From 26cf7dcf19933feffabcb6b690e840c51f04c31b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 19 Nov 2014 17:06:30 +0100 Subject: [PATCH] Make SDK examples compile again ...after various recent changes to include files etc. Change-Id: I9d2acbcfb09ca1df6247038afa6fbd99aa74a90d --- .../Components/Addons/ProtocolHandlerAddon_cpp/component.cxx | 1 + .../DevelopersGuide/Components/CppComponent/service1_impl.cxx | 1 + .../DevelopersGuide/Database/DriverSkeleton/SDriver.hxx | 4 ++++ .../DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 1 + .../FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx | 1 + .../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(+) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx index 41466a48fe89..6a57f3291f9b 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 +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 fcfef8fcc618..20649fc16579 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -43,6 +43,7 @@ #include +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 b80b3e42afc4..b482d5088aa5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx @@ -41,6 +41,10 @@ #include #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 567635454420..a64fa88c7ae1 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #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 89f1f38413ad..9d234e9aa1df 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 cd87a7e2b951..6c7e6d7c34a8 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 #include #include +#include #include #include @@ -59,6 +60,7 @@ #include #include +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 a55ce0dd5ab1..8a39becd63a7 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 #include "ListenerHelper.h" diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h index 2f3f984466eb..6687dc7c8be6 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 +#include #include #include diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h index 5e228592eb24..303916545c14 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 #include #include #include diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 41fc283b202d..07003304ad2e 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -31,6 +31,7 @@ #include #include #include +#include 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 88cfe29db1c5..86f8d87b6271 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 8e53793f20af..f917a4fe8da5 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 63ff64cb80ee..373efaee8a24 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -52,6 +52,7 @@ #include +using namespace ::rtl; using namespace ::cppu; using namespace ::osl; using namespace ::com::sun::star::uno;