[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - odk/examples odk/Package_examples.mk xmloff/source

[Tor Lillqvist]

 odk/Package_examples.mk                                             |    1 +
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx |    2 +-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx |    2 +-
 xmloff/source/chart/SchXMLExport.cxx                                |    8 --------
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 62e3e3c7c8b76e163e7671963d83d7f7ce958309
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 12 19:51:40 2014 +0300

    WaE: unused function 'isString'
    
    Change-Id: I991cbf4a0203debaa98887d2db3fec9654dc1c5b
    (cherry picked from commit 1b450cfd425a988157d5a7eff86091ba12bc10f4)
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index dfa4d0dc..0c5147f 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2549,14 +2549,6 @@ namespace
         //no doubles and no texts
         return false;
     }
-
-    bool isString(const OUString& rString)
-    {
-        if(rString.startsWith("\"") && rString.endsWith("\""))
-            return true;
-
-        return false;
-    }
 }
 
 void SchXMLExportHelper_Impl::exportSeries(
commit e91686d27844b1d2428788adad489f54e3357efc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 20 16:15:11 2014 +0200

    Fix SDK examples
    
    Change-Id: I68099725c43adeab144d53737f60f778b3aebf73
    (cherry picked from commit 6e714e618353b9eccf04efc15a5987ee10793309)

diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index b6aaae7..4463c8f 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -411,6 +411,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,
     cpp/complextoolbarcontrols/ProtocolHandler.xcu \
     cpp/complextoolbarcontrols/WriterListener.cxx \
     cpp/complextoolbarcontrols/WriterWindowState.xcu \
+    cpp/complextoolbarcontrols/description.xml \
     cpp/complextoolbarcontrols/exports.cxx \
     cpp/complextoolbarcontrols/logo_big.png \
     cpp/complextoolbarcontrols/logo_small.png \
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index b44ba02..ed34981 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -770,7 +770,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
-        PROPERTY_ID_CURSORNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY);
+        PROPERTY_ID_CURSORNAME, ::cppu::UnoType<rtl::OUString>::get(), PropertyAttribute::READONLY);
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
         PROPERTY_ID_FETCHDIRECTION, ::cppu::UnoType<sal_Int32>::get(), 0);
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index 5b91333..5676354 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -269,7 +269,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
-        PROPERTY_ID_CURSORNAME, ::cppu::UnoType<OUString>::get(), 0);
+        PROPERTY_ID_CURSORNAME, ::cppu::UnoType<rtl::OUString>::get(), 0);
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),
         PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0);
     pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),