[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - svx/source wizards/com

[David Tardon]

 svx/source/fmcomp/gridctrl.src                           |    2 -
 svx/source/form/fmexpl.src                               |    2 -
 svx/source/form/formshell.src                            |    2 -
 wizards/com/sun/star/wizards/common/PropertySetHelper.py |   23 ++++-----------
 4 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 642c799d2dbbb99ac717a9c085ff80a6fccd0219
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Dec 22 13:30:41 2011 +0100

    we need to include the localized file
    
    This reverts commit 9d88c67c4cfa8e894d23ebe7924a9d630327ccda.
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index e5a0c9a..874f3ae 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -27,7 +27,7 @@
 
 #include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
-#include "globlmn_tmpl.hrc"
+#include "globlmn.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxcommands.h>
 
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index c6509d8..f4d56d3 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -28,7 +28,7 @@
 #include <svx/svxids.hrc>
 #include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
-#include "globlmn_tmpl.hrc"
+#include "globlmn.hrc"
 #include <svx/svxcommands.h>
 #include "fmhelp.hrc"
 
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index 881d13f..287f60a 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -29,7 +29,7 @@
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
-#include "globlmn_tmpl.hrc"
+#include "globlmn.hrc"
 #include "helpid.hrc"
 #include "fmhelp.hrc"
 
commit 21b20398d2f087175f2096820e54317e06af59d8
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 16 06:53:23 2011 +0100

    fix syntactic error
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
index 8ce949e..970e453 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
@@ -225,10 +225,7 @@ class PropertySetHelper(object):
     def showProperties(self):
         sName = ""
         if self.m_xPropertySet != None:
-            XServiceInfo xServiceInfo = (XServiceInfo)
-            UnoRuntime.queryInterface(XServiceInfo.class, self.m_xPropertySet)
-            if xServiceInfo != None:
-                sName = xServiceInfo.getImplementationName()
+            sName = self.m_xPropertySet.getImplementationName()
 
             xInfo = self.m_xPropertySet.getPropertySetInfo()
             aAllProperties = xInfo.getProperties()
commit 8ab2c40f2000a7d8a8f5f230698f19babde8e523
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Dec 16 06:44:18 2011 +0100

    fix syntactic error
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
index fbb31d8..8ce949e 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
@@ -4,16 +4,8 @@ class PropertySetHelper(object):
 
     @classmethod
     def __init__(self, _aObj):
-        if not _aObj:
-           return
-
         self.m_xPropertySet = _aObj
-
-    def getHashMap(self):
-        if self.m_aHashMap == None:
-            self.m_aHashMap = HashMap < String, Object >.Object()
-
-        return self.m_aHashMap
+        self.m_aHashMap = {}
 
     '''
     set a property, don't throw any exceptions,
@@ -55,7 +47,7 @@ class PropertySetHelper(object):
                 DebugHelper.exception(e)
 
         else:
-            getHashMap().put(_sName, _aValue)
+            self.m_aHashMap[_sName] = _aValue
 
     '''
     get a property and convert it to a int value
@@ -128,9 +120,11 @@ class PropertySetHelper(object):
             except com.sun.star.lang.WrappedTargetException, e:
                 DebugHelper.writeInfo(e.getMessage())
 
+        # TODO: I wonder why the same thing is not done in the rest of the
+        # getPropertyValueAs* functions...
         if aObject == None:
-            if getHashMap().containsKey(_sName):
-                aObject = getHashMap().get(_sName)
+            if _sName in self.m_aHashMap:
+                aObject = self.m_aHashMap[_sName]
 
         if aObject != None:
             try: