[Libreoffice-commits] core.git: odk/examples
Stephan Bergmann
sbergman at redhat.com
Wed Nov 19 08:07:09 PST 2014
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx | 1 +
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 1 +
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx | 4 ++++
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 1 +
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx | 1 +
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 2 ++
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx | 1 +
odk/examples/cpp/complextoolbarcontrols/MyJob.h | 1 +
odk/examples/cpp/complextoolbarcontrols/MyListener.h | 1 +
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 1 +
odk/examples/cpp/counter/counter.cxx | 1 +
odk/examples/cpp/counter/countermain.cxx | 2 ++
odk/examples/cpp/remoteclient/remoteclient.cxx | 1 +
13 files changed, 18 insertions(+)
New commits:
commit 26cf7dcf19933feffabcb6b690e840c51f04c31b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 19 17:06:30 2014 +0100
Make SDK examples compile again
...after various recent changes to include files etc.
Change-Id: I9d2acbcfb09ca1df6247038afa6fbd99aa74a90d
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 41466a4..6a57f32 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
@@ -46,6 +46,7 @@
// include our specific addon header to get access to functions and definitions
#include <addon.hxx>
+using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index fcfef8f..20649fc 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -43,6 +43,7 @@
#include <my_module/XSomething.hpp>
+using namespace ::rtl; // for OUString
using namespace ::com::sun::star; // for odk interfaces
using namespace ::com::sun::star::uno; // for basic types
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
index b80b3e4..b482d50 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
@@ -41,6 +41,10 @@
#include <cppuhelper/compbase2.hxx>
#include "SConnection.hxx"
+namespace com { namespace sun { namespace star { namespace lang {
+ class XMultiServiceFactory;
+} } } }
+
namespace connectivity
{
namespace skeleton
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index 5676354..a64fa88 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -44,6 +44,7 @@
#include <com/sun/star/sdbc/FetchDirection.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/queryinterface.hxx>
#include "propertyids.hxx"
using namespace connectivity::skeleton;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index 89f1f38..9d234e9 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -43,6 +43,7 @@
#include "filterdetect.hxx"
+using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index cd87a7e..6c7e6d7 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -37,6 +37,7 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
+#include <osl/diagnose.h>
#include <uno/lbnames.h>
#include <com/sun/star/lang/XComponent.hpp>
@@ -59,6 +60,7 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XSeekable.hpp>
+using namespace ::rtl;
using namespace ::cppu;
using namespace ::osl;
using namespace ::com::sun::star::beans;
diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx
index a55ce0d..8a39bec 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <osl/diagnose.h>
#include "ListenerHelper.h"
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
index 2f3f984..6687dc7 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
@@ -21,6 +21,7 @@
#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYJOB_H
#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
index 5e22859..3039165 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
@@ -20,6 +20,7 @@
#ifndef INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/document/XEventListener.hpp>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 41fc283..0700330 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <osl/diagnose.h>
using namespace com::sun::star::awt;
using namespace com::sun::star::frame;
diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx
index 88cfe29..86f8d87 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -56,6 +56,7 @@
#define SERVICENAME "foo.Counter"
#define IMPLNAME "com.sun.star.comp.example.cpp.Counter"
+using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx
index 8e53793..f917a4f 100644
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@ -57,6 +57,8 @@ using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
+using namespace ::rtl;
+
SAL_IMPLEMENT_MAIN()
diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx
index 63ff64c..373efae 100644
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@ -52,6 +52,7 @@
#include <cppuhelper/implbase1.hxx>
+using namespace ::rtl;
using namespace ::cppu;
using namespace ::osl;
using namespace ::com::sun::star::uno;
More information about the Libreoffice-commits
mailing list