diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index fb25532855eb..ae6e36092e51 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include "vtablefactory.hxx" namespace com { namespace sun { namespace star { namespace uno { class XInterface; diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx index 519abd627c48..3da3adac5fc3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx @@ -50,7 +50,7 @@ OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------- */ -#include "sal/config.h" +#include #include "abi.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx index 1cce8737a1b1..680e8da819f2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typeclass.h" -#include "typelib/typedescription.h" +#include +#include +#include +#include #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx index 4a48692c5c46..92418607f69f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX -#include "sal/config.h" +#include -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typedescription.h" +#include +#include +#include namespace CPPU_CURRENT_NAMESPACE { diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 3f5857fdc5d4..cba6302ce7b0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -25,15 +25,15 @@ #include #include -#include "com/sun/star/uno/RuntimeException.hpp" +#include #include #include #include -#include "bridge.hxx" -#include "cppinterfaceproxy.hxx" -#include "types.hxx" -#include "vtablefactory.hxx" +#include +#include +#include +#include #include "abi.hxx" #include "call.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 12df659b41cd..038f101a7edf 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -25,7 +25,7 @@ #include #include -#include "com/sun/star/uno/RuntimeException.hpp" +#include #include #include diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx index 4d6683ff5640..5f83cfcac9b2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "rtti.hxx" +#include "share.hxx" namespace { diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index bac7ef6fec15..55009d5f7480 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include #include @@ -29,9 +29,9 @@ #endif #include -#include "config_cxxabi.h" -#include "uno/any2.h" -#include "uno/mapping.h" +#include +#include +#include #if !HAVE_CXXABI_H_CLASS_TYPE_INFO // , diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index c277c1a32ee9..929e0e2945aa 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -22,17 +22,17 @@ #include #include -#include "rtl/alloc.h" +#include #include -#include "com/sun/star/uno/RuntimeException.hpp" +#include #include #include #include #include -#include "unointerfaceproxy.hxx" -#include "vtables.hxx" +#include +#include #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index 805e56968482..556350022e48 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -18,18 +18,18 @@ */ -#include "bridge.hxx" +#include -#include "cppinterfaceproxy.hxx" -#include "unointerfaceproxy.hxx" +#include +#include -#include "com/sun/star/uno/XInterface.hpp" -#include "rtl/ustring.h" -#include "sal/types.h" -#include "typelib/typedescription.h" -#include "uno/dispatcher.h" -#include "uno/environment.h" -#include "uno/mapping.h" +#include +#include +#include +#include +#include +#include +#include namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 960fc9991cf1..35217307a1b4 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -17,23 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "bridge.hxx" +#include -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/XInterface.hpp" -#include "osl/mutex.hxx" -#include "osl/time.h" -#include "rtl/process.h" -#include "rtl/ustrbuf.hxx" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "sal/types.h" -#include "uno/environment.h" -#include "uno/lbnames.h" -#include "uno/mapping.h" -#include "cppu/EnvDcp.hxx" +#include +#include +#include +#include +#include namespace { diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 4a87eb389146..f28148104a5f 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -17,18 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "cppinterfaceproxy.hxx" +#include #include "guardedarray.hxx" -#include "bridge.hxx" -#include "vtablefactory.hxx" +#include +#include -#include "com/sun/star/uno/XInterface.hpp" -#include "osl/getglobalmutex.hxx" -#include "osl/mutex.hxx" -#include "rtl/instance.hxx" -#include "typelib/typedescription.h" +#include +#include +#include +#include +#include #include #include diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx index a4bdb1bbe25f..a22e3307173f 100644 --- a/bridges/source/cpp_uno/shared/types.cxx +++ b/bridges/source/cpp_uno/shared/types.cxx @@ -18,10 +18,10 @@ */ -#include "types.hxx" +#include -#include "typelib/typeclass.h" -#include "typelib/typedescription.h" +#include +#include namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx index b2c608403f34..42037afe6e54 100644 --- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "unointerfaceproxy.hxx" +#include -#include "bridge.hxx" +#include -#include "com/sun/star/uno/XInterface.hpp" -#include "typelib/typedescription.h" -#include "uno/dispatcher.h" +#include +#include +#include namespace bridges { namespace cpp_uno { namespace shared { diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 47a4af246977..47bd40069f4f 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -18,21 +18,21 @@ */ -#include "vtablefactory.hxx" +#include #include "guardedarray.hxx" -#include "vtables.hxx" +#include -#include "osl/thread.h" -#include "osl/security.hxx" -#include "osl/file.hxx" -#include "osl/mutex.hxx" -#include "rtl/alloc.h" -#include "rtl/ustring.hxx" -#include "sal/log.hxx" -#include "sal/types.h" -#include "typelib/typedescription.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx index 4e70a2c5e44e..a9909eaee5ca 100644 --- a/bridges/source/cpp_uno/shared/vtables.cxx +++ b/bridges/source/cpp_uno/shared/vtables.cxx @@ -18,10 +18,10 @@ */ -#include "vtables.hxx" +#include -#include "sal/types.h" -#include "typelib/typedescription.h" +#include +#include #include #include diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 88f43bc968bc..c7ab58a0078d 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -24,17 +24,17 @@ #include -#include "jvmaccess/unovirtualmachine.hxx" -#include "jvmaccess/virtualmachine.hxx" +#include +#include -#include "osl/diagnose.h" +#include -#include "rtl/alloc.h" -#include "rtl/ustring.hxx" -#include "sal/log.hxx" +#include +#include +#include -#include "uno/environment.h" -#include "typelib/typedescription.h" +#include +#include namespace jni_uno diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index c8106bb19390..3859b148c541 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -25,10 +25,10 @@ #include "jni_bridge.h" #include "jniunoenvironmentdata.hxx" -#include "jvmaccess/unovirtualmachine.hxx" -#include "rtl/ref.hxx" -#include "rtl/strbuf.hxx" -#include "uno/lbnames.h" +#include +#include +#include +#include using namespace ::osl; using namespace ::jni_uno; diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h index fbf2a8449737..730d034c6bc6 100644 --- a/bridges/source/jni_uno/jni_bridge.h +++ b/bridges/source/jni_uno/jni_bridge.h @@ -28,12 +28,12 @@ #include "jni_base.h" #include "jni_helper.h" -#include "osl/diagnose.h" +#include -#include "uno/mapping.h" -#include "uno/dispatcher.h" +#include +#include -#include "com/sun/star/uno/XInterface.hpp" +#include namespace jni_uno diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index 11ebf3589602..ac86fd391e4f 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -24,8 +24,8 @@ #include "jni_bridge.h" -#include "rtl/strbuf.hxx" -#include "uno/sequence2.h" +#include +#include namespace jni_uno { diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index c2334071b676..82b773d6d58c 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -23,14 +23,14 @@ #include "jni_bridge.h" -#include "com/sun/star/uno/RuntimeException.hpp" +#include -#include "jvmaccess/unovirtualmachine.hxx" -#include "rtl/string.hxx" -#include "rtl/strbuf.hxx" -#include "rtl/ustrbuf.hxx" +#include +#include +#include +#include -#include "uno/lbnames.h" +#include using namespace ::std; diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index a8d395c6e309..920e78453afe 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -26,15 +26,15 @@ #include "jni_base.h" -#include "osl/mutex.hxx" -#include "rtl/ref.hxx" -#include "rtl/ustring.hxx" -#include "rtl/strbuf.hxx" +#include +#include +#include +#include -#include "uno/environment.h" -#include "typelib/typedescription.hxx" +#include +#include -#include "com/sun/star/uno/Type.hxx" +#include namespace jvmaccess { class UnoVirtualMachine; } diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 117a520094fd..45bcbaedc3f0 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -26,9 +26,9 @@ #include -#include "com/sun/star/uno/RuntimeException.hpp" +#include -#include "rtl/ustrbuf.hxx" +#include #include "jni_bridge.h" #include "jniunoenvironmentdata.hxx" diff --git a/bridges/source/jni_uno/jniunoenvironmentdata.hxx b/bridges/source/jni_uno/jniunoenvironmentdata.hxx index e7eb9933e895..091e6dbd9eab 100644 --- a/bridges/source/jni_uno/jniunoenvironmentdata.hxx +++ b/bridges/source/jni_uno/jniunoenvironmentdata.hxx @@ -28,7 +28,7 @@ #include #include -#include +#include "jni_info.h" namespace jni_uno { diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index ee40e6b53e82..547001a7f51e 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -19,14 +19,14 @@ #include -#include "jvmaccess/virtualmachine.hxx" -#include "rtl/byteseq.h" -#include "rtl/byteseq.hxx" -#include "rtl/ref.hxx" -#include "sal/types.h" -#include "uno/threadpool.h" +#include +#include +#include +#include +#include +#include -#include "jni.h" +#include #include