[Libreoffice-commits] .: 3 commits - scripting/source xmlhelp/source

[David Tardon]

 scripting/source/pyprov/makefile.mk              |   10 +---------
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx |   14 +++++++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit b9e65390d9f5df73ef46d67d218f59fe2ed1caec
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Feb 19 07:55:57 2011 +0100

    bah, disabled too much

diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index e95dac8..e9a065a 100644
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -34,14 +34,6 @@ TARGET=pyprov
 
 .INCLUDE :  settings.mk
 
-# ------------------------------------------------------------------
-
-.IF "$(ENABLE_SCRIPTING_PYTHON)" != "YES"
- at all:
-    @echo "Script Provider for Python build disabled."
-.ENDIF
-
-
 # --- Targets ------------------------------------------------------
 ALL : ALLTAR \
     $(DLLDEST)$/officehelper.py	\
@@ -51,7 +43,7 @@ $(DLLDEST)$/%.py: %.py
     cp $? $@
 
 # scripting provider extension
-.IF "$(L10N_framework)"==""
+.IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
 
 EXTENSIONNAME:=ScriptProviderForPython
 EXTENSION_ZIPNAME:=script-provider-for-python
commit e25e59639e1c90b9fc238130db003de671cfb734
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 17 16:18:31 2011 +0100

    add RTL_CONSTASCII_STRINGPARAM for string literals

diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 1ed1773..dead769 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -126,10 +126,10 @@ namespace chelp {
                       Databases* pDatabases ) 
             throw( com::sun::star::ucb::IllegalIdentifierException );
         
-        bool isPicture() const { return m_aModule.compareToAscii("picture") == 0; }
-        bool isActive() const { return m_aActive.getLength() > 0 && m_aActive.compareToAscii( "true" ) == 0; }
+        bool isPicture() const { return m_aModule.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("picture")); }
+        bool isActive() const { return m_aActive.getLength() > 0 && m_aActive.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); }
         bool isQuery() const { return m_aId.getLength() == 0 && m_aQuery.getLength() != 0; }
-        bool isEntryForModule() const { return m_aId.compareToAscii("start") == 0 || m_bStart; }
+        bool isEntryForModule() const { return m_aId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("start")) || m_bStart; }
         bool isFile() const { return m_aId.getLength() != 0; }
         bool isModule() const { return m_aId.getLength() == 0 && m_aModule.getLength() != 0; }
         bool isRoot() const { return m_aModule.getLength() == 0; }
commit 78b70af5708b04fc1913ed8d44ff953a02b3f1f0
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 17 16:15:04 2011 +0100

    test length instead of comparing with ""

diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 0a2134a..1ed1773 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -128,11 +128,11 @@ namespace chelp {
         
         bool isPicture() const { return m_aModule.compareToAscii("picture") == 0; }
         bool isActive() const { return m_aActive.getLength() > 0 && m_aActive.compareToAscii( "true" ) == 0; }
-        bool isQuery() const { return m_aId.compareToAscii("") == 0 && m_aQuery.compareToAscii("") != 0; }
+        bool isQuery() const { return m_aId.getLength() == 0 && m_aQuery.getLength() != 0; }
         bool isEntryForModule() const { return m_aId.compareToAscii("start") == 0 || m_bStart; }
-        bool isFile() const { return m_aId.compareToAscii( "" ) != 0; }
-        bool isModule() const { return m_aId.compareToAscii("") == 0 && m_aModule.compareToAscii("") != 0; }
-        bool isRoot() const { return m_aModule.compareToAscii("") == 0; }
+        bool isFile() const { return m_aId.getLength() != 0; }
+        bool isModule() const { return m_aId.getLength() == 0 && m_aModule.getLength() != 0; }
+        bool isRoot() const { return m_aModule.getLength() == 0; }
         bool isErrorDocument();
         
         rtl::OUString get_url() const { return m_aURL; }