Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index 

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3010

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/3010/1

Init: Relative paths and missing imports

Change-Id: I2196567e0c9b90a9a56aa1db769f6efc9e56e74f
---
M wizards/com/sun/star/wizards/web/StylePreview.py
M wizards/com/sun/star/wizards/web/data/CGArgument.py
M wizards/com/sun/star/wizards/web/data/CGContent.py
M wizards/com/sun/star/wizards/web/data/CGDesign.py
M wizards/com/sun/star/wizards/web/data/CGFilter.py
M wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
M wizards/com/sun/star/wizards/web/data/CGIconSet.py
M wizards/com/sun/star/wizards/web/data/CGImage.py
M wizards/com/sun/star/wizards/web/data/CGLayout.py
M wizards/com/sun/star/wizards/web/data/CGSessionName.py
M wizards/com/sun/star/wizards/web/data/CGStyle.py
11 files changed, 22 insertions(+), 15 deletions(-)



diff --git a/wizards/com/sun/star/wizards/web/StylePreview.py 
b/wizards/com/sun/star/wizards/web/StylePreview.py
index eb9510f..d131037 100644
--- a/wizards/com/sun/star/wizards/web/StylePreview.py
+++ b/wizards/com/sun/star/wizards/web/StylePreview.py
@@ -15,8 +15,9 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.FileAccess import FileAccess
 import traceback
+
+from ..common.FileAccess import FileAccess
 
 '''
 @author rpiterman
@@ -46,7 +47,9 @@
         self.cssFilename = FileAccess.connectURLs(self.tempDir, "style.css")
         self.backgroundFilename = FileAccess.connectURLs(
             self.tempDir, "images/background.gif")
+
         self.wwRoot = wwRoot_
+        print ("WARNING !!! StylePreview init (review) - source, target: ", self.wwRoot, 
self.htmlFilename)
         self.fileAccess.copy(FileAccess.connectURLs(
             self.wwRoot, "preview.html"), self.htmlFilename)
 
@@ -68,9 +71,11 @@
             # a solaris bug workaround
             # TODO
             #copy the background image to the temp directory.
+            print ("WARNING !!! refresh (background) - source, target: ", background, 
self.backgroundFilename)
             self.fileAccess.copy(background, self.backgroundFilename)
 
         #copy the actual css to the temp directory
+        print ("WARNING !!! refresh (css) - source, target: ", css, self.tempDir)
         self.fileAccess.copy(css, self.cssFilename)
 
     def cleanup(self):
diff --git a/wizards/com/sun/star/wizards/web/data/CGArgument.py 
b/wizards/com/sun/star/wizards/web/data/CGArgument.py
index 220f424..ee532de 100644
--- a/wizards/com/sun/star/wizards/web/data/CGArgument.py
+++ b/wizards/com/sun/star/wizards/web/data/CGArgument.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGArgument(ConfigGroup):
     cp_Value = str()
diff --git a/wizards/com/sun/star/wizards/web/data/CGContent.py 
b/wizards/com/sun/star/wizards/web/data/CGContent.py
index d2969d8..c85d7df 100644
--- a/wizards/com/sun/star/wizards/web/data/CGContent.py
+++ b/wizards/com/sun/star/wizards/web/data/CGContent.py
@@ -15,9 +15,10 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
-from common.ConfigSet import ConfigSet
-from CGDocument import CGDocument
+from ...common.ConfigGroup import ConfigGroup
+from ...common.ConfigSet import ConfigSet
+from ...common.XMLHelper import XMLHelper
+from .CGDocument import CGDocument
 
 class CGContent(ConfigGroup):
 
diff --git a/wizards/com/sun/star/wizards/web/data/CGDesign.py 
b/wizards/com/sun/star/wizards/web/data/CGDesign.py
index 2d071d3..a53e40a 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDesign.py
+++ b/wizards/com/sun/star/wizards/web/data/CGDesign.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGDesign(ConfigGroup):
 
diff --git a/wizards/com/sun/star/wizards/web/data/CGFilter.py 
b/wizards/com/sun/star/wizards/web/data/CGFilter.py
index 75a4adc..8862cae 100644
--- a/wizards/com/sun/star/wizards/web/data/CGFilter.py
+++ b/wizards/com/sun/star/wizards/web/data/CGFilter.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGFilter(ConfigGroup):
     cp_Index = -1
diff --git a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py 
b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
index 0928dda..bdfdae6 100644
--- a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
+++ b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
@@ -15,7 +15,8 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
+from ...common.XMLHelper import XMLHelper
 
 class CGGeneralInfo(ConfigGroup):
 
diff --git a/wizards/com/sun/star/wizards/web/data/CGIconSet.py 
b/wizards/com/sun/star/wizards/web/data/CGIconSet.py
index fb540e4..6f8c88f 100644
--- a/wizards/com/sun/star/wizards/web/data/CGIconSet.py
+++ b/wizards/com/sun/star/wizards/web/data/CGIconSet.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGIconSet(ConfigGroup):
     cp_Index = -1
diff --git a/wizards/com/sun/star/wizards/web/data/CGImage.py 
b/wizards/com/sun/star/wizards/web/data/CGImage.py
index 1f01ff9..0d747ee 100644
--- a/wizards/com/sun/star/wizards/web/data/CGImage.py
+++ b/wizards/com/sun/star/wizards/web/data/CGImage.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGImage(ConfigGroup):
     cp_Href = str()
diff --git a/wizards/com/sun/star/wizards/web/data/CGLayout.py 
b/wizards/com/sun/star/wizards/web/data/CGLayout.py
index a8b5bbb..9830664 100644
--- a/wizards/com/sun/star/wizards/web/data/CGLayout.py
+++ b/wizards/com/sun/star/wizards/web/data/CGLayout.py
@@ -15,8 +15,8 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
-from ui.UIConsts import RID_IMG_WEB
+from ...common.ConfigGroup import ConfigGroup
+from ...ui.UIConsts import UIConsts
 
 class CGLayout(ConfigGroup):
 
@@ -42,7 +42,7 @@
 
     def getImageUrls(self):
         sRetUrls = range(1)
-        ResId = RID_IMG_WEB + (self.cp_Index * 2)
+        ResId = UIConsts.RID_IMG_WEB + (self.cp_Index * 2)
         return [ResId, ResId + 1]
 
     def getTemplates(self, xmsf):
diff --git a/wizards/com/sun/star/wizards/web/data/CGSessionName.py 
b/wizards/com/sun/star/wizards/web/data/CGSessionName.py
index d42b0d5..283eaac 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSessionName.py
+++ b/wizards/com/sun/star/wizards/web/data/CGSessionName.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGSessionName(ConfigGroup):
     cp_Index = -1
diff --git a/wizards/com/sun/star/wizards/web/data/CGStyle.py 
b/wizards/com/sun/star/wizards/web/data/CGStyle.py
index bf90d51..2de5fdd 100644
--- a/wizards/com/sun/star/wizards/web/data/CGStyle.py
+++ b/wizards/com/sun/star/wizards/web/data/CGStyle.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from common.ConfigGroup import ConfigGroup
+from ...common.ConfigGroup import ConfigGroup
 
 class CGStyle(ConfigGroup):
     cp_Index = -1

-- 
To view, visit https://gerrit.libreoffice.org/3010
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2196567e0c9b90a9a56aa1db769f6efc9e56e74f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Javier Fernandez <javier.fgb@gmail.com>

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.