odk/Package_examples.mk | 1 +
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx | 2 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6e714e618353b9eccf04efc15a5987ee10793309
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 20 16:15:11 2014 +0200
Fix SDK examples
Change-Id: I68099725c43adeab144d53737f60f778b3aebf73
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),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
