diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:59:03 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:59:03 +0200 |
| commit | fcb8c3c297e3f14f6af280614d37bd7c86b90d49 (patch) | |
| tree | 25899be8fa61330e1f6e3cbbba8e3304a2938b1d | |
| parent | 24af5f6248513a79a1fe056daab8c61bbe03c889 (diff) | |
| parent | 861f8ece769bf05c138aac080706e0d97bf5fd10 (diff) | |
resyncing to master
433 files changed, 7527 insertions, 17250 deletions
diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst index 230b323f0a35..2681035e1ae6 100644 --- a/binaryurp/prj/build.lst +++ b/binaryurp/prj/build.lst @@ -1,3 +1,3 @@ -bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper stlport NULL +bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL bu binaryurp\source nmake - all bu_source NULL bu binaryurp\qa nmake - all bu_qa bu_source NULL diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index ebaf3d1a1777..9421371c5149 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -225,11 +225,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( - char const ** ppEnvTypeName, uno_Environment **) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index 6960e102a9a1..130588c5c503 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -510,14 +510,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - if (envTypeName != 0) { - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName, void * serviceManager, void *) { void * p = 0; diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index e803415eb3b6..7e4aa754fcda 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -162,12 +162,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(rContext)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - sal_Char const ** pEnvTypeName, uno_Environment **) -{ - *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, void * pServiceManager, void *) { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 4c69a7a7b540..82737af756f6 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -170,10 +170,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( implName, serviceManager, registryKey, entries); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index f3bf1791a839..b22dc8dfeb48 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -134,10 +134,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( implName, serviceManager, registryKey, entries); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map index b560ad15b99f..c24529e13509 100644 --- a/bridges/test/java_uno/nativethreadpool/version.map +++ b/bridges/test/java_uno/nativethreadpool/version.map @@ -28,8 +28,6 @@ UDK_3_0_0 { global: component_getFactory; - component_getImplementationEnvironment; - local: *; }; diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst index c9ac99cf9790..a46a8297d12d 100644 --- a/cli_ure/prj/build.lst +++ b/cli_ure/prj/build.lst @@ -1,4 +1,4 @@ -ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges NULL +ure cli_ure : cppu cppuhelper sal DESKTOP:codemaker stoc udkapi bridges NULL ure cli_ure usr1 - all ure_mkout NULL ure cli_ure\inc nmake - all ure_inc NULL ure cli_ure\version nmake - all ure_source_version ure_inc NULL diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx index 76c3328668f3..43e39b5eadfb 100644 --- a/codemaker/inc/codemaker/options.hxx +++ b/codemaker/inc/codemaker/options.hxx @@ -65,14 +65,9 @@ public: sal_Bool isValid(const ::rtl::OString& option); const ::rtl::OString getOption(const ::rtl::OString& option) throw( IllegalArgument ); - const OptionMap& getOptions(); - - const ::rtl::OString getInputFile(sal_uInt16 index) - throw( IllegalArgument ); const StringVector& getInputFiles(); - ::rtl::OString getExtraInputFile(sal_uInt16 index) const throw( IllegalArgument ); inline sal_uInt16 getNumberOfExtraInputFiles() const { return (sal_uInt16)m_extra_input_files.size(); } inline const StringVector& getExtraInputFiles() const diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst index a0fa864ebd8e..1202fd2ef775 100644 --- a/codemaker/prj/build.lst +++ b/codemaker/prj/build.lst @@ -1,4 +1,4 @@ -cm codemaker : udkapi NULL +cm codemaker : registry NULL cm codemaker usr1 - all cm_mkout NULL cm codemaker\inc nmake - all cm_inc NULL cm codemaker\prj get - all cm_prj NULL diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 8748db53c2c8..4050c1ba6266 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -64,38 +64,9 @@ const OString Options::getOption(const OString& option) } } -const OptionMap& Options::getOptions() -{ - return m_options; -} - -const OString Options::getInputFile(sal_uInt16 index) - throw( IllegalArgument ) -{ - if (index < m_inputFiles.size()) - { - return m_inputFiles[index]; - } else - { - throw IllegalArgument("index is out of bound."); - } -} - const StringVector& Options::getInputFiles() { return m_inputFiles; } -OString Options::getExtraInputFile(sal_uInt16 index) const - throw( IllegalArgument ) -{ - if (index < m_extra_input_files.size()) - { - return m_extra_input_files[index]; - } else - { - throw IllegalArgument("index is out of bound."); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx index 9ab2e4296228..1f103e7f2a69 100644 --- a/codemaker/source/javamaker/classfile.cxx +++ b/codemaker/source/javamaker/classfile.cxx @@ -90,11 +90,6 @@ void write(FileStream & file, void const * buffer, sal_uInt64 size) { } } -void writeU1(FileStream & file, sal_uInt8 data) { - unsigned char buf[] = { static_cast< unsigned char >(data) }; - write(file, &buf, sizeof buf); -} - void writeU2(FileStream & file, sal_uInt16 data) { unsigned char buf[] = { static_cast< unsigned char >(data >> 8), diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst index 0af8b3019621..f55bffde8ce1 100644 --- a/cppu/prj/build.lst +++ b/cppu/prj/build.lst @@ -1,4 +1,4 @@ -cu cppu : sal salhelper offuh BOOST:boost NULL +cu cppu : sal salhelper offapi BOOST:boost NULL cu cppu usr1 - all cu_mkout NULL cu cppu\inc nmake - all cu_inc NULL cu cppu\source\uno nmake - all cu_uno cu_inc NULL diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index f8ae76e8dd7a..0c09a1bda400 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -59,7 +59,11 @@ SHL1TARGET= uno_$(TARGET) SHL1STDLIBS = $(SALLIB) SHL1DEPN= +.IF "$(COM)" == "MSC" SHL1IMPLIB=i$(TARGET) +.ELSE +SHL1IMPLIB=uno_$(TARGET) +.ENDIF .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx index 7bfdc97ea75e..ed7f74107cae 100644 --- a/cppuhelper/inc/cppuhelper/shlib.hxx +++ b/cppuhelper/inc/cppuhelper/shlib.hxx @@ -60,6 +60,32 @@ SAL_CALL loadSharedLibComponentFactory( ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey ) SAL_THROW( (::com::sun::star::loader::CannotActivateFactoryException) ); +/** Loads a shared library component and gets the factory out of it. You can give either a + fully qualified libname or single lib name. The libname need not be pre/postfixed + (e.g. xxx.dll). You can give parameter rPath to force lookup of the library in a specific + directory. The resulting path of the library will be checked against environment variable + CPLD_ACCESSPATH if set. An optional 'prefix' parameter is used to determine the symbol + name of the entry point in the library. + + @param rLibName name of the library + @param rPath optional path + @param rImplName implementation to be retrieved from the library + @param xMgr service manager to be provided to the component + @param xKey registry key to be provided to the component + @param rPrefix optional component prefix + @return + factory instance (::com::sun::star::lang::XSingleComponentFactory or + ::com::sun::star::lang::XSingleComponentFactory) +*/ +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +SAL_CALL loadSharedLibComponentFactory( + ::rtl::OUString const & rLibName, ::rtl::OUString const & rPath, + ::rtl::OUString const & rImplName, + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & xMgr, + ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey, + ::rtl::OUString const & rPrefix ) + SAL_THROW( (::com::sun::star::loader::CannotActivateFactoryException) ); + /** Invokes component_writeInfo() function of specified component library. You can give either a fully qualified libname or single lib name. The libname need not be pre/postfixed (e.g. xxx.dll). You can give parameter rPath to force lookup of the library in a specific diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst index 4ff92edfaadb..570a34560a1c 100644 --- a/cppuhelper/prj/build.lst +++ b/cppuhelper/prj/build.lst @@ -1,4 +1,4 @@ -ch cppuhelper : BOOST:boost LIBXSLT:libxslt codemaker cppu offuh NULL +ch cppuhelper : BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi NULL ch cppuhelper usr1 - all ch_mkout NULL ch cppuhelper\inc nmake - all ch_include NULL ch cppuhelper\source nmake - all ch_source ch_unotypes ch_include NULL diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 2fd0d494c99d..19cf4c0a0d86 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -416,18 +416,11 @@ cppu::ImplementationEntry entries[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mixin_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index be4cfc380947..384e2b047883 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -66,7 +66,6 @@ DEF1NAME = $(SHL1TARGET) SHL2TARGET = $(TARGET).uno SHL2OBJS = $(SLO)/comp_propertysetmixin.obj -SHL2VERSIONMAP = $(SOLARENV)/src/component.map SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) SHL2IMPLIB = i$(SHL2TARGET) SH21RPATH = NONE diff --git a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component b/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component index a654e07581a3..1ae646e98017 100644 --- a/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component +++ b/cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="mixin" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="test.cppuhelper.propertysetmixin.comp.CppSupplier"> <service name="test.cppuhelper.propertysetmixin.CppSupplier"/> diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 2958e1505f5f..bccc91db36eb 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -31,9 +31,11 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase3.hxx> +#include <cppuhelper/shlib.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/instance.hxx> #include <rtl/unload.h> @@ -832,6 +834,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() OUString aActivatorUrl; OUString aActivatorName; OUString aLocation; + OUString aPrefix; Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey( OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) ); @@ -847,6 +850,15 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) ); if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII ) aLocation = xLocationKey->getAsciiValue(); + + Reference<XRegistryKey > xPrefixKey = xImplementationKey->openKey( + OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) ); + if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII ) + { + aPrefix = xPrefixKey->getAsciiValue(); + if( aPrefix.getLength() != 0 ) + aPrefix = aPrefix + OUSTR("_"); + } } else { @@ -881,6 +893,17 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() Reference<XInterface > x = xSMgr->createInstance( aActivatorName ); Reference<XImplementationLoader > xLoader( x, UNO_QUERY ); Reference<XInterface > xMF; + if( aActivatorName == OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) ) + { + try + { + return loadSharedLibComponentFactory( bootstrap_expandUri( aLocation ), OUString(), aImplementationName, xSMgr, xImplementationKey, aPrefix ); + } + catch ( IllegalArgumentException & e ) + { + throw RuntimeException( e.Message, e.Context ); + } + } if (xLoader.is()) { xFactory = xLoader->activate( aImplementationName, aActivatorUrl, aLocation, xImplementationKey ); diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map index 7017d274c95d..156fcc12f28f 100644 --- a/cppuhelper/source/gcc3.map +++ b/cppuhelper/source/gcc3.map @@ -158,6 +158,7 @@ _ZN4cppu28createSingleComponentFactoryEPFN3com3sun4star3uno9ReferenceINS3_10XInt _ZN4cppu29WeakComponentImplHelper_queryERKN3com3sun4star3uno4TypeEPNS_10class_dataEPvPNS_27WeakComponentImplHelperBaseE; _ZN4cppu29installTypeDescriptionManagerERKN3com3sun4star3uno9ReferenceINS2_9container23XHierarchicalNameAccessEEE; _ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEE; +_ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEES3_; _ZN4cppu30ImplHelper_getImplementationIdEPNS_10class_dataE; _ZN4cppu30WeakAggComponentImplHelperBase14queryInterfaceERKN3com3sun4star3uno4TypeE; _ZN4cppu30WeakAggComponentImplHelperBase16addEventListenerERKN3com3sun4star3uno9ReferenceINS3_4lang14XEventListenerEEE; diff --git a/cppuhelper/source/gcc3os2.map b/cppuhelper/source/gcc3os2.map index 681a076cee79..5bd0ec5d1787 100644 --- a/cppuhelper/source/gcc3os2.map +++ b/cppuhelper/source/gcc3os2.map @@ -158,6 +158,7 @@ _ZN4cppu28createSingleComponentFactoryEPFN3com3sun4star3uno9ReferenceINS3_10XInt _ZN4cppu29WeakComponentImplHelper_queryERKN3com3sun4star3uno4TypeEPNS_10class_dataEPvPNS_27WeakComponentImplHelperBaseE; _ZN4cppu29installTypeDescriptionManagerERKN3com3sun4star3uno9ReferenceINS2_9container23XHierarchicalNameAccessEEE; _ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEE; +_ZN4cppu29loadSharedLibComponentFactoryERKN3rtl8OUStringES3_S3_RKN3com3sun4star3uno9ReferenceINS6_4lang20XMultiServiceFactoryEEERKNS8_INS6_8registry12XRegistryKeyEEES3_; _ZN4cppu30ImplHelper_getImplementationIdEPNS_10class_dataE; _ZN4cppu30WeakAggComponentImplHelperBase14queryInterfaceERKN3com3sun4star3uno4TypeE; _ZN4cppu30WeakAggComponentImplHelperBase16addEventListenerERKN3com3sun4star3uno9ReferenceINS3_4lang14XEventListenerEEE; diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index a7fd2241344a..f10548282c18 100755 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -162,7 +162,11 @@ SHL1STDLIBS += $(ADVAPI32LIB) .ENDIF SHL1DEPN= +.IF "$(COM)" == "MSC" SHL1IMPLIB=i$(TARGET) +.ELSE +SHL1IMPLIB=uno_$(TARGET)$(COMID) +.ENDIF SHL1OBJS = $(SLOFILES) SHL1RPATH=URELIB diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map index 7069276e2baa..fef204f3647a 100644 --- a/cppuhelper/source/msvc_win32_intel.map +++ b/cppuhelper/source/msvc_win32_intel.map @@ -125,6 +125,7 @@ GetVersionInfo; ??0OWeakObject@cppu@@QAE@XZ; ?installTypeDescriptionManager@cppu@@YAEABV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z; ?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z; +?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@0@Z; ?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PBUContextEntry_Init@1@JABV23456@@Z; ?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@ABVOUString@rtl@@@Z; ?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z; diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 544ba8c5d6fc..4df655bad33c 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -270,18 +270,16 @@ static OUString makeComponentPath( } //============================================================================== -static OUString getLibEnv(OUString const & aModulePath, - oslModule lib, +static OUString getLibEnv(oslModule lib, uno::Environment * pEnv, OUString * pSourceEnv_name, uno::Environment const & cTargetEnv, - OUString const & cImplName = OUString()) + OUString const & cImplName = OUString(), + OUString const & rPrefix = OUString()) { - OUString aExcMsg; - sal_Char const * pEnvTypeName = NULL; - OUString aGetEnvNameExt = OUSTR(COMPONENT_GETENVEXT); + OUString aGetEnvNameExt = rPrefix + OUSTR(COMPONENT_GETENVEXT); component_getImplementationEnvironmentExtFunc pGetImplEnvExt = (component_getImplementationEnvironmentExtFunc)osl_getFunctionSymbol(lib, aGetEnvNameExt.pData); @@ -292,20 +290,15 @@ static OUString getLibEnv(OUString const & aModulePath, } else { - OUString aGetEnvName = OUSTR(COMPONENT_GETENV); + OUString aGetEnvName = rPrefix + OUSTR(COMPONENT_GETENV); component_getImplementationEnvironmentFunc pGetImplEnv = (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( lib, aGetEnvName.pData ); if (pGetImplEnv) pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv); - else - { - aExcMsg = aModulePath; - aExcMsg += OUSTR(": cannot get symbol: "); - aExcMsg += aGetEnvName; - aExcMsg += OUSTR("- nor: "); - } + else // this symbol used to be mandatory, but is no longer + pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } if (!pEnv->is() && pEnvTypeName) @@ -327,10 +320,8 @@ static OUString getLibEnv(OUString const & aModulePath, } } while( nIndex != -1 ); } - } - - return aExcMsg; + return OUString(); } extern "C" {static void s_getFactory(va_list * pParam) @@ -344,6 +335,7 @@ extern "C" {static void s_getFactory(va_list * pParam) *ppSSF = pSym(pImplName->getStr(), pSMgr, pKey); }} +/* For backwards compatibility */ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( OUString const & rLibName, OUString const & rPath, OUString const & rImplName, @@ -351,6 +343,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( Reference< registry::XRegistryKey > const & xKey ) SAL_THROW( (loader::CannotActivateFactoryException) ) { + return loadSharedLibComponentFactory( rLibName, rPath, rImplName, xMgr, xKey, rtl::OUString() ); +} + +Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( + OUString const & rLibName, OUString const & rPath, + OUString const & rImplName, + Reference< lang::XMultiServiceFactory > const & xMgr, + Reference< registry::XRegistryKey > const & xKey, + OUString const & rPrefix ) + SAL_THROW( (loader::CannotActivateFactoryException) ) +{ OUString aModulePath( makeComponentPath( rLibName, rPath ) ); if (! checkAccessPath( &aModulePath )) { @@ -376,10 +379,10 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( OUString aEnvTypeName; - OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv, rImplName); + OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix); if (!aExcMsg.getLength()) { - OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY); + OUString aGetFactoryName = rPrefix + OUSTR(COMPONENT_GETFACTORY); oslGenericFunction pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData ); if (pSym != 0) { @@ -522,7 +525,7 @@ void SAL_CALL writeSharedLibComponentInfo( uno::Environment env; OUString aEnvTypeName; - OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv); + OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv); if (!aExcMsg.getLength()) { OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO); diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 95640a69447f..889b6b013d01 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -227,12 +227,6 @@ static struct ImplementationEntry g_entries[] = extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst index ca820871b3c3..72aed9e6609e 100644 --- a/cpputools/prj/build.lst +++ b/cpputools/prj/build.lst @@ -1,4 +1,4 @@ -pt cpputools : cppuhelper offuh LIBXML2:libxml2 NULL +pt cpputools : cppuhelper offapi LIBXML2:libxml2 NULL pt cpputools usr1 - all pt_mkout NULL pt cpputools\prj get - all pt_prj NULL pt cpputools\source\registercomponent nmake - all pt_regcomp NULL diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk index 7b85efddd58b..0f4232feadfe 100644 --- a/idlc/source/makefile.mk +++ b/idlc/source/makefile.mk @@ -37,12 +37,6 @@ INCPRE=$(MISC) # --- Settings ----------------------------------------------------- - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .INCLUDE : settings.mk # --- Files -------------------------------------------------------- diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk index 6afe98f5cb42..721a5cd3e703 100644 --- a/idlc/source/preproc/makefile.mk +++ b/idlc/source/preproc/makefile.mk @@ -38,11 +38,6 @@ LIBSALCPPRT=$(0) .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - # --- Files -------------------------------------------------------- OBJFILES= \ @@ -69,8 +64,10 @@ APP1OBJS=$(OBJ)$/cpp.obj APP1LIBS= $(LB)$/idlcpp.lib .IF "$(HAVE_GETOPT)" != "YES" -.IF "$(GUI)" == "WNT" +.IF "$(GUI)$(COM)" == "WNTMSC" APP1STDLIBS=gnu_getopt.lib +.ELIF "$(GUI)$(COM)" == "WNTGCC" +APP1STDLIBS=-lgnu_getopt .ENDIF .ENDIF diff --git a/io/prj/build.lst b/io/prj/build.lst index f2be62d2aa1e..eab94bf8c43f 100644 --- a/io/prj/build.lst +++ b/io/prj/build.lst @@ -1,4 +1,4 @@ -io io : LIBXSLT:libxslt rdbmaker NULL +io io : LIBXSLT:libxslt DESKTOP:rdbmaker NULL io io usr1 - all io_mkout NULL io io\inc nmake - all io_inc NULL io io\source\acceptor nmake - all io_acceptor io_connector io_inc NULL diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 9b2cbfeda57b..dc2b5744a7fc 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -507,12 +507,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 1f54a64d0633..bd4325ab11f2 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -305,12 +305,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index f68ffe07d634..899849f0c7ea 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -352,12 +352,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 192b97075fad..38a44eaa066a 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -264,12 +264,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx index 10e2c80e020f..8631a09eea74 100644 --- a/io/source/stm/factreg.cxx +++ b/io/source/stm/factreg.cxx @@ -105,12 +105,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/io/test/stm/exports.dxp b/io/test/stm/exports.dxp index ce95ae0f8deb..86214860d555 100644 --- a/io/test/stm/exports.dxp +++ b/io/test/stm/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_getFactory -component_writeInfo
\ No newline at end of file +component_writeInfo diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index 213c10a1f610..ebc5ffca2682 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -47,13 +47,6 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index 04bba081e37f..d962451459e5 100644 --- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java +++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java @@ -163,7 +163,7 @@ public class Bootstrap { /** Bootstraps the initial component context from a native UNO installation. - @see cppuhelper/defaultBootstrap_InitialComponentContext() + @see "cppuhelper/defaultBootstrap_InitialComponentContext()" */ static public final XComponentContext defaultBootstrap_InitialComponentContext() throws Exception @@ -177,7 +177,7 @@ public class Bootstrap { @param bootstrap_parameters bootstrap parameters (maybe null) - @see cppuhelper/defaultBootstrap_InitialComponentContext() + @see "cppuhelper/defaultBootstrap_InitialComponentContext()" */ static public final XComponentContext defaultBootstrap_InitialComponentContext( String ini_file, Hashtable bootstrap_parameters ) diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java index e077fe6bb9bd..64ed85d6d4c9 100644 --- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java +++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java @@ -39,7 +39,7 @@ import com.sun.star.registry.XRegistryKey; * service. * <p> * @see com.sun.star.loader.SharedLibrary - * @see com.sun.star.comp.servicemanager.ServiceManager + * @see "com.sun.star.comp.servicemanager.ServiceManager" * @see com.sun.star.lang.ServiceManager */ public class SharedLibraryLoader { diff --git a/jurt/source/pipe/wrapper/wrapper.c b/jurt/source/pipe/wrapper/wrapper.c index 0db29e492338..2d9489995a5d 100644 --- a/jurt/source/pipe/wrapper/wrapper.c +++ b/jurt/source/pipe/wrapper/wrapper.c @@ -30,7 +30,7 @@ #include <stddef.h> -#include <Windows.h> +#include <windows.h> #include "jni.h" #include "sal/types.h" diff --git a/jvmaccess/prj/build.lst b/jvmaccess/prj/build.lst index 73d99c7e0166..723c0a6ec6b8 100644 --- a/jvmaccess/prj/build.lst +++ b/jvmaccess/prj/build.lst @@ -1,4 +1,4 @@ -jv jvmaccess : offuh ridljar cppu sal salhelper NULL +jv jvmaccess : offapi ridljar cppu sal salhelper NULL jv jvmaccess usr1 - all jv_mkout NULL jv jvmaccess\source nmake - all jv_source NULL jv jvmaccess\util nmake - all jv_util jv_source NULL diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst index 42f019d625a2..56d9e83269e9 100644 --- a/jvmaccess/prj/d.lst +++ b/jvmaccess/prj/d.lst @@ -4,5 +4,5 @@ mkdir: %_DEST%\inc\jvmaccess ..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc\jvmaccess\virtualmachine.hxx ..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin\* ..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib\ijvmaccess.lib -..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib\* +..\%__SRC%\lib\libjvmaccess*.* %_DEST%\lib\* linklib: libjvmaccess*.*.* diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index 048a80469ffa..1d6106f8fb9e 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -43,7 +43,11 @@ SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) SHL1TARGET = $(TARGET)$(COMID) .ENDIF # UNIXVERSIONNAMES +.IF "$(COM)" == "MSC" SHL1IMPLIB = i$(TARGET) +.ELSE +SHL1IMPLIB = $(TARGET)$(COMID) +.ENDIF SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) .IF "$(OS)" == "WNT" diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 779ede709cae..09bc295ddb40 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -2,7 +2,7 @@ mkdir: %_DEST%\inc\jvmfwk ..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h ..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h ..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib -..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib\* +..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\* ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\* ..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\* ..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\* diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index bc067a1202c6..76ae22de6a44 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -58,7 +58,11 @@ SHL1TARGET = $(FRAMEWORKLIB) .ENDIF # UNIXVERSIONNAMES SHL1DEPN= +.IF "$(COM)" == "MSC" SHL1IMPLIB = i$(FRAMEWORKLIB) +.ELSE +SHL1IMPLIB = $(FRAMEWORKLIB) +.ENDIF SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB) SHL1RPATH = URELIB diff --git a/offapi/com/sun/star/deployment/test/makefile.mk b/offapi/Makefile index 2c00302497ae..a79aff831024 100644 --- a/offapi/com/sun/star/deployment/test/makefile.mk +++ b/offapi/Makefile @@ -25,17 +25,14 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -PRJNAME = api +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -TARGET = cssdeploymenttest -PACKAGE = com$/sun$/star$/deployment$/test +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - SmoketestCommandEnvironment.idl - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk +# vim: set noet sw=4 ts=4: diff --git a/offapi/util/target.pmk b/offapi/Module_offapi.mk index 5d9a389b2d96..76d56c30be00 100644 --- a/offapi/util/target.pmk +++ b/offapi/Module_offapi.mk @@ -25,9 +25,14 @@ # #************************************************************************* -$(OUT)$/misc$/$(TARGET).idls: makefile.mk - $(COMMAND_ECHO)-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@ -ALLTAR: $(OUT)$/misc$/$(TARGET).idls +$(eval $(call gb_Module_Module,offapi)) +$(eval $(call gb_Module_add_targets,offapi,\ + UnoApi_offapi \ + UnoApi_types \ + Package_offapi_idl \ + Package_offapi_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk new file mode 100644 index 000000000000..5dd2bcc821df --- /dev/null +++ b/offapi/Package_offapi_idl.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_autopackage_idl,offapi)) + diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk new file mode 100644 index 000000000000..0197ccd0932c --- /dev/null +++ b/offapi/Package_offapi_inc.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_autopackage_inc,offapi)) + diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk new file mode 100644 index 000000000000..a34cca9afa56 --- /dev/null +++ b/offapi/UnoApi_offapi.mk @@ -0,0 +1,3761 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi)) + +$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\ + udkapi \ +)) + +$(eval $(call gb_UnoApiTarget_set_include,offapi,\ + $$(INCLUDE) \ + -I$(SRCDIR)/offapi \ + -I$(OUTDIR)/idl \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,\ + offapi/com/sun/star/animations/TargetPropertiesCreator \ + offapi/com/sun/star/awt/AsyncCallback \ + offapi/com/sun/star/awt/ContainerWindowProvider \ + offapi/com/sun/star/awt/DialogProvider \ + offapi/com/sun/star/awt/DialogProvider2 \ + offapi/com/sun/star/awt/UnoControlDialogModelProvider \ + offapi/com/sun/star/awt/grid/DefaultGridDataModel \ + offapi/com/sun/star/awt/grid/SortableGridDataModel \ + offapi/com/sun/star/awt/tab/UnoControlTabPageModel \ + offapi/com/sun/star/awt/tree/MutableTreeDataModel \ + offapi/com/sun/star/awt/tree/MutableTreeNode \ + offapi/com/sun/star/awt/tree/TreeControl \ + offapi/com/sun/star/chart2/data/DatabaseDataProvider \ + offapi/com/sun/star/configuration/Update \ + offapi/com/sun/star/deployment/ExtensionManager \ + offapi/com/sun/star/deployment/PackageInformationProvider \ + offapi/com/sun/star/deployment/PackageRegistryBackend \ + offapi/com/sun/star/deployment/UpdateInformationProvider \ + offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment \ + offapi/com/sun/star/deployment/thePackageManagerFactory \ + offapi/com/sun/star/deployment/ui/LicenseDialog \ + offapi/com/sun/star/deployment/ui/PackageManagerDialog \ + offapi/com/sun/star/deployment/ui/UpdateRequiredDialog \ + offapi/com/sun/star/document/DocumentProperties \ + offapi/com/sun/star/document/DocumentRevisionListPersistence \ + offapi/com/sun/star/drawing/SlideRenderer \ + offapi/com/sun/star/drawing/SlideSorter \ + offapi/com/sun/star/drawing/framework/BasicPaneFactory \ + offapi/com/sun/star/drawing/framework/BasicToolBarFactory \ + offapi/com/sun/star/drawing/framework/BasicViewFactory \ + offapi/com/sun/star/drawing/framework/Configuration \ + offapi/com/sun/star/drawing/framework/ConfigurationController \ + offapi/com/sun/star/drawing/framework/ModuleController \ + offapi/com/sun/star/drawing/framework/ResourceId \ + offapi/com/sun/star/embed/DocumentCloser \ + offapi/com/sun/star/embed/InstanceLocker \ + offapi/com/sun/star/embed/OLESimpleStorage \ + offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel \ + offapi/com/sun/star/form/runtime/FormOperations \ + offapi/com/sun/star/graphic/GraphicObject \ + offapi/com/sun/star/inspection/DefaultHelpProvider \ + offapi/com/sun/star/inspection/GenericPropertyHandler \ + offapi/com/sun/star/inspection/ObjectInspector \ + offapi/com/sun/star/inspection/ObjectInspectorModel \ + offapi/com/sun/star/inspection/StringRepresentation \ + offapi/com/sun/star/linguistic2/Proofreader \ + offapi/com/sun/star/linguistic2/ProofreadingIterator \ + offapi/com/sun/star/logging/ConsoleHandler \ + offapi/com/sun/star/logging/CsvLogFormatter \ + offapi/com/sun/star/logging/DocumentIOLogRing \ + offapi/com/sun/star/logging/FileHandler \ + offapi/com/sun/star/logging/LoggerPool \ + offapi/com/sun/star/logging/PlainTextFormatter \ + offapi/com/sun/star/logging/SimpleLogRing \ + offapi/com/sun/star/mail/MailMessage \ + offapi/com/sun/star/mail/MailServiceProvider \ + offapi/com/sun/star/media/Manager \ + offapi/com/sun/star/oooimprovement/Core \ + offapi/com/sun/star/oooimprovement/CoreController \ + offapi/com/sun/star/presentation/SlideShow \ + offapi/com/sun/star/presentation/TransitionFactory \ + offapi/com/sun/star/rdf/BlankNode \ + offapi/com/sun/star/rdf/Literal \ + offapi/com/sun/star/rdf/Repository \ + offapi/com/sun/star/rdf/URI \ + offapi/com/sun/star/rendering/Canvas \ + offapi/com/sun/star/rendering/CanvasFactory \ + offapi/com/sun/star/rendering/MtfRenderer \ + offapi/com/sun/star/report/FixedLine \ + offapi/com/sun/star/report/FixedText \ + offapi/com/sun/star/report/FormatCondition \ + offapi/com/sun/star/report/FormattedField \ + offapi/com/sun/star/report/Function \ + offapi/com/sun/star/report/Group \ + offapi/com/sun/star/report/Groups \ + offapi/com/sun/star/report/ImageControl \ + offapi/com/sun/star/report/ReportControlFormat \ + offapi/com/sun/star/report/ReportControlModel \ + offapi/com/sun/star/report/ReportDefinition \ + offapi/com/sun/star/report/Section \ + offapi/com/sun/star/report/Shape \ + offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel \ + offapi/com/sun/star/resource/OfficeResourceLoader \ + offapi/com/sun/star/resource/StringResource \ + offapi/com/sun/star/resource/StringResourceWithLocation \ + offapi/com/sun/star/resource/StringResourceWithStorage \ + offapi/com/sun/star/script/DocumentDialogLibraryContainer \ + offapi/com/sun/star/script/DocumentScriptLibraryContainer \ + offapi/com/sun/star/script/provider/ScriptURIHelper \ + offapi/com/sun/star/script/vba/VBAEventProcessor \ + offapi/com/sun/star/script/vba/VBAMacroResolver \ + offapi/com/sun/star/sdb/DataAccessDescriptorFactory \ + offapi/com/sun/star/sdb/DatabaseInteractionHandler \ + offapi/com/sun/star/sdb/InteractionHandler \ + offapi/com/sun/star/sdb/application/CopyTableWizard \ + offapi/com/sun/star/sdbc/ConnectionPool \ + offapi/com/sun/star/security/CertificateContainer \ + offapi/com/sun/star/security/SerialNumberAdapter \ + offapi/com/sun/star/sheet/ExternalDocLink \ + offapi/com/sun/star/sheet/ExternalDocLinks \ + offapi/com/sun/star/sheet/ExternalSheetCache \ + offapi/com/sun/star/sheet/FilterFormulaParser \ + offapi/com/sun/star/sheet/FormulaOpCodeMapper \ + offapi/com/sun/star/sheet/Solver \ + offapi/com/sun/star/smarttags/SmartTagAction \ + offapi/com/sun/star/smarttags/SmartTagRecognizer \ + offapi/com/sun/star/task/InteractionRequestStringResolver \ + offapi/com/sun/star/task/OfficeRestartManager \ + offapi/com/sun/star/task/PasswordContainerInteractionHandler \ + offapi/com/sun/star/ucb/CommandEnvironment \ + offapi/com/sun/star/ui/GlobalAcceleratorConfiguration \ + offapi/com/sun/star/ui/WindowContentFactory \ + offapi/com/sun/star/ui/dialogs/Wizard \ + offapi/com/sun/star/util/JobManager \ + offapi/com/sun/star/util/UriAbbreviation \ + offapi/com/sun/star/xml/sax/FastShapeContextHandler \ + offapi/com/sun/star/xml/sax/FastTokenHandler \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,\ + offapi/com/sun/star/accessibility/AccessBridge \ + offapi/com/sun/star/accessibility/Accessible \ + offapi/com/sun/star/accessibility/AccessibleContext \ + offapi/com/sun/star/auth/SSOExceptions \ + offapi/com/sun/star/auth/SSOManagerFactory \ + offapi/com/sun/star/auth/SSOPasswordCache \ + offapi/com/sun/star/awt/AccessibleButton \ + offapi/com/sun/star/awt/AccessibleCheckBox \ + offapi/com/sun/star/awt/AccessibleComboBox \ + offapi/com/sun/star/awt/AccessibleDropDownComboBox \ + offapi/com/sun/star/awt/AccessibleDropDownListBox \ + offapi/com/sun/star/awt/AccessibleEdit \ + offapi/com/sun/star/awt/AccessibleFixedText \ + offapi/com/sun/star/awt/AccessibleIconChoiceControl \ + offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry \ + offapi/com/sun/star/awt/AccessibleList \ + offapi/com/sun/star/awt/AccessibleListBox \ + offapi/com/sun/star/awt/AccessibleListBoxList \ + offapi/com/sun/star/awt/AccessibleListItem \ + offapi/com/sun/star/awt/AccessibleMenu \ + offapi/com/sun/star/awt/AccessibleMenuBar \ + offapi/com/sun/star/awt/AccessibleMenuItem \ + offapi/com/sun/star/awt/AccessibleMenuSeparator \ + offapi/com/sun/star/awt/AccessiblePopupMenu \ + offapi/com/sun/star/awt/AccessibleRadioButton \ + offapi/com/sun/star/awt/AccessibleScrollBar \ + offapi/com/sun/star/awt/AccessibleStatusBar \ + offapi/com/sun/star/awt/AccessibleStatusBarItem \ + offapi/com/sun/star/awt/AccessibleTabBar \ + offapi/com/sun/star/awt/AccessibleTabBarPage \ + offapi/com/sun/star/awt/AccessibleTabBarPageList \ + offapi/com/sun/star/awt/AccessibleTabControl \ + offapi/com/sun/star/awt/AccessibleTabPage \ + offapi/com/sun/star/awt/AccessibleTextField \ + offapi/com/sun/star/awt/AccessibleToolBox \ + offapi/com/sun/star/awt/AccessibleToolBoxItem \ + offapi/com/sun/star/awt/AccessibleTreeListBox \ + offapi/com/sun/star/awt/AccessibleTreeListBoxEntry \ + offapi/com/sun/star/awt/AccessibleWindow \ + offapi/com/sun/star/awt/AnimatedImagesControl \ + offapi/com/sun/star/awt/AnimatedImagesControlModel \ + offapi/com/sun/star/awt/RoadmapItem \ + offapi/com/sun/star/awt/SpinningProgressControlModel \ + offapi/com/sun/star/awt/TabController \ + offapi/com/sun/star/awt/TabControllerModel \ + offapi/com/sun/star/awt/Toolkit \ + offapi/com/sun/star/awt/UnoControl \ + offapi/com/sun/star/awt/UnoControlButton \ + offapi/com/sun/star/awt/UnoControlButtonModel \ + offapi/com/sun/star/awt/UnoControlCheckBox \ + offapi/com/sun/star/awt/UnoControlCheckBoxModel \ + offapi/com/sun/star/awt/UnoControlComboBox \ + offapi/com/sun/star/awt/UnoControlComboBoxModel \ + offapi/com/sun/star/awt/UnoControlContainer \ + offapi/com/sun/star/awt/UnoControlContainerModel \ + offapi/com/sun/star/awt/UnoControlCurrencyField \ + offapi/com/sun/star/awt/UnoControlCurrencyFieldModel \ + offapi/com/sun/star/awt/UnoControlDateField \ + offapi/com/sun/star/awt/UnoControlDateFieldModel \ + offapi/com/sun/star/awt/UnoControlDialog \ + offapi/com/sun/star/awt/UnoControlDialogElement \ + offapi/com/sun/star/awt/UnoControlDialogModel \ + offapi/com/sun/star/awt/UnoControlEdit \ + offapi/com/sun/star/awt/UnoControlEditModel \ + offapi/com/sun/star/awt/UnoControlFileControl \ + offapi/com/sun/star/awt/UnoControlFileControlModel \ + offapi/com/sun/star/awt/UnoControlFixedHyperlink \ + offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel \ + offapi/com/sun/star/awt/UnoControlFixedLine \ + offapi/com/sun/star/awt/UnoControlFixedLineModel \ + offapi/com/sun/star/awt/UnoControlFixedText \ + offapi/com/sun/star/awt/UnoControlFixedTextModel \ + offapi/com/sun/star/awt/UnoControlFormattedField \ + offapi/com/sun/star/awt/UnoControlFormattedFieldModel \ + offapi/com/sun/star/awt/UnoControlGroupBox \ + offapi/com/sun/star/awt/UnoControlGroupBoxModel \ + offapi/com/sun/star/awt/UnoControlImageControl \ + offapi/com/sun/star/awt/UnoControlImageControlModel \ + offapi/com/sun/star/awt/UnoControlListBox \ + offapi/com/sun/star/awt/UnoControlListBoxModel \ + offapi/com/sun/star/awt/UnoControlModel \ + offapi/com/sun/star/awt/UnoControlNumericField \ + offapi/com/sun/star/awt/UnoControlNumericFieldModel \ + offapi/com/sun/star/awt/UnoControlPatternField \ + offapi/com/sun/star/awt/UnoControlPatternFieldModel \ + offapi/com/sun/star/awt/UnoControlProgressBar \ + offapi/com/sun/star/awt/UnoControlProgressBarModel \ + offapi/com/sun/star/awt/UnoControlRadioButton \ + offapi/com/sun/star/awt/UnoControlRadioButtonModel \ + offapi/com/sun/star/awt/UnoControlRoadmap \ + offapi/com/sun/star/awt/UnoControlRoadmapModel \ + offapi/com/sun/star/awt/UnoControlScrollBar \ + offapi/com/sun/star/awt/UnoControlScrollBarModel \ + offapi/com/sun/star/awt/UnoControlSimpleAnimation \ + offapi/com/sun/star/awt/UnoControlSimpleAnimationModel \ + offapi/com/sun/star/awt/UnoControlSpinButton \ + offapi/com/sun/star/awt/UnoControlSpinButtonModel \ + offapi/com/sun/star/awt/UnoControlThrobber \ + offapi/com/sun/star/awt/UnoControlThrobberModel \ + offapi/com/sun/star/awt/UnoControlTimeField \ + offapi/com/sun/star/awt/UnoControlTimeFieldModel \ + offapi/com/sun/star/awt/XLayoutFlowContainer \ + offapi/com/sun/star/awt/grid/UnoControlGrid \ + offapi/com/sun/star/awt/grid/UnoControlGridModel \ + offapi/com/sun/star/awt/tab/UnoControlTabPage \ + offapi/com/sun/star/awt/tab/UnoControlTabPageContainer \ + offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel \ + offapi/com/sun/star/awt/tree/TreeControlModel \ + offapi/com/sun/star/chart/AccessibleChartDocumentView \ + offapi/com/sun/star/chart/AccessibleChartElement \ + offapi/com/sun/star/chart/AreaDiagram \ + offapi/com/sun/star/chart/BarDiagram \ + offapi/com/sun/star/chart/BubbleDiagram \ + offapi/com/sun/star/chart/Chart3DBarProperties \ + offapi/com/sun/star/chart/ChartArea \ + offapi/com/sun/star/chart/ChartAxis \ + offapi/com/sun/star/chart/ChartAxisXSupplier \ + offapi/com/sun/star/chart/ChartAxisYSupplier \ + offapi/com/sun/star/chart/ChartAxisZSupplier \ + offapi/com/sun/star/chart/ChartData \ + offapi/com/sun/star/chart/ChartDataArray \ + offapi/com/sun/star/chart/ChartDataPointProperties \ + offapi/com/sun/star/chart/ChartDataRowProperties \ + offapi/com/sun/star/chart/ChartDocument \ + offapi/com/sun/star/chart/ChartGrid \ + offapi/com/sun/star/chart/ChartLegend \ + offapi/com/sun/star/chart/ChartLine \ + offapi/com/sun/star/chart/ChartPieSegmentProperties \ + offapi/com/sun/star/chart/ChartStatistics \ + offapi/com/sun/star/chart/ChartTableAddressSupplier \ + offapi/com/sun/star/chart/ChartTitle \ + offapi/com/sun/star/chart/ChartTwoAxisXSupplier \ + offapi/com/sun/star/chart/ChartTwoAxisYSupplier \ + offapi/com/sun/star/chart/Diagram \ + offapi/com/sun/star/chart/Dim3DDiagram \ + offapi/com/sun/star/chart/DonutDiagram \ + offapi/com/sun/star/chart/FilledNetDiagram \ + offapi/com/sun/star/chart/LineDiagram \ + offapi/com/sun/star/chart/NetDiagram \ + offapi/com/sun/star/chart/PieDiagram \ + offapi/com/sun/star/chart/StackableDiagram \ + offapi/com/sun/star/chart/StockDiagram \ + offapi/com/sun/star/chart/XYDiagram \ + offapi/com/sun/star/chart2/XFastPropertyState \ + offapi/com/sun/star/configuration/AccessRootElement \ + offapi/com/sun/star/configuration/AdministrationProvider \ + offapi/com/sun/star/configuration/ConfigurationAccess \ + offapi/com/sun/star/configuration/ConfigurationProvider \ + offapi/com/sun/star/configuration/ConfigurationRegistry \ + offapi/com/sun/star/configuration/ConfigurationUpdateAccess \ + offapi/com/sun/star/configuration/DefaultProvider \ + offapi/com/sun/star/configuration/GroupAccess \ + offapi/com/sun/star/configuration/GroupElement \ + offapi/com/sun/star/configuration/GroupUpdate \ + offapi/com/sun/star/configuration/HierarchyAccess \ + offapi/com/sun/star/configuration/HierarchyElement \ + offapi/com/sun/star/configuration/PropertyHierarchy \ + offapi/com/sun/star/configuration/SetAccess \ + offapi/com/sun/star/configuration/SetElement \ + offapi/com/sun/star/configuration/SetUpdate \ + offapi/com/sun/star/configuration/SimpleSetAccess \ + offapi/com/sun/star/configuration/SimpleSetUpdate \ + offapi/com/sun/star/configuration/UpdateRootElement \ + offapi/com/sun/star/configuration/backend/Backend \ + offapi/com/sun/star/configuration/backend/BackendAdapter \ + offapi/com/sun/star/configuration/backend/CopyImporter \ + offapi/com/sun/star/configuration/backend/DataImporter \ + offapi/com/sun/star/configuration/backend/HierarchyBrowser \ + offapi/com/sun/star/configuration/backend/Importer \ + offapi/com/sun/star/configuration/backend/InteractionHandler \ + offapi/com/sun/star/configuration/backend/Layer \ + offapi/com/sun/star/configuration/backend/LayerDescriber \ + offapi/com/sun/star/configuration/backend/LayerFilter \ + offapi/com/sun/star/configuration/backend/LayerUpdateMerger \ + offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum \ + offapi/com/sun/star/configuration/backend/LdapSingleBackend \ + offapi/com/sun/star/configuration/backend/LdapSingleStratum \ + offapi/com/sun/star/configuration/backend/LocalDataImporter \ + offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser \ + offapi/com/sun/star/configuration/backend/LocalSchemaSupplier \ + offapi/com/sun/star/configuration/backend/LocalSingleBackend \ + offapi/com/sun/star/configuration/backend/LocalSingleStratum \ + offapi/com/sun/star/configuration/backend/MergeImporter \ + offapi/com/sun/star/configuration/backend/MultiLayerStratum \ + offapi/com/sun/star/configuration/backend/MultiStratumBackend \ + offapi/com/sun/star/configuration/backend/OfflineBackend \ + offapi/com/sun/star/configuration/backend/OnlineBackend \ + offapi/com/sun/star/configuration/backend/PlatformBackend \ + offapi/com/sun/star/configuration/backend/Schema \ + offapi/com/sun/star/configuration/backend/SchemaSupplier \ + offapi/com/sun/star/configuration/backend/SingleBackend \ + offapi/com/sun/star/configuration/backend/SingleBackendAdapter \ + offapi/com/sun/star/configuration/backend/SingleLayerStratum \ + offapi/com/sun/star/configuration/backend/SystemIntegration \ + offapi/com/sun/star/configuration/backend/UpdatableLayer \ + offapi/com/sun/star/configuration/backend/xml/LayerParser \ + offapi/com/sun/star/configuration/backend/xml/LayerWriter \ + offapi/com/sun/star/configuration/backend/xml/SchemaParser \ + offapi/com/sun/star/configuration/bootstrap/BootstrapContext \ + offapi/com/sun/star/datatransfer/DataFormatTranslator \ + offapi/com/sun/star/datatransfer/MimeContentTypeFactory \ + offapi/com/sun/star/datatransfer/clipboard/ClipboardManager \ + offapi/com/sun/star/datatransfer/clipboard/GenericClipboard \ + offapi/com/sun/star/datatransfer/clipboard/SystemClipboard \ + offapi/com/sun/star/datatransfer/dnd/OleDragSource \ + offapi/com/sun/star/datatransfer/dnd/OleDropTarget \ + offapi/com/sun/star/datatransfer/dnd/X11DragSource \ + offapi/com/sun/star/datatransfer/dnd/X11DropTarget \ + offapi/com/sun/star/document/DocumentInfo \ + offapi/com/sun/star/document/EventDescriptor \ + offapi/com/sun/star/document/Events \ + offapi/com/sun/star/document/ExportFilter \ + offapi/com/sun/star/document/ExtendedTypeDetection \ + offapi/com/sun/star/document/ExtendedTypeDetectionFactory \ + offapi/com/sun/star/document/FilterAdapter \ + offapi/com/sun/star/document/FilterFactory \ + offapi/com/sun/star/document/HeaderFooterSettings \ + offapi/com/sun/star/document/ImportFilter \ + offapi/com/sun/star/document/LinkTarget \ + offapi/com/sun/star/document/LinkTargets \ + offapi/com/sun/star/document/MediaDescriptor \ + offapi/com/sun/star/document/OfficeDocument \ + offapi/com/sun/star/document/OleEmbeddedServerRegistration \ + offapi/com/sun/star/document/PDFDialog \ + offapi/com/sun/star/document/Settings \ + offapi/com/sun/star/document/StandaloneDocumentInfo \ + offapi/com/sun/star/document/TypeDetection \ + offapi/com/sun/star/drawing/AccessibleDrawDocumentView \ + offapi/com/sun/star/drawing/AccessibleGraphControl \ + offapi/com/sun/star/drawing/AccessibleGraphicShape \ + offapi/com/sun/star/drawing/AccessibleOLEShape \ + offapi/com/sun/star/drawing/AccessibleShape \ + offapi/com/sun/star/drawing/AccessibleSlideView \ + offapi/com/sun/star/drawing/AccessibleSlideViewObject \ + offapi/com/sun/star/drawing/AppletShape \ + offapi/com/sun/star/drawing/Background \ + offapi/com/sun/star/drawing/BitmapTable \ + offapi/com/sun/star/drawing/CaptionShape \ + offapi/com/sun/star/drawing/ClosedBezierShape \ + offapi/com/sun/star/drawing/ConnectorProperties \ + offapi/com/sun/star/drawing/ConnectorShape \ + offapi/com/sun/star/drawing/ControlShape \ + offapi/com/sun/star/drawing/CustomShape \ + offapi/com/sun/star/drawing/CustomShapeEngine \ + offapi/com/sun/star/drawing/DashTable \ + offapi/com/sun/star/drawing/Defaults \ + offapi/com/sun/star/drawing/DocumentSettings \ + offapi/com/sun/star/drawing/DrawPage \ + offapi/com/sun/star/drawing/DrawPages \ + offapi/com/sun/star/drawing/DrawingDocument \ + offapi/com/sun/star/drawing/DrawingDocumentDrawView \ + offapi/com/sun/star/drawing/DrawingDocumentFactory \ + offapi/com/sun/star/drawing/EllipseShape \ + offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion \ + offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry \ + offapi/com/sun/star/drawing/EnhancedCustomShapeHandle \ + offapi/com/sun/star/drawing/EnhancedCustomShapePath \ + offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath \ + offapi/com/sun/star/drawing/FillProperties \ + offapi/com/sun/star/drawing/GenericDrawPage \ + offapi/com/sun/star/drawing/GenericDrawingDocument \ + offapi/com/sun/star/drawing/GradientTable \ + offapi/com/sun/star/drawing/GraphicExportFilter \ + offapi/com/sun/star/drawing/GraphicObjectShape \ + offapi/com/sun/star/drawing/GroupShape \ + offapi/com/sun/star/drawing/HatchTable \ + offapi/com/sun/star/drawing/Layer \ + offapi/com/sun/star/drawing/LayerManager \ + offapi/com/sun/star/drawing/LineProperties \ + offapi/com/sun/star/drawing/LineShape \ + offapi/com/sun/star/drawing/MarkerTable \ + offapi/com/sun/star/drawing/MasterPage \ + offapi/com/sun/star/drawing/MasterPages \ + offapi/com/sun/star/drawing/MeasureProperties \ + offapi/com/sun/star/drawing/MeasureShape \ + offapi/com/sun/star/drawing/OLE2Shape \ + offapi/com/sun/star/drawing/OpenBezierShape \ + offapi/com/sun/star/drawing/PageShape \ + offapi/com/sun/star/drawing/PluginShape \ + offapi/com/sun/star/drawing/PolyLineShape \ + offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor \ + offapi/com/sun/star/drawing/PolyPolygonBezierShape \ + offapi/com/sun/star/drawing/PolyPolygonDescriptor \ + offapi/com/sun/star/drawing/PolyPolygonShape \ + offapi/com/sun/star/drawing/RectangleShape \ + offapi/com/sun/star/drawing/RotationDescriptor \ + offapi/com/sun/star/drawing/ShadowProperties \ + offapi/com/sun/star/drawing/Shape \ + offapi/com/sun/star/drawing/ShapeCollection \ + offapi/com/sun/star/drawing/Shapes \ + offapi/com/sun/star/drawing/Text \ + offapi/com/sun/star/drawing/TextProperties \ + offapi/com/sun/star/drawing/TextShape \ + offapi/com/sun/star/drawing/TransparencyGradientTable \ + offapi/com/sun/star/embed/BaseStorage \ + offapi/com/sun/star/embed/EmbeddedObjectDescriptor \ + offapi/com/sun/star/embed/FileSystemStorage \ + offapi/com/sun/star/embed/FileSystemStorageFactory \ + offapi/com/sun/star/embed/Storage \ + offapi/com/sun/star/embed/StorageFactory \ + offapi/com/sun/star/embed/StorageStream \ + offapi/com/sun/star/form/DataAwareControlModel \ + offapi/com/sun/star/form/FormComponent \ + offapi/com/sun/star/form/FormComponents \ + offapi/com/sun/star/form/FormControlModel \ + offapi/com/sun/star/form/FormController \ + offapi/com/sun/star/form/FormControllerDispatcher \ + offapi/com/sun/star/form/Forms \ + offapi/com/sun/star/form/PropertyBrowserController \ + offapi/com/sun/star/form/binding/BindableControlModel \ + offapi/com/sun/star/form/binding/BindableDataAwareControlModel \ + offapi/com/sun/star/form/binding/BindableDatabaseCheckBox \ + offapi/com/sun/star/form/binding/BindableDatabaseComboBox \ + offapi/com/sun/star/form/binding/BindableDatabaseDateField \ + offapi/com/sun/star/form/binding/BindableDatabaseFormattedField \ + offapi/com/sun/star/form/binding/BindableDatabaseListBox \ + offapi/com/sun/star/form/binding/BindableDatabaseNumericField \ + offapi/com/sun/star/form/binding/BindableDatabaseRadioButton \ + offapi/com/sun/star/form/binding/BindableDatabaseTextField \ + offapi/com/sun/star/form/binding/BindableDatabaseTimeField \ + offapi/com/sun/star/form/binding/BindableIntegerValueRange \ + offapi/com/sun/star/form/binding/ListEntrySource \ + offapi/com/sun/star/form/binding/ValueBinding \ + offapi/com/sun/star/form/component/CheckBox \ + offapi/com/sun/star/form/component/ComboBox \ + offapi/com/sun/star/form/component/CommandButton \ + offapi/com/sun/star/form/component/CurrencyField \ + offapi/com/sun/star/form/component/DataForm \ + offapi/com/sun/star/form/component/DatabaseCheckBox \ + offapi/com/sun/star/form/component/DatabaseComboBox \ + offapi/com/sun/star/form/component/DatabaseCurrencyField \ + offapi/com/sun/star/form/component/DatabaseDateField \ + offapi/com/sun/star/form/component/DatabaseFormattedField \ + offapi/com/sun/star/form/component/DatabaseImageControl \ + offapi/com/sun/star/form/component/DatabaseListBox \ + offapi/com/sun/star/form/component/DatabaseNumericField \ + offapi/com/sun/star/form/component/DatabasePatternField \ + offapi/com/sun/star/form/component/DatabaseRadioButton \ + offapi/com/sun/star/form/component/DatabaseTextField \ + offapi/com/sun/star/form/component/DatabaseTimeField \ + offapi/com/sun/star/form/component/DateField \ + offapi/com/sun/star/form/component/FileControl \ + offapi/com/sun/star/form/component/FixedText \ + offapi/com/sun/star/form/component/Form \ + offapi/com/sun/star/form/component/FormattedField \ + offapi/com/sun/star/form/component/GridControl \ + offapi/com/sun/star/form/component/GroupBox \ + offapi/com/sun/star/form/component/HTMLForm \ + offapi/com/sun/star/form/component/HiddenControl \ + offapi/com/sun/star/form/component/ImageButton \ + offapi/com/sun/star/form/component/ListBox \ + offapi/com/sun/star/form/component/NavigationToolBar \ + offapi/com/sun/star/form/component/NumericField \ + offapi/com/sun/star/form/component/PatternField \ + offapi/com/sun/star/form/component/RadioButton \ + offapi/com/sun/star/form/component/RichTextControl \ + offapi/com/sun/star/form/component/ScrollBar \ + offapi/com/sun/star/form/component/SpinButton \ + offapi/com/sun/star/form/component/SubmitButton \ + offapi/com/sun/star/form/component/TextField \ + offapi/com/sun/star/form/component/TimeField \ + offapi/com/sun/star/form/control/CheckBox \ + offapi/com/sun/star/form/control/ComboBox \ + offapi/com/sun/star/form/control/CommandButton \ + offapi/com/sun/star/form/control/CurrencyField \ + offapi/com/sun/star/form/control/DateField \ + offapi/com/sun/star/form/control/FormattedField \ + offapi/com/sun/star/form/control/GridControl \ + offapi/com/sun/star/form/control/GroupBox \ + offapi/com/sun/star/form/control/ImageButton \ + offapi/com/sun/star/form/control/ImageControl \ + offapi/com/sun/star/form/control/InteractionGridControl \ + offapi/com/sun/star/form/control/ListBox \ + offapi/com/sun/star/form/control/NavigationToolBar \ + offapi/com/sun/star/form/control/NumericField \ + offapi/com/sun/star/form/control/PatternField \ + offapi/com/sun/star/form/control/RadioButton \ + offapi/com/sun/star/form/control/SubmitButton \ + offapi/com/sun/star/form/control/TextField \ + offapi/com/sun/star/form/control/TimeField \ + offapi/com/sun/star/form/inspection/ButtonNavigationHandler \ + offapi/com/sun/star/form/inspection/CellBindingPropertyHandler \ + offapi/com/sun/star/form/inspection/EditPropertyHandler \ + offapi/com/sun/star/form/inspection/EventHandler \ + offapi/com/sun/star/form/inspection/FormComponentPropertyHandler \ + offapi/com/sun/star/form/inspection/SubmissionPropertyHandler \ + offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler \ + offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler \ + offapi/com/sun/star/form/modules \ + offapi/com/sun/star/form/runtime/FormController \ + offapi/com/sun/star/form/validation/ValidatableBindableControlModel \ + offapi/com/sun/star/form/validation/ValidatableControlModel \ + offapi/com/sun/star/formula/AccessibleFormulaText \ + offapi/com/sun/star/formula/AccessibleFormulaView \ + offapi/com/sun/star/formula/FormulaProperties \ + offapi/com/sun/star/frame/Components \ + offapi/com/sun/star/frame/ContentHandler \ + offapi/com/sun/star/frame/ContentHandlerFactory \ + offapi/com/sun/star/frame/Controller \ + offapi/com/sun/star/frame/Desktop \ + offapi/com/sun/star/frame/DesktopTask \ + offapi/com/sun/star/frame/DesktopTasks \ + offapi/com/sun/star/frame/DispatchHelper \ + offapi/com/sun/star/frame/DispatchProvider \ + offapi/com/sun/star/frame/DispatchRecorder \ + offapi/com/sun/star/frame/DispatchRecorderSupplier \ + offapi/com/sun/star/frame/DocumentTemplates \ + offapi/com/sun/star/frame/Frame \ + offapi/com/sun/star/frame/FrameControl \ + offapi/com/sun/star/frame/FrameLoader \ + offapi/com/sun/star/frame/FrameLoaderFactory \ + offapi/com/sun/star/frame/FramesContainer \ + offapi/com/sun/star/frame/LayoutManager \ + offapi/com/sun/star/frame/MediaTypeDetectionHelper \ + offapi/com/sun/star/frame/ModuleManager \ + offapi/com/sun/star/frame/PopupMenuController \ + offapi/com/sun/star/frame/PopupMenuControllerFactory \ + offapi/com/sun/star/frame/ProtocolHandler \ + offapi/com/sun/star/frame/SessionManager \ + offapi/com/sun/star/frame/Settings \ + offapi/com/sun/star/frame/StatusbarController \ + offapi/com/sun/star/frame/StatusbarControllerFactory \ + offapi/com/sun/star/frame/SynchronousFrameLoader \ + offapi/com/sun/star/frame/Task \ + offapi/com/sun/star/frame/TemplateAccess \ + offapi/com/sun/star/frame/ToolbarController \ + offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory \ + offapi/com/sun/star/gallery/GalleryItem \ + offapi/com/sun/star/gallery/GalleryTheme \ + offapi/com/sun/star/gallery/GalleryThemeProvider \ + offapi/com/sun/star/graphic/Graphic \ + offapi/com/sun/star/graphic/GraphicDescriptor \ + offapi/com/sun/star/graphic/GraphicProvider \ + offapi/com/sun/star/graphic/GraphicRendererVCL \ + offapi/com/sun/star/graphic/MediaProperties \ + offapi/com/sun/star/i18n/BreakIterator \ + offapi/com/sun/star/i18n/ChapterCollator \ + offapi/com/sun/star/i18n/CharacterClassification \ + offapi/com/sun/star/i18n/Collator \ + offapi/com/sun/star/i18n/IndexEntrySupplier \ + offapi/com/sun/star/i18n/InputSequenceChecker \ + offapi/com/sun/star/i18n/LocaleCalendar \ + offapi/com/sun/star/i18n/LocaleData \ + offapi/com/sun/star/i18n/NativeNumberSupplier \ + offapi/com/sun/star/i18n/NumberFormatMapper \ + offapi/com/sun/star/i18n/OrdinalSuffix \ + offapi/com/sun/star/i18n/TextConversion \ + offapi/com/sun/star/i18n/Transliteration \ + offapi/com/sun/star/image/ImageMap \ + offapi/com/sun/star/image/ImageMapCircleObject \ + offapi/com/sun/star/image/ImageMapObject \ + offapi/com/sun/star/image/ImageMapPolygonObject \ + offapi/com/sun/star/image/ImageMapRectangleObject \ + offapi/com/sun/star/installation/InstallationCheck \ + offapi/com/sun/star/installation/InstallationCheckService \ + offapi/com/sun/star/installation/InternetSettings \ + offapi/com/sun/star/installation/ProtocolHandlerCheck \ + offapi/com/sun/star/installation/ProtocolHandlerCheckService \ + offapi/com/sun/star/linguistic2/ConversionDictionary \ + offapi/com/sun/star/linguistic2/ConversionDictionaryList \ + offapi/com/sun/star/linguistic2/Dictionary \ + offapi/com/sun/star/linguistic2/DictionaryList \ + offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary \ + offapi/com/sun/star/linguistic2/Hyphenator \ + offapi/com/sun/star/linguistic2/LinguProperties \ + offapi/com/sun/star/linguistic2/LinguServiceManager \ + offapi/com/sun/star/linguistic2/SpellChecker \ + offapi/com/sun/star/linguistic2/Thesaurus \ + offapi/com/sun/star/modules \ + offapi/com/sun/star/mozilla/MenuProxy \ + offapi/com/sun/star/mozilla/MenuProxyListener \ + offapi/com/sun/star/mozilla/MozillaBootstrap \ + offapi/com/sun/star/packages/Package \ + offapi/com/sun/star/packages/PackageFolder \ + offapi/com/sun/star/packages/PackageFolderEnumeration \ + offapi/com/sun/star/packages/PackageStream \ + offapi/com/sun/star/packages/zip/ZipFileAccess \ + offapi/com/sun/star/plugin/PluginManager \ + offapi/com/sun/star/presentation/ChartShape \ + offapi/com/sun/star/presentation/CustomPresentation \ + offapi/com/sun/star/presentation/CustomPresentationAccess \ + offapi/com/sun/star/presentation/DateTimeShape \ + offapi/com/sun/star/presentation/DocumentSettings \ + offapi/com/sun/star/presentation/DrawPage \ + offapi/com/sun/star/presentation/FooterShape \ + offapi/com/sun/star/presentation/GraphicObjectShape \ + offapi/com/sun/star/presentation/HandoutShape \ + offapi/com/sun/star/presentation/HandoutView \ + offapi/com/sun/star/presentation/HeaderShape \ + offapi/com/sun/star/presentation/NotesShape \ + offapi/com/sun/star/presentation/NotesView \ + offapi/com/sun/star/presentation/OLE2Shape \ + offapi/com/sun/star/presentation/OutlineView \ + offapi/com/sun/star/presentation/OutlinerShape \ + offapi/com/sun/star/presentation/PageShape \ + offapi/com/sun/star/presentation/Presentation \ + offapi/com/sun/star/presentation/Presentation2 \ + offapi/com/sun/star/presentation/PresentationDocument \ + offapi/com/sun/star/presentation/PresentationView \ + offapi/com/sun/star/presentation/PreviewView \ + offapi/com/sun/star/presentation/Shape \ + offapi/com/sun/star/presentation/SlideNumberShape \ + offapi/com/sun/star/presentation/SlidesView \ + offapi/com/sun/star/presentation/SubtitleShape \ + offapi/com/sun/star/presentation/TitleTextShape \ + offapi/com/sun/star/presentation/textfield/DateTime \ + offapi/com/sun/star/presentation/textfield/Footer \ + offapi/com/sun/star/presentation/textfield/Header \ + offapi/com/sun/star/rendering/BitmapCanvas \ + offapi/com/sun/star/report/inspection/DataProviderHandler \ + offapi/com/sun/star/report/inspection/ReportComponentHandler \ + offapi/com/sun/star/report/modules \ + offapi/com/sun/star/scanner/ScannerManager \ + offapi/com/sun/star/script/browse/BrowseNode \ + offapi/com/sun/star/script/browse/BrowseNodeFactory \ + offapi/com/sun/star/script/provider/LanguageScriptProvider \ + offapi/com/sun/star/script/provider/MasterScriptProvider \ + offapi/com/sun/star/script/provider/MasterScriptProviderFactory \ + offapi/com/sun/star/script/provider/ScriptProvider \ + offapi/com/sun/star/script/provider/ScriptProviderForBasic \ + offapi/com/sun/star/script/provider/ScriptProviderForBeanShell \ + offapi/com/sun/star/script/provider/ScriptProviderForJava \ + offapi/com/sun/star/script/provider/ScriptProviderForJavaScript \ + offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor \ + offapi/com/sun/star/script/vba/VBATextEventProcessor \ + offapi/com/sun/star/sdb/CallableStatement \ + offapi/com/sun/star/sdb/Column \ + offapi/com/sun/star/sdb/ColumnDescriptorControl \ + offapi/com/sun/star/sdb/ColumnDescriptorControlModel \ + offapi/com/sun/star/sdb/ColumnSettings \ + offapi/com/sun/star/sdb/Connection \ + offapi/com/sun/star/sdb/ContentLoader \ + offapi/com/sun/star/sdb/DataAccessDescriptor \ + offapi/com/sun/star/sdb/DataColumn \ + offapi/com/sun/star/sdb/DataSettings \ + offapi/com/sun/star/sdb/DataSource \ + offapi/com/sun/star/sdb/DataSourceBrowser \ + offapi/com/sun/star/sdb/DatabaseAccess \ + offapi/com/sun/star/sdb/DatabaseAccessConnection \ + offapi/com/sun/star/sdb/DatabaseAccessContext \ + offapi/com/sun/star/sdb/DatabaseAccessDataSource \ + offapi/com/sun/star/sdb/DatabaseContext \ + offapi/com/sun/star/sdb/DatabaseDocument \ + offapi/com/sun/star/sdb/DatabaseEnvironment \ + offapi/com/sun/star/sdb/DatasourceAdministrationDialog \ + offapi/com/sun/star/sdb/DefinitionContainer \ + offapi/com/sun/star/sdb/DefinitionContent \ + offapi/com/sun/star/sdb/Document \ + offapi/com/sun/star/sdb/DocumentContainer \ + offapi/com/sun/star/sdb/DocumentDataSource \ + offapi/com/sun/star/sdb/DocumentDefinition \ + offapi/com/sun/star/sdb/ErrorMessageDialog \ + offapi/com/sun/star/sdb/Forms \ + offapi/com/sun/star/sdb/OfficeDatabaseDocument \ + offapi/com/sun/star/sdb/OrderColumn \ + offapi/com/sun/star/sdb/PreparedStatement \ + offapi/com/sun/star/sdb/Query \ + offapi/com/sun/star/sdb/QueryDefinition \ + offapi/com/sun/star/sdb/QueryDescriptor \ + offapi/com/sun/star/sdb/QueryDesign \ + offapi/com/sun/star/sdb/RelationDesign \ + offapi/com/sun/star/sdb/Reports \ + offapi/com/sun/star/sdb/ResultColumn \ + offapi/com/sun/star/sdb/ResultSet \ + offapi/com/sun/star/sdb/RowSet \ + offapi/com/sun/star/sdb/SQLQueryComposer \ + offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer \ + offapi/com/sun/star/sdb/SingleSelectQueryComposer \ + offapi/com/sun/star/sdb/Table \ + offapi/com/sun/star/sdb/TableDescriptor \ + offapi/com/sun/star/sdb/TableDesign \ + offapi/com/sun/star/sdb/application/DefaultViewController \ + offapi/com/sun/star/sdbc/CallableStatement \ + offapi/com/sun/star/sdbc/Connection \ + offapi/com/sun/star/sdbc/ConnectionProperties \ + offapi/com/sun/star/sdbc/DBASEConnectionProperties \ + offapi/com/sun/star/sdbc/Driver \ + offapi/com/sun/star/sdbc/DriverManager \ + offapi/com/sun/star/sdbc/FILEConnectionProperties \ + offapi/com/sun/star/sdbc/FLATConnectionProperties \ + offapi/com/sun/star/sdbc/JDBCConnectionProperties \ + offapi/com/sun/star/sdbc/ODBCConnectionProperties \ + offapi/com/sun/star/sdbc/PreparedStatement \ + offapi/com/sun/star/sdbc/ResultSet \ + offapi/com/sun/star/sdbc/RowSet \ + offapi/com/sun/star/sdbc/Statement \ + offapi/com/sun/star/sdbcx/Column \ + offapi/com/sun/star/sdbcx/ColumnDescriptor \ + offapi/com/sun/star/sdbcx/Container \ + offapi/com/sun/star/sdbcx/DatabaseDefinition \ + offapi/com/sun/star/sdbcx/Descriptor \ + offapi/com/sun/star/sdbcx/Driver \ + offapi/com/sun/star/sdbcx/Group \ + offapi/com/sun/star/sdbcx/GroupDescriptor \ + offapi/com/sun/star/sdbcx/Index \ + offapi/com/sun/star/sdbcx/IndexColumn \ + offapi/com/sun/star/sdbcx/IndexColumnDescriptor \ + offapi/com/sun/star/sdbcx/IndexDescriptor \ + offapi/com/sun/star/sdbcx/Key \ + offapi/com/sun/star/sdbcx/KeyColumn \ + offapi/com/sun/star/sdbcx/KeyColumnDescriptor \ + offapi/com/sun/star/sdbcx/KeyDescriptor \ + offapi/com/sun/star/sdbcx/PreparedStatement \ + offapi/com/sun/star/sdbcx/ReferenceColumn \ + offapi/com/sun/star/sdbcx/ResultSet \ + offapi/com/sun/star/sdbcx/Statement \ + offapi/com/sun/star/sdbcx/Table \ + offapi/com/sun/star/sdbcx/TableDescriptor \ + offapi/com/sun/star/sdbcx/User \ + offapi/com/sun/star/sdbcx/UserDescriptor \ + offapi/com/sun/star/sdbcx/View \ + offapi/com/sun/star/sdbcx/ViewDescriptor \ + offapi/com/sun/star/security/DocumentDigitalSignatures \ + offapi/com/sun/star/setup/ProductRegistration \ + offapi/com/sun/star/setup/Setup \ + offapi/com/sun/star/sheet/AccessibleCell \ + offapi/com/sun/star/sheet/AccessibleCsvCell \ + offapi/com/sun/star/sheet/AccessibleCsvRuler \ + offapi/com/sun/star/sheet/AccessibleCsvTable \ + offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView \ + offapi/com/sun/star/sheet/AccessibleSpreadsheet \ + offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView \ + offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView \ + offapi/com/sun/star/sheet/AddIn \ + offapi/com/sun/star/sheet/CellAnnotation \ + offapi/com/sun/star/sheet/CellAnnotationShape \ + offapi/com/sun/star/sheet/CellAnnotations \ + offapi/com/sun/star/sheet/CellAnnotationsEnumeration \ + offapi/com/sun/star/sheet/CellAreaLink \ + offapi/com/sun/star/sheet/CellAreaLinks \ + offapi/com/sun/star/sheet/CellAreaLinksEnumeration \ + offapi/com/sun/star/sheet/CellFormatRanges \ + offapi/com/sun/star/sheet/CellFormatRangesEnumeration \ + offapi/com/sun/star/sheet/Cells \ + offapi/com/sun/star/sheet/CellsEnumeration \ + offapi/com/sun/star/sheet/ConsolidationDescriptor \ + offapi/com/sun/star/sheet/DDELink \ + offapi/com/sun/star/sheet/DDELinks \ + offapi/com/sun/star/sheet/DDELinksEnumeration \ + offapi/com/sun/star/sheet/DataPilotDescriptor \ + offapi/com/sun/star/sheet/DataPilotField \ + offapi/com/sun/star/sheet/DataPilotFieldGroup \ + offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration \ + offapi/com/sun/star/sheet/DataPilotFieldGroupItem \ + offapi/com/sun/star/sheet/DataPilotFieldGroups \ + offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration \ + offapi/com/sun/star/sheet/DataPilotFields \ + offapi/com/sun/star/sheet/DataPilotFieldsEnumeration \ + offapi/com/sun/star/sheet/DataPilotItem \ + offapi/com/sun/star/sheet/DataPilotItems \ + offapi/com/sun/star/sheet/DataPilotItemsEnumeration \ + offapi/com/sun/star/sheet/DataPilotSource \ + offapi/com/sun/star/sheet/DataPilotSourceDimension \ + offapi/com/sun/star/sheet/DataPilotSourceDimensions \ + offapi/com/sun/star/sheet/DataPilotSourceHierarchies \ + offapi/com/sun/star/sheet/DataPilotSourceHierarchy \ + offapi/com/sun/star/sheet/DataPilotSourceLevel \ + offapi/com/sun/star/sheet/DataPilotSourceLevels \ + offapi/com/sun/star/sheet/DataPilotSourceMember \ + offapi/com/sun/star/sheet/DataPilotSourceMembers \ + offapi/com/sun/star/sheet/DataPilotTable \ + offapi/com/sun/star/sheet/DataPilotTables \ + offapi/com/sun/star/sheet/DataPilotTablesEnumeration \ + offapi/com/sun/star/sheet/DatabaseImportDescriptor \ + offapi/com/sun/star/sheet/DatabaseRange \ + offapi/com/sun/star/sheet/DatabaseRanges \ + offapi/com/sun/star/sheet/DatabaseRangesEnumeration \ + offapi/com/sun/star/sheet/DocumentSettings \ + offapi/com/sun/star/sheet/FormulaParser \ + offapi/com/sun/star/sheet/FunctionAccess \ + offapi/com/sun/star/sheet/FunctionDescription \ + offapi/com/sun/star/sheet/FunctionDescriptionEnumeration \ + offapi/com/sun/star/sheet/FunctionDescriptions \ + offapi/com/sun/star/sheet/GlobalSheetSettings \ + offapi/com/sun/star/sheet/HeaderFooterContent \ + offapi/com/sun/star/sheet/LabelRange \ + offapi/com/sun/star/sheet/LabelRanges \ + offapi/com/sun/star/sheet/LabelRangesEnumeration \ + offapi/com/sun/star/sheet/NamedRange \ + offapi/com/sun/star/sheet/NamedRanges \ + offapi/com/sun/star/sheet/NamedRangesEnumeration \ + offapi/com/sun/star/sheet/RangeSelectionArguments \ + offapi/com/sun/star/sheet/RecentFunctions \ + offapi/com/sun/star/sheet/Scenario \ + offapi/com/sun/star/sheet/Scenarios \ + offapi/com/sun/star/sheet/ScenariosEnumeration \ + offapi/com/sun/star/sheet/Shape \ + offapi/com/sun/star/sheet/SheetCell \ + offapi/com/sun/star/sheet/SheetCellCursor \ + offapi/com/sun/star/sheet/SheetCellRange \ + offapi/com/sun/star/sheet/SheetCellRanges \ + offapi/com/sun/star/sheet/SheetCellRangesEnumeration \ + offapi/com/sun/star/sheet/SheetFilterDescriptor \ + offapi/com/sun/star/sheet/SheetLink \ + offapi/com/sun/star/sheet/SheetLinks \ + offapi/com/sun/star/sheet/SheetLinksEnumeration \ + offapi/com/sun/star/sheet/SheetRangesQuery \ + offapi/com/sun/star/sheet/SheetSortDescriptor \ + offapi/com/sun/star/sheet/SheetSortDescriptor2 \ + offapi/com/sun/star/sheet/Spreadsheet \ + offapi/com/sun/star/sheet/SpreadsheetDocument \ + offapi/com/sun/star/sheet/SpreadsheetDocumentSettings \ + offapi/com/sun/star/sheet/SpreadsheetDrawPage \ + offapi/com/sun/star/sheet/SpreadsheetView \ + offapi/com/sun/star/sheet/SpreadsheetViewPane \ + offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration \ + offapi/com/sun/star/sheet/SpreadsheetViewSettings \ + offapi/com/sun/star/sheet/Spreadsheets \ + offapi/com/sun/star/sheet/SpreadsheetsEnumeration \ + offapi/com/sun/star/sheet/SubTotalDescriptor \ + offapi/com/sun/star/sheet/SubTotalField \ + offapi/com/sun/star/sheet/SubTotalFieldsEnumeration \ + offapi/com/sun/star/sheet/TableAutoFormat \ + offapi/com/sun/star/sheet/TableAutoFormatEnumeration \ + offapi/com/sun/star/sheet/TableAutoFormatField \ + offapi/com/sun/star/sheet/TableAutoFormats \ + offapi/com/sun/star/sheet/TableAutoFormatsEnumeration \ + offapi/com/sun/star/sheet/TableCellStyle \ + offapi/com/sun/star/sheet/TableConditionalEntry \ + offapi/com/sun/star/sheet/TableConditionalEntryEnumeration \ + offapi/com/sun/star/sheet/TableConditionalFormat \ + offapi/com/sun/star/sheet/TablePageStyle \ + offapi/com/sun/star/sheet/TableValidation \ + offapi/com/sun/star/sheet/UniqueCellFormatRanges \ + offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration \ + offapi/com/sun/star/sheet/VolatileResult \ + offapi/com/sun/star/style/CellStyle \ + offapi/com/sun/star/style/CharacterProperties \ + offapi/com/sun/star/style/CharacterPropertiesAsian \ + offapi/com/sun/star/style/CharacterPropertiesComplex \ + offapi/com/sun/star/style/CharacterStyle \ + offapi/com/sun/star/style/NumberingAlignment \ + offapi/com/sun/star/style/NumberingLevel \ + offapi/com/sun/star/style/NumberingRule \ + offapi/com/sun/star/style/PageProperties \ + offapi/com/sun/star/style/PageStyle \ + offapi/com/sun/star/style/ParagraphProperties \ + offapi/com/sun/star/style/ParagraphPropertiesAsian \ + offapi/com/sun/star/style/ParagraphPropertiesComplex \ + offapi/com/sun/star/style/ParagraphStyle \ + offapi/com/sun/star/style/Style \ + offapi/com/sun/star/style/StyleFamilies \ + offapi/com/sun/star/style/StyleFamily \ + offapi/com/sun/star/sync/SyncCollector \ + offapi/com/sun/star/sync/Synchronizer \ + offapi/com/sun/star/system/ProxySettings \ + offapi/com/sun/star/system/SOffice52ProxySettings \ + offapi/com/sun/star/system/SimpleCommandMail \ + offapi/com/sun/star/system/SimpleSystemMail \ + offapi/com/sun/star/system/SystemProxySettings \ + offapi/com/sun/star/system/SystemShellExecute \ + offapi/com/sun/star/table/AccessibleCellView \ + offapi/com/sun/star/table/AccessibleTableView \ + offapi/com/sun/star/table/Cell \ + offapi/com/sun/star/table/CellCursor \ + offapi/com/sun/star/table/CellProperties \ + offapi/com/sun/star/table/CellRange \ + offapi/com/sun/star/table/CellRangeListSource \ + offapi/com/sun/star/table/CellValueBinding \ + offapi/com/sun/star/table/ListPositionCellBinding \ + offapi/com/sun/star/table/TableChart \ + offapi/com/sun/star/table/TableCharts \ + offapi/com/sun/star/table/TableChartsEnumeration \ + offapi/com/sun/star/table/TableColumn \ + offapi/com/sun/star/table/TableColumns \ + offapi/com/sun/star/table/TableColumnsEnumeration \ + offapi/com/sun/star/table/TableRow \ + offapi/com/sun/star/table/TableRows \ + offapi/com/sun/star/table/TableRowsEnumeration \ + offapi/com/sun/star/table/TableSortDescriptor \ + offapi/com/sun/star/table/TableSortDescriptor2 \ + offapi/com/sun/star/task/AsyncJob \ + offapi/com/sun/star/task/InteractionHandler \ + offapi/com/sun/star/task/Job \ + offapi/com/sun/star/task/JobExecutor \ + offapi/com/sun/star/task/PasswordContainer \ + offapi/com/sun/star/text/AccessibleEndnoteView \ + offapi/com/sun/star/text/AccessibleFootnoteView \ + offapi/com/sun/star/text/AccessibleHeaderFooterView \ + offapi/com/sun/star/text/AccessiblePageView \ + offapi/com/sun/star/text/AccessibleParagraphView \ + offapi/com/sun/star/text/AccessibleTextDocumentPageView \ + offapi/com/sun/star/text/AccessibleTextDocumentView \ + offapi/com/sun/star/text/AccessibleTextEmbeddedObject \ + offapi/com/sun/star/text/AccessibleTextFrameView \ + offapi/com/sun/star/text/AccessibleTextGraphicObject \ + offapi/com/sun/star/text/AdvancedTextDocument \ + offapi/com/sun/star/text/AutoTextContainer \ + offapi/com/sun/star/text/AutoTextEntry \ + offapi/com/sun/star/text/AutoTextGroup \ + offapi/com/sun/star/text/BaseFrame \ + offapi/com/sun/star/text/BaseFrameProperties \ + offapi/com/sun/star/text/BaseIndex \ + offapi/com/sun/star/text/BaseIndexMark \ + offapi/com/sun/star/text/Bibliography \ + offapi/com/sun/star/text/Bookmark \ + offapi/com/sun/star/text/Bookmarks \ + offapi/com/sun/star/text/Cell \ + offapi/com/sun/star/text/CellProperties \ + offapi/com/sun/star/text/CellRange \ + offapi/com/sun/star/text/ChainedTextFrame \ + offapi/com/sun/star/text/ChapterNumberingRule \ + offapi/com/sun/star/text/ContentIndex \ + offapi/com/sun/star/text/ContentIndexMark \ + offapi/com/sun/star/text/DefaultNumberingProvider \ + offapi/com/sun/star/text/Defaults \ + offapi/com/sun/star/text/DependentTextField \ + offapi/com/sun/star/text/DocumentIndex \ + offapi/com/sun/star/text/DocumentIndexFormat \ + offapi/com/sun/star/text/DocumentIndexLevelFormat \ + offapi/com/sun/star/text/DocumentIndexMark \ + offapi/com/sun/star/text/DocumentIndexMarkAsian \ + offapi/com/sun/star/text/DocumentIndexParagraphStyles \ + offapi/com/sun/star/text/DocumentIndexes \ + offapi/com/sun/star/text/DocumentSettings \ + offapi/com/sun/star/text/Endnote \ + offapi/com/sun/star/text/EndnoteSettings \ + offapi/com/sun/star/text/Footnote \ + offapi/com/sun/star/text/FootnoteSettings \ + offapi/com/sun/star/text/Footnotes \ + offapi/com/sun/star/text/GenericTextDocument \ + offapi/com/sun/star/text/GlobalDocument \ + offapi/com/sun/star/text/GlobalSettings \ + offapi/com/sun/star/text/HypertextDocument \ + offapi/com/sun/star/text/IllustrationsIndex \ + offapi/com/sun/star/text/InContentMetadata \ + offapi/com/sun/star/text/LineNumberingProperties \ + offapi/com/sun/star/text/LineNumberingSettings \ + offapi/com/sun/star/text/MailMerge \ + offapi/com/sun/star/text/NumberingLevel \ + offapi/com/sun/star/text/NumberingRules \ + offapi/com/sun/star/text/NumberingStyle \ + offapi/com/sun/star/text/ObjectIndex \ + offapi/com/sun/star/text/PageFootnoteInfo \ + offapi/com/sun/star/text/PagePrintSettings \ + offapi/com/sun/star/text/Paragraph \ + offapi/com/sun/star/text/ParagraphEnumeration \ + offapi/com/sun/star/text/PrintPreviewSettings \ + offapi/com/sun/star/text/PrintSettings \ + offapi/com/sun/star/text/RedlinePortion \ + offapi/com/sun/star/text/ReferenceMark \ + offapi/com/sun/star/text/ReferenceMarks \ + offapi/com/sun/star/text/Shape \ + offapi/com/sun/star/text/TableColumns \ + offapi/com/sun/star/text/TableIndex \ + offapi/com/sun/star/text/TableRows \ + offapi/com/sun/star/text/Text \ + offapi/com/sun/star/text/TextColumns \ + offapi/com/sun/star/text/TextContent \ + offapi/com/sun/star/text/TextContentCollection \ + offapi/com/sun/star/text/TextCursor \ + offapi/com/sun/star/text/TextDocument \ + offapi/com/sun/star/text/TextDocumentView \ + offapi/com/sun/star/text/TextEmbeddedObject \ + offapi/com/sun/star/text/TextEmbeddedObjects \ + offapi/com/sun/star/text/TextField \ + offapi/com/sun/star/text/TextFieldEnumeration \ + offapi/com/sun/star/text/TextFieldMaster \ + offapi/com/sun/star/text/TextFieldMasters \ + offapi/com/sun/star/text/TextFields \ + offapi/com/sun/star/text/TextFrame \ + offapi/com/sun/star/text/TextFrames \ + offapi/com/sun/star/text/TextGraphicObject \ + offapi/com/sun/star/text/TextGraphicObjects \ + offapi/com/sun/star/text/TextLayoutCursor \ + offapi/com/sun/star/text/TextPageStyle \ + offapi/com/sun/star/text/TextPortion \ + offapi/com/sun/star/text/TextPortionEnumeration \ + offapi/com/sun/star/text/TextRange \ + offapi/com/sun/star/text/TextRangeContentProperties \ + offapi/com/sun/star/text/TextRanges \ + offapi/com/sun/star/text/TextSection \ + offapi/com/sun/star/text/TextSections \ + offapi/com/sun/star/text/TextSortDescriptor \ + offapi/com/sun/star/text/TextSortDescriptor2 \ + offapi/com/sun/star/text/TextSortable \ + offapi/com/sun/star/text/TextTable \ + offapi/com/sun/star/text/TextTableCursor \ + offapi/com/sun/star/text/TextTableRow \ + offapi/com/sun/star/text/TextTables \ + offapi/com/sun/star/text/TextViewCursor \ + offapi/com/sun/star/text/UserDefinedIndex \ + offapi/com/sun/star/text/UserIndex \ + offapi/com/sun/star/text/UserIndexMark \ + offapi/com/sun/star/text/ViewSettings \ + offapi/com/sun/star/text/WebDocument \ + offapi/com/sun/star/text/fieldmaster/Bibliography \ + offapi/com/sun/star/text/fieldmaster/DDE \ + offapi/com/sun/star/text/fieldmaster/Database \ + offapi/com/sun/star/text/fieldmaster/SetExpression \ + offapi/com/sun/star/text/fieldmaster/User \ + offapi/com/sun/star/text/textfield/Annotation \ + offapi/com/sun/star/text/textfield/Author \ + offapi/com/sun/star/text/textfield/Bibliography \ + offapi/com/sun/star/text/textfield/Chapter \ + offapi/com/sun/star/text/textfield/CharacterCount \ + offapi/com/sun/star/text/textfield/CombinedCharacters \ + offapi/com/sun/star/text/textfield/ConditionalText \ + offapi/com/sun/star/text/textfield/DDE \ + offapi/com/sun/star/text/textfield/Database \ + offapi/com/sun/star/text/textfield/DatabaseName \ + offapi/com/sun/star/text/textfield/DatabaseNextSet \ + offapi/com/sun/star/text/textfield/DatabaseNumberOfSet \ + offapi/com/sun/star/text/textfield/DatabaseSetNumber \ + offapi/com/sun/star/text/textfield/DateTime \ + offapi/com/sun/star/text/textfield/DropDown \ + offapi/com/sun/star/text/textfield/EmbeddedObjectCount \ + offapi/com/sun/star/text/textfield/ExtendedUser \ + offapi/com/sun/star/text/textfield/FileName \ + offapi/com/sun/star/text/textfield/GetExpression \ + offapi/com/sun/star/text/textfield/GetReference \ + offapi/com/sun/star/text/textfield/GraphicObjectCount \ + offapi/com/sun/star/text/textfield/HiddenParagraph \ + offapi/com/sun/star/text/textfield/HiddenText \ + offapi/com/sun/star/text/textfield/Input \ + offapi/com/sun/star/text/textfield/InputUser \ + offapi/com/sun/star/text/textfield/JumpEdit \ + offapi/com/sun/star/text/textfield/Macro \ + offapi/com/sun/star/text/textfield/MetadataField \ + offapi/com/sun/star/text/textfield/PageCount \ + offapi/com/sun/star/text/textfield/PageNumber \ + offapi/com/sun/star/text/textfield/ParagraphCount \ + offapi/com/sun/star/text/textfield/ReferencePageGet \ + offapi/com/sun/star/text/textfield/ReferencePageSet \ + offapi/com/sun/star/text/textfield/Script \ + offapi/com/sun/star/text/textfield/SetExpression \ + offapi/com/sun/star/text/textfield/TableCount \ + offapi/com/sun/star/text/textfield/TableFormula \ + offapi/com/sun/star/text/textfield/TemplateName \ + offapi/com/sun/star/text/textfield/URL \ + offapi/com/sun/star/text/textfield/User \ + offapi/com/sun/star/text/textfield/WordCount \ + offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor \ + offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime \ + offapi/com/sun/star/text/textfield/docinfo/CreateAuthor \ + offapi/com/sun/star/text/textfield/docinfo/CreateDateTime \ + offapi/com/sun/star/text/textfield/docinfo/Custom \ + offapi/com/sun/star/text/textfield/docinfo/Description \ + offapi/com/sun/star/text/textfield/docinfo/EditTime \ + offapi/com/sun/star/text/textfield/docinfo/Info0 \ + offapi/com/sun/star/text/textfield/docinfo/Info1 \ + offapi/com/sun/star/text/textfield/docinfo/Info2 \ + offapi/com/sun/star/text/textfield/docinfo/Info3 \ + offapi/com/sun/star/text/textfield/docinfo/Keywords \ + offapi/com/sun/star/text/textfield/docinfo/PrintAuthor \ + offapi/com/sun/star/text/textfield/docinfo/PrintDateTime \ + offapi/com/sun/star/text/textfield/docinfo/Revision \ + offapi/com/sun/star/text/textfield/docinfo/Subject \ + offapi/com/sun/star/text/textfield/docinfo/Title \ + offapi/com/sun/star/ucb/AnyCompareFactory \ + offapi/com/sun/star/ucb/CachedContentResultSet \ + offapi/com/sun/star/ucb/CachedContentResultSetFactory \ + offapi/com/sun/star/ucb/CachedContentResultSetStub \ + offapi/com/sun/star/ucb/CachedContentResultSetStubFactory \ + offapi/com/sun/star/ucb/CachedDynamicResultSet \ + offapi/com/sun/star/ucb/CachedDynamicResultSetFactory \ + offapi/com/sun/star/ucb/CachedDynamicResultSetStub \ + offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory \ + offapi/com/sun/star/ucb/Content \ + offapi/com/sun/star/ucb/ContentProvider \ + offapi/com/sun/star/ucb/ContentProviderProxy \ + offapi/com/sun/star/ucb/ContentProviderProxyFactory \ + offapi/com/sun/star/ucb/ContentResultSet \ + offapi/com/sun/star/ucb/ContentTransmitter \ + offapi/com/sun/star/ucb/DefaultHierarchyDataSource \ + offapi/com/sun/star/ucb/DynamicResultSet \ + offapi/com/sun/star/ucb/ExpandContentProvider \ + offapi/com/sun/star/ucb/FTPContent \ + offapi/com/sun/star/ucb/FTPContentProvider \ + offapi/com/sun/star/ucb/FileContent \ + offapi/com/sun/star/ucb/FileContentProvider \ + offapi/com/sun/star/ucb/GIOContentProvider \ + offapi/com/sun/star/ucb/GnomeVFSContentProvider \ + offapi/com/sun/star/ucb/GnomeVFSDocumentContent \ + offapi/com/sun/star/ucb/GnomeVFSFolderContent \ + offapi/com/sun/star/ucb/HelpContent \ + offapi/com/sun/star/ucb/HelpContentProvider \ + offapi/com/sun/star/ucb/HierarchyContentProvider \ + offapi/com/sun/star/ucb/HierarchyDataReadAccess \ + offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess \ + offapi/com/sun/star/ucb/HierarchyDataSource \ + offapi/com/sun/star/ucb/HierarchyFolderContent \ + offapi/com/sun/star/ucb/HierarchyLinkContent \ + offapi/com/sun/star/ucb/HierarchyRootFolderContent \ + offapi/com/sun/star/ucb/ODMAContent \ + offapi/com/sun/star/ucb/ODMAContentProvider \ + offapi/com/sun/star/ucb/PackageContentProvider \ + offapi/com/sun/star/ucb/PackageFolderContent \ + offapi/com/sun/star/ucb/PackageStreamContent \ + offapi/com/sun/star/ucb/PersistentPropertySet \ + offapi/com/sun/star/ucb/PropertiesManager \ + offapi/com/sun/star/ucb/PropertySetRegistry \ + offapi/com/sun/star/ucb/RemoteAccessContentProvider \ + offapi/com/sun/star/ucb/RemoteContentProviderAcceptor \ + offapi/com/sun/star/ucb/RemoteProxyContentProvider \ + offapi/com/sun/star/ucb/SimpleFileAccess \ + offapi/com/sun/star/ucb/SortedDynamicResultSetFactory \ + offapi/com/sun/star/ucb/Store \ + offapi/com/sun/star/ucb/TransientDocumentsContentProvider \ + offapi/com/sun/star/ucb/TransientDocumentsDocumentContent \ + offapi/com/sun/star/ucb/TransientDocumentsFolderContent \ + offapi/com/sun/star/ucb/TransientDocumentsRootContent \ + offapi/com/sun/star/ucb/TransientDocumentsStreamContent \ + offapi/com/sun/star/ucb/UniversalContentBroker \ + offapi/com/sun/star/ucb/WebDAVContentProvider \ + offapi/com/sun/star/ucb/WebDAVDocumentContent \ + offapi/com/sun/star/ucb/WebDAVFolderContent \ + offapi/com/sun/star/ui/ActionTrigger \ + offapi/com/sun/star/ui/ActionTriggerContainer \ + offapi/com/sun/star/ui/ActionTriggerSeparator \ + offapi/com/sun/star/ui/ConfigurableUIElement \ + offapi/com/sun/star/ui/ItemDescriptor \ + offapi/com/sun/star/ui/ModuleUICategoryDescription \ + offapi/com/sun/star/ui/ModuleUICommandDescription \ + offapi/com/sun/star/ui/ModuleUIConfigurationManager \ + offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier \ + offapi/com/sun/star/ui/ModuleWindowStateConfiguration \ + offapi/com/sun/star/ui/UICategoryDescription \ + offapi/com/sun/star/ui/UICommandDescription \ + offapi/com/sun/star/ui/UIConfigurationManager \ + offapi/com/sun/star/ui/UIElement \ + offapi/com/sun/star/ui/UIElementFactory \ + offapi/com/sun/star/ui/UIElementFactoryManager \ + offapi/com/sun/star/ui/UIElementSettings \ + offapi/com/sun/star/ui/WindowStateConfiguration \ + offapi/com/sun/star/ui/dialogs/FilePicker \ + offapi/com/sun/star/ui/dialogs/FilterOptionsDialog \ + offapi/com/sun/star/ui/dialogs/FolderPicker \ + offapi/com/sun/star/util/NumberFormatProperties \ + offapi/com/sun/star/util/NumberFormatSettings \ + offapi/com/sun/star/util/NumberFormats \ + offapi/com/sun/star/util/NumberFormatsSupplier \ + offapi/com/sun/star/util/NumberFormatter \ + offapi/com/sun/star/util/OfficeInstallationDirectories \ + offapi/com/sun/star/util/PathSettings \ + offapi/com/sun/star/util/PathSubstitution \ + offapi/com/sun/star/util/ReplaceDescriptor \ + offapi/com/sun/star/util/SearchDescriptor \ + offapi/com/sun/star/util/SortDescriptor \ + offapi/com/sun/star/util/SortDescriptor2 \ + offapi/com/sun/star/util/Sortable \ + offapi/com/sun/star/util/TextSearch \ + offapi/com/sun/star/util/URLTransformer \ + offapi/com/sun/star/view/OfficeDocumentView \ + offapi/com/sun/star/view/PrintOptions \ + offapi/com/sun/star/view/PrintSettings \ + offapi/com/sun/star/view/PrinterDescriptor \ + offapi/com/sun/star/view/RenderDescriptor \ + offapi/com/sun/star/view/RenderOptions \ + offapi/com/sun/star/view/ViewSettings \ + offapi/com/sun/star/xforms/Binding \ + offapi/com/sun/star/xml/AttributeContainer \ + offapi/com/sun/star/xml/ExportFilter \ + offapi/com/sun/star/xml/ImportFilter \ + offapi/com/sun/star/xml/NamespaceContainer \ + offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier \ + offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier \ + offapi/com/sun/star/xml/UserDefinedAttributeSupplier \ + offapi/com/sun/star/xml/UserDefinedAttributesSupplier \ + offapi/com/sun/star/xml/XMLExportFilter \ + offapi/com/sun/star/xml/XMLImportFilter \ + offapi/com/sun/star/xml/crypto/SEInitializer \ + offapi/com/sun/star/xml/crypto/SecurityEnvironment \ + offapi/com/sun/star/xml/crypto/XMLEncryption \ + offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate \ + offapi/com/sun/star/xml/crypto/XMLSecurityContext \ + offapi/com/sun/star/xml/crypto/XMLSignature \ + offapi/com/sun/star/xml/crypto/XMLSignatureTemplate \ + offapi/com/sun/star/xml/crypto/sax/Decryptor \ + offapi/com/sun/star/xml/crypto/sax/Encryptor \ + offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper \ + offapi/com/sun/star/xml/crypto/sax/SignatureCreator \ + offapi/com/sun/star/xml/crypto/sax/SignatureVerifier \ + offapi/com/sun/star/xml/dom/SAXDocumentBuilder \ + offapi/com/sun/star/xml/input/SaxDocumentHandler \ + offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper \ + offapi/com/sun/star/xml/wrapper/XMLElementWrapper \ + offapi/com/sun/star/xml/xpath/XPathAPI \ + offapi/com/sun/star/xml/xpath/XPathExtension \ + offapi/com/sun/star/xsd/Boolean \ + offapi/com/sun/star/xsd/Date \ + offapi/com/sun/star/xsd/DateTime \ + offapi/com/sun/star/xsd/Day \ + offapi/com/sun/star/xsd/Decimal \ + offapi/com/sun/star/xsd/Month \ + offapi/com/sun/star/xsd/String \ + offapi/com/sun/star/xsd/Time \ + offapi/com/sun/star/xsd/Year \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,\ + offapi/com/sun/star/accessibility/AccessibleEventId \ + offapi/com/sun/star/accessibility/AccessibleEventObject \ + offapi/com/sun/star/accessibility/AccessibleRelation \ + offapi/com/sun/star/accessibility/AccessibleRelationType \ + offapi/com/sun/star/accessibility/AccessibleRole \ + offapi/com/sun/star/accessibility/AccessibleStateType \ + offapi/com/sun/star/accessibility/AccessibleTableModelChange \ + offapi/com/sun/star/accessibility/AccessibleTableModelChangeType \ + offapi/com/sun/star/accessibility/AccessibleTextType \ + offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException \ + offapi/com/sun/star/accessibility/TextSegment \ + offapi/com/sun/star/accessibility/XAccessible \ + offapi/com/sun/star/accessibility/XAccessibleAction \ + offapi/com/sun/star/accessibility/XAccessibleComponent \ + offapi/com/sun/star/accessibility/XAccessibleContext \ + offapi/com/sun/star/accessibility/XAccessibleEditableText \ + offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster \ + offapi/com/sun/star/accessibility/XAccessibleEventListener \ + offapi/com/sun/star/accessibility/XAccessibleExtendedComponent \ + offapi/com/sun/star/accessibility/XAccessibleHyperlink \ + offapi/com/sun/star/accessibility/XAccessibleHypertext \ + offapi/com/sun/star/accessibility/XAccessibleImage \ + offapi/com/sun/star/accessibility/XAccessibleKeyBinding \ + offapi/com/sun/star/accessibility/XAccessibleMultiLineText \ + offapi/com/sun/star/accessibility/XAccessibleRelationSet \ + offapi/com/sun/star/accessibility/XAccessibleSelection \ + offapi/com/sun/star/accessibility/XAccessibleStateSet \ + offapi/com/sun/star/accessibility/XAccessibleTable \ + offapi/com/sun/star/accessibility/XAccessibleText \ + offapi/com/sun/star/accessibility/XAccessibleTextAttributes \ + offapi/com/sun/star/accessibility/XAccessibleTextMarkup \ + offapi/com/sun/star/accessibility/XAccessibleValue \ + offapi/com/sun/star/animations/AnimationAdditiveMode \ + offapi/com/sun/star/animations/AnimationCalcMode \ + offapi/com/sun/star/animations/AnimationColorSpace \ + offapi/com/sun/star/animations/AnimationEndSync \ + offapi/com/sun/star/animations/AnimationFill \ + offapi/com/sun/star/animations/AnimationNodeType \ + offapi/com/sun/star/animations/AnimationRestart \ + offapi/com/sun/star/animations/AnimationTransformType \ + offapi/com/sun/star/animations/AnimationValueType \ + offapi/com/sun/star/animations/Event \ + offapi/com/sun/star/animations/EventTrigger \ + offapi/com/sun/star/animations/TargetProperties \ + offapi/com/sun/star/animations/TimeFilterPair \ + offapi/com/sun/star/animations/Timing \ + offapi/com/sun/star/animations/TransitionSubType \ + offapi/com/sun/star/animations/TransitionType \ + offapi/com/sun/star/animations/ValuePair \ + offapi/com/sun/star/animations/XAnimate \ + offapi/com/sun/star/animations/XAnimateColor \ + offapi/com/sun/star/animations/XAnimateMotion \ + offapi/com/sun/star/animations/XAnimateSet \ + offapi/com/sun/star/animations/XAnimateTransform \ + offapi/com/sun/star/animations/XAnimationListener \ + offapi/com/sun/star/animations/XAnimationNode \ + offapi/com/sun/star/animations/XAnimationNodeSupplier \ + offapi/com/sun/star/animations/XAudio \ + offapi/com/sun/star/animations/XCommand \ + offapi/com/sun/star/animations/XIterateContainer \ + offapi/com/sun/star/animations/XTargetPropertiesCreator \ + offapi/com/sun/star/animations/XTimeContainer \ + offapi/com/sun/star/animations/XTransitionFilter \ + offapi/com/sun/star/auth/AuthenticationFailedException \ + offapi/com/sun/star/auth/InvalidArgumentException \ + offapi/com/sun/star/auth/InvalidContextException \ + offapi/com/sun/star/auth/InvalidCredentialException \ + offapi/com/sun/star/auth/InvalidPrincipalException \ + offapi/com/sun/star/auth/PersistenceFailureException \ + offapi/com/sun/star/auth/UnsupportedException \ + offapi/com/sun/star/auth/XSSOAcceptorContext \ + offapi/com/sun/star/auth/XSSOContext \ + offapi/com/sun/star/auth/XSSOInitiatorContext \ + offapi/com/sun/star/auth/XSSOManager \ + offapi/com/sun/star/auth/XSSOManagerFactory \ + offapi/com/sun/star/auth/XSSOPasswordCache \ + offapi/com/sun/star/awt/ActionEvent \ + offapi/com/sun/star/awt/AdjustmentEvent \ + offapi/com/sun/star/awt/AdjustmentType \ + offapi/com/sun/star/awt/CharSet \ + offapi/com/sun/star/awt/Command \ + offapi/com/sun/star/awt/DeviceCapability \ + offapi/com/sun/star/awt/DeviceInfo \ + offapi/com/sun/star/awt/DockingData \ + offapi/com/sun/star/awt/DockingEvent \ + offapi/com/sun/star/awt/EndDockingEvent \ + offapi/com/sun/star/awt/EndPopupModeEvent \ + offapi/com/sun/star/awt/EnhancedMouseEvent \ + offapi/com/sun/star/awt/FieldUnit \ + offapi/com/sun/star/awt/FocusChangeReason \ + offapi/com/sun/star/awt/FocusEvent \ + offapi/com/sun/star/awt/FontDescriptor \ + offapi/com/sun/star/awt/FontEmphasisMark \ + offapi/com/sun/star/awt/FontFamily \ + offapi/com/sun/star/awt/FontPitch \ + offapi/com/sun/star/awt/FontRelief \ + offapi/com/sun/star/awt/FontSlant \ + offapi/com/sun/star/awt/FontStrikeout \ + offapi/com/sun/star/awt/FontType \ + offapi/com/sun/star/awt/FontUnderline \ + offapi/com/sun/star/awt/FontWeight \ + offapi/com/sun/star/awt/FontWidth \ + offapi/com/sun/star/awt/Gradient \ + offapi/com/sun/star/awt/GradientStyle \ + offapi/com/sun/star/awt/ImageAlign \ + offapi/com/sun/star/awt/ImagePosition \ + offapi/com/sun/star/awt/ImageScaleMode \ + offapi/com/sun/star/awt/ImageStatus \ + offapi/com/sun/star/awt/InputEvent \ + offapi/com/sun/star/awt/InvalidateStyle \ + offapi/com/sun/star/awt/ItemEvent \ + offapi/com/sun/star/awt/ItemListEvent \ + offapi/com/sun/star/awt/Key \ + offapi/com/sun/star/awt/KeyEvent \ + offapi/com/sun/star/awt/KeyFunction \ + offapi/com/sun/star/awt/KeyGroup \ + offapi/com/sun/star/awt/KeyModifier \ + offapi/com/sun/star/awt/KeyStroke \ + offapi/com/sun/star/awt/LineEndFormat \ + offapi/com/sun/star/awt/MaxChildrenException \ + offapi/com/sun/star/awt/MenuEvent \ + offapi/com/sun/star/awt/MenuItemStyle \ + offapi/com/sun/star/awt/MenuItemType \ + offapi/com/sun/star/awt/MenuLogo \ + offapi/com/sun/star/awt/MessageBoxButtons \ + offapi/com/sun/star/awt/MessageBoxCommand \ + offapi/com/sun/star/awt/MouseButton \ + offapi/com/sun/star/awt/MouseEvent \ + offapi/com/sun/star/awt/MouseWheelBehavior \ + offapi/com/sun/star/awt/PaintEvent \ + offapi/com/sun/star/awt/Point \ + offapi/com/sun/star/awt/PopupMenuDirection \ + offapi/com/sun/star/awt/PosSize \ + offapi/com/sun/star/awt/PrinterException \ + offapi/com/sun/star/awt/PushButtonType \ + offapi/com/sun/star/awt/RasterOperation \ + offapi/com/sun/star/awt/Rectangle \ + offapi/com/sun/star/awt/ScrollBarOrientation \ + offapi/com/sun/star/awt/Selection \ + offapi/com/sun/star/awt/SimpleFontMetric \ + offapi/com/sun/star/awt/Size \ + offapi/com/sun/star/awt/SpinEvent \ + offapi/com/sun/star/awt/Style \ + offapi/com/sun/star/awt/SystemDependentXWindow \ + offapi/com/sun/star/awt/SystemPointer \ + offapi/com/sun/star/awt/TextAlign \ + offapi/com/sun/star/awt/TextEvent \ + offapi/com/sun/star/awt/VclContainerEvent \ + offapi/com/sun/star/awt/VclWindowPeerAttribute \ + offapi/com/sun/star/awt/VisualEffect \ + offapi/com/sun/star/awt/WindowAttribute \ + offapi/com/sun/star/awt/WindowClass \ + offapi/com/sun/star/awt/WindowDescriptor \ + offapi/com/sun/star/awt/WindowEvent \ + offapi/com/sun/star/awt/XActionListener \ + offapi/com/sun/star/awt/XActivateListener \ + offapi/com/sun/star/awt/XAdjustmentListener \ + offapi/com/sun/star/awt/XAnimatedImages \ + offapi/com/sun/star/awt/XAnimation \ + offapi/com/sun/star/awt/XBitmap \ + offapi/com/sun/star/awt/XButton \ + offapi/com/sun/star/awt/XCallback \ + offapi/com/sun/star/awt/XCheckBox \ + offapi/com/sun/star/awt/XComboBox \ + offapi/com/sun/star/awt/XContainerWindowEventHandler \ + offapi/com/sun/star/awt/XContainerWindowProvider \ + offapi/com/sun/star/awt/XControl \ + offapi/com/sun/star/awt/XControlContainer \ + offapi/com/sun/star/awt/XControlModel \ + offapi/com/sun/star/awt/XCurrencyField \ + offapi/com/sun/star/awt/XDataTransferProviderAccess \ + offapi/com/sun/star/awt/XDateField \ + offapi/com/sun/star/awt/XDevice \ + offapi/com/sun/star/awt/XDialog \ + offapi/com/sun/star/awt/XDialog2 \ + offapi/com/sun/star/awt/XDialogEventHandler \ + offapi/com/sun/star/awt/XDialogProvider \ + offapi/com/sun/star/awt/XDialogProvider2 \ + offapi/com/sun/star/awt/XDisplayBitmap \ + offapi/com/sun/star/awt/XDisplayConnection \ + offapi/com/sun/star/awt/XDockableWindow \ + offapi/com/sun/star/awt/XDockableWindowListener \ + offapi/com/sun/star/awt/XEnhancedMouseClickHandler \ + offapi/com/sun/star/awt/XEventHandler \ + offapi/com/sun/star/awt/XExtendedToolkit \ + offapi/com/sun/star/awt/XFileDialog \ + offapi/com/sun/star/awt/XFixedHyperlink \ + offapi/com/sun/star/awt/XFixedText \ + offapi/com/sun/star/awt/XFocusListener \ + offapi/com/sun/star/awt/XFont \ + offapi/com/sun/star/awt/XFont2 \ + offapi/com/sun/star/awt/XGraphics \ + offapi/com/sun/star/awt/XImageButton \ + offapi/com/sun/star/awt/XImageConsumer \ + offapi/com/sun/star/awt/XImageProducer \ + offapi/com/sun/star/awt/XInfoPrinter \ + offapi/com/sun/star/awt/XItemEventBroadcaster \ + offapi/com/sun/star/awt/XItemList \ + offapi/com/sun/star/awt/XItemListListener \ + offapi/com/sun/star/awt/XItemListener \ + offapi/com/sun/star/awt/XKeyHandler \ + offapi/com/sun/star/awt/XKeyListener \ + offapi/com/sun/star/awt/XLayoutConstrains \ + offapi/com/sun/star/awt/XLayoutContainer \ + offapi/com/sun/star/awt/XLayoutFlow \ + offapi/com/sun/star/awt/XLayoutRoot \ + offapi/com/sun/star/awt/XLayoutUnit \ + offapi/com/sun/star/awt/XListBox \ + offapi/com/sun/star/awt/XMenu \ + offapi/com/sun/star/awt/XMenuBar \ + offapi/com/sun/star/awt/XMenuBarExtended \ + offapi/com/sun/star/awt/XMenuExtended \ + offapi/com/sun/star/awt/XMenuExtended2 \ + offapi/com/sun/star/awt/XMenuListener \ + offapi/com/sun/star/awt/XMessageBox \ + offapi/com/sun/star/awt/XMessageBoxFactory \ + offapi/com/sun/star/awt/XMetricField \ + offapi/com/sun/star/awt/XMouseClickHandler \ + offapi/com/sun/star/awt/XMouseListener \ + offapi/com/sun/star/awt/XMouseMotionHandler \ + offapi/com/sun/star/awt/XMouseMotionListener \ + offapi/com/sun/star/awt/XNumericField \ + offapi/com/sun/star/awt/XPaintListener \ + offapi/com/sun/star/awt/XPatternField \ + offapi/com/sun/star/awt/XPointer \ + offapi/com/sun/star/awt/XPopupMenu \ + offapi/com/sun/star/awt/XPopupMenuExtended \ + offapi/com/sun/star/awt/XPrinter \ + offapi/com/sun/star/awt/XPrinterPropertySet \ + offapi/com/sun/star/awt/XPrinterServer \ + offapi/com/sun/star/awt/XProgressBar \ + offapi/com/sun/star/awt/XProgressMonitor \ + offapi/com/sun/star/awt/XRadioButton \ + offapi/com/sun/star/awt/XRegion \ + offapi/com/sun/star/awt/XRequestCallback \ + offapi/com/sun/star/awt/XReschedule \ + offapi/com/sun/star/awt/XScrollBar \ + offapi/com/sun/star/awt/XSimpleAnimation \ + offapi/com/sun/star/awt/XSimpleTabController \ + offapi/com/sun/star/awt/XSpinField \ + offapi/com/sun/star/awt/XSpinListener \ + offapi/com/sun/star/awt/XSpinValue \ + offapi/com/sun/star/awt/XStyleChangeListener \ + offapi/com/sun/star/awt/XStyleSettings \ + offapi/com/sun/star/awt/XStyleSettingsSupplier \ + offapi/com/sun/star/awt/XSystemChildFactory \ + offapi/com/sun/star/awt/XSystemDependentMenuPeer \ + offapi/com/sun/star/awt/XSystemDependentWindowPeer \ + offapi/com/sun/star/awt/XTabController \ + offapi/com/sun/star/awt/XTabControllerModel \ + offapi/com/sun/star/awt/XTabListener \ + offapi/com/sun/star/awt/XTextArea \ + offapi/com/sun/star/awt/XTextComponent \ + offapi/com/sun/star/awt/XTextEditField \ + offapi/com/sun/star/awt/XTextLayoutConstrains \ + offapi/com/sun/star/awt/XTextListener \ + offapi/com/sun/star/awt/XThrobber \ + offapi/com/sun/star/awt/XTimeField \ + offapi/com/sun/star/awt/XToggleButton \ + offapi/com/sun/star/awt/XToolkit \ + offapi/com/sun/star/awt/XTopWindow \ + offapi/com/sun/star/awt/XTopWindow2 \ + offapi/com/sun/star/awt/XTopWindowListener \ + offapi/com/sun/star/awt/XUnitConversion \ + offapi/com/sun/star/awt/XUnoControlContainer \ + offapi/com/sun/star/awt/XUserInputInterception \ + offapi/com/sun/star/awt/XVclContainer \ + offapi/com/sun/star/awt/XVclContainerListener \ + offapi/com/sun/star/awt/XVclContainerPeer \ + offapi/com/sun/star/awt/XVclWindowPeer \ + offapi/com/sun/star/awt/XView \ + offapi/com/sun/star/awt/XWindow \ + offapi/com/sun/star/awt/XWindow2 \ + offapi/com/sun/star/awt/XWindowListener \ + offapi/com/sun/star/awt/XWindowListener2 \ + offapi/com/sun/star/awt/XWindowPeer \ + offapi/com/sun/star/awt/grid/GridColumnEvent \ + offapi/com/sun/star/awt/grid/GridDataEvent \ + offapi/com/sun/star/awt/grid/GridInvalidDataException \ + offapi/com/sun/star/awt/grid/GridInvalidModelException \ + offapi/com/sun/star/awt/grid/GridSelectionEvent \ + offapi/com/sun/star/awt/grid/SelectionEventType \ + offapi/com/sun/star/awt/grid/XGridColumn \ + offapi/com/sun/star/awt/grid/XGridColumnListener \ + offapi/com/sun/star/awt/grid/XGridColumnModel \ + offapi/com/sun/star/awt/grid/XGridControl \ + offapi/com/sun/star/awt/grid/XGridDataListener \ + offapi/com/sun/star/awt/grid/XGridDataModel \ + offapi/com/sun/star/awt/grid/XGridSelection \ + offapi/com/sun/star/awt/grid/XGridSelectionListener \ + offapi/com/sun/star/awt/grid/XMutableGridDataModel \ + offapi/com/sun/star/awt/grid/XMutableGridDataModel \ + offapi/com/sun/star/awt/grid/XSortableGridData \ + offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel \ + offapi/com/sun/star/awt/tab/TabPageActivatedEvent \ + offapi/com/sun/star/awt/tab/XTabPage \ + offapi/com/sun/star/awt/tab/XTabPageContainer \ + offapi/com/sun/star/awt/tab/XTabPageContainerListener \ + offapi/com/sun/star/awt/tab/XTabPageContainerModel \ + offapi/com/sun/star/awt/tab/XTabPageModel \ + offapi/com/sun/star/awt/tree/ExpandVetoException \ + offapi/com/sun/star/awt/tree/TreeDataModelEvent \ + offapi/com/sun/star/awt/tree/TreeExpansionEvent \ + offapi/com/sun/star/awt/tree/XMutableTreeDataModel \ + offapi/com/sun/star/awt/tree/XMutableTreeNode \ + offapi/com/sun/star/awt/tree/XTreeControl \ + offapi/com/sun/star/awt/tree/XTreeDataModel \ + offapi/com/sun/star/awt/tree/XTreeDataModelListener \ + offapi/com/sun/star/awt/tree/XTreeEditListener \ + offapi/com/sun/star/awt/tree/XTreeExpansionListener \ + offapi/com/sun/star/awt/tree/XTreeNode \ + offapi/com/sun/star/chart/ChartAxisArrangeOrderType \ + offapi/com/sun/star/chart/ChartAxisAssign \ + offapi/com/sun/star/chart/ChartAxisLabelPosition \ + offapi/com/sun/star/chart/ChartAxisMarkPosition \ + offapi/com/sun/star/chart/ChartAxisMarks \ + offapi/com/sun/star/chart/ChartAxisPosition \ + offapi/com/sun/star/chart/ChartAxisType \ + offapi/com/sun/star/chart/ChartDataCaption \ + offapi/com/sun/star/chart/ChartDataChangeEvent \ + offapi/com/sun/star/chart/ChartDataChangeType \ + offapi/com/sun/star/chart/ChartDataPoint \ + offapi/com/sun/star/chart/ChartDataRow \ + offapi/com/sun/star/chart/ChartDataRowSource \ + offapi/com/sun/star/chart/ChartDataValue \ + offapi/com/sun/star/chart/ChartErrorCategory \ + offapi/com/sun/star/chart/ChartErrorIndicatorType \ + offapi/com/sun/star/chart/ChartLegendExpansion \ + offapi/com/sun/star/chart/ChartLegendPosition \ + offapi/com/sun/star/chart/ChartRegressionCurveType \ + offapi/com/sun/star/chart/ChartSeriesAddress \ + offapi/com/sun/star/chart/ChartSolidType \ + offapi/com/sun/star/chart/ChartSymbolType \ + offapi/com/sun/star/chart/DataLabelPlacement \ + offapi/com/sun/star/chart/ErrorBarStyle \ + offapi/com/sun/star/chart/MissingValueTreatment \ + offapi/com/sun/star/chart/TimeIncrement \ + offapi/com/sun/star/chart/TimeInterval \ + offapi/com/sun/star/chart/TimeUnit \ + offapi/com/sun/star/chart/X3DDefaultSetter \ + offapi/com/sun/star/chart/X3DDisplay \ + offapi/com/sun/star/chart/XAxis \ + offapi/com/sun/star/chart/XAxisSupplier \ + offapi/com/sun/star/chart/XAxisXSupplier \ + offapi/com/sun/star/chart/XAxisYSupplier \ + offapi/com/sun/star/chart/XAxisZSupplier \ + offapi/com/sun/star/chart/XChartData \ + offapi/com/sun/star/chart/XChartDataArray \ + offapi/com/sun/star/chart/XChartDataChangeEventListener \ + offapi/com/sun/star/chart/XChartDocument \ + offapi/com/sun/star/chart/XComplexDescriptionAccess \ + offapi/com/sun/star/chart/XDateCategories \ + offapi/com/sun/star/chart/XDiagram \ + offapi/com/sun/star/chart/XDiagramPositioning \ + offapi/com/sun/star/chart/XSecondAxisTitleSupplier \ + offapi/com/sun/star/chart/XStatisticDisplay \ + offapi/com/sun/star/chart/XTwoAxisXSupplier \ + offapi/com/sun/star/chart/XTwoAxisYSupplier \ + offapi/com/sun/star/chart2/AxisOrientation \ + offapi/com/sun/star/chart2/AxisType \ + offapi/com/sun/star/chart2/CoordinateSystemTypeID \ + offapi/com/sun/star/chart2/CurveStyle \ + offapi/com/sun/star/chart2/DataPointGeometry3D \ + offapi/com/sun/star/chart2/DataPointLabel \ + offapi/com/sun/star/chart2/FillBitmap \ + offapi/com/sun/star/chart2/IncrementData \ + offapi/com/sun/star/chart2/InterpretedData \ + offapi/com/sun/star/chart2/LegendPosition \ + offapi/com/sun/star/chart2/LightSource \ + offapi/com/sun/star/chart2/PieChartOffsetMode \ + offapi/com/sun/star/chart2/RelativePosition \ + offapi/com/sun/star/chart2/RelativeSize \ + offapi/com/sun/star/chart2/ScaleData \ + offapi/com/sun/star/chart2/StackingDirection \ + offapi/com/sun/star/chart2/SubIncrement \ + offapi/com/sun/star/chart2/Symbol \ + offapi/com/sun/star/chart2/SymbolStyle \ + offapi/com/sun/star/chart2/TickmarkStyle \ + offapi/com/sun/star/chart2/TransparencyStyle \ + offapi/com/sun/star/chart2/XAnyDescriptionAccess \ + offapi/com/sun/star/chart2/XAxis \ + offapi/com/sun/star/chart2/XChartDocument \ + offapi/com/sun/star/chart2/XChartShape \ + offapi/com/sun/star/chart2/XChartShapeContainer \ + offapi/com/sun/star/chart2/XChartType \ + offapi/com/sun/star/chart2/XChartTypeContainer \ + offapi/com/sun/star/chart2/XChartTypeManager \ + offapi/com/sun/star/chart2/XChartTypeTemplate \ + offapi/com/sun/star/chart2/XColorScheme \ + offapi/com/sun/star/chart2/XCoordinateSystem \ + offapi/com/sun/star/chart2/XCoordinateSystemContainer \ + offapi/com/sun/star/chart2/XDataInterpreter \ + offapi/com/sun/star/chart2/XDataSeries \ + offapi/com/sun/star/chart2/XDataSeriesContainer \ + offapi/com/sun/star/chart2/XDefaultSizeTransmitter \ + offapi/com/sun/star/chart2/XDiagram \ + offapi/com/sun/star/chart2/XDiagramProvider \ + offapi/com/sun/star/chart2/XFormattedString \ + offapi/com/sun/star/chart2/XInternalDataProvider \ + offapi/com/sun/star/chart2/XLabeled \ + offapi/com/sun/star/chart2/XLegend \ + offapi/com/sun/star/chart2/XRegressionCurve \ + offapi/com/sun/star/chart2/XRegressionCurveCalculator \ + offapi/com/sun/star/chart2/XRegressionCurveContainer \ + offapi/com/sun/star/chart2/XScaling \ + offapi/com/sun/star/chart2/XTarget \ + offapi/com/sun/star/chart2/XTitle \ + offapi/com/sun/star/chart2/XTitled \ + offapi/com/sun/star/chart2/XTransformation \ + offapi/com/sun/star/chart2/data/DataSequenceRole \ + offapi/com/sun/star/chart2/data/HighlightedRange \ + offapi/com/sun/star/chart2/data/LabelOrigin \ + offapi/com/sun/star/chart2/data/XDataProvider \ + offapi/com/sun/star/chart2/data/XDataReceiver \ + offapi/com/sun/star/chart2/data/XDataSequence \ + offapi/com/sun/star/chart2/data/XDataSink \ + offapi/com/sun/star/chart2/data/XDataSource \ + offapi/com/sun/star/chart2/data/XDatabaseDataProvider \ + offapi/com/sun/star/chart2/data/XLabeledDataSequence \ + offapi/com/sun/star/chart2/data/XNumericalDataSequence \ + offapi/com/sun/star/chart2/data/XRangeHighlighter \ + offapi/com/sun/star/chart2/data/XRangeXMLConversion \ + offapi/com/sun/star/chart2/data/XTextualDataSequence \ + offapi/com/sun/star/configuration/CannotLoadConfigurationException \ + offapi/com/sun/star/configuration/CorruptedConfigurationException \ + offapi/com/sun/star/configuration/CorruptedUIConfigurationException \ + offapi/com/sun/star/configuration/InstallationIncompleteException \ + offapi/com/sun/star/configuration/InvalidBootstrapFileException \ + offapi/com/sun/star/configuration/MissingBootstrapFileException \ + offapi/com/sun/star/configuration/XTemplateContainer \ + offapi/com/sun/star/configuration/XTemplateInstance \ + offapi/com/sun/star/configuration/XUpdate \ + offapi/com/sun/star/configuration/backend/AuthenticationFailedException \ + offapi/com/sun/star/configuration/backend/BackendAccessException \ + offapi/com/sun/star/configuration/backend/BackendSetupException \ + offapi/com/sun/star/configuration/backend/CannotConnectException \ + offapi/com/sun/star/configuration/backend/ComponentChangeEvent \ + offapi/com/sun/star/configuration/backend/ConnectionLostException \ + offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException \ + offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException \ + offapi/com/sun/star/configuration/backend/MalformedDataException \ + offapi/com/sun/star/configuration/backend/MergeRecoveryRequest \ + offapi/com/sun/star/configuration/backend/NodeAttribute \ + offapi/com/sun/star/configuration/backend/PropertyInfo \ + offapi/com/sun/star/configuration/backend/SchemaAttribute \ + offapi/com/sun/star/configuration/backend/StratumCreationException \ + offapi/com/sun/star/configuration/backend/TemplateIdentifier \ + offapi/com/sun/star/configuration/backend/XBackend \ + offapi/com/sun/star/configuration/backend/XBackendChangesListener \ + offapi/com/sun/star/configuration/backend/XBackendChangesNotifier \ + offapi/com/sun/star/configuration/backend/XBackendEntities \ + offapi/com/sun/star/configuration/backend/XCompositeLayer \ + offapi/com/sun/star/configuration/backend/XLayer \ + offapi/com/sun/star/configuration/backend/XLayerContentDescriber \ + offapi/com/sun/star/configuration/backend/XLayerHandler \ + offapi/com/sun/star/configuration/backend/XLayerImporter \ + offapi/com/sun/star/configuration/backend/XMultiLayerStratum \ + offapi/com/sun/star/configuration/backend/XSchema \ + offapi/com/sun/star/configuration/backend/XSchemaHandler \ + offapi/com/sun/star/configuration/backend/XSchemaSupplier \ + offapi/com/sun/star/configuration/backend/XSingleLayerStratum \ + offapi/com/sun/star/configuration/backend/XUpdatableLayer \ + offapi/com/sun/star/configuration/backend/XUpdateHandler \ + offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier \ + offapi/com/sun/star/datatransfer/DataFlavor \ + offapi/com/sun/star/datatransfer/UnsupportedFlavorException \ + offapi/com/sun/star/datatransfer/XDataFormatTranslator \ + offapi/com/sun/star/datatransfer/XMimeContentType \ + offapi/com/sun/star/datatransfer/XMimeContentTypeFactory \ + offapi/com/sun/star/datatransfer/XSystemTransferable \ + offapi/com/sun/star/datatransfer/XTransferDataAccess \ + offapi/com/sun/star/datatransfer/XTransferable \ + offapi/com/sun/star/datatransfer/XTransferableEx \ + offapi/com/sun/star/datatransfer/XTransferableSource \ + offapi/com/sun/star/datatransfer/XTransferableSupplier \ + offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent \ + offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities \ + offapi/com/sun/star/datatransfer/clipboard/XClipboard \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardEx \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardListener \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardManager \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier \ + offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner \ + offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard \ + offapi/com/sun/star/datatransfer/dnd/DNDConstants \ + offapi/com/sun/star/datatransfer/dnd/DragGestureEvent \ + offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent \ + offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent \ + offapi/com/sun/star/datatransfer/dnd/DragSourceEvent \ + offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent \ + offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent \ + offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent \ + offapi/com/sun/star/datatransfer/dnd/DropTargetEvent \ + offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException \ + offapi/com/sun/star/datatransfer/dnd/XAutoscroll \ + offapi/com/sun/star/datatransfer/dnd/XDragGestureListener \ + offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer \ + offapi/com/sun/star/datatransfer/dnd/XDragSource \ + offapi/com/sun/star/datatransfer/dnd/XDragSourceContext \ + offapi/com/sun/star/datatransfer/dnd/XDragSourceListener \ + offapi/com/sun/star/datatransfer/dnd/XDropTarget \ + offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext \ + offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext \ + offapi/com/sun/star/datatransfer/dnd/XDropTargetListener \ + offapi/com/sun/star/deployment/DependencyException \ + offapi/com/sun/star/deployment/DeploymentException \ + offapi/com/sun/star/deployment/ExtensionRemovedException \ + offapi/com/sun/star/deployment/InstallException \ + offapi/com/sun/star/deployment/InvalidRemovedParameterException \ + offapi/com/sun/star/deployment/LicenseException \ + offapi/com/sun/star/deployment/PlatformException \ + offapi/com/sun/star/deployment/Prerequisites \ + offapi/com/sun/star/deployment/UpdateInformationEntry \ + offapi/com/sun/star/deployment/VersionException \ + offapi/com/sun/star/deployment/XExtensionManager \ + offapi/com/sun/star/deployment/XPackage \ + offapi/com/sun/star/deployment/XPackageInformationProvider \ + offapi/com/sun/star/deployment/XPackageManager \ + offapi/com/sun/star/deployment/XPackageManagerFactory \ + offapi/com/sun/star/deployment/XPackageRegistry \ + offapi/com/sun/star/deployment/XPackageTypeInfo \ + offapi/com/sun/star/deployment/XUpdateInformationProvider \ + offapi/com/sun/star/document/AmbigousFilterRequest \ + offapi/com/sun/star/document/BrokenPackageRequest \ + offapi/com/sun/star/document/ChangedByOthersRequest \ + offapi/com/sun/star/document/CorruptedFilterConfigurationException \ + offapi/com/sun/star/document/DocumentEvent \ + offapi/com/sun/star/document/EmptyUndoStackException \ + offapi/com/sun/star/document/EventObject \ + offapi/com/sun/star/document/FilterOptionsRequest \ + offapi/com/sun/star/document/LinkUpdateModes \ + offapi/com/sun/star/document/LockFileIgnoreRequest \ + offapi/com/sun/star/document/LockedDocumentRequest \ + offapi/com/sun/star/document/LockedOnSavingRequest \ + offapi/com/sun/star/document/MacroExecMode \ + offapi/com/sun/star/document/NoSuchFilterRequest \ + offapi/com/sun/star/document/OwnLockOnDocumentRequest \ + offapi/com/sun/star/document/PrinterIndependentLayout \ + offapi/com/sun/star/document/RedlineDisplayType \ + offapi/com/sun/star/document/UndoContextNotClosedException \ + offapi/com/sun/star/document/UndoFailedException \ + offapi/com/sun/star/document/UndoManagerEvent \ + offapi/com/sun/star/document/UpdateDocMode \ + offapi/com/sun/star/document/XActionLockable \ + offapi/com/sun/star/document/XBinaryStreamResolver \ + offapi/com/sun/star/document/XCodeNameQuery \ + offapi/com/sun/star/document/XCompatWriterDocProperties \ + offapi/com/sun/star/document/XDocumentEventBroadcaster \ + offapi/com/sun/star/document/XDocumentEventListener \ + offapi/com/sun/star/document/XDocumentInfo \ + offapi/com/sun/star/document/XDocumentInfoSupplier \ + offapi/com/sun/star/document/XDocumentInsertable \ + offapi/com/sun/star/document/XDocumentLanguages \ + offapi/com/sun/star/document/XDocumentProperties \ + offapi/com/sun/star/document/XDocumentPropertiesSupplier \ + offapi/com/sun/star/document/XDocumentRecovery \ + offapi/com/sun/star/document/XDocumentRevisionListPersistence \ + offapi/com/sun/star/document/XDocumentSubStorageSupplier \ + offapi/com/sun/star/document/XEmbeddedObjectResolver \ + offapi/com/sun/star/document/XEmbeddedObjectSupplier \ + offapi/com/sun/star/document/XEmbeddedObjectSupplier2 \ + offapi/com/sun/star/document/XEmbeddedScripts \ + offapi/com/sun/star/document/XEventBroadcaster \ + offapi/com/sun/star/document/XEventListener \ + offapi/com/sun/star/document/XEventsSupplier \ + offapi/com/sun/star/document/XExporter \ + offapi/com/sun/star/document/XExtendedFilterDetection \ + offapi/com/sun/star/document/XFilter \ + offapi/com/sun/star/document/XFilterAdapter \ + offapi/com/sun/star/document/XGraphicObjectResolver \ + offapi/com/sun/star/document/XImporter \ + offapi/com/sun/star/document/XInteractionFilterOptions \ + offapi/com/sun/star/document/XInteractionFilterSelect \ + offapi/com/sun/star/document/XLinkTargetSupplier \ + offapi/com/sun/star/document/XMimeTypeInfo \ + offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter \ + offapi/com/sun/star/document/XRedlinesSupplier \ + offapi/com/sun/star/document/XScriptInvocationContext \ + offapi/com/sun/star/document/XStandaloneDocumentInfo \ + offapi/com/sun/star/document/XStorageBasedDocument \ + offapi/com/sun/star/document/XStorageChangeListener \ + offapi/com/sun/star/document/XTypeDetection \ + offapi/com/sun/star/document/XUndoAction \ + offapi/com/sun/star/document/XUndoManager \ + offapi/com/sun/star/document/XUndoManagerListener \ + offapi/com/sun/star/document/XUndoManagerSupplier \ + offapi/com/sun/star/document/XVbaMethodParameter \ + offapi/com/sun/star/document/XViewDataSupplier \ + offapi/com/sun/star/drawing/Alignment \ + offapi/com/sun/star/drawing/Arrangement \ + offapi/com/sun/star/drawing/BezierPoint \ + offapi/com/sun/star/drawing/BitmapMode \ + offapi/com/sun/star/drawing/BoundVolume \ + offapi/com/sun/star/drawing/CameraGeometry \ + offapi/com/sun/star/drawing/CanvasFeature \ + offapi/com/sun/star/drawing/CaptionEscapeDirection \ + offapi/com/sun/star/drawing/CaptionType \ + offapi/com/sun/star/drawing/CircleKind \ + offapi/com/sun/star/drawing/ColorMode \ + offapi/com/sun/star/drawing/ConnectionType \ + offapi/com/sun/star/drawing/ConnectorType \ + offapi/com/sun/star/drawing/CoordinateSequence \ + offapi/com/sun/star/drawing/CoordinateSequenceSequence \ + offapi/com/sun/star/drawing/DashStyle \ + offapi/com/sun/star/drawing/Direction3D \ + offapi/com/sun/star/drawing/DoubleSequence \ + offapi/com/sun/star/drawing/DoubleSequenceSequence \ + offapi/com/sun/star/drawing/DrawViewMode \ + offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue \ + offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType \ + offapi/com/sun/star/drawing/EnhancedCustomShapeParameter \ + offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair \ + offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType \ + offapi/com/sun/star/drawing/EnhancedCustomShapeSegment \ + offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand \ + offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame \ + offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode \ + offapi/com/sun/star/drawing/EscapeDirection \ + offapi/com/sun/star/drawing/FillStyle \ + offapi/com/sun/star/drawing/FlagSequence \ + offapi/com/sun/star/drawing/FlagSequenceSequence \ + offapi/com/sun/star/drawing/GluePoint \ + offapi/com/sun/star/drawing/GluePoint2 \ + offapi/com/sun/star/drawing/GraphicFilterRequest \ + offapi/com/sun/star/drawing/Hatch \ + offapi/com/sun/star/drawing/HatchStyle \ + offapi/com/sun/star/drawing/HomogenMatrix \ + offapi/com/sun/star/drawing/HomogenMatrix3 \ + offapi/com/sun/star/drawing/HomogenMatrix4 \ + offapi/com/sun/star/drawing/HomogenMatrixLine \ + offapi/com/sun/star/drawing/HomogenMatrixLine3 \ + offapi/com/sun/star/drawing/HomogenMatrixLine4 \ + offapi/com/sun/star/drawing/HorizontalDimensioning \ + offapi/com/sun/star/drawing/LayerType \ + offapi/com/sun/star/drawing/LineDash \ + offapi/com/sun/star/drawing/LineEndType \ + offapi/com/sun/star/drawing/LineJoint \ + offapi/com/sun/star/drawing/LineStyle \ + offapi/com/sun/star/drawing/MeasureKind \ + offapi/com/sun/star/drawing/MeasureTextHorzPos \ + offapi/com/sun/star/drawing/MeasureTextVertPos \ + offapi/com/sun/star/drawing/MirrorAxis \ + offapi/com/sun/star/drawing/NormalsKind \ + offapi/com/sun/star/drawing/PointSequence \ + offapi/com/sun/star/drawing/PointSequenceSequence \ + offapi/com/sun/star/drawing/PolyPolygonBezierCoords \ + offapi/com/sun/star/drawing/PolyPolygonShape3D \ + offapi/com/sun/star/drawing/PolygonFlags \ + offapi/com/sun/star/drawing/PolygonKind \ + offapi/com/sun/star/drawing/Position3D \ + offapi/com/sun/star/drawing/ProjectionMode \ + offapi/com/sun/star/drawing/RectanglePoint \ + offapi/com/sun/star/drawing/ShadeMode \ + offapi/com/sun/star/drawing/SnapObjectType \ + offapi/com/sun/star/drawing/TextAdjust \ + offapi/com/sun/star/drawing/TextAnimationDirection \ + offapi/com/sun/star/drawing/TextAnimationKind \ + offapi/com/sun/star/drawing/TextFitToSizeType \ + offapi/com/sun/star/drawing/TextHorizontalAdjust \ + offapi/com/sun/star/drawing/TextVerticalAdjust \ + offapi/com/sun/star/drawing/TextureKind \ + offapi/com/sun/star/drawing/TextureKind2 \ + offapi/com/sun/star/drawing/TextureMode \ + offapi/com/sun/star/drawing/TextureProjectionMode \ + offapi/com/sun/star/drawing/VerticalDimensioning \ + offapi/com/sun/star/drawing/XConnectableShape \ + offapi/com/sun/star/drawing/XConnectorShape \ + offapi/com/sun/star/drawing/XControlShape \ + offapi/com/sun/star/drawing/XCustomShapeEngine \ + offapi/com/sun/star/drawing/XCustomShapeHandle \ + offapi/com/sun/star/drawing/XDrawPage \ + offapi/com/sun/star/drawing/XDrawPageDuplicator \ + offapi/com/sun/star/drawing/XDrawPageExpander \ + offapi/com/sun/star/drawing/XDrawPageSummarizer \ + offapi/com/sun/star/drawing/XDrawPageSupplier \ + offapi/com/sun/star/drawing/XDrawPages \ + offapi/com/sun/star/drawing/XDrawPagesSupplier \ + offapi/com/sun/star/drawing/XDrawSubController \ + offapi/com/sun/star/drawing/XDrawView \ + offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter \ + offapi/com/sun/star/drawing/XGluePointsSupplier \ + offapi/com/sun/star/drawing/XLayer \ + offapi/com/sun/star/drawing/XLayerManager \ + offapi/com/sun/star/drawing/XLayerSupplier \ + offapi/com/sun/star/drawing/XMasterPageTarget \ + offapi/com/sun/star/drawing/XMasterPagesSupplier \ + offapi/com/sun/star/drawing/XPresenterHelper \ + offapi/com/sun/star/drawing/XSelectionFunction \ + offapi/com/sun/star/drawing/XShape \ + offapi/com/sun/star/drawing/XShapeAligner \ + offapi/com/sun/star/drawing/XShapeArranger \ + offapi/com/sun/star/drawing/XShapeBinder \ + offapi/com/sun/star/drawing/XShapeCombiner \ + offapi/com/sun/star/drawing/XShapeDescriptor \ + offapi/com/sun/star/drawing/XShapeGroup \ + offapi/com/sun/star/drawing/XShapeGrouper \ + offapi/com/sun/star/drawing/XShapeMirror \ + offapi/com/sun/star/drawing/XShapes \ + offapi/com/sun/star/drawing/XSlidePreviewCache \ + offapi/com/sun/star/drawing/XSlidePreviewCacheListener \ + offapi/com/sun/star/drawing/XSlideRenderer \ + offapi/com/sun/star/drawing/XSlideSorterBase \ + offapi/com/sun/star/drawing/XUniversalShapeDescriptor \ + offapi/com/sun/star/drawing/framework/AnchorBindingMode \ + offapi/com/sun/star/drawing/framework/BorderType \ + offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent \ + offapi/com/sun/star/drawing/framework/ResourceActivationMode \ + offapi/com/sun/star/drawing/framework/TabBarButton \ + offapi/com/sun/star/drawing/framework/XConfiguration \ + offapi/com/sun/star/drawing/framework/XConfigurationChangeListener \ + offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest \ + offapi/com/sun/star/drawing/framework/XConfigurationController \ + offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster \ + offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue \ + offapi/com/sun/star/drawing/framework/XControllerManager \ + offapi/com/sun/star/drawing/framework/XModuleController \ + offapi/com/sun/star/drawing/framework/XPane \ + offapi/com/sun/star/drawing/framework/XPane2 \ + offapi/com/sun/star/drawing/framework/XPaneBorderPainter \ + offapi/com/sun/star/drawing/framework/XRelocatableResource \ + offapi/com/sun/star/drawing/framework/XResource \ + offapi/com/sun/star/drawing/framework/XResourceFactory \ + offapi/com/sun/star/drawing/framework/XResourceFactoryManager \ + offapi/com/sun/star/drawing/framework/XResourceId \ + offapi/com/sun/star/drawing/framework/XTabBar \ + offapi/com/sun/star/drawing/framework/XToolBar \ + offapi/com/sun/star/drawing/framework/XView \ + offapi/com/sun/star/embed/Actions \ + offapi/com/sun/star/embed/Aspects \ + offapi/com/sun/star/embed/ElementModes \ + offapi/com/sun/star/embed/EmbedMapUnits \ + offapi/com/sun/star/embed/EmbedMisc \ + offapi/com/sun/star/embed/EmbedStates \ + offapi/com/sun/star/embed/EmbedUpdateModes \ + offapi/com/sun/star/embed/EmbedVerbs \ + offapi/com/sun/star/embed/EntryInitModes \ + offapi/com/sun/star/embed/InsertedObjectInfo \ + offapi/com/sun/star/embed/InvalidStorageException \ + offapi/com/sun/star/embed/LinkageMisuseException \ + offapi/com/sun/star/embed/NeedsRunningStateException \ + offapi/com/sun/star/embed/NoVisualAreaSizeException \ + offapi/com/sun/star/embed/ObjectSaveVetoException \ + offapi/com/sun/star/embed/StateChangeInProgressException \ + offapi/com/sun/star/embed/StorageFormats \ + offapi/com/sun/star/embed/StorageWrappedTargetException \ + offapi/com/sun/star/embed/UnreachableStateException \ + offapi/com/sun/star/embed/UseBackupException \ + offapi/com/sun/star/embed/VerbAttributes \ + offapi/com/sun/star/embed/VerbDescriptor \ + offapi/com/sun/star/embed/VisualRepresentation \ + offapi/com/sun/star/embed/WrongStateException \ + offapi/com/sun/star/embed/XActionsApproval \ + offapi/com/sun/star/embed/XClassifiedObject \ + offapi/com/sun/star/embed/XCommonEmbedPersist \ + offapi/com/sun/star/embed/XComponentSupplier \ + offapi/com/sun/star/embed/XEmbedObjectClipboardCreator \ + offapi/com/sun/star/embed/XEmbedObjectCreator \ + offapi/com/sun/star/embed/XEmbedObjectFactory \ + offapi/com/sun/star/embed/XEmbedPersist \ + offapi/com/sun/star/embed/XEmbeddedClient \ + offapi/com/sun/star/embed/XEmbeddedObject \ + offapi/com/sun/star/embed/XEncryptionProtectedSource \ + offapi/com/sun/star/embed/XEncryptionProtectedSource2 \ + offapi/com/sun/star/embed/XEncryptionProtectedStorage \ + offapi/com/sun/star/embed/XExtendedStorageStream \ + offapi/com/sun/star/embed/XHatchWindow \ + offapi/com/sun/star/embed/XHatchWindowController \ + offapi/com/sun/star/embed/XHatchWindowFactory \ + offapi/com/sun/star/embed/XHierarchicalStorageAccess \ + offapi/com/sun/star/embed/XHierarchicalStorageAccess2 \ + offapi/com/sun/star/embed/XInplaceClient \ + offapi/com/sun/star/embed/XInplaceObject \ + offapi/com/sun/star/embed/XInsertObjectDialog \ + offapi/com/sun/star/embed/XLinkCreator \ + offapi/com/sun/star/embed/XLinkFactory \ + offapi/com/sun/star/embed/XLinkageSupport \ + offapi/com/sun/star/embed/XOLESimpleStorage \ + offapi/com/sun/star/embed/XOptimizedStorage \ + offapi/com/sun/star/embed/XPackageStructureCreator \ + offapi/com/sun/star/embed/XPersistanceHolder \ + offapi/com/sun/star/embed/XRelationshipAccess \ + offapi/com/sun/star/embed/XStateChangeBroadcaster \ + offapi/com/sun/star/embed/XStateChangeListener \ + offapi/com/sun/star/embed/XStorage \ + offapi/com/sun/star/embed/XStorage2 \ + offapi/com/sun/star/embed/XStorageRawAccess \ + offapi/com/sun/star/embed/XTransactedObject \ + offapi/com/sun/star/embed/XTransactionBroadcaster \ + offapi/com/sun/star/embed/XTransactionListener \ + offapi/com/sun/star/embed/XTransferableSupplier \ + offapi/com/sun/star/embed/XVisualObject \ + offapi/com/sun/star/embed/XWindowSupplier \ + offapi/com/sun/star/form/DataSelectionType \ + offapi/com/sun/star/form/DatabaseDeleteEvent \ + offapi/com/sun/star/form/DatabaseParameterEvent \ + offapi/com/sun/star/form/ErrorEvent \ + offapi/com/sun/star/form/FormButtonType \ + offapi/com/sun/star/form/FormComponentType \ + offapi/com/sun/star/form/FormSubmitEncoding \ + offapi/com/sun/star/form/FormSubmitMethod \ + offapi/com/sun/star/form/ListSourceType \ + offapi/com/sun/star/form/NavigationBarMode \ + offapi/com/sun/star/form/TabulatorCycle \ + offapi/com/sun/star/form/XApproveActionBroadcaster \ + offapi/com/sun/star/form/XApproveActionListener \ + offapi/com/sun/star/form/XBoundComponent \ + offapi/com/sun/star/form/XBoundControl \ + offapi/com/sun/star/form/XChangeBroadcaster \ + offapi/com/sun/star/form/XChangeListener \ + offapi/com/sun/star/form/XConfirmDeleteBroadcaster \ + offapi/com/sun/star/form/XConfirmDeleteListener \ + offapi/com/sun/star/form/XDatabaseParameterBroadcaster \ + offapi/com/sun/star/form/XDatabaseParameterBroadcaster2 \ + offapi/com/sun/star/form/XDatabaseParameterListener \ + offapi/com/sun/star/form/XDeleteListener \ + offapi/com/sun/star/form/XErrorBroadcaster \ + offapi/com/sun/star/form/XErrorListener \ + offapi/com/sun/star/form/XForm \ + offapi/com/sun/star/form/XFormComponent \ + offapi/com/sun/star/form/XFormController \ + offapi/com/sun/star/form/XFormControllerListener \ + offapi/com/sun/star/form/XFormsSupplier \ + offapi/com/sun/star/form/XFormsSupplier2 \ + offapi/com/sun/star/form/XGrid \ + offapi/com/sun/star/form/XGridColumnFactory \ + offapi/com/sun/star/form/XGridControl \ + offapi/com/sun/star/form/XGridControlListener \ + offapi/com/sun/star/form/XGridFieldDataSupplier \ + offapi/com/sun/star/form/XGridPeer \ + offapi/com/sun/star/form/XImageProducerSupplier \ + offapi/com/sun/star/form/XInsertListener \ + offapi/com/sun/star/form/XLoadListener \ + offapi/com/sun/star/form/XLoadable \ + offapi/com/sun/star/form/XPositioningListener \ + offapi/com/sun/star/form/XReset \ + offapi/com/sun/star/form/XResetListener \ + offapi/com/sun/star/form/XRestoreListener \ + offapi/com/sun/star/form/XSubmit \ + offapi/com/sun/star/form/XSubmitListener \ + offapi/com/sun/star/form/XUpdateBroadcaster \ + offapi/com/sun/star/form/XUpdateListener \ + offapi/com/sun/star/form/binding/IncompatibleTypesException \ + offapi/com/sun/star/form/binding/InvalidBindingStateException \ + offapi/com/sun/star/form/binding/ListEntryEvent \ + offapi/com/sun/star/form/binding/XBindableValue \ + offapi/com/sun/star/form/binding/XListEntryListener \ + offapi/com/sun/star/form/binding/XListEntrySink \ + offapi/com/sun/star/form/binding/XListEntrySource \ + offapi/com/sun/star/form/binding/XValueBinding \ + offapi/com/sun/star/form/runtime/FeatureState \ + offapi/com/sun/star/form/runtime/FilterEvent \ + offapi/com/sun/star/form/runtime/FormFeature \ + offapi/com/sun/star/form/runtime/XFeatureInvalidation \ + offapi/com/sun/star/form/runtime/XFilterController \ + offapi/com/sun/star/form/runtime/XFilterControllerListener \ + offapi/com/sun/star/form/runtime/XFormController \ + offapi/com/sun/star/form/runtime/XFormControllerContext \ + offapi/com/sun/star/form/runtime/XFormOperations \ + offapi/com/sun/star/form/submission/XSubmission \ + offapi/com/sun/star/form/submission/XSubmissionSupplier \ + offapi/com/sun/star/form/submission/XSubmissionVetoListener \ + offapi/com/sun/star/form/validation/XFormComponentValidityListener \ + offapi/com/sun/star/form/validation/XValidatable \ + offapi/com/sun/star/form/validation/XValidatableFormComponent \ + offapi/com/sun/star/form/validation/XValidator \ + offapi/com/sun/star/form/validation/XValidityConstraintListener \ + offapi/com/sun/star/formula/SymbolDescriptor \ + offapi/com/sun/star/frame/BorderWidths \ + offapi/com/sun/star/frame/CommandGroup \ + offapi/com/sun/star/frame/ControlCommand \ + offapi/com/sun/star/frame/ControlEvent \ + offapi/com/sun/star/frame/DispatchDescriptor \ + offapi/com/sun/star/frame/DispatchInformation \ + offapi/com/sun/star/frame/DispatchResultEvent \ + offapi/com/sun/star/frame/DispatchResultState \ + offapi/com/sun/star/frame/DispatchStatement \ + offapi/com/sun/star/frame/DoubleInitializationException \ + offapi/com/sun/star/frame/FeatureStateEvent \ + offapi/com/sun/star/frame/FrameAction \ + offapi/com/sun/star/frame/FrameActionEvent \ + offapi/com/sun/star/frame/FrameSearchFlag \ + offapi/com/sun/star/frame/IllegalArgumentIOException \ + offapi/com/sun/star/frame/LayoutManagerEvents \ + offapi/com/sun/star/frame/TerminationVetoException \ + offapi/com/sun/star/frame/TitleChangedEvent \ + offapi/com/sun/star/frame/UnknownModuleException \ + offapi/com/sun/star/frame/UntitledNumbersConst \ + offapi/com/sun/star/frame/WindowArrange \ + offapi/com/sun/star/frame/XBorderResizeListener \ + offapi/com/sun/star/frame/XBrowseHistoryRegistry \ + offapi/com/sun/star/frame/XComponentLoader \ + offapi/com/sun/star/frame/XComponentRegistry \ + offapi/com/sun/star/frame/XConfigManager \ + offapi/com/sun/star/frame/XControlNotificationListener \ + offapi/com/sun/star/frame/XController \ + offapi/com/sun/star/frame/XController2 \ + offapi/com/sun/star/frame/XControllerBorder \ + offapi/com/sun/star/frame/XDesktop \ + offapi/com/sun/star/frame/XDesktopTask \ + offapi/com/sun/star/frame/XDispatch \ + offapi/com/sun/star/frame/XDispatchHelper \ + offapi/com/sun/star/frame/XDispatchInformationProvider \ + offapi/com/sun/star/frame/XDispatchProvider \ + offapi/com/sun/star/frame/XDispatchProviderInterception \ + offapi/com/sun/star/frame/XDispatchProviderInterceptor \ + offapi/com/sun/star/frame/XDispatchRecorder \ + offapi/com/sun/star/frame/XDispatchRecorderSupplier \ + offapi/com/sun/star/frame/XDispatchResultListener \ + offapi/com/sun/star/frame/XDocumentTemplates \ + offapi/com/sun/star/frame/XExtendedFilterDetection \ + offapi/com/sun/star/frame/XFilterDetect \ + offapi/com/sun/star/frame/XFrame \ + offapi/com/sun/star/frame/XFrameActionListener \ + offapi/com/sun/star/frame/XFrameLoader \ + offapi/com/sun/star/frame/XFrameLoaderQuery \ + offapi/com/sun/star/frame/XFrameSetModel \ + offapi/com/sun/star/frame/XFrames \ + offapi/com/sun/star/frame/XFramesSupplier \ + offapi/com/sun/star/frame/XInplaceLayout \ + offapi/com/sun/star/frame/XInterceptorInfo \ + offapi/com/sun/star/frame/XLayoutManager \ + offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster \ + offapi/com/sun/star/frame/XLayoutManagerListener \ + offapi/com/sun/star/frame/XLoadEventListener \ + offapi/com/sun/star/frame/XLoadable \ + offapi/com/sun/star/frame/XMenuBarAcceptor \ + offapi/com/sun/star/frame/XMenuBarMergingAcceptor \ + offapi/com/sun/star/frame/XModel \ + offapi/com/sun/star/frame/XModel2 \ + offapi/com/sun/star/frame/XModule \ + offapi/com/sun/star/frame/XModuleManager \ + offapi/com/sun/star/frame/XNotifyingDispatch \ + offapi/com/sun/star/frame/XPopupMenuController \ + offapi/com/sun/star/frame/XRecordableDispatch \ + offapi/com/sun/star/frame/XSessionManagerClient \ + offapi/com/sun/star/frame/XSessionManagerListener \ + offapi/com/sun/star/frame/XSessionManagerListener2 \ + offapi/com/sun/star/frame/XStatusListener \ + offapi/com/sun/star/frame/XStatusbarController \ + offapi/com/sun/star/frame/XStorable \ + offapi/com/sun/star/frame/XStorable2 \ + offapi/com/sun/star/frame/XSubToolbarController \ + offapi/com/sun/star/frame/XSynchronousDispatch \ + offapi/com/sun/star/frame/XSynchronousFrameLoader \ + offapi/com/sun/star/frame/XTask \ + offapi/com/sun/star/frame/XTasksSupplier \ + offapi/com/sun/star/frame/XTerminateListener \ + offapi/com/sun/star/frame/XTerminateListener2 \ + offapi/com/sun/star/frame/XTitle \ + offapi/com/sun/star/frame/XTitleChangeBroadcaster \ + offapi/com/sun/star/frame/XTitleChangeListener \ + offapi/com/sun/star/frame/XToolbarController \ + offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory \ + offapi/com/sun/star/frame/XUIControllerRegistration \ + offapi/com/sun/star/frame/XUntitledNumbers \ + offapi/com/sun/star/frame/XUrlList \ + offapi/com/sun/star/frame/XWindowArranger \ + offapi/com/sun/star/frame/status/ClipboardFormats \ + offapi/com/sun/star/frame/status/FontHeight \ + offapi/com/sun/star/frame/status/ItemState \ + offapi/com/sun/star/frame/status/ItemStatus \ + offapi/com/sun/star/frame/status/LeftRightMargin \ + offapi/com/sun/star/frame/status/Template \ + offapi/com/sun/star/frame/status/UpperLowerMargin \ + offapi/com/sun/star/frame/status/UpperLowerMarginScale \ + offapi/com/sun/star/frame/status/Verb \ + offapi/com/sun/star/frame/status/Visibility \ + offapi/com/sun/star/gallery/GalleryItemType \ + offapi/com/sun/star/gallery/XGalleryItem \ + offapi/com/sun/star/gallery/XGalleryTheme \ + offapi/com/sun/star/gallery/XGalleryThemeProvider \ + offapi/com/sun/star/geometry/AffineMatrix2D \ + offapi/com/sun/star/geometry/AffineMatrix3D \ + offapi/com/sun/star/geometry/EllipticalArc \ + offapi/com/sun/star/geometry/IntegerBezierSegment2D \ + offapi/com/sun/star/geometry/IntegerPoint2D \ + offapi/com/sun/star/geometry/IntegerRectangle2D \ + offapi/com/sun/star/geometry/IntegerSize2D \ + offapi/com/sun/star/geometry/Matrix2D \ + offapi/com/sun/star/geometry/RealBezierSegment2D \ + offapi/com/sun/star/geometry/RealPoint2D \ + offapi/com/sun/star/geometry/RealRectangle2D \ + offapi/com/sun/star/geometry/RealRectangle3D \ + offapi/com/sun/star/geometry/RealSize2D \ + offapi/com/sun/star/geometry/XMapping2D \ + offapi/com/sun/star/graphic/GraphicColorMode \ + offapi/com/sun/star/graphic/GraphicType \ + offapi/com/sun/star/graphic/XGraphic \ + offapi/com/sun/star/graphic/XGraphicObject \ + offapi/com/sun/star/graphic/XGraphicProvider \ + offapi/com/sun/star/graphic/XGraphicRasterizer \ + offapi/com/sun/star/graphic/XGraphicRenderer \ + offapi/com/sun/star/graphic/XGraphicTransformer \ + offapi/com/sun/star/graphic/XPrimitive2D \ + offapi/com/sun/star/graphic/XPrimitive3D \ + offapi/com/sun/star/graphic/XPrimitiveFactory2D \ + offapi/com/sun/star/i18n/AmPmValue \ + offapi/com/sun/star/i18n/Boundary \ + offapi/com/sun/star/i18n/BreakType \ + offapi/com/sun/star/i18n/CTLScriptType \ + offapi/com/sun/star/i18n/Calendar \ + offapi/com/sun/star/i18n/CalendarDisplayCode \ + offapi/com/sun/star/i18n/CalendarDisplayIndex \ + offapi/com/sun/star/i18n/CalendarFieldIndex \ + offapi/com/sun/star/i18n/CalendarItem \ + offapi/com/sun/star/i18n/CharType \ + offapi/com/sun/star/i18n/CharacterIteratorMode \ + offapi/com/sun/star/i18n/CollatorOptions \ + offapi/com/sun/star/i18n/Currency \ + offapi/com/sun/star/i18n/Currency2 \ + offapi/com/sun/star/i18n/DirectionProperty \ + offapi/com/sun/star/i18n/ForbiddenCharacters \ + offapi/com/sun/star/i18n/FormatElement \ + offapi/com/sun/star/i18n/Implementation \ + offapi/com/sun/star/i18n/InputSequenceCheckMode \ + offapi/com/sun/star/i18n/KCharacterType \ + offapi/com/sun/star/i18n/KNumberFormatType \ + offapi/com/sun/star/i18n/KNumberFormatUsage \ + offapi/com/sun/star/i18n/KParseTokens \ + offapi/com/sun/star/i18n/KParseType \ + offapi/com/sun/star/i18n/LanguageCountryInfo \ + offapi/com/sun/star/i18n/LineBreakHyphenationOptions \ + offapi/com/sun/star/i18n/LineBreakResults \ + offapi/com/sun/star/i18n/LineBreakUserOptions \ + offapi/com/sun/star/i18n/LocaleDataItem \ + offapi/com/sun/star/i18n/LocaleItem \ + offapi/com/sun/star/i18n/Months \ + offapi/com/sun/star/i18n/MultipleCharsOutputException \ + offapi/com/sun/star/i18n/NativeNumberMode \ + offapi/com/sun/star/i18n/NativeNumberXmlAttributes \ + offapi/com/sun/star/i18n/NumberFormatCode \ + offapi/com/sun/star/i18n/NumberFormatIndex \ + offapi/com/sun/star/i18n/ParseResult \ + offapi/com/sun/star/i18n/ScriptDirection \ + offapi/com/sun/star/i18n/ScriptType \ + offapi/com/sun/star/i18n/TextConversionOption \ + offapi/com/sun/star/i18n/TextConversionResult \ + offapi/com/sun/star/i18n/TextConversionType \ + offapi/com/sun/star/i18n/TransliterationModules \ + offapi/com/sun/star/i18n/TransliterationModulesExtra \ + offapi/com/sun/star/i18n/TransliterationModulesNew \ + offapi/com/sun/star/i18n/TransliterationType \ + offapi/com/sun/star/i18n/UnicodeScript \ + offapi/com/sun/star/i18n/UnicodeType \ + offapi/com/sun/star/i18n/Weekdays \ + offapi/com/sun/star/i18n/WordType \ + offapi/com/sun/star/i18n/XBreakIterator \ + offapi/com/sun/star/i18n/XCalendar \ + offapi/com/sun/star/i18n/XCharacterClassification \ + offapi/com/sun/star/i18n/XCollator \ + offapi/com/sun/star/i18n/XExtendedCalendar \ + offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier \ + offapi/com/sun/star/i18n/XExtendedInputSequenceChecker \ + offapi/com/sun/star/i18n/XExtendedTextConversion \ + offapi/com/sun/star/i18n/XExtendedTransliteration \ + offapi/com/sun/star/i18n/XForbiddenCharacters \ + offapi/com/sun/star/i18n/XIndexEntrySupplier \ + offapi/com/sun/star/i18n/XInputSequenceChecker \ + offapi/com/sun/star/i18n/XLocaleData \ + offapi/com/sun/star/i18n/XLocaleData2 \ + offapi/com/sun/star/i18n/XNativeNumberSupplier \ + offapi/com/sun/star/i18n/XNumberFormatCode \ + offapi/com/sun/star/i18n/XOrdinalSuffix \ + offapi/com/sun/star/i18n/XScriptTypeDetector \ + offapi/com/sun/star/i18n/XTextConversion \ + offapi/com/sun/star/i18n/XTransliteration \ + offapi/com/sun/star/i18n/reservedWords \ + offapi/com/sun/star/inspection/InteractiveSelectionResult \ + offapi/com/sun/star/inspection/LineDescriptor \ + offapi/com/sun/star/inspection/PropertyCategoryDescriptor \ + offapi/com/sun/star/inspection/PropertyControlType \ + offapi/com/sun/star/inspection/PropertyLineElement \ + offapi/com/sun/star/inspection/XHyperlinkControl \ + offapi/com/sun/star/inspection/XNumericControl \ + offapi/com/sun/star/inspection/XObjectInspector \ + offapi/com/sun/star/inspection/XObjectInspectorModel \ + offapi/com/sun/star/inspection/XObjectInspectorUI \ + offapi/com/sun/star/inspection/XPropertyControl \ + offapi/com/sun/star/inspection/XPropertyControlContext \ + offapi/com/sun/star/inspection/XPropertyControlFactory \ + offapi/com/sun/star/inspection/XPropertyControlObserver \ + offapi/com/sun/star/inspection/XPropertyHandler \ + offapi/com/sun/star/inspection/XStringListControl \ + offapi/com/sun/star/inspection/XStringRepresentation \ + offapi/com/sun/star/installation/ProtDlgRes \ + offapi/com/sun/star/installation/XInstallationCheck \ + offapi/com/sun/star/installation/XProtocolHandlerCheck \ + offapi/com/sun/star/installation/protocols \ + offapi/com/sun/star/ldap/LdapConnectionException \ + offapi/com/sun/star/ldap/LdapGenericException \ + offapi/com/sun/star/linguistic2/ConversionDictionaryType \ + offapi/com/sun/star/linguistic2/ConversionDirection \ + offapi/com/sun/star/linguistic2/ConversionPropertyType \ + offapi/com/sun/star/linguistic2/DictionaryEvent \ + offapi/com/sun/star/linguistic2/DictionaryEventFlags \ + offapi/com/sun/star/linguistic2/DictionaryListEvent \ + offapi/com/sun/star/linguistic2/DictionaryListEventFlags \ + offapi/com/sun/star/linguistic2/DictionaryType \ + offapi/com/sun/star/linguistic2/LinguServiceEvent \ + offapi/com/sun/star/linguistic2/LinguServiceEventFlags \ + offapi/com/sun/star/linguistic2/ProofreadingResult \ + offapi/com/sun/star/linguistic2/SingleProofreadingError \ + offapi/com/sun/star/linguistic2/SpellFailure \ + offapi/com/sun/star/linguistic2/XAvailableLocales \ + offapi/com/sun/star/linguistic2/XConversionDictionary \ + offapi/com/sun/star/linguistic2/XConversionDictionaryList \ + offapi/com/sun/star/linguistic2/XConversionPropertyType \ + offapi/com/sun/star/linguistic2/XDictionary \ + offapi/com/sun/star/linguistic2/XDictionary1 \ + offapi/com/sun/star/linguistic2/XDictionaryEntry \ + offapi/com/sun/star/linguistic2/XDictionaryEventListener \ + offapi/com/sun/star/linguistic2/XDictionaryList \ + offapi/com/sun/star/linguistic2/XDictionaryListEventListener \ + offapi/com/sun/star/linguistic2/XHyphenatedWord \ + offapi/com/sun/star/linguistic2/XHyphenator \ + offapi/com/sun/star/linguistic2/XLanguageGuessing \ + offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster \ + offapi/com/sun/star/linguistic2/XLinguServiceEventListener \ + offapi/com/sun/star/linguistic2/XLinguServiceManager \ + offapi/com/sun/star/linguistic2/XMeaning \ + offapi/com/sun/star/linguistic2/XPossibleHyphens \ + offapi/com/sun/star/linguistic2/XProofreader \ + offapi/com/sun/star/linguistic2/XProofreadingIterator \ + offapi/com/sun/star/linguistic2/XSearchableDictionary \ + offapi/com/sun/star/linguistic2/XSearchableDictionaryList \ + offapi/com/sun/star/linguistic2/XSetSpellAlternatives \ + offapi/com/sun/star/linguistic2/XSpellAlternatives \ + offapi/com/sun/star/linguistic2/XSpellChecker \ + offapi/com/sun/star/linguistic2/XSpellChecker1 \ + offapi/com/sun/star/linguistic2/XSupportedLanguages \ + offapi/com/sun/star/linguistic2/XSupportedLocales \ + offapi/com/sun/star/linguistic2/XThesaurus \ + offapi/com/sun/star/logging/LogLevel \ + offapi/com/sun/star/logging/LogRecord \ + offapi/com/sun/star/logging/XConsoleHandler \ + offapi/com/sun/star/logging/XCsvLogFormatter \ + offapi/com/sun/star/logging/XLogFormatter \ + offapi/com/sun/star/logging/XLogHandler \ + offapi/com/sun/star/logging/XLogger \ + offapi/com/sun/star/logging/XLoggerPool \ + offapi/com/sun/star/logging/XSimpleLogRing \ + offapi/com/sun/star/mail/MailAttachment \ + offapi/com/sun/star/mail/MailException \ + offapi/com/sun/star/mail/MailServiceType \ + offapi/com/sun/star/mail/NoMailServiceProviderException \ + offapi/com/sun/star/mail/SendMailMessageFailedException \ + offapi/com/sun/star/mail/XAuthenticator \ + offapi/com/sun/star/mail/XConnectionListener \ + offapi/com/sun/star/mail/XMailMessage \ + offapi/com/sun/star/mail/XMailService \ + offapi/com/sun/star/mail/XMailServiceProvider \ + offapi/com/sun/star/mail/XSmtpService \ + offapi/com/sun/star/media/XFrameGrabber \ + offapi/com/sun/star/media/XManager \ + offapi/com/sun/star/media/XPlayer \ + offapi/com/sun/star/media/XPlayerWindow \ + offapi/com/sun/star/media/ZoomLevel \ + offapi/com/sun/star/mozilla/MenuMultipleChange \ + offapi/com/sun/star/mozilla/MenuSingleChange \ + offapi/com/sun/star/mozilla/MozillaProductType \ + offapi/com/sun/star/mozilla/XCloseSessionListener \ + offapi/com/sun/star/mozilla/XCodeProxy \ + offapi/com/sun/star/mozilla/XMenuProxy \ + offapi/com/sun/star/mozilla/XMenuProxyListener \ + offapi/com/sun/star/mozilla/XMozillaBootstrap \ + offapi/com/sun/star/mozilla/XPluginInstance \ + offapi/com/sun/star/mozilla/XPluginInstanceNotifySink \ + offapi/com/sun/star/mozilla/XPluginInstancePeer \ + offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer \ + offapi/com/sun/star/mozilla/XPluginWindowPeer \ + offapi/com/sun/star/mozilla/XProfileDiscover \ + offapi/com/sun/star/mozilla/XProfileManager \ + offapi/com/sun/star/mozilla/XProxyRunner \ + offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider \ + offapi/com/sun/star/office/XAnnotation \ + offapi/com/sun/star/office/XAnnotationAccess \ + offapi/com/sun/star/office/XAnnotationEnumeration \ + offapi/com/sun/star/oooimprovement/XCore \ + offapi/com/sun/star/oooimprovement/XCoreController \ + offapi/com/sun/star/packages/EncryptionNotAllowedException \ + offapi/com/sun/star/packages/NoEncryptionException \ + offapi/com/sun/star/packages/NoRawFormatException \ + offapi/com/sun/star/packages/WrongPasswordException \ + offapi/com/sun/star/packages/XDataSinkEncrSupport \ + offapi/com/sun/star/packages/manifest/XManifestReader \ + offapi/com/sun/star/packages/manifest/XManifestWriter \ + offapi/com/sun/star/packages/zip/XZipFileAccess \ + offapi/com/sun/star/packages/zip/ZipConstants \ + offapi/com/sun/star/packages/zip/ZipEntry \ + offapi/com/sun/star/packages/zip/ZipException \ + offapi/com/sun/star/packages/zip/ZipIOException \ + offapi/com/sun/star/plugin/PluginDescription \ + offapi/com/sun/star/plugin/PluginException \ + offapi/com/sun/star/plugin/PluginMode \ + offapi/com/sun/star/plugin/PluginVariable \ + offapi/com/sun/star/plugin/XPlugin \ + offapi/com/sun/star/plugin/XPluginContext \ + offapi/com/sun/star/plugin/XPluginManager \ + offapi/com/sun/star/presentation/AnimationEffect \ + offapi/com/sun/star/presentation/AnimationSpeed \ + offapi/com/sun/star/presentation/ClickAction \ + offapi/com/sun/star/presentation/EffectCommands \ + offapi/com/sun/star/presentation/EffectNodeType \ + offapi/com/sun/star/presentation/EffectPresetClass \ + offapi/com/sun/star/presentation/FadeEffect \ + offapi/com/sun/star/presentation/ParagraphTarget \ + offapi/com/sun/star/presentation/PresentationRange \ + offapi/com/sun/star/presentation/ShapeAnimationSubType \ + offapi/com/sun/star/presentation/TextAnimationType \ + offapi/com/sun/star/presentation/XCustomPresentationSupplier \ + offapi/com/sun/star/presentation/XHandoutMasterSupplier \ + offapi/com/sun/star/presentation/XPresentation \ + offapi/com/sun/star/presentation/XPresentation2 \ + offapi/com/sun/star/presentation/XPresentationPage \ + offapi/com/sun/star/presentation/XPresentationSupplier \ + offapi/com/sun/star/presentation/XShapeEventListener \ + offapi/com/sun/star/presentation/XSlideShow \ + offapi/com/sun/star/presentation/XSlideShowController \ + offapi/com/sun/star/presentation/XSlideShowListener \ + offapi/com/sun/star/presentation/XSlideShowView \ + offapi/com/sun/star/presentation/XTransition \ + offapi/com/sun/star/presentation/XTransitionFactory \ + offapi/com/sun/star/rdf/FileFormat \ + offapi/com/sun/star/rdf/ParseException \ + offapi/com/sun/star/rdf/QueryException \ + offapi/com/sun/star/rdf/RepositoryException \ + offapi/com/sun/star/rdf/Statement \ + offapi/com/sun/star/rdf/URIs \ + offapi/com/sun/star/rdf/XBlankNode \ + offapi/com/sun/star/rdf/XDocumentMetadataAccess \ + offapi/com/sun/star/rdf/XDocumentRepository \ + offapi/com/sun/star/rdf/XLiteral \ + offapi/com/sun/star/rdf/XMetadatable \ + offapi/com/sun/star/rdf/XNamedGraph \ + offapi/com/sun/star/rdf/XNode \ + offapi/com/sun/star/rdf/XQuerySelectResult \ + offapi/com/sun/star/rdf/XReifiedStatement \ + offapi/com/sun/star/rdf/XRepository \ + offapi/com/sun/star/rdf/XRepositorySupplier \ + offapi/com/sun/star/rdf/XResource \ + offapi/com/sun/star/rdf/XURI \ + offapi/com/sun/star/rendering/ARGBColor \ + offapi/com/sun/star/rendering/AnimationAttributes \ + offapi/com/sun/star/rendering/AnimationRepeat \ + offapi/com/sun/star/rendering/BlendMode \ + offapi/com/sun/star/rendering/Caret \ + offapi/com/sun/star/rendering/Color \ + offapi/com/sun/star/rendering/ColorComponent \ + offapi/com/sun/star/rendering/ColorComponentTag \ + offapi/com/sun/star/rendering/ColorProfile \ + offapi/com/sun/star/rendering/ColorSpaceType \ + offapi/com/sun/star/rendering/CompositeOperation \ + offapi/com/sun/star/rendering/EmphasisMark \ + offapi/com/sun/star/rendering/FillRule \ + offapi/com/sun/star/rendering/FloatingPointBitmapFormat \ + offapi/com/sun/star/rendering/FloatingPointBitmapLayout \ + offapi/com/sun/star/rendering/FontInfo \ + offapi/com/sun/star/rendering/FontMetrics \ + offapi/com/sun/star/rendering/FontRequest \ + offapi/com/sun/star/rendering/IntegerBitmapLayout \ + offapi/com/sun/star/rendering/InterpolationMode \ + offapi/com/sun/star/rendering/Panose \ + offapi/com/sun/star/rendering/PanoseArmStyle \ + offapi/com/sun/star/rendering/PanoseContrast \ + offapi/com/sun/star/rendering/PanoseFamilyTypes \ + offapi/com/sun/star/rendering/PanoseLetterForm \ + offapi/com/sun/star/rendering/PanoseMidline \ + offapi/com/sun/star/rendering/PanoseProportion \ + offapi/com/sun/star/rendering/PanoseSerifStyle \ + offapi/com/sun/star/rendering/PanoseStrokeVariation \ + offapi/com/sun/star/rendering/PanoseWeight \ + offapi/com/sun/star/rendering/PanoseXHeight \ + offapi/com/sun/star/rendering/PathCapType \ + offapi/com/sun/star/rendering/PathJoinType \ + offapi/com/sun/star/rendering/RGBColor \ + offapi/com/sun/star/rendering/RenderState \ + offapi/com/sun/star/rendering/RenderingIntent \ + offapi/com/sun/star/rendering/RepaintResult \ + offapi/com/sun/star/rendering/StringContext \ + offapi/com/sun/star/rendering/StrokeAttributes \ + offapi/com/sun/star/rendering/TextDirection \ + offapi/com/sun/star/rendering/TextHit \ + offapi/com/sun/star/rendering/Texture \ + offapi/com/sun/star/rendering/TexturingMode \ + offapi/com/sun/star/rendering/ViewState \ + offapi/com/sun/star/rendering/VolatileContentDestroyedException \ + offapi/com/sun/star/rendering/XAnimatedSprite \ + offapi/com/sun/star/rendering/XAnimation \ + offapi/com/sun/star/rendering/XBezierPolyPolygon2D \ + offapi/com/sun/star/rendering/XBitmap \ + offapi/com/sun/star/rendering/XBitmapCanvas \ + offapi/com/sun/star/rendering/XBitmapPalette \ + offapi/com/sun/star/rendering/XBufferController \ + offapi/com/sun/star/rendering/XCachedPrimitive \ + offapi/com/sun/star/rendering/XCanvas \ + offapi/com/sun/star/rendering/XCanvasFont \ + offapi/com/sun/star/rendering/XColorSpace \ + offapi/com/sun/star/rendering/XCustomSprite \ + offapi/com/sun/star/rendering/XGraphicDevice \ + offapi/com/sun/star/rendering/XHalfFloatBitmap \ + offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap \ + offapi/com/sun/star/rendering/XIeeeDoubleBitmap \ + offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap \ + offapi/com/sun/star/rendering/XIeeeFloatBitmap \ + offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap \ + offapi/com/sun/star/rendering/XIntegerBitmap \ + offapi/com/sun/star/rendering/XIntegerBitmapColorSpace \ + offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap \ + offapi/com/sun/star/rendering/XLinePolyPolygon2D \ + offapi/com/sun/star/rendering/XMtfRenderer \ + offapi/com/sun/star/rendering/XParametricPolyPolygon2D \ + offapi/com/sun/star/rendering/XPolyPolygon2D \ + offapi/com/sun/star/rendering/XSimpleCanvas \ + offapi/com/sun/star/rendering/XSprite \ + offapi/com/sun/star/rendering/XSpriteCanvas \ + offapi/com/sun/star/rendering/XTextLayout \ + offapi/com/sun/star/rendering/XVolatileBitmap \ + offapi/com/sun/star/report/ForceNewPage \ + offapi/com/sun/star/report/GroupKeepTogether \ + offapi/com/sun/star/report/GroupOn \ + offapi/com/sun/star/report/KeepTogether \ + offapi/com/sun/star/report/ReportPrintOption \ + offapi/com/sun/star/report/XFixedLine \ + offapi/com/sun/star/report/XFixedText \ + offapi/com/sun/star/report/XFormatCondition \ + offapi/com/sun/star/report/XFormattedField \ + offapi/com/sun/star/report/XFunction \ + offapi/com/sun/star/report/XFunctions \ + offapi/com/sun/star/report/XFunctionsSupplier \ + offapi/com/sun/star/report/XGroup \ + offapi/com/sun/star/report/XGroups \ + offapi/com/sun/star/report/XImageControl \ + offapi/com/sun/star/report/XReportComponent \ + offapi/com/sun/star/report/XReportControlFormat \ + offapi/com/sun/star/report/XReportControlModel \ + offapi/com/sun/star/report/XReportDefinition \ + offapi/com/sun/star/report/XReportEngine \ + offapi/com/sun/star/report/XSection \ + offapi/com/sun/star/report/XShape \ + offapi/com/sun/star/report/meta/XFormulaParser \ + offapi/com/sun/star/report/meta/XFunctionCategory \ + offapi/com/sun/star/report/meta/XFunctionDescription \ + offapi/com/sun/star/report/meta/XFunctionManager \ + offapi/com/sun/star/resource/MissingResourceException \ + offapi/com/sun/star/resource/XLocale \ + offapi/com/sun/star/resource/XResourceBundle \ + offapi/com/sun/star/resource/XResourceBundleLoader \ + offapi/com/sun/star/resource/XStringResourceManager \ + offapi/com/sun/star/resource/XStringResourcePersistence \ + offapi/com/sun/star/resource/XStringResourceResolver \ + offapi/com/sun/star/resource/XStringResourceSupplier \ + offapi/com/sun/star/resource/XStringResourceWithLocation \ + offapi/com/sun/star/resource/XStringResourceWithStorage \ + offapi/com/sun/star/scanner/ScanError \ + offapi/com/sun/star/scanner/ScannerContext \ + offapi/com/sun/star/scanner/ScannerException \ + offapi/com/sun/star/scanner/XScannerManager \ + offapi/com/sun/star/script/LibraryNotLoadedException \ + offapi/com/sun/star/script/ModuleInfo \ + offapi/com/sun/star/script/ModuleSizeExceededRequest \ + offapi/com/sun/star/script/ModuleType \ + offapi/com/sun/star/script/NativeObjectWrapper \ + offapi/com/sun/star/script/XLibraryContainer \ + offapi/com/sun/star/script/XLibraryContainer2 \ + offapi/com/sun/star/script/XLibraryContainer3 \ + offapi/com/sun/star/script/XLibraryContainerExport \ + offapi/com/sun/star/script/XLibraryContainerPassword \ + offapi/com/sun/star/script/XLibraryQueryExecutable \ + offapi/com/sun/star/script/XPersistentLibraryContainer \ + offapi/com/sun/star/script/XStorageBasedLibraryContainer \ + offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes \ + offapi/com/sun/star/script/browse/BrowseNodeTypes \ + offapi/com/sun/star/script/browse/XBrowseNode \ + offapi/com/sun/star/script/browse/XBrowseNodeFactory \ + offapi/com/sun/star/script/provider/ScriptErrorRaisedException \ + offapi/com/sun/star/script/provider/ScriptExceptionRaisedException \ + offapi/com/sun/star/script/provider/ScriptFrameworkErrorException \ + offapi/com/sun/star/script/provider/ScriptFrameworkErrorType \ + offapi/com/sun/star/script/provider/XScript \ + offapi/com/sun/star/script/provider/XScriptContext \ + offapi/com/sun/star/script/provider/XScriptProvider \ + offapi/com/sun/star/script/provider/XScriptProviderFactory \ + offapi/com/sun/star/script/provider/XScriptProviderSupplier \ + offapi/com/sun/star/script/provider/XScriptURIHelper \ + offapi/com/sun/star/script/vba/VBAEventId \ + offapi/com/sun/star/script/vba/VBAScriptEvent \ + offapi/com/sun/star/script/vba/VBAScriptEventId \ + offapi/com/sun/star/script/vba/XVBACompatibility \ + offapi/com/sun/star/script/vba/XVBAEventProcessor \ + offapi/com/sun/star/script/vba/XVBAMacroResolver \ + offapi/com/sun/star/script/vba/XVBAModuleInfo \ + offapi/com/sun/star/script/vba/XVBAScriptListener \ + offapi/com/sun/star/sdb/BooleanComparisonMode \ + offapi/com/sun/star/sdb/CommandType \ + offapi/com/sun/star/sdb/DatabaseRegistrationEvent \ + offapi/com/sun/star/sdb/DocumentSaveRequest \ + offapi/com/sun/star/sdb/ErrorCondition \ + offapi/com/sun/star/sdb/ParametersRequest \ + offapi/com/sun/star/sdb/RowChangeAction \ + offapi/com/sun/star/sdb/RowChangeEvent \ + offapi/com/sun/star/sdb/RowSetVetoException \ + offapi/com/sun/star/sdb/RowsChangeEvent \ + offapi/com/sun/star/sdb/SQLContext \ + offapi/com/sun/star/sdb/SQLErrorEvent \ + offapi/com/sun/star/sdb/SQLFilterOperator \ + offapi/com/sun/star/sdb/XAlterQuery \ + offapi/com/sun/star/sdb/XBookmarksSupplier \ + offapi/com/sun/star/sdb/XColumn \ + offapi/com/sun/star/sdb/XColumnUpdate \ + offapi/com/sun/star/sdb/XCommandPreparation \ + offapi/com/sun/star/sdb/XCompletedConnection \ + offapi/com/sun/star/sdb/XCompletedExecution \ + offapi/com/sun/star/sdb/XDataAccessDescriptorFactory \ + offapi/com/sun/star/sdb/XDatabaseAccess \ + offapi/com/sun/star/sdb/XDatabaseAccessListener \ + offapi/com/sun/star/sdb/XDatabaseEnvironment \ + offapi/com/sun/star/sdb/XDatabaseRegistrations \ + offapi/com/sun/star/sdb/XDatabaseRegistrationsListener \ + offapi/com/sun/star/sdb/XDocumentDataSource \ + offapi/com/sun/star/sdb/XFormDocumentsSupplier \ + offapi/com/sun/star/sdb/XInteractionDocumentSave \ + offapi/com/sun/star/sdb/XInteractionSupplyParameters \ + offapi/com/sun/star/sdb/XOfficeDatabaseDocument \ + offapi/com/sun/star/sdb/XParametersSupplier \ + offapi/com/sun/star/sdb/XQueriesSupplier \ + offapi/com/sun/star/sdb/XQueryDefinitionsSupplier \ + offapi/com/sun/star/sdb/XReportDocumentsSupplier \ + offapi/com/sun/star/sdb/XResultSetAccess \ + offapi/com/sun/star/sdb/XRowSetApproveBroadcaster \ + offapi/com/sun/star/sdb/XRowSetApproveListener \ + offapi/com/sun/star/sdb/XRowSetChangeBroadcaster \ + offapi/com/sun/star/sdb/XRowSetChangeListener \ + offapi/com/sun/star/sdb/XRowSetSupplier \ + offapi/com/sun/star/sdb/XRowsChangeBroadcaster \ + offapi/com/sun/star/sdb/XRowsChangeListener \ + offapi/com/sun/star/sdb/XSQLErrorBroadcaster \ + offapi/com/sun/star/sdb/XSQLErrorListener \ + offapi/com/sun/star/sdb/XSQLQueryComposer \ + offapi/com/sun/star/sdb/XSQLQueryComposerFactory \ + offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer \ + offapi/com/sun/star/sdb/XSingleSelectQueryComposer \ + offapi/com/sun/star/sdb/XSubDocument \ + offapi/com/sun/star/sdb/application/CopyTableContinuation \ + offapi/com/sun/star/sdb/application/CopyTableOperation \ + offapi/com/sun/star/sdb/application/CopyTableRowEvent \ + offapi/com/sun/star/sdb/application/DatabaseObject \ + offapi/com/sun/star/sdb/application/DatabaseObjectContainer \ + offapi/com/sun/star/sdb/application/NamedDatabaseObject \ + offapi/com/sun/star/sdb/application/XCopyTableListener \ + offapi/com/sun/star/sdb/application/XCopyTableWizard \ + offapi/com/sun/star/sdb/application/XDatabaseDocumentUI \ + offapi/com/sun/star/sdb/application/XTableUIProvider \ + offapi/com/sun/star/sdb/tools/CompositionType \ + offapi/com/sun/star/sdb/tools/XConnectionSupplier \ + offapi/com/sun/star/sdb/tools/XConnectionTools \ + offapi/com/sun/star/sdb/tools/XDataSourceMetaData \ + offapi/com/sun/star/sdb/tools/XIndexAlteration \ + offapi/com/sun/star/sdb/tools/XKeyAlteration \ + offapi/com/sun/star/sdb/tools/XObjectNames \ + offapi/com/sun/star/sdb/tools/XTableAlteration \ + offapi/com/sun/star/sdb/tools/XTableName \ + offapi/com/sun/star/sdb/tools/XTableRename \ + offapi/com/sun/star/sdb/tools/XViewAccess \ + offapi/com/sun/star/sdbc/BatchUpdateException \ + offapi/com/sun/star/sdbc/BestRowScope \ + offapi/com/sun/star/sdbc/BestRowType \ + offapi/com/sun/star/sdbc/ChangeAction \ + offapi/com/sun/star/sdbc/ChangeEvent \ + offapi/com/sun/star/sdbc/ColumnSearch \ + offapi/com/sun/star/sdbc/ColumnType \ + offapi/com/sun/star/sdbc/ColumnValue \ + offapi/com/sun/star/sdbc/DataTruncation \ + offapi/com/sun/star/sdbc/DataType \ + offapi/com/sun/star/sdbc/Deferrability \ + offapi/com/sun/star/sdbc/DriverPropertyInfo \ + offapi/com/sun/star/sdbc/FetchDirection \ + offapi/com/sun/star/sdbc/IndexType \ + offapi/com/sun/star/sdbc/KeyRule \ + offapi/com/sun/star/sdbc/ProcedureColumn \ + offapi/com/sun/star/sdbc/ProcedureResult \ + offapi/com/sun/star/sdbc/ResultSetConcurrency \ + offapi/com/sun/star/sdbc/ResultSetType \ + offapi/com/sun/star/sdbc/SQLException \ + offapi/com/sun/star/sdbc/SQLWarning \ + offapi/com/sun/star/sdbc/TransactionIsolation \ + offapi/com/sun/star/sdbc/XArray \ + offapi/com/sun/star/sdbc/XBatchExecution \ + offapi/com/sun/star/sdbc/XBlob \ + offapi/com/sun/star/sdbc/XClob \ + offapi/com/sun/star/sdbc/XCloseable \ + offapi/com/sun/star/sdbc/XColumnLocate \ + offapi/com/sun/star/sdbc/XConnection \ + offapi/com/sun/star/sdbc/XDataSource \ + offapi/com/sun/star/sdbc/XDatabaseMetaData \ + offapi/com/sun/star/sdbc/XDatabaseMetaData2 \ + offapi/com/sun/star/sdbc/XDriver \ + offapi/com/sun/star/sdbc/XDriverAccess \ + offapi/com/sun/star/sdbc/XDriverManager \ + offapi/com/sun/star/sdbc/XGeneratedResultSet \ + offapi/com/sun/star/sdbc/XIsolatedConnection \ + offapi/com/sun/star/sdbc/XMultipleResults \ + offapi/com/sun/star/sdbc/XOutParameters \ + offapi/com/sun/star/sdbc/XParameters \ + offapi/com/sun/star/sdbc/XPooledConnection \ + offapi/com/sun/star/sdbc/XPreparedBatchExecution \ + offapi/com/sun/star/sdbc/XPreparedStatement \ + offapi/com/sun/star/sdbc/XRef \ + offapi/com/sun/star/sdbc/XResultSet \ + offapi/com/sun/star/sdbc/XResultSetMetaData \ + offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier \ + offapi/com/sun/star/sdbc/XResultSetUpdate \ + offapi/com/sun/star/sdbc/XRow \ + offapi/com/sun/star/sdbc/XRowSet \ + offapi/com/sun/star/sdbc/XRowSetListener \ + offapi/com/sun/star/sdbc/XRowUpdate \ + offapi/com/sun/star/sdbc/XSQLData \ + offapi/com/sun/star/sdbc/XSQLInput \ + offapi/com/sun/star/sdbc/XSQLOutput \ + offapi/com/sun/star/sdbc/XStatement \ + offapi/com/sun/star/sdbc/XStruct \ + offapi/com/sun/star/sdbc/XWarningsSupplier \ + offapi/com/sun/star/sdbcx/CheckOption \ + offapi/com/sun/star/sdbcx/CompareBookmark \ + offapi/com/sun/star/sdbcx/KeyType \ + offapi/com/sun/star/sdbcx/Privilege \ + offapi/com/sun/star/sdbcx/PrivilegeObject \ + offapi/com/sun/star/sdbcx/XAlterTable \ + offapi/com/sun/star/sdbcx/XAlterView \ + offapi/com/sun/star/sdbcx/XAppend \ + offapi/com/sun/star/sdbcx/XAuthorizable \ + offapi/com/sun/star/sdbcx/XColumnsSupplier \ + offapi/com/sun/star/sdbcx/XCreateCatalog \ + offapi/com/sun/star/sdbcx/XDataDefinitionSupplier \ + offapi/com/sun/star/sdbcx/XDataDescriptorFactory \ + offapi/com/sun/star/sdbcx/XDeleteRows \ + offapi/com/sun/star/sdbcx/XDrop \ + offapi/com/sun/star/sdbcx/XDropCatalog \ + offapi/com/sun/star/sdbcx/XGroupsSupplier \ + offapi/com/sun/star/sdbcx/XIndexesSupplier \ + offapi/com/sun/star/sdbcx/XKeysSupplier \ + offapi/com/sun/star/sdbcx/XRename \ + offapi/com/sun/star/sdbcx/XRowLocate \ + offapi/com/sun/star/sdbcx/XTablesSupplier \ + offapi/com/sun/star/sdbcx/XUser \ + offapi/com/sun/star/sdbcx/XUsersSupplier \ + offapi/com/sun/star/sdbcx/XViewsSupplier \ + offapi/com/sun/star/security/CertAltNameEntry \ + offapi/com/sun/star/security/CertificateCharacters \ + offapi/com/sun/star/security/CertificateContainerStatus \ + offapi/com/sun/star/security/CertificateException \ + offapi/com/sun/star/security/CertificateValidity \ + offapi/com/sun/star/security/CryptographyException \ + offapi/com/sun/star/security/DocumentSignatureInformation \ + offapi/com/sun/star/security/EncryptionException \ + offapi/com/sun/star/security/ExtAltNameType \ + offapi/com/sun/star/security/KeyException \ + offapi/com/sun/star/security/KeyUsage \ + offapi/com/sun/star/security/NoPasswordException \ + offapi/com/sun/star/security/SecurityInfrastructureException \ + offapi/com/sun/star/security/SignatureException \ + offapi/com/sun/star/security/XCertificate \ + offapi/com/sun/star/security/XCertificateContainer \ + offapi/com/sun/star/security/XCertificateExtension \ + offapi/com/sun/star/security/XDocumentDigitalSignatures \ + offapi/com/sun/star/security/XSanExtension \ + offapi/com/sun/star/security/XSerialNumberAdapter \ + offapi/com/sun/star/setup/ActionType \ + offapi/com/sun/star/setup/BaseAction \ + offapi/com/sun/star/setup/CopyFileAction \ + offapi/com/sun/star/setup/DeleteDirAction \ + offapi/com/sun/star/setup/DeleteFileAction \ + offapi/com/sun/star/setup/DeleteFolderAction \ + offapi/com/sun/star/setup/DeleteFolderItemAction \ + offapi/com/sun/star/setup/DownloadAction \ + offapi/com/sun/star/setup/FontAction \ + offapi/com/sun/star/setup/InstallEnvironment \ + offapi/com/sun/star/setup/InstallResponse \ + offapi/com/sun/star/setup/InstallType \ + offapi/com/sun/star/setup/MakeDirAction \ + offapi/com/sun/star/setup/MakeFolderAction \ + offapi/com/sun/star/setup/MakeFolderItemAction \ + offapi/com/sun/star/setup/MakeShortcutAction \ + offapi/com/sun/star/setup/MirrorEntry \ + offapi/com/sun/star/setup/ModuleInfo \ + offapi/com/sun/star/setup/ModuleState \ + offapi/com/sun/star/setup/OSType \ + offapi/com/sun/star/setup/ProfileItemAction \ + offapi/com/sun/star/setup/ResponseErrorCode \ + offapi/com/sun/star/setup/SizeInfo \ + offapi/com/sun/star/setup/UnzipAction \ + offapi/com/sun/star/setup/UpdateType \ + offapi/com/sun/star/setup/VersionIdentifier \ + offapi/com/sun/star/setup/WindowsRegistryAction \ + offapi/com/sun/star/setup/XSetup \ + offapi/com/sun/star/sheet/ActivationEvent \ + offapi/com/sun/star/sheet/AddressConvention \ + offapi/com/sun/star/sheet/Border \ + offapi/com/sun/star/sheet/CellDeleteMode \ + offapi/com/sun/star/sheet/CellFlags \ + offapi/com/sun/star/sheet/CellInsertMode \ + offapi/com/sun/star/sheet/ComplexReference \ + offapi/com/sun/star/sheet/ConditionOperator \ + offapi/com/sun/star/sheet/ConditionOperator2 \ + offapi/com/sun/star/sheet/DDEItemInfo \ + offapi/com/sun/star/sheet/DDELinkInfo \ + offapi/com/sun/star/sheet/DDELinkMode \ + offapi/com/sun/star/sheet/DataImportMode \ + offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo \ + offapi/com/sun/star/sheet/DataPilotFieldFilter \ + offapi/com/sun/star/sheet/DataPilotFieldGroupBy \ + offapi/com/sun/star/sheet/DataPilotFieldGroupInfo \ + offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo \ + offapi/com/sun/star/sheet/DataPilotFieldLayoutMode \ + offapi/com/sun/star/sheet/DataPilotFieldOrientation \ + offapi/com/sun/star/sheet/DataPilotFieldReference \ + offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType \ + offapi/com/sun/star/sheet/DataPilotFieldReferenceType \ + offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode \ + offapi/com/sun/star/sheet/DataPilotFieldSortInfo \ + offapi/com/sun/star/sheet/DataPilotFieldSortMode \ + offapi/com/sun/star/sheet/DataPilotOutputRangeType \ + offapi/com/sun/star/sheet/DataPilotTableHeaderData \ + offapi/com/sun/star/sheet/DataPilotTablePositionData \ + offapi/com/sun/star/sheet/DataPilotTablePositionType \ + offapi/com/sun/star/sheet/DataPilotTableResultData \ + offapi/com/sun/star/sheet/DataResult \ + offapi/com/sun/star/sheet/DataResultFlags \ + offapi/com/sun/star/sheet/DimensionFlags \ + offapi/com/sun/star/sheet/ExternalLinkInfo \ + offapi/com/sun/star/sheet/ExternalLinkType \ + offapi/com/sun/star/sheet/ExternalReference \ + offapi/com/sun/star/sheet/FillDateMode \ + offapi/com/sun/star/sheet/FillDirection \ + offapi/com/sun/star/sheet/FillMode \ + offapi/com/sun/star/sheet/FilterConnection \ + offapi/com/sun/star/sheet/FilterOperator \ + offapi/com/sun/star/sheet/FilterOperator2 \ + offapi/com/sun/star/sheet/FormulaLanguage \ + offapi/com/sun/star/sheet/FormulaMapGroup \ + offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset \ + offapi/com/sun/star/sheet/FormulaOpCodeMapEntry \ + offapi/com/sun/star/sheet/FormulaResult \ + offapi/com/sun/star/sheet/FormulaToken \ + offapi/com/sun/star/sheet/FunctionArgument \ + offapi/com/sun/star/sheet/FunctionCategory \ + offapi/com/sun/star/sheet/GeneralFunction \ + offapi/com/sun/star/sheet/GoalResult \ + offapi/com/sun/star/sheet/LocalizedName \ + offapi/com/sun/star/sheet/MemberResult \ + offapi/com/sun/star/sheet/MemberResultFlags \ + offapi/com/sun/star/sheet/MoveDirection \ + offapi/com/sun/star/sheet/NamedRangeFlag \ + offapi/com/sun/star/sheet/NameToken \ + offapi/com/sun/star/sheet/NoConvergenceException \ + offapi/com/sun/star/sheet/PasteOperation \ + offapi/com/sun/star/sheet/RangeSelectionEvent \ + offapi/com/sun/star/sheet/ReferenceFlags \ + offapi/com/sun/star/sheet/ResultEvent \ + offapi/com/sun/star/sheet/SheetLinkMode \ + offapi/com/sun/star/sheet/SingleReference \ + offapi/com/sun/star/sheet/SolverConstraint \ + offapi/com/sun/star/sheet/SolverConstraintOperator \ + offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode \ + offapi/com/sun/star/sheet/StatusBarFunction \ + offapi/com/sun/star/sheet/SubTotalColumn \ + offapi/com/sun/star/sheet/TableFilterField \ + offapi/com/sun/star/sheet/TableFilterField2 \ + offapi/com/sun/star/sheet/TableOperationMode \ + offapi/com/sun/star/sheet/TablePageBreakData \ + offapi/com/sun/star/sheet/TableValidationVisibility \ + offapi/com/sun/star/sheet/ValidationAlertStyle \ + offapi/com/sun/star/sheet/ValidationType \ + offapi/com/sun/star/sheet/XActivationBroadcaster \ + offapi/com/sun/star/sheet/XActivationEventListener \ + offapi/com/sun/star/sheet/XAddIn \ + offapi/com/sun/star/sheet/XAreaLink \ + offapi/com/sun/star/sheet/XAreaLinks \ + offapi/com/sun/star/sheet/XArrayFormulaRange \ + offapi/com/sun/star/sheet/XArrayFormulaTokens \ + offapi/com/sun/star/sheet/XCalculatable \ + offapi/com/sun/star/sheet/XCellAddressable \ + offapi/com/sun/star/sheet/XCellFormatRangesSupplier \ + offapi/com/sun/star/sheet/XCellRangeAddressable \ + offapi/com/sun/star/sheet/XCellRangeData \ + offapi/com/sun/star/sheet/XCellRangeFormula \ + offapi/com/sun/star/sheet/XCellRangeMovement \ + offapi/com/sun/star/sheet/XCellRangeReferrer \ + offapi/com/sun/star/sheet/XCellRangesAccess \ + offapi/com/sun/star/sheet/XCellRangesQuery \ + offapi/com/sun/star/sheet/XCellSeries \ + offapi/com/sun/star/sheet/XCompatibilityNames \ + offapi/com/sun/star/sheet/XConsolidatable \ + offapi/com/sun/star/sheet/XConsolidationDescriptor \ + offapi/com/sun/star/sheet/XDDELink \ + offapi/com/sun/star/sheet/XDDELinkResults \ + offapi/com/sun/star/sheet/XDDELinks \ + offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier \ + offapi/com/sun/star/sheet/XDataPilotDescriptor \ + offapi/com/sun/star/sheet/XDataPilotField \ + offapi/com/sun/star/sheet/XDataPilotFieldGrouping \ + offapi/com/sun/star/sheet/XDataPilotMemberResults \ + offapi/com/sun/star/sheet/XDataPilotResults \ + offapi/com/sun/star/sheet/XDataPilotTable \ + offapi/com/sun/star/sheet/XDataPilotTable2 \ + offapi/com/sun/star/sheet/XDataPilotTables \ + offapi/com/sun/star/sheet/XDataPilotTablesSupplier \ + offapi/com/sun/star/sheet/XDatabaseRange \ + offapi/com/sun/star/sheet/XDatabaseRanges \ + offapi/com/sun/star/sheet/XDimensionsSupplier \ + offapi/com/sun/star/sheet/XDocumentAuditing \ + offapi/com/sun/star/sheet/XDrillDownDataSupplier \ + offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster \ + offapi/com/sun/star/sheet/XExternalDocLink \ + offapi/com/sun/star/sheet/XExternalDocLinks \ + offapi/com/sun/star/sheet/XExternalSheetCache \ + offapi/com/sun/star/sheet/XExternalSheetName \ + offapi/com/sun/star/sheet/XFillAcrossSheet \ + offapi/com/sun/star/sheet/XFilterFormulaParser \ + offapi/com/sun/star/sheet/XFormulaOpCodeMapper \ + offapi/com/sun/star/sheet/XFormulaParser \ + offapi/com/sun/star/sheet/XFormulaQuery \ + offapi/com/sun/star/sheet/XFormulaTokens \ + offapi/com/sun/star/sheet/XFunctionAccess \ + offapi/com/sun/star/sheet/XFunctionDescriptions \ + offapi/com/sun/star/sheet/XGoalSeek \ + offapi/com/sun/star/sheet/XHeaderFooterContent \ + offapi/com/sun/star/sheet/XHierarchiesSupplier \ + offapi/com/sun/star/sheet/XLabelRange \ + offapi/com/sun/star/sheet/XLabelRanges \ + offapi/com/sun/star/sheet/XLevelsSupplier \ + offapi/com/sun/star/sheet/XMembersSupplier \ + offapi/com/sun/star/sheet/XMultiFormulaTokens \ + offapi/com/sun/star/sheet/XMultipleOperation \ + offapi/com/sun/star/sheet/XNamedRange \ + offapi/com/sun/star/sheet/XNamedRanges \ + offapi/com/sun/star/sheet/XPrintAreas \ + offapi/com/sun/star/sheet/XRangeSelection \ + offapi/com/sun/star/sheet/XRangeSelectionChangeListener \ + offapi/com/sun/star/sheet/XRangeSelectionListener \ + offapi/com/sun/star/sheet/XRecentFunctions \ + offapi/com/sun/star/sheet/XResultListener \ + offapi/com/sun/star/sheet/XScenario \ + offapi/com/sun/star/sheet/XScenarioEnhanced \ + offapi/com/sun/star/sheet/XScenarios \ + offapi/com/sun/star/sheet/XScenariosSupplier \ + offapi/com/sun/star/sheet/XSheetAnnotation \ + offapi/com/sun/star/sheet/XSheetAnnotationAnchor \ + offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier \ + offapi/com/sun/star/sheet/XSheetAnnotations \ + offapi/com/sun/star/sheet/XSheetAnnotationsSupplier \ + offapi/com/sun/star/sheet/XSheetAuditing \ + offapi/com/sun/star/sheet/XSheetCellCursor \ + offapi/com/sun/star/sheet/XSheetCellRange \ + offapi/com/sun/star/sheet/XSheetCellRangeContainer \ + offapi/com/sun/star/sheet/XSheetCellRanges \ + offapi/com/sun/star/sheet/XSheetCondition \ + offapi/com/sun/star/sheet/XSheetCondition2 \ + offapi/com/sun/star/sheet/XSheetConditionalEntries \ + offapi/com/sun/star/sheet/XSheetConditionalEntry \ + offapi/com/sun/star/sheet/XSheetFilterDescriptor \ + offapi/com/sun/star/sheet/XSheetFilterDescriptor2 \ + offapi/com/sun/star/sheet/XSheetFilterable \ + offapi/com/sun/star/sheet/XSheetFilterableEx \ + offapi/com/sun/star/sheet/XSheetLinkable \ + offapi/com/sun/star/sheet/XSheetOperation \ + offapi/com/sun/star/sheet/XSheetOutline \ + offapi/com/sun/star/sheet/XSheetPageBreak \ + offapi/com/sun/star/sheet/XSheetPastable \ + offapi/com/sun/star/sheet/XSolver \ + offapi/com/sun/star/sheet/XSolverDescription \ + offapi/com/sun/star/sheet/XSpreadsheet \ + offapi/com/sun/star/sheet/XSpreadsheetDocument \ + offapi/com/sun/star/sheet/XSpreadsheetView \ + offapi/com/sun/star/sheet/XSpreadsheets \ + offapi/com/sun/star/sheet/XSubTotalCalculatable \ + offapi/com/sun/star/sheet/XSubTotalDescriptor \ + offapi/com/sun/star/sheet/XSubTotalField \ + offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier \ + offapi/com/sun/star/sheet/XUnnamedDatabaseRanges \ + offapi/com/sun/star/sheet/XUsedAreaCursor \ + offapi/com/sun/star/sheet/XViewFreezable \ + offapi/com/sun/star/sheet/XViewPane \ + offapi/com/sun/star/sheet/XViewPanesSupplier \ + offapi/com/sun/star/sheet/XViewSplitable \ + offapi/com/sun/star/sheet/XVolatileResult \ + offapi/com/sun/star/sheet/_NamedRange \ + offapi/com/sun/star/smarttags/SmartTagRecognizerMode \ + offapi/com/sun/star/smarttags/XSmartTagAction \ + offapi/com/sun/star/smarttags/XSmartTagRecognizer \ + offapi/com/sun/star/style/BreakType \ + offapi/com/sun/star/style/CaseMap \ + offapi/com/sun/star/style/DropCapFormat \ + offapi/com/sun/star/style/GraphicLocation \ + offapi/com/sun/star/style/HorizontalAlignment \ + offapi/com/sun/star/style/LineNumberPosition \ + offapi/com/sun/star/style/LineSpacing \ + offapi/com/sun/star/style/LineSpacingMode \ + offapi/com/sun/star/style/NumberingType \ + offapi/com/sun/star/style/PageStyleLayout \ + offapi/com/sun/star/style/ParagraphAdjust \ + offapi/com/sun/star/style/ParagraphStyleCategory \ + offapi/com/sun/star/style/TabAlign \ + offapi/com/sun/star/style/TabStop \ + offapi/com/sun/star/style/VerticalAlignment \ + offapi/com/sun/star/style/XAutoStyle \ + offapi/com/sun/star/style/XAutoStyleFamily \ + offapi/com/sun/star/style/XAutoStyles \ + offapi/com/sun/star/style/XAutoStylesSupplier \ + offapi/com/sun/star/style/XDefaultsSupplier \ + offapi/com/sun/star/style/XStyle \ + offapi/com/sun/star/style/XStyleCondition \ + offapi/com/sun/star/style/XStyleFamiliesSupplier \ + offapi/com/sun/star/style/XStyleLoader \ + offapi/com/sun/star/style/XStyleSupplier \ + offapi/com/sun/star/svg/XSVGPrinter \ + offapi/com/sun/star/svg/XSVGWriter \ + offapi/com/sun/star/sync/FilterData \ + offapi/com/sun/star/sync/SyncAction \ + offapi/com/sun/star/sync/SyncElement \ + offapi/com/sun/star/sync/SyncEvent \ + offapi/com/sun/star/sync/SyncInfo \ + offapi/com/sun/star/sync/SyncMode \ + offapi/com/sun/star/sync/SyncOptions \ + offapi/com/sun/star/sync/SyncScheme \ + offapi/com/sun/star/sync/SyncType \ + offapi/com/sun/star/sync/XSyncCollector \ + offapi/com/sun/star/sync/XSynchronizer \ + offapi/com/sun/star/sync2/BadPartnershipException \ + offapi/com/sun/star/system/SimpleMailClientFlags \ + offapi/com/sun/star/system/SystemShellExecuteException \ + offapi/com/sun/star/system/SystemShellExecuteFlags \ + offapi/com/sun/star/system/XProxySettings \ + offapi/com/sun/star/system/XSimpleMailClient \ + offapi/com/sun/star/system/XSimpleMailClientSupplier \ + offapi/com/sun/star/system/XSimpleMailMessage \ + offapi/com/sun/star/system/XSystemShellExecute \ + offapi/com/sun/star/table/BorderLine \ + offapi/com/sun/star/table/BorderLine2 \ + offapi/com/sun/star/table/BorderLineStyle \ + offapi/com/sun/star/table/CellAddress \ + offapi/com/sun/star/table/CellContentType \ + offapi/com/sun/star/table/CellHoriJustify \ + offapi/com/sun/star/table/CellJustifyMethod \ + offapi/com/sun/star/table/CellOrientation \ + offapi/com/sun/star/table/CellRangeAddress \ + offapi/com/sun/star/table/CellVertJustify \ + offapi/com/sun/star/table/CellVertJustify2 \ + offapi/com/sun/star/table/ShadowFormat \ + offapi/com/sun/star/table/ShadowLocation \ + offapi/com/sun/star/table/TableBorder \ + offapi/com/sun/star/table/TableBorderDistances \ + offapi/com/sun/star/table/TableOrientation \ + offapi/com/sun/star/table/TableSortField \ + offapi/com/sun/star/table/TableSortFieldType \ + offapi/com/sun/star/table/XAutoFormattable \ + offapi/com/sun/star/table/XCell \ + offapi/com/sun/star/table/XCell2 \ + offapi/com/sun/star/table/XCellCursor \ + offapi/com/sun/star/table/XCellRange \ + offapi/com/sun/star/table/XColumnRowRange \ + offapi/com/sun/star/table/XMergeableCell \ + offapi/com/sun/star/table/XMergeableCellRange \ + offapi/com/sun/star/table/XTable \ + offapi/com/sun/star/table/XTableChart \ + offapi/com/sun/star/table/XTableCharts \ + offapi/com/sun/star/table/XTableChartsSupplier \ + offapi/com/sun/star/table/XTableColumns \ + offapi/com/sun/star/table/XTableRows \ + offapi/com/sun/star/task/ClassifiedInteractionRequest \ + offapi/com/sun/star/task/DocumentMSPasswordRequest \ + offapi/com/sun/star/task/DocumentMSPasswordRequest2 \ + offapi/com/sun/star/task/DocumentMacroConfirmationRequest \ + offapi/com/sun/star/task/DocumentPasswordRequest \ + offapi/com/sun/star/task/DocumentPasswordRequest2 \ + offapi/com/sun/star/task/ErrorCodeIOException \ + offapi/com/sun/star/task/ErrorCodeRequest \ + offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest \ + offapi/com/sun/star/task/InteractionClassification \ + offapi/com/sun/star/task/MasterPasswordRequest \ + offapi/com/sun/star/task/NoMasterException \ + offapi/com/sun/star/task/PDFExportException \ + offapi/com/sun/star/task/PasswordRequest \ + offapi/com/sun/star/task/PasswordRequestMode \ + offapi/com/sun/star/task/UnsupportedOverwriteRequest \ + offapi/com/sun/star/task/UrlRecord \ + offapi/com/sun/star/task/UserRecord \ + offapi/com/sun/star/task/XAbortChannel \ + offapi/com/sun/star/task/XAsyncJob \ + offapi/com/sun/star/task/XInteractionApprove \ + offapi/com/sun/star/task/XInteractionAskLater \ + offapi/com/sun/star/task/XInteractionDisapprove \ + offapi/com/sun/star/task/XInteractionPassword \ + offapi/com/sun/star/task/XInteractionPassword2 \ + offapi/com/sun/star/task/XInteractionRequestStringResolver \ + offapi/com/sun/star/task/XJob \ + offapi/com/sun/star/task/XJobExecutor \ + offapi/com/sun/star/task/XJobListener \ + offapi/com/sun/star/task/XMasterPasswordHandling \ + offapi/com/sun/star/task/XMasterPasswordHandling2 \ + offapi/com/sun/star/task/XPasswordContainer \ + offapi/com/sun/star/task/XRestartManager \ + offapi/com/sun/star/task/XStatusIndicator \ + offapi/com/sun/star/task/XStatusIndicatorFactory \ + offapi/com/sun/star/task/XStatusIndicatorSupplier \ + offapi/com/sun/star/task/XUrlContainer \ + offapi/com/sun/star/text/AuthorDisplayFormat \ + offapi/com/sun/star/text/BibliographyDataField \ + offapi/com/sun/star/text/BibliographyDataType \ + offapi/com/sun/star/text/ChapterFormat \ + offapi/com/sun/star/text/CharacterCompressionType \ + offapi/com/sun/star/text/ControlCharacter \ + offapi/com/sun/star/text/DateDisplayFormat \ + offapi/com/sun/star/text/DocumentStatistic \ + offapi/com/sun/star/text/FilenameDisplayFormat \ + offapi/com/sun/star/text/FontEmphasis \ + offapi/com/sun/star/text/FontRelief \ + offapi/com/sun/star/text/FootnoteNumbering \ + offapi/com/sun/star/text/GraphicCrop \ + offapi/com/sun/star/text/HoriOrientation \ + offapi/com/sun/star/text/HoriOrientationFormat \ + offapi/com/sun/star/text/HorizontalAdjust \ + offapi/com/sun/star/text/InvalidTextContentException \ + offapi/com/sun/star/text/LabelFollow \ + offapi/com/sun/star/text/MailMergeEvent \ + offapi/com/sun/star/text/MailMergeType \ + offapi/com/sun/star/text/NotePrintMode \ + offapi/com/sun/star/text/PageNumberType \ + offapi/com/sun/star/text/ParagraphVertAlign \ + offapi/com/sun/star/text/PlaceholderType \ + offapi/com/sun/star/text/PositionAndSpaceMode \ + offapi/com/sun/star/text/PositionLayoutDir \ + offapi/com/sun/star/text/ReferenceFieldPart \ + offapi/com/sun/star/text/ReferenceFieldSource \ + offapi/com/sun/star/text/RelOrientation \ + offapi/com/sun/star/text/RubyAdjust \ + offapi/com/sun/star/text/SectionFileLink \ + offapi/com/sun/star/text/SetVariableType \ + offapi/com/sun/star/text/SizeType \ + offapi/com/sun/star/text/TableColumnSeparator \ + offapi/com/sun/star/text/TemplateDisplayFormat \ + offapi/com/sun/star/text/TextColumn \ + offapi/com/sun/star/text/TextColumnSequence \ + offapi/com/sun/star/text/TextContentAnchorType \ + offapi/com/sun/star/text/TextGridMode \ + offapi/com/sun/star/text/TextMarkupDescriptor \ + offapi/com/sun/star/text/TextMarkupType \ + offapi/com/sun/star/text/TimeDisplayFormat \ + offapi/com/sun/star/text/UserDataPart \ + offapi/com/sun/star/text/UserFieldFormat \ + offapi/com/sun/star/text/VertOrientation \ + offapi/com/sun/star/text/VertOrientationFormat \ + offapi/com/sun/star/text/WrapInfluenceOnPosition \ + offapi/com/sun/star/text/WrapTextMode \ + offapi/com/sun/star/text/WritingMode \ + offapi/com/sun/star/text/WritingMode2 \ + offapi/com/sun/star/text/XAutoTextContainer \ + offapi/com/sun/star/text/XAutoTextEntry \ + offapi/com/sun/star/text/XAutoTextGroup \ + offapi/com/sun/star/text/XBookmarkInsertTool \ + offapi/com/sun/star/text/XBookmarksSupplier \ + offapi/com/sun/star/text/XChapterNumberingSupplier \ + offapi/com/sun/star/text/XDefaultNumberingProvider \ + offapi/com/sun/star/text/XDependentTextField \ + offapi/com/sun/star/text/XDocumentIndex \ + offapi/com/sun/star/text/XDocumentIndexMark \ + offapi/com/sun/star/text/XDocumentIndexesSupplier \ + offapi/com/sun/star/text/XEndnotesSettingsSupplier \ + offapi/com/sun/star/text/XEndnotesSupplier \ + offapi/com/sun/star/text/XFlatParagraph \ + offapi/com/sun/star/text/XFlatParagraphIterator \ + offapi/com/sun/star/text/XFlatParagraphIteratorProvider \ + offapi/com/sun/star/text/XFootnote \ + offapi/com/sun/star/text/XFootnotesSettingsSupplier \ + offapi/com/sun/star/text/XFootnotesSupplier \ + offapi/com/sun/star/text/XFormField \ + offapi/com/sun/star/text/XHeaderFooter \ + offapi/com/sun/star/text/XHeaderFooterPageStyle \ + offapi/com/sun/star/text/XLineNumberingProperties \ + offapi/com/sun/star/text/XLineNumberingSupplier \ + offapi/com/sun/star/text/XMailMergeBroadcaster \ + offapi/com/sun/star/text/XMailMergeListener \ + offapi/com/sun/star/text/XModule \ + offapi/com/sun/star/text/XMultiTextMarkup \ + offapi/com/sun/star/text/XNumberingFormatter \ + offapi/com/sun/star/text/XNumberingRulesSupplier \ + offapi/com/sun/star/text/XNumberingTypeInfo \ + offapi/com/sun/star/text/XPageCursor \ + offapi/com/sun/star/text/XPagePrintable \ + offapi/com/sun/star/text/XParagraphAppend \ + offapi/com/sun/star/text/XParagraphCursor \ + offapi/com/sun/star/text/XRedline \ + offapi/com/sun/star/text/XReferenceMarksSupplier \ + offapi/com/sun/star/text/XRelativeTextContentInsert \ + offapi/com/sun/star/text/XRelativeTextContentRemove \ + offapi/com/sun/star/text/XRubySelection \ + offapi/com/sun/star/text/XSentenceCursor \ + offapi/com/sun/star/text/XSimpleText \ + offapi/com/sun/star/text/XText \ + offapi/com/sun/star/text/XTextAppend \ + offapi/com/sun/star/text/XTextAppendAndConvert \ + offapi/com/sun/star/text/XTextColumns \ + offapi/com/sun/star/text/XTextContent \ + offapi/com/sun/star/text/XTextContentAppend \ + offapi/com/sun/star/text/XTextConvert \ + offapi/com/sun/star/text/XTextCopy \ + offapi/com/sun/star/text/XTextCursor \ + offapi/com/sun/star/text/XTextDocument \ + offapi/com/sun/star/text/XTextEmbeddedObject \ + offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier \ + offapi/com/sun/star/text/XTextField \ + offapi/com/sun/star/text/XTextFieldsSupplier \ + offapi/com/sun/star/text/XTextFrame \ + offapi/com/sun/star/text/XTextFramesSupplier \ + offapi/com/sun/star/text/XTextGraphicObjectsSupplier \ + offapi/com/sun/star/text/XTextMarkup \ + offapi/com/sun/star/text/XTextPortionAppend \ + offapi/com/sun/star/text/XTextRange \ + offapi/com/sun/star/text/XTextRangeCompare \ + offapi/com/sun/star/text/XTextRangeMover \ + offapi/com/sun/star/text/XTextSection \ + offapi/com/sun/star/text/XTextSectionsSupplier \ + offapi/com/sun/star/text/XTextShapesSupplier \ + offapi/com/sun/star/text/XTextTable \ + offapi/com/sun/star/text/XTextTableCursor \ + offapi/com/sun/star/text/XTextTablesSupplier \ + offapi/com/sun/star/text/XTextViewCursor \ + offapi/com/sun/star/text/XTextViewCursorSupplier \ + offapi/com/sun/star/text/XWordCursor \ + offapi/com/sun/star/ucb/AlreadyInitializedException \ + offapi/com/sun/star/ucb/AuthenticationRequest \ + offapi/com/sun/star/ucb/CHAOSProgressStart \ + offapi/com/sun/star/ucb/CertificateValidationRequest \ + offapi/com/sun/star/ucb/Command \ + offapi/com/sun/star/ucb/CommandAbortedException \ + offapi/com/sun/star/ucb/CommandFailedException \ + offapi/com/sun/star/ucb/CommandInfo \ + offapi/com/sun/star/ucb/CommandInfoChange \ + offapi/com/sun/star/ucb/CommandInfoChangeEvent \ + offapi/com/sun/star/ucb/ConnectionMode \ + offapi/com/sun/star/ucb/ContentAction \ + offapi/com/sun/star/ucb/ContentCreationError \ + offapi/com/sun/star/ucb/ContentCreationException \ + offapi/com/sun/star/ucb/ContentEvent \ + offapi/com/sun/star/ucb/ContentInfo \ + offapi/com/sun/star/ucb/ContentInfoAttribute \ + offapi/com/sun/star/ucb/ContentProviderInfo \ + offapi/com/sun/star/ucb/ContentResultSetCapability \ + offapi/com/sun/star/ucb/Cookie \ + offapi/com/sun/star/ucb/CookiePolicy \ + offapi/com/sun/star/ucb/CookieRequest \ + offapi/com/sun/star/ucb/CrossReference \ + offapi/com/sun/star/ucb/DocumentHeaderField \ + offapi/com/sun/star/ucb/DocumentStoreMode \ + offapi/com/sun/star/ucb/DuplicateCommandIdentifierException \ + offapi/com/sun/star/ucb/DuplicateProviderException \ + offapi/com/sun/star/ucb/Error \ + offapi/com/sun/star/ucb/ExportStreamInfo \ + offapi/com/sun/star/ucb/FetchError \ + offapi/com/sun/star/ucb/FetchResult \ + offapi/com/sun/star/ucb/FileSystemNotation \ + offapi/com/sun/star/ucb/FolderList \ + offapi/com/sun/star/ucb/FolderListCommand \ + offapi/com/sun/star/ucb/FolderListEntry \ + offapi/com/sun/star/ucb/GlobalTransferCommandArgument \ + offapi/com/sun/star/ucb/HandleCookiesRequest \ + offapi/com/sun/star/ucb/IOErrorCode \ + offapi/com/sun/star/ucb/IllegalIdentifierException \ + offapi/com/sun/star/ucb/InsertCommandArgument \ + offapi/com/sun/star/ucb/InteractiveAppException \ + offapi/com/sun/star/ucb/InteractiveAugmentedIOException \ + offapi/com/sun/star/ucb/InteractiveBadTransferURLException \ + offapi/com/sun/star/ucb/InteractiveCHAOSException \ + offapi/com/sun/star/ucb/InteractiveFileIOException \ + offapi/com/sun/star/ucb/InteractiveIOException \ + offapi/com/sun/star/ucb/InteractiveLockingException \ + offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException \ + offapi/com/sun/star/ucb/InteractiveLockingLockedException \ + offapi/com/sun/star/ucb/InteractiveLockingNotLockedException \ + offapi/com/sun/star/ucb/InteractiveNetworkConnectException \ + offapi/com/sun/star/ucb/InteractiveNetworkException \ + offapi/com/sun/star/ucb/InteractiveNetworkGeneralException \ + offapi/com/sun/star/ucb/InteractiveNetworkOffLineException \ + offapi/com/sun/star/ucb/InteractiveNetworkReadException \ + offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException \ + offapi/com/sun/star/ucb/InteractiveNetworkWriteException \ + offapi/com/sun/star/ucb/InteractiveWrongMediumException \ + offapi/com/sun/star/ucb/Link \ + offapi/com/sun/star/ucb/ListAction \ + offapi/com/sun/star/ucb/ListActionType \ + offapi/com/sun/star/ucb/ListEvent \ + offapi/com/sun/star/ucb/ListenerAlreadySetException \ + offapi/com/sun/star/ucb/Lock \ + offapi/com/sun/star/ucb/LockDepth \ + offapi/com/sun/star/ucb/LockEntry \ + offapi/com/sun/star/ucb/LockScope \ + offapi/com/sun/star/ucb/LockType \ + offapi/com/sun/star/ucb/MissingInputStreamException \ + offapi/com/sun/star/ucb/MissingPropertiesException \ + offapi/com/sun/star/ucb/NameClash \ + offapi/com/sun/star/ucb/NameClashException \ + offapi/com/sun/star/ucb/NameClashResolveRequest \ + offapi/com/sun/star/ucb/NumberedSortingInfo \ + offapi/com/sun/star/ucb/OpenCommandArgument \ + offapi/com/sun/star/ucb/OpenCommandArgument2 \ + offapi/com/sun/star/ucb/OpenMode \ + offapi/com/sun/star/ucb/OutgoingMessageState \ + offapi/com/sun/star/ucb/PostCommandArgument \ + offapi/com/sun/star/ucb/PostCommandArgument2 \ + offapi/com/sun/star/ucb/Priority \ + offapi/com/sun/star/ucb/PropertyValueInfo \ + offapi/com/sun/star/ucb/PropertyValueState \ + offapi/com/sun/star/ucb/RecipientInfo \ + offapi/com/sun/star/ucb/RememberAuthentication \ + offapi/com/sun/star/ucb/RemoteContentProviderChangeAction \ + offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent \ + offapi/com/sun/star/ucb/ResultSetException \ + offapi/com/sun/star/ucb/Rule \ + offapi/com/sun/star/ucb/RuleAction \ + offapi/com/sun/star/ucb/RuleOperator \ + offapi/com/sun/star/ucb/RuleSet \ + offapi/com/sun/star/ucb/RuleTerm \ + offapi/com/sun/star/ucb/SearchCommandArgument \ + offapi/com/sun/star/ucb/SearchCriterium \ + offapi/com/sun/star/ucb/SearchInfo \ + offapi/com/sun/star/ucb/SearchRecursion \ + offapi/com/sun/star/ucb/SendInfo \ + offapi/com/sun/star/ucb/SendMediaTypes \ + offapi/com/sun/star/ucb/ServiceNotFoundException \ + offapi/com/sun/star/ucb/SortingInfo \ + offapi/com/sun/star/ucb/SynchronizePolicy \ + offapi/com/sun/star/ucb/TransferCommandOperation \ + offapi/com/sun/star/ucb/TransferInfo \ + offapi/com/sun/star/ucb/TransferResult \ + offapi/com/sun/star/ucb/URLAuthenticationRequest \ + offapi/com/sun/star/ucb/UnsupportedCommandException \ + offapi/com/sun/star/ucb/UnsupportedDataSinkException \ + offapi/com/sun/star/ucb/UnsupportedNameClashException \ + offapi/com/sun/star/ucb/UnsupportedOpenModeException \ + offapi/com/sun/star/ucb/VerificationMode \ + offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct \ + offapi/com/sun/star/ucb/XAnyCompare \ + offapi/com/sun/star/ucb/XAnyCompareFactory \ + offapi/com/sun/star/ucb/XCachedContentResultSetFactory \ + offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory \ + offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory \ + offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory \ + offapi/com/sun/star/ucb/XCommandEnvironment \ + offapi/com/sun/star/ucb/XCommandInfo \ + offapi/com/sun/star/ucb/XCommandInfoChangeListener \ + offapi/com/sun/star/ucb/XCommandInfoChangeNotifier \ + offapi/com/sun/star/ucb/XCommandProcessor \ + offapi/com/sun/star/ucb/XCommandProcessor2 \ + offapi/com/sun/star/ucb/XContent \ + offapi/com/sun/star/ucb/XContentAccess \ + offapi/com/sun/star/ucb/XContentCreator \ + offapi/com/sun/star/ucb/XContentEventListener \ + offapi/com/sun/star/ucb/XContentIdentifier \ + offapi/com/sun/star/ucb/XContentIdentifierFactory \ + offapi/com/sun/star/ucb/XContentIdentifierMapping \ + offapi/com/sun/star/ucb/XContentProvider \ + offapi/com/sun/star/ucb/XContentProviderFactory \ + offapi/com/sun/star/ucb/XContentProviderManager \ + offapi/com/sun/star/ucb/XContentProviderSupplier \ + offapi/com/sun/star/ucb/XContentTransmitter \ + offapi/com/sun/star/ucb/XDataContainer \ + offapi/com/sun/star/ucb/XDynamicResultSet \ + offapi/com/sun/star/ucb/XDynamicResultSetListener \ + offapi/com/sun/star/ucb/XFetchProvider \ + offapi/com/sun/star/ucb/XFetchProviderForContentAccess \ + offapi/com/sun/star/ucb/XFileIdentifierConverter \ + offapi/com/sun/star/ucb/XInteractionCookieHandling \ + offapi/com/sun/star/ucb/XInteractionHandlerSupplier \ + offapi/com/sun/star/ucb/XInteractionReplaceExistingData \ + offapi/com/sun/star/ucb/XInteractionSupplyAuthentication \ + offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2 \ + offapi/com/sun/star/ucb/XInteractionSupplyName \ + offapi/com/sun/star/ucb/XParameterizedContentProvider \ + offapi/com/sun/star/ucb/XPersistentPropertySet \ + offapi/com/sun/star/ucb/XProgressHandler \ + offapi/com/sun/star/ucb/XPropertyMatcher \ + offapi/com/sun/star/ucb/XPropertyMatcherFactory \ + offapi/com/sun/star/ucb/XPropertySetRegistry \ + offapi/com/sun/star/ucb/XPropertySetRegistryFactory \ + offapi/com/sun/star/ucb/XRecycler \ + offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor \ + offapi/com/sun/star/ucb/XRemoteContentProviderActivator \ + offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener \ + offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier \ + offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl \ + offapi/com/sun/star/ucb/XRemoteContentProviderDistributor \ + offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener \ + offapi/com/sun/star/ucb/XRemoteContentProviderSupplier \ + offapi/com/sun/star/ucb/XSimpleFileAccess \ + offapi/com/sun/star/ucb/XSimpleFileAccess2 \ + offapi/com/sun/star/ucb/XSimpleFileAccess3 \ + offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory \ + offapi/com/sun/star/ucb/XSourceInitialization \ + offapi/com/sun/star/ucb/XWebDAVCommandEnvironment \ + offapi/com/sun/star/ui/ActionTriggerSeparatorType \ + offapi/com/sun/star/ui/ConfigurationEvent \ + offapi/com/sun/star/ui/ContextMenuExecuteEvent \ + offapi/com/sun/star/ui/ContextMenuInterceptorAction \ + offapi/com/sun/star/ui/DockingArea \ + offapi/com/sun/star/ui/ImageType \ + offapi/com/sun/star/ui/ItemStyle \ + offapi/com/sun/star/ui/ItemType \ + offapi/com/sun/star/ui/UIElementType \ + offapi/com/sun/star/ui/XAcceleratorConfiguration \ + offapi/com/sun/star/ui/XContextMenuInterception \ + offapi/com/sun/star/ui/XContextMenuInterceptor \ + offapi/com/sun/star/ui/XDockingAreaAcceptor \ + offapi/com/sun/star/ui/XImageManager \ + offapi/com/sun/star/ui/XModuleUIConfigurationManager \ + offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier \ + offapi/com/sun/star/ui/XToolPanel \ + offapi/com/sun/star/ui/XUIConfiguration \ + offapi/com/sun/star/ui/XUIConfigurationListener \ + offapi/com/sun/star/ui/XUIConfigurationManager \ + offapi/com/sun/star/ui/XUIConfigurationManagerSupplier \ + offapi/com/sun/star/ui/XUIConfigurationPersistence \ + offapi/com/sun/star/ui/XUIConfigurationStorage \ + offapi/com/sun/star/ui/XUIElement \ + offapi/com/sun/star/ui/XUIElementFactory \ + offapi/com/sun/star/ui/XUIElementFactoryRegistration \ + offapi/com/sun/star/ui/XUIElementSettings \ + offapi/com/sun/star/ui/XUIFunctionListener \ + offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds \ + offapi/com/sun/star/ui/dialogs/ControlActions \ + offapi/com/sun/star/ui/dialogs/DialogClosedEvent \ + offapi/com/sun/star/ui/dialogs/ExecutableDialogException \ + offapi/com/sun/star/ui/dialogs/ExecutableDialogResults \ + offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds \ + offapi/com/sun/star/ui/dialogs/FilePickerEvent \ + offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats \ + offapi/com/sun/star/ui/dialogs/ListboxControlActions \ + offapi/com/sun/star/ui/dialogs/TemplateDescription \ + offapi/com/sun/star/ui/dialogs/WizardButton \ + offapi/com/sun/star/ui/dialogs/WizardTravelType \ + offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog \ + offapi/com/sun/star/ui/dialogs/XControlAccess \ + offapi/com/sun/star/ui/dialogs/XControlInformation \ + offapi/com/sun/star/ui/dialogs/XDialogClosedListener \ + offapi/com/sun/star/ui/dialogs/XExecutableDialog \ + offapi/com/sun/star/ui/dialogs/XFilePicker \ + offapi/com/sun/star/ui/dialogs/XFilePicker2 \ + offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess \ + offapi/com/sun/star/ui/dialogs/XFilePickerListener \ + offapi/com/sun/star/ui/dialogs/XFilePickerNotifier \ + offapi/com/sun/star/ui/dialogs/XFilePreview \ + offapi/com/sun/star/ui/dialogs/XFilterGroupManager \ + offapi/com/sun/star/ui/dialogs/XFilterManager \ + offapi/com/sun/star/ui/dialogs/XFolderPicker \ + offapi/com/sun/star/ui/dialogs/XWizard \ + offapi/com/sun/star/ui/dialogs/XWizardController \ + offapi/com/sun/star/ui/dialogs/XWizardPage \ + offapi/com/sun/star/util/AliasProgrammaticPair \ + offapi/com/sun/star/util/AtomClassRequest \ + offapi/com/sun/star/util/AtomDescription \ + offapi/com/sun/star/util/CellProtection \ + offapi/com/sun/star/util/ChangesEvent \ + offapi/com/sun/star/util/ChangesSet \ + offapi/com/sun/star/util/CloseVetoException \ + offapi/com/sun/star/util/Color \ + offapi/com/sun/star/util/DataEditorEvent \ + offapi/com/sun/star/util/DataEditorEventType \ + offapi/com/sun/star/util/Date \ + offapi/com/sun/star/util/DateTime \ + offapi/com/sun/star/util/DateTimeRange \ + offapi/com/sun/star/util/DiskFullException \ + offapi/com/sun/star/util/Duration \ + offapi/com/sun/star/util/ElementChange \ + offapi/com/sun/star/util/Endianness \ + offapi/com/sun/star/util/FileIOException \ + offapi/com/sun/star/util/InvalidStateException \ + offapi/com/sun/star/util/Language \ + offapi/com/sun/star/util/MalformedNumberFormatException \ + offapi/com/sun/star/util/MeasureUnit \ + offapi/com/sun/star/util/ModeChangeEvent \ + offapi/com/sun/star/util/NotLockedException \ + offapi/com/sun/star/util/NotNumericException \ + offapi/com/sun/star/util/NumberFormat \ + offapi/com/sun/star/util/RevisionTag \ + offapi/com/sun/star/util/SearchAlgorithms \ + offapi/com/sun/star/util/SearchFlags \ + offapi/com/sun/star/util/SearchOptions \ + offapi/com/sun/star/util/SearchResult \ + offapi/com/sun/star/util/SortField \ + offapi/com/sun/star/util/SortFieldType \ + offapi/com/sun/star/util/Time \ + offapi/com/sun/star/util/TriState \ + offapi/com/sun/star/util/URL \ + offapi/com/sun/star/util/VetoException \ + offapi/com/sun/star/util/XArchiver \ + offapi/com/sun/star/util/XAtomServer \ + offapi/com/sun/star/util/XBroadcaster \ + offapi/com/sun/star/util/XCancelManager \ + offapi/com/sun/star/util/XCancellable \ + offapi/com/sun/star/util/XChainable \ + offapi/com/sun/star/util/XChangesBatch \ + offapi/com/sun/star/util/XChangesListener \ + offapi/com/sun/star/util/XChangesNotifier \ + offapi/com/sun/star/util/XChangesSet \ + offapi/com/sun/star/util/XCloneable \ + offapi/com/sun/star/util/XCloseBroadcaster \ + offapi/com/sun/star/util/XCloseListener \ + offapi/com/sun/star/util/XCloseable \ + offapi/com/sun/star/util/XDataEditor \ + offapi/com/sun/star/util/XDataEditorListener \ + offapi/com/sun/star/util/XFlushListener \ + offapi/com/sun/star/util/XFlushable \ + offapi/com/sun/star/util/XImportable \ + offapi/com/sun/star/util/XIndent \ + offapi/com/sun/star/util/XJobManager \ + offapi/com/sun/star/util/XLinkUpdate \ + offapi/com/sun/star/util/XLocalizedAliases \ + offapi/com/sun/star/util/XLockable \ + offapi/com/sun/star/util/XMergeable \ + offapi/com/sun/star/util/XModeChangeApproveListener \ + offapi/com/sun/star/util/XModeChangeBroadcaster \ + offapi/com/sun/star/util/XModeChangeListener \ + offapi/com/sun/star/util/XModeSelector \ + offapi/com/sun/star/util/XModifiable \ + offapi/com/sun/star/util/XModifiable2 \ + offapi/com/sun/star/util/XModifyBroadcaster \ + offapi/com/sun/star/util/XModifyListener \ + offapi/com/sun/star/util/XNumberFormatPreviewer \ + offapi/com/sun/star/util/XNumberFormatTypes \ + offapi/com/sun/star/util/XNumberFormats \ + offapi/com/sun/star/util/XNumberFormatsSupplier \ + offapi/com/sun/star/util/XNumberFormatter \ + offapi/com/sun/star/util/XOfficeInstallationDirectories \ + offapi/com/sun/star/util/XPropertyReplace \ + offapi/com/sun/star/util/XProtectable \ + offapi/com/sun/star/util/XRefreshListener \ + offapi/com/sun/star/util/XRefreshable \ + offapi/com/sun/star/util/XReplaceDescriptor \ + offapi/com/sun/star/util/XReplaceable \ + offapi/com/sun/star/util/XSearchDescriptor \ + offapi/com/sun/star/util/XSearchable \ + offapi/com/sun/star/util/XSimpleErrorHandler \ + offapi/com/sun/star/util/XSortable \ + offapi/com/sun/star/util/XStringAbbreviation \ + offapi/com/sun/star/util/XStringEscape \ + offapi/com/sun/star/util/XStringMapping \ + offapi/com/sun/star/util/XStringSubstitution \ + offapi/com/sun/star/util/XStringWidth \ + offapi/com/sun/star/util/XTextSearch \ + offapi/com/sun/star/util/XTimeStamped \ + offapi/com/sun/star/util/XURLTransformer \ + offapi/com/sun/star/util/XUniqueIDFactory \ + offapi/com/sun/star/util/XUpdatable \ + offapi/com/sun/star/view/DocumentZoomType \ + offapi/com/sun/star/view/DuplexMode \ + offapi/com/sun/star/view/PaperFormat \ + offapi/com/sun/star/view/PaperOrientation \ + offapi/com/sun/star/view/PrintJobEvent \ + offapi/com/sun/star/view/PrintableState \ + offapi/com/sun/star/view/PrintableStateEvent \ + offapi/com/sun/star/view/SelectionType \ + offapi/com/sun/star/view/XControlAccess \ + offapi/com/sun/star/view/XFormLayerAccess \ + offapi/com/sun/star/view/XLineCursor \ + offapi/com/sun/star/view/XMultiSelectionSupplier \ + offapi/com/sun/star/view/XPrintJob \ + offapi/com/sun/star/view/XPrintJobBroadcaster \ + offapi/com/sun/star/view/XPrintJobListener \ + offapi/com/sun/star/view/XPrintPreview \ + offapi/com/sun/star/view/XPrintSettingsSupplier \ + offapi/com/sun/star/view/XPrintable \ + offapi/com/sun/star/view/XPrintableBroadcaster \ + offapi/com/sun/star/view/XPrintableListener \ + offapi/com/sun/star/view/XRenderable \ + offapi/com/sun/star/view/XScreenCursor \ + offapi/com/sun/star/view/XSelectionChangeListener \ + offapi/com/sun/star/view/XSelectionSupplier \ + offapi/com/sun/star/view/XViewCursor \ + offapi/com/sun/star/view/XViewSettingsSupplier \ + offapi/com/sun/star/xforms/InvalidDataOnSubmitException \ + offapi/com/sun/star/xforms/XDataTypeRepository \ + offapi/com/sun/star/xforms/XFormsEvent \ + offapi/com/sun/star/xforms/XFormsSupplier \ + offapi/com/sun/star/xforms/XFormsUIHelper1 \ + offapi/com/sun/star/xforms/XModel \ + offapi/com/sun/star/xforms/XSubmission \ + offapi/com/sun/star/xml/Attribute \ + offapi/com/sun/star/xml/AttributeData \ + offapi/com/sun/star/xml/FastAttribute \ + offapi/com/sun/star/xml/XExportFilter \ + offapi/com/sun/star/xml/XImportFilter \ + offapi/com/sun/star/xml/crypto/SecurityOperationStatus \ + offapi/com/sun/star/xml/crypto/XMLEncryptionException \ + offapi/com/sun/star/xml/crypto/XMLSignatureException \ + offapi/com/sun/star/xml/crypto/XSEInitializer \ + offapi/com/sun/star/xml/crypto/XSecurityEnvironment \ + offapi/com/sun/star/xml/crypto/XUriBinding \ + offapi/com/sun/star/xml/crypto/XXMLEncryption \ + offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate \ + offapi/com/sun/star/xml/crypto/XXMLSecurityContext \ + offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate \ + offapi/com/sun/star/xml/crypto/XXMLSignature \ + offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate \ + offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId \ + offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority \ + offapi/com/sun/star/xml/crypto/sax/ElementMarkType \ + offapi/com/sun/star/xml/crypto/sax/ElementStackItem \ + offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor \ + offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener \ + offapi/com/sun/star/xml/crypto/CipherID \ + offapi/com/sun/star/xml/crypto/DigestID \ + offapi/com/sun/star/xml/crypto/XCipherContext \ + offapi/com/sun/star/xml/crypto/XCipherContextSupplier \ + offapi/com/sun/star/xml/crypto/XDigestContext \ + offapi/com/sun/star/xml/crypto/XDigestContextSupplier \ + offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper \ + offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener \ + offapi/com/sun/star/xml/crypto/sax/XKeyCollector \ + offapi/com/sun/star/xml/crypto/sax/XMissionTaker \ + offapi/com/sun/star/xml/crypto/sax/XReferenceCollector \ + offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener \ + offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper \ + offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener \ + offapi/com/sun/star/xml/crypto/sax/XSecurityController \ + offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper \ + offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener \ + offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster \ + offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener \ + offapi/com/sun/star/xml/csax/XCompressedDocumentHandler \ + offapi/com/sun/star/xml/csax/XMLAttribute \ + offapi/com/sun/star/xml/dom/DOMException \ + offapi/com/sun/star/xml/dom/DOMExceptionType \ + offapi/com/sun/star/xml/dom/NodeType \ + offapi/com/sun/star/xml/dom/SAXDocumentBuilderState \ + offapi/com/sun/star/xml/dom/XAttr \ + offapi/com/sun/star/xml/dom/XCDATASection \ + offapi/com/sun/star/xml/dom/XCharacterData \ + offapi/com/sun/star/xml/dom/XComment \ + offapi/com/sun/star/xml/dom/XDOMImplementation \ + offapi/com/sun/star/xml/dom/XDocument \ + offapi/com/sun/star/xml/dom/XDocumentBuilder \ + offapi/com/sun/star/xml/dom/XDocumentFragment \ + offapi/com/sun/star/xml/dom/XDocumentType \ + offapi/com/sun/star/xml/dom/XElement \ + offapi/com/sun/star/xml/dom/XEntity \ + offapi/com/sun/star/xml/dom/XEntityReference \ + offapi/com/sun/star/xml/dom/XNamedNodeMap \ + offapi/com/sun/star/xml/dom/XNode \ + offapi/com/sun/star/xml/dom/XNodeList \ + offapi/com/sun/star/xml/dom/XNotation \ + offapi/com/sun/star/xml/dom/XProcessingInstruction \ + offapi/com/sun/star/xml/dom/XSAXDocumentBuilder \ + offapi/com/sun/star/xml/dom/XText \ + offapi/com/sun/star/xml/dom/events/AttrChangeType \ + offapi/com/sun/star/xml/dom/events/EventException \ + offapi/com/sun/star/xml/dom/events/EventType \ + offapi/com/sun/star/xml/dom/events/PhaseType \ + offapi/com/sun/star/xml/dom/events/XDocumentEvent \ + offapi/com/sun/star/xml/dom/events/XEvent \ + offapi/com/sun/star/xml/dom/events/XEventListener \ + offapi/com/sun/star/xml/dom/events/XEventTarget \ + offapi/com/sun/star/xml/dom/events/XMouseEvent \ + offapi/com/sun/star/xml/dom/events/XMutationEvent \ + offapi/com/sun/star/xml/dom/events/XUIEvent \ + offapi/com/sun/star/xml/dom/views/XAbstractView \ + offapi/com/sun/star/xml/dom/views/XDocumentView \ + offapi/com/sun/star/xml/input/XAttributes \ + offapi/com/sun/star/xml/input/XElement \ + offapi/com/sun/star/xml/input/XNamespaceMapping \ + offapi/com/sun/star/xml/input/XRoot \ + offapi/com/sun/star/xml/sax/FastToken \ + offapi/com/sun/star/xml/sax/InputSource \ + offapi/com/sun/star/xml/sax/SAXException \ + offapi/com/sun/star/xml/sax/SAXInvalidCharacterException \ + offapi/com/sun/star/xml/sax/SAXParseException \ + offapi/com/sun/star/xml/sax/XAttributeList \ + offapi/com/sun/star/xml/sax/XDTDHandler \ + offapi/com/sun/star/xml/sax/XDocumentHandler \ + offapi/com/sun/star/xml/sax/XEntityResolver \ + offapi/com/sun/star/xml/sax/XErrorHandler \ + offapi/com/sun/star/xml/sax/XExtendedDocumentHandler \ + offapi/com/sun/star/xml/sax/XFastAttributeList \ + offapi/com/sun/star/xml/sax/XFastContextHandler \ + offapi/com/sun/star/xml/sax/XFastDocumentHandler \ + offapi/com/sun/star/xml/sax/XFastParser \ + offapi/com/sun/star/xml/sax/XFastSAXSerializable \ + offapi/com/sun/star/xml/sax/XFastSerializer \ + offapi/com/sun/star/xml/sax/XFastShapeContextHandler \ + offapi/com/sun/star/xml/sax/XFastTokenHandler \ + offapi/com/sun/star/xml/sax/XLocator \ + offapi/com/sun/star/xml/sax/XParser \ + offapi/com/sun/star/xml/sax/XSAXSerializable \ + offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper \ + offapi/com/sun/star/xml/wrapper/XXMLElementWrapper \ + offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle \ + offapi/com/sun/star/xml/xpath/XPathException \ + offapi/com/sun/star/xml/xpath/XPathObjectType \ + offapi/com/sun/star/xml/xpath/XXPathAPI \ + offapi/com/sun/star/xml/xpath/XXPathExtension \ + offapi/com/sun/star/xml/xpath/XXPathObject \ + offapi/com/sun/star/xsd/DataTypeClass \ + offapi/com/sun/star/xsd/WhiteSpaceTreatment \ + offapi/com/sun/star/xsd/XDataType \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/offapi/com/sun/star/deployment/ui/makefile.mk b/offapi/UnoApi_types.mk index 5436f66178a8..4c6701c85370 100644 --- a/offapi/com/sun/star/deployment/ui/makefile.mk +++ b/offapi/UnoApi_types.mk @@ -14,30 +14,32 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. +$(eval $(call gb_UnoApiTarget_UnoApiTarget,types)) -PRJNAME=offapi +$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\ + udkapi \ + offapi \ +)) -TARGET = cssdeploymentui -PACKAGE = com$/sun$/star$/deployment$/ui +$(eval $(call gb_UnoApiTarget_add_reference_rdbfile,types,\ + offapi/type_reference/types \ +)) -.INCLUDE : $(PRJ)$/util$/makefile.pmk +# ugly hack for now! +statistic : $(gb_Helper_MISC)/api_statistic -IDLFILES = \ - PackageManagerDialog.idl \ - LicenseDialog.idl \ - UpdateRequiredDialog.idl +$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiTarget_get_target,types) + $(PERL) util/checknewapi.pl $(call gb_UnoApiTarget_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiTarget_REGVIEWTARGET)" > $@ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk +# vim: set noet sw=4 ts=4: diff --git a/offapi/com/sun/star/accessibility/makefile.mk b/offapi/com/sun/star/accessibility/makefile.mk deleted file mode 100644 index 29403d0e9d08..000000000000 --- a/offapi/com/sun/star/accessibility/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssaccessibility -PACKAGE=com$/sun$/star$/accessibility - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessBridge.idl \ - Accessible.idl \ - AccessibleContext.idl \ - AccessibleEventId.idl \ - AccessibleEventObject.idl \ - AccessibleRelation.idl \ - AccessibleRelationType.idl \ - AccessibleRole.idl \ - AccessibleStateType.idl \ - AccessibleTableModelChange.idl \ - AccessibleTableModelChangeType.idl \ - AccessibleTextType.idl \ - IllegalAccessibleComponentStateException.idl \ - TextSegment.idl \ - XAccessible.idl \ - XAccessibleAction.idl \ - XAccessibleComponent.idl \ - XAccessibleContext.idl \ - XAccessibleEditableText.idl \ - XAccessibleEventBroadcaster.idl \ - XAccessibleEventListener.idl \ - XAccessibleExtendedComponent.idl \ - XAccessibleHyperlink.idl \ - XAccessibleHypertext.idl \ - XAccessibleImage.idl \ - XAccessibleKeyBinding.idl \ - XAccessibleMultiLineText.idl \ - XAccessibleRelationSet.idl \ - XAccessibleSelection.idl \ - XAccessibleStateSet.idl \ - XAccessibleTable.idl \ - XAccessibleText.idl \ - XAccessibleTextAttributes.idl \ - XAccessibleTextMarkup.idl \ - XAccessibleValue.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl new file mode 100644 index 000000000000..7e1627dc733d --- /dev/null +++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl @@ -0,0 +1,44 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__ +#define __com_sun_star_animations_TargetPropertiesCreator_idl__ + +#ifndef __com_sun_star_animations_TargetProperties_idl__ +#include <com/sun/star/animations/XTargetPropertiesCreator.idl> +#endif + +//============================================================================= + + module com { module sun { module star { module animations { + +//============================================================================= + +service TargetPropertiesCreator: XTargetPropertiesCreator; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl index 016bf2b94d8a..1a844c0e4743 100644 --- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl +++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl @@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface //============================================================================= -service TargetPropertiesCreator: XTargetPropertiesCreator; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/animations/makefile.mk b/offapi/com/sun/star/animations/makefile.mk deleted file mode 100644 index f899d8c14304..000000000000 --- a/offapi/com/sun/star/animations/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssanimations -PACKAGE=com$/sun$/star$/animations - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AnimationAdditiveMode.idl\ - AnimationCalcMode.idl\ - AnimationColorSpace.idl\ - AnimationEndSync.idl\ - AnimationFill.idl\ - AnimationNodeType.idl\ - AnimationRestart.idl\ - AnimationTransformType.idl\ - AnimationValueType.idl\ - Event.idl\ - EventTrigger.idl\ - TargetProperties.idl \ - TimeFilterPair.idl\ - Timing.idl\ - TransitionSubType.idl\ - TransitionType.idl\ - ValuePair.idl\ - XAnimate.idl\ - XAnimateColor.idl\ - XAnimateMotion.idl\ - XAnimateSet.idl\ - XAnimateTransform.idl\ - XAnimationNode.idl\ - XAnimationNodeSupplier.idl\ - XAudio.idl\ - XIterateContainer.idl\ - XTargetPropertiesCreator.idl \ - XTimeContainer.idl\ - XTransitionFilter.idl\ - XCommand.idl\ - XAnimationListener.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/auth/makefile.mk b/offapi/com/sun/star/auth/makefile.mk deleted file mode 100644 index f6bdb844520c..000000000000 --- a/offapi/com/sun/star/auth/makefile.mk +++ /dev/null @@ -1,28 +0,0 @@ -PRJ = ..$/..$/..$/.. -PRJNAME=offapi - -TARGET = cssauth -PACKAGE = com$/sun$/star$/auth - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - AuthenticationFailedException.idl \ - InvalidArgumentException.idl \ - InvalidContextException.idl \ - InvalidCredentialException.idl \ - InvalidPrincipalException.idl \ - PersistenceFailureException.idl \ - UnsupportedException.idl \ - SSOManagerFactory.idl \ - SSOPasswordCache.idl \ - XSSOAcceptorContext.idl \ - XSSOContext.idl \ - XSSOInitiatorContext.idl \ - XSSOManager.idl \ - XSSOManagerFactory.idl \ - XSSOPasswordCache.idl - - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk deleted file mode 100644 index 8499dca27d82..000000000000 --- a/offapi/com/sun/star/awt/grid/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssawtgrid -PACKAGE=com$/sun$/star$/awt$/grid - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ -IDLFILES=\ - GridColumnEvent.idl\ - GridDataEvent.idl\ - SelectionEventType.idl\ - GridSelectionEvent.idl\ - XGridSelectionListener.idl\ - XGridSelection.idl\ - XGridColumn.idl\ - XGridColumnListener.idl\ - XGridDataListener.idl\ - DefaultGridDataModel.idl\ - XGridDataModel.idl\ - XMutableGridDataModel.idl\ - XGridColumnModel.idl\ - XGridControl.idl\ - UnoControlGrid.idl\ - UnoControlGridModel.idl\ - GridInvalidDataException.idl\ - GridInvalidModelException.idl\ - XSortableGridData.idl\ - SortableGridDataModel.idl\ - XSortableMutableGridDataModel.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk deleted file mode 100644 index c2397d81bf44..000000000000 --- a/offapi/com/sun/star/awt/makefile.mk +++ /dev/null @@ -1,348 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssawt -PACKAGE=com$/sun$/star$/awt - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessibleButton.idl\ - AccessibleCheckBox.idl\ - AccessibleComboBox.idl\ - AccessibleDropDownComboBox.idl\ - AccessibleDropDownListBox.idl\ - AccessibleEdit.idl\ - AccessibleFixedText.idl\ - AccessibleIconChoiceControl.idl\ - AccessibleIconChoiceControlEntry.idl\ - AccessibleList.idl\ - AccessibleListBox.idl\ - AccessibleListBoxList.idl\ - AccessibleListItem.idl\ - AccessibleMenu.idl\ - AccessibleMenuBar.idl\ - AccessibleMenuItem.idl\ - AccessibleMenuSeparator.idl\ - AccessiblePopupMenu.idl\ - AccessibleRadioButton.idl\ - AccessibleScrollBar.idl\ - AccessibleStatusBar.idl\ - AccessibleStatusBarItem.idl\ - AccessibleTabBar.idl\ - AccessibleTabBarPage.idl\ - AccessibleTabBarPageList.idl\ - AccessibleTabControl.idl\ - AccessibleTabPage.idl\ - AccessibleTextField.idl\ - AccessibleToolBox.idl\ - AccessibleToolBoxItem.idl\ - AccessibleTreeListBox.idl\ - AccessibleTreeListBoxEntry.idl\ - AccessibleWindow.idl\ - ActionEvent.idl\ - AdjustmentEvent.idl\ - AdjustmentType.idl\ - AsyncCallback.idl\ - CharSet.idl\ - Command.idl\ - DeviceCapability.idl\ - DeviceInfo.idl\ - DialogProvider.idl\ - DialogProvider2.idl\ - ContainerWindowProvider.idl\ - DockingData.idl\ - DockingEvent.idl\ - EndDockingEvent.idl\ - EndPopupModeEvent.idl\ - EnhancedMouseEvent.idl\ - FieldUnit.idl\ - FocusChangeReason.idl\ - FocusEvent.idl\ - FontDescriptor.idl\ - FontEmphasisMark.idl\ - FontFamily.idl\ - FontPitch.idl\ - FontRelief.idl\ - FontSlant.idl\ - FontStrikeout.idl\ - FontType.idl\ - FontUnderline.idl\ - FontWeight.idl\ - FontWidth.idl\ - Gradient.idl\ - GradientStyle.idl\ - ImageAlign.idl\ - ImagePosition.idl\ - ImageScaleMode.idl\ - ImageStatus.idl\ - InputEvent.idl\ - InvalidateStyle.idl\ - ItemEvent.idl\ - Key.idl\ - KeyEvent.idl\ - KeyFunction.idl\ - KeyGroup.idl\ - KeyModifier.idl\ - KeyStroke.idl\ - LineEndFormat.idl\ - MenuEvent.idl\ - MenuItemStyle.idl\ - MessageBoxButtons.idl\ - MessageBoxCommand.idl\ - MouseButton.idl\ - MouseEvent.idl\ - MouseWheelBehavior.idl\ - PaintEvent.idl\ - Point.idl\ - PopupMenuDirection.idl\ - PosSize.idl\ - PrinterException.idl\ - PushButtonType.idl\ - RasterOperation.idl\ - Rectangle.idl\ - RoadmapItem.idl\ - ScrollBarOrientation.idl\ - Selection.idl\ - SimpleFontMetric.idl\ - Size.idl\ - SpinEvent.idl\ - Style.idl\ - SystemPointer.idl\ - TabController.idl\ - TabControllerModel.idl\ - TextAlign.idl\ - TextEvent.idl\ - Toolkit.idl\ - UnoControl.idl\ - UnoControlButton.idl\ - UnoControlButtonModel.idl\ - UnoControlCheckBox.idl\ - UnoControlCheckBoxModel.idl\ - UnoControlComboBox.idl\ - UnoControlComboBoxModel.idl\ - UnoControlContainer.idl\ - UnoControlContainerModel.idl\ - UnoControlCurrencyField.idl\ - UnoControlCurrencyFieldModel.idl\ - UnoControlDateField.idl\ - UnoControlDateFieldModel.idl\ - UnoControlDialog.idl\ - UnoControlDialogElement.idl\ - UnoControlDialogModel.idl\ - UnoControlDialogModelProvider.idl\ - UnoControlEdit.idl\ - UnoControlEditModel.idl\ - UnoControlFileControl.idl\ - UnoControlFileControlModel.idl\ - UnoControlFixedHyperlink.idl\ - UnoControlFixedHyperlinkModel.idl\ - UnoControlFixedLine.idl\ - UnoControlFixedLineModel.idl\ - UnoControlFixedText.idl\ - UnoControlFixedTextModel.idl\ - UnoControlFormattedField.idl\ - UnoControlFormattedFieldModel.idl\ - UnoControlGroupBox.idl\ - UnoControlGroupBoxModel.idl\ - UnoControlImageControl.idl\ - UnoControlImageControlModel.idl\ - UnoControlListBox.idl\ - UnoControlListBoxModel.idl\ - UnoControlModel.idl\ - UnoControlNumericField.idl\ - UnoControlNumericFieldModel.idl\ - UnoControlPatternField.idl\ - UnoControlPatternFieldModel.idl\ - UnoControlProgressBar.idl\ - UnoControlProgressBarModel.idl\ - UnoControlRadioButton.idl\ - UnoControlRadioButtonModel.idl\ - UnoControlRoadmap.idl\ - UnoControlRoadmapModel.idl\ - UnoControlScrollBar.idl\ - UnoControlScrollBarModel.idl\ - UnoControlSimpleAnimation.idl\ - UnoControlSimpleAnimationModel.idl\ - UnoControlSpinButton.idl\ - UnoControlSpinButtonModel.idl\ - UnoControlThrobber.idl\ - UnoControlThrobberModel.idl\ - UnoControlTimeField.idl\ - UnoControlTimeFieldModel.idl\ - VclContainerEvent.idl\ - VclWindowPeerAttribute.idl\ - VisualEffect.idl\ - WindowAttribute.idl\ - WindowClass.idl\ - WindowDescriptor.idl\ - WindowEvent.idl\ - XActionListener.idl\ - XActivateListener.idl\ - XAdjustmentListener.idl\ - XBitmap.idl\ - XButton.idl\ - XCallback.idl\ - XCheckBox.idl\ - XComboBox.idl\ - XControl.idl\ - XControlContainer.idl\ - XControlModel.idl\ - XCurrencyField.idl\ - XDataTransferProviderAccess.idl\ - XDateField.idl\ - XDevice.idl\ - XDialog.idl\ - XDialogProvider.idl\ - XDialogProvider2.idl\ - XDialogEventHandler.idl\ - ContainerWindowProvider.idl\ - XContainerWindowProvider.idl\ - XContainerWindowEventHandler.idl\ - XDisplayBitmap.idl\ - XDisplayConnection.idl\ - XDockableWindow.idl\ - XDockableWindowListener.idl\ - XEnhancedMouseClickHandler.idl\ - XEventHandler.idl\ - XExtendedToolkit.idl\ - XFileDialog.idl\ - XFixedHyperlink.idl\ - XFixedText.idl\ - XFocusListener.idl\ - XFont.idl\ - XFont2.idl\ - XGraphics.idl\ - XImageButton.idl\ - XImageConsumer.idl\ - XImageProducer.idl\ - XInfoPrinter.idl\ - XItemEventBroadcaster.idl\ - XItemListener.idl\ - XKeyHandler.idl\ - XKeyListener.idl\ - XLayoutConstrains.idl\ - XListBox.idl\ - XMenu.idl\ - XMenuBar.idl\ - XMenuListener.idl\ - XMessageBox.idl\ - XMessageBoxFactory.idl\ - XMetricField.idl\ - XMouseClickHandler.idl\ - XMouseListener.idl\ - XMouseMotionListener.idl\ - XMouseMotionHandler.idl\ - XNumericField.idl\ - XPaintListener.idl\ - XPatternField.idl\ - XPointer.idl\ - XPopupMenu.idl\ - XPrinter.idl\ - XPrinterPropertySet.idl\ - XPrinterServer.idl\ - XProgressBar.idl\ - XProgressMonitor.idl\ - XRadioButton.idl\ - XRegion.idl\ - XRequestCallback.idl\ - XReschedule.idl\ - XScrollBar.idl\ - XSimpleTabController.idl\ - XSpinField.idl\ - XSpinListener.idl\ - XSpinValue.idl\ - XStyleChangeListener.idl\ - XStyleSettings.idl\ - XStyleSettingsSupplier.idl\ - XSystemChildFactory.idl\ - XSystemDependentMenuPeer.idl\ - XSystemDependentWindowPeer.idl\ - SystemDependentXWindow.idl\ - XSimpleAnimation.idl\ - XSimpleTabController.idl\ - XThrobber.idl\ - XTabController.idl\ - XTabControllerModel.idl\ - XTabListener.idl\ - XTextArea.idl\ - XTextComponent.idl\ - XTextEditField.idl\ - XTextLayoutConstrains.idl\ - XTextListener.idl\ - XTimeField.idl\ - XToggleButton.idl\ - XToolkit.idl\ - XTopWindow.idl\ - XTopWindow2.idl\ - XTopWindowListener.idl\ - XUnitConversion.idl\ - XUnoControlContainer.idl\ - XUserInputInterception.idl\ - XVclContainer.idl\ - XVclContainerListener.idl\ - XVclContainerPeer.idl\ - XVclWindowPeer.idl\ - XView.idl\ - XWindow.idl\ - XWindow2.idl\ - XWindowListener.idl\ - XWindowListener2.idl\ - XWindowPeer.idl\ - XMenuExtended.idl\ - MaxChildrenException.idl\ - XDialog2.idl\ - XLayoutContainer.idl\ - XLayoutFlow.idl\ - XLayoutFlowContainer.idl\ - XLayoutRoot.idl\ - XLayoutUnit.idl \ - MenuItemType.idl \ - MenuLogo.idl \ - XMenuExtended2.idl \ - XMenuBarExtended.idl \ - XPopupMenuExtended.idl \ - XItemList.idl \ - XItemListListener.idl \ - ItemListEvent.idl \ - AnimatedImagesControl.idl \ - AnimatedImagesControlModel.idl \ - XAnimatedImages.idl \ - XAnimation.idl \ - SpinningProgressControlModel.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/awt/tree/makefile.mk b/offapi/com/sun/star/awt/tree/makefile.mk deleted file mode 100644 index 797644e7628e..000000000000 --- a/offapi/com/sun/star/awt/tree/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssawttree -PACKAGE=com$/sun$/star$/awt$/tree - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - MutableTreeDataModel.idl\ - ExpandVetoException.idl\ - MutableTreeNode.idl\ - TreeControl.idl\ - TreeControlModel.idl\ - TreeDataModelEvent.idl\ - TreeExpansionEvent.idl\ - XMutableTreeDataModel.idl\ - XMutableTreeNode.idl\ - XTreeControl.idl\ - XTreeDataModel.idl\ - XTreeDataModelListener.idl\ - XTreeExpansionListener.idl\ - XTreeNode.idl\ - XTreeEditListener.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk deleted file mode 100644 index 94592e0d70e9..000000000000 --- a/offapi/com/sun/star/chart/makefile.mk +++ /dev/null @@ -1,127 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csschart -PACKAGE=com$/sun$/star$/chart - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessibleChartElement.idl\ - AccessibleChartDocumentView.idl\ - AreaDiagram.idl\ - BarDiagram.idl\ - BubbleDiagram.idl\ - Chart3DBarProperties.idl\ - ChartArea.idl\ - ChartAxis.idl\ - ChartAxisArrangeOrderType.idl\ - ChartAxisAssign.idl\ - ChartAxisMarks.idl\ - ChartAxisPosition.idl\ - ChartAxisLabelPosition.idl\ - ChartAxisMarkPosition.idl\ - ChartAxisType.idl\ - ChartAxisXSupplier.idl\ - ChartAxisYSupplier.idl\ - ChartAxisZSupplier.idl\ - ChartData.idl\ - ChartDataArray.idl\ - ChartDataCaption.idl\ - ChartDataChangeEvent.idl\ - ChartDataChangeType.idl\ - ChartDataPoint.idl\ - ChartDataPointProperties.idl\ - ChartDataRow.idl\ - ChartDataRowProperties.idl\ - ChartDataRowSource.idl\ - ChartDataValue.idl\ - ChartDocument.idl\ - ChartErrorCategory.idl\ - ChartErrorIndicatorType.idl\ - ChartGrid.idl\ - ChartLegend.idl\ - ChartLegendPosition.idl\ - ChartLegendExpansion.idl \ - ChartLine.idl\ - ChartPieSegmentProperties.idl\ - ChartRegressionCurveType.idl\ - ChartSeriesAddress.idl\ - ChartSolidType.idl\ - ChartStatistics.idl\ - ChartSymbolType.idl\ - ChartTableAddressSupplier.idl\ - ChartTitle.idl\ - ChartTwoAxisXSupplier.idl\ - ChartTwoAxisYSupplier.idl\ - DataLabelPlacement.idl\ - TimeIncrement.idl \ - Diagram.idl\ - Dim3DDiagram.idl\ - DonutDiagram.idl\ - FilledNetDiagram.idl\ - LineDiagram.idl\ - MissingValueTreatment.idl\ - NetDiagram.idl\ - PieDiagram.idl\ - StackableDiagram.idl\ - StockDiagram.idl\ - TimeUnit.idl\ - TimeInterval.idl\ - X3DDefaultSetter.idl\ - X3DDisplay.idl\ - XAxis.idl\ - XAxisSupplier.idl\ - XAxisXSupplier.idl\ - XAxisYSupplier.idl\ - XAxisZSupplier.idl\ - XChartData.idl\ - XChartDataArray.idl\ - XChartDataChangeEventListener.idl\ - XChartDocument.idl\ - XComplexDescriptionAccess.idl\ - XDateCategories.idl\ - XDiagram.idl\ - XDiagramPositioning.idl\ - XStatisticDisplay.idl\ - XTwoAxisXSupplier.idl\ - XTwoAxisYSupplier.idl\ - XSecondAxisTitleSupplier.idl\ - XYDiagram.idl\ - ErrorBarStyle.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/chart2/CurveStyle.idl b/offapi/com/sun/star/chart2/CurveStyle.idl index e8f97fde9b77..6bf1e335c49d 100644 --- a/offapi/com/sun/star/chart2/CurveStyle.idl +++ b/offapi/com/sun/star/chart2/CurveStyle.idl @@ -49,9 +49,8 @@ enum CurveStyle */ CUBIC_SPLINES, - /** Data points are connected via a smoothed B-spline curve. The - data points themselves are not necessarily part of to the - curve. + /** Data points are connected via a parametric, interpolating + B-spline curve. */ B_SPLINES, diff --git a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl index 9fee78298ffc..09d05cb1cf20 100644 --- a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp +++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,19 +24,26 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef __com_sun_star_report_DatabaseDataProvider_idl__ +#define __com_sun_star_report_DatabaseDataProvider_idl__ -#include "macros.h" +#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl> -IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLogicalDriveStringsW, ( DWORD cchBuffer, LPWSTR lpBufferW ) ) -{ - AUTO_STR( lpBuffer, cchBuffer ); +//============================================================================= + + module com { module sun { module star { module chart2 { module data { - DWORD dwResult = GetLogicalDriveStringsA( cchBuffer, lpBufferA ); +//============================================================================= + +service DatabaseDataProvider : XDatabaseDataProvider +{ + createWithConnection([in] com::sun::star::sdbc::XConnection connection); +}; +//============================================================================= + }; }; }; }; }; - if ( dwResult && dwResult < cchBuffer ) - STRBUF2WSTR( lpBuffer, (int) (dwResult + 1), (int) cchBuffer ); +/*============================================================================= - return dwResult; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl index abe0c45b08f2..7dd525f18eeb 100644 --- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl +++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl @@ -208,10 +208,6 @@ interface XDatabaseDataProvider [attribute,bound] string DataSourceName; }; -service DatabaseDataProvider : XDatabaseDataProvider -{ - createWithConnection([in] com::sun::star::sdbc::XConnection connection); -}; //============================================================================= }; }; }; }; }; diff --git a/offapi/com/sun/star/chart2/data/makefile.mk b/offapi/com/sun/star/chart2/data/makefile.mk deleted file mode 100644 index f36f9e6c8ba3..000000000000 --- a/offapi/com/sun/star/chart2/data/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -TARGET=csschart2data -PACKAGE=com$/sun$/star$/chart2$/data - -PRJNAME=chart2 - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -#------------------------------------------------------------------- - -IDLFILES= \ - DataSequenceRole.idl \ - HighlightedRange.idl \ - LabelOrigin.idl \ - XDataProvider.idl \ - XDataReceiver.idl \ - XDataSequence.idl \ - XDataSink.idl \ - XDataSource.idl \ - XLabeledDataSequence.idl \ - XNumericalDataSequence.idl \ - XRangeHighlighter.idl \ - XRangeXMLConversion.idl \ - XTextualDataSequence.idl \ - XDatabaseDataProvider.idl - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk deleted file mode 100644 index 873bb985d566..000000000000 --- a/offapi/com/sun/star/chart2/makefile.mk +++ /dev/null @@ -1,99 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -TARGET=csschart2 -PACKAGE=com$/sun$/star$/chart2 - -PRJNAME=offapi - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -#------------------------------------------------------------------- - -IDLFILES= \ - AxisType.idl \ - AxisOrientation.idl \ - CoordinateSystemTypeID.idl \ - CurveStyle.idl \ - DataPointGeometry3D.idl \ - DataPointLabel.idl \ - FillBitmap.idl \ - IncrementData.idl \ - InterpretedData.idl \ - LegendPosition.idl \ - LightSource.idl \ - PieChartOffsetMode.idl \ - RelativePosition.idl \ - RelativeSize.idl \ - ScaleData.idl \ - StackingDirection.idl \ - SubIncrement.idl \ - Symbol.idl \ - SymbolStyle.idl \ - TickmarkStyle.idl \ - TransparencyStyle.idl \ - XAnyDescriptionAccess.idl\ - XAxis.idl \ - XCoordinateSystem.idl \ - XCoordinateSystemContainer.idl \ - XChartDocument.idl \ - XChartShape.idl \ - XChartShapeContainer.idl \ - XChartType.idl \ - XChartTypeContainer.idl \ - XChartTypeManager.idl \ - XChartTypeTemplate.idl \ - XColorScheme.idl \ - XDataInterpreter.idl \ - XDataSeries.idl \ - XDataSeriesContainer.idl \ - XDefaultSizeTransmitter.idl \ - XDiagram.idl \ - XDiagramProvider.idl \ - XFastPropertyState.idl \ - XFormattedString.idl \ - XInternalDataProvider.idl \ - XLabeled.idl \ - XLegend.idl \ - XRegressionCurve.idl \ - XRegressionCurveCalculator.idl \ - XRegressionCurveContainer.idl \ - XScaling.idl \ - XStyleSupplier.idl \ - XTarget.idl \ - XTitle.idl \ - XTitled.idl \ - XTransformation.idl \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/configuration/backend/makefile.mk b/offapi/com/sun/star/configuration/backend/makefile.mk deleted file mode 100644 index 2e2042b0ec34..000000000000 --- a/offapi/com/sun/star/configuration/backend/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/..$/..$/.. -PRJNAME=offapi - -TARGET = csscbackend -PACKAGE = com$/sun$/star$/configuration$/backend - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - Backend.idl \ - SingleBackend.idl \ - LocalSingleBackend.idl \ - LdapSingleBackend.idl \ - BackendAdapter.idl \ - SingleBackendAdapter.idl \ - OfflineBackend.idl \ - OnlineBackend.idl \ - HierarchyBrowser.idl \ - LocalHierarchyBrowser.idl \ - DataImporter.idl \ - LocalDataImporter.idl \ - LayerFilter.idl \ - LayerUpdateMerger.idl \ - Importer.idl \ - MergeImporter.idl \ - CopyImporter.idl \ - Schema.idl \ - Layer.idl \ - UpdatableLayer.idl \ - SingleLayerStratum.idl \ - LocalSingleStratum.idl \ - LdapSingleStratum.idl \ - MultiStratumBackend.idl \ - MultiLayerStratum.idl \ - LdapMultiLayerStratum.idl \ - SchemaSupplier.idl \ - LocalSchemaSupplier.idl \ - PlatformBackend.idl \ - SystemIntegration.idl \ - LayerDescriber.idl \ - InteractionHandler.idl \ - XBackend.idl \ - XBackendEntities.idl \ - XSchemaSupplier.idl \ - XVersionedSchemaSupplier.idl \ - XSingleLayerStratum.idl \ - XMultiLayerStratum.idl \ - XSchema.idl \ - XLayer.idl \ - XCompositeLayer.idl \ - XUpdatableLayer.idl \ - XSchemaHandler.idl \ - XLayerHandler.idl \ - XUpdateHandler.idl \ - XLayerImporter.idl \ - XBackendChangesNotifier.idl \ - XBackendChangesListener.idl \ - XLayerContentDescriber.idl \ - ComponentChangeEvent.idl \ - TemplateIdentifier.idl \ - SchemaAttribute.idl \ - NodeAttribute.idl \ - PropertyInfo.idl \ - MergeRecoveryRequest.idl \ - MalformedDataException.idl \ - BackendSetupException.idl \ - StratumCreationException.idl \ - AuthenticationFailedException.idl \ - CannotConnectException.idl \ - InvalidAuthenticationMechanismException.idl \ - BackendAccessException.idl \ - ConnectionLostException.idl \ - InsufficientAccessRightsException.idl - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/configuration/makefile.mk b/offapi/com/sun/star/configuration/makefile.mk deleted file mode 100644 index 00525e9ba355..000000000000 --- a/offapi/com/sun/star/configuration/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssconfiguration -PACKAGE=com$/sun$/star$/configuration - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AdministrationProvider.idl \ - DefaultProvider.idl \ - CannotLoadConfigurationException.idl \ - CorruptedConfigurationException.idl \ - CorruptedUIConfigurationException.idl \ - InvalidBootstrapFileException.idl \ - MissingBootstrapFileException.idl \ - InstallationIncompleteException.idl \ - ConfigurationAccess.idl\ - ConfigurationProvider.idl\ - ConfigurationUpdateAccess.idl\ - ConfigurationRegistry.idl\ - HierarchyElement.idl\ - AccessRootElement.idl\ - UpdateRootElement.idl\ - GroupElement.idl\ - SetElement.idl\ - HierarchyAccess.idl\ - GroupAccess.idl\ - GroupUpdate.idl\ - SetAccess.idl\ - SetUpdate.idl\ - SimpleSetAccess.idl\ - SimpleSetUpdate.idl\ - PropertyHierarchy.idl\ - XTemplateContainer.idl\ - XTemplateInstance.idl\ - Update.idl \ - XUpdate.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk b/offapi/com/sun/star/datatransfer/clipboard/makefile.mk deleted file mode 100644 index c7d011aea6ca..000000000000 --- a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdclipboard -PACKAGE=com$/sun$/star$/datatransfer$/clipboard - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ClipboardEvent.idl \ - ClipboardManager.idl \ - GenericClipboard.idl \ - RenderingCapabilities.idl \ - SystemClipboard.idl \ - XClipboard.idl \ - XClipboardEx.idl \ - XClipboardFactory.idl \ - XClipboardListener.idl \ - XClipboardManager.idl \ - XClipboardNotifier.idl \ - XClipboardOwner.idl \ - XFlushableClipboard.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/datatransfer/dnd/makefile.mk b/offapi/com/sun/star/datatransfer/dnd/makefile.mk deleted file mode 100644 index 358a126aabb1..000000000000 --- a/offapi/com/sun/star/datatransfer/dnd/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssddnd -PACKAGE=com$/sun$/star$/datatransfer$/dnd - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - DNDConstants.idl \ - DragGestureEvent.idl \ - DragSourceEvent.idl \ - DragSourceDragEvent.idl \ - DragSourceDropEvent.idl \ - DropTargetDragEvent.idl \ - DropTargetDragEnterEvent.idl \ - DropTargetDropEvent.idl \ - DropTargetEvent.idl \ - InvalidDNDOperationException.idl \ - OleDragSource.idl \ - OleDropTarget.idl \ - X11DragSource.idl \ - X11DropTarget.idl \ - XAutoscroll.idl\ - XDragGestureListener.idl \ - XDragGestureRecognizer.idl \ - XDragSource.idl \ - XDragSourceContext.idl \ - XDragSourceListener.idl \ - XDropTarget.idl \ - XDropTargetDragContext.idl \ - XDropTargetDropContext.idl \ - XDropTargetListener.idl \ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/datatransfer/makefile.mk b/offapi/com/sun/star/datatransfer/makefile.mk deleted file mode 100644 index aff51f398a23..000000000000 --- a/offapi/com/sun/star/datatransfer/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdatatransfer -PACKAGE=com$/sun$/star$/datatransfer - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XTransferableSupplier.idl \ - DataFlavor.idl \ - UnsupportedFlavorException.idl \ - XTransferable.idl \ - XTransferableEx.idl \ - XSystemTransferable.idl \ - XTransferableSource.idl \ - XTransferDataAccess.idl \ - XMimeContentType.idl \ - XMimeContentTypeFactory.idl \ - MimeContentTypeFactory.idl\ - DataFormatTranslator.idl\ - XDataFormatTranslator.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/deployment/makefile.mk b/offapi/com/sun/star/deployment/makefile.mk deleted file mode 100644 index 1e3a77b89573..000000000000 --- a/offapi/com/sun/star/deployment/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/..$/.. - -PRJNAME=offapi - -TARGET = cssdeployment -PACKAGE = com$/sun$/star$/deployment - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - DeploymentException.idl \ - XPackageTypeInfo.idl \ - XPackage.idl \ - XPackageRegistry.idl \ - PackageRegistryBackend.idl \ - XPackageManager.idl \ - XPackageManagerFactory.idl \ - XExtensionManager.idl \ - ExtensionManager.idl \ - thePackageManagerFactory.idl \ - DependencyException.idl \ - LicenseException.idl \ - VersionException.idl \ - InstallException.idl \ - UpdateInformationEntry.idl \ - XUpdateInformationProvider.idl \ - UpdateInformationProvider.idl \ - XPackageInformationProvider.idl \ - PackageInformationProvider.idl \ - PlatformException.idl \ - InvalidRemovedParameterException.idl \ - ExtensionRemovedException.idl \ - Prerequisites.idl - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp b/offapi/com/sun/star/drawing/CanvasFeature.idl index 0947640464f6..bcb2470e7fb0 100644 --- a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp +++ b/offapi/com/sun/star/drawing/CanvasFeature.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,11 +25,19 @@ * ************************************************************************/ -#include "macros.h" +#ifndef __com_sun_star_drawing_CanvasFeature_idl__ +#define __com_sun_star_drawing_CanvasFeature_idl__ -IMPLEMENT_THUNK( kernel32, WINDOWS, LANGID, WINAPI, GetUserDefaultUILanguage,()) +module com { module sun { module star { module drawing { + +constants CanvasFeature { - return LANGIDFROMLCID(GetUserDefaultLCID()); -} + const short None = 0; + const short SpriteCanvas = 1; +}; + + + +}; }; }; }; // ::com::sun::star::drawing -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#endif diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl index b497917592dd..76a1994806dc 100644 --- a/offapi/com/sun/star/drawing/SlideSorter.idl +++ b/offapi/com/sun/star/drawing/SlideSorter.idl @@ -34,92 +34,10 @@ #include <com/sun/star/container/XIndexAccess.idl> #include <com/sun/star/frame/XController.idl> #include <com/sun/star/util/Color.idl> +#include <com/sun/star/drawing/XSlideSorterBase.idl> module com { module sun { module star { module drawing { -/** This interface exists only because services do not directly support - multiple inheritance and attributes. - <p>It provides the interfaces and attributes that every object that - implements the <type>SlideSorter</type> service.</p> -*/ -interface XSlideSorterBase -{ - /** This interface is included to mark a <type>SlideSorter</type> object - as view of the drawing framework and to provide a - <type>ResourceId</type>. - */ - interface ::com::sun::star::drawing::framework::XView; - - /** The <type>XDrawView</type> interface is included to provide access - to the current slide (especially write access). - */ - interface ::com::sun::star::drawing::XDrawView; - - /** The set of slides that are displayed by the implementing object. - <p>The default value is the set of all slides of the document for - which a slide sorter is created.</p> - */ - [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides; - - /** Set this flag to <TRUE/> in order to have the current slide - highlighted. - <p>The default value is <FALSE/>.</p> - */ - [attribute] boolean IsHighlightCurrentSlide; - - /** Set this flag to <TRUE/> in order to visualize the selection of - slides (typically a bold frame around the selected slides). - <p>The default value is <TRUE/>.</p> - */ - [attribute] boolean IsShowSelection; - - /** Set this flag to <TRUE/> to visualize to where the focus is by - showing a dotted rectangle around the focused slide. - <p>The default value is <TRUE/>.</p> - */ - [attribute] boolean IsShowFocus; - - /** When this flag has the value <TRUE/> then every time the current - slide is changed the visual area is shifted so that the new current - slide is display in the center of the slide sorter window. - <p>It is not always possible to move the current slide into the - exact center of the window, for example when slides are located near - the start or end of a document.</p> - <p>The default value is <FALSE/>. - */ - [attribute] boolean IsCenterSelection; - - /** This flag controls whether updates of previews are created during - full screen presentations (<FALSE/>) or not (<TRUE/>). The - suspension of preview creations is an optimization for not slowing - down a running presentation. - <p>The default value is <TRUE/>.</p> - */ - [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation; - - /** The orientation of a slide sorter can be either vertical (<TRUE/>) - or horizontal (<FALSE/>). - */ - [attribute] boolean IsOrientationVertical; - - /** This flag is a hint to make scrolling look smooth. - */ - [attribute] boolean IsSmoothScrolling; - - [attribute] ::com::sun::star::util::Color BackgroundColor; - [attribute] ::com::sun::star::util::Color TextColor; - [attribute] ::com::sun::star::util::Color SelectionColor; - [attribute] ::com::sun::star::util::Color HighlightColor; - - /** This flag controls whether the model can be modified by using - keyboard or mouse. - <p>The default value is <TRUE/>.</p> - */ - [attribute] boolean IsUIReadOnly; -}; - - - /** A slide sorter shows previews for a set of slides, typically all slides in a document, and allows the selection, reordering, creation, and diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl index e1a749040bd2..59ec6257eda9 100644 --- a/offapi/com/sun/star/drawing/XPresenterHelper.idl +++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl @@ -32,15 +32,10 @@ #include <com/sun/star/rendering/XCanvas.idl> #include <com/sun/star/rendering/XSpriteCanvas.idl> #include <com/sun/star/awt/Rectangle.idl> +#include <com/sun/star/drawing/CanvasFeature.idl> module com { module sun { module star { module drawing { -constants CanvasFeature -{ - const short None = 0; - const short SpriteCanvas = 1; -}; - /** This interface is a collection of functions that are necessary to implement larger parts of the presenter screen as extension. The methods of this interface give access to services that can, at the diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl index 78ee0a9654b5..a7977ccfd3db 100644 --- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl +++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl @@ -33,28 +33,10 @@ #include <com/sun/star/lang/IllegalArgumentException.idl> #include <com/sun/star/rendering/XBitmap.idl> #include <com/sun/star/rendering/XCanvas.idl> +#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl> module com { module sun { module star { module drawing { -/** Listener for asynchronous preview creations. Called when a slide - preview has been created that was previously requested via a call to - <method>XSlidePreviewCache::getSlidePreview()</method>. The - implementor may then call <method>getSlidePreview()</method> a second - time to get the up-to-date version of the preview. -*/ -published interface XSlidePreviewCacheListener -{ - /** Called by a <interface>XSlidePreviewCache</interface> object when a - preview has been created for the slide with the given index. - @param nSlideIndex - The index of the slide for which a new preview has been created. - */ - void notifyPreviewCreation ([in] long nSlideIndex); -}; - - - - /** A cache of preview bitmaps for the slides of one Impress or Draw document in one size. There may be more than one cache for one document. These are internally connected and for missing previews one diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl new file mode 100644 index 000000000000..d6192889b76f --- /dev/null +++ b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl @@ -0,0 +1,55 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__ +#define __com_sun_star_drawing_XSlidePreviewCacheListener_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif + +module com { module sun { module star { module drawing { + +/** Listener for asynchronous preview creations. Called when a slide + preview has been created that was previously requested via a call to + <method>XSlidePreviewCache::getSlidePreview()</method>. The + implementor may then call <method>getSlidePreview()</method> a second + time to get the up-to-date version of the preview. +*/ +published interface XSlidePreviewCacheListener +{ + /** Called by a <interface>XSlidePreviewCache</interface> object when a + preview has been created for the slide with the given index. + @param nSlideIndex + The index of the slide for which a new preview has been created. + */ + void notifyPreviewCreation ([in] long nSlideIndex); +}; + +}; }; }; }; // ::com::sun::star::drawing + +#endif diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl new file mode 100644 index 000000000000..5a6c4de654ed --- /dev/null +++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl @@ -0,0 +1,137 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__ +#define __com_sun_star_drawing_XSlideSorterBase_idl__ + +#ifndef __com_sun_star_drawing_framework_XView_idl__ +#include <com/sun/star/drawing/framework/XView.idl> +#endif +#ifndef __com_sun_star_drawing_XDrawView_idl__ +#include <com/sun/star/drawing/XDrawView.idl> +#endif +#ifndef __com_sun_star_awt_XWindow_idl__ +#include <com/sun/star/awt/XWindow.idl> +#endif +#ifndef __com_sun_star_container_XIndexAccess_idl__ +#include <com/sun/star/container/XIndexAccess.idl> +#endif +#ifndef __com_sun_star_frame_XController_idl__ +#include <com/sun/star/frame/XController.idl> +#endif +#ifndef __com_sun_star_util_Color_idl__ +#include <com/sun/star/util/Color.idl> +#endif + +module com { module sun { module star { module drawing { + +/** This interface exists only because services do not directly support + multiple inheritance and attributes. + <p>It provides the interfaces and attributes that every object that + implements the <type>SlideSorter</type> service.</p> +*/ +interface XSlideSorterBase +{ + /** This interface is included to mark a <type>SlideSorter</type> object + as view of the drawing framework and to provide a + <type>ResourceId</type>. + */ + interface ::com::sun::star::drawing::framework::XView; + + /** The <type>XDrawView</type> interface is included to provide access + to the current slide (especially write access). + */ + interface ::com::sun::star::drawing::XDrawView; + + /** The set of slides that are displayed by the implementing object. + <p>The default value is the set of all slides of the document for + which a slide sorter is created.</p> + */ + [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides; + + /** Set this flag to <TRUE/> in order to have the current slide + highlighted. + <p>The default value is <FALSE/>.</p> + */ + [attribute] boolean IsHighlightCurrentSlide; + + /** Set this flag to <TRUE/> in order to visualize the selection of + slides (typically a bold frame around the selected slides). + <p>The default value is <TRUE/>.</p> + */ + [attribute] boolean IsShowSelection; + + /** Set this flag to <TRUE/> to visualize to where the focus is by + showing a dotted rectangle around the focused slide. + <p>The default value is <TRUE/>.</p> + */ + [attribute] boolean IsShowFocus; + + /** When this flag has the value <TRUE/> then every time the current + slide is changed the visual area is shifted so that the new current + slide is display in the center of the slide sorter window. + <p>It is not always possible to move the current slide into the + exact center of the window, for example when slides are located near + the start or end of a document.</p> + <p>The default value is <FALSE/>. + */ + [attribute] boolean IsCenterSelection; + + /** This flag controls whether updates of previews are created during + full screen presentations (<FALSE/>) or not (<TRUE/>). The + suspension of preview creations is an optimization for not slowing + down a running presentation. + <p>The default value is <TRUE/>.</p> + */ + [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation; + + /** The orientation of a slide sorter can be either vertical (<TRUE/>) + or horizontal (<FALSE/>). + */ + [attribute] boolean IsOrientationVertical; + + /** This flag is a hint to make scrolling look smooth. + */ + [attribute] boolean IsSmoothScrolling; + + [attribute] ::com::sun::star::util::Color BackgroundColor; + [attribute] ::com::sun::star::util::Color TextColor; + [attribute] ::com::sun::star::util::Color SelectionColor; + [attribute] ::com::sun::star::util::Color HighlightColor; + + /** This flag controls whether the model can be modified by using + keyboard or mouse. + <p>The default value is <TRUE/>.</p> + */ + [attribute] boolean IsUIReadOnly; +}; + + + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/drawing/framework/BorderType.idl b/offapi/com/sun/star/drawing/framework/BorderType.idl new file mode 100644 index 000000000000..d1c9ea3f3e3c --- /dev/null +++ b/offapi/com/sun/star/drawing/framework/BorderType.idl @@ -0,0 +1,46 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_drawing_framework_BorderType_idl__ +#define __com_sun_star_drawing_framework_BorderType_idl__ + + +module com { module sun { module star { module drawing { module framework { + +/** See XPaneBorderPainter and its addBorder() and removeBorder() methods + for an explanation of the border type and its values. +*/ +published enum BorderType +{ + INNER_BORDER, + OUTER_BORDER, + TOTAL_BORDER +}; + +}; }; }; }; }; // ::com::sun::star::drawing::framework + +#endif diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl index d4d953b1a936..292af409bf49 100644 --- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl +++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl @@ -31,20 +31,10 @@ #include <com/sun/star/awt/Rectangle.idl> #include <com/sun/star/awt/Point.idl> #include <com/sun/star/rendering/XCanvas.idl> +#include <com/sun/star/drawing/framework/BorderType.idl> module com { module sun { module star { module drawing { module framework { -/** See XPaneBorderPainter and its addBorder() and removeBorder() methods - for an explanation of the border type and its values. -*/ -published enum BorderType -{ - INNER_BORDER, - OUTER_BORDER, - TOTAL_BORDER -}; - - /** Paint the border around a rectangular region, typically a pane. <p>Calling objects have to be able to derive inner bounding boxes of the diff --git a/offapi/com/sun/star/drawing/framework/makefile.mk b/offapi/com/sun/star/drawing/framework/makefile.mk deleted file mode 100644 index e073b1a61ab8..000000000000 --- a/offapi/com/sun/star/drawing/framework/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssdframework -PACKAGE=com$/sun$/star$/drawing$/framework - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES= \ - AnchorBindingMode.idl \ - BasicPaneFactory.idl \ - BasicToolBarFactory.idl \ - BasicViewFactory.idl \ - Configuration.idl \ - ConfigurationChangeEvent.idl \ - ConfigurationController.idl \ - ModuleController.idl \ - ResourceActivationMode.idl \ - ResourceId.idl \ - TabBarButton.idl \ - XConfiguration.idl \ - XConfigurationChangeListener.idl \ - XConfigurationChangeRequest.idl \ - XConfigurationController.idl \ - XConfigurationControllerBroadcaster.idl \ - XConfigurationControllerRequestQueue.idl\ - XControllerManager.idl \ - XModuleController.idl \ - XPane.idl \ - XPane2.idl \ - XPaneBorderPainter.idl \ - XRelocatableResource.idl \ - XResource.idl \ - XResourceId.idl \ - XResourceFactory.idl \ - XResourceFactoryManager.idl \ - XTabBar.idl \ - XToolBar.idl \ - XView.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk deleted file mode 100644 index b3d581c755e6..000000000000 --- a/offapi/com/sun/star/drawing/makefile.mk +++ /dev/null @@ -1,227 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdrawing -PACKAGE=com$/sun$/star$/drawing - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessibleShape.idl \ - AccessibleGraphicShape.idl \ - AccessibleOLEShape.idl \ - AccessibleDrawDocumentView.idl \ - AccessibleSlideView.idl \ - AccessibleSlideViewObject.idl \ - AccessibleGraphControl.idl\ - Alignment.idl\ - AppletShape.idl\ - Arrangement.idl\ - Background.idl\ - BezierPoint.idl\ - BitmapMode.idl\ - BitmapTable.idl\ - BoundVolume.idl\ - CameraGeometry.idl\ - CaptionEscapeDirection.idl\ - CaptionShape.idl\ - CaptionType.idl\ - CircleKind.idl\ - ClosedBezierShape.idl\ - ColorMode.idl\ - ConnectionType.idl\ - ConnectorProperties.idl\ - ConnectorShape.idl\ - ConnectorType.idl\ - ControlShape.idl\ - CoordinateSequence.idl\ - CoordinateSequenceSequence.idl\ - CustomShape.idl\ - CustomShapeEngine.idl\ - DashStyle.idl\ - DashTable.idl\ - Defaults.idl\ - Direction3D.idl\ - DocumentSettings.idl\ - DoubleSequence.idl\ - DoubleSequenceSequence.idl\ - DrawingDocument.idl\ - DrawingDocumentDrawView.idl\ - DrawingDocumentFactory.idl\ - DrawPage.idl\ - DrawPages.idl\ - DrawViewMode.idl\ - EnhancedCustomShapeAdjustmentValue.idl\ - EnhancedCustomShapeExtrusion.idl\ - EnhancedCustomShapeGeometry.idl\ - EnhancedCustomShapeGluePointType.idl\ - EnhancedCustomShapeHandle.idl\ - EnhancedCustomShapeParameter.idl\ - EnhancedCustomShapeParameterPair.idl\ - EnhancedCustomShapeParameterType.idl\ - EnhancedCustomShapePath.idl\ - EnhancedCustomShapeSegment.idl\ - EnhancedCustomShapeSegmentCommand.idl\ - EnhancedCustomShapeTextFrame.idl\ - EnhancedCustomShapeTextPath.idl\ - EnhancedCustomShapeTextPathMode.idl\ - EllipseShape.idl\ - EscapeDirection.idl\ - FillProperties.idl\ - FillStyle.idl\ - FlagSequence.idl\ - FlagSequenceSequence.idl\ - GenericDrawingDocument.idl\ - GenericDrawPage.idl\ - GluePoint.idl\ - GluePoint2.idl\ - GradientTable.idl\ - GraphicExportFilter.idl\ - GraphicFilterRequest.idl\ - GraphicObjectShape.idl\ - GroupShape.idl\ - Hatch.idl\ - HatchStyle.idl\ - HatchTable.idl\ - HomogenMatrix.idl\ - HomogenMatrix3.idl\ - HomogenMatrix4.idl\ - HomogenMatrixLine.idl\ - HomogenMatrixLine3.idl\ - HomogenMatrixLine4.idl\ - HorizontalDimensioning.idl\ - Layer.idl\ - LayerManager.idl\ - LayerType.idl\ - LineDash.idl\ - LineEndType.idl\ - LineJoint.idl\ - LineProperties.idl\ - LineShape.idl\ - LineStyle.idl\ - MarkerTable.idl\ - MasterPage.idl\ - MasterPages.idl\ - MeasureKind.idl\ - MeasureProperties.idl\ - MeasureShape.idl\ - MeasureTextHorzPos.idl\ - MeasureTextVertPos.idl\ - MirrorAxis.idl\ - NormalsKind.idl\ - OLE2Shape.idl\ - OpenBezierShape.idl\ - PageShape.idl\ - PluginShape.idl\ - PointSequence.idl\ - PointSequenceSequence.idl\ - PolygonFlags.idl\ - PolygonKind.idl\ - PolyLineShape.idl\ - PolyPolygonBezierCoords.idl\ - PolyPolygonBezierDescriptor.idl\ - PolyPolygonBezierShape.idl\ - PolyPolygonDescriptor.idl\ - PolyPolygonShape.idl\ - PolyPolygonShape3D.idl\ - Position3D.idl\ - ProjectionMode.idl\ - RectanglePoint.idl\ - RectangleShape.idl\ - RotationDescriptor.idl\ - ShadeMode.idl\ - ShadowProperties.idl\ - Shape.idl\ - ShapeCollection.idl\ - Shapes.idl\ - SlideRenderer.idl\ - SlideSorter.idl\ - SnapObjectType.idl\ - Text.idl\ - TextAdjust.idl\ - TextAnimationDirection.idl\ - TextAnimationKind.idl\ - TextFitToSizeType.idl\ - TextHorizontalAdjust.idl\ - TextProperties.idl\ - TextShape.idl\ - TextureKind.idl\ - TextureKind2.idl\ - TextureMode.idl\ - TextureProjectionMode.idl\ - TextVerticalAdjust.idl\ - TransparencyGradientTable.idl\ - VerticalDimensioning.idl\ - XConnectableShape.idl\ - XConnectorShape.idl\ - XControlShape.idl\ - XCustomShapeEngine.idl\ - XCustomShapeHandle.idl\ - XDrawPage.idl\ - XDrawPageDuplicator.idl\ - XDrawPageExpander.idl\ - XDrawPages.idl\ - XDrawPagesSupplier.idl\ - XDrawPageSummarizer.idl\ - XDrawPageSupplier.idl\ - XDrawSubController.idl\ - XDrawView.idl\ - XEnhancedCustomShapeDefaulter.idl\ - XGluePointsSupplier.idl\ - XLayer.idl\ - XLayerManager.idl\ - XLayerSupplier.idl\ - XMasterPagesSupplier.idl\ - XMasterPageTarget.idl\ - XPresenterHelper.idl\ - XShape.idl\ - XShapeAligner.idl\ - XShapeArranger.idl\ - XShapeBinder.idl\ - XShapeCombiner.idl\ - XShapeDescriptor.idl\ - XShapeGroup.idl\ - XShapeGrouper.idl\ - XShapeMirror.idl\ - XShapes.idl\ - XSlidePreviewCache.idl\ - XSlideRenderer.idl\ - XUniversalShapeDescriptor.idl\ - XSelectionFunction.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/form/binding/makefile.mk b/offapi/com/sun/star/form/binding/makefile.mk deleted file mode 100644 index dc9885f5fd55..000000000000 --- a/offapi/com/sun/star/form/binding/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfbinding -PACKAGE=com$/sun$/star$/form$/binding - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XBindableValue.idl \ - XValueBinding.idl \ - ValueBinding.idl \ - XListEntrySink.idl \ - XListEntrySource.idl \ - XListEntryListener.idl \ - ListEntryEvent.idl \ - ListEntrySource.idl \ - \ - BindableControlModel.idl \ - BindableIntegerValueRange.idl \ - BindableDataAwareControlModel.idl \ - BindableDatabaseCheckBox.idl \ - BindableDatabaseComboBox.idl \ - BindableDatabaseDateField.idl \ - BindableDatabaseFormattedField.idl \ - BindableDatabaseListBox.idl \ - BindableDatabaseNumericField.idl \ - BindableDatabaseRadioButton.idl \ - BindableDatabaseTextField.idl \ - BindableDatabaseTimeField.idl \ - \ - IncompatibleTypesException.idl \ - InvalidBindingStateException.idl \ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/component/makefile.mk b/offapi/com/sun/star/form/component/makefile.mk deleted file mode 100644 index 37c1bb44d560..000000000000 --- a/offapi/com/sun/star/form/component/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfcomp -PACKAGE=com$/sun$/star$/form$/component - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - CheckBox.idl\ - ComboBox.idl\ - CommandButton.idl\ - CurrencyField.idl\ - DatabaseCheckBox.idl\ - DatabaseComboBox.idl\ - DatabaseCurrencyField.idl\ - DatabaseDateField.idl\ - DatabaseImageControl.idl\ - DatabaseListBox.idl\ - DatabaseNumericField.idl\ - DatabasePatternField.idl\ - DatabaseRadioButton.idl\ - DatabaseTextField.idl\ - DatabaseFormattedField.idl\ - DatabaseTimeField.idl\ - DataForm.idl\ - DateField.idl\ - FileControl.idl\ - FixedText.idl\ - Form.idl\ - GridControl.idl\ - GroupBox.idl\ - HiddenControl.idl\ - HTMLForm.idl\ - ImageButton.idl\ - ListBox.idl\ - NumericField.idl\ - PatternField.idl\ - RadioButton.idl\ - TextField.idl\ - FormattedField.idl\ - TimeField.idl\ - NavigationToolBar.idl\ - ScrollBar.idl\ - SpinButton.idl\ - SubmitButton.idl\ - RichTextControl.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/control/makefile.mk b/offapi/com/sun/star/form/control/makefile.mk deleted file mode 100644 index 6e972b224b69..000000000000 --- a/offapi/com/sun/star/form/control/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfcontrol -PACKAGE=com$/sun$/star$/form$/control - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - CheckBox.idl \ - ComboBox.idl \ - CommandButton.idl \ - CurrencyField.idl \ - DateField.idl \ - FormattedField.idl \ - GridControl.idl \ - GroupBox.idl \ - ImageButton.idl \ - ImageControl.idl \ - InteractionGridControl.idl \ - ListBox.idl \ - NumericField.idl \ - PatternField.idl \ - RadioButton.idl \ - TextField.idl \ - TimeField.idl \ - SubmitButton.idl \ - NavigationToolBar.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/inspection/makefile.mk b/offapi/com/sun/star/form/inspection/makefile.mk deleted file mode 100644 index e867febf8220..000000000000 --- a/offapi/com/sun/star/form/inspection/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfinsp -PACKAGE=com$/sun$/star$/form$/inspection - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ButtonNavigationHandler.idl \ - CellBindingPropertyHandler.idl \ - DefaultFormComponentInspectorModel.idl \ - EditPropertyHandler.idl \ - EventHandler.idl \ - FormComponentPropertyHandler.idl \ - SubmissionPropertyHandler.idl \ - XMLFormsPropertyHandler.idl \ - XSDValidationPropertyHandler.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/makefile.mk b/offapi/com/sun/star/form/makefile.mk deleted file mode 100644 index b1161cb2a14a..000000000000 --- a/offapi/com/sun/star/form/makefile.mk +++ /dev/null @@ -1,104 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssform -PACKAGE=com$/sun$/star$/form - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - modules.idl\ - DataAwareControlModel.idl\ - DatabaseDeleteEvent.idl\ - DatabaseParameterEvent.idl\ - DataSelectionType.idl\ - ErrorEvent.idl\ - FormButtonType.idl\ - FormComponent.idl\ - FormComponents.idl\ - FormComponentType.idl\ - FormController.idl\ - FormControllerDispatcher.idl\ - FormControlModel.idl\ - Forms.idl\ - FormSubmitEncoding.idl\ - FormSubmitMethod.idl\ - ListSourceType.idl\ - NavigationBarMode.idl\ - PropertyBrowserController.idl\ - TabulatorCycle.idl\ - XApproveActionBroadcaster.idl\ - XApproveActionListener.idl\ - XBoundComponent.idl\ - XBoundControl.idl\ - XChangeBroadcaster.idl\ - XChangeListener.idl\ - XConfirmDeleteBroadcaster.idl\ - XConfirmDeleteListener.idl\ - XDatabaseParameterBroadcaster.idl\ - XDatabaseParameterBroadcaster2.idl\ - XDatabaseParameterListener.idl\ - XDeleteListener.idl\ - XErrorBroadcaster.idl\ - XErrorListener.idl\ - XForm.idl\ - XFormComponent.idl\ - XFormController.idl\ - XFormControllerListener.idl\ - XFormsSupplier.idl\ - XFormsSupplier2.idl\ - XGrid.idl\ - XGridColumnFactory.idl\ - XGridControl.idl\ - XGridControlListener.idl\ - XGridFieldDataSupplier.idl\ - XGridPeer.idl\ - XImageProducerSupplier.idl\ - XInsertListener.idl\ - XLoadListener.idl\ - XPositioningListener.idl\ - XReset.idl\ - XResetListener.idl\ - XRestoreListener.idl\ - XSubmit.idl\ - XSubmitListener.idl\ - XUpdateBroadcaster.idl\ - XUpdateListener.idl\ - XLoadable.idl\ - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/runtime/makefile.mk b/offapi/com/sun/star/form/runtime/makefile.mk deleted file mode 100644 index 4b34b28cae9a..000000000000 --- a/offapi/com/sun/star/form/runtime/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfrunt -PACKAGE=com$/sun$/star$/form$/runtime - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - FeatureState.idl \ - FilterEvent.idl \ - FormFeature.idl \ - FormOperations.idl \ - FormController.idl \ - XFeatureInvalidation.idl \ - XFilterController.idl \ - XFilterControllerListener.idl \ - XFormController.idl \ - XFormControllerContext.idl \ - XFormOperations.idl \ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/submission/makefile.mk b/offapi/com/sun/star/form/submission/makefile.mk deleted file mode 100644 index 27a60084cb29..000000000000 --- a/offapi/com/sun/star/form/submission/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfsubmission -PACKAGE=com$/sun$/star$/form$/submission - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XSubmission.idl \ - XSubmissionSupplier.idl \ - XSubmissionVetoListener.idl \ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/form/validation/makefile.mk b/offapi/com/sun/star/form/validation/makefile.mk deleted file mode 100644 index 752438c94f2c..000000000000 --- a/offapi/com/sun/star/form/validation/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfvalidation -PACKAGE=com$/sun$/star$/form$/validation - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XValidatable.idl \ - XValidator.idl \ - XValidityConstraintListener.idl \ - XValidatableFormComponent.idl \ - XFormComponentValidityListener.idl \ - \ - ValidatableControlModel.idl \ - ValidatableBindableControlModel.idl \ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/formula/makefile.mk b/offapi/com/sun/star/formula/makefile.mk deleted file mode 100644 index aae03ff0353c..000000000000 --- a/offapi/com/sun/star/formula/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssformula -PACKAGE=com$/sun$/star$/formula - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessibleFormulaText.idl \ - AccessibleFormulaView.idl \ - SymbolDescriptor.idl \ - FormulaProperties.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp b/offapi/com/sun/star/frame/UntitledNumbersConst.idl index b444dbd9bdbc..de80742b1dea 100644 --- a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp +++ b/offapi/com/sun/star/frame/UntitledNumbersConst.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +24,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef __com_sun_star_frame_UntitledNumbersConst_idl__ +#define __com_sun_star_frame_UntitledNumbersConst_idl__ + module com { module sun { module star { module frame { + +constants UntitledNumbersConst { - return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize ); -} + const long INVALID_NUMBER = 0; +}; + +}; }; }; }; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#endif diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl index 595a0ac224df..48cd137d4ff8 100644 --- a/offapi/com/sun/star/frame/XUntitledNumbers.idl +++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl @@ -34,11 +34,6 @@ module com { module sun { module star { module frame { -constants UntitledNumbersConst -{ - const long INVALID_NUMBER = 0; -}; - //============================================================================= /** knows all currently used and all free numbers for using with untitled but counted objects. diff --git a/offapi/com/sun/star/frame/makefile.mk b/offapi/com/sun/star/frame/makefile.mk deleted file mode 100644 index dbcfd03cd940..000000000000 --- a/offapi/com/sun/star/frame/makefile.mk +++ /dev/null @@ -1,166 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssframe -PACKAGE=com$/sun$/star$/frame - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - BorderWidths.idl\ - CommandGroup.idl\ - Components.idl\ - ContentHandler.idl\ - ContentHandlerFactory.idl\ - ControlCommand.idl\ - ControlEvent.idl\ - Controller.idl\ - Desktop.idl\ - DesktopTask.idl\ - DesktopTasks.idl\ - DispatchDescriptor.idl\ - DispatchHelper.idl\ - DispatchInformation.idl\ - DispatchProvider.idl\ - DispatchRecorder.idl\ - DispatchRecorderSupplier.idl\ - DispatchResultState.idl\ - DispatchResultEvent.idl\ - DispatchStatement.idl\ - DocumentTemplates.idl\ - DoubleInitializationException.idl\ - FeatureStateEvent.idl\ - Frame.idl\ - FrameAction.idl\ - FrameActionEvent.idl\ - FrameControl.idl\ - FrameLoader.idl\ - FrameLoaderFactory.idl\ - FramesContainer.idl\ - FrameSearchFlag.idl\ - IllegalArgumentIOException.idl\ - LayoutManager.idl\ - LayoutManagerEvents.idl\ - MediaTypeDetectionHelper.idl\ - ModuleManager.idl\ - PopupMenuController.idl\ - PopupMenuControllerFactory.idl\ - ProtocolHandler.idl\ - SessionManager.idl\ - Settings.idl\ - SynchronousFrameLoader.idl\ - StatusbarController.idl\ - StatusbarControllerFactory.idl\ - Task.idl\ - TemplateAccess.idl\ - TerminationVetoException.idl\ - TitleChangedEvent.idl\ - ToolbarController.idl\ - TransientDocumentsDocumentContentFactory.idl \ - UnknownModuleException.idl\ - WindowArrange.idl\ - XBorderResizeListener.idl\ - XBrowseHistoryRegistry.idl\ - XComponentLoader.idl\ - XComponentRegistry.idl\ - XConfigManager.idl\ - XController.idl\ - XController2.idl\ - XControlNotificationListener.idl\ - XControllerBorder.idl\ - XDesktop.idl\ - XDesktopTask.idl\ - XDispatch.idl\ - XDispatchHelper.idl\ - XDispatchInformationProvider.idl\ - XDispatchProvider.idl\ - XDispatchProviderInterception.idl\ - XDispatchProviderInterceptor.idl\ - XDispatchRecorder.idl\ - XDispatchRecorderSupplier.idl\ - XDispatchResultListener.idl\ - XDocumentTemplates.idl\ - XExtendedFilterDetection.idl\ - XFilterDetect.idl\ - XFrame.idl\ - XFrameActionListener.idl\ - XFrameLoader.idl\ - XFrameLoaderQuery.idl\ - XFrames.idl\ - XFrameSetModel.idl\ - XFramesSupplier.idl\ - XInplaceLayout.idl\ - XInterceptorInfo.idl\ - XLayoutManager.idl\ - XLayoutManagerEventBroadcaster.idl\ - XLayoutManagerListener.idl\ - XLoadable.idl\ - XLoadEventListener.idl\ - XMenuBarAcceptor.idl\ - XMenuBarMergingAcceptor.idl\ - XModel.idl\ - XModel2.idl\ - XModule.idl\ - XModuleManager.idl\ - XNotifyingDispatch.idl\ - XPopupMenuController.idl\ - XRecordableDispatch.idl\ - XSessionManagerClient.idl\ - XSessionManagerListener.idl\ - XSessionManagerListener2.idl\ - XStatusListener.idl\ - XStatusbarController.idl\ - XStorable.idl\ - XSubToolbarController.idl\ - XStorable2.idl\ - XSynchronousDispatch.idl\ - XSynchronousFrameLoader.idl\ - XTask.idl\ - XTasksSupplier.idl\ - XTerminateListener.idl\ - XTerminateListener2.idl\ - XTitle.idl\ - XTitleChangeBroadcaster.idl\ - XTitleChangeListener.idl\ - XToolbarController.idl\ - XTransientDocumentsDocumentContentFactory.idl\ - XUIControllerRegistration.idl\ - XUntitledNumbers.idl\ - XUrlList.idl\ - XWindowArranger.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/frame/status/makefile.mk b/offapi/com/sun/star/frame/status/makefile.mk deleted file mode 100644 index ca8beb50d1a1..000000000000 --- a/offapi/com/sun/star/frame/status/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfstatus -PACKAGE=com$/sun$/star$/frame$/status - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - FontHeight.idl \ - Verb.idl \ - ClipboardFormats.idl \ - LeftRightMargin.idl \ - UpperLowerMargin.idl \ - UpperLowerMarginScale.idl \ - Template.idl \ - ItemStatus.idl \ - ItemState.idl \ - Visibility.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/gallery/makefile.mk b/offapi/com/sun/star/gallery/makefile.mk deleted file mode 100644 index 49a9c908df65..000000000000 --- a/offapi/com/sun/star/gallery/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. -PRJNAME=offapi -TARGET=cssgallery -PACKAGE=com$/sun$/star$/gallery - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - GalleryThemeProvider.idl \ - GalleryTheme.idl \ - GalleryItem.idl \ - GalleryItemType.idl \ - XGalleryThemeProvider.idl \ - XGalleryTheme.idl \ - XGalleryItem.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/geometry/makefile.mk b/offapi/com/sun/star/geometry/makefile.mk deleted file mode 100644 index 2ade163ea049..000000000000 --- a/offapi/com/sun/star/geometry/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssgeometry -PACKAGE=com$/sun$/star$/geometry - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AffineMatrix2D.idl \ - AffineMatrix3D.idl \ - EllipticalArc.idl \ - Matrix2D.idl \ - XMapping2D.idl \ - IntegerBezierSegment2D.idl \ - RealBezierSegment2D.idl \ - RealPoint2D.idl \ - RealRectangle2D.idl \ - RealRectangle3D.idl \ - RealSize2D.idl \ - IntegerPoint2D.idl \ - IntegerRectangle2D.idl \ - IntegerSize2D.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/i18n/makefile.mk b/offapi/com/sun/star/i18n/makefile.mk deleted file mode 100644 index 7d861fa1436d..000000000000 --- a/offapi/com/sun/star/i18n/makefile.mk +++ /dev/null @@ -1,129 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssi18n -PACKAGE=com$/sun$/star$/i18n - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AmPmValue.idl \ - Boundary.idl \ - BreakIterator.idl \ - BreakType.idl \ - CTLScriptType.idl \ - Calendar.idl \ - CalendarDisplayCode.idl \ - CalendarDisplayIndex.idl \ - CalendarFieldIndex.idl \ - CalendarItem.idl \ - ChapterCollator.idl \ - CharType.idl \ - CharacterClassification.idl \ - CharacterIteratorMode.idl \ - Collator.idl \ - CollatorOptions.idl \ - Currency.idl \ - Currency2.idl \ - DirectionProperty.idl \ - ForbiddenCharacters.idl \ - FormatElement.idl \ - Implementation.idl \ - IndexEntrySupplier.idl \ - InputSequenceChecker.idl \ - InputSequenceCheckMode.idl \ - KCharacterType.idl \ - KNumberFormatType.idl \ - KNumberFormatUsage.idl \ - KParseTokens.idl \ - KParseType.idl \ - LanguageCountryInfo.idl \ - LineBreakHyphenationOptions.idl \ - LineBreakResults.idl \ - LineBreakUserOptions.idl \ - LocaleCalendar.idl \ - LocaleData.idl \ - LocaleDataItem.idl \ - LocaleItem.idl \ - Months.idl \ - MultipleCharsOutputException.idl \ - NativeNumberMode.idl \ - NativeNumberSupplier.idl \ - NativeNumberXmlAttributes.idl \ - NumberFormatCode.idl \ - NumberFormatIndex.idl \ - NumberFormatMapper.idl \ - ParseResult.idl \ - ScriptDirection.idl \ - ScriptType.idl \ - TextConversion.idl \ - TextConversionOption.idl \ - TextConversionResult.idl \ - TextConversionType.idl \ - Transliteration.idl \ - TransliterationModules.idl \ - TransliterationModulesNew.idl \ - TransliterationModulesExtra.idl \ - TransliterationType.idl \ - UnicodeScript.idl \ - UnicodeType.idl \ - Weekdays.idl \ - WordType.idl \ - XBreakIterator.idl \ - XCalendar.idl \ - XCharacterClassification.idl \ - XCollator.idl \ - XExtendedCalendar.idl \ - XExtendedIndexEntrySupplier.idl \ - XExtendedTransliteration.idl \ - XForbiddenCharacters.idl \ - XIndexEntrySupplier.idl \ - XInputSequenceChecker.idl \ - XExtendedInputSequenceChecker.idl \ - XLocaleData.idl \ - XLocaleData2.idl \ - XNativeNumberSupplier.idl \ - XNumberFormatCode.idl \ - XTextConversion.idl \ - XExtendedTextConversion.idl \ - XScriptTypeDetector.idl \ - XTransliteration.idl \ - reservedWords.idl \ - XOrdinalSuffix.idl \ - OrdinalSuffix.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/image/makefile.mk b/offapi/com/sun/star/image/makefile.mk deleted file mode 100644 index a09e60ad7e55..000000000000 --- a/offapi/com/sun/star/image/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssimage -PACKAGE=com$/sun$/star$/image - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ImageMap.idl\ - ImageMapObject.idl\ - ImageMapRectangleObject.idl\ - ImageMapCircleObject.idl\ - ImageMapPolygonObject.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/sal/inc/systools/win32/AutoSystoolInit.hxx b/offapi/com/sun/star/inspection/StringRepresentation.idl index 3ebc7a6b5b36..dd23ddcae6ac 100644 --- a/sal/inc/systools/win32/AutoSystoolInit.hxx +++ b/offapi/com/sun/star/inspection/StringRepresentation.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,40 +25,23 @@ * ************************************************************************/ -#ifndef _AUTOSYSTOOLINIT_HXX_ -#define _AUTOSYSTOOLINIT_HXX_ +#ifndef __com_sun_star_inspection_StringRepresentation_idl__ +#define __com_sun_star_inspection_StringRepresentation_idl__ -#ifndef _WINDOWS_ -#include <windows.h> -#endif +#include <com/sun/star/inspection/XStringRepresentation.idl> -//------------------------------------------------------------------------ -// class used to automatically initialize/deinitialize the systools -//------------------------------------------------------------------------ +//============================================================================= +module com { module sun { module star { module inspection { -class OAutoSystoolInit +//----------------------------------------------------------------------------- +service StringRepresentation : XStringRepresentation { - typedef void ( WINAPI *LPFNINIT_T )( ); - typedef void ( WINAPI *LPFNDEINIT_T )( ); - -public: - OAutoSystoolInit( LPFNINIT_T lpfnInit, LPFNDEINIT_T lpfnDeInit ) : - m_lpfnDeInit( lpfnDeInit ) - { - if ( NULL != lpfnInit ) - lpfnInit( ); - } - - ~OAutoSystoolInit( ) - { - if ( NULL != m_lpfnDeInit ) - m_lpfnDeInit( ); - } - -private: - LPFNDEINIT_T m_lpfnDeInit; // address of the deinit function + create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException ); + createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException ); }; +//============================================================================= + +}; }; }; }; #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl index a2bfd5065926..520138517a3d 100644 --- a/offapi/com/sun/star/inspection/XStringRepresentation.idl +++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl @@ -61,11 +61,6 @@ published interface XStringRepresentation ) raises( com::sun::star::uno::Exception ); }; -service StringRepresentation : XStringRepresentation -{ - create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException ); - createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException ); -}; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/inspection/makefile.mk b/offapi/com/sun/star/inspection/makefile.mk deleted file mode 100644 index bca5fd1e1f17..000000000000 --- a/offapi/com/sun/star/inspection/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssinspection -PACKAGE=com$/sun$/star$/inspection - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ -IDLFILES=\ - DefaultHelpProvider.idl \ - GenericPropertyHandler.idl \ - InteractiveSelectionResult.idl \ - LineDescriptor.idl \ - ObjectInspector.idl \ - ObjectInspectorModel.idl \ - PropertyCategoryDescriptor.idl \ - PropertyControlType.idl \ - PropertyLineElement.idl \ - XHyperlinkControl.idl \ - XNumericControl.idl \ - XObjectInspector.idl \ - XObjectInspectorModel.idl \ - XObjectInspectorUI.idl \ - XPropertyControl.idl \ - XPropertyControlContext.idl \ - XPropertyControlFactory.idl \ - XPropertyControlObserver.idl \ - XPropertyHandler.idl \ - XStringListControl.idl \ - XStringRepresentation.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/installation/makefile.mk b/offapi/com/sun/star/installation/makefile.mk deleted file mode 100644 index 5483b64531a8..000000000000 --- a/offapi/com/sun/star/installation/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssinstallation -PACKAGE=com$/sun$/star$/installation - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - InstallationCheck.idl\ - InstallationCheckService.idl\ - InternetSettings.idl\ - ProtDlgRes.idl\ - ProtocolHandlerCheck.idl\ - ProtocolHandlerCheckService.idl\ - protocols.idl\ - XInstallationCheck.idl\ - XProtocolHandlerCheck.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/ldap/makefile.mk b/offapi/com/sun/star/ldap/makefile.mk deleted file mode 100644 index 35e601ee4b0b..000000000000 --- a/offapi/com/sun/star/ldap/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssldap -PACKAGE=com$/sun$/star$/ldap - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - LdapGenericException.idl\ - LdapConnectionException.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/linguistic2/makefile.mk b/offapi/com/sun/star/linguistic2/makefile.mk deleted file mode 100644 index 54c08c7be4b9..000000000000 --- a/offapi/com/sun/star/linguistic2/makefile.mk +++ /dev/null @@ -1,101 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csslinguistic2 -PACKAGE=com$/sun$/star$/linguistic2 - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ConversionDictionary.idl \ - ConversionDictionaryList.idl \ - ConversionDictionaryType.idl \ - ConversionDirection.idl \ - ConversionPropertyType.idl \ - Dictionary.idl\ - DictionaryEvent.idl\ - DictionaryEventFlags.idl\ - DictionaryList.idl\ - DictionaryListEvent.idl\ - DictionaryListEventFlags.idl\ - DictionaryType.idl\ - HangulHanjaConversionDictionary.idl \ - Hyphenator.idl\ - LinguProperties.idl\ - LinguServiceEvent.idl\ - LinguServiceEventFlags.idl\ - LinguServiceManager.idl\ - SpellChecker.idl\ - SpellFailure.idl\ - Thesaurus.idl\ - XAvailableLocales.idl\ - XConversionDictionary.idl \ - XConversionDictionaryList.idl \ - XConversionPropertyType.idl \ - XDictionary.idl\ - XDictionary1.idl\ - XDictionaryEntry.idl\ - XDictionaryEventListener.idl\ - XDictionaryList.idl\ - XDictionaryListEventListener.idl\ - XHyphenatedWord.idl\ - XHyphenator.idl\ - XLanguageGuessing.idl\ - XLinguServiceEventBroadcaster.idl\ - XLinguServiceEventListener.idl\ - XLinguServiceManager.idl\ - XMeaning.idl\ - XPossibleHyphens.idl\ - XSearchableDictionary.idl\ - XSearchableDictionaryList.idl\ - XSpellAlternatives.idl\ - XSetSpellAlternatives.idl\ - XSpellChecker.idl\ - XSpellChecker1.idl\ - XSupportedLanguages.idl\ - XSupportedLocales.idl\ - XThesaurus.idl\ - SingleProofreadingError.idl\ - ProofreadingResult.idl\ - Proofreader.idl\ - XProofreader.idl\ - XProofreadingIterator.idl\ - ProofreadingIterator.idl - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/logging/makefile.mk b/offapi/com/sun/star/logging/makefile.mk deleted file mode 100644 index 9a5e82845443..000000000000 --- a/offapi/com/sun/star/logging/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/..$/..$/.. -PRJNAME := offapi -TARGET := csslogging - -PACKAGE := com$/sun$/star$/logging - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - ConsoleHandler.idl\ - CsvLogFormatter.idl\ - DocumentIOLogRing.idl\ - FileHandler.idl\ - LoggerPool.idl\ - LogLevel.idl\ - LogRecord.idl\ - PlainTextFormatter.idl\ - SimpleLogRing.idl\ - XConsoleHandler.idl\ - XCsvLogFormatter.idl\ - XLogFormatter.idl\ - XLogger.idl\ - XLoggerPool.idl\ - XLogHandler.idl\ - XSimpleLogRing.idl - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/mail/makefile.mk b/offapi/com/sun/star/mail/makefile.mk deleted file mode 100644 index 4b6854220b24..000000000000 --- a/offapi/com/sun/star/mail/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssmail -PACKAGE=com$/sun$/star$/mail - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - MailException.idl\ - SendMailMessageFailedException.idl\ - NoMailServiceProviderException.idl\ - XMailService.idl\ - XAuthenticator.idl\ - XMailMessage.idl\ - MailMessage.idl\ - XConnectionListener.idl\ - MailAttachment.idl\ - XSmtpService.idl\ - MailServiceType.idl\ - XMailServiceProvider.idl\ - MailServiceProvider.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/makefile.mk b/offapi/com/sun/star/makefile.mk deleted file mode 100644 index c3daa292c8f0..000000000000 --- a/offapi/com/sun/star/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=offapi - -TARGET=css -PACKAGE=com$/sun$/star - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - modules.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/media/makefile.mk b/offapi/com/sun/star/media/makefile.mk deleted file mode 100644 index 4d4ac1df1060..000000000000 --- a/offapi/com/sun/star/media/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. -PRJNAME=offapi -TARGET=cssmedia -PACKAGE=com$/sun$/star$/media - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Manager.idl \ - XManager.idl \ - XFrameGrabber.idl \ - XPlayer.idl \ - XPlayerWindow.idl \ - ZoomLevel.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/mozilla/makefile.mk b/offapi/com/sun/star/mozilla/makefile.mk deleted file mode 100644 index 38a3f009fafe..000000000000 --- a/offapi/com/sun/star/mozilla/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssmozilla -PACKAGE=com$/sun$/star$/mozilla - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - MenuMultipleChange.idl \ - MenuSingleChange.idl \ - MenuProxy.idl \ - MenuProxyListener.idl \ - XMenuProxy.idl \ - XMenuProxyListener.idl \ - XPluginInstance.idl \ - XPluginInstanceNotifySink.idl \ - XPluginInstancePeer.idl \ - XPluginInstanceSyncPeer.idl \ - XPluginWindowPeer.idl \ - XCloseSessionListener.idl \ - XRemoteServiceManagerProvider.idl \ - MozillaBootstrap.idl \ - MozillaProductType.idl \ - XMozillaBootstrap.idl \ - XProfileDiscover.idl \ - XProfileManager.idl \ - XProxyRunner.idl \ - XCodeProxy.idl - - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/office/makefile.mk b/offapi/com/sun/star/office/makefile.mk deleted file mode 100644 index e24a411dd755..000000000000 --- a/offapi/com/sun/star/office/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. -PRJNAME=offapi -TARGET=cssoffice -PACKAGE=com$/sun$/star$/office - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XAnnotation.idl\ - XAnnotationEnumeration.idl\ - XAnnotationAccess.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/oooimprovement/makefile.mk b/offapi/com/sun/star/oooimprovement/makefile.mk deleted file mode 100644 index c64c21951736..000000000000 --- a/offapi/com/sun/star/oooimprovement/makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/..$/..$/.. -PRJNAME := offapi -TARGET := cssoooimprovement - -PACKAGE := com$/sun$/star$/oooimprovement - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - Core.idl \ - CoreController.idl \ - XCore.idl \ - XCoreController.idl \ - - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/packages/makefile.mk b/offapi/com/sun/star/packages/makefile.mk deleted file mode 100644 index 3707e09837e1..000000000000 --- a/offapi/com/sun/star/packages/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csspackages -PACKAGE=com$/sun$/star$/packages - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Package.idl\ - PackageFolder.idl\ - PackageFolderEnumeration.idl\ - PackageStream.idl\ - EncryptionNotAllowedException.idl\ - NoEncryptionException.idl\ - WrongPasswordException.idl\ - NoRawFormatException.idl\ - XDataSinkEncrSupport.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/packages/manifest/makefile.mk b/offapi/com/sun/star/packages/manifest/makefile.mk deleted file mode 100644 index 9be92686a918..000000000000 --- a/offapi/com/sun/star/packages/manifest/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssmanifest -PACKAGE=com$/sun$/star$/packages$/manifest - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XManifestReader.idl\ - XManifestWriter.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/packages/zip/makefile.mk b/offapi/com/sun/star/packages/zip/makefile.mk deleted file mode 100644 index b361ebeacc7d..000000000000 --- a/offapi/com/sun/star/packages/zip/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csszippackage -PACKAGE=com$/sun$/star$/packages - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ZipEntry.idl\ - ZipException.idl \ - ZipIOException.idl \ - ZipConstants.idl\ - ZipFileAccess.idl\ - XZipFileAccess.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/plugin/makefile.mk b/offapi/com/sun/star/plugin/makefile.mk deleted file mode 100644 index a0b4615f0c96..000000000000 --- a/offapi/com/sun/star/plugin/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssplugin -PACKAGE=com$/sun$/star$/plugin - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - PluginDescription.idl\ - PluginException.idl\ - PluginManager.idl\ - PluginMode.idl\ - PluginVariable.idl\ - XPlugin.idl\ - XPluginContext.idl\ - XPluginManager.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp b/offapi/com/sun/star/presentation/SlideShow.idl index 6dcdfd217a46..6e026dab0141 100644 --- a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp +++ b/offapi/com/sun/star/presentation/SlideShow.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +24,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef _com_sun_star_presentation_SlideShow_idl +#define _com_sun_star_presentation_SlideShow_idl -#include "macros.h" +#include <com/sun/star/presentation/XSlideShow.idl> + +module com { module sun { module star { module presentation { + +service SlideShow : XSlideShow; + +}; }; }; }; + +#endif -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeMountPointClose, (HANDLE hFindVolumeMountPoint ) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp b/offapi/com/sun/star/presentation/TransitionFactory.idl index e2cfc82d5491..28b19466c267 100644 --- a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp +++ b/offapi/com/sun/star/presentation/TransitionFactory.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef __com_sun_star_presentation_TransitionFactory_idl__ +#define __com_sun_star_presentation_TransitionFactory_idl__ -#include "macros.h" +#include <com/sun/star/presentation/XTransitionFactory.idl> + + +module com { module sun { module star { module presentation { + +service TransitionFactory : XTransitionFactory; + +}; }; }; }; + +#endif -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeW, (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl index e8fec3b1974b..3bda17e15e9b 100644 --- a/offapi/com/sun/star/presentation/XSlideShow.idl +++ b/offapi/com/sun/star/presentation/XSlideShow.idl @@ -346,8 +346,6 @@ interface XSlideShow : ::com::sun::star::uno::XInterface }; -service SlideShow : XSlideShow; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl index 3f648353fff6..0c4b19540215 100644 --- a/offapi/com/sun/star/presentation/XTransitionFactory.idl +++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl @@ -80,8 +80,6 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface [in] com::sun::star::rendering::XBitmap enteringBitmap ); }; -service TransitionFactory : XTransitionFactory; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/presentation/makefile.mk b/offapi/com/sun/star/presentation/makefile.mk deleted file mode 100644 index 80689401852a..000000000000 --- a/offapi/com/sun/star/presentation/makefile.mk +++ /dev/null @@ -1,96 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csspresentation -PACKAGE=com$/sun$/star$/presentation - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - HeaderShape.idl\ - FooterShape.idl\ - DateTimeShape.idl\ - SlideNumberShape.idl\ - AnimationEffect.idl\ - AnimationSpeed.idl\ - ChartShape.idl\ - ClickAction.idl\ - CustomPresentation.idl\ - CustomPresentationAccess.idl\ - DocumentSettings.idl\ - DrawPage.idl\ - FadeEffect.idl\ - GraphicObjectShape.idl\ - HandoutShape.idl\ - HandoutView.idl\ - NotesShape.idl\ - NotesView.idl\ - OLE2Shape.idl\ - OutlinerShape.idl\ - OutlineView.idl\ - PageShape.idl\ - Presentation.idl\ - Presentation2.idl\ - PresentationDocument.idl\ - PresentationRange.idl\ - PresentationView.idl\ - PreviewView.idl\ - Shape.idl\ - SlidesView.idl\ - SubtitleShape.idl\ - TitleTextShape.idl\ - XCustomPresentationSupplier.idl\ - XHandoutMasterSupplier.idl\ - XPresentation.idl\ - XPresentationPage.idl\ - XPresentationSupplier.idl\ - EffectNodeType.idl\ - EffectPresetClass.idl\ - ParagraphTarget.idl\ - ShapeAnimationSubType.idl\ - TextAnimationType.idl\ - EffectCommands.idl\ - XShapeEventListener.idl\ - XSlideShow.idl\ - XSlideShowController.idl\ - XSlideShowListener.idl\ - XSlideShowView.idl\ - XPresentation2.idl\ - XTransition.idl\ - XTransitionFactory.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/presentation/textfield/makefile.mk b/offapi/com/sun/star/presentation/textfield/makefile.mk deleted file mode 100644 index 49220f824fb4..000000000000 --- a/offapi/com/sun/star/presentation/textfield/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csspresentationtextfield -PACKAGE=com$/sun$/star$/presentation$/textfield - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Header.idl\ - Footer.idl\ - DateTime.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/rdf/makefile.mk b/offapi/com/sun/star/rdf/makefile.mk deleted file mode 100644 index b27ea74e54cb..000000000000 --- a/offapi/com/sun/star/rdf/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssrdf -PACKAGE=com$/sun$/star$/rdf - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES= \ - FileFormat.idl \ - URIs.idl \ - ParseException.idl \ - QueryException.idl \ - RepositoryException.idl \ - XNode.idl \ - XResource.idl \ - XBlankNode.idl \ - XURI.idl \ - XLiteral.idl \ - BlankNode.idl \ - URI.idl \ - Literal.idl \ - Statement.idl \ - XReifiedStatement.idl \ - XQuerySelectResult.idl \ - XNamedGraph.idl \ - XRepository.idl \ - XDocumentRepository.idl \ - Repository.idl \ - XRepositorySupplier.idl \ - XMetadatable.idl \ - XDocumentMetadataAccess.idl \ - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/rendering/ARGBColor.idl b/offapi/com/sun/star/rendering/ARGBColor.idl new file mode 100644 index 000000000000..16d0ee17b098 --- /dev/null +++ b/offapi/com/sun/star/rendering/ARGBColor.idl @@ -0,0 +1,55 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_rendering_ARGBColor_idl__ +#define __com_sun_star_rendering_ARGBColor_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> +#endif + +module com { module sun { module star { module rendering { + +/// ARGB color quad +published struct ARGBColor +{ + /** Alpha component.<p> + + Valid range is [0,1.0], with 0.0 denoting fully transparent, + and 1.0 fully opaque. + */ + ColorComponent Alpha; + /// Red component. Valid range is [0,1.0] + ColorComponent Red; + /// Green component. Valid range is [0,1.0] + ColorComponent Green; + /// Blue component. Valid range is [0,1.0] + ColorComponent Blue; +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl new file mode 100644 index 000000000000..70bd913037e4 --- /dev/null +++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl @@ -0,0 +1,57 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_rendering_BitmapCanvas_idl__ +#define __com_sun_star_rendering_BitmapCanvas_idl__ + +#ifndef __com_sun_star_rendering_XBitmap_idl__ +#include <com/sun/star/rendering/XBitmap.idl> +#endif +#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__ +#include <com/sun/star/rendering/XBitmapCanvas.idl> +#endif + + +module com { module sun { module star { module rendering { + +// TODO: Multiple-inheritance interfaces + +/** This service provides the interfaces for a <type>XBitmapCanvas</type> + */ +service BitmapCanvas +{ + /** Canvas interface, to issue rendering operations. + */ + interface XBitmapCanvas; + + /** Bitmap interface, to directly manipulate the pixel. + */ + interface XBitmap; +}; + +}; }; }; }; + +#endif diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp b/offapi/com/sun/star/rendering/Canvas.idl index 60eae2a5e3b8..6c7336f79b5e 100644 --- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp +++ b/offapi/com/sun/star/rendering/Canvas.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +24,19 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) +#ifndef __com_sun_star_rendering_Canvas_idl__ +#define __com_sun_star_rendering_Canvas_idl__ + +#ifndef __com_sun_star_rendering_XCanvas_idl__ +#include <com/sun/star/rendering/XCanvas.idl> #endif -#include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +module com { module sun { module star { module rendering { + +/// Service providing an <type>XCanvas</type> interface +service Canvas: XCanvas; + +}; }; }; }; + +#endif diff --git a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp b/offapi/com/sun/star/rendering/Color.idl index c9d28c3443e8..f36fbbe90949 100644 --- a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp +++ b/offapi/com/sun/star/rendering/Color.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +24,18 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) +#ifndef __com_sun_star_rendering_Color_idl__ +#define __com_sun_star_rendering_Color_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> #endif -#include "macros.h" +module com { module sun { module star { module rendering { + +/// Shorthand for the device-dependent color components, and easier to read +published typedef sequence<ColorComponent> Color; -DEFINE_DEFAULT_THUNK( shell32, TRYLOAD, HRESULT, WINAPI, SHCreateItemFromParsingName, (PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +}; }; }; }; + +#endif diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp b/offapi/com/sun/star/rendering/ColorComponent.idl index 035c3c1e4007..c4a21a5a014d 100644 --- a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp +++ b/offapi/com/sun/star/rendering/ColorComponent.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +25,14 @@ * ************************************************************************/ -#include "macros.h" +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#define __com_sun_star_rendering_ColorComponent_idl__ -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +module com { module sun { module star { module rendering { + +/// Shorthand for the device-dependent color components, and easier to read +published typedef double ColorComponent; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/rendering/MtfRenderer.idl b/offapi/com/sun/star/rendering/MtfRenderer.idl index af07f0a1d391..43b76ef105bf 100644 --- a/offapi/com/sun/star/rendering/MtfRenderer.idl +++ b/offapi/com/sun/star/rendering/MtfRenderer.idl @@ -28,17 +28,12 @@ #ifndef __com_sun_star_rendering_MtfRenderer_idl__ #define __com_sun_star_rendering_MtfRenderer_idl__ -#include <com/sun/star/rendering/XCanvas.idl> +#include <com/sun/star/rendering/XMtfRenderer.idl> module com { module sun { module star { module rendering { - interface XMtfRenderer : ::com::sun::star::uno::XInterface - { - void setMetafile( [in] sequence< byte > aMtf ); - void draw( [in] double fScaleX, [in] double fScaleY ); - }; - service MtfRenderer : XMtfRenderer; + }; }; }; }; #endif diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl new file mode 100644 index 000000000000..a2bee3373e6c --- /dev/null +++ b/offapi/com/sun/star/rendering/RGBColor.idl @@ -0,0 +1,49 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_rendering_RGBColor_idl__ +#define __com_sun_star_rendering_RGBColor_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> +#endif + +module com { module sun { module star { module rendering { + +/// RGB color triplet +published struct RGBColor +{ + /// Red component. Valid range is [0,1.0] + ColorComponent Red; + /// Green component. Valid range is [0,1.0] + ColorComponent Green; + /// Blue component. Valid range is [0,1.0] + ColorComponent Blue; +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl index c5030b99809c..2dcab8f2ad84 100644 --- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl +++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl @@ -31,7 +31,6 @@ #include <com/sun/star/lang/IllegalArgumentException.idl> #include <com/sun/star/geometry/RealRectangle2D.idl> #include <com/sun/star/rendering/RenderState.idl> -#include <com/sun/star/rendering/XBitmap.idl> #include <com/sun/star/rendering/XCanvas.idl> #include <com/sun/star/rendering/VolatileContentDestroyedException.idl> @@ -115,23 +114,6 @@ published interface XBitmapCanvas : XCanvas }; -//============================================================================= - -// TODO: Multiple-inheritance interfaces - -/** This service provides the interfaces for a <type>XBitmapCanvas</type> - */ -service BitmapCanvas -{ - /** Canvas interface, to issue rendering operations. - */ - interface XBitmapCanvas; - - /** Bitmap interface, to directly manipulate the pixel. - */ - interface XBitmap; -}; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl index 7d1e4ccce08b..2c80da4d8cc9 100644 --- a/offapi/com/sun/star/rendering/XCanvas.idl +++ b/offapi/com/sun/star/rendering/XCanvas.idl @@ -703,11 +703,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface XGraphicDevice getDevice(); }; -//============================================================================= - -/// Service providing an <type>XCanvas</type> interface -service Canvas: XCanvas; - }; }; }; }; #endif diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl index 20a5e669baf0..ed624c9b0f12 100644 --- a/offapi/com/sun/star/rendering/XColorSpace.idl +++ b/offapi/com/sun/star/rendering/XColorSpace.idl @@ -31,47 +31,12 @@ #include <com/sun/star/lang/IllegalArgumentException.idl> #include <com/sun/star/beans/PropertyValue.idl> #include <com/sun/star/rendering/ColorProfile.idl> +#include <com/sun/star/rendering/ColorComponent.idl> +#include <com/sun/star/rendering/RGBColor.idl> +#include <com/sun/star/rendering/ARGBColor.idl> module com { module sun { module star { module rendering { -/// Shorthand for the device-dependent color components, and easier to read -published typedef double ColorComponent; -published typedef sequence<ColorComponent> Color; - -//============================================================================= - -/// RGB color triplet -published struct RGBColor -{ - /// Red component. Valid range is [0,1.0] - ColorComponent Red; - /// Green component. Valid range is [0,1.0] - ColorComponent Green; - /// Blue component. Valid range is [0,1.0] - ColorComponent Blue; -}; - -//============================================================================= - -/// ARGB color quad -published struct ARGBColor -{ - /** Alpha component.<p> - - Valid range is [0,1.0], with 0.0 denoting fully transparent, - and 1.0 fully opaque. - */ - ColorComponent Alpha; - /// Red component. Valid range is [0,1.0] - ColorComponent Red; - /// Green component. Valid range is [0,1.0] - ColorComponent Green; - /// Blue component. Valid range is [0,1.0] - ColorComponent Blue; -}; - -//============================================================================= - /** Information how to interpret certain color data.<p> This interface encapsulates all information that is necessary to diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp b/offapi/com/sun/star/rendering/XMtfRenderer.idl index 260a95b27157..ac69a9a75710 100644 --- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp +++ b/offapi/com/sun/star/rendering/XMtfRenderer.idl @@ -1,9 +1,8 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2010 Novell, Inc. * * OpenOffice.org - a multi-platform office productivity suite * @@ -25,11 +24,18 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) -#endif -#include "macros.h" +#ifndef __com_sun_star_rendering_XMtfRenderer_idl__ +#define __com_sun_star_rendering_XMtfRenderer_idl__ + +module com { module sun { module star { module rendering { + + interface XMtfRenderer : ::com::sun::star::uno::XInterface + { + void setMetafile( [in] sequence< byte > aMtf ); + void draw( [in] double fScaleX, [in] double fScaleY ); + }; -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointA, (LPCSTR lpszVolumeMountPoint) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/report/FixedLine.idl b/offapi/com/sun/star/report/FixedLine.idl new file mode 100644 index 000000000000..76856b426210 --- /dev/null +++ b/offapi/com/sun/star/report/FixedLine.idl @@ -0,0 +1,45 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_FixedLine_idl__ +#define __com_sun_star_report_FixedLine_idl__ + +#include <com/sun/star/report/XFixedLine.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= +service FixedLine : XFixedLine; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/FixedText.idl b/offapi/com/sun/star/report/FixedText.idl new file mode 100644 index 000000000000..74bb17680371 --- /dev/null +++ b/offapi/com/sun/star/report/FixedText.idl @@ -0,0 +1,46 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_FixedText_idl__ +#define __com_sun_star_report_FixedText_idl__ + + +#include <com/sun/star/report/XFixedText.idl> +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service FixedText : XFixedText; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/FormatCondition.idl b/offapi/com/sun/star/report/FormatCondition.idl new file mode 100644 index 000000000000..f1449d114a79 --- /dev/null +++ b/offapi/com/sun/star/report/FormatCondition.idl @@ -0,0 +1,40 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_FormatCondition_idl__ +#define __com_sun_star_report_FormatCondition_idl__ + +#include <com/sun/star/report/XFormatCondition.idl> + +//============================================================================= + module com { module sun { module star { module report { +//============================================================================= + +service FormatCondition : XFormatCondition; +//============================================================================= + +}; }; }; }; +#endif diff --git a/offapi/com/sun/star/report/FormattedField.idl b/offapi/com/sun/star/report/FormattedField.idl new file mode 100644 index 000000000000..ae1f965947cc --- /dev/null +++ b/offapi/com/sun/star/report/FormattedField.idl @@ -0,0 +1,46 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_FormattedField_idl__ +#define __com_sun_star_report_FormattedField_idl__ + +#include <com/sun/star/report/XFormattedField.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service FormattedField : XFormattedField; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/Function.idl b/offapi/com/sun/star/report/Function.idl new file mode 100644 index 000000000000..b829b2716f31 --- /dev/null +++ b/offapi/com/sun/star/report/Function.idl @@ -0,0 +1,43 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_Function_idl__ +#define __com_sun_star_report_Function_idl__ + +#include <com/sun/star/report/XFunction.idl> + +//============================================================================= + module com { module sun { module star { module report { +//============================================================================= + +service Function : XFunction +{ + create(); +}; +//============================================================================= + +}; }; }; }; +#endif diff --git a/offapi/com/sun/star/report/Group.idl b/offapi/com/sun/star/report/Group.idl new file mode 100644 index 000000000000..650a0cba692c --- /dev/null +++ b/offapi/com/sun/star/report/Group.idl @@ -0,0 +1,45 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_Group_idl__ +#define __com_sun_star_report_Group_idl__ + +#include <com/sun/star/report/XGroup.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= +service Group : XGroup; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/Groups.idl b/offapi/com/sun/star/report/Groups.idl new file mode 100644 index 000000000000..c9986cc367ad --- /dev/null +++ b/offapi/com/sun/star/report/Groups.idl @@ -0,0 +1,42 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_Groups_idl__ +#define __com_sun_star_report_Groups_idl__ + +#include <com/sun/star/report/XGroups.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= +service Groups : XGroups; +//============================================================================= + +}; }; }; }; + +#endif diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/offapi/com/sun/star/report/ImageControl.idl index 08165707dc54..d0bd030342c8 100644 --- a/sal/systools/win32/uwinapi/CopyFileExW.cpp +++ b/offapi/com/sun/star/report/ImageControl.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,18 +24,23 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) -#endif +#ifndef __com_sun_star_report_ImageControl_idl__ +#define __com_sun_star_report_ImageControl_idl__ + +#include <com/sun/star/report/XImageControl.idl> + +//============================================================================= + + module com { module sun { module star { module report { -#define _WIN32_WINNT 0x0400 -#include "macros.h" +//============================================================================= -IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExW, ( LPCWSTR lpExistingFileNameW, LPCWSTR lpNewFileNameW, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) ) -{ - AUTO_WSTR2STR( lpExistingFileName ); - AUTO_WSTR2STR( lpNewFileName ); +service ImageControl : XImageControl; +//============================================================================= - return CopyFileExA( lpExistingFileNameA, lpNewFileNameA, lpProgressRoutine, lpData, pbCancel, dwCopyFlags ); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/ReportControlFormat.idl b/offapi/com/sun/star/report/ReportControlFormat.idl new file mode 100644 index 000000000000..00de8134b3a1 --- /dev/null +++ b/offapi/com/sun/star/report/ReportControlFormat.idl @@ -0,0 +1,42 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_ReportControlFormat_idl__ +#define __com_sun_star_report_ReportControlFormat_idl__ + +#include <com/sun/star/report/XReportControlFormat.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service ReportControlFormat : XReportControlFormat; +//============================================================================= + +}; }; }; }; +#endif diff --git a/offapi/com/sun/star/report/ReportControlModel.idl b/offapi/com/sun/star/report/ReportControlModel.idl new file mode 100644 index 000000000000..a5b2ab3141fe --- /dev/null +++ b/offapi/com/sun/star/report/ReportControlModel.idl @@ -0,0 +1,46 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_ReportControlModel_idl__ +#define __com_sun_star_report_ReportControlModel_idl__ + +#include <com/sun/star/report/XReportControlModel.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service ReportControlModel : XReportControlModel; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/ReportDefinition.idl b/offapi/com/sun/star/report/ReportDefinition.idl new file mode 100644 index 000000000000..8025ff9718b1 --- /dev/null +++ b/offapi/com/sun/star/report/ReportDefinition.idl @@ -0,0 +1,44 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_ReportDefinition_idl__ +#define __com_sun_star_report_ReportDefinition_idl__ + +#include <com/sun/star/report/XReportDefinition.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service ReportDefinition : XReportDefinition; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/report/Section.idl b/offapi/com/sun/star/report/Section.idl new file mode 100644 index 000000000000..f1e44aabdb64 --- /dev/null +++ b/offapi/com/sun/star/report/Section.idl @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_Section_idl__ +#define __com_sun_star_report_Section_idl__ + +#include <com/sun/star/report/XSection.idl> + +//============================================================================= + + module com { module sun { module star { module report { + interface XGroup; +//============================================================================= + + + +service Section : XSection; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/Shape.idl b/offapi/com/sun/star/report/Shape.idl new file mode 100644 index 000000000000..0f711390c903 --- /dev/null +++ b/offapi/com/sun/star/report/Shape.idl @@ -0,0 +1,46 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_report_Shape_idl__ +#define __com_sun_star_report_Shape_idl__ + +#include <com/sun/star/report/XShape.idl> + +//============================================================================= + + module com { module sun { module star { module report { + +//============================================================================= + +service Shape : XShape; +//============================================================================= + +}; }; }; }; + +/*============================================================================= + +=============================================================================*/ +#endif diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl index 3f01884b1249..32ea1898a5ba 100644 --- a/offapi/com/sun/star/report/XFixedLine.idl +++ b/offapi/com/sun/star/report/XFixedLine.idl @@ -86,7 +86,6 @@ published interface XFixedLine //------------------------------------------------------------------------- }; -published service FixedLine : XFixedLine; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl index 88775201b50c..fb2bd9196e4e 100644 --- a/offapi/com/sun/star/report/XFixedText.idl +++ b/offapi/com/sun/star/report/XFixedText.idl @@ -42,7 +42,6 @@ published interface XFixedText [attribute,bound] string Label; }; -published service FixedText : XFixedText; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl index a89596cbaad2..15644341d8cc 100644 --- a/offapi/com/sun/star/report/XFormatCondition.idl +++ b/offapi/com/sun/star/report/XFormatCondition.idl @@ -52,7 +52,6 @@ published interface XFormatCondition [attribute,bound] string Formula; }; -service FormatCondition : XFormatCondition; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl index 2de7609b81b5..38367ef99599 100644 --- a/offapi/com/sun/star/report/XFormattedField.idl +++ b/offapi/com/sun/star/report/XFormattedField.idl @@ -57,7 +57,6 @@ published interface XFormattedField [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier; }; -published service FormattedField : XFormattedField; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl index 8b5df0737e9e..1de5ab69f2a3 100644 --- a/offapi/com/sun/star/report/XFunction.idl +++ b/offapi/com/sun/star/report/XFunction.idl @@ -72,10 +72,6 @@ published interface XFunction [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula; }; -service Function : XFunction -{ - create(); -}; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl index a69e55a53b84..3ead87e36b63 100644 --- a/offapi/com/sun/star/report/XGroup.idl +++ b/offapi/com/sun/star/report/XGroup.idl @@ -132,7 +132,6 @@ published interface XGroup [attribute,bound] boolean ResetPageNumber; }; -service Group : XGroup; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl index d96242e83ef0..21df874d7e3b 100644 --- a/offapi/com/sun/star/report/XGroups.idl +++ b/offapi/com/sun/star/report/XGroups.idl @@ -67,7 +67,6 @@ published interface XGroups [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition; }; -service Groups : XGroups; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl index f4d56ff67a37..569d3b3eeffd 100644 --- a/offapi/com/sun/star/report/XImageControl.idl +++ b/offapi/com/sun/star/report/XImageControl.idl @@ -77,7 +77,6 @@ published interface XImageControl [attribute,bound] boolean PreserveIRI; }; -published service ImageControl : XImageControl; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl index dba485f01625..0cb7b57b7f03 100644 --- a/offapi/com/sun/star/report/XReportControlFormat.idl +++ b/offapi/com/sun/star/report/XReportControlFormat.idl @@ -606,7 +606,6 @@ published interface XReportControlFormat }; }; -service ReportControlFormat : XReportControlFormat; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl index 725c5b4b4893..0ba6667f96e2 100644 --- a/offapi/com/sun/star/report/XReportControlModel.idl +++ b/offapi/com/sun/star/report/XReportControlModel.idl @@ -94,7 +94,6 @@ published interface XReportControlModel }; }; -service ReportControlModel : XReportControlModel; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl index cadb506f92e3..82e90b80a328 100644 --- a/offapi/com/sun/star/report/XReportDefinition.idl +++ b/offapi/com/sun/star/report/XReportDefinition.idl @@ -313,7 +313,6 @@ published interface XReportDefinition }; }; -published service ReportDefinition : XReportDefinition; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl index 6d35f0791bb0..eaa888a2961a 100644 --- a/offapi/com/sun/star/report/XSection.idl +++ b/offapi/com/sun/star/report/XSection.idl @@ -168,7 +168,6 @@ published interface XSection [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition; }; -service Section : XSection; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl index 039554a50c6a..2f94c934e1c9 100644 --- a/offapi/com/sun/star/report/XShape.idl +++ b/offapi/com/sun/star/report/XShape.idl @@ -77,7 +77,6 @@ published interface XShape [attribute,bound] boolean Opaque; }; -service Shape : XShape; //============================================================================= }; }; }; }; diff --git a/offapi/com/sun/star/report/inspection/makefile.mk b/offapi/com/sun/star/report/inspection/makefile.mk deleted file mode 100644 index a123a2a42957..000000000000 --- a/offapi/com/sun/star/report/inspection/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssrptins -PACKAGE=com$/sun$/star$/report$/inspection - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - DefaultComponentInspectorModel.idl \ - ReportComponentHandler.idl \ - DataProviderHandler.idl - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/report/makefile.mk b/offapi/com/sun/star/report/makefile.mk deleted file mode 100644 index c2fa45637555..000000000000 --- a/offapi/com/sun/star/report/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssreport -PACKAGE=com$/sun$/star$/report - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - modules.idl\ - XReportDefinition.idl \ - XReportComponent.idl \ - XReportControlModel.idl \ - XGroups.idl \ - XGroup.idl \ - XFormattedField.idl \ - XFixedText.idl \ - XImageControl.idl \ - XSection.idl \ - ReportPrintOption.idl \ - GroupKeepTogether.idl \ - ForceNewPage.idl \ - KeepTogether.idl \ - XReportEngine.idl \ - XFormatCondition.idl \ - XReportControlFormat.idl \ - XFunction.idl \ - XFunctions.idl \ - XFunctionsSupplier.idl \ - GroupOn.idl \ - XShape.idl \ - XFixedLine.idl - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/report/meta/makefile.mk b/offapi/com/sun/star/report/meta/makefile.mk deleted file mode 100644 index 2a6a6e7e79e1..000000000000 --- a/offapi/com/sun/star/report/meta/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssrptmeta -PACKAGE=com$/sun$/star$/report$/meta - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XFunctionManager.idl \ - XFunctionCategory.idl \ - XFunctionDescription.idl \ - XFormulaParser.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/resource/makefile.mk b/offapi/com/sun/star/resource/makefile.mk deleted file mode 100644 index b255b2f2efb3..000000000000 --- a/offapi/com/sun/star/resource/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssresource -PACKAGE=com$/sun$/star$/resource - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - MissingResourceException.idl\ - OfficeResourceLoader.idl\ - XLocale.idl\ - XResourceBundle.idl\ - XResourceBundleLoader.idl\ - XStringResourceResolver.idl\ - XStringResourceManager.idl\ - XStringResourcePersistence.idl\ - XStringResourceWithStorage.idl\ - XStringResourceWithLocation.idl\ - XStringResourceSupplier.idl\ - StringResource.idl\ - StringResourceWithLocation.idl\ - StringResourceWithStorage.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/scanner/makefile.mk b/offapi/com/sun/star/scanner/makefile.mk deleted file mode 100644 index b4214c20563d..000000000000 --- a/offapi/com/sun/star/scanner/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssscanner -PACKAGE=com$/sun$/star$/scanner - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ScanError.idl\ - ScannerContext.idl\ - ScannerException.idl\ - ScannerManager.idl\ - XScannerManager.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/script/browse/makefile.mk b/offapi/com/sun/star/script/browse/makefile.mk deleted file mode 100644 index 4a2fdfddf185..000000000000 --- a/offapi/com/sun/star/script/browse/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssbrowse -PACKAGE=com$/sun$/star$/script$/browse - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XBrowseNode.idl\ - XBrowseNodeFactory.idl\ - BrowseNodeFactoryViewTypes.idl\ - BrowseNodeFactory.idl\ - BrowseNode.idl\ - BrowseNodeTypes.idl - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/script/provider/makefile.mk b/offapi/com/sun/star/script/provider/makefile.mk deleted file mode 100644 index 488944ff7e62..000000000000 --- a/offapi/com/sun/star/script/provider/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssprovider -PACKAGE=com$/sun$/star$/script$/provider - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XScript.idl\ - XScriptContext.idl\ - XScriptProvider.idl\ - XScriptProviderSupplier.idl\ - ScriptProvider.idl\ - MasterScriptProvider.idl\ - XScriptProviderFactory.idl\ - LanguageScriptProvider.idl\ - ScriptProviderForJava.idl\ - ScriptProviderForJavaScript.idl\ - ScriptProviderForBeanShell.idl\ - MasterScriptProviderFactory.idl\ - ScriptErrorRaisedException.idl\ - ScriptExceptionRaisedException.idl\ - ScriptFrameworkErrorException.idl\ - ScriptFrameworkErrorType.idl\ - ScriptURIHelper.idl\ - XScriptURIHelper.idl\ - ScriptProviderForBasic.idl - -# ------------------------------------------------------------------ - -# ------------------------------------------------------------------ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl index c1fc7096bcee..c1fc7096bcee 100755..100644 --- a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl +++ b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl diff --git a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl index cc66a3fc098c..cc66a3fc098c 100755..100644 --- a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl +++ b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl diff --git a/offapi/com/sun/star/script/vba/XVBAScriptListener.idl b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl index 2f5594d3b416..2f5594d3b416 100755..100644 --- a/offapi/com/sun/star/script/vba/XVBAScriptListener.idl +++ b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl diff --git a/offapi/com/sun/star/sdb/application/makefile.mk b/offapi/com/sun/star/sdb/application/makefile.mk deleted file mode 100644 index 7eb972b28b85..000000000000 --- a/offapi/com/sun/star/sdb/application/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssdbapp -PACKAGE=com$/sun$/star$/sdb$/application - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - - -UNOIDLDEFS += -w - -# ------------------------------------------------------------------------ -IDLFILES=\ - DefaultViewController.idl \ - CopyTableContinuation.idl \ - CopyTableOperation.idl \ - CopyTableRowEvent.idl \ - CopyTableWizard.idl \ - DatabaseObject.idl \ - DatabaseObjectContainer.idl \ - NamedDatabaseObject.idl \ - XCopyTableWizard.idl \ - XCopyTableListener.idl \ - XDatabaseDocumentUI.idl \ - XTableUIProvider.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/sdb/makefile.mk b/offapi/com/sun/star/sdb/makefile.mk deleted file mode 100644 index f095f338bcd4..000000000000 --- a/offapi/com/sun/star/sdb/makefile.mk +++ /dev/null @@ -1,147 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssdb -PACKAGE=com$/sun$/star$/sdb - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - - -UNOIDLDEFS += -w - -# ------------------------------------------------------------------------ -IDLFILES=\ - BooleanComparisonMode.idl \ - CallableStatement.idl \ - Column.idl \ - ColumnDescriptorControl.idl \ - ColumnDescriptorControlModel.idl \ - ColumnSettings.idl \ - CommandType.idl \ - Connection.idl \ - ContentLoader.idl \ - DataAccessDescriptor.idl \ - DataAccessDescriptorFactory.idl \ - DatabaseAccess.idl \ - DatabaseAccessConnection.idl \ - DatabaseAccessContext.idl \ - DatabaseAccessDataSource.idl\ - DatabaseContext.idl \ - DatabaseDocument.idl \ - DatabaseEnvironment.idl \ - DatabaseInteractionHandler.idl \ - DatabaseRegistrationEvent.idl \ - DataColumn.idl \ - DataSettings.idl \ - DataSource.idl \ - DatasourceAdministrationDialog.idl \ - DataSourceBrowser.idl \ - DefinitionContainer.idl \ - DefinitionContent.idl \ - Document.idl \ - DocumentContainer.idl \ - DocumentDataSource.idl \ - DocumentDefinition.idl \ - DocumentSaveRequest.idl \ - ErrorCondition.idl \ - ErrorMessageDialog.idl \ - Forms.idl \ - InteractionHandler.idl \ - OfficeDatabaseDocument.idl \ - OrderColumn.idl \ - ParametersRequest.idl \ - PreparedStatement.idl \ - Query.idl \ - QueryDefinition.idl \ - QueryDescriptor.idl \ - QueryDesign.idl \ - RelationDesign.idl \ - Reports.idl \ - ResultColumn.idl \ - ResultSet.idl \ - RowChangeAction.idl \ - RowChangeEvent.idl \ - RowsChangeEvent.idl \ - RowSet.idl \ - RowSetVetoException.idl \ - SingleSelectQueryAnalyzer.idl \ - SingleSelectQueryComposer.idl \ - SQLContext.idl \ - SQLErrorEvent.idl \ - SQLFilterOperator.idl \ - SQLQueryComposer.idl \ - Table.idl \ - TableDescriptor.idl \ - TableDesign.idl \ - XAlterQuery.idl \ - XBookmarksSupplier.idl \ - XColumn.idl \ - XColumnUpdate.idl \ - XCommandPreparation.idl \ - XCompletedConnection.idl \ - XCompletedExecution.idl \ - XDataAccessDescriptorFactory.idl \ - XDatabaseAccess.idl \ - XDatabaseAccessListener.idl \ - XDatabaseRegistrations.idl \ - XDatabaseRegistrationsListener.idl \ - XDatabaseEnvironment.idl \ - XDocumentDataSource.idl \ - XFormDocumentsSupplier.idl \ - XInteractionDocumentSave.idl \ - XInteractionSupplyParameters.idl \ - XOfficeDatabaseDocument.idl \ - XParametersSupplier.idl \ - XQueriesSupplier.idl \ - XQueryDefinitionsSupplier.idl \ - XReportDocumentsSupplier.idl \ - XResultSetAccess.idl \ - XRowSetApproveBroadcaster.idl \ - XRowSetApproveListener.idl \ - XRowSetChangeBroadcaster.idl \ - XRowSetChangeListener.idl \ - XRowsChangeBroadcaster.idl \ - XRowsChangeListener.idl \ - XRowSetSupplier.idl \ - XSingleSelectQueryAnalyzer.idl \ - XSingleSelectQueryComposer.idl \ - XSubDocument.idl \ - XSQLErrorBroadcaster.idl \ - XSQLErrorListener.idl \ - XSQLQueryComposer.idl \ - XSQLQueryComposerFactory.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/sdb/tools/makefile.mk b/offapi/com/sun/star/sdb/tools/makefile.mk deleted file mode 100644 index 1bc7e6b11c7d..000000000000 --- a/offapi/com/sun/star/sdb/tools/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssdbtools -PACKAGE=com$/sun$/star$/sdb$/tools - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - - -UNOIDLDEFS += -w - -# ------------------------------------------------------------------------ -IDLFILES=\ - CompositionType.idl \ - XConnectionTools.idl \ - XDataSourceMetaData.idl \ - XObjectNames.idl \ - XTableName.idl \ - XTableRename.idl \ - XViewAccess.idl \ - XTableAlteration.idl \ - XKeyAlteration.idl \ - XIndexAlteration.idl \ - XConnectionSupplier.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/sdbc/makefile.mk b/offapi/com/sun/star/sdbc/makefile.mk deleted file mode 100644 index aa033684a4cf..000000000000 --- a/offapi/com/sun/star/sdbc/makefile.mk +++ /dev/null @@ -1,118 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssdbc -PACKAGE=com$/sun$/star$/sdbc - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ -IDLFILES=\ - BatchUpdateException.idl \ - BestRowScope.idl \ - BestRowType.idl \ - CallableStatement.idl \ - ChangeAction.idl \ - ChangeEvent.idl \ - ColumnSearch.idl \ - ColumnType.idl \ - ColumnValue.idl \ - Connection.idl \ - ConnectionPool.idl \ - ConnectionProperties.idl \ - DataTruncation.idl \ - DataType.idl \ - DBASEConnectionProperties.idl \ - Deferrability.idl \ - Driver.idl \ - DriverManager.idl \ - DriverPropertyInfo.idl \ - FetchDirection.idl \ - FILEConnectionProperties.idl \ - FLATConnectionProperties.idl \ - IndexType.idl \ - JDBCConnectionProperties.idl \ - KeyRule.idl \ - ODBCConnectionProperties.idl \ - PreparedStatement.idl \ - ProcedureColumn.idl \ - ProcedureResult.idl \ - ResultSet.idl \ - ResultSetConcurrency.idl \ - ResultSetType.idl \ - RowSet.idl \ - SQLException.idl \ - SQLWarning.idl \ - Statement.idl \ - TransactionIsolation.idl \ - XArray.idl \ - XBatchExecution.idl \ - XBlob.idl \ - XClob.idl \ - XCloseable.idl \ - XColumnLocate.idl \ - XConnection.idl \ - XDatabaseMetaData.idl \ - XDatabaseMetaData2.idl \ - XDataSource.idl \ - XDriver.idl \ - XDriverAccess.idl \ - XDriverManager.idl \ - XGeneratedResultSet.idl \ - XIsolatedConnection.idl \ - XMultipleResults.idl \ - XOutParameters.idl \ - XParameters.idl \ - XPooledConnection.idl \ - XPreparedBatchExecution.idl \ - XPreparedStatement.idl \ - XRef.idl \ - XResultSet.idl \ - XResultSetMetaData.idl \ - XResultSetMetaDataSupplier.idl \ - XResultSetUpdate.idl \ - XRow.idl \ - XRowSet.idl \ - XRowSetListener.idl \ - XRowUpdate.idl \ - XSQLData.idl \ - XSQLInput.idl \ - XSQLOutput.idl \ - XStatement.idl \ - XStruct.idl \ - XWarningsSupplier.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/sdbcx/makefile.mk b/offapi/com/sun/star/sdbcx/makefile.mk deleted file mode 100644 index 5950687989cf..000000000000 --- a/offapi/com/sun/star/sdbcx/makefile.mk +++ /dev/null @@ -1,97 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssdbcx -PACKAGE=com$/sun$/star$/sdbcx - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ -IDLFILES=\ - CheckOption.idl \ - CompareBookmark.idl \ - Column.idl \ - ColumnDescriptor.idl \ - Container.idl \ - DatabaseDefinition.idl \ - Descriptor.idl \ - Driver.idl \ - Group.idl \ - GroupDescriptor.idl \ - Index.idl \ - IndexColumn.idl \ - IndexColumnDescriptor.idl \ - IndexDescriptor.idl \ - Key.idl \ - KeyColumn.idl \ - KeyDescriptor.idl \ - KeyColumnDescriptor.idl \ - KeyDescriptor.idl \ - KeyType.idl \ - PreparedStatement.idl \ - Privilege.idl \ - PrivilegeObject.idl \ - ReferenceColumn.idl \ - ResultSet.idl \ - Statement.idl \ - Table.idl \ - TableDescriptor.idl \ - User.idl \ - UserDescriptor.idl \ - View.idl \ - ViewDescriptor.idl \ - XAlterTable.idl \ - XAlterView.idl \ - XAppend.idl \ - XAuthorizable.idl \ - XColumnsSupplier.idl \ - XCreateCatalog.idl \ - XDeleteRows.idl \ - XDataDefinitionSupplier.idl \ - XDataDescriptorFactory.idl \ - XDrop.idl \ - XDropCatalog.idl \ - XGroupsSupplier.idl \ - XIndexesSupplier.idl \ - XKeysSupplier.idl \ - XRename.idl \ - XRowLocate.idl \ - XTablesSupplier.idl \ - XUser.idl \ - XUsersSupplier.idl \ - XViewsSupplier.idl \ - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - diff --git a/offapi/com/sun/star/setup/InstallResponse.idl b/offapi/com/sun/star/setup/InstallResponse.idl index 61930efdec91..c3c8361b1631 100644 --- a/offapi/com/sun/star/setup/InstallResponse.idl +++ b/offapi/com/sun/star/setup/InstallResponse.idl @@ -27,17 +27,9 @@ #ifndef __com_sun_star_setup_InstallResponse_idl__ #define __com_sun_star_setup_InstallResponse_idl__ -module com { module sun { module star { module setup { - -/// @deprecated -published enum ResponseErrorCode -{ - // DocMerge: empty anyway - NOERROR, +#include <com/sun/star/setup/ResponseErrorCode.idl> - // DocMerge: empty anyway - NOT_ENOUGH_SPACE - }; +module com { module sun { module star { module setup { // DocMerge: empty anyway published struct InstallResponse diff --git a/offapi/com/sun/star/setup/OSType.idl b/offapi/com/sun/star/setup/OSType.idl index 738ab7e73112..77cf8809d751 100644 --- a/offapi/com/sun/star/setup/OSType.idl +++ b/offapi/com/sun/star/setup/OSType.idl @@ -43,6 +43,9 @@ published enum OSType WIN, // DocMerge: empty anyway + OS2, + + // DocMerge: empty anyway MAC, // DocMerge: empty anyway diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp b/offapi/com/sun/star/setup/ResponseErrorCode.idl index 67de06905bfe..648e2257fbe1 100644 --- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp +++ b/offapi/com/sun/star/setup/ResponseErrorCode.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +24,21 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#ifndef __com_sun_star_setup_ResponseErrorCode_idl__ +#define __com_sun_star_setup_ResponseErrorCode_idl__ -#include "macros.h" +module com { module sun { module star { module setup { -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointA, (HANDLE hFindVolumeMountPoint, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/// @deprecated +published enum ResponseErrorCode +{ + // DocMerge: empty anyway + NOERROR, + + // DocMerge: empty anyway + NOT_ENOUGH_SPACE +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/setup/makefile.mk b/offapi/com/sun/star/setup/makefile.mk deleted file mode 100644 index 5970e1cd884d..000000000000 --- a/offapi/com/sun/star/setup/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi -TARGET=csssetup -PACKAGE=com$/sun$/star$/setup - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------ - -IDLFILES=\ - UpdateType.idl \ - ActionType.idl \ - BaseAction.idl \ - CopyFileAction.idl \ - DeleteDirAction.idl \ - DeleteFileAction.idl \ - DeleteFolderAction.idl \ - DeleteFolderItemAction.idl \ - DownloadAction.idl \ - FontAction.idl \ - InstallEnvironment.idl \ - InstallResponse.idl \ - InstallType.idl \ - MakeDirAction.idl \ - MakeFolderAction.idl \ - MakeFolderItemAction.idl \ - MakeShortcutAction.idl \ - MirrorEntry.idl \ - ModuleInfo.idl \ - ModuleState.idl \ - OSType.idl \ - ProductRegistration.idl \ - ProfileItemAction.idl \ - Setup.idl \ - SizeInfo.idl \ - UnzipAction.idl \ - VersionIdentifier.idl \ - WindowsRegistryAction.idl \ - XSetup.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl new file mode 100644 index 000000000000..28c381b1272d --- /dev/null +++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_sheet_FormulaOpCodeMapper_idl__ +#define __com_sun_star_sheet_FormulaOpCodeMapper_idl__ + +#include <com/sun/star/sheet/XFormulaOpCodeMapper.idl> + +//============================================================================= + +module com { module sun { module star { module sheet { + +//============================================================================= + +//============================================================================= + +service FormulaOpCodeMapper : XFormulaOpCodeMapper; + +//============================================================================= + +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/sheet/NameToken.idl b/offapi/com/sun/star/sheet/NameToken.idl new file mode 100644 index 000000000000..15cd48c5fe48 --- /dev/null +++ b/offapi/com/sun/star/sheet/NameToken.idl @@ -0,0 +1,52 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Markus Mohrhard <markus.mohrhard@googlemail.com> + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Major Contributor(s): + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef __com_sun_star_sheet_NameToken_idl__ +#define __com_sun_star_sheet_NameToken_idl__ + +//============================================================================= + +module com { module sun { module star { module sheet { + +//============================================================================= + +/** contains the information regarding named tokens + */ +struct NameToken +{ + long Index; + + boolean Global; +}; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl index 1a52b3439110..b1230f494e38 100644 --- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl +++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl @@ -140,10 +140,6 @@ published interface XFormulaOpCodeMapper //============================================================================= -service FormulaOpCodeMapper : XFormulaOpCodeMapper; - -//============================================================================= - }; }; }; }; #endif diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk index 10bb43d23173..26901cb64b22 100644 --- a/offapi/com/sun/star/sheet/makefile.mk +++ b/offapi/com/sun/star/sheet/makefile.mk @@ -166,6 +166,7 @@ IDLFILES=\ NamedRangeFlag.idl\ NamedRanges.idl\ NamedRangesEnumeration.idl\ + NameToken.idl\ NoConvergenceException.idl\ PasteOperation.idl\ RangeSelectionArguments.idl\ diff --git a/offapi/com/sun/star/smarttags/makefile.mk b/offapi/com/sun/star/smarttags/makefile.mk deleted file mode 100644 index 40d83a29897f..000000000000 --- a/offapi/com/sun/star/smarttags/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csssmarttags -PACKAGE=com$/sun$/star$/smarttags - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - SmartTagAction.idl\ - SmartTagRecognizer.idl\ - SmartTagRecognizerMode.idl\ - XSmartTagAction.idl\ - XSmartTagRecognizer.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - - - - - - - - - - - - - - - diff --git a/offapi/com/sun/star/style/XStyleSupplier.idl b/offapi/com/sun/star/style/XStyleSupplier.idl new file mode 100644 index 000000000000..cfc4d34ca5fa --- /dev/null +++ b/offapi/com/sun/star/style/XStyleSupplier.idl @@ -0,0 +1,75 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef com_sun_star_style_XStyleSupplier_idl +#define com_sun_star_style_XStyleSupplier_idl + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif +#ifndef __com_sun_star_style_XStyle_idl__ +#include <com/sun/star/style/XStyle.idl> +#endif +#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ +#include <com/sun/star/lang/IllegalArgumentException.idl> +#endif + +module com +{ +module sun +{ +module star +{ +module style +{ + +interface XStyleSupplier : ::com::sun::star::uno::XInterface +{ + /** get the currently set style. + + @return the style. If no style was set, the returned object + may be empty (null). Otherwise, the returned object + must support the service + <type>PropertyTemplate</type>. + */ + ::com::sun::star::style::XStyle getStyle(); + + /** @param xStyle If you want to remove an existing style, you can + set an empty (null) object. Otherwise, the object + given must support the service + <type>PropertyTemplate</type>. + */ + void setStyle( [in] ::com::sun::star::style::XStyle xStyle ) + raises( com::sun::star::lang::IllegalArgumentException ); +}; + +} ; // style +} ; // com +} ; // sun +} ; // star + + +#endif diff --git a/offapi/com/sun/star/svg/makefile.mk b/offapi/com/sun/star/svg/makefile.mk deleted file mode 100644 index 7f5f045261bd..000000000000 --- a/offapi/com/sun/star/svg/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssvg -PACKAGE=com$/sun$/star$/svg - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XSVGPrinter.idl\ - XSVGWriter.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp b/offapi/com/sun/star/sync/FilterData.idl index 7c825cf60697..0ecb9f2b0c8b 100644 --- a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp +++ b/offapi/com/sun/star/sync/FilterData.idl @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,12 +25,17 @@ * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER>=1400) -#pragma warning(disable : 4273) -#endif -#include "macros.h" +#ifndef __com_sun_star_sync_FilterData_idl__ +#define __com_sun_star_sync_FilterData_idl__ + +//============================================================================= + +module com { module sun { module star { module sync { +published typedef sequence< string > FilterData; -DEFINE_DEFAULT_THUNK( advapi32, TRYLOAD, BOOL, WINAPI, CheckTokenMembership, (HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember) ) +//============================================================================= -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl index ab8c7804d0ee..5c4b5d322d48 100644 --- a/offapi/com/sun/star/sync/SyncInfo.idl +++ b/offapi/com/sun/star/sync/SyncInfo.idl @@ -29,13 +29,12 @@ #define __com_sun_star_sync_SyncInfo_idl__ #include <com/sun/star/sync/SyncScheme.idl> +#include <com/sun/star/sync/FilterData.idl> //============================================================================= module com { module sun { module star { module sync { -published typedef sequence< string > FilterData; - //============================================================================= /// @deprecated diff --git a/offapi/com/sun/star/sync/makefile.mk b/offapi/com/sun/star/sync/makefile.mk deleted file mode 100644 index 93de367a89db..000000000000 --- a/offapi/com/sun/star/sync/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssync -PACKAGE=com$/sun$/star$/sync - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - SyncCollector.idl\ - Synchronizer.idl\ - SyncElement.idl\ - SyncType.idl\ - SyncScheme.idl\ - SyncAction.idl\ - SyncEvent.idl\ - SyncInfo.idl\ - SyncMode.idl\ - SyncOptions.idl\ - XSyncCollector.idl\ - XSynchronizer.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/system/makefile.mk b/offapi/com/sun/star/system/makefile.mk deleted file mode 100644 index 7e30a8a65897..000000000000 --- a/offapi/com/sun/star/system/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssystem -PACKAGE=com$/sun$/star$/system - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - SystemShellExecute.idl\ - SystemShellExecuteException.idl\ - SystemShellExecuteFlags.idl\ - XSystemShellExecute.idl\ - SimpleMailClientFlags.idl\ - XSimpleMailMessage.idl\ - XSimpleMailClient.idl\ - XSimpleMailClientSupplier.idl\ - SimpleCommandMail.idl \ - SimpleSystemMail.idl\ - ProxySettings.idl\ - SOffice52ProxySettings.idl\ - SystemProxySettings.idl\ - XProxySettings.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/table/XCell2.idl b/offapi/com/sun/star/table/XCell2.idl new file mode 100644 index 000000000000..6e3c24e6940f --- /dev/null +++ b/offapi/com/sun/star/table/XCell2.idl @@ -0,0 +1,71 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Novell, Inc. + * + * Portions created by the Initial Developer are Copyright (C) 2011 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Muthu Subramanian <sumuthu@novell.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef __com_sun_star_table_XCell2_idl__ +#define __com_sun_star_table_XCell2_idl__ + +#include <com/sun/star/table/XCell.idl> + +//============================================================================= + +module com { module sun { module star { module table { + +//============================================================================= + +/** extends XCell methods to access the contents of a cell in a table. + + @see com::sun::star::table::Cell + */ +interface XCell2: com::sun::star::table::XCell +{ + /** sets a formula result into the cell. + + <p>When assigned, the formula cell's result will be set to this + value and will not be calculated - unless a HardRecalc is + executed.</p> + */ + void setFormulaResult( [in] double nValue ); + + //------------------------------------------------------------------------- + + /** sets a formula string into the cell. + + <p>When assigned, the formula is set into the string. But is not + compiled, tokenized or calculated. Its useful when loading a + document and setFormulaResult() is used. Otherwise it is compiled + on trying to fetch a result value.</p> + */ + void setFormulaString( [in] string aFormula ); +}; + +//============================================================================= + +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/table/makefile.mk b/offapi/com/sun/star/table/makefile.mk index 9b7e18582336..4cb90ab6ed95 100644 --- a/offapi/com/sun/star/table/makefile.mk +++ b/offapi/com/sun/star/table/makefile.mk @@ -75,6 +75,7 @@ IDLFILES=\ TableSortFieldType.idl\ XAutoFormattable.idl\ XCell.idl\ + XCell2.idl\ XMergeableCell.idl\ XMergeableCellRange.idl\ XCellCursor.idl\ diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk deleted file mode 100644 index cd9db6b5a738..000000000000 --- a/offapi/com/sun/star/task/makefile.mk +++ /dev/null @@ -1,91 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# Copyright IBM Corporation 2009. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csstask -PACKAGE=com$/sun$/star$/task - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ClassifiedInteractionRequest.idl\ - DocumentMacroConfirmationRequest.idl\ - DocumentPasswordRequest.idl\ - DocumentPasswordRequest2.idl\ - DocumentMSPasswordRequest.idl\ - DocumentMSPasswordRequest2.idl\ - ErrorCodeRequest.idl\ - ErrorCodeIOException.idl\ - FutureDocumentVersionProductUpdateRequest.idl\ - InteractionClassification.idl\ - InteractionHandler.idl\ - JobExecutor.idl\ - Job.idl\ - AsyncJob.idl\ - MasterPasswordRequest.idl\ - NoMasterException.idl\ - PasswordContainer.idl\ - PasswordContainerInteractionHandler.idl\ - PasswordRequest.idl\ - PasswordRequestMode.idl\ - PDFExportException.idl\ - OfficeRestartManager.idl\ - UnsupportedOverwriteRequest.idl\ - UrlRecord.idl\ - UserRecord.idl\ - XAsyncJob.idl\ - XInteractionApprove.idl\ - XInteractionAskLater.idl\ - XInteractionDisapprove.idl\ - XInteractionPassword.idl\ - XInteractionPassword2.idl\ - XJob.idl\ - XJobExecutor.idl\ - XJobListener.idl\ - XMasterPasswordHandling.idl\ - XMasterPasswordHandling2.idl\ - XPasswordContainer.idl\ - XRestartManager.idl\ - XStatusIndicator.idl\ - XStatusIndicatorFactory.idl\ - XStatusIndicatorSupplier.idl\ - XAbortChannel.idl\ - XInteractionRequestStringResolver.idl\ - InteractionRequestStringResolver.idl\ - XUrlContainer.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/text/fieldmaster/makefile.mk b/offapi/com/sun/star/text/fieldmaster/makefile.mk deleted file mode 100644 index ad0a5d8af18c..000000000000 --- a/offapi/com/sun/star/text/fieldmaster/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssfieldmaster -PACKAGE=com$/sun$/star$/text$/fieldmaster - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Database.idl\ - DDE.idl\ - Bibliography.idl\ - SetExpression.idl\ - User.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk deleted file mode 100644 index 4e6d24746af8..000000000000 --- a/offapi/com/sun/star/text/makefile.mk +++ /dev/null @@ -1,278 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csstext -PACKAGE=com$/sun$/star$/text - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AccessibleEndnoteView.idl\ - AccessibleFootnoteView.idl\ - AccessibleHeaderFooterView.idl\ - AccessiblePageView.idl\ - AccessibleParagraphView.idl\ - AccessibleTextDocumentPageView.idl\ - AccessibleTextDocumentView.idl\ - AccessibleTextEmbeddedObject.idl\ - AccessibleTextFrameView.idl\ - AccessibleTextGraphicObject.idl\ - AdvancedTextDocument.idl\ - AuthorDisplayFormat.idl\ - AutoTextContainer.idl\ - AutoTextEntry.idl\ - AutoTextGroup.idl\ - BaseFrame.idl\ - BaseFrameProperties.idl\ - BaseIndex.idl\ - BaseIndexMark.idl\ - Bibliography.idl\ - BibliographyDataType.idl\ - BibliographyDataField.idl\ - Bookmark.idl\ - Bookmarks.idl\ - Cell.idl\ - CellProperties.idl\ - CellRange.idl\ - ChainedTextFrame.idl\ - ChapterFormat.idl\ - ChapterNumberingRule.idl\ - CharacterCompressionType.idl\ - ContentIndex.idl\ - ContentIndexMark.idl\ - ControlCharacter.idl\ - DateDisplayFormat.idl\ - DefaultNumberingProvider.idl\ - Defaults.idl\ - DependentTextField.idl\ - DocumentIndex.idl\ - DocumentIndexes.idl\ - DocumentIndexFormat.idl\ - DocumentIndexLevelFormat.idl\ - DocumentIndexMark.idl\ - DocumentIndexMarkAsian.idl\ - DocumentIndexParagraphStyles.idl\ - DocumentSettings.idl\ - DocumentStatistic.idl\ - Endnote.idl\ - EndnoteSettings.idl\ - FilenameDisplayFormat.idl\ - FontEmphasis.idl\ - FontRelief.idl\ - Footnote.idl\ - FootnoteNumbering.idl\ - Footnotes.idl\ - FootnoteSettings.idl\ - GenericTextDocument.idl\ - GlobalDocument.idl\ - GlobalSettings.idl\ - GraphicCrop.idl\ - HoriOrientation.idl\ - HoriOrientationFormat.idl\ - HorizontalAdjust.idl\ - HypertextDocument.idl\ - IllustrationsIndex.idl\ - InContentMetadata.idl\ - InvalidTextContentException.idl\ - LabelFollow.idl\ - LineNumberingProperties.idl\ - LineNumberingSettings.idl\ - MailMerge.idl\ - MailMergeEvent.idl\ - MailMergeType.idl\ - NotePrintMode.idl\ - NumberingLevel.idl\ - NumberingRules.idl\ - NumberingStyle.idl\ - ObjectIndex.idl\ - PageFootnoteInfo.idl\ - PageNumberType.idl\ - PagePrintSettings.idl\ - Paragraph.idl\ - ParagraphEnumeration.idl\ - ParagraphVertAlign.idl\ - PlaceholderType.idl\ - PositionAndSpaceMode.idl\ - PositionLayoutDir.idl\ - PrintPreviewSettings.idl\ - PrintSettings.idl\ - RedlinePortion.idl\ - ReferenceFieldPart.idl\ - ReferenceFieldSource.idl\ - ReferenceMark.idl\ - ReferenceMarks.idl\ - RelOrientation.idl\ - RubyAdjust.idl\ - SectionFileLink.idl\ - SetVariableType.idl\ - Shape.idl\ - SizeType.idl\ - TableColumns.idl\ - TableColumnSeparator.idl\ - TableIndex.idl\ - TableRows.idl\ - TemplateDisplayFormat.idl\ - Text.idl\ - TextColumn.idl\ - TextColumns.idl\ - TextColumnSequence.idl\ - TextContent.idl\ - TextContentAnchorType.idl\ - TextContentCollection.idl\ - TextCursor.idl\ - TextDocument.idl\ - TextDocumentView.idl\ - TextEmbeddedObject.idl\ - TextEmbeddedObjects.idl\ - TextField.idl\ - TextFieldEnumeration.idl\ - TextFieldMaster.idl\ - TextFieldMasters.idl\ - TextFields.idl\ - TextFrame.idl\ - TextFrames.idl\ - TextGraphicObject.idl\ - TextGraphicObjects.idl\ - TextGridMode.idl\ - TextLayoutCursor.idl\ - TextMarkupDescriptor.idl\ - TextMarkupType.idl \ - TextPageStyle.idl\ - TextPortion.idl\ - TextPortionEnumeration.idl\ - TextRange.idl\ - TextRanges.idl\ - TextRangeContentProperties.idl\ - TextSection.idl\ - TextSections.idl\ - TextSortable.idl\ - TextSortDescriptor.idl\ - TextSortDescriptor2.idl\ - TextTable.idl\ - TextTableCursor.idl\ - TextTableRow.idl\ - TextTables.idl\ - TextViewCursor.idl\ - TimeDisplayFormat.idl\ - UserDataPart.idl\ - UserDefinedIndex.idl\ - UserFieldFormat.idl\ - UserIndex.idl\ - UserIndexMark.idl\ - VertOrientation.idl\ - VertOrientationFormat.idl\ - ViewSettings.idl\ - WebDocument.idl\ - WrapInfluenceOnPosition.idl\ - WrapTextMode.idl\ - WritingMode.idl\ - WritingMode2.idl\ - XAutoTextContainer.idl\ - XAutoTextEntry.idl\ - XAutoTextGroup.idl\ - XBookmarkInsertTool.idl\ - XBookmarksSupplier.idl\ - XChapterNumberingSupplier.idl\ - XDefaultNumberingProvider.idl\ - XDependentTextField.idl\ - XDocumentIndex.idl\ - XDocumentIndexesSupplier.idl\ - XDocumentIndexMark.idl\ - XEndnotesSettingsSupplier.idl\ - XEndnotesSupplier.idl\ - XFootnote.idl\ - XFootnotesSettingsSupplier.idl\ - XFootnotesSupplier.idl\ - XHeaderFooter.idl\ - XHeaderFooterPageStyle.idl\ - XLineNumberingSupplier.idl\ - XLineNumberingProperties.idl\ - XMailMergeBroadcaster.idl\ - XMailMergeListener.idl\ - XModule.idl\ - XNumberingFormatter.idl\ - XNumberingRulesSupplier.idl\ - XNumberingTypeInfo.idl\ - XPageCursor.idl\ - XPagePrintable.idl\ - XParagraphCursor.idl\ - XRedline.idl\ - XReferenceMarksSupplier.idl\ - XRelativeTextContentInsert.idl\ - XRelativeTextContentRemove.idl\ - XRubySelection.idl\ - XSentenceCursor.idl\ - XSimpleText.idl\ - XText.idl\ - XTextColumns.idl\ - XTextContent.idl\ - XTextCursor.idl\ - XTextCopy.idl\ - XTextDocument.idl\ - XTextEmbeddedObject.idl\ - XTextEmbeddedObjectsSupplier.idl\ - XTextField.idl\ - XTextFieldsSupplier.idl\ - XTextFrame.idl\ - XTextFramesSupplier.idl\ - XTextGraphicObjectsSupplier.idl\ - XTextMarkup.idl\ - XMultiTextMarkup.idl\ - XTextRange.idl\ - XTextRangeCompare.idl\ - XTextRangeMover.idl\ - XTextSection.idl\ - XTextSectionsSupplier.idl\ - XTextShapesSupplier.idl\ - XTextTable.idl\ - XTextTableCursor.idl\ - XTextTablesSupplier.idl\ - XTextViewCursor.idl\ - XTextViewCursorSupplier.idl\ - XWordCursor.idl \ - XParagraphAppend.idl \ - XTextPortionAppend.idl \ - XTextContentAppend.idl \ - XTextConvert.idl \ - XTextAppendAndConvert.idl \ - XTextAppend.idl \ - XFormField.idl \ - XFlatParagraph.idl \ - XFlatParagraphIterator.idl \ - XFlatParagraphIteratorProvider.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk b/offapi/com/sun/star/text/textfield/docinfo/makefile.mk deleted file mode 100644 index 47381e570e06..000000000000 --- a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csstextfielddocinfo -PACKAGE=com$/sun$/star$/text$/textfield$/docinfo - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ChangeAuthor.idl\ - ChangeDateTime.idl\ - CreateAuthor.idl\ - CreateDateTime.idl\ - Custom.idl\ - Description.idl\ - EditTime.idl\ - Info0.idl\ - Info1.idl\ - Info2.idl\ - Info3.idl\ - Keywords.idl\ - PrintAuthor.idl\ - PrintDateTime.idl\ - Revision.idl\ - Subject.idl\ - Title.idl\ - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/text/textfield/makefile.mk b/offapi/com/sun/star/text/textfield/makefile.mk deleted file mode 100644 index 475d6b019843..000000000000 --- a/offapi/com/sun/star/text/textfield/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csstextfield -PACKAGE=com$/sun$/star$/text$/textfield - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - URL.idl\ - Annotation.idl\ - Author.idl\ - Bibliography.idl\ - Chapter.idl\ - CharacterCount.idl\ - CombinedCharacters.idl\ - ConditionalText.idl\ - Database.idl\ - DatabaseName.idl\ - DatabaseNextSet.idl\ - DatabaseNumberOfSet.idl\ - DatabaseSetNumber.idl\ - DateTime.idl\ - DDE.idl\ - DropDown.idl\ - EmbeddedObjectCount.idl\ - ExtendedUser.idl\ - FileName.idl\ - GetExpression.idl\ - GetReference.idl\ - GraphicObjectCount.idl\ - HiddenParagraph.idl\ - HiddenText.idl\ - Input.idl\ - InputUser.idl\ - JumpEdit.idl\ - Macro.idl\ - MetadataField.idl\ - PageCount.idl\ - PageNumber.idl\ - ParagraphCount.idl\ - ReferencePageGet.idl\ - ReferencePageSet.idl\ - Script.idl\ - SetExpression.idl\ - TableCount.idl\ - TableFormula.idl\ - TemplateName.idl\ - User.idl\ - WordCount.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk deleted file mode 100644 index d5cd58ff685f..000000000000 --- a/offapi/com/sun/star/ucb/makefile.mk +++ /dev/null @@ -1,274 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssucb -PACKAGE=com$/sun$/star$/ucb - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AlreadyInitializedException.idl\ - AnyCompareFactory.idl\ - AuthenticationRequest.idl\ - URLAuthenticationRequest.idl\ - CachedContentResultSet.idl\ - CachedContentResultSetFactory.idl\ - CachedContentResultSetStub.idl\ - CachedContentResultSetStubFactory.idl\ - CachedDynamicResultSet.idl\ - CachedDynamicResultSetFactory.idl\ - CachedDynamicResultSetStub.idl\ - CachedDynamicResultSetStubFactory.idl\ - CHAOSProgressStart.idl\ - CertificateValidationRequest.idl\ - Command.idl\ - CommandAbortedException.idl\ - CommandEnvironment.idl\ - CommandFailedException.idl\ - CommandInfo.idl\ - CommandInfoChange.idl\ - CommandInfoChangeEvent.idl\ - ConnectionMode.idl\ - Content.idl\ - ContentAction.idl\ - ContentCreationError.idl\ - ContentCreationException.idl\ - ContentEvent.idl\ - ContentInfo.idl\ - ContentInfoAttribute.idl\ - ContentProvider.idl\ - ContentProviderInfo.idl\ - ContentProviderProxy.idl\ - ContentProviderProxyFactory.idl\ - ContentResultSet.idl\ - ContentResultSetCapability.idl\ - ContentTransmitter.idl\ - Cookie.idl\ - CookiePolicy.idl\ - CookieRequest.idl\ - CrossReference.idl\ - DefaultHierarchyDataSource.idl\ - DocumentHeaderField.idl\ - DocumentStoreMode.idl\ - DuplicateCommandIdentifierException.idl\ - DuplicateProviderException.idl\ - DynamicResultSet.idl\ - Error.idl\ - ExpandContentProvider.idl\ - ExportStreamInfo.idl\ - FetchError.idl\ - FetchResult.idl\ - FileContent.idl\ - FileContentProvider.idl\ - FileSystemNotation.idl\ - FolderList.idl\ - FolderListCommand.idl\ - FolderListEntry.idl\ - FTPContent.idl\ - FTPContentProvider.idl\ - GlobalTransferCommandArgument.idl\ - GIOContentProvider.idl\ - GnomeVFSContentProvider.idl\ - GnomeVFSDocumentContent.idl\ - GnomeVFSFolderContent.idl\ - HandleCookiesRequest.idl\ - HelpContent.idl\ - HelpContentProvider.idl\ - HierarchyContentProvider.idl\ - HierarchyDataReadAccess.idl\ - HierarchyDataReadWriteAccess.idl\ - HierarchyDataSource.idl\ - HierarchyFolderContent.idl\ - HierarchyLinkContent.idl\ - HierarchyRootFolderContent.idl\ - IllegalIdentifierException.idl\ - InsertCommandArgument.idl\ - InteractiveAppException.idl\ - InteractiveAugmentedIOException.idl\ - InteractiveBadTransferURLException.idl\ - InteractiveCHAOSException.idl\ - InteractiveFileIOException.idl\ - InteractiveIOException.idl\ - InteractiveLockingException.idl\ - InteractiveLockingLockedException.idl\ - InteractiveLockingLockExpiredException.idl\ - InteractiveLockingNotLockedException.idl\ - InteractiveNetworkConnectException.idl\ - InteractiveNetworkException.idl\ - InteractiveNetworkGeneralException.idl\ - InteractiveNetworkOffLineException.idl\ - InteractiveNetworkReadException.idl\ - InteractiveNetworkResolveNameException.idl\ - InteractiveNetworkWriteException.idl\ - InteractiveWrongMediumException.idl\ - IOErrorCode.idl\ - Link.idl\ - ListAction.idl\ - ListActionType.idl\ - ListenerAlreadySetException.idl\ - ListEvent.idl\ - Lock.idl\ - LockDepth.idl\ - LockEntry.idl\ - LockScope.idl\ - LockType.idl\ - MissingInputStreamException.idl\ - MissingPropertiesException.idl\ - NameClash.idl\ - NameClashException.idl\ - NameClashResolveRequest.idl\ - NumberedSortingInfo.idl\ - ODMAContent.idl\ - ODMAContentProvider.idl\ - OpenCommandArgument.idl\ - OpenCommandArgument2.idl\ - OpenMode.idl\ - OutgoingMessageState.idl\ - PackageContentProvider.idl\ - PackageFolderContent.idl\ - PackageStreamContent.idl\ - PersistentPropertySet.idl\ - PostCommandArgument.idl\ - PostCommandArgument2.idl\ - Priority.idl\ - PropertiesManager.idl\ - PropertySetRegistry.idl\ - PropertyValueInfo.idl\ - PropertyValueState.idl\ - RecipientInfo.idl\ - RememberAuthentication.idl\ - RemoteAccessContentProvider.idl\ - RemoteContentProviderAcceptor.idl\ - RemoteContentProviderChangeAction.idl\ - RemoteContentProviderChangeEvent.idl\ - RemoteProxyContentProvider.idl\ - ResultSetException.idl\ - Rule.idl\ - RuleAction.idl\ - RuleOperator.idl\ - RuleSet.idl\ - RuleTerm.idl\ - SearchCommandArgument.idl\ - SearchCriterium.idl\ - SearchInfo.idl\ - SearchRecursion.idl\ - SendInfo.idl\ - SendMediaTypes.idl\ - ServiceNotFoundException.idl\ - SimpleFileAccess.idl\ - SortedDynamicResultSetFactory.idl\ - SortingInfo.idl\ - Store.idl\ - SynchronizePolicy.idl\ - TransferCommandOperation.idl\ - TransferInfo.idl\ - TransferResult.idl\ - TransientDocumentsContentProvider.idl\ - TransientDocumentsRootContent.idl\ - TransientDocumentsDocumentContent.idl\ - TransientDocumentsFolderContent.idl\ - TransientDocumentsStreamContent.idl\ - UniversalContentBroker.idl\ - UnsupportedCommandException.idl\ - UnsupportedDataSinkException.idl\ - UnsupportedNameClashException.idl\ - UnsupportedOpenModeException.idl\ - VerificationMode.idl\ - WebDAVContentProvider.idl\ - WebDAVDocumentContent.idl\ - WebDAVFolderContent.idl\ - WelcomeDynamicResultSetStruct.idl\ - XAnyCompare.idl\ - XAnyCompareFactory.idl\ - XCachedContentResultSetFactory.idl\ - XCachedContentResultSetStubFactory.idl\ - XCachedDynamicResultSetFactory.idl\ - XCachedDynamicResultSetStubFactory.idl\ - XCommandEnvironment.idl\ - XCommandInfo.idl\ - XCommandInfoChangeListener.idl\ - XCommandInfoChangeNotifier.idl\ - XCommandProcessor.idl\ - XCommandProcessor2.idl\ - XContent.idl\ - XContentAccess.idl\ - XContentCreator.idl\ - XContentEventListener.idl\ - XContentIdentifier.idl\ - XContentIdentifierFactory.idl\ - XContentIdentifierMapping.idl\ - XContentProvider.idl\ - XContentProviderFactory.idl\ - XContentProviderManager.idl\ - XContentProviderSupplier.idl\ - XContentTransmitter.idl\ - XDataContainer.idl\ - XDynamicResultSet.idl\ - XDynamicResultSetListener.idl\ - XFetchProvider.idl\ - XFetchProviderForContentAccess.idl\ - XFileIdentifierConverter.idl\ - XInteractionCookieHandling.idl\ - XInteractionHandlerSupplier.idl\ - XInteractionReplaceExistingData.idl\ - XInteractionSupplyAuthentication.idl\ - XInteractionSupplyAuthentication2.idl\ - XInteractionSupplyName.idl\ - XParameterizedContentProvider.idl\ - XPersistentPropertySet.idl\ - XProgressHandler.idl\ - XPropertyMatcher.idl\ - XPropertyMatcherFactory.idl\ - XPropertySetRegistry.idl\ - XPropertySetRegistryFactory.idl\ - XRecycler.idl\ - XRemoteContentProviderAcceptor.idl\ - XRemoteContentProviderActivator.idl\ - XRemoteContentProviderChangeListener.idl\ - XRemoteContentProviderChangeNotifier.idl\ - XRemoteContentProviderConnectionControl.idl\ - XRemoteContentProviderDistributor.idl\ - XRemoteContentProviderDoneListener.idl\ - XRemoteContentProviderSupplier.idl\ - XSimpleFileAccess.idl\ - XSimpleFileAccess2.idl\ - XSimpleFileAccess3.idl\ - XSortedDynamicResultSetFactory.idl\ - XSourceInitialization.idl\ - XWebDAVCommandEnvironment.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/ucb/smart/makefile.mk b/offapi/com/sun/star/ucb/smart/makefile.mk deleted file mode 100644 index 37172e9e6db7..000000000000 --- a/offapi/com/sun/star/ucb/smart/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssucbs -PACKAGE=com$/sun$/star$/ucb$/smart - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Content.idl\ - XFactory.idl\ - XContent.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/ui/dialogs/makefile.mk b/offapi/com/sun/star/ui/dialogs/makefile.mk deleted file mode 100644 index 07d762fb0ec6..000000000000 --- a/offapi/com/sun/star/ui/dialogs/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssuidialogs -PACKAGE=com$/sun$/star$/ui$/dialogs - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - FilterOptionsDialog.idl\ - ControlActions.idl\ - ExecutableDialogException.idl\ - ExecutableDialogResults.idl\ - XExecutableDialog.idl\ - CommonFilePickerElementIds.idl\ - ExtendedFilePickerElementIds.idl\ - FilePicker.idl\ - FilePickerEvent.idl\ - FilePreviewImageFormats.idl\ - FolderPicker.idl\ - ListboxControlActions.idl\ - TemplateDescription.idl\ - XFilePicker.idl\ - XFilePicker2.idl\ - XFilePickerControlAccess.idl \ - XFilePickerListener.idl\ - XFilePickerNotifier.idl\ - XFilePreview.idl\ - XFilterGroupManager.idl\ - XFilterManager.idl\ - XFolderPicker.idl\ - XControlAccess.idl\ - XControlInformation.idl \ - XAsynchronousExecutableDialog.idl \ - XDialogClosedListener.idl \ - DialogClosedEvent.idl \ - XWizard.idl \ - XWizardController.idl \ - Wizard.idl \ - XWizardPage.idl \ - WizardButton.idl \ - WizardTravelType.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/offapi/com/sun/star/ui/makefile.mk b/offapi/com/sun/star/ui/makefile.mk deleted file mode 100644 index 313d74dcd9e8..000000000000 --- a/offapi/com/sun/star/ui/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssui -PACKAGE=com$/sun$/star$/ui - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ActionTrigger.idl \ - ActionTriggerContainer.idl \ - ActionTriggerSeparator.idl \ - ActionTriggerSeparatorType.idl \ - ConfigurableUIElement.idl \ - ConfigurationEvent.idl \ - ContextMenuExecuteEvent.idl \ - ContextMenuInterceptorAction.idl \ - DockingArea.idl \ - GlobalAcceleratorConfiguration.idl \ - ImageType.idl \ - ItemDescriptor.idl \ - ItemStyle.idl \ - ItemType.idl \ - ModuleUICategoryDescription.idl \ - ModuleUICommandDescription.idl \ - ModuleUIConfigurationManager.idl \ - ModuleUIConfigurationManagerSupplier.idl \ - ModuleWindowStateConfiguration.idl \ - UICategoryDescription.idl \ - UICommandDescription.idl \ - UIConfigurationManager.idl \ - UIElement.idl \ - UIElementFactory.idl \ - UIElementFactoryManager.idl \ - UIElementSettings.idl \ - UIElementType.idl \ - WindowContentFactory.idl \ - WindowStateConfiguration.idl \ - XAcceleratorConfiguration.idl \ - XContextMenuInterception.idl \ - XContextMenuInterceptor.idl \ - XDockingAreaAcceptor.idl \ - XImageManager.idl \ - XModuleUIConfigurationManager.idl \ - XModuleUIConfigurationManagerSupplier.idl \ - XUIConfiguration.idl \ - XUIConfigurationListener.idl \ - XUIConfigurationManager.idl \ - XUIConfigurationManagerSupplier.idl \ - XUIConfigurationPersistence.idl \ - XUIConfigurationStorage.idl \ - XUIElement.idl \ - XUIElementFactory.idl \ - XUIElementFactoryRegistration.idl \ - XUIElementSettings.idl \ - XUIFunctionListener.idl \ - XToolPanel.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/util/SearchAlgorithms.idl b/offapi/com/sun/star/util/SearchAlgorithms.idl new file mode 100644 index 000000000000..f83b4404ec18 --- /dev/null +++ b/offapi/com/sun/star/util/SearchAlgorithms.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_lang_SearchAlgorithms_idl__ +#define __com_sun_star_lang_SearchAlgorithms_idl__ + + +//============================================================================= + +module com { module sun { module star { module util { + +//============================================================================= + +published enum SearchAlgorithms +{ + /// Literal + ABSOLUTE, // implemented as a kind of Boyer-Moore + /// Regular expression + REGEXP, + /// Weighted Levenshtein Distance + APPROXIMATE +}; + +//============================================================================= +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/util/SearchFlags.idl b/offapi/com/sun/star/util/SearchFlags.idl new file mode 100644 index 000000000000..452b5d45d970 --- /dev/null +++ b/offapi/com/sun/star/util/SearchFlags.idl @@ -0,0 +1,140 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_lang_SearchFlags_idl__ +#define __com_sun_star_lang_SearchFlags_idl__ + + +//============================================================================= + +module com { module sun { module star { module util { + +//============================================================================= + +/// Flags for search methods +published constants SearchFlags +{ + /** + @deprecated The constant ALL_IGNORE_CASE is never supported - use + <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const> + with + <member>SearchOptions::transliterateFlags</member> + instead. + + @see <type scope="com::sun::star::i18n">TransliterationModules</type> + */ + const long ALL_IGNORE_CASE = 0x00000001; + + /** Flag for normal (Boyer-Moore) search / Search for word only. */ + const long NORM_WORD_ONLY = 0x00000010; + + /** Flag for "regular expression" search / Interpret as extended + regular expression. + + @deprecated The flag is currently not supported by OOo. + */ + const long REG_EXTENDED = 0x00000100; + + /** Flag for "regular expression" search / No register information + or backreferences, i.e., avoid sub expressions. Return only + true/false if matched or not. + + @deprecated The flag is currently not supported by OOo. + */ + const long REG_NOSUB = 0x00000200; + + /** Flag for "regular expression" search / Special new line + treatment. + + @deprecated The flag is currently not supported by OOo. + + <p> A NEWLINE character in string will not be matched by a + period outside bracket expression or by any form of a non + matching list. </p> + + <p> A circumflex (^) in pattern when used to specify expression + anchoring will match the zero length string immediately after a + newline in string, regardless of the setting of + REG_NOT_BEGINOFLINE. </p> + + <p> A dollar-sign ($) in pattern when used to specify expression + anchoring, will match zero-length string immediately before a + new line in string, regardless of the setting of + REG_NOT_ENDOFLINE. </p> + */ + const long REG_NEWLINE = 0x00000400; + + /** The first character in the string is not the beginning of the + line therefore ^ will not match with first character of the + string. + */ + const long REG_NOT_BEGINOFLINE = 0x00000800; + + /** The last character in the string is not the end of the line + therefore $ will not match with last character of the string. + */ + const long REG_NOT_ENDOFLINE = 0x00001000; + + /** Flag for "Weighted Levenshtein Distance" search / Relaxed + checking of limit, split weigh pools. + + <p> If not specified (<b>strict</b>), the search is sucessful if + the WLD is within a calculated limit where each insertion, + deletion and replacement adds a weight to a common pool of + weights. This is the mathematically correct WLD. </p> + + <p> From a user's point of view the strict WLD is an + exclusive-OR of the arguments given, for example if allowed + insertions=2 and allowed replacements=2, the search fails if 2 + characters had been inserted and an additional operation would + be needed to match. Depending on the weights it may also fail if + 1 character was inserted and 1 character replaced and an + additional operation would be needed to match. The strict + algorithm may match less than expected from a first glance of + the specified arguments, but does not return false positives. </p> + + <p> If specified (<b>relaxed</b>), the search is also successful + if the combined pool for insertions and deletions is below a + doubled calculated limit and replacements are treated + differently. Additionally, swapped characters are counted as one + replacement. </p> + + <p> From a user's point of view the relaxed WLD is an + inclusive-OR of the arguments given, for example if allowed + insertions=2 and allowed replacements=2, the search succeeds if + 2 characters had been inserted and an additional replacement is + needed to match. The relaxed algorithm may return false + positives, but meets user expectation better. </p> + */ + const long LEV_RELAXED = 0x00010000; +}; + +//============================================================================= +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/util/SearchOptions.idl b/offapi/com/sun/star/util/SearchOptions.idl new file mode 100644 index 000000000000..b4784720ce6d --- /dev/null +++ b/offapi/com/sun/star/util/SearchOptions.idl @@ -0,0 +1,86 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_lang_SearchOptions_idl__ +#define __com_sun_star_lang_SearchOptions_idl__ + + +#include <com/sun/star/lang/Locale.idl> +#include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/util/SearchAlgorithms.idl> + +//============================================================================= + +module com { module sun { module star { module util { + +//============================================================================= + +published struct SearchOptions { + //------------------------------------------------------------------------- + /** search type */ + SearchAlgorithms algorithmType; + + /** some flags - can be mixed + + @see <type>SearchFlags</type> + */ + long searchFlag; + + /** The text or pattern to be searched. */ + string searchString; + + /** The replacement text + (is for optional replacing - SearchOption is only the data container for it) */ + string replaceString; + + /** The locale for case insensitive search. */ + ::com::sun::star::lang::Locale Locale; + + /** This many characters can be different (as a replacement) between + the found word and the search pattern in a "Weighted Levenshtein + Distance" search. */ + long changedChars; + + /** This many characters can be missing in the found word in a + "Weighted Levenshtein Distance" search. */ + long deletedChars; + + /** This many characters can be additional in the found word in a + "Weighted Levenshtein Distance" search. */ + long insertedChars; + + /** Flags for the transliteration. Same meaning as the enum of + <type scope="com::sun::star::i18n">TransliterationModules</type> + */ + long transliterateFlags; +}; + +//============================================================================= +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/util/SearchResult.idl b/offapi/com/sun/star/util/SearchResult.idl new file mode 100644 index 000000000000..784d35478909 --- /dev/null +++ b/offapi/com/sun/star/util/SearchResult.idl @@ -0,0 +1,64 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_lang_SearchResult_idl__ +#define __com_sun_star_lang_SearchResult_idl__ + + +//============================================================================= + +module com { module sun { module star { module util { + +//============================================================================= + +published struct SearchResult { + //------------------------------------------------------------------------- + /** Number of subexpressions, + if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match. + The start and endOffset are always dependent on the search direction. + For example: + if you search "X" in the text "-X-" the offset are: + for forward: start = 1, end = 2 + for backward: start = 2, end = 1 + Forward, the startOffset is inclusive, the endOffset exclusive. + Backward, the startOffset is exclusive, the endOffset inclusive. + + For regular expressions it can be greater than 1. + If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string + if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression + startoffset[i] and endoffset[i] points to the matching substring of i th matching substring. + */ + long subRegExpressions; + sequence<long> startOffset; // inclusive + sequence<long> endOffset; // exclusive +}; + +//============================================================================= +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl index e76d286eec46..d5b4c1aa3ff1 100644 --- a/offapi/com/sun/star/util/XTextSearch.idl +++ b/offapi/com/sun/star/util/XTextSearch.idl @@ -31,184 +31,12 @@ #include <com/sun/star/lang/Locale.idl> #include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/util/SearchOptions.idl> +#include <com/sun/star/util/SearchResult.idl> module com { module sun { module star { module util { -published enum SearchAlgorithms -{ - /// Literal - ABSOLUTE, // implemented as a kind of Boyer-Moore - /// Regular expression - REGEXP, - /// Weighted Levenshtein Distance - APPROXIMATE -}; - -/// Flags for search methods -published constants SearchFlags -{ - /** - @deprecated The constant ALL_IGNORE_CASE is never supported - use - <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const> - with - <member>SearchOptions::transliterateFlags</member> - instead. - - @see <type scope="com::sun::star::i18n">TransliterationModules</type> - */ - const long ALL_IGNORE_CASE = 0x00000001; - - /** Flag for normal (Boyer-Moore) search / Search for word only. */ - const long NORM_WORD_ONLY = 0x00000010; - - /** Flag for "regular expression" search / Interpret as extended - regular expression. - - @deprecated The flag is currently not supported by OOo. - */ - const long REG_EXTENDED = 0x00000100; - - /** Flag for "regular expression" search / No register information - or backreferences, i.e., avoid sub expressions. Return only - true/false if matched or not. - - @deprecated The flag is currently not supported by OOo. - */ - const long REG_NOSUB = 0x00000200; - - /** Flag for "regular expression" search / Special new line - treatment. - - @deprecated The flag is currently not supported by OOo. - - <p> A NEWLINE character in string will not be matched by a - period outside bracket expression or by any form of a non - matching list. </p> - - <p> A circumflex (^) in pattern when used to specify expression - anchoring will match the zero length string immediately after a - newline in string, regardless of the setting of - REG_NOT_BEGINOFLINE. </p> - - <p> A dollar-sign ($) in pattern when used to specify expression - anchoring, will match zero-length string immediately before a - new line in string, regardless of the setting of - REG_NOT_ENDOFLINE. </p> - */ - const long REG_NEWLINE = 0x00000400; - - /** The first character in the string is not the beginning of the - line therefore ^ will not match with first character of the - string. - */ - const long REG_NOT_BEGINOFLINE = 0x00000800; - - /** The last character in the string is not the end of the line - therefore $ will not match with last character of the string. - */ - const long REG_NOT_ENDOFLINE = 0x00001000; - - /** Flag for "Weighted Levenshtein Distance" search / Relaxed - checking of limit, split weigh pools. - - <p> If not specified (<b>strict</b>), the search is sucessful if - the WLD is within a calculated limit where each insertion, - deletion and replacement adds a weight to a common pool of - weights. This is the mathematically correct WLD. </p> - - <p> From a user's point of view the strict WLD is an - exclusive-OR of the arguments given, for example if allowed - insertions=2 and allowed replacements=2, the search fails if 2 - characters had been inserted and an additional operation would - be needed to match. Depending on the weights it may also fail if - 1 character was inserted and 1 character replaced and an - additional operation would be needed to match. The strict - algorithm may match less than expected from a first glance of - the specified arguments, but does not return false positives. </p> - - <p> If specified (<b>relaxed</b>), the search is also successful - if the combined pool for insertions and deletions is below a - doubled calculated limit and replacements are treated - differently. Additionally, swapped characters are counted as one - replacement. </p> - - <p> From a user's point of view the relaxed WLD is an - inclusive-OR of the arguments given, for example if allowed - insertions=2 and allowed replacements=2, the search succeeds if - 2 characters had been inserted and an additional replacement is - needed to match. The relaxed algorithm may return false - positives, but meets user expectation better. </p> - */ - const long LEV_RELAXED = 0x00010000; -}; - - -published struct SearchOptions { - //------------------------------------------------------------------------- - /** search type */ - SearchAlgorithms algorithmType; - - /** some flags - can be mixed - - @see <type>SearchFlags</type> - */ - long searchFlag; - - /** The text or pattern to be searched. */ - string searchString; - - /** The replacement text - (is for optional replacing - SearchOption is only the data container for it) */ - string replaceString; - - /** The locale for case insensitive search. */ - ::com::sun::star::lang::Locale Locale; - - /** This many characters can be different (as a replacement) between - the found word and the search pattern in a "Weighted Levenshtein - Distance" search. */ - long changedChars; - - /** This many characters can be missing in the found word in a - "Weighted Levenshtein Distance" search. */ - long deletedChars; - - /** This many characters can be additional in the found word in a - "Weighted Levenshtein Distance" search. */ - long insertedChars; - - /** Flags for the transliteration. Same meaning as the enum of - <type scope="com::sun::star::i18n">TransliterationModules</type> - */ - long transliterateFlags; -}; - - -published struct SearchResult { - //------------------------------------------------------------------------- - /** Number of subexpressions, - if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match. - The start and endOffset are always dependent on the search direction. - For example: - if you search "X" in the text "-X-" the offset are: - for forward: start = 1, end = 2 - for backward: start = 2, end = 1 - Forward, the startOffset is inclusive, the endOffset exclusive. - Backward, the startOffset is exclusive, the endOffset inclusive. - - For regular expressions it can be greater than 1. - If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string - if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression - startoffset[i] and endoffset[i] points to the matching substring of i th matching substring. - */ - long subRegExpressions; - sequence<long> startOffset; // inclusive - sequence<long> endOffset; // exclusive -}; - - - /** enables an object to search in its content. */ published interface XTextSearch : com::sun::star::uno::XInterface diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk deleted file mode 100644 index 87dc2d078037..000000000000 --- a/offapi/com/sun/star/util/makefile.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssutil -PACKAGE=com$/sun$/star$/util - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - MeasureUnit.idl\ - AliasProgrammaticPair.idl \ - CellProtection.idl\ - ChangesEvent.idl\ - ChangesSet.idl \ - CloseVetoException.idl\ - Color.idl\ - Date.idl\ - DateTime.idl\ - DateTimeRange.idl\ - DiskFullException.idl\ - Duration.idl\ - ElementChange.idl \ - Endianness.idl \ - FileIOException.idl\ - InvalidStateException.idl\ - Language.idl\ - NumberFormat.idl\ - NumberFormatProperties.idl\ - NumberFormats.idl\ - NumberFormatSettings.idl\ - NumberFormatsSupplier.idl\ - NumberFormatter.idl\ - ModeChangeEvent.idl\ - ReplaceDescriptor.idl\ - SearchDescriptor.idl\ - Sortable.idl\ - SortDescriptor.idl\ - SortDescriptor2.idl\ - SortField.idl\ - SortFieldType.idl\ - TextSearch.idl\ - Time.idl\ - TriState.idl\ - URL.idl\ - URLTransformer.idl\ - XArchiver.idl\ - XCancellable.idl\ - XCancelManager.idl\ - XChainable.idl\ - XChangesBatch.idl \ - XChangesListener.idl \ - XChangesNotifier.idl \ - XChangesSet.idl \ - XCloneable.idl\ - XCloseable.idl\ - XCloseBroadcaster.idl\ - XCloseListener.idl\ - XFlushable.idl\ - XFlushListener.idl\ - XImportable.idl\ - XIndent.idl\ - XLinkUpdate.idl\ - XLocalizedAliases.idl\ - XMergeable.idl\ - XModeChangeBroadcaster.idl\ - XModeChangeListener.idl\ - XModeChangeApproveListener.idl\ - XModeSelector.idl\ - XModifiable.idl\ - XModifiable2.idl\ - XModifyBroadcaster.idl\ - XBroadcaster.idl\ - XModifyListener.idl\ - XNumberFormatPreviewer.idl\ - XNumberFormats.idl\ - XNumberFormatsSupplier.idl\ - XNumberFormatter.idl\ - XNumberFormatTypes.idl\ - XPropertyReplace.idl\ - XProtectable.idl\ - XRefreshable.idl\ - XRefreshListener.idl\ - XReplaceable.idl\ - XReplaceDescriptor.idl\ - XSearchable.idl\ - XSearchDescriptor.idl\ - XSimpleErrorHandler.idl\ - XSortable.idl\ - XStringAbbreviation.idl\ - XStringWidth.idl\ - XStringMapping.idl\ - XStringEscape.idl\ - XTextSearch.idl\ - XUpdatable.idl\ - XURLTransformer.idl\ - XUniqueIDFactory.idl\ - VetoException.idl\ - DataEditorEventType.idl\ - DataEditorEvent.idl\ - XDataEditorListener.idl\ - XDataEditor.idl\ - MalformedNumberFormatException.idl\ - NotNumericException.idl\ - XAtomServer.idl\ - AtomClassRequest.idl\ - AtomDescription.idl\ - XStringSubstitution.idl\ - PathSettings.idl\ - PathSubstitution.idl\ - XTimeStamped.idl\ - OfficeInstallationDirectories.idl\ - XOfficeInstallationDirectories.idl\ - RevisionTag.idl\ - UriAbbreviation.idl\ - XJobManager.idl\ - JobManager.idl\ - XLockable.idl\ - NotLockedException.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/view/makefile.mk b/offapi/com/sun/star/view/makefile.mk deleted file mode 100644 index d07b67a6dd13..000000000000 --- a/offapi/com/sun/star/view/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssview -PACKAGE=com$/sun$/star$/view - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - DocumentZoomType.idl\ - OfficeDocumentView.idl\ - PaperFormat.idl\ - PaperOrientation.idl\ - PrintableState.idl\ - PrintableStateEvent.idl\ - PrinterDescriptor.idl\ - PrintOptions.idl\ - PrintSettings.idl\ - RenderDescriptor.idl\ - RenderOptions.idl\ - ViewSettings.idl\ - XControlAccess.idl\ - XFormLayerAccess.idl\ - XLineCursor.idl\ - XPrintable.idl\ - XPrintableBroadcaster.idl\ - XPrintableListener.idl\ - XPrintPreview.idl\ - XPrintSettingsSupplier.idl\ - XRenderable.idl\ - XScreenCursor.idl\ - XSelectionChangeListener.idl\ - XSelectionSupplier.idl\ - XViewCursor.idl\ - XViewSettingsSupplier.idl\ - PrintJobEvent.idl\ - XPrintJob.idl\ - XPrintJobBroadcaster.idl\ - XPrintJobListener.idl\ - XMultiSelectionSupplier.idl\ - SelectionType.idl\ - DuplexMode.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xforms/makefile.mk b/offapi/com/sun/star/xforms/makefile.mk deleted file mode 100644 index ff09cb53537e..000000000000 --- a/offapi/com/sun/star/xforms/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssxforms -PACKAGE=com$/sun$/star$/xforms - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XFormsSupplier.idl\ - XModel.idl \ - XDataTypeRepository.idl \ - XFormsEvent.idl \ - XFormsUIHelper1.idl \ - XSubmission.idl \ - Binding.idl \ - InvalidDataOnSubmitException.idl \ - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl new file mode 100644 index 000000000000..f015e6692da3 --- /dev/null +++ b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +//i20156 - new file for xmlsecurity module + +/** -- idl definition -- **/ + +#ifndef __com_sun_star_xml_crypto_sax_constofsecurityid_idl_ +#define __com_sun_star_xml_crypto_sax_constofsecurityid_idl_ + +module com { module sun { module star { module xml { module crypto { module sax { + +/** + * Represents the undefined security id + */ +constants ConstOfSecurityId +{ + const long UNDEFINEDSECURITYID = -1; +}; + +} ; } ; } ; } ; } ; } ; + +#endif + diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl new file mode 100644 index 000000000000..a6b725f473c9 --- /dev/null +++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl @@ -0,0 +1,64 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +//i20156 - new file for xmlsecurity module + +/** -- idl definition -- **/ + +#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_ +#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_ + +module com { module sun { module star { module xml { module crypto { module sax { + +/** + * Defines priority for the element mark's notification. + * <p> + * The PRI_MINIMUM priority is a value less than any practical + * priority value, it is used when compare between different + * priority values. + * <p> + * The PRI_AFTERMODIFY priority represents the notification will be + * sent after any internal modification has finished. + * <p> + * The PRI_BEFOREMODIFY proirity represents the notification will be + * sent before any internal modification happens. + * <p> + * So an element mark with PRI_BEFOREMODIFY will be handled first, + * and one with PRI_AFTERMODIFY will be handled at last. + */ +enum ElementMarkPriority +{ + MINIMUM = 1, + AFTERMODIFY, + BEFOREMODIFY +}; + +} ; } ; } ; } ; } ; } ; + + +#endif + diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl new file mode 100644 index 000000000000..0dc048a0555d --- /dev/null +++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl @@ -0,0 +1,53 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +//i20156 - new file for xmlsecurity module + +/** -- idl definition -- **/ + +#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_ +#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_ + +module com { module sun { module star { module xml { module crypto { module sax { + +/** + * Defines types of element mark. + * <p> + * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR + * type represents a element collector. + */ +enum ElementMarkType +{ + ELEMENTMARK = 1, + ELEMENTCOLLECTOR +}; + + +} ; } ; } ; } ; } ; } ; + +#endif + diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl new file mode 100644 index 000000000000..00d710a40777 --- /dev/null +++ b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl @@ -0,0 +1,64 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +//i20156 - new file for xmlsecurity module + +/** -- idl definition -- **/ + +#ifndef __com_sun_star_xml_crypto_sax_xelementstackitem_idl_ +#define __com_sun_star_xml_crypto_sax_xelementstackitem_idl_ + +#include <com/sun/star/xml/sax/XDocumentHandler.idl> + +module com { module sun { module star { module xml { module crypto { module sax { + +/** + * A struct to keep a startElement/endElement SAX event. + */ +struct ElementStackItem +{ + /** + * whether it is a startElement event + */ + boolean isStartElementEvent; + + /** + * the name of the element + */ + string elementName; + + /** + * attribute list for a startElement event + */ + com::sun::star::xml::sax::XAttributeList xAttributes; +}; + +} ; } ; } ; } ; } ; } ; + + +#endif + diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl index 69b808991bc1..a07257d8ddfa 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl @@ -35,31 +35,11 @@ #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/uno/Exception.idl> #include <com/sun/star/xml/sax/XDocumentHandler.idl> +#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl> module com { module sun { module star { module xml { module crypto { module sax { /** - * A struct to keep a startElement/endElement SAX event. - */ -struct ElementStackItem -{ - /** - * whether it is a startElement event - */ - boolean isStartElementEvent; - - /** - * the name of the element - */ - string elementName; - - /** - * attribute list for a startElement event - */ - com::sun::star::xml::sax::XAttributeList xAttributes; -}; - -/** * Manipulate the "key SAX events" in a SAX event stream. * * @see XSecurityController diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl index 65bfabc22920..70ea6a8e9554 100644 --- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl +++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl @@ -35,53 +35,13 @@ #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/uno/Exception.idl> #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl> +#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl> +#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl> +#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl> module com { module sun { module star { module xml { module crypto { module sax { /** - * Represents the undefined security id - */ -constants ConstOfSecurityId -{ - const long UNDEFINEDSECURITYID = -1; -}; - -/** - * Defines priority for the element mark's notification. - * <p> - * The PRI_MINIMUM priority is a value less than any practical - * priority value, it is used when compare between different - * priority values. - * <p> - * The PRI_AFTERMODIFY priority represents the notification will be - * sent after any internal modification has finished. - * <p> - * The PRI_BEFOREMODIFY priority represents the notification will be - * sent before any internal modification happens. - * <p> - * So an element mark with PRI_BEFOREMODIFY will be handled first, - * and one with PRI_AFTERMODIFY will be handled at last. - */ -enum ElementMarkPriority -{ - MINIMUM = 1, - AFTERMODIFY, - BEFOREMODIFY -}; - -/** - * Defines types of element mark. - * <p> - * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR - * type represents a element collector. - */ -enum ElementMarkType -{ - ELEMENTMARK = 1, - ELEMENTCOLLECTOR -}; - -/** * Interface of Security SAX Event Keeper. * <p> * This interface is an extension of the XSAXEventKeeper interface, diff --git a/offapi/com/sun/star/xml/crypto/sax/makefile.mk b/offapi/com/sun/star/xml/crypto/sax/makefile.mk deleted file mode 100644 index a95aef560bea..000000000000 --- a/offapi/com/sun/star/xml/crypto/sax/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -#i20156 - new file for xmlsecurity module - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=xsec-sax -PACKAGE=com$/sun$/star$/xml$/crypto$/sax - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XSecurityController.idl \ - XElementStackKeeper.idl \ - XSAXEventKeeper.idl \ - XSecuritySAXEventKeeper.idl \ - XSAXEventKeeperStatusChangeBroadcaster.idl \ - XSAXEventKeeperStatusChangeListener.idl \ - XKeyCollector.idl \ - XReferenceCollector.idl \ - XBlockerMonitor.idl \ - XMissionTaker.idl \ - XEncryptionResultBroadcaster.idl \ - XEncryptionResultListener.idl \ - XDecryptionResultBroadcaster.idl \ - XDecryptionResultListener.idl \ - XSignatureCreationResultBroadcaster.idl \ - XSignatureCreationResultListener.idl \ - XSignatureVerifyResultBroadcaster.idl \ - XSignatureVerifyResultListener.idl \ - XReferenceResolvedBroadcaster.idl \ - XReferenceResolvedListener.idl \ - SignatureCreator.idl \ - SignatureVerifier.idl \ - Decryptor.idl \ - Encryptor.idl \ - SAXEventKeeper.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl index ad314f4b60ff..509b54e5bc3b 100644 --- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl +++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl @@ -32,27 +32,12 @@ #include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/xml/sax/SAXException.idl> +#include <com/sun/star/xml/csax/XMLAttribute.idl> module com { module sun { module star { module xml { module csax { /** - * A struct to keep information of an element's attribute. - */ -struct XMLAttribute -{ - /** - * the attribute name - */ - string sName; - - /** - * the attribute value - */ - string sValue; -}; - -/** * A compressed XDocumentHandler interface. * <p> * All methods in this interface have the same function with methods diff --git a/offapi/com/sun/star/xml/csax/XMLAttribute.idl b/offapi/com/sun/star/xml/csax/XMLAttribute.idl new file mode 100644 index 000000000000..a302a30c4f19 --- /dev/null +++ b/offapi/com/sun/star/xml/csax/XMLAttribute.idl @@ -0,0 +1,53 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +//i20156 - new file for xmlsecurity module + +#ifndef __com_sun_star_xml_csax_XMLAttribute_idl__ +#define __com_sun_star_xml_csax_XMLAttribute_idl__ + +module com { module sun { module star { module xml { module csax { + +/** + * A struct to keep information of an element's attribute. + */ +struct XMLAttribute +{ + /** + * the attribute name + */ + string sName; + + /** + * the attribute value + */ + string sValue; +}; + +} ; } ; } ; } ; } ; + +#endif diff --git a/offapi/com/sun/star/xml/csax/makefile.mk b/offapi/com/sun/star/xml/csax/makefile.mk deleted file mode 100644 index 8f41b54264b8..000000000000 --- a/offapi/com/sun/star/xml/csax/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -#i20156 - new file for xmlsecurity module - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=xsec-csax -PACKAGE=com$/sun$/star$/xml$/csax - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XCompressedDocumentHandler.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/dom/events/makefile.mk b/offapi/com/sun/star/xml/dom/events/makefile.mk deleted file mode 100644 index b03cf793ca32..000000000000 --- a/offapi/com/sun/star/xml/dom/events/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdomevents -PACKAGE=com$/sun$/star$/xml$/dom$/events - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AttrChangeType.idl \ - EventException.idl \ - EventType.idl \ - PhaseType.idl \ - XDocumentEvent.idl \ - XEvent.idl \ - XEventListener.idl \ - XEventTarget.idl \ - XMouseEvent.idl \ - XMutationEvent.idl \ - XUIEvent.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - - - - - diff --git a/offapi/com/sun/star/xml/dom/makefile.mk b/offapi/com/sun/star/xml/dom/makefile.mk deleted file mode 100644 index 3468e2685908..000000000000 --- a/offapi/com/sun/star/xml/dom/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdom -PACKAGE=com$/sun$/star$/xml$/dom - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - DOMException.idl \ - DOMExceptionType.idl \ - NodeType.idl \ - XNode.idl \ - XAttr.idl \ - XCharacterData.idl \ - XText.idl \ - XCDATASection.idl \ - XComment.idl \ - XDOMImplementation.idl \ - XDocument.idl \ - XDocumentBuilder.idl \ - XDocumentFragment.idl \ - XDocumentType.idl \ - XElement.idl \ - XEntity.idl \ - XEntityReference.idl \ - XNamedNodeMap.idl \ - XNodeList.idl \ - XNotation.idl \ - XProcessingInstruction.idl \ - SAXDocumentBuilder.idl \ - XSAXDocumentBuilder.idl \ - SAXDocumentBuilderState.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - - - - - diff --git a/offapi/com/sun/star/xml/dom/views/makefile.mk b/offapi/com/sun/star/xml/dom/views/makefile.mk deleted file mode 100644 index 77f45f0045cf..000000000000 --- a/offapi/com/sun/star/xml/dom/views/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssdomviews -PACKAGE=com$/sun$/star$/xml$/dom$/views - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XAbstractView.idl \ - XDocumentView.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - - - - - diff --git a/offapi/com/sun/star/xml/input/makefile.mk b/offapi/com/sun/star/xml/input/makefile.mk deleted file mode 100644 index d0f7b0aa2f5b..000000000000 --- a/offapi/com/sun/star/xml/input/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET = cssxmlinput -PACKAGE = com$/sun$/star$/xml$/input - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------ - -IDLFILES = \ - XRoot.idl \ - XElement.idl \ - XAttributes.idl \ - XNamespaceMapping.idl \ - SaxDocumentHandler.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/makefile.mk b/offapi/com/sun/star/xml/makefile.mk deleted file mode 100644 index 4aa46f6c46e7..000000000000 --- a/offapi/com/sun/star/xml/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssxml -PACKAGE=com$/sun$/star$/xml - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - AttributeContainer.idl \ - AttributeData.idl \ - Attribute.idl \ - ExportFilter.idl \ - FastAttribute.idl \ - ImportFilter.idl \ - NamespaceContainer.idl \ - ParaUserDefinedAttributesSupplier.idl \ - TextUserDefinedAttributesSupplier.idl \ - UserDefinedAttributesSupplier.idl \ - UserDefinedAttributeSupplier.idl \ - XExportFilter.idl \ - XImportFilter.idl \ - XMLExportFilter.idl \ - XMLImportFilter.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/sax/makefile.mk b/offapi/com/sun/star/xml/sax/makefile.mk deleted file mode 100644 index 812d92cc9450..000000000000 --- a/offapi/com/sun/star/xml/sax/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=csssax -PACKAGE=com$/sun$/star$/xml$/sax - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - InputSource.idl\ - SAXException.idl\ - SAXInvalidCharacterException.idl\ - SAXParseException.idl\ - XAttributeList.idl\ - XDocumentHandler.idl\ - XDTDHandler.idl\ - XEntityResolver.idl\ - XErrorHandler.idl\ - XExtendedDocumentHandler.idl\ - XLocator.idl\ - XParser.idl\ - XSAXSerializable.idl\ - XFastParser.idl\ - XFastDocumentHandler.idl\ - XFastContextHandler.idl\ - XFastSAXSerializable.idl\ - XFastSerializer.idl\ - XFastShapeContextHandler.idl\ - XFastTokenHandler.idl\ - XFastAttributeList.idl\ - FastToken.idl \ - FastShapeContextHandler.idl \ - FastTokenHandler.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/wrapper/makefile.mk b/offapi/com/sun/star/xml/wrapper/makefile.mk deleted file mode 100644 index e3690cd38443..000000000000 --- a/offapi/com/sun/star/xml/wrapper/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -#i20156 - new file for xmlsecurity module - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=xsec-wrapper -PACKAGE=com$/sun$/star$/xml$/wrapper - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XMLElementWrapper.idl \ - XMLDocumentWrapper.idl \ - XXMLElementWrapper.idl \ - XXMLDocumentWrapper.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/com/sun/star/xml/xpath/makefile.mk b/offapi/com/sun/star/xml/xpath/makefile.mk deleted file mode 100644 index 60b70c9d70d3..000000000000 --- a/offapi/com/sun/star/xml/xpath/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssxpath -PACKAGE=com$/sun$/star$/xml$/xpath - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XPathException.idl \ - XPathObjectType.idl \ - XXPathObject.idl \ - XXPathAPI.idl \ - XXPathExtension.idl \ - Libxml2ExtensionHandle.idl \ - XPathExtension.idl \ - XPathAPI.idl \ - Libxml2ExtensionHandle.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - - - - - - diff --git a/offapi/com/sun/star/xsd/makefile.mk b/offapi/com/sun/star/xsd/makefile.mk deleted file mode 100644 index 56f791bd1038..000000000000 --- a/offapi/com/sun/star/xsd/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=offapi - -TARGET=cssxsd -PACKAGE=com$/sun$/star$/xsd - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - WhiteSpaceTreatment.idl\ - Boolean.idl\ - DataTypeClass.idl\ - Date.idl\ - DateTime.idl\ - Day.idl\ - Decimal.idl\ - Month.idl\ - String.idl\ - Time.idl\ - XDataType.idl\ - Year.idl\ - - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst index c3a5f06d43bb..6a8001b4385e 100644 --- a/offapi/prj/build.lst +++ b/offapi/prj/build.lst @@ -1,109 +1,2 @@ -oa offapi : udkapi idlc solenv NULL -oa offapi usr1 - all oa_mkout NULL -oa offapi\com\sun\star\script nmake - all oa_script oa_embed NULL -oa offapi\com\sun\star\script\browse nmake - all oa_sfbrowse NULL -oa offapi\com\sun\star\script\provider nmake - all oa_sfprovider NULL -oa offapi\com\sun\star\script\vba nmake - all oa_script_vba NULL -oa offapi\com\sun\star\auth nmake - all oa_auth NULL -oa offapi\com\sun\star\accessibility nmake - all oa_accessibility oa_awt NULL -oa offapi\com\sun\star\awt nmake - all oa_awt NULL -oa offapi\com\sun\star\awt\tree nmake - all oa_awttree NULL -oa offapi\com\sun\star\awt\grid nmake - all oa_awtgrid NULL -oa offapi\com\sun\star\awt\tab nmake - all oa_awttab NULL -oa offapi\com\sun\star\chart nmake - all oa_chart NULL -oa offapi\com\sun\star\chart2 nmake - all oa_chart2 NULL -oa offapi\com\sun\star\chart2\data nmake - all oa_chart2_data NULL -oa offapi\com\sun\star\configuration nmake - all oa_config NULL -oa offapi\com\sun\star\configuration\bootstrap nmake - all oa_configbootstrap NULL -oa offapi\com\sun\star\configuration\backend nmake - all oa_configbackend NULL -oa offapi\com\sun\star\configuration\backend\xml nmake - all oa_configbackend_xml NULL -oa offapi\com\sun\star\datatransfer nmake - all oa_datatransfer NULL -oa offapi\com\sun\star\datatransfer\clipboard nmake - all oa_datatrans_clip NULL -oa offapi\com\sun\star\datatransfer\dnd nmake - all oa_datatrans_dnd oa_awt NULL -oa offapi\com\sun\star\deployment nmake - all oa_deployment oa_ucb oa_xml_input NULL -oa offapi\com\sun\star\deployment\test nmake - all oa_deploymenttest oa_ucb NULL -oa offapi\com\sun\star\deployment\ui nmake - all oa_deployment_ui oa_awt oa_ui_dialogs NULL -oa offapi\com\sun\star\document nmake - all oa_docu oa_embed NULL -oa offapi\com\sun\star\drawing nmake - all oa_draw NULL -oa offapi\com\sun\star\drawing\framework nmake - all oa_draw_framework NULL -oa offapi\com\sun\star\embed nmake - all oa_embed NULL -oa offapi\com\sun\star\form nmake - all oa_form oa_inspection NULL -oa offapi\com\sun\star\form\component nmake - all oa_fcomp oa_form oa_form_submission NULL -oa offapi\com\sun\star\form\inspection nmake - all oa_finsp oa_fcomp oa_inspection NULL -oa offapi\com\sun\star\form\binding nmake - all oa_form_binding oa_fcomp NULL -oa offapi\com\sun\star\form\validation nmake - all oa_form_validation oa_form_binding NULL -oa offapi\com\sun\star\form\submission nmake - all oa_form_submission NULL -oa offapi\com\sun\star\form\control nmake - all oa_fcontr oa_form_submission NULL -oa offapi\com\sun\star\form\runtime nmake - all oa_fruntime oa_fcomp NULL -oa offapi\com\sun\star\xforms nmake - all oa_xforms oa_xsd oa_form_submission NULL -oa offapi\com\sun\star\formula nmake - all oa_formula NULL -oa offapi\com\sun\star\frame\status nmake - all oa_frame_status NULL -oa offapi\com\sun\star\frame nmake - all oa_frame NULL -oa offapi\com\sun\star\gallery nmake - all oa_gallery NULL -oa offapi\com\sun\star\graphic nmake - all oa_graphic NULL -oa offapi\com\sun\star\i18n nmake - all oa_i18n NULL -oa offapi\com\sun\star\installation nmake - all oa_inst NULL -oa offapi\com\sun\star\ldap nmake - all oa_ldap NULL -oa offapi\com\sun\star\linguistic2 nmake - all oa_ling2 NULL -oa offapi\com\sun\star\logging nmake - all oa_logging NULL -oa offapi\com\sun\star\mail nmake - all oa_mail NULL -oa offapi\com\sun\star\media nmake - all oa_media NULL -oa offapi\com\sun\star\mozilla nmake - all oa_mozilla NULL -oa offapi\com\sun\star\oooimprovement nmake - all oa_oooimprovement NULL -oa offapi\com\sun\star\packages nmake - all oa_packages NULL -oa offapi\com\sun\star\packages\manifest nmake - all oa_manifest NULL -oa offapi\com\sun\star\packages\zip nmake - all oa_zippackage NULL -oa offapi\com\sun\star\plugin nmake - all oa_plug NULL -oa offapi\com\sun\star\presentation nmake - all oa_pres NULL -oa offapi\com\sun\star\animations nmake - all oa_animations oa_pres NULL -oa offapi\com\sun\star\presentation\textfield nmake - all oa_prestextfield NULL -oa offapi\com\sun\star\resource nmake - all oa_resrc NULL -oa offapi\com\sun\star\xml\sax nmake - all oa_sax NULL -oa offapi\com\sun\star\xml nmake - all oa_xml NULL -oa offapi\com\sun\star\xml\input nmake - all oa_xml_input oa_sax NULL -oa offapi\com\sun\star\xml\dom nmake - all oa_xml_dom oa_sax NULL -oa offapi\com\sun\star\xml\xpath nmake - all oa_xml_xpath oa_xml_dom NULL -oa offapi\com\sun\star\xml\dom\views nmake - all oa_xml_views NULL -oa offapi\com\sun\star\xml\dom\events nmake - all oa_xml_events oa_xml_views oa_xml_dom NULL -oa offapi\com\sun\star\scanner nmake - all oa_scan NULL -oa offapi\com\sun\star\setup nmake - all oa_setup NULL -oa offapi\com\sun\star\sheet nmake - all oa_sheet NULL -oa offapi\com\sun\star\smarttags nmake - all oa_smarttags NULL -oa offapi\com\sun\star\style nmake - all oa_style NULL -oa offapi\com\sun\star\svg nmake - all oa_svg NULL -oa offapi\com\sun\star\sync nmake - all oa_sync NULL -oa offapi\com\sun\star\sync2 nmake - all oa_sync2 NULL -oa offapi\com\sun\star\system nmake - all oa_system NULL -oa offapi\com\sun\star\table nmake - all oa_table oa_form_binding NULL -oa offapi\com\sun\star\task nmake - all oa_task NULL -oa offapi\com\sun\star\text nmake - all oa_text NULL -oa offapi\com\sun\star\text\textfield nmake - all oa_textfield NULL -oa offapi\com\sun\star\text\textfield\docinfo nmake - all oa_docinfo NULL -oa offapi\com\sun\star\text\fieldmaster nmake - all oa_fieldmaster NULL -oa offapi\com\sun\star\ucb nmake - all oa_ucb NULL -oa offapi\com\sun\star\util nmake - all oa_putil NULL -oa offapi\com\sun\star\view nmake - all oa_view NULL -oa offapi\com\sun\star\report nmake - all oa_report NULL -oa offapi\com\sun\star\report\inspection nmake - all oa_reportins oa_report NULL -oa offapi\com\sun\star\report\meta nmake - all oa_reportmeta oa_report NULL -oa offapi\com\sun\star\sdbcx nmake - all oa_sdbcx NULL -oa offapi\com\sun\star\sdbc nmake - all oa_sdbc NULL -oa offapi\com\sun\star\sdb nmake - all oa_sdb NULL -oa offapi\com\sun\star\sdb\tools nmake - all oa_sdbtools NULL -oa offapi\com\sun\star\sdb\application nmake - all oa_sdbapp NULL -oa offapi\com\sun\star\image nmake - all oa_image NULL -oa offapi\com\sun\star\xsd nmake - all oa_xsd NULL -oa offapi\com\sun\star\inspection nmake - all oa_inspection NULL -oa offapi\com\sun\star\ui nmake - all oa_ui NULL -oa offapi\com\sun\star\ui\dialogs nmake - all oa_ui_dialogs NULL -oa offapi\com\sun\star nmake - all oa_starme NULL -oa offapi\com\sun\star\security nmake - all oa_security NULL -oa offapi\com\sun\star\xml\crypto\sax nmake - all oa_crypto_sax oa_wrapper oa_csax NULL -oa offapi\com\sun\star\xml\crypto nmake - all oa_crypto oa_wrapper oa_security NULL -oa offapi\com\sun\star\xml\csax nmake - all oa_csax oa_sax NULL -oa offapi\com\sun\star\xml\wrapper nmake - all oa_wrapper oa_sax NULL -oa offapi\com\sun\star\geometry nmake - all oa_geometry NULL -oa offapi\com\sun\star\rendering nmake - all oa_rendering oa_geometry NULL -oa offapi\com\sun\star\rdf nmake - all oa_rdf oa_datatransfer oa_text NULL -oa offapi\com\sun\star\office nmake - all oa_office oa_text NULL -oa offapi\util nmake - all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_awttab oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme oa_script_vba NULL +oa offapi : udkapi DESKTOP:idlc solenv NULL +oa offapi/prj nmake - all oa_mkout NULL diff --git a/offapi/com/sun/star/configuration/bootstrap/makefile.mk b/offapi/prj/makefile.mk index 8c234ead56ae..88cd9dfe08b8 100644 --- a/offapi/com/sun/star/configuration/bootstrap/makefile.mk +++ b/offapi/prj/makefile.mk @@ -25,17 +25,16 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. -PRJNAME=offapi +PRJ=.. +TARGET=prj -TARGET = csscbootstrap -PACKAGE = com$/sun$/star$/configuration$/bootstrap +.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -IDLFILES = \ - BootstrapContext.idl \ - - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk index d377ecafc589..4138067fde20 100644 --- a/offapi/util/makefile.mk +++ b/offapi/util/makefile.mk @@ -151,7 +151,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt -REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST) +REGVIEWTOOL=$(SOLARBINDIR)$/regview # --- Targets ------------------------------------------------------ diff --git a/offuh/prj/build.lst b/offuh/prj/build.lst deleted file mode 100644 index e98f3565b60c..000000000000 --- a/offuh/prj/build.lst +++ /dev/null @@ -1,4 +0,0 @@ -ou offuh :: offapi oovbaapi codemaker NULL -ou offuh usr1 - all ou_mkout NULL -ou offuh\prj get - all ou_prj NULL -ou offuh\source nmake - all ou_source NULL diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst deleted file mode 100644 index 8642b07880a3..000000000000 --- a/offuh/prj/d.lst +++ /dev/null @@ -1,423 +0,0 @@ -mkdir: %_DEST%\inc\offuh -mkdir: %_DEST%\inc\offuh\com -mkdir: %_DEST%\inc\offuh\com\sun -mkdir: %_DEST%\inc\offuh\com\sun\star - -mkdir: %_DEST%\inc\offuh\com\sun\star\auth -mkdir: %_DEST%\inc\offuh\com\sun\star\accessibility -mkdir: %_DEST%\inc\offuh\com\sun\star\awt -mkdir: %_DEST%\inc\offuh\com\sun\star\awt\tree -mkdir: %_DEST%\inc\offuh\com\sun\star\awt\grid -mkdir: %_DEST%\inc\offuh\com\sun\star\awt\tab -mkdir: %_DEST%\inc\offuh\com\sun\star\beans -mkdir: %_DEST%\inc\offuh\com\sun\star\bridge -mkdir: %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation -mkdir: %_DEST%\inc\offuh\com\sun\star\chart -mkdir: %_DEST%\inc\offuh\com\sun\star\chart2 -mkdir: %_DEST%\inc\offuh\com\sun\star\chart2\data -mkdir: %_DEST%\inc\offuh\com\sun\star\container -mkdir: %_DEST%\inc\offuh\com\sun\star\configuration -mkdir: %_DEST%\inc\offuh\com\sun\star\configuration\backend -mkdir: %_DEST%\inc\offuh\com\sun\star\connection -mkdir: %_DEST%\inc\offuh\com\sun\star\data -mkdir: %_DEST%\inc\offuh\com\sun\star\deployment -mkdir: %_DEST%\inc\offuh\com\sun\star\deployment\ui -mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer -mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard -mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd -mkdir: %_DEST%\inc\offuh\com\sun\star\daemons -mkdir: %_DEST%\inc\offuh\com\sun\star\document -mkdir: %_DEST%\inc\offuh\com\sun\star\drawing -mkdir: %_DEST%\inc\offuh\com\sun\star\drawing\framework -mkdir: %_DEST%\inc\offuh\com\sun\star\geometry -mkdir: %_DEST%\inc\offuh\com\sun\star\rendering -mkdir: %_DEST%\inc\offuh\com\sun\star\embed -mkdir: %_DEST%\inc\offuh\com\sun\star\form -mkdir: %_DEST%\inc\offuh\com\sun\star\xforms -mkdir: %_DEST%\inc\offuh\com\sun\star\form\binding -mkdir: %_DEST%\inc\offuh\com\sun\star\form\validation -mkdir: %_DEST%\inc\offuh\com\sun\star\form\submission -mkdir: %_DEST%\inc\offuh\com\sun\star\form\runtime -mkdir: %_DEST%\inc\offuh\com\sun\star\form\inspection -mkdir: %_DEST%\inc\offuh\com\sun\star\formula -mkdir: %_DEST%\inc\offuh\com\sun\star\frame -mkdir: %_DEST%\inc\offuh\com\sun\star\frame\status -mkdir: %_DEST%\inc\offuh\com\sun\star\gallery -mkdir: %_DEST%\inc\offuh\com\sun\star\graphic -mkdir: %_DEST%\inc\offuh\com\sun\star\i18n -mkdir: %_DEST%\inc\offuh\com\sun\star\installation -mkdir: %_DEST%\inc\offuh\com\sun\star\io -mkdir: %_DEST%\inc\offuh\com\sun\star\java -mkdir: %_DEST%\inc\offuh\com\sun\star\lang -mkdir: %_DEST%\inc\offuh\com\sun\star\linguistic2 -mkdir: %_DEST%\inc\offuh\com\sun\star\logging -mkdir: %_DEST%\inc\offuh\com\sun\star\oooimprovement -mkdir: %_DEST%\inc\offuh\com\sun\star\office -mkdir: %_DEST%\inc\offuh\com\sun\star\mail -mkdir: %_DEST%\inc\offuh\com\sun\star\media -mkdir: %_DEST%\inc\offuh\com\sun\star\packages -mkdir: %_DEST%\inc\offuh\com\sun\star\packages\manifest -mkdir: %_DEST%\inc\offuh\com\sun\star\packages\zip -mkdir: %_DEST%\inc\offuh\com\sun\star\presentation -mkdir: %_DEST%\inc\offuh\com\sun\star\animations -mkdir: %_DEST%\inc\offuh\com\sun\star\reflection -mkdir: %_DEST%\inc\offuh\com\sun\star\registry -mkdir: %_DEST%\inc\offuh\com\sun\star\report -mkdir: %_DEST%\inc\offuh\com\sun\star\report\inspection -mkdir: %_DEST%\inc\offuh\com\sun\star\report\meta -mkdir: %_DEST%\inc\offuh\com\sun\star\resource -mkdir: %_DEST%\inc\offuh\com\sun\star\sdb -mkdir: %_DEST%\inc\offuh\com\sun\star\sdb\tools -mkdir: %_DEST%\inc\offuh\com\sun\star\sdb\application -mkdir: %_DEST%\inc\offuh\com\sun\star\sdbc -mkdir: %_DEST%\inc\offuh\com\sun\star\sdbcx -mkdir: %_DEST%\inc\offuh\com\sun\star\scanner -mkdir: %_DEST%\inc\offuh\com\sun\star\script -mkdir: %_DEST%\inc\offuh\com\sun\star\script\vba -mkdir: %_DEST%\inc\offuh\com\sun\star\sheet -mkdir: %_DEST%\inc\offuh\com\sun\star\smarttags -mkdir: %_DEST%\inc\offuh\com\sun\star\style -mkdir: %_DEST%\inc\offuh\com\sun\star\svg -mkdir: %_DEST%\inc\offuh\com\sun\star\sync2 -mkdir: %_DEST%\inc\offuh\com\sun\star\system -mkdir: %_DEST%\inc\offuh\com\sun\star\table -mkdir: %_DEST%\inc\offuh\com\sun\star\telephony -mkdir: %_DEST%\inc\offuh\com\sun\star\telephony\DIALER -mkdir: %_DEST%\inc\offuh\com\sun\star\text -mkdir: %_DEST%\inc\offuh\com\sun\star\xsd -mkdir: %_DEST%\inc\offuh\com\sun\star\inspection -mkdir: %_DEST%\inc\offuh\com\sun\star\ui -mkdir: %_DEST%\inc\offuh\com\sun\star\ui\dialogs -mkdir: %_DEST%\inc\offuh\com\sun\star\uno -mkdir: %_DEST%\inc\offuh\com\sun\star\uri -mkdir: %_DEST%\inc\offuh\com\sun\star\util -mkdir: %_DEST%\inc\offuh\com\sun\star\util\logging -mkdir: %_DEST%\inc\offuh\com\sun\star\view -mkdir: %_DEST%\inc\offuh\com\sun\star\linguistic2 -mkdir: %_DEST%\inc\offuh\com\sun\star\xml -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\input -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\sax -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\xpath -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom\events -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom\views -mkdir: %_DEST%\inc\offuh\com\sun\star\loader -mkdir: %_DEST%\inc\offuh\com\sun\star\task -mkdir: %_DEST%\inc\offuh\com\sun\star\ucb -mkdir: %_DEST%\inc\offuh\com\sun\star\plugin -mkdir: %_DEST%\inc\offuh\com\sun\star\setup -mkdir: %_DEST%\inc\offuh\com\sun\star\portal -mkdir: %_DEST%\inc\offuh\com\sun\star\portal\client -mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons -mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind -mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed -mkdir: %_DEST%\inc\offuh\com\sun\star\portal\system -mkdir: %_DEST%\inc\offuh\com\sun\star\mozilla -mkdir: %_DEST%\inc\offuh\com\sun\star\ldap - -mkdir: %_DEST%\inc\offuh\drafts\com -mkdir: %_DEST%\inc\offuh\drafts\com\sun -mkdir: %_DEST%\inc\offuh\drafts\com\sun\star - -mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\i18n -mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\ui -mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\form -mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\script -mkdir: %_DEST%\inc\offuh\com\sun\star\script\browse -mkdir: %_DEST%\inc\offuh\com\sun\star\script\provider -#i20156 - add xmlsecurity module related -mkdir: %_DEST%\inc\offuh\com\sun\star\security -mkdir: %_DEST%\inc\offuh\com\sun\star\xml -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\crypto -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\csax -mkdir: %_DEST%\inc\offuh\com\sun\star\xml\wrapper -#i20156 - end -mkdir: %_DEST%\inc\offuh\com\sun\star\rdf - -mkdir: %_DEST%\inc\offuh\ooo -mkdir: %_DEST%\inc\offuh\ooo\vba -mkdir: %_DEST%\inc\offuh\ooo\vba\access -mkdir: %_DEST%\inc\offuh\ooo\vba\adodb -mkdir: %_DEST%\inc\offuh\ooo\vba\dao -mkdir: %_DEST%\inc\offuh\ooo\vba\excel -mkdir: %_DEST%\inc\offuh\ooo\vba\msforms -mkdir: %_DEST%\inc\offuh\ooo\vba\office -mkdir: %_DEST%\inc\offuh\ooo\vba\powerpoint -mkdir: %_DEST%\inc\offuh\ooo\vba\stdole -mkdir: %_DEST%\inc\offuh\ooo\vba\word -mkdir: %_DEST%\inc\offuh\msforms - - - -..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc\offuh\com\sun\star\auth\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc\offuh\com\sun\star\auth\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc\offuh\com\sun\star\accessibility\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hdl %_DEST%\inc\offuh\com\sun\star\accessibility\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\awt\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\tree\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\tree\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\grid\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\grid\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\tab\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\tab\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc\offuh\com\sun\star\beans\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc\offuh\com\sun\star\beans\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc\offuh\com\sun\star\bridge\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hpp %_DEST%\inc\offuh\com\sun\star\bridge\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\chart\*.hdl %_DEST%\inc\offuh\com\sun\star\chart\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\chart\*.hpp %_DEST%\inc\offuh\com\sun\star\chart\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hpp %_DEST%\inc\offuh\com\sun\star\chart2\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hdl %_DEST%\inc\offuh\com\sun\star\chart2\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hpp %_DEST%\inc\offuh\com\sun\star\chart2\data\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hdl %_DEST%\inc\offuh\com\sun\star\chart2\data\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hdl %_DEST%\inc\offuh\com\sun\star\configuration\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hpp %_DEST%\inc\offuh\com\sun\star\configuration\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hdl %_DEST%\inc\offuh\com\sun\star\configuration\backend\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hpp %_DEST%\inc\offuh\com\sun\star\configuration\backend\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\container\*.hdl %_DEST%\inc\offuh\com\sun\star\container\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\container\*.hpp %_DEST%\inc\offuh\com\sun\star\container\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\connection\*.hdl %_DEST%\inc\offuh\com\sun\star\connection\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\connection\*.hpp %_DEST%\inc\offuh\com\sun\star\connection\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\data\*.hdl %_DEST%\inc\offuh\com\sun\star\data\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\data\*.hpp %_DEST%\inc\offuh\com\sun\star\data\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hpp %_DEST%\inc\offuh\com\sun\star\deployment\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hdl %_DEST%\inc\offuh\com\sun\star\deployment\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hpp %_DEST%\inc\offuh\com\sun\star\deployment\ui\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hdl %_DEST%\inc\offuh\com\sun\star\deployment\ui\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hdl %_DEST%\inc\offuh\com\sun\star\daemons\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hpp %_DEST%\inc\offuh\com\sun\star\daemons\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\document\*.hdl %_DEST%\inc\offuh\com\sun\star\document\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\document\*.hpp %_DEST%\inc\offuh\com\sun\star\document\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hdl %_DEST%\inc\offuh\com\sun\star\drawing\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hpp %_DEST%\inc\offuh\com\sun\star\drawing\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hdl %_DEST%\inc\offuh\com\sun\star\drawing\framework\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hpp %_DEST%\inc\offuh\com\sun\star\drawing\framework\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hdl %_DEST%\inc\offuh\com\sun\star\geometry\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hpp %_DEST%\inc\offuh\com\sun\star\geometry\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hdl %_DEST%\inc\offuh\com\sun\star\rendering\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hpp %_DEST%\inc\offuh\com\sun\star\rendering\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\embed\*.hdl %_DEST%\inc\offuh\com\sun\star\embed\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\embed\*.hpp %_DEST%\inc\offuh\com\sun\star\embed\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\*.hdl %_DEST%\inc\offuh\com\sun\star\form\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\*.hpp %_DEST%\inc\offuh\com\sun\star\form\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hdl %_DEST%\inc\offuh\com\sun\star\xforms\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hpp %_DEST%\inc\offuh\com\sun\star\xforms\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hdl %_DEST%\inc\offuh\com\sun\star\form\binding\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hpp %_DEST%\inc\offuh\com\sun\star\form\binding\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hdl %_DEST%\inc\offuh\com\sun\star\form\validation\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hpp %_DEST%\inc\offuh\com\sun\star\form\validation\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hdl %_DEST%\inc\offuh\com\sun\star\form\submission\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hpp %_DEST%\inc\offuh\com\sun\star\form\submission\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hdl %_DEST%\inc\offuh\com\sun\star\form\runtime\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hpp %_DEST%\inc\offuh\com\sun\star\form\runtime\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\form\inspection\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\form\inspection\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\formula\*.hdl %_DEST%\inc\offuh\com\sun\star\formula\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\formula\*.hpp %_DEST%\inc\offuh\com\sun\star\formula\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\frame\*.hdl %_DEST%\inc\offuh\com\sun\star\frame\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\frame\*.hpp %_DEST%\inc\offuh\com\sun\star\frame\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hdl %_DEST%\inc\offuh\com\sun\star\frame\status\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hpp %_DEST%\inc\offuh\com\sun\star\frame\status\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hdl %_DEST%\inc\offuh\com\sun\star\gallery\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hpp %_DEST%\inc\offuh\com\sun\star\gallery\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hdl %_DEST%\inc\offuh\com\sun\star\graphic\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hpp %_DEST%\inc\offuh\com\sun\star\graphic\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hdl %_DEST%\inc\offuh\com\sun\star\i18n\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hpp %_DEST%\inc\offuh\com\sun\star\i18n\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\installation\*.hdl %_DEST%\inc\offuh\com\sun\star\installation\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\installation\*.hpp %_DEST%\inc\offuh\com\sun\star\installation\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\io\*.hdl %_DEST%\inc\offuh\com\sun\star\io\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\io\*.hpp %_DEST%\inc\offuh\com\sun\star\io\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\java\*.hdl %_DEST%\inc\offuh\com\sun\star\java\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\java\*.hpp %_DEST%\inc\offuh\com\sun\star\java\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\lang\*.hdl %_DEST%\inc\offuh\com\sun\star\lang\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\lang\*.hpp %_DEST%\inc\offuh\com\sun\star\lang\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc\offuh\com\sun\star\logging\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc\offuh\com\sun\star\logging\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc\offuh\com\sun\star\office\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc\offuh\com\sun\star\office\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc\offuh\com\sun\star\oooimprovement\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc\offuh\com\sun\star\oooimprovement\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc\offuh\com\sun\star\mail\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\mail\*.hdl %_DEST%\inc\offuh\com\sun\star\mail\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\media\*.hdl %_DEST%\inc\offuh\com\sun\star\media\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\media\*.hpp %_DEST%\inc\offuh\com\sun\star\media\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\packages\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\packages\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\manifest\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\manifest\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\zip\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\zip\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hdl %_DEST%\inc\offuh\com\sun\star\presentation\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hpp %_DEST%\inc\offuh\com\sun\star\presentation\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\animations\*.hdl %_DEST%\inc\offuh\com\sun\star\animations\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\animations\*.hpp %_DEST%\inc\offuh\com\sun\star\animations\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hdl %_DEST%\inc\offuh\com\sun\star\reflection\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hpp %_DEST%\inc\offuh\com\sun\star\reflection\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\registry\*.hpp %_DEST%\inc\offuh\com\sun\star\registry\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\registry\*.hdl %_DEST%\inc\offuh\com\sun\star\registry\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\report\*.hpp %_DEST%\inc\offuh\com\sun\star\report\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\report\*.hdl %_DEST%\inc\offuh\com\sun\star\report\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\report\inspection\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\report\inspection\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hpp %_DEST%\inc\offuh\com\sun\star\report\meta\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hdl %_DEST%\inc\offuh\com\sun\star\report\meta\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\resource\*.hpp %_DEST%\inc\offuh\com\sun\star\resource\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\resource\*.hdl %_DEST%\inc\offuh\com\sun\star\resource\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\tools\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\tools\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\application\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\application\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hdl %_DEST%\inc\offuh\com\sun\star\sdbc\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hpp %_DEST%\inc\offuh\com\sun\star\sdbc\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hdl %_DEST%\inc\offuh\com\sun\star\sdbcx\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hpp %_DEST%\inc\offuh\com\sun\star\sdbcx\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hdl %_DEST%\inc\offuh\com\sun\star\scanner\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hpp %_DEST%\inc\offuh\com\sun\star\scanner\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\script\*.hdl %_DEST%\inc\offuh\com\sun\star\script\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\script\*.hpp %_DEST%\inc\offuh\com\sun\star\script\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hdl %_DEST%\inc\offuh\com\sun\star\script\vba\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hpp %_DEST%\inc\offuh\com\sun\star\script\vba\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hdl %_DEST%\inc\offuh\com\sun\star\sheet\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hpp %_DEST%\inc\offuh\com\sun\star\sheet\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hdl %_DEST%\inc\offuh\com\sun\star\smarttags\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hpp %_DEST%\inc\offuh\com\sun\star\smarttags\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\svg\*.hdl %_DEST%\inc\offuh\com\sun\star\svg\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\svg\*.hpp %_DEST%\inc\offuh\com\sun\star\svg\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\style\*.hdl %_DEST%\inc\offuh\com\sun\star\style\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\style\*.hpp %_DEST%\inc\offuh\com\sun\star\style\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hdl %_DEST%\inc\offuh\com\sun\star\sync2\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hpp %_DEST%\inc\offuh\com\sun\star\sync2\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\system\*.hdl %_DEST%\inc\offuh\com\sun\star\system\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\system\*.hpp %_DEST%\inc\offuh\com\sun\star\system\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\table\*.hdl %_DEST%\inc\offuh\com\sun\star\table\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\table\*.hpp %_DEST%\inc\offuh\com\sun\star\table\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hdl %_DEST%\inc\offuh\com\sun\star\telephony\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hpp %_DEST%\inc\offuh\com\sun\star\telephony\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl %_DEST%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp %_DEST%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\text\*.hdl %_DEST%\inc\offuh\com\sun\star\text\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\text\*.hpp %_DEST%\inc\offuh\com\sun\star\text\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hdl %_DEST%\inc\offuh\com\sun\star\xsd\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hpp %_DEST%\inc\offuh\com\sun\star\xsd\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\inspection\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\inspection\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\ui\*.hdl %_DEST%\inc\offuh\com\sun\star\ui\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\ui\*.hpp %_DEST%\inc\offuh\com\sun\star\ui\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hdl %_DEST%\inc\offuh\com\sun\star\ui\dialogs\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hpp %_DEST%\inc\offuh\com\sun\star\ui\dialogs\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\uno\*.hdl %_DEST%\inc\offuh\com\sun\star\uno\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\uno\*.hpp %_DEST%\inc\offuh\com\sun\star\uno\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\uri\*.hdl %_DEST%\inc\offuh\com\sun\star\uri\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\uri\*.hpp %_DEST%\inc\offuh\com\sun\star\uri\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\util\*.hdl %_DEST%\inc\offuh\com\sun\star\util\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\util\*.hpp %_DEST%\inc\offuh\com\sun\star\util\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hdl %_DEST%\inc\offuh\com\sun\star\util\logging\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hpp %_DEST%\inc\offuh\com\sun\star\util\logging\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\view\*.hdl %_DEST%\inc\offuh\com\sun\star\view\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\view\*.hpp %_DEST%\inc\offuh\com\sun\star\view\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\input\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\input\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\sax\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\sax\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\events\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\events\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\views\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\views\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\xpath\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\xpath\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\loader\*.hdl %_DEST%\inc\offuh\com\sun\star\loader\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\loader\*.hpp %_DEST%\inc\offuh\com\sun\star\loader\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\task\*.hdl %_DEST%\inc\offuh\com\sun\star\task\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\task\*.hpp %_DEST%\inc\offuh\com\sun\star\task\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hpp %_DEST%\inc\offuh\com\sun\star\ucb\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hdl %_DEST%\inc\offuh\com\sun\star\ucb\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hpp %_DEST%\inc\offuh\com\sun\star\plugin\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hdl %_DEST%\inc\offuh\com\sun\star\plugin\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\setup\*.hpp %_DEST%\inc\offuh\com\sun\star\setup\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\setup\*.hdl %_DEST%\inc\offuh\com\sun\star\setup\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\client\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\client\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\system\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\system\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hpp %_DEST%\inc\offuh\com\sun\star\mozilla\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hdl %_DEST%\inc\offuh\com\sun\star\mozilla\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hpp %_DEST%\inc\offuh\com\sun\star\ldap\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hdl %_DEST%\inc\offuh\com\sun\star\ldap\*.hdl - -..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hpp %_DEST%\inc\offuh\drafts\com\sun\star\i18n\*.hpp -..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hdl %_DEST%\inc\offuh\drafts\com\sun\star\i18n\*.hdl - -..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc\offuh\com\sun\star\script\browse\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc\offuh\com\sun\star\script\browse\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc\offuh\com\sun\star\script\provider\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc\offuh\com\sun\star\script\provider\*.hdl - -..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hpp %_DEST%\inc\offuh\drafts\com\sun\star\form\*.hpp -..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hdl %_DEST%\inc\offuh\drafts\com\sun\star\form\*.hdl - -#i20156 - add xmlsecurity module related -..\%__SRC%\inc\offuh\com\sun\star\security\*.hpp %_DEST%\inc\offuh\com\sun\star\security\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\security\*.hdl %_DEST%\inc\offuh\com\sun\star\security\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\crypto\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\crypto\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\csax\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\csax\*.hdl -..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\wrapper\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\wrapper\*.hdl -#i20156 - end - -..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc\offuh\com\sun\star\rdf\*.hpp -..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc\offuh\com\sun\star\rdf\*.hdl - -..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc\offuh\ooo\vba\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc\offuh\ooo\vba\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc\offuh\ooo\vba\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc\offuh\ooo\vba\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\access\*.hpp %_DEST%\inc\offuh\ooo\vba\access\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\access\*.hdl %_DEST%\inc\offuh\ooo\vba\access\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hpp %_DEST%\inc\offuh\ooo\vba\adodb\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hdl %_DEST%\inc\offuh\ooo\vba\adodb\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\dao\*.hpp %_DEST%\inc\offuh\ooo\vba\dao\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\dao\*.hdl %_DEST%\inc\offuh\ooo\vba\dao\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\excel\*.hpp %_DEST%\inc\offuh\ooo\vba\excel\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\excel\*.hdl %_DEST%\inc\offuh\ooo\vba\excel\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hpp %_DEST%\inc\offuh\ooo\vba\msforms\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hdl %_DEST%\inc\offuh\ooo\vba\msforms\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\office\*.hpp %_DEST%\inc\offuh\ooo\vba\office\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\office\*.hdl %_DEST%\inc\offuh\ooo\vba\office\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hpp %_DEST%\inc\offuh\ooo\vba\powerpoint\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hdl %_DEST%\inc\offuh\ooo\vba\powerpoint\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hpp %_DEST%\inc\offuh\ooo\vba\stdole\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hdl %_DEST%\inc\offuh\ooo\vba\stdole\*.hdl -..\%__SRC%\inc\offuh\ooo\vba\word\*.hpp %_DEST%\inc\offuh\ooo\vba\word\*.hpp -..\%__SRC%\inc\offuh\ooo\vba\word\*.hdl %_DEST%\inc\offuh\ooo\vba\word\*.hdl -..\%__SRC%\inc\offuh\msforms\*.hpp %_DEST%\inc\offuh\msforms\*.hpp -..\%__SRC%\inc\offuh\msforms\*.hdl %_DEST%\inc\offuh\msforms\*.hdl - diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk deleted file mode 100644 index 230dc750aa90..000000000000 --- a/offuh/source/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME= offuh -TARGET= offuh - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -ALLTAR : $(MISC)$/oovbaapi.don $(MISC)$/$(TARGET).don - -$(MISC)$/$(TARGET).don : $(UNOUCRRDB) - @@-$(RM) $@ - $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@ - -$(MISC)$/oovbaapi.don : $(SOLARBINDIR)$/oovbaapi.rdb - @@-$(RM) $@ - $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ - echo $@ diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst index a7c1c5b03426..e6e0914eb6e3 100644 --- a/pyuno/prj/build.lst +++ b/pyuno/prj/build.lst @@ -1,4 +1,4 @@ -bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL +bgpu pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL pu pyuno usr1 - all br_mkout NULL pu pyuno\zipcore nmake - all pu_zipcore NULL pu pyuno\source\module nmake - all pu_module NULL diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 79fbae9ab098..96246b14ee7e 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -245,13 +245,6 @@ static struct cppu::ImplementationEntry g_entries[] = extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 627a97d711f7..935303f6fd9e 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -52,7 +52,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python .IF "$(GUI)" == "UNX" PYUNORC=pyunorc .ELSE +.IF "$(CROSS_COMPILING)" != "YES" .INCLUDE : pyversion.mk +.ENDIF PYUNORC=pyuno.ini DLLPOST=.pyd .ENDIF @@ -111,7 +113,7 @@ ALLTAR : \ $(LB)$/lib$(TARGET).a $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def - dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a + $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a .ELSE .IF "$(GUI)"!="WNT" diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk index 4c93b8be9313..8b41a93b6e7f 100644 --- a/rdbmaker/source/rdbmaker/makefile.mk +++ b/rdbmaker/source/rdbmaker/makefile.mk @@ -37,11 +37,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.IF "$(OS)" == "IOS" -all: - @echo No point in build-time executables for this platform -.ENDIF - OBJFILES= $(OBJ)$/rdbmaker.obj \ $(OBJ)$/rdboptions.obj \ $(OBJ)$/typeblop.obj \ diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk index 0b6be7e6e7f5..ecc356c7bf12 100644 --- a/registry/util/makefile.mk +++ b/registry/util/makefile.mk @@ -53,7 +53,11 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1FILES= $(SLB)$/$(TARGET)cpp.lib SHL1TARGET= $(TARGET) +.IF "$(COM)" == "MSC" SHL1IMPLIB= ireg +.ELSE +SHL1IMPLIB= $(TARGET) +.ENDIF SHL1STDLIBS= \ $(SALLIB) \ $(STORELIB) diff --git a/remotebridges/examples/exports.dxp b/remotebridges/examples/exports.dxp index 9630d7e06768..51703a04666a 100644 --- a/remotebridges/examples/exports.dxp +++ b/remotebridges/examples/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index 1ae0d29b871e..40c902332406 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -278,12 +278,6 @@ using namespace remotebridges_officeclient; extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { diff --git a/remotebridges/prj/build.lst b/remotebridges/prj/build.lst index 5f2a661dd5de..ae454aa89075 100644 --- a/remotebridges/prj/build.lst +++ b/remotebridges/prj/build.lst @@ -1,2 +1,2 @@ -rb remotebridges : LIBXSLT:libxslt cppu cppuhelper offuh rdbmaker sal NULL +rb remotebridges : LIBXSLT:libxslt cppu cppuhelper offapi DESKTOP:rdbmaker sal NULL rb remotebridges\source\unourl_resolver nmake - all rb_urlresolv NULL diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 422241e6dbe5..459f2fe0efd0 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -215,12 +215,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst index ac91c68bd9c1..b0aca0888e6c 100644 --- a/ridljar/prj/build.lst +++ b/ridljar/prj/build.lst @@ -1,4 +1,4 @@ -ri ridljar : codemaker solenv udkapi NULL +ri ridljar : DESKTOP:codemaker solenv udkapi NULL ri ridljar\javamaker nmake - all javamaker NULL ri ridljar\com nmake - all com javamaker NULL ri ridljar\util nmake - all util javamaker com NULL diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 96d23472c53e..b351870b6a22 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -37,7 +37,6 @@ #include <iostream> #include <limits> #include <string> - #include "cppunittester/protectorfactory.hxx" #include "osl/module.h" #include "osl/module.hxx" @@ -58,6 +57,8 @@ #include "cppunit/plugin/PlugInManager.h" #include "cppunit/portability/Stream.h" +#include "boost/noncopyable.hpp" + namespace { void usageFailure() { @@ -84,6 +85,39 @@ std::string convertLazy(rtl::OUString const & s16) { : static_cast< std::string::size_type >(s8.getLength()))); } +//Allow the whole uniting testing framework to be run inside a "Protector" +//which knows about uno exceptions, so it can print the content of the +//exception before falling over and dying +class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor, private boost::noncopyable +{ +private: + const std::string &testlib; + const std::string &args; + CppUnit::TestResult &result; +public: + ProtectedFixtureFunctor(const std::string& testlib_, const std::string &args_, CppUnit::TestResult &result_) + : testlib(testlib_) + , args(args_) + , result(result_) + { + } + bool run() const + { + CppUnit::PlugInManager manager; + manager.load(testlib, args); + CppUnit::TestRunner runner; + runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); + CppUnit::TestResultCollector collector; + result.addListener(&collector); + runner.run(result); + CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write(); + return collector.wasSuccessful(); + } + virtual bool operator()() const + { + return run(); + } +}; } SAL_IMPLEMENT_MAIN() { @@ -95,12 +129,27 @@ SAL_IMPLEMENT_MAIN() { #endif CppUnit::TestResult result; + cppunittester::LibreOfficeProtector *throw_protector = 0; + std::string args; + std::string testlib; sal_uInt32 index = 0; - for (; index < rtl_getAppCommandArgCount(); index += 3) { - if (!getArgument(index).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("--protector"))) + while (index < rtl_getAppCommandArgCount()) + { + rtl::OUString arg = getArgument(index); + if (!arg.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--protector"))) { - break; + if (testlib.empty()) + { + testlib = rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr(); + args += testlib; + } + else + { + args += ' '; + args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr(); + } + ++index; + continue; } if (rtl_getAppCommandArgCount() - index < 3) { usageFailure(); @@ -109,45 +158,29 @@ SAL_IMPLEMENT_MAIN() { rtl::OUString sym(getArgument(index + 2)); oslGenericFunction fn = (new osl::Module(lib, SAL_LOADMODULE_GLOBAL)) ->getFunctionSymbol(sym); - CppUnit::Protector * p = fn == 0 + throw_protector = fn == 0 ? 0 : (*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))(); - if (p == 0) { + if (throw_protector == 0) { std::cerr << "Failure instantiating protector \"" << convertLazy(lib) << "\", \"" << convertLazy(sym) << '"' << std::endl; std::exit(EXIT_FAILURE); } - result.pushProtector(p); - } - if (rtl_getAppCommandArgCount() - index < 1) { - usageFailure(); + result.pushProtector(throw_protector); + index+=3; } - std::string testlib; - { - rtl::OUString path; - rtl_getAppCommandArg(index, &path.pData); - testlib = rtl::OUStringToOString(path, osl_getThreadTextEncoding()).getStr(); - } - std::string args = testlib; - for (sal_uInt32 i = index + 1; i < rtl_getAppCommandArgCount(); ++i) - { - rtl::OUString arg; - rtl_getAppCommandArg(i, &arg.pData); - args += ' '; - args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr(); - } + bool ok = false; + ProtectedFixtureFunctor tests(testlib, args, result); + //if the unoprotector was given on the command line, use it to catch + //and report the error message of exceptions + if (throw_protector) + ok = throw_protector->protect(tests); + else + ok = tests.run(); - CppUnit::PlugInManager manager; - manager.load(testlib, args); - CppUnit::TestRunner runner; - runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); - CppUnit::TestResultCollector collector; - result.addListener(&collector); - runner.run(result); - CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write(); - return collector.wasSuccessful() ? EXIT_SUCCESS : EXIT_FAILURE; + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk index 65b600b05bd7..7c43bab6b743 100644 --- a/sal/cppunittester/makefile.mk +++ b/sal/cppunittester/makefile.mk @@ -33,10 +33,12 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" - CFLAGSCXX += $(CPPUNIT_CFLAGS) +.IF "$(OS)" == "IOS" +CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 +.ENDIF + OBJFILES = $(APP1OBJS) APP1OBJS = $(OBJ)/cppunittester.obj @@ -44,6 +46,4 @@ APP1RPATH = NONE APP1STDLIBS = $(CPPUNITLIB) $(SALLIB) APP1TARGET = cppunittester -.ENDIF - .INCLUDE: target.mk diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/sal/inc/cppunittester/protectorfactory.hxx index c309dbe8aa85..916f89f74d40 100644 --- a/sal/inc/cppunittester/protectorfactory.hxx +++ b/sal/inc/cppunittester/protectorfactory.hxx @@ -32,14 +32,20 @@ #include "sal/types.h" -namespace CppUnit { class Protector; } - -namespace cppunittester { - -// The type of CppUnit::Protector factory functions that can be plugged into -// cppunittester: -extern "C" typedef CppUnit::Protector * SAL_CALL ProtectorFactory(); - +#include <cppunit/Protector.h> + +namespace cppunittester +{ + class LibreOfficeProtector : public CppUnit::Protector + { + public: + virtual bool protect(CppUnit::Functor const & functor) = 0; + using CppUnit::Protector::protect; + }; + + // The type of CppUnit::Protector factory functions that can be plugged into + // cppunittester: + extern "C" typedef LibreOfficeProtector * SAL_CALL ProtectorFactory(); } #endif diff --git a/sal/inc/osl/thread.h b/sal/inc/osl/thread.h index 14b4cbfd8b7e..5fa84d898cdc 100644 --- a/sal/inc/osl/thread.h +++ b/sal/inc/osl/thread.h @@ -68,7 +68,7 @@ typedef enum typedef sal_uInt32 oslThreadIdentifier; -typedef sal_uInt32 oslThreadKey; +typedef void* oslThreadKey; /** Create the thread, using the function-ptr pWorker as its main (worker) function. This functions receives in diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx index 8a70f7db51da..14581ee0b2f9 100644 --- a/sal/inc/rtl/math.hxx +++ b/sal/inc/rtl/math.hxx @@ -142,8 +142,8 @@ inline void doubleToUStringBuffer( rtl::OUStringBuffer& rBuffer, double fValue, */ inline double stringToDouble(rtl::OString const & rString, sal_Char cDecSeparator, sal_Char cGroupSeparator, - rtl_math_ConversionStatus * pStatus, - sal_Int32 * pParsedEnd) + rtl_math_ConversionStatus * pStatus = 0, + sal_Int32 * pParsedEnd = 0) { sal_Char const * pBegin = rString.getStr(); sal_Char const * pEnd; @@ -161,8 +161,8 @@ inline double stringToDouble(rtl::OString const & rString, inline double stringToDouble(rtl::OUString const & rString, sal_Unicode cDecSeparator, sal_Unicode cGroupSeparator, - rtl_math_ConversionStatus * pStatus, - sal_Int32 * pParsedEnd) + rtl_math_ConversionStatus * pStatus = 0, + sal_Int32 * pParsedEnd = 0) { sal_Unicode const * pBegin = rString.getStr(); sal_Unicode const * pEnd; diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h index 584137f6d38c..c1d929c1298b 100644 --- a/sal/inc/rtl/strbuf.h +++ b/sal/inc/rtl/strbuf.h @@ -105,7 +105,6 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity( /*inout*/rtl_String ** This, @param offset the offset. @param ch a character array. @param len the number of characters to append. - @return this string buffer. */ void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This, /*inout*/sal_Int32 * capacity, @@ -113,6 +112,21 @@ void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This, const sal_Char * str, sal_Int32 len); +/** + Removes the characters in a substring of this sequence. + + The substring begins at the specified <code>start</code> and + is <code>len</code> characters long. + + start must be >= 0 && <= This->length + + @param start The beginning index, inclusive + @param len The substring length + */ +void SAL_CALL rtl_stringbuffer_remove( /*inout*/rtl_String ** This, + sal_Int32 start, + sal_Int32 len ); + #ifdef __cplusplus } #endif diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index ed3ea2c1b637..310b38e9a19a 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -54,7 +54,7 @@ namespace rtl is compiled to the equivalent of: <p><blockquote><pre> x = new OStringBuffer().append("a").append(4).append("c") - .toString() + .makeStringAndClear() </pre></blockquote><p> The principal operations on a <code>OStringBuffer</code> are the <code>append</code> and <code>insert</code> methods, which are @@ -135,6 +135,25 @@ public: rtl_stringbuffer_newFromStr_WithLength( &pData, value.getStr(), value.getLength() ); } + /** + Constructs a string buffer so that it represents the same + sequence of characters as the string argument. + + The initial + capacity of the string buffer is <code>16</code> plus length + + @param value a character array. + @param length the number of character which should be copied. + The character array length must be greater or + equal than this value. + */ + OStringBuffer(const sal_Char * value, sal_Int32 length) + : pData(NULL) + , nCapacity( length + 16 ) + { + rtl_stringbuffer_newFromStr_WithLength( &pData, value, length ); + } + /** Assign to this a copy of value. */ OStringBuffer& operator = ( const OStringBuffer& value ) @@ -651,6 +670,25 @@ public: sal_Char sz[RTL_STR_MAX_VALUEOFDOUBLE]; return insert( offset, sz, rtl_str_valueOfDouble( sz, d ) ); } + + /** + Removes the characters in a substring of this sequence. + + The substring begins at the specified <code>start</code> and + is <code>len</code> characters long. + + start must be >= 0 && <= getLength() && <= end + + @param start The beginning index, inclusive + @param len The substring length + @return this string buffer. + */ + OStringBuffer & remove( sal_Int32 start, sal_Int32 len ) + { + rtl_stringbuffer_remove( &pData, start, len ); + return *this; + } + private: /** A pointer to the data structur which contains the data. diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index daf95802a489..9183d0d892d0 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -341,6 +341,30 @@ public: } /** + Perform a comparison of two strings. + + The result is true if and only if second string + represents the same sequence of characters as the first string. + The ASCII string must be NULL-terminated and must be greater or + equal as length. + This function can't be used for language specific comparison. + + + @param value a character array. + @param length the length of the character array. + @return sal_True if the strings are equal; + sal_False, otherwise. + */ + sal_Bool equalsL( const sal_Char* value, sal_Int32 length ) const SAL_THROW(()) + { + if ( pData->length != length ) + return sal_False; + + return rtl_str_reverseCompare_WithLength( pData->buffer, pData->length, + value, length ) == 0; + } + + /** Perform a ASCII lowercase comparison of two strings. The result is true if and only if second string diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h index a7295f5e5324..8ea5c316e80e 100644 --- a/sal/inc/rtl/ustrbuf.h +++ b/sal/inc/rtl/ustrbuf.h @@ -159,6 +159,21 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii( /*inout*/rtl_uString ** This, const sal_Char * str, sal_Int32 len); +/** + Removes the characters in a substring of this sequence. + + The substring begins at the specified <code>start</code> and + is <code>len</code> characters long. + + start must be >= 0 && <= This->length + + @param start The beginning index, inclusive + @param len The substring length + */ +void SAL_CALL rtl_uStringbuffer_remove( /*inout*/rtl_uString ** This, + sal_Int32 start, + sal_Int32 len ); + #ifdef __cplusplus } #endif diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 3f3498aa2ecf..39e3562bd516 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -53,7 +53,7 @@ namespace rtl is compiled to the equivalent of: <p><blockquote><pre> x = new OUStringBuffer().append("a").append(4).append("c") - .toString() + .makeStringAndClear() </pre></blockquote><p> The principal operations on a <code>OUStringBuffer</code> are the <code>append</code> and <code>insert</code> methods, which are @@ -95,7 +95,7 @@ public: Allocates a new string buffer that contains the same sequence of characters as the string buffer argument. - @param value a <code>OStringBuffer</code>. + @param value a <code>OUStringBuffer</code>. */ OUStringBuffer( const OUStringBuffer & value ) : pData(NULL) @@ -280,7 +280,6 @@ public: */ const OUString toString() const { return OUString(pData->buffer); } - /** The character at the specified index of this string buffer is set to <code>ch</code>. @@ -739,6 +738,24 @@ public: return *this; } + /** + Removes the characters in a substring of this sequence. + + The substring begins at the specified <code>start</code> and + is <code>len</code> characters long. + + start must be >= 0 && <= This->length + + @param start The beginning index, inclusive + @param len The substring length + @return this string buffer. + */ + OUStringBuffer & remove( sal_Int32 start, sal_Int32 len ) + { + rtl_uStringbuffer_remove( &pData, start, len ); + return *this; + } + /** Allows access to the internal data of this OUStringBuffer, for effective manipulation. diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h index d0b3e6099d8a..41c465d6282c 100644 --- a/sal/inc/sal/cppunit.h +++ b/sal/inc/sal/cppunit.h @@ -35,6 +35,18 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include <cppunit/Protector.h> + +namespace cppunittester +{ + class LibreOfficeProtecter : public CppUnit::Protector + { + public: + virtual bool protect(CppUnit::Functor const & functor) = 0; + using CppUnit::Protector::protect; + }; +} + #undef CPPUNIT_PLUGIN_EXPORT #define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index 536bf328a43a..ea58141fe2ab 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -41,6 +41,82 @@ extern "C" { void SAL_CALL sal_detail_initialize(int argc, char ** argv); void SAL_CALL sal_detail_deinitialize(); +#ifdef IOS + +#include <premac.h> +#import <UIKit/UIKit.h> +#include <postmac.h> + +#define SAL_MAIN_WITH_ARGS_IMPL \ +int SAL_CALL main(int argc, char ** argv) \ +{ \ + sal_detail_initialize(argc, argv); \ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \ + int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \ + [pool release]; \ + sal_detail_deinitialize(); \ + return retVal; \ +} \ + \ +static int sal_main_with_args(int argc, char **argv); \ + \ +static int \ +sal_main(void) \ +{ \ + char *argv[] = { NULL }; \ + return sal_main_with_args(0, argv); \ +} + +#define SAL_MAIN_IMPL \ +int SAL_CALL main(int argc, char ** argv) \ +{ \ + sal_detail_initialize(argc, argv); \ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \ + int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \ + [pool release]; \ + sal_detail_deinitialize(); \ + return retVal; \ +} + +#define SAL_MAIN_WITH_GUI_IMPL \ +int SAL_CALL main(int argc, char ** argv) \ +{ \ + sal_detail_initialize(argc, argv); \ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \ + int retVal = sal_main(); \ + [pool release]; \ + sal_detail_deinitialize(); \ + return retVal; \ +} + +@interface salAppDelegate : NSObject <UIApplicationDelegate> { +} +@property (nonatomic, retain) UIWindow *window; +@end + +static int sal_main(void); + +@implementation salAppDelegate + +@synthesize window=_window; + +- (BOOL)application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions +{ + UIWindow *uiw = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; + uiw.backgroundColor = [UIColor redColor]; + self.window = uiw; + [uiw release]; + + sal_main(); + + [self.window makeKeyAndVisible]; + return YES; +} + +@end + +#else + #define SAL_MAIN_WITH_ARGS_IMPL \ int SAL_CALL main(int argc, char ** argv) \ { \ @@ -61,6 +137,11 @@ int SAL_CALL main(int argc, char ** argv) \ return ret; \ } +#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL + +#endif + + /* Definition macros for CRT entries */ #ifdef SAL_W32 @@ -118,6 +199,19 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh SAL_WIN_WinMain \ static int SAL_CALL sal_main(void) +/* Use SAL_IMPLEMENT_MAIN_WITH_GUI in programs that actually have a + * VCL GUI. The difference is meaningful only for iOS support, which + * of course is a highly experimental work in progress. So actually, + * don't bother, just let developers who care for iOS take care of it + * when/if necessary. + */ + +#define SAL_IMPLEMENT_MAIN_WITH_GUI() \ + static int SAL_CALL sal_main(void); \ + SAL_MAIN_WITH_GUI_IMPL \ + SAL_WIN_WinMain \ + static int SAL_CALL sal_main(void) + /* "How to use" Examples: diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 863185167088..9954ff4eebe5 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -241,8 +241,6 @@ typedef void * sal_Handle; #if defined(SAL_W32) || defined(SAL_UNX) # define SAL_MAX_ENUM 0x7fffffff -#elif defined(SAL_W16) -# define SAL_MAX_ENUM 0x7fff #endif #if defined(_MSC_VER) || defined(__MINGW32__) diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h deleted file mode 100644 index 80c24513a993..000000000000 --- a/sal/inc/systools/win32/StrConvert.h +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _STRCONVERT_H_ -#define _STRCONVERT_H_ - -#include <windows.h> - -#ifdef NDEBUG -#define STRCONVERT_H_HAD_NDEBUG -#undef NDEBUG -#endif -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> - -#ifdef __cplusplus -extern "C"{ -#endif - -int AllocNecessarySpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, LPSTR* lppStr ); -int AllocSpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, DWORD nWCharsToCopy, LPSTR* lppStr ); -int CalcLenDblNullTerminatedWStr( LPCWSTR lpcwstrString ); -int CalcLenDblNullTerminatedStr( LPCSTR lpcstrString ); -void FreeSpaceStr( LPSTR lpszString ); - -/* WC2MB allocates a sufficient amount of memory on stack and converts - the wide char parameter to multi byte string using the actual code - page. - - @Param: wcStr - a wide char string - mbStr - the corresponding multi byte string - - NOTE: due to the use of _alloca, this must be a macro and no function -*/ - -#define WC2MB( wcStr, mbStr ) \ -if( wcStr ) \ -{ \ - int needed = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, NULL, 0, NULL, NULL ); \ - if( needed > 0 ) \ - { \ - int copied; \ - mbStr = _alloca( needed * sizeof( CHAR ) ); \ - copied = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, mbStr, needed, NULL, NULL ); \ - assert( copied == needed ); \ - } \ -} - - -/* WideCharListGetMultiByteLength - calculates the needed length of a corresponding the multi byte string - list for a wide char string list. - - @Param: cp - the code page to use for convertion. - wcList - a double '\0' terminated wide char string list. -*/ - -int WideCharListGetMultiByteLength( UINT codepage, LPCWSTR wcList ); - -/* WideCharListToMultiByteList - converts a double '\0' terminated list of wide char strings to a - multi byte string list. - - @Param: cp - the code page to use for convertion. - wcList - a double '\0' terminated wide char string list. - mbList - a double '\0' terminated multi byte string list. - dwSize - size of buffer for multi byte string list. -*/ - -int WideCharListToMultiByteList( UINT codepage, LPCWSTR wcList, LPSTR mbList, DWORD dwSize ); - - -/* WCL2MBL allocates a sufficient amount of memory on stack and converts - the wide char list parameter to multi byte string list using the actual - code page. - - @Param: wcList - a wide char string list - mbList - the corresponding multi byte string list - - NOTE: due to the use of _alloca, this must be a macro and no function -*/ - -#define WCL2MBL( wcList, mbList ) \ -if( wcList ) \ -{ \ - int needed = WideCharListGetMultiByteLength( CP_ACP, wcList ); \ - if( needed > 0 ) \ - { \ - int copied; \ - mbList = _alloca( needed * sizeof( CHAR ) ); \ - copied = WideCharListToMultiByteList( CP_ACP, wcList, mbList, needed ); \ - assert( copied == needed ); \ - } \ -} - -#ifdef __cplusplus -} -#endif - -// Restore NDEBUG state -#ifdef STRCONVERT_H_HAD_NDEBUG -#define NDEBUG -#else -#undef NDEBUG -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/systools/win32/SyncObjects.hxx b/sal/inc/systools/win32/SyncObjects.hxx deleted file mode 100644 index 3966fca14391..000000000000 --- a/sal/inc/systools/win32/SyncObjects.hxx +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _SYNCOBJECTS_HXX_ -#define _SYNCOBJECTS_HXX_ - -//------------------------------------------------------------------------ -// includes -//------------------------------------------------------------------------ - -#include <windows.h> - -//------------------------------------------------------------------------ -// a simple helper template for automatic locking/unlocking -//------------------------------------------------------------------------ - -template< class LOCK > -class CLockGuard -{ -public: - CLockGuard( LOCK* aLock ) : - m_pLock( aLock ) - { - m_pLock->Lock( ); - } - - ~CLockGuard( ) - { - m_pLock->Unlock( ); - } - -private: - LOCK* m_pLock; -}; - -//------------------------------------------------------------------------ -// a interface base class for different locking sub classes -//------------------------------------------------------------------------ - -class CSyncObject -{ -public: - virtual ~CSyncObject( ) = 0; - - virtual int Lock( ) = 0; - virtual int Unlock( ) = 0; -}; - -//------------------------------------------------------------------------ -// if no synchronization is necessary this class will be used -// declaring the functions as inline safes runtime overhead -//------------------------------------------------------------------------ - -class CNullLock -{ -public: - inline virtual ~CNullLock ( ) {}; - inline virtual int Lock( ) {}; - inline virtual int Unlock() {}; -}; - -//------------------------------------------------------------------------ -// a minimal wrapper for a win32 critical section -//------------------------------------------------------------------------ - -class CCriticalSection : public CSyncObject -{ -public: - CCriticalSection( ); - virtual ~CCriticalSection( ); - - // both functions return always 0 - // because the win32 critsec functions - // don't return any return code - virtual int Lock( ); - virtual int Unlock( ); - -private: - CRITICAL_SECTION m_critSec; -}; - - -typedef CLockGuard< CSyncObject > SyncObjLockGuard_t; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h index b01554e8f47c..e7874e439e5a 100644 --- a/sal/inc/systools/win32/uwinapi.h +++ b/sal/inc/systools/win32/uwinapi.h @@ -51,58 +51,6 @@ #endif #endif -/** GetUserDomain - -The GetUserDomain function retrieves the name of the NT domain the user is -logged in. - -Parameters - @param lpBuffer - [out] Pointer to a buffer that receives a null-terminated string - containing the domain name. - @param nBufferSize - [in] Specifies the size, in TCHARs, of the buffer pointed to - by the lpBuffer parameter. - - -Return Values - @return - If the function succeeds, the return value is the number of TCHARs stored - into the buffer pointed to by lpBuffer, not including the terminating - null character. - - If the domain name can't be retrieved, the return value is zero. - - If the buffer pointed to by lpBuffer is not large enough, the return value - is the buffer size, in TCHARs, required to hold the value string and its - terminating null character. - -Remarks - Windows 95/98/Me: If the user is not logged in onto a NT domain server - the name of the workgroup is returned. - -Requirements - Windows NT/2000/XP: Included in Windows NT 4 and later. - Windows 95/98/Me: Included in Windows 95 and later. - Header: Declared in Uwinapi.h; include Uwinapi.h. - Library: Use Uwinapi.lib. - Unicode: Implemented as Unicode and ANSI versions on Windows 95/98/Me/NT/2000/XP. - -See Also -@see -*/ - -EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainA( LPSTR lpBuffer, DWORD nBuffserSize ); -EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainW( LPWSTR lpBuffer, DWORD nBuffserSize ); - -#ifdef UNICODE -#define GetUserDomain GetUserDomainW -#else -#define GetUserDomain GetUserDomainA -#endif - -EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess ); - #ifdef __cplusplus inline bool IsValidHandle(HANDLE handle) diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c index e5bb3ea1e431..a32f67c11985 100644 --- a/sal/osl/unx/interlck.c +++ b/sal/osl/unx/interlck.c @@ -149,17 +149,6 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* return --nCount; #endif } - -#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) -oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount) -{ - return __sync_add_and_fetch(pCount, 1); -} - -oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount) -{ - return __sync_sub_and_fetch(pCount, 1); -} #elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount) { diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk index cb566aeb1d60..2ec11e16f58b 100644 --- a/sal/osl/unx/makefile.mk +++ b/sal/osl/unx/makefile.mk @@ -49,6 +49,10 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) +.IF "$(OS)" == "IOS" +CFLAGSCXX+=-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 +.ENDIF + # --- Files -------------------------------------------------------- SLOFILES= \ @@ -113,7 +117,7 @@ OBJFILES= $(OBJ)$/conditn.obj \ $(OBJ)$/readwrite_helper.obj -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS" SLOFILES += $(SLO)$/osxlocale.obj .ENDIF diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c index 63634c7bd4a2..5076138cdd75 100644 --- a/sal/osl/unx/module.c +++ b/sal/osl/unx/module.c @@ -208,7 +208,8 @@ osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName) sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl) { sal_Bool result = sal_False; -#ifndef NO_DL_FUNCTIONS +/* Bah, we do want to use dladdr here also on iOS, I think? */ +#if !defined(NO_DL_FUNCTIONS) || defined(IOS) #if defined(AIX) int i; int size = 4 * 1024; diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index eb0068269620..fa796e62d93a 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -35,13 +35,13 @@ defined(FREEBSD) || defined(MACOSX) || defined(IOS) || defined(OPENBSD) || \ defined(DRAGONFLY) #include <pthread.h> -#ifndef MACOSX +#if !defined(MACOSX) && !defined(IOS) #include <locale.h> #include <langinfo.h> #else #include <osl/module.h> #include <osl/thread.h> -#endif /* !MACOSX */ +#endif /* !MACOSX && !IOS */ #endif /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */ #include <string.h> @@ -855,7 +855,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) return RTL_TEXTENCODING_DONTKNOW; } -#ifdef MACOSX +#if defined(MACOSX) || defined(IOS) #include "system.h" /* OS X locale discovery function */ diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx index c8bcc6dae756..78626d310da1 100644 --- a/sal/osl/unx/osxlocale.cxx +++ b/sal/osl/unx/osxlocale.cxx @@ -33,7 +33,9 @@ #include <assert.h> #include <premac.h> +#ifndef IOS #include <CoreServices/CoreServices.h> +#endif #include <CoreFoundation/CoreFoundation.h> #include <postmac.h> diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 1ed1363500e9..e62bdab890eb 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -30,7 +30,6 @@ #include "sal/config.h" #include "osl/process.h" -#include "sal/main.h" #include "sal/types.h" extern "C" { diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index a9aaeb60e740..ef6d884b89c8 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -354,6 +354,7 @@ int macxp_resolveAlias(char *path, int buflen); # ifndef ETIME # define ETIME ETIMEDOUT # endif +# include <dlfcn.h> # include <pthread.h> # include <sys/file.h> # include <sys/ioctl.h> diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c index 4e5abae826a2..3b55bdac2694 100644 --- a/sal/osl/unx/tempfile.c +++ b/sal/osl/unx/tempfile.c @@ -49,53 +49,29 @@ #include "file_url.h" #endif -/*****************************************************************/ -/* osl_getTempFirURL */ -/*****************************************************************/ - oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) { -#ifdef MACOSX + oslFileError error; + /* described in environ(7) */ const char *pValue = getenv( "TMPDIR" ); - /* If TMPDIR environment variable is not set, use "/tmp" instead - of P_tmpdir because its value is "/var/tmp" and it is not - deleted on system start up */ if ( !pValue ) - pValue = "/tmp"; -#else - - const char *pValue = getenv( "TEMP" ); + pValue = getenv( "TEMP" ); if ( !pValue ) pValue = getenv( "TMP" ); -#if defined(NETBSD) - if ( !pValue ) - pValue = _PATH_TMP; -#else - if ( !pValue ) - pValue = P_tmpdir; -#endif - if ( !pValue ) pValue = "/tmp"; -#endif /* MACOSX */ - if ( pValue ) - { - oslFileError error; - rtl_uString *ustrTempPath = NULL; + rtl_uString *ustrTempPath = NULL; - rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(ustrTempPath != NULL); - error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir ); - rtl_uString_release( ustrTempPath ); + rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(ustrTempPath != NULL); + error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir ); + rtl_uString_release( ustrTempPath ); - return error; - } - else - return osl_File_E_NOENT; + return error; } /****************************************************************** diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index 0ea6057ec509..c8f060f4d2ed 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -35,6 +35,7 @@ #include <osl/thread.h> #include <osl/nlsupport.h> #include <rtl/textenc.h> +#include <rtl/alloc.h> #include <sal/macros.h> #if defined LINUX @@ -975,17 +976,31 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread) return Priority; } +typedef struct _wrapper_pthread_key +{ + pthread_key_t m_key; + oslThreadKeyCallbackFunction pfnCallback; +} wrapper_pthread_key; + /*****************************************************************************/ /* osl_createThreadKey */ /*****************************************************************************/ oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallback ) { - pthread_key_t key; + wrapper_pthread_key *pKey = (wrapper_pthread_key*)rtl_allocateMemory(sizeof(wrapper_pthread_key)); + + if (pKey) + { + pKey->pfnCallback = pCallback; - if (pthread_key_create(&key, pCallback) != 0) - key = 0; + if (pthread_key_create(&(pKey->m_key), pKey->pfnCallback) != 0) + { + rtl_freeMemory(pKey); + pKey = 0; + } + } - return ((oslThreadKey)key); + return ((oslThreadKey)pKey); } /*****************************************************************************/ @@ -993,7 +1008,12 @@ oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallbac /*****************************************************************************/ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key) { - pthread_key_delete((pthread_key_t)Key); + wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key; + if (pKey) + { + pthread_key_delete(pKey->m_key); + rtl_freeMemory(pKey); + } } /*****************************************************************************/ @@ -1001,7 +1021,8 @@ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key) /*****************************************************************************/ void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key) { - return (pthread_getspecific((pthread_key_t)Key)); + wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key; + return pKey ? pthread_getspecific(pKey->m_key) : NULL; } /*****************************************************************************/ @@ -1009,7 +1030,21 @@ void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key) /*****************************************************************************/ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) { - return (pthread_setspecific((pthread_key_t)Key, pData) == 0); + sal_Bool bRet; + void *pOldData = NULL; + wrapper_pthread_key *pKey = (wrapper_pthread_key*)Key; + if (!pKey) + return sal_False; + + if (pKey->pfnCallback) + pOldData = pthread_getspecific(pKey->m_key); + + bRet = (pthread_setspecific(pKey->m_key, pData) == 0); + + if (bRet && pKey->pfnCallback && pOldData) + pKey->pfnCallback(pOldData); + + return bRet; } /*****************************************************************************/ diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index a8fe90603c8f..9cff7c0e350b 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -93,7 +93,7 @@ sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName) { #ifndef MACOSX // not MACOSX - rtl::OString fn = OUStringToOString(pustrFileName); + rtl::OString fn = OUStringToOString(pustrFileName); #else rtl::OString fn = macxp_resolveAliasAndConvert(pustrFileName); #endif diff --git a/sal/prj/build.lst b/sal/prj/build.lst index 4de757265f80..8222001e7c15 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -1,4 +1,4 @@ -sa sal : xml2cmp external BOOST:boost CPPUNIT:cppunit NULL +sa sal : NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL sa sal\typesconfig nmake - all sa_tc sa_inc NULL @@ -30,3 +30,4 @@ sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util NULL sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util NULL sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util NULL sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL +sa sal\qa\static nmake - u sal_qa_static sa_qa_sal NULL diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk index 60d87c83f18c..cc2d79dbf89b 100644 --- a/sal/qa/ByteSequence/makefile.mk +++ b/sal/qa/ByteSequence/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGSCXX += $(CPPUNIT_CFLAGS) -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLO)/ByteSequence.obj @@ -47,7 +49,5 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk index e6419b72ba7f..4149c58485e9 100644 --- a/sal/qa/OStringBuffer/makefile.mk +++ b/sal/qa/OStringBuffer/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -63,8 +65,6 @@ SHL1RPATH = NONE # do this here, so we get right dependencies SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index b01862f1bb86..2ebce4c74588 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -319,6 +319,53 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; + + class remove : public CppUnit::TestFixture + { + public: + void setUp() + { + } + + void tearDown() + { + } + + void remove_001() + { + ::rtl::OStringBuffer sb( + RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc.")); + + sb.remove(0, 4); + CPPUNIT_ASSERT(sb.toString().equalsL( + RTL_CONSTASCII_STRINGPARAM("Hat, Inc."))); + + sb.remove(3, 6); + CPPUNIT_ASSERT(sb.toString().equalsL( + RTL_CONSTASCII_STRINGPARAM("Hat"))); + + sb.remove(0, 100); + + CPPUNIT_ASSERT(sb.toString().isEmpty()); + + sb.append(RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc.")); + + sb.remove(3, 100); + + CPPUNIT_ASSERT(sb.toString().equalsL( + RTL_CONSTASCII_STRINGPARAM("Red"))); + + sb.remove(0, sb.getLength()); + + CPPUNIT_ASSERT(sb.toString().isEmpty()); + } + + CPPUNIT_TEST_SUITE(remove); + CPPUNIT_TEST(remove_001); + CPPUNIT_TEST_SUITE_END(); + }; + + // ----------------------------------------------------------------------------- class getLength : public CppUnit::TestFixture @@ -16555,6 +16602,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_float); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_Float_Negative); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_double); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative); +CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::remove); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx index 68d3534ccef1..065c32445013 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx @@ -194,172 +194,6 @@ sal_Char* createName( sal_Char* dst, const sal_Char* meth, sal_uInt32 cnt ) } //------------------------------------------------------------------------ -// testing the method compareTo( const OString & aStr ) -//------------------------------------------------------------------------ -void makeComment( char *com, const char *str1, const char *str2, - sal_Int32 sgn ) -{ - cpystr(com, str1); - int str1Length = AStringLen( str1 ); - const char *sign = (sgn == 0) ? " == " : (sgn > 0) ? " > " : " < " ; - cpystr(com + str1Length, sign); - int signLength = AStringLen(sign); - cpystr(com + str1Length + signLength, str2); - com[str1Length + signLength + AStringLen(str2)] = 0; -} - - -//------------------------------------------------------------------------ - -sal_Bool AStringToFloatCompare ( const sal_Char *pStr, - const float nX, - const float nEPS - ) -{ - sal_Bool cmp = sal_False; - - if ( pStr != NULL ) - { - ::rtl::OString aStr(pStr); - - float actNum = 0; - float expNum = nX; - float eps = nEPS; - - actNum = aStr.toFloat(); - - if ( abs( (int)(actNum - expNum) ) <= eps ) - { - cmp = sal_True; - } // if - } // if - - return cmp; -} // AStringToFloatCompare - -//------------------------------------------------------------------------ - -sal_Bool AStringToDoubleCompare ( const sal_Char *pStr, - const double nX, - const double nEPS - ) -{ - sal_Bool cmp = sal_False; - - if ( pStr != NULL ) - { - ::rtl::OString aStr(pStr); - - double actNum = 0; - double expNum = nX; - double eps = nEPS; - - actNum = aStr.toDouble(); - - if ( abs( (int)(actNum - expNum) ) <= eps ) - { - cmp = sal_True; - } // if - } // if - - return cmp; -} // AStringToDoubleCompare - -sal_uInt32 UStringLen( const sal_Unicode *pUStr ) -{ - sal_uInt32 nUStrLen = 0; - - if ( pUStr != NULL ) - { - const sal_Unicode *pTempUStr = pUStr; - - while( *pTempUStr ) - { - pTempUStr++; - } // while - - nUStrLen = (sal_uInt32)( pTempUStr - pUStr ); - } // if - - return nUStrLen; -} // UStringLen - -//------------------------------------------------------------------------ - -sal_Bool AStringIsValid( const sal_Char *pAStr ) -{ - if ( pAStr != NULL ) - { - sal_uInt32 nLen = AStringLen( pAStr ); - sal_uChar uChar = 0; - - while ( *pAStr ) - { - uChar = (unsigned char)*pAStr; - - if ( uChar > 127 ) - { - return sal_False; - } // if - - pAStr++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nLen > 0 ) - { - nLen--; - } // if - else - { - break; - } // else - } // while - } // if - - return sal_True; -} // AStringIsValid - -//------------------------------------------------------------------------ - -sal_Bool AStringNIsValid( const sal_Char *pAStr, - const sal_uInt32 nStrLen - ) -{ - sal_uInt32 nLen = nStrLen; - sal_uChar uChar = 0; - - while ( *pAStr ) - { - uChar = (unsigned char)*pAStr; - - if ( uChar > 127 ) - { - return sal_False; - } // if - - pAStr++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nLen > 0 ) - { - nLen--; - } // if - else - { - break; - } // else - } // while - - return sal_True; -} // AStringNIsValid - -//------------------------------------------------------------------------ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr, const sal_Char *pAStr @@ -374,224 +208,4 @@ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr, return nCmp; } // ACharToUCharCompare -//------------------------------------------------------------------------ - -sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr, - const sal_Char *pAStr - ) -{ - sal_Int32 nCmp = kErrCompareAStringToUString; - - if ( ( pUStr != NULL ) && ( pAStr != NULL ) ) - { - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - while ( ( nCmp == 0 ) && ( *pAStr ) ) - { - pUStr++; - pAStr++; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - } // while - } // if - - return nCmp; -} // AStringToUStringCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ) -{ - sal_Int32 nCmp = kErrCompareNAStringToUString; - - if ( ( pUStr != NULL ) && ( pAStr != NULL ) ) - { - sal_uInt32 nCount = nAStrCount; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - while ( ( nCmp == 0 ) && ( *pAStr ) && ( nCount ) ) - { - pUStr++; - pAStr++; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - } // if - - return nCmp; -} // AStringToUStringNCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToRTLUStringCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr - ) -{ - sal_Int32 nCmp = kErrCompareAStringToRTLUString; - - if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) ) - { - rtl_uString *pRTLUStrCopy = NULL; - - rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr ); - - if ( pRTLUStrCopy != NULL ) - { - const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy ); - - if ( pUStr != NULL ) - { - nCmp = AStringToUStringCompare( pUStr, pAStr ); - } // if - - rtl_uString_release( pRTLUStrCopy ); - - pRTLUStrCopy = NULL; - } // if - } // if - - return nCmp; -} // AStringToRTLUStringCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToRTLUStringNCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ) -{ - sal_Int32 nCmp = kErrCompareNAStringToRTLUString; - - if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) ) - { - rtl_uString *pRTLUStrCopy = NULL; - - rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr ); - - if ( pRTLUStrCopy != NULL ) - { - const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy ); - - if ( pUStr != NULL ) - { - nCmp = AStringToUStringNCompare( pUStr, pAStr, nAStrCount ); - } // if - - rtl_uString_release( pRTLUStrCopy ); - - pRTLUStrCopy = NULL; - } // if - } // if - - return nCmp; -} // AStringToRTLUStringNCompare - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringCopy( sal_Unicode *pDest, - const sal_Char *pSrc - ) -{ - sal_Bool bCopied = sal_False; - sal_uInt32 nCount = AStringLen( pSrc ); - sal_uInt32 nLen = nCount; - - if ( ( pDest != NULL ) - && ( pSrc != NULL ) - && ( AStringNIsValid( pSrc, nLen ) ) - ) - { - for (;;) - { - *pDest = (unsigned char)*pSrc; - - pDest++; - pSrc++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - - if ( nCount == 0 ) - { - bCopied = sal_True; - } // if - } // if - - return bCopied; -} // AStringToUStringCopy - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringNCopy( sal_Unicode *pDest, - const sal_Char *pSrc, - const sal_uInt32 nSrcLen - ) -{ - sal_Bool bCopied = sal_False; - sal_uInt32 nCount = nSrcLen; - sal_uInt32 nLen = nSrcLen; - - if ( ( pDest != NULL ) - && ( pSrc != NULL ) - && ( AStringNIsValid( pSrc, nLen ) ) - ) - { - for (;;) - { - *pDest = (unsigned char)*pSrc; - - pDest++; - pSrc++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - - if ( nCount == 0 ) - { - bCopied = sal_True; - } // if - } // if - - return bCopied; -} // AStringToUStringNCopy - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index 87c97174b71b..81b3ff34220f 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -55,29 +55,12 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 l sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ); sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); -void makeComment(char *com, const char *str1, const char *str2, sal_Int32 sgn); sal_uInt32 AStringLen( const sal_Char *pAStr ); -sal_uInt32 UStringLen( const sal_Unicode *pUStr ); - -//------------------------------------------------------------------------ - -sal_Bool AStringToFloatCompare ( const sal_Char *pStr, - const float nX, - const float nEPS - ); - -sal_Bool AStringToDoubleCompare ( const sal_Char *pStr, - const double nX, - const double nEPS - ); - //------------------------------------------------------------------------ -sal_Bool AStringIsValid( const sal_Char *pAStr ); - sal_Bool AStringNIsValid( const sal_Char *pAStr, const sal_uInt32 nStrLen ); @@ -93,26 +76,6 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr, const sal_uInt32 nAStrCount ); -sal_Int32 AStringToRTLUStringCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr - ); - -sal_Int32 AStringToRTLUStringNCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ); - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringCopy( sal_Unicode *pDest, - const sal_Char *pSrc - ); - -sal_Bool AStringToUStringNCopy( sal_Unicode *pDest, - const sal_Char *pSrc, - const sal_uInt32 nSrcLen - ); - #endif /* __cplusplus */ #endif /* _RTL_STRING_UTILS_HXX */ diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk index 4b452b73c94c..eaa662877b84 100644 --- a/sal/qa/cppunit_local.mk +++ b/sal/qa/cppunit_local.mk @@ -25,6 +25,10 @@ # cppunittester is built in this module; cannot use delivered version # this should be kept in sync with the definition in solenv/inc/settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +CPPUNITTESTER=\# +.ELSE CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester +.ENDIF .INCLUDE : _cppunit.mk diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk index e9eec4d98f5b..391ac66b8ade 100644 --- a/sal/qa/makefile.mk +++ b/sal/qa/makefile.mk @@ -47,8 +47,6 @@ TARGET=whole_sal_qa ALLTAR : test_all .ENDIF -.IF "$(CROSS_COMPILING)"!="YES" - # OTHER STUFF ------------------------------------------------------ # test : test_all @@ -62,5 +60,3 @@ test_all: @echo - start sal unit tests @echo ---------------------------------------------------------- $(PERL) buildall.pl $(TESTOPT) - -.ENDIF diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index 89a4fb363460..9683f20a7dde 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -36,13 +36,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:Condition by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Condition.obj @@ -53,10 +53,8 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP = $(PRJ)$/qa$/export.map -# auto generated Target:Condition -# END ------------------------------------------------------------------ - -.ENDIF +# ------------------------------------------------------------------ +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index 4cb2ffebce16..de85e5e5ef34 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -36,8 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -79,9 +77,7 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 5787a746bdc6..47895582b648 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File +#endif + //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ @@ -2176,7 +2180,7 @@ namespace osl_VolumeInfo } -#if ( defined UNX ) +#if defined(UNX) && !defined(ANDROID) void getMaxNameLength_002( ) { struct statvfs aStatFS; @@ -5819,7 +5823,7 @@ namespace osl_Directory nError1 = ::osl::Directory::getVolumeInfo( aTmpName3, aVolumeInfo ); // LLA: in Windows, it reply no error, it did not pass in (W32). -#ifdef UNX +#if defined(UNX) && !defined(IOS) CPPUNIT_ASSERT_MESSAGE( "test for getVolumeInfo function: non-existence test. ", ( osl::FileBase::E_NOENT == nError1 ) ); #endif @@ -6051,7 +6055,7 @@ namespace osl_Directory if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1)) tmp_x += rtl::OString('/'); -#ifndef WNT +#if !defined(WNT) && !defined(ANDROID) // FIXME would be nice to create unique dir even on Windows tmp_x += rtl::OString("XXXXXX"); char *out = mkdtemp(const_cast<char*>(tmp_x.getStr())); diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index f49d63d76743..939e6df92f90 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -89,13 +89,15 @@ const sal_Char pBuffer_Blank[] = ""; # include <errno.h> # include <fcntl.h> # include <sys/stat.h> -# if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY) +# if !defined(MACOSX) && !defined(IOS) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY) # include <sys/statfs.h> # else # include <sys/param.h> # include <sys/mount.h> # endif -# include <sys/statvfs.h> +# if !defined(ANDROID) +# include <sys/statvfs.h> +# endif # include <sys/types.h> # define TEST_PLATFORM "" # define TEST_PLATFORM_ROOT "/" diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index f280905be361..bbfc1a8fa037 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file +#endif + // LLA: // this file is converted to use with testshl2 // original was placed in sal/test/textenc.cxx diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 891163120489..56135301e4cb 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf +#endif + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -43,7 +47,7 @@ using ::rtl::OUStringToOString; using ::rtl::OString; //Use to silence OSL_ warnings for a deliberate error -extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * ) +extern "C" void SAL_CALL suppressOslDebugMessage2( const sal_Char *, sal_Int32, const sal_Char * ) { } @@ -71,7 +75,7 @@ public: //deliberate errors, suppress run-time warning for operations on //un-opened File pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc = - osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage ); + osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage2 ); char buffer[1]; sal_uInt64 written = 0; diff --git a/sal/qa/osl/getsystempathfromfileurl/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk index 769313aad004..71597ba07f0a 100644 --- a/sal/qa/osl/getsystempathfromfileurl/makefile.mk +++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk @@ -37,7 +37,9 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -53,8 +55,6 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: _cppunit.mk diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index 22a4811eaa3c..7fdf0ca43c15 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -36,7 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -72,9 +74,8 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME =$(SHL2TARGET) SHL2VERSIONMAP= $(PRJ)$/qa$/export.map -# END ------------------------------------------------------------------ -.ENDIF +SLOFILES = $(SHL2OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index 04c46143f809..8dd3ba900870 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -43,9 +43,5 @@ extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes ) { return ( bRes = sal_True ); } -extern "C" void SAL_CALL secondfunc() -{ - printf("second func called.\n"); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index 17bac5faf871..73360cbd04d9 100644 --- a/sal/qa/osl/process/makefile.mk +++ b/sal/qa/osl/process/makefile.mk @@ -35,15 +35,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" - CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl - -.IF "$(GUI)" == "WNT" +.IF "$(COM)" == "MSC" CFLAGS+=/Ob1 .ENDIF @@ -54,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET) DEF1NAME=$(SHL1TARGET) SHL1VERSIONMAP = $(PRJ)$/qa$/export.map -# END ------------------------------------------------------------------ - SHL2OBJS=$(SLO)$/osl_process.obj SHL2TARGET=osl_process SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) @@ -63,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET) DEF2NAME=$(SHL2TARGET) SHL2VERSIONMAP = $(PRJ)$/qa$/export.map -# END ------------------------------------------------------------------ - OBJ3FILES=$(OBJ)$/osl_process_child.obj APP3TARGET=osl_process_child APP3OBJS=$(OBJ3FILES) @@ -75,12 +66,8 @@ SHL2DEPN=$(APP3TARGETN) \ $(BIN)/batch.bat #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies - SLOFILES=$(SHL1OBJS) $(SHL2OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 3b021a497db6..de0589f45e69 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread +#endif + #ifdef WNT #define NOMINMAX #include <windows.h> @@ -1097,9 +1101,11 @@ namespace osl_Thread case osl_Thread_PriorityAboveNormal: sPrioStr = "AboveNormal"; + break; case osl_Thread_PriorityNormal: sPrioStr = "Normal"; + break; case osl_Thread_PriorityBelowNormal: sPrioStr = "BelowNormal"; @@ -2097,9 +2103,6 @@ namespace osl_ThreadData "ThreadData setData: ", cData1 == 'a' && cData2 == 'b' && aChar == 'o' ); - - delete [] pc2; - delete [] pc; } CPPUNIT_TEST_SUITE(setData); @@ -2147,8 +2150,6 @@ namespace osl_ThreadData "ThreadData setData: ", cData1 == 'c' && cData2 == 'd' && aChar == 'i' ); - - delete [] pc; } // setData then change the value in the address data pointer points, diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index db22198ca4a1..ae09ead5f154 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process +#endif + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -76,14 +80,6 @@ const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child")); #endif - -//######################################## -std::string OUString_to_std_string(const rtl::OUString& oustr) -{ - rtl::OString ostr = rtl::OUStringToOString(oustr, osl_getThreadTextEncoding()); - return std::string(ostr.getStr()); -} - //######################################## using namespace osl; @@ -477,6 +473,7 @@ public: ); std::string line; + line.reserve(1024); while (std::getline(file, line, '\0')) env_container->push_back(line); tidy_container(*env_container); diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk index e6fbed4ab7a6..85d9beb44972 100755 --- a/sal/qa/osl/security/makefile.mk +++ b/sal/qa/osl/security/makefile.mk @@ -36,13 +36,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:Security by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Security.obj @@ -57,10 +57,8 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP= $(PRJ)$/qa$/export.map -# auto generated Target:Security -# END ------------------------------------------------------------------ -.ENDIF +SLOFILES = $(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 063ddf2b2591..72b00b3459bd 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -126,12 +126,12 @@ namespace osl_Security CPPUNIT_TEST_SUITE( logonUser ); - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd are forwarded { CPPUNIT_TEST( logonUser_user_pwd ); } - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) != aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) != aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd and file server are forwarded { CPPUNIT_TEST( logonUser_user_pwd_server ); @@ -587,31 +587,31 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, t_print("#\n#Retrived system information is below:\n"); t_print("Computer Name: "); - if ( strComputerName == aNullURL ) + if ( strComputerName == aNullUrl ) t_print("Not retrived\n" ); else printUString( strComputerName ); t_print("Current User Name: "); - if ( strUserName == aNullURL ) + if ( strUserName == aNullUrl ) t_print("Not retrived\n" ); else printUString( strUserName ); t_print("Current User Home Directory:"); - if ( strHomeDirectory == aNullURL ) + if ( strHomeDirectory == aNullUrl ) t_print("Not retrived\n" ); else printUString( strHomeDirectory ); t_print("Current Config Directory: "); - if ( strConfigDirectory == aNullURL ) + if ( strConfigDirectory == aNullUrl ) t_print("Not retrived\n" ); else printUString( strConfigDirectory ); t_print("Current UserID: "); - if ( strUserID == aNullURL ) + if ( strUserID == aNullUrl ) t_print("Not retrived\n" ); else printUString( strUserID ); @@ -624,7 +624,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, /// get and display forwarded text if available. aStringForward = ::rtl::OUString::createFromAscii( parameters.getCommandLine().c_str() ); - if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 ) + if ( !aStringForward.equals( aNullUrl ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 ) { sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' );; sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' ' );; diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 74e068e2595d..197745f7dd8d 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -63,12 +63,15 @@ const char pTestString[17] = "Sun Microsystems"; //------------------------------------------------------------------------ // condition names //------------------------------------------------------------------------ -OSLTEST_DECLARE_USTRING( TestSec, "testsecurity" ); -OSLTEST_DECLARE_USTRING( NullURL, "" ); -::rtl::OUString aLogonUser( aNullURL ), aLogonPasswd( aNullURL ), aFileServer( aNullURL ), aStringForward( aNullURL ); -::rtl::OUString strUserName( aNullURL ) , strComputerName( aNullURL ) , strHomeDirectory( aNullURL ); -::rtl::OUString strConfigDirectory( aNullURL ), strUserID( aNullURL ); +// Intentionally different from the aNullURL in osl_File_Const.h to avoid +// duplicate symbols as all the unit tests here get linked together for iOS... + +OSLTEST_DECLARE_USTRING( NullUrl, "" ); + +::rtl::OUString aLogonUser( aNullUrl ), aLogonPasswd( aNullUrl ), aFileServer( aNullUrl ), aStringForward( aNullUrl ); +::rtl::OUString strUserName( aNullUrl ) , strComputerName( aNullUrl ) , strHomeDirectory( aNullUrl ); +::rtl::OUString strConfigDirectory( aNullUrl ), strUserID( aNullUrl ); sal_Bool isAdmin = sal_False; diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk index d829b14643c8..1a015da3bdfd 100755 --- a/sal/qa/rtl/alloc/makefile.mk +++ b/sal/qa/rtl/alloc/makefile.mk @@ -35,7 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -53,10 +55,7 @@ DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP= $(PRJ)$/qa$/export.map #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -# SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk index 30fc67825a0c..fd95355ac912 100644 --- a/sal/qa/rtl/cipher/makefile.mk +++ b/sal/qa/rtl/cipher/makefile.mk @@ -37,15 +37,15 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_cipher.obj @@ -58,14 +58,9 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF2EXPORTFILE= export.exp SHL1VERSIONMAP= $(PRJ)$/qa$/export.map -# auto generated Target:joblist -# END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -# SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk index 23e7fd2aa724..3820a8cf7422 100755 --- a/sal/qa/rtl/crc32/makefile.mk +++ b/sal/qa/rtl/crc32/makefile.mk @@ -35,15 +35,15 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:jobfile by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_crc32.obj @@ -56,14 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp SHL1VERSIONMAP= $(PRJ)$/qa$/export.map -# auto generated Target:jobfile -# END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -# SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk index 87ef35bcbc88..a1d03567306f 100644 --- a/sal/qa/rtl/doublelock/makefile.mk +++ b/sal/qa/rtl/doublelock/makefile.mk @@ -35,17 +35,16 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl - -.IF "$(GUI)" == "WNT" +.IF "$(COM)" == "MSC" CFLAGS+=/Ob1 .ENDIF @@ -59,15 +58,9 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP = $(PRJ)$/qa$/export.map -# END ------------------------------------------------------------------ - #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies - SLOFILES=$(SHL1OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk index fd97147937a6..0d1c8f83fb46 100644 --- a/sal/qa/rtl/locale/makefile.mk +++ b/sal/qa/rtl/locale/makefile.mk @@ -35,15 +35,15 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS) -# BEGIN ---------------------------------------------------------------- -# auto generated Target:locale by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_locale.obj @@ -56,15 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp SHL1VERSIONMAP= $(PRJ)$/qa$/export.map -# auto generated Target:locale -# END ------------------------------------------------------------------ - #------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -# SLOFILES=$(SHL1OBJS) - -.ENDIF +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk index 32583c2ff25a..0db90281a929 100644 --- a/sal/qa/rtl/oustringbuffer/makefile.mk +++ b/sal/qa/rtl/oustringbuffer/makefile.mk @@ -34,7 +34,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -51,7 +53,5 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) SHL1VERSIONMAP := $(PRJ)$/qa$/export.map DEF1NAME := $(SHL1TARGET) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk index 821e04e7fea8..c58476e5918f 100644 --- a/sal/qa/rtl/strings/makefile.mk +++ b/sal/qa/rtl/strings/makefile.mk @@ -34,7 +34,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) @@ -52,7 +54,5 @@ SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) SHL1VERSIONMAP := $(PRJ)$/qa$/export.map DEF1NAME := $(SHL1TARGET) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx index 9f882f796a7c..ac4befd185b2 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils.cxx +++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx @@ -171,172 +171,6 @@ sal_Char* createName( sal_Char* dst, const sal_Char* meth, sal_uInt32 cnt ) } //------------------------------------------------------------------------ -// testing the method compareTo( const OString & aStr ) -//------------------------------------------------------------------------ -void makeComment( char *com, const char *str1, const char *str2, - sal_Int32 sgn ) -{ - cpystr(com, str1); - int str1Length = AStringLen( str1 ); - const char *sign = (sgn == 0) ? " == " : (sgn > 0) ? " > " : " < " ; - cpystr(com + str1Length, sign); - int signLength = AStringLen(sign); - cpystr(com + str1Length + signLength, str2); - com[str1Length + signLength + AStringLen(str2)] = 0; -} - - -//------------------------------------------------------------------------ - -sal_Bool AStringToFloatCompare ( const sal_Char *pStr, - const float nX, - const float nEPS - ) -{ - sal_Bool cmp = sal_False; - - if ( pStr != NULL ) - { - ::rtl::OString aStr(pStr); - - float actNum = 0; - float expNum = nX; - float eps = nEPS; - - actNum = aStr.toFloat(); - - if ( abs( (int)(actNum - expNum) ) <= eps ) - { - cmp = sal_True; - } // if - } // if - - return cmp; -} // AStringToFloatCompare - -//------------------------------------------------------------------------ - -sal_Bool AStringToDoubleCompare ( const sal_Char *pStr, - const double nX, - const double nEPS - ) -{ - sal_Bool cmp = sal_False; - - if ( pStr != NULL ) - { - ::rtl::OString aStr(pStr); - - double actNum = 0; - double expNum = nX; - double eps = nEPS; - - actNum = aStr.toDouble(); - - if ( abs( (int)(actNum - expNum) ) <= eps ) - { - cmp = sal_True; - } // if - } // if - - return cmp; -} // AStringToDoubleCompare - -sal_uInt32 UStringLen( const sal_Unicode *pUStr ) -{ - sal_uInt32 nUStrLen = 0; - - if ( pUStr != NULL ) - { - const sal_Unicode *pTempUStr = pUStr; - - while( *pTempUStr ) - { - pTempUStr++; - } // while - - nUStrLen = (sal_uInt32)( pTempUStr - pUStr ); - } // if - - return nUStrLen; -} // UStringLen - -//------------------------------------------------------------------------ - -sal_Bool AStringIsValid( const sal_Char *pAStr ) -{ - if ( pAStr != NULL ) - { - sal_uInt32 nLen = AStringLen( pAStr ); - sal_uChar uChar = 0; - - while ( ( nLen >= 0 ) && ( *pAStr ) ) - { - uChar = (unsigned char)*pAStr; - - if ( uChar > 127 ) - { - return sal_False; - } // if - - pAStr++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nLen > 0 ) - { - nLen--; - } // if - else - { - break; - } // else - } // while - } // if - - return sal_True; -} // AStringIsValid - -//------------------------------------------------------------------------ - -sal_Bool AStringNIsValid( const sal_Char *pAStr, - const sal_uInt32 nStrLen - ) -{ - sal_uInt32 nLen = nStrLen; - sal_uChar uChar = 0; - - while ( ( nLen >= 0 ) && ( *pAStr ) ) - { - uChar = (unsigned char)*pAStr; - - if ( uChar > 127 ) - { - return sal_False; - } // if - - pAStr++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nLen > 0 ) - { - nLen--; - } // if - else - { - break; - } // else - } // while - - return sal_True; -} // AStringNIsValid - -//------------------------------------------------------------------------ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr, const sal_Char *pAStr @@ -351,224 +185,4 @@ static inline sal_Int32 ACharToUCharCompare( const sal_Unicode *pUStr, return nCmp; } // ACharToUCharCompare -//------------------------------------------------------------------------ - -sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr, - const sal_Char *pAStr - ) -{ - sal_Int32 nCmp = kErrCompareAStringToUString; - - if ( ( pUStr != NULL ) && ( pAStr != NULL ) ) - { - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - while ( ( nCmp == 0 ) && ( *pAStr ) ) - { - pUStr++; - pAStr++; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - } // while - } // if - - return nCmp; -} // AStringToUStringCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ) -{ - sal_Int32 nCmp = kErrCompareNAStringToUString; - - if ( ( pUStr != NULL ) && ( pAStr != NULL ) ) - { - sal_uInt32 nCount = nAStrCount; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - while ( ( nCmp == 0 ) && ( *pAStr ) && ( nCount ) ) - { - pUStr++; - pAStr++; - - nCmp = ACharToUCharCompare( pUStr, pAStr ); - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - } // if - - return nCmp; -} // AStringToUStringNCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToRTLUStringCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr - ) -{ - sal_Int32 nCmp = kErrCompareAStringToRTLUString; - - if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) ) - { - rtl_uString *pRTLUStrCopy = NULL; - - rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr ); - - if ( pRTLUStrCopy != NULL ) - { - const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy ); - - if ( pUStr != NULL ) - { - nCmp = AStringToUStringCompare( pUStr, pAStr ); - } // if - - rtl_uString_release( pRTLUStrCopy ); - - pRTLUStrCopy = NULL; - } // if - } // if - - return nCmp; -} // AStringToRTLUStringCompare - -//------------------------------------------------------------------------ - -sal_Int32 AStringToRTLUStringNCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ) -{ - sal_Int32 nCmp = kErrCompareNAStringToRTLUString; - - if ( ( pRTLUStr != NULL ) && ( pAStr != NULL ) ) - { - rtl_uString *pRTLUStrCopy = NULL; - - rtl_uString_newFromString( &pRTLUStrCopy, pRTLUStr ); - - if ( pRTLUStrCopy != NULL ) - { - const sal_Unicode *pUStr = rtl_uString_getStr( pRTLUStrCopy ); - - if ( pUStr != NULL ) - { - nCmp = AStringToUStringNCompare( pUStr, pAStr, nAStrCount ); - } // if - - rtl_uString_release( pRTLUStrCopy ); - - pRTLUStrCopy = NULL; - } // if - } // if - - return nCmp; -} // AStringToRTLUStringNCompare - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringCopy( sal_Unicode *pDest, - const sal_Char *pSrc - ) -{ - sal_Bool bCopied = sal_False; - sal_uInt32 nCount = AStringLen( pSrc ); - sal_uInt32 nLen = nCount; - - if ( ( pDest != NULL ) - && ( pSrc != NULL ) - && ( AStringNIsValid( pSrc, nLen ) ) - ) - { - while ( nCount >= 0 ) - { - *pDest = (unsigned char)*pSrc; - - pDest++; - pSrc++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - - if ( nCount == 0 ) - { - bCopied = sal_True; - } // if - } // if - - return bCopied; -} // AStringToUStringCopy - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringNCopy( sal_Unicode *pDest, - const sal_Char *pSrc, - const sal_uInt32 nSrcLen - ) -{ - sal_Bool bCopied = sal_False; - sal_uInt32 nCount = nSrcLen; - sal_uInt32 nLen = nSrcLen; - - if ( ( pDest != NULL ) - && ( pSrc != NULL ) - && ( AStringNIsValid( pSrc, nLen ) ) - ) - { - while ( nCount >= 0 ) - { - *pDest = (unsigned char)*pSrc; - - pDest++; - pSrc++; - - // Since we are dealing with unsigned integers - // we want to make sure that the last number is - // indeed zero. - - if ( nCount > 0 ) - { - nCount--; - } // if - else - { - break; - } // else - } // while - - if ( nCount == 0 ) - { - bCopied = sal_True; - } // if - } // if - - return bCopied; -} // AStringToUStringNCopy - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx index 7c059ae57f27..98a523dc5eab 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils.hxx +++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx @@ -54,29 +54,12 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 l sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ); sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); -void makeComment(char *com, const char *str1, const char *str2, sal_Int32 sgn); sal_uInt32 AStringLen( const sal_Char *pAStr ); -sal_uInt32 UStringLen( const sal_Unicode *pUStr ); - -//------------------------------------------------------------------------ - -sal_Bool AStringToFloatCompare ( const sal_Char *pStr, - const float nX, - const float nEPS - ); - -sal_Bool AStringToDoubleCompare ( const sal_Char *pStr, - const double nX, - const double nEPS - ); - //------------------------------------------------------------------------ -sal_Bool AStringIsValid( const sal_Char *pAStr ); - sal_Bool AStringNIsValid( const sal_Char *pAStr, const sal_uInt32 nStrLen ); @@ -92,34 +75,8 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr, const sal_uInt32 nAStrCount ); -sal_Int32 AStringToRTLUStringCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr - ); - -sal_Int32 AStringToRTLUStringNCompare( const rtl_uString *pRTLUStr, - const sal_Char *pAStr, - const sal_uInt32 nAStrCount - ); - -//------------------------------------------------------------------------ - -sal_Bool AStringToUStringCopy( sal_Unicode *pDest, - const sal_Char *pSrc - ); - -sal_Bool AStringToUStringNCopy( sal_Unicode *pDest, - const sal_Char *pSrc, - const sal_uInt32 nSrcLen - ); - #endif /* __cplusplus */ #endif /* _RTL_STRING_UTILS_HXX */ - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk index 78c8646c307a..0677acc24bd6 100644 --- a/sal/qa/sal/makefile.mk +++ b/sal/qa/sal/makefile.mk @@ -33,7 +33,9 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"!="YES" +.IF "$(OS)" == "IOS" +CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) +.ENDIF SHL1TARGET = $(TARGET)_types SHL1OBJS = $(SLO)$/test_types.obj @@ -44,7 +46,5 @@ DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) -.ENDIF - .INCLUDE: target.mk .INCLUDE: $(PRJ)$/qa$/cppunit_local.mk diff --git a/offapi/com/sun/star/configuration/backend/xml/makefile.mk b/sal/qa/static/makefile.mk index b16dcb545738..71c308544ecf 100644 --- a/offapi/com/sun/star/configuration/backend/xml/makefile.mk +++ b/sal/qa/static/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -23,21 +23,46 @@ # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # -#************************************************************************* +#***********************************************************************/ + +PRJ = ../.. +PRJNAME = sal +TARGET = sal_cppunittester_all + +ENABLE_EXCEPTIONS = TRUE +LIBTARGET = NO + +.INCLUDE: settings.mk + +CFLAGSCXX += $(CPPUNIT_CFLAGS) + +.IF "$(OS)" != "IOS" + +ALL : + @echo This is only for iOS -PRJ = ..$/..$/..$/..$/..$/.. -PRJNAME=offapi +.ENDIF -TARGET = csscbxml -PACKAGE = com$/sun$/star$/configuration$/backend$/xml +CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -.INCLUDE: $(PRJ)$/util$/makefile.pmk +OBJFILES = $(APP1OBJS) -IDLFILES = \ - SchemaParser.idl \ - LayerParser.idl \ - LayerWriter.idl \ +APP1OBJS = $(OBJ)/sal_cppunittester_all.obj +APP1RPATH = NONE +APP1LIBS += \ + $(SLB)/qa_ByteSequence.lib \ + $(SLB)/qa_ostringbuffer.lib \ + $(SLB)/qa_osl_condition.lib \ + $(SLB)/qa_osl_file.lib \ + $(SLB)/qa_osl_security.lib \ + $(SLB)/qa_rtl_alloc.lib \ + $(SLB)/qa_rtl_cipher.lib \ + $(SLB)/qa_rtl_crc32.lib \ + $(SLB)/qa_rtl_doublelock.lib \ + $(SLB)/qa_rtl_locale.lib \ + $(SLB)/qa_sal.lib +APP1STDLIBS = $(CPPUNITLIB) $(SALLIB) +APP1TARGET = $(TARGET) .INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx new file mode 100644 index 000000000000..4c3d942c187f --- /dev/null +++ b/sal/qa/static/sal_cppunittester_all.cxx @@ -0,0 +1,161 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +#include "precompiled_sal.hxx" +#include "sal/config.h" + +#include <cstdlib> +#include <iostream> +#include <limits> +#include <string> +#include "cppunittester/protectorfactory.hxx" +#include "osl/module.h" +#include "osl/module.hxx" +#include "osl/thread.h" +#include "rtl/process.h" +#include "rtl/string.h" +#include "rtl/string.hxx" +#include "rtl/textcvt.h" +#include "rtl/ustring.hxx" +#include "sal/main.h" +#include "sal/types.h" + +#include "cppunit/CompilerOutputter.h" +#include "cppunit/TestResult.h" +#include "cppunit/TestResultCollector.h" +#include "cppunit/TestRunner.h" +#include "cppunit/plugin/TestPlugIn.h" +#include "cppunit/plugin/PlugInParameters.h" +#include "cppunit/extensions/TestFactoryRegistry.h" +#include "cppunit/portability/Stream.h" + +#include "boost/noncopyable.hpp" + +namespace { + +void usageFailure() { + std::cerr + << ("Usage: cppunittester (--protector <shared-library-path>" + " <function-symbol>)* <shared-library-path>") + << std::endl; + std::exit(EXIT_FAILURE); +} + +rtl::OUString getArgument(sal_Int32 index) { + rtl::OUString arg; + rtl_getAppCommandArg(index, &arg.pData); + return arg; +} + +std::string convertLazy(rtl::OUString const & s16) { + rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding())); + return std::string( + s8.getStr(), + ((static_cast< sal_uInt32 >(s8.getLength()) + > (std::numeric_limits< std::string::size_type >::max)()) + ? (std::numeric_limits< std::string::size_type >::max)() + : static_cast< std::string::size_type >(s8.getLength()))); +} + +//Allow the whole uniting testing framework to be run inside a "Protector" +//which knows about uno exceptions, so it can print the content of the +//exception before falling over and dying +class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor, private boost::noncopyable +{ +private: + const std::string &args; + CppUnit::TestResult &result; +public: + ProtectedFixtureFunctor(const std::string &args_, CppUnit::TestResult &result_) + : args(args_) + , result(result_) + { + } + bool run() const + { + CppUnit::TestRunner runner; + runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); + CppUnit::TestResultCollector collector; + result.addListener(&collector); + runner.run(result); + CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write(); + return collector.wasSuccessful(); + } + virtual bool operator()() const + { + return run(); + } +}; +} + +extern "C" CppUnitTestPlugIn *cppunitTest_qa_ByteSequence(void), + *cppunitTest_qa_ostringbuffer(void), + *cppunitTest_qa_osl_condition(void), + *cppunitTest_qa_osl_File(void), + *cppunitTest_tcwf(void), + *cppunitTest_osl_old_test_file(void), + *cppunitTest_qa_osl_security(void), + *cppunitTest_qa_rtl_alloc(void), + *cppunitTest_qa_rtl_cipher(void), + *cppunitTest_qa_rtl_crc32(void), + *cppunitTest_qa_rtl_doublelock(void), + *cppunitTest_qa_rtl_locale(void), + *cppunitTest_qa_sal(void); + +SAL_IMPLEMENT_MAIN() { + TestPlugInSignature plugs[] = { + cppunitTest_qa_ByteSequence, + cppunitTest_qa_ostringbuffer, + cppunitTest_qa_osl_condition, + cppunitTest_qa_osl_File, + cppunitTest_tcwf, + cppunitTest_osl_old_test_file, + cppunitTest_qa_osl_security, + cppunitTest_qa_rtl_alloc, + cppunitTest_qa_rtl_cipher, + cppunitTest_qa_rtl_crc32, + cppunitTest_qa_rtl_doublelock, + cppunitTest_qa_rtl_locale, + cppunitTest_qa_sal, + NULL + }; + CppUnit::TestResult result; + std::string args; + bool ok = false; + for (TestPlugInSignature *plug = plugs; *plug != NULL; plug++) { + CppUnitTestPlugIn *iface; + iface = (*plug)(); + iface->initialize(&CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters()); + } + ProtectedFixtureFunctor tests(args, result); + ok = tests.run(); + + return ok ? EXIT_SUCCESS : EXIT_FAILURE; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/rtl/source/strbuf.c b/sal/rtl/source/strbuf.c index 47fd5c8b51ed..c9a4f3140643 100644 --- a/sal/rtl/source/strbuf.c +++ b/sal/rtl/source/strbuf.c @@ -146,4 +146,34 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, } } +/************************************************************************* + * rtl_stringbuffer_remove + */ +void SAL_CALL rtl_stringbuffer_remove( rtl_String ** This, + sal_Int32 start, + sal_Int32 len ) +{ + sal_Int32 nTailLen; + sal_Char * pBuf; + + if (len > (*This)->length - start) + len = (*This)->length - start; + + //remove nothing + if (!len) + return; + + pBuf = (*This)->buffer; + nTailLen = (*This)->length - ( start + len ); + + if (nTailLen) + { + /* move the tail */ + rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Char)); + } + + (*This)->length-=len; + pBuf[ (*This)->length ] = 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/rtl/source/ustrbuf.c b/sal/rtl/source/ustrbuf.c index 3b05eb258c90..374913ae78b8 100644 --- a/sal/rtl/source/ustrbuf.c +++ b/sal/rtl/source/ustrbuf.c @@ -206,5 +206,34 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii( /*inout*/rtl_uString ** This, } } +/************************************************************************* + * rtl_uStringbuffer_remove + */ +void SAL_CALL rtl_uStringbuffer_remove( rtl_uString ** This, + sal_Int32 start, + sal_Int32 len ) +{ + sal_Int32 nTailLen; + sal_Unicode * pBuf; + + if (len > (*This)->length - start) + len = (*This)->length - start; + + //remove nothing + if (!len) + return; + + pBuf = (*This)->buffer; + nTailLen = (*This)->length - ( start + len ); + + if (nTailLen) + { + /* move the tail */ + rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Unicode)); + } + + (*This)->length-=len; + pBuf[ (*This)->length ] = 0; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp deleted file mode 100644 index 1385c0bb6411..000000000000 --- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) -#endif - -#include "macros.h" - -#ifdef __cplusplus -#define local inline -#else -#define local static -#endif - -local LPCWSTR SkipBlanks( LPCWSTR lpScan ) -{ - while ( ' ' == *lpScan || '\t' == *lpScan ) - lpScan++; - - return lpScan; -} - - -local LPCWSTR SkipArgument( LPCWSTR lpScan ) -{ - BOOL fQuoted = FALSE; - LPCWSTR lpArgEnd = NULL; - - do - { - switch ( *lpScan ) - { - case ' ': - case '\t': - if ( fQuoted ) - lpScan++; - else - lpArgEnd = lpScan; - break; - case '\"': - lpScan++; - fQuoted = !fQuoted; - break; - case '\0': - lpArgEnd = lpScan; - break; - default: - lpScan++; - break; - } - } while( *lpScan && !lpArgEnd ); - - return lpScan; -} - - -IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWSTR lpCmdLineW, int *pNumArgs ) ) -{ - LPWSTR *lpArgvW = NULL; - - if ( !lpCmdLineW || !*lpCmdLineW ) - { - CHAR szFileName[MAX_PATH]; - - DWORD dwResult = GetModuleFileNameA( NULL, szFileName, MAX_PATH ); - - if ( dwResult && dwResult < MAX_PATH ) - { - int cchNeeded = MultiByteToWideChar( CP_ACP, 0, szFileName, -1, NULL, 0 ); - - lpArgvW = (LPWSTR *)GlobalAlloc( 0, cchNeeded * sizeof(WCHAR) + sizeof(LPWSTR) ); - - if ( lpArgvW ) - { - lpArgvW[0] = (LPWSTR)(lpArgvW + 1); - - MultiByteToWideChar( CP_ACP, 0, szFileName, -1, lpArgvW[0], cchNeeded ); - *pNumArgs = 1; - } - else - SetLastError( ERROR_OUTOFMEMORY ); - } - } - else - { - LPCWSTR lpScan = lpCmdLineW; - int nTokens = 0; - int cchNeeded = 0; - - // Count arguments and required size - - while ( *lpScan ) - { - lpScan = SkipBlanks( lpScan ); - if ( *lpScan ) - { - LPCWSTR lpArgEnd = SkipArgument( lpScan ); - - nTokens++; - cchNeeded += lpArgEnd - lpScan + 1; - lpScan = lpArgEnd; - } - } - - // Allocate space for one additional NULL pointer to terminate list - - lpArgvW = (LPWSTR *)GlobalAlloc( 0, sizeof(LPWSTR) * (nTokens + 1) + sizeof(WCHAR) * cchNeeded ); - - if ( lpArgvW ) - { - // Collect arguments - - LPWSTR lpDestination = (LPWSTR)&lpArgvW[nTokens + 1]; - - lpScan = lpCmdLineW; - nTokens = 0; - - while ( *lpScan ) - { - lpScan = SkipBlanks( lpScan ); - if ( *lpScan ) - { - LPCWSTR lpArgEnd = SkipArgument( lpScan ); - - lpArgvW[nTokens++] = lpDestination; - - while ( lpScan < lpArgEnd ) - { - if ( '\"' != *lpScan ) - *lpDestination++ = *lpScan; - - lpScan++; - } - *lpDestination++ = 0; - } - } - - lpArgvW[nTokens] = NULL; - - *pNumArgs = nTokens; - } - else - SetLastError( ERROR_OUTOFMEMORY ); - - } - - return lpArgvW; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/CopyFileExA.cpp b/sal/systools/win32/uwinapi/CopyFileExA.cpp deleted file mode 100644 index f694fb3420f6..000000000000 --- a/sal/systools/win32/uwinapi/CopyFileExA.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) -#endif - -#define _WIN32_WINNT 0x0400 -#include "macros.h" - -#define BUFSIZE 16384 - -static DWORD CALLBACK DefCopyProgressRoutine( - LARGE_INTEGER TotalFileSize, // total file size, in bytes - LARGE_INTEGER TotalBytesTransferred, - // total number of bytes transferred - LARGE_INTEGER StreamSize, // total number of bytes for this stream - LARGE_INTEGER StreamBytesTransferred, - // total number of bytes transferred for - // this stream - DWORD dwStreamNumber, // the current stream - DWORD dwCallbackReason, // reason for callback - HANDLE hSourceFile, // handle to the source file - HANDLE hDestinationFile, // handle to the destination file - LPVOID lpData // passed by CopyFileEx -) -{ - return PROGRESS_CONTINUE; -} - - -IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) ) -{ - BOOL fSuccess = FALSE; // Assume failure - - HANDLE hSourceFile = CreateFileA( - lpExistingFileNameA, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL - ); - - if ( IsValidHandle(hSourceFile) ) - { - LARGE_INTEGER FileSize, BytesTransferred; - HANDLE hTargetFile = NULL; - - SetLastError( ERROR_SUCCESS ); - FileSize.LowPart = GetFileSize( hSourceFile, (LPDWORD)&FileSize.HighPart ); - BytesTransferred.QuadPart = 0; - - if ( (DWORD)-1 != FileSize.LowPart || ERROR_SUCCESS == GetLastError() ) - hTargetFile = CreateFileA( - lpNewFileNameA, - GENERIC_WRITE, - 0, - NULL, - (DWORD) ((dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS), - 0, - NULL - ); - - if ( IsValidHandle(hTargetFile) ) - { - DWORD dwProgressResult = PROGRESS_CONTINUE; - - fSuccess = SetEndOfFile( hTargetFile ); - - if ( fSuccess ) - { - if ( !lpProgressRoutine ) - lpProgressRoutine = DefCopyProgressRoutine; - - dwProgressResult = lpProgressRoutine( - FileSize, - BytesTransferred, - FileSize, - BytesTransferred, - 1, - CALLBACK_STREAM_SWITCH, - hSourceFile, - hTargetFile, - lpData - ); - - // Suppress further notifications - - if ( PROGRESS_QUIET == dwProgressResult ) - { - lpProgressRoutine = DefCopyProgressRoutine; - dwProgressResult = PROGRESS_CONTINUE; - } - } - - while ( fSuccess && PROGRESS_CONTINUE == dwProgressResult ) - { - BYTE buffer[BUFSIZE]; - DWORD dwBytesRead, dwBytesWritten = 0; - - fSuccess = ReadFile( hSourceFile, buffer, BUFSIZE, &dwBytesRead, NULL ); - - if ( !dwBytesRead ) break; - - if ( fSuccess ) - fSuccess = WriteFile( hTargetFile, buffer, dwBytesRead, &dwBytesWritten, NULL ); - - if ( fSuccess ) - { - BytesTransferred.QuadPart += (LONGLONG)dwBytesWritten; - - if ( pbCancel && *pbCancel ) - dwProgressResult = PROGRESS_CANCEL; - else - dwProgressResult = lpProgressRoutine( - FileSize, - BytesTransferred, - FileSize, - BytesTransferred, - 1, - CALLBACK_CHUNK_FINISHED, - hSourceFile, - hTargetFile, - lpData - ); - - } - - } - - CloseHandle( hTargetFile ); - - if ( PROGRESS_CANCEL == dwProgressResult ) - DeleteFileA( lpNewFileNameA ); - } - - - CloseHandle( hSourceFile ); - } - - return fSuccess; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp deleted file mode 100644 index f1eee397d24e..000000000000 --- a/sal/systools/win32/uwinapi/DllGetVersion.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) -#endif -#include <windows.h> -#include <shlwapi.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#include <malloc.h> - -extern HMODULE UWINAPI_BaseAddress; - -// This function should be exported by every DLL that wants to provide it's version number. -// This code automaticly generates the information from the version resource - -extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi ) -{ - TCHAR szModulePath[MAX_PATH]; - BOOL fSuccess = FALSE; - - if ( UWINAPI_BaseAddress && GetModuleFileName( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) ) - { - DWORD dwHandle = 0; - DWORD dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle ); - LPVOID lpData = _alloca( dwSize ); - - if ( GetFileVersionInfo( szModulePath, dwHandle, dwSize, lpData ) ) - { - VS_FIXEDFILEINFO *lpBuffer = NULL; - UINT uLen = 0; - - if ( VerQueryValue( lpData, TEXT("\\"), (LPVOID *)&lpBuffer, &uLen ) ) - { - pdvi->dwMajorVersion = HIWORD( lpBuffer->dwFileVersionMS ); - pdvi->dwMinorVersion = LOWORD( lpBuffer->dwFileVersionMS ); - pdvi->dwBuildNumber = HIWORD( lpBuffer->dwFileVersionLS ); - pdvi->dwPlatformID = (DWORD) ((lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS); - - fSuccess = TRUE; - } - } - } - - return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp deleted file mode 100644 index d856dbd4b28d..000000000000 --- a/sal/systools/win32/uwinapi/DllMain.cpp +++ /dev/null @@ -1,238 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif -#include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#include <malloc.h> -#define _MBCS -#include <tchar.h> - - -HMODULE UWINAPI_BaseAddress = NULL; -const CHAR szUnicowsModuleName[] = "UNICOWS.DLL"; - -static HMODULE WINAPI _LoadUnicowsLibrary(VOID) -{ - CHAR szModulePath[MAX_PATH]; - HMODULE hModuleUnicows = NULL; - - // First search in the same directory as UWINAPI.DLL was loaded from. This is because - // UWINAPI.DLL not always resides in the same directory as the actual application. - - if ( UWINAPI_BaseAddress && GetModuleFileNameA( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) ) - { - char *lpLastBkSlash = _tcsrchr( szModulePath, '\\' ); - - if ( lpLastBkSlash ) - { - size_t nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath); - LPSTR lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) ); - - if ( lpUnicowsModulePath ) - { - _tcsncpy( lpUnicowsModulePath, szModulePath, nParentDirSize ); - _tcscpy( lpUnicowsModulePath + nParentDirSize, szUnicowsModuleName ); - - hModuleUnicows = LoadLibraryA( lpUnicowsModulePath ); - } - } - } - - // Search at the common places - - if ( !hModuleUnicows ) - hModuleUnicows = LoadLibraryA(szUnicowsModuleName); - - return hModuleUnicows; -} - -static HMODULE WINAPI LoadUnicowsLibrary(VOID) -{ - HMODULE hModuleUnicows; - int idMsg = IDOK; - - do - { - hModuleUnicows = _LoadUnicowsLibrary(); - - if ( !hModuleUnicows ) - { - LPVOID lpMsgBuf; - - FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ERROR_DLL_NOT_FOUND /* GetLastError() */, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPSTR)&lpMsgBuf, - 0, - NULL - ); - // Process any inserts in lpMsgBuf. - CHAR szModuleFileName[MAX_PATH]; - - GetModuleFileNameA( NULL, szModuleFileName, sizeof(szModuleFileName) ); - LPSTR lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 ); - strcpy( lpMessage, (LPCSTR)lpMsgBuf ); - strcat( lpMessage, "\n" ); - strcat( lpMessage, szUnicowsModuleName ); - // Free the buffer. - LocalFree( lpMsgBuf ); - // Display the string. - idMsg = MessageBoxA( NULL, lpMessage, - szModuleFileName, MB_ABORTRETRYIGNORE | MB_ICONERROR | MB_TASKMODAL ); - - if ( IDABORT == idMsg ) - TerminateProcess( GetCurrentProcess(), 255 ); - } - } while ( !hModuleUnicows && IDRETRY == idMsg ); - - return hModuleUnicows; -} - -extern "C" { -FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary; -} - -#ifdef __MINGW32__ - -extern "C" { - -typedef void (*func_ptr) (void); -extern func_ptr __CTOR_LIST__[]; -extern func_ptr __DTOR_LIST__[]; - -static void do_startup(void); -static void do_cleanup(void); - -HMODULE hModuleUnicowsDLL; - -void -__do_global_dtors (void) -{ - static func_ptr *p = __DTOR_LIST__ + 1; - - /* - * Call each destructor in the destructor list until a null pointer - * is encountered. - */ - while (*p) - { - (*(p)) (); - p++; - } -} - -void -__do_global_ctors (void) -{ - unsigned long nptrs = (unsigned long) __CTOR_LIST__[0]; - unsigned i; - - /* - * If the first entry in the constructor list is -1 then the list - * is terminated with a null entry. Otherwise the first entry was - * the number of pointers in the list. - */ - if (nptrs == static_cast<unsigned long>(-1)) - { - for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++) - ; - } - - /* - * Go through the list backwards calling constructors. - */ - for (i = nptrs; i >= 1; i--) - { - __CTOR_LIST__[i] (); - } - - /* - * Register the destructors for processing on exit. - */ - atexit (__do_global_dtors); -} - -static int initialized = 0; - -void -__main (void) -{ - if (!initialized) - { - initialized = 1; - do_startup(); - __do_global_ctors (); - } -} - -static void do_startup( void ) -{ - if (((LONG)GetVersion()&0x800000ff) == 0x80000004) - { - hModuleUnicowsDLL = LoadUnicowsLibrary(); - if (hModuleUnicowsDLL) - atexit(do_cleanup); - } -} - -void do_cleanup( void ) -{ - FreeLibrary(hModuleUnicowsDLL); -} -} - -#endif - -extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID ) -{ - switch ( dwReason ) - { - case DLL_PROCESS_ATTACH: - UWINAPI_BaseAddress = hModule; -#ifdef __MINGW32__ - return TRUE; -#else - return DisableThreadLibraryCalls( hModule ); -#endif - default: - return TRUE; - } - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/DrawStateW.cpp b/sal/systools/win32/uwinapi/DrawStateW.cpp deleted file mode 100644 index 99d14f22d43b..000000000000 --- a/sal/systools/win32/uwinapi/DrawStateW.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW, -( - HDC hdc, // handle to device context - HBRUSH hbr, // handle to brush - DRAWSTATEPROC lpOutputFunc, // pointer to callback function - LPARAM lData, // image information - WPARAM wData, // more image information - int x, // horizontal location of image - int y, // vertical location of image - int cx, // width of image - int cy, // height of image - UINT fuFlags // image type and state - -)) -{ - switch ( fuFlags & 0x000F ) - { - case DST_TEXT: - case DST_PREFIXTEXT: - { - LPSTR lpTextA = NULL; - - if ( lData ) - { - int cchWideChar = (int) (wData ? wData : -1); - int cchNeeded = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, NULL, 0, NULL, NULL ); - - lpTextA = (LPSTR)_alloca( cchNeeded * sizeof(CHAR) ); - - if ( !lpTextA ) - { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - - WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, lpTextA, cchNeeded, NULL, NULL ); - - } - - return DrawStateA( hdc, hbr, lpOutputFunc, (LPARAM)lpTextA, wData, x, y, cx, cy, fuFlags ); - } - default: - return DrawStateA( hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags ); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/EnumProcesses.cpp b/sal/systools/win32/uwinapi/EnumProcesses.cpp deleted file mode 100644 index 228ecddf1cda..000000000000 --- a/sal/systools/win32/uwinapi/EnumProcesses.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "macros.h" -#include <tlhelp32.h> - -IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProcesses, DWORD cbSize, LPDWORD lpcbCopied ) ) -{ - BOOL fSuccess = FALSE; - HANDLE hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); - - if ( IsValidHandle( hSnapshot ) ) - { - PROCESSENTRY32 pe; - - if ( lpcbCopied ) - *lpcbCopied = 0; - - pe.dwSize = sizeof(pe); - if ( Process32First( hSnapshot, &pe ) ) - { - fSuccess = TRUE; - - while ( cbSize >= sizeof(*lpProcesses) ) - { - *(lpProcesses++) = pe.th32ProcessID; - if ( lpcbCopied ) - *lpcbCopied += sizeof(*lpProcesses); - cbSize -= sizeof(*lpProcesses); - - if ( !Process32Next( hSnapshot, &pe ) ) - break; - } - } - - CloseHandle( hSnapshot ); - } - else - SetLastError( ERROR_INVALID_HANDLE ); - - return fSuccess; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp deleted file mode 100644 index ee54d434e5b1..000000000000 --- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "macros.h" -#ifdef __MINGW32__ -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -#else -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -#endif -/* -extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr; -static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength); -static _declspec ( naked ) void FindFirstVolumeMountPointA_Thunk() -{ - ResolveThunk_TRYLOAD( &kernel32_FindFirstVolumeMountPointA_Ptr, "kernel32" ".dll", "FindFirstVolumeMountPointA", 0, (FARPROC)FindFirstVolumeMountPointA_Failure ); - _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr] } - -//extern "C" _declspec( naked ) HANDLE __stdcall -//extern "C" HANDLE WINAPI -extern "C" _declspec( naked ) HANDLE __stdcall FindFirstVolumeMountPointA (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) -{ - _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr] -} - -extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr = (FARPROC)FindFirstVolumeMountPointA_Thunk; -static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) -{ SetLastError( 120L ); return (HANDLE)0; } -*/ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp deleted file mode 100644 index 6bdb6b20360b..000000000000 --- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "macros.h" -#ifdef __MINGW32__ -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -#else -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp deleted file mode 100644 index 2bef40a6cc5e..000000000000 --- a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp deleted file mode 100644 index dfda390ea54b..000000000000 --- a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp deleted file mode 100644 index b9f52cd8ac61..000000000000 --- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointW, (HANDLE hFindVolumeMountPoint, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/FindVolumeClose.cpp b/sal/systools/win32/uwinapi/FindVolumeClose.cpp deleted file mode 100644 index 8b0ff3aa8517..000000000000 --- a/sal/systools/win32/uwinapi/FindVolumeClose.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeClose, (HANDLE hFindVolume) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp deleted file mode 100644 index d33553d2df66..000000000000 --- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -// GetDiskSpaceExA wrapper for Win 95A - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetDiskFreeSpaceExA,( - LPCSTR lpRootPathName, // directory name - PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller - PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk - PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk -)) -{ - DWORD dwSectorsPerCluster, dwBytesPerSector, dwNumberOfFreeClusters, dwTotalNumberOfClusters; - - BOOL fSuccess = GetDiskFreeSpaceA( lpRootPathName, &dwSectorsPerCluster, &dwBytesPerSector, &dwNumberOfFreeClusters, &dwTotalNumberOfClusters ); - - if ( fSuccess ) - { - ULONGLONG ulBytesPerCluster = (ULONGLONG)dwSectorsPerCluster * (ULONGLONG)dwBytesPerSector; - - if ( lpFreeBytesAvailable ) - lpFreeBytesAvailable->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters; - - if ( lpTotalNumberOfBytes ) - lpTotalNumberOfBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwTotalNumberOfClusters; - - if ( lpTotalNumberOfFreeBytes ) - lpTotalNumberOfFreeBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters; - } - - return fSuccess; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp deleted file mode 100644 index 150d9e18ed84..000000000000 --- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, GetDiskFreeSpaceExW,( - LPCWSTR lpRootPathNameW, // directory name - PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller - PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk - PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk -)) -{ - AUTO_WSTR2STR( lpRootPathName ); - - return GetDiskFreeSpaceExA( lpRootPathNameA, lpFreeBytesAvailable, lpTotalNumberOfBytes, lpTotalNumberOfFreeBytes ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetLongPathName.cpp b/sal/systools/win32/uwinapi/GetLongPathName.cpp deleted file mode 100644 index 52027646810a..000000000000 --- a/sal/systools/win32/uwinapi/GetLongPathName.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -{ - DWORD dwResult = 0; // Assume failure - - if ( IsBadStringPtr( lpShortPath, MAX_PATH ) ) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return dwResult; - } - - // Assume a not existing buffer means a bufsize of zero - if ( !lpLongPath ) - cchBuffer = 0; - - if ( _tcslen( lpShortPath ) == 2 && lpShortPath[1] == ':' ) - { - _tcscpy( lpLongPath, lpShortPath ); - dwResult = _tcslen( lpLongPath ); - } - else - { - HANDLE hFind; - WIN32_FIND_DATA aFindFileData; - - if ( lpShortPath[_tcslen(lpShortPath)-1] == '\\' ) - { - TCHAR szFilePath[MAX_PATH]; - - _tcscpy( szFilePath, lpShortPath ); - _tcscat( szFilePath, TEXT("*.*") ); - hFind = FindFirstFile( szFilePath, &aFindFileData );; - aFindFileData.cFileName[0] = 0; - } - else - { - hFind = FindFirstFile( lpShortPath, &aFindFileData ); - if ( !IsValidHandle( hFind ) ) - { - TCHAR szFilePath[MAX_PATH]; - - _tcscpy( szFilePath, lpShortPath ); - _tcscat( szFilePath, TEXT("\\*.*") ); - hFind = FindFirstFile( szFilePath, &aFindFileData );; - aFindFileData.cFileName[0] = 0; - } - } - - if ( IsValidHandle( hFind ) ) - { - FindClose( hFind ); - - LPCTSTR lpLastSlash = _tcsrchr( lpShortPath, '\\' ); - - if ( lpLastSlash ) - { - int nParentLen = lpLastSlash - lpShortPath; - LPTSTR lpParentPath = (LPTSTR)_alloca( (nParentLen + 1) * sizeof(TCHAR) ); - - CopyMemory( lpParentPath, lpShortPath, nParentLen * sizeof(TCHAR) ); - lpParentPath[nParentLen] = 0; - - dwResult = GetLongPathName( lpParentPath, lpLongPath, cchBuffer ); - - if ( !dwResult ) - _tcscpy( lpLongPath, lpParentPath ); - } - else - { - _tcscpy( lpLongPath, lpShortPath ); - dwResult = _tcslen( lpLongPath ); - } - - if ( dwResult < cchBuffer ) - { - _tcscat( lpLongPath, TEXT("\\") ); - _tcscat( lpLongPath, aFindFileData.cFileName ); - dwResult = _tcslen( lpLongPath ); - } - else - dwResult += _tcslen( aFindFileData.cFileName ) + 1; - } - } - - return dwResult; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp deleted file mode 100644 index eef6503d046e..000000000000 --- a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) ) -#include "GetLongPathName.cpp" -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp deleted file mode 100644 index b7280db13bb0..000000000000 --- a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define UNICODE -#include "macros.h" - -EXTERN_C DWORD WINAPI GetLongPathNameW_NT( LPCWSTR lpShortPath, LPWSTR lpLongPath, DWORD cchBuffer ) -#include "GetLongPathName.cpp" - -EXTERN_C DWORD WINAPI GetLongPathNameW_WINDOWS( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) -{ - AUTO_WSTR2STR( lpShortPath ); - AUTO_STR( lpLongPath, cchBuffer ); - - DWORD dwResult = GetLongPathNameA( lpShortPathA, lpLongPathA, cchBuffer ); - - if ( dwResult && dwResult < cchBuffer ) - STR2WSTR( lpLongPath, cchBuffer ); - - return dwResult; -} - - -EXTERN_C void WINAPI ResolveThunk_GetLongPathNameW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName ) -{ - if ( (LONG)GetVersion() < 0 ) - *lppfn = (FARPROC)GetLongPathNameW_WINDOWS; - else - { - FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); - if ( !lpfnResult ) - lpfnResult = (FARPROC)GetLongPathNameW_NT; - - *lppfn = lpfnResult; - } -} - - -DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp deleted file mode 100644 index f5231b212490..000000000000 --- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "macros.h" -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif -#include <psapi.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif -#include <tlhelp32.h> - -IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize ) ) -{ - DWORD dwProcessId = 0; - DWORD dwResult = 0; - - if ( !hProcess || hProcess == GetCurrentProcess() || GetCurrentProcessId() == (dwProcessId = GetProcessId( hProcess )) ) - return GetModuleFileNameA( hModule, lpFileName, nSize ); - - HANDLE hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwProcessId ); - - if ( IsValidHandle( hSnapshot ) ) - { - MODULEENTRY32 me; - - me.dwSize = sizeof(me); - if ( Module32First( hSnapshot, &me ) ) - { - BOOL fFound = FALSE; - - if ( NULL == hModule ) - fFound = TRUE; - else do - { - fFound = (me.hModule == hModule); - } while ( !fFound && Module32Next( hSnapshot, &me ) ); - - if ( fFound ) - { - dwResult = _tcslen( me.szExePath ); - - if ( dwResult > nSize && nSize > 0 ) - lpFileName[nSize -1] = 0; - - _tcsncpy( lpFileName, me.szExePath, nSize ); - } - } - - CloseHandle( hSnapshot ); - } - - return dwResult; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp deleted file mode 100644 index 2c476731c19a..000000000000 --- a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "macros.h" -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif -#include <psapi.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExW, (HANDLE hProcess, HMODULE hModule, LPWSTR lpFileNameW, DWORD nSize ) ) -{ - AUTO_STR( lpFileName, 2 * nSize ); - - if ( GetModuleFileNameExA( hProcess, hModule, lpFileNameA, 2 * nSize ) ) - return (DWORD) STR2WSTR( lpFileName, nSize ); - else - return 0; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetProcessId.cpp b/sal/systools/win32/uwinapi/GetProcessId.cpp deleted file mode 100644 index 0e365a040008..000000000000 --- a/sal/systools/win32/uwinapi/GetProcessId.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" -#include "win95sys.h" -#include <tlhelp32.h> -static FARPROC WINAPI GetRealProcAddress( HMODULE hModule, LPCSTR lpProcName ) -{ - FARPROC lpfn = GetProcAddress( hModule, lpProcName ); - - if ( lpfn ) - { - if ( 0x68 == *(LPBYTE)lpfn ) - { - /* - 82C9F460 68 36 49 F8 BF push 0BFF84936h - 82C9F465 E9 41 62 2F 3D jmp BFF956AB - */ - - lpfn = (FARPROC)*(LPDWORD)((LPBYTE)lpfn + 1); - - /* - BFF956AB 9C pushfd - BFF956AC FC cld - BFF956AD 50 push eax - BFF956AE 53 push ebx - BFF956AF 52 push edx - BFF956B0 64 8B 15 20 00 00 00 mov edx,dword ptr fs:[20h] - BFF956B7 0B D2 or edx,edx - BFF956B9 74 09 je BFF956C4 - BFF956BB 8B 42 04 mov eax,dword ptr [edx+4] - BFF956BE 0B C0 or eax,eax - BFF956C0 74 07 je BFF956C9 - BFF956C2 EB 42 jmp BFF95706 - BFF956C4 5A pop edx - BFF956C5 5B pop ebx - BFF956C6 58 pop eax - BFF956C7 9D popfd - BFF956C8 C3 ret - */ - } - } - - return lpfn; -} - - -typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID ); -typedef OBFUSCATE *LPOBFUSCATE; - -static DWORD WINAPI Obfuscate( DWORD dwPTID ) -{ - static LPOBFUSCATE lpfnObfuscate = NULL; - - if ( !lpfnObfuscate ) - { - LPBYTE lpCode = (LPBYTE)GetRealProcAddress( GetModuleHandleA("KERNEL32"), "GetCurrentThreadId" ); - - if ( lpCode ) - { - /* - GetCurrentThreadId: - lpCode + 00 BFF84936 A1 DC 9C FC BF mov eax,[BFFC9CDC] ; This is the real thread id - lpcode + 05 BFF8493B FF 30 push dword ptr [eax] - lpCode + 07 BFF8493D E8 17 C5 FF FF call BFF80E59 ; call Obfuscate function - lpcode + 0C BFF84942 C3 ret - */ - - DWORD dwOffset = *(LPDWORD)(lpCode + 0x08); - - lpfnObfuscate = (LPOBFUSCATE)(lpCode + 0x0C + dwOffset); - /* - Obfuscate: - BFF80E59 A1 CC 98 FC BF mov eax,[BFFC98CC] - BFF80E5E 85 C0 test eax,eax - BFF80E60 75 04 jne BFF80E66 - BFF80E62 33 C0 xor eax,eax - BFF80E64 EB 04 jmp BFF80E6A - BFF80E66 33 44 24 04 xor eax,dword ptr [esp+4] - BFF80E6A C2 04 00 ret 4 - */ - } - - } - - return lpfnObfuscate ? lpfnObfuscate( dwPTID ) : 0; -} - - -EXTERN_C DWORD WINAPI GetProcessId_WINDOWS( HANDLE hProcess ) -{ - if ( GetCurrentProcess() == hProcess ) - return GetCurrentProcessId(); - - DWORD dwProcessId = 0; - PPROCESS_DATABASE pPDB = (PPROCESS_DATABASE)Obfuscate( GetCurrentProcessId() ); - - if ( pPDB && K32OBJ_PROCESS == pPDB->Type ) - { - DWORD dwHandleNumber = (DWORD)hProcess >> 2; - - if ( 0 == ((DWORD)hProcess & 0x03) && dwHandleNumber < pPDB->pHandleTable->cEntries ) - { - if ( - pPDB->pHandleTable->array[dwHandleNumber].pObject && - K32OBJ_PROCESS == pPDB->pHandleTable->array[dwHandleNumber].pObject->Type - ) - dwProcessId = Obfuscate( (DWORD)pPDB->pHandleTable->array[dwHandleNumber].pObject ); - } - - SetLastError( ERROR_INVALID_HANDLE ); - } - - return dwProcessId; -} - - -EXTERN_C DWORD WINAPI GetProcessId_NT( HANDLE hProcess ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; -} - - -EXTERN_C void WINAPI ResolveThunk_GetProcessId( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName ) -{ - if ( (LONG)GetVersion() < 0 ) - *lppfn = (FARPROC)GetProcessId_WINDOWS; - else - { - FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); - if ( !lpfnResult ) - lpfnResult = (FARPROC)GetProcessId_NT; - - *lppfn = lpfnResult; - } -} - - -DEFINE_CUSTOM_THUNK( kernel32, GetProcessId, DWORD, WINAPI, GetProcessId, ( HANDLE hProcess ) ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetUserDomainA.cpp b/sal/systools/win32/uwinapi/GetUserDomainA.cpp deleted file mode 100644 index 9b2d31c17260..000000000000 --- a/sal/systools/win32/uwinapi/GetUserDomainA.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "macros.h" - -EXTERN_C DWORD WINAPI GetUserDomainA_NT( LPSTR lpBuffer, DWORD nSize ) -#include "GetUserDomain_NT.cpp" - -EXTERN_C DWORD WINAPI GetUserDomainA_WINDOWS( LPSTR lpBuffer, DWORD nSize ) -#include "GetUserDomain_WINDOWS.cpp" - -EXTERN_C void WINAPI ResolveThunk_GetUserDomainA( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName ) -{ - if ( (LONG)GetVersion() < 0 ) - *lppfn = (FARPROC)GetUserDomainA_WINDOWS; - else - *lppfn = (FARPROC)GetUserDomainA_NT; -} - -DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainA, DWORD, WINAPI, GetUserDomainA, ( LPSTR lpBuffer, DWORD nSize ) ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetUserDomainW.cpp b/sal/systools/win32/uwinapi/GetUserDomainW.cpp deleted file mode 100644 index efb1b7b04590..000000000000 --- a/sal/systools/win32/uwinapi/GetUserDomainW.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define UNICODE -#include "macros.h" - -EXTERN_C DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) -#include "GetUserDomain_NT.cpp" - - -EXTERN_C DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) -#include "GetUserDomain_WINDOWS.cpp" - -EXTERN_C void WINAPI ResolveThunk_GetUserDomainW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName ) -{ - if ( (LONG)GetVersion() < 0 ) - *lppfn = (FARPROC)GetUserDomainW_WINDOWS; - else - *lppfn = (FARPROC)GetUserDomainW_NT; -} - -DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainW, DWORD, WINAPI, GetUserDomainW, ( LPWSTR lpBuffer, DWORD cchBuffer ) ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp deleted file mode 100644 index 67e7b7018f08..000000000000 --- a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -{ - HKEY hkeyLogon; - HKEY hkeyWorkgroup; - DWORD dwResult = 0; - - - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("Network\\Logon"), - 0, KEY_READ, &hkeyLogon ) ) - { - DWORD dwLogon = 0; - DWORD dwLogonSize = sizeof(dwLogon); - RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize ); - RegCloseKey( hkeyLogon ); - - if ( dwLogon ) - { - HKEY hkeyNetworkProvider; - - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), - 0, KEY_READ, &hkeyNetworkProvider ) ) - { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); - - if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) - dwResult = dwBufferSize / sizeof(TCHAR); - - RegCloseKey( hkeyNetworkProvider ); - } - } - } - else if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"), - 0, KEY_READ, &hkeyWorkgroup ) ) - { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); - - if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) - dwResult = dwBufferSize / sizeof(TCHAR); - - RegCloseKey( hkeyWorkgroup ); - } - - - return dwResult; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp deleted file mode 100644 index 500978c79ed3..000000000000 --- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp deleted file mode 100644 index de61fd2d93d4..000000000000 --- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp deleted file mode 100644 index ac63033c1989..000000000000 --- a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameA, (LPCSTR lpszFileName, LPSTR lpszVolumePathName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp deleted file mode 100644 index 1bb585bf601d..000000000000 --- a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameW, (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp deleted file mode 100644 index 73f58a406dcd..000000000000 --- a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" -#include <vfw.h> - -IMPLEMENT_THUNK( kernel32, WINDOWS, HWND, VFWAPIV, MCIWndCreateW, -( - HWND hwndParent, - HINSTANCE hInstance, - DWORD dwStyle, - LPCWSTR lpFileW -)) -{ - AUTO_WSTR2STR( lpFile ); - - return MCIWndCreateA( hwndParent, hInstance, dwStyle, lpFileA ); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/MoveFileExA.cpp b/sal/systools/win32/uwinapi/MoveFileExA.cpp deleted file mode 100644 index c1e6a3663576..000000000000 --- a/sal/systools/win32/uwinapi/MoveFileExA.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" -#include <sal/macros.h> - -#define WININIT_FILENAME "wininit.ini" -#define RENAME_SECTION "rename" - -IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags ) ) -{ - BOOL fSuccess = FALSE; // assume failure - - // Windows 9x has a special mechanism to move files after reboot - - if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT ) - { - CHAR szExistingFileNameA[MAX_PATH]; - CHAR szNewFileNameA[MAX_PATH] = "NUL"; - - // Path names in WININIT.INI must be in short path name form - - if ( - GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) && - (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH )) - ) - { - CHAR szBuffer[32767]; // The buffer size must not exceed 32K - DWORD dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME ); - - CHAR szRename[MAX_PATH]; // This is enough for at most to times 67 chracters - strcpy( szRename, szNewFileNameA ); - strcat( szRename, "=" ); - strcat( szRename, szExistingFileNameA ); - size_t lnRename = strlen(szRename); - - if ( dwBufLen + lnRename + 2 <= SAL_N_ELEMENTS(szBuffer) ) - { - CopyMemory( &szBuffer[dwBufLen], szRename, lnRename ); - szBuffer[dwBufLen + lnRename ] = 0; - szBuffer[dwBufLen + lnRename + 1 ] = 0; - - fSuccess = WritePrivateProfileSectionA( RENAME_SECTION, szBuffer, WININIT_FILENAME ); - } - else - SetLastError( ERROR_BUFFER_OVERFLOW ); - } - } - else - { - - fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA ); - - if ( !fSuccess && 0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING)) ) - { - BOOL bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING); - - fSuccess = CopyFileA( lpExistingFileNameA, lpNewFileNameA, bFailIfExist ); - - // In case of successfull copy do not return FALSE if delete fails. - // Error detection is done by GetLastError() - - if ( fSuccess ) - { - SetLastError( NO_ERROR ); - DeleteFileA( lpExistingFileNameA ); - } - } - - } - - return fSuccess; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/MoveFileExW.cpp b/sal/systools/win32/uwinapi/MoveFileExW.cpp deleted file mode 100644 index 7613be22681f..000000000000 --- a/sal/systools/win32/uwinapi/MoveFileExW.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExW, ( LPCWSTR lpExistingFileNameW, LPCWSTR lpNewFileNameW, DWORD dwFlags ) ) -{ - AUTO_WSTR2STR( lpExistingFileName ); - AUTO_WSTR2STR( lpNewFileName ); - - return MoveFileExA( lpExistingFileNameA, lpNewFileNameA, dwFlags ); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp deleted file mode 100644 index 089fb332c330..000000000000 --- a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW, -( - LPWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - PathAddBackslashA(lpPathA); - STR2WSTR(lpPath, MAX_PATH); - return lpPathW + wcslen(lpPathW); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp deleted file mode 100644 index 794a6fc2594d..000000000000 --- a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathCompactPathExW, -( - LPWSTR pszOut, - LPCWSTR lpPathW, - UINT cchMax, - DWORD dwFlags -)) -{ - AUTO_WSTR2STR(lpPath); - char* pOutA = (LPSTR)_alloca( cchMax * sizeof(CHAR) ); - BOOL bret = PathCompactPathExA(pOutA, lpPathA, cchMax, dwFlags); - MultiByteToWideChar(CP_ACP, 0, pOutA, -1, pszOut, (int) cchMax); - return bret; -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathFileExistsW.cpp b/sal/systools/win32/uwinapi/PathFileExistsW.cpp deleted file mode 100644 index e66a3fc01ee4..000000000000 --- a/sal/systools/win32/uwinapi/PathFileExistsW.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathFileExistsW, -( - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - return PathFileExistsA(lpPathA); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp deleted file mode 100644 index f218dd5b1292..000000000000 --- a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -#include <tchar.h> -#include <mbstring.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindExtensionW, -( - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - char* pExt = PathFindExtensionA(lpPathA); - - if (*pExt) - { - *pExt = '\0'; - LPWSTR pOutW = const_cast<LPWSTR>(lpPathW); - return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA))); - } - else - return const_cast<LPWSTR>(lpPathW) + wcslen(lpPathW); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp deleted file mode 100644 index fdcf46b91d5e..000000000000 --- a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -#include <mbstring.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindFileNameW, -( - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - char* pFname = PathFindFileNameA(lpPathA); - - if (pFname > lpPathA) - { - *pFname = '\0'; - LPWSTR pOutW = const_cast<LPWSTR>(lpPathW); - return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA))); - } - else - return const_cast<LPWSTR>(lpPathW); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp b/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp deleted file mode 100644 index 22ac05f109e4..000000000000 --- a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsFileSpecW, -( - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - return PathIsFileSpecA(lpPathA); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathIsUNCW.cpp b/sal/systools/win32/uwinapi/PathIsUNCW.cpp deleted file mode 100644 index 2aeb660c3ea3..000000000000 --- a/sal/systools/win32/uwinapi/PathIsUNCW.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsUNCW, -( - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - return PathIsUNCA(lpPathA); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp deleted file mode 100644 index 790ce1ce15d1..000000000000 --- a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathRemoveExtensionW, -( - LPWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - PathRemoveExtensionA(lpPathA); - STR2WSTR(lpPath, wcslen(lpPathW) + 1); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp deleted file mode 100644 index 21bec5bd5281..000000000000 --- a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathRemoveFileSpecW, -( - LPWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - BOOL bret = PathRemoveFileSpecA(lpPathA); - STR2WSTR(lpPath, wcslen(lpPathW) + 1); - return bret; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp deleted file mode 100644 index b79702c06ca0..000000000000 --- a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW, -( - HWND hDlg, - int id, - LPCWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - PathSetDlgItemPathA(hDlg, id, lpPathA); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/PathStripToRootW.cpp b/sal/systools/win32/uwinapi/PathStripToRootW.cpp deleted file mode 100644 index 05a3ce875f96..000000000000 --- a/sal/systools/win32/uwinapi/PathStripToRootW.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -#define _SHLWAPI_ -#include <shlwapi.h> - -IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW, -( - LPWSTR lpPathW -)) -{ - AUTO_WSTR2STR(lpPath); - BOOL bret = PathStripToRootA(lpPathA); - STR2WSTR(lpPath, wcslen(lpPathW) + 1); - return bret; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/ResolveThunk.cpp b/sal/systools/win32/uwinapi/ResolveThunk.cpp deleted file mode 100644 index 0f4ed5e3bb7c..000000000000 --- a/sal/systools/win32/uwinapi/ResolveThunk.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - - -EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ) -{ - FARPROC lpfnResult = (LONG)GetVersion() < 0 ? lpfnEmulate : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); - - if ( !lpfnResult ) - lpfnResult = lpfnEmulate; - - if ( !lpfnResult ) - lpfnResult = lpfnFailure; - - *lppfn = lpfnResult; -} - - -EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ) -{ - FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); - - if ( !lpfnResult ) - lpfnResult = lpfnEmulate; - - if ( !lpfnResult ) - lpfnResult = lpfnFailure; - - *lppfn = lpfnResult; -} - - -EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ) -{ - *lppfn = lpfnEmulate ? lpfnEmulate : lpfnFailure; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp deleted file mode 100644 index d38e75063ccf..000000000000 --- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp +++ /dev/null @@ -1,518 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifdef __MINGW32__ -#define _GDI32_ -#include "macros.h" -#include <w32api.h> -#include <multimon.h> -extern "C" { -extern HMODULE hModuleUnicowsDLL; -} - -EXTERN_C void WINAPI ResolveThunk_UNICOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnFailure ) -{ - FARPROC lpfnResult = (((LONG)GetVersion()&0x800000ff) == 0x80000004) ? GetProcAddress( hModuleUnicowsDLL, lpFuncName ) : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName ); - - if ( !lpfnResult ) - lpfnResult = lpfnFailure; - - *lppfn = lpfnResult; -} - -static void GetProcAddress_Thunk(); -EXTERN_C { _declspec( dllexport ) FARPROC kernel32_GetProcAddress_Ptr = (FARPROC)GetProcAddress_Thunk; } -static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR); -static void GetProcAddress_Thunk() -{ - ResolveThunk_UNICOWS( &kernel32_GetProcAddress_Ptr, "kernel32.dll", "GetProcAddress", (FARPROC)GetProcAddress_Failure ); - asm(" movl %ebp, %esp"); - asm(" popl %ebp"); - asm(" jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr)); -} -EXTERN_C FARPROC WINAPI Internal_GetProcAddress (HINSTANCE,LPCSTR) -{ - asm(" popl %ebp"); - asm(" jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr)); -} -static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return (FARPROC)0; -} - -#define DEFINE_UNICOWS_THUNK( module, rettype, calltype, func, params ) \ -static void func##_Thunk(); \ -EXTERN_C { _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; } \ -static rettype calltype func##_##Failure params; \ -static void func##_Thunk() \ -{ \ - ResolveThunk_UNICOWS( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##Failure ); \ - asm(" movl %ebp, %esp"); \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -EXTERN_C rettype calltype func params \ -{ \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} - -DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, AddAtomW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, AddFontResourceW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddJobW, (HANDLE,DWORD,PBYTE,DWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPortW, (LPWSTR,HWND,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProcessorW, (LPWSTR,LPWSTR,LPWSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrintProvidorW, (LPWSTR,DWORD,PBYTE) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, AddPrinterDriverW, (LPWSTR,DWORD,PBYTE) ) -DEFINE_UNICOWS_THUNK( winspool, HANDLE, WINAPI, AddPrinterW, (LPWSTR,DWORD,PBYTE) ) -DEFINE_UNICOWS_THUNK( winspool, LONG, WINAPI, AdvancedDocumentPropertiesW, (HWND,HANDLE,LPWSTR,PDEVMODE,PDEVMODEW) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, AppendMenuW, (HMENU,UINT,UINT_PTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, BeginUpdateResourceW, (LPCWSTR,BOOL) ) -DEFINE_UNICOWS_THUNK( user32, long, WINAPI, BroadcastSystemMessageW, (DWORD,LPDWORD,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBAndTimeoutsW, (LPCWSTR,LPDCB,LPCOMMTIMEOUTS) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, BuildCommDCBW, (LPCWSTR,LPDCB) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CallMsgFilterW, (LPMSG,int) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CallNamedPipeW, (LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcA, (WNDPROC,HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, CallWindowProcW, (WNDPROC,HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsExW, (LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, ChangeDisplaySettingsW, (PDEVMODEW,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ChangeMenuW, (HMENU,UINT,LPCWSTR,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharLowerBuffW, (LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharLowerW, (LPWSTR) ) -DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharNextW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharPrevW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemBuffW, (LPCWSTR,LPSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, CharToOemW, (LPCWSTR,LPSTR) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, CharUpperBuffW, (LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, LPWSTR, WINAPI, CharUpperW, (LPWSTR) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseColorW, (LPCHOOSECOLORW) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, ChooseFontW, (LPCHOOSEFONTW) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CommConfigDialogW, (LPCWSTR,HWND,LPCOMMCONFIG) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, CompareStringW, (LCID,DWORD,LPCWSTR,int,LPCWSTR,int) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, ConfigurePortW, (LPWSTR,HWND,LPWSTR) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, CopyAcceleratorTableW, (HACCEL,LPACCEL,int) ) -DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, CopyEnhMetaFileW, (HENHMETAFILE,LPCWSTR) ) -//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileExW, (LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CopyFileW, (LPCWSTR,LPCWSTR,BOOL) ) -DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, CopyMetaFileW, (HMETAFILE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, CreateAcceleratorTableW, (LPACCEL,int) ) -DEFINE_UNICOWS_THUNK( gdi32, HCOLORSPACE, WINAPI, CreateColorSpaceW, (LPLOGCOLORSPACEW) ) -DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateDCW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateDialogParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryExW, (LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateDirectoryW, (LPCWSTR,LPSECURITY_ATTRIBUTES) ) -DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateEnhMetaFileW, (HDC,LPCWSTR,LPCRECT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateEventW, (LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileMappingW, (HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateFileW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE) ) -DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontIndirectW, (const LOGFONTW*) ) -DEFINE_UNICOWS_THUNK( gdi32, HFONT, WINAPI, CreateFontW, (int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateICW, (LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateMDIWindowW, (LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMailslotW, (LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES) ) -DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, CreateMetaFileW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateMutexW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, CreateProcessW, (LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, CreateScalableFontResourceW, (DWORD,LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateSemaphoreW, (LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( oeacc, HRESULT, STDAPICALLTYPE, CreateStdAccessibleProxyW, (HWND, LPCWSTR, LONG, REFIID, void**) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateWaitableTimerW, (LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateWindowExW, (DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID) ) -DEFINE_UNICOWS_THUNK( user32, HCONV, WINAPI, DdeConnect, (DWORD,HSZ,HSZ,PCONVCONTEXT) ) -DEFINE_UNICOWS_THUNK( user32, HCONVLIST, WINAPI, DdeConnectList, (DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT) ) -DEFINE_UNICOWS_THUNK( user32, HSZ, WINAPI, DdeCreateStringHandleW, (DWORD,LPCWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeInitializeW, (PDWORD,PFNCALLBACK,DWORD,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeQueryConvInfo, (HCONV,DWORD,PCONVINFO) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, DdeQueryStringW, (DWORD,HSZ,LPWSTR,DWORD,int) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefDlgProcW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefFrameProcW, (HWND,HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefMDIChildProcW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, DefWindowProcW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, DeleteFileW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeleteMonitorW, (LPWSTR,LPWSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePortW, (LPWSTR,HWND,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProcessorW, (LPWSTR,LPWSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrintProvidorW, (LPWSTR,LPWSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, DeletePrinterDriverW, (LPWSTR,LPWSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxIndirectParamW, (HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DialogBoxParamW, (HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, DispatchMessageW, (const MSG*) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListComboBoxW, (HWND,LPWSTR,int,int,UINT) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DlgDirListW, (HWND,LPWSTR,int,int,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectComboBoxExW, (HWND,LPWSTR,int,int) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DlgDirSelectExW, (HWND,LPWSTR,int,int) ) -DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, DragQueryFileW, (HDROP,UINT,LPWSTR,UINT) ) -//DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, DrawStateW, (HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextExW, (HDC,LPWSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, DrawTextW, (HDC,LPCWSTR,int,LPRECT,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnableWindow, (HWND,BOOL) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EndUpdateResourceW, (HANDLE,BOOL) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoExW, (CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumCalendarInfoW, (CALINFO_ENUMPROCW,LCID,CALID,CALTYPE) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, EnumClipboardFormats, (UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsExW, (DATEFMT_ENUMPROCEXW,LCID,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumDateFormatsW, (DATEFMT_ENUMPROCW,LCID,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplayDevicesW, (LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsExW, (LPCWSTR,DWORD,LPDEVMODEW,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, EnumDisplaySettingsW, (LPCWSTR,DWORD,PDEVMODEW) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesExW, (HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontFamiliesW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumFontsW, (HDC,LPCWSTR,FONTENUMPROCW,LPARAM) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, EnumICMProfilesW, (HDC,ICMENUMPROCW,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsA, (HWND,PROPENUMPROCA) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExA, (HWND,PROPENUMPROCEXA,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsExW, (HWND,PROPENUMPROCEXW,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, EnumPropsW, (HWND,PROPENUMPROCW) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemCodePagesW, (CODEPAGE_ENUMPROCW,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumSystemLocalesW, (LOCALE_ENUMPROCW,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, EnumTimeFormatsW, (TIMEFMT_ENUMPROCW,LCID,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, ExpandEnvironmentStringsW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, ExtTextOutW, (HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*) ) -DEFINE_UNICOWS_THUNK( shell32, UINT, WINAPI, ExtractIconExW, (LPCWSTR,int,HICON*,HICON*,UINT) ) -DEFINE_UNICOWS_THUNK( shell32, HICON, WINAPI, ExtractIconW, (HINSTANCE,LPCWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, FatalAppExitW, (UINT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FillConsoleOutputCharacterW, (HANDLE,WCHAR,DWORD,COORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, FindAtomW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstChangeNotificationW, (LPCWSTR,BOOL,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FindFirstFileW, (LPCWSTR,LPWIN32_FIND_DATAW) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FindNextFileW, (HANDLE,LPWIN32_FIND_DATAW) ) -DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceExW, (HINSTANCE,LPCWSTR,LPCWSTR,WORD) ) -DEFINE_UNICOWS_THUNK( kernel32, HRSRC, WINAPI, FindResourceW, (HINSTANCE,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, FindTextW, (LPFINDREPLACEW) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowExW, (HWND,HWND,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, FindWindowW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, FormatMessageW, (DWORD,PCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FreeEnvironmentStringsW, (LPWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpCreateDirectoryW, (HANDLE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpDeleteFileW, (HANDLE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, FtpFindFirstFileW, (HANDLE,LPCWSTR,LPWIN32_FIND_DATA,DWORD,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpGetCurrentDirectoryW, (HANDLE,LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpRemoveDirectoryW, (HANDLE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, FtpSetCurrentDirectoryW, (HANDLE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetAltTabInfoW, (HWND,int,PALTTABINFO,LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetAtomNameW, (ATOM,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfo, (UINT,LPCPINFO) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExA, (UINT,DWORD,LPCPINFOEXA) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetCPInfoExW, (UINT,DWORD,LPCPINFOEXW) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCalendarInfoW, (LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharABCWidthsW, (HDC,UINT,UINT,LPABC) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthFloatW, (HDC,UINT,UINT,PFLOAT) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetCharWidthW, (HDC,UINT,UINT,LPINT) ) -DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetCharacterPlacementW, (HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoExW, (HINSTANCE,LPCWSTR,LPWNDCLASSEXW) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetClassInfoW, (HINSTANCE,LPCWSTR,LPWNDCLASSW) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetClassLongW, (HWND,int) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClassNameW, (HWND,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetClipboardData, (UINT) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetClipboardFormatNameW, (UINT,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetComputerNameW, (LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetConsoleTitleW, (LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetCurrencyFormatW, (LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetCurrentDirectoryW, (DWORD,LPWSTR) ) -DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetCurrentHwProfileW, (LPHW_PROFILE_INFOW) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetDateFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,PDWORD) ) -//DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceExW, (LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetDiskFreeSpaceW, (LPCWSTR,PDWORD,PDWORD,PDWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetDlgItemTextW, (HWND,int,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetDriveTypeW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetEnhMetaFileDescriptionW, (HENHMETAFILE,UINT,LPWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, HENHMETAFILE, WINAPI, GetEnhMetaFileW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, GetEnvironmentStringsW, (void) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetEnvironmentVariableW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetFileAttributesExW, (LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFileAttributesW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( comdlg32, short, WINAPI, GetFileTitleW, (LPCWSTR,LPWSTR,WORD) ) -DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (LPWSTR,DWORD,DWORD,PVOID) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFullPathNameW, (LPCWSTR,DWORD,LPWSTR,LPWSTR*) ) -DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetGlyphOutlineW, (HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetICMProfileW, (HDC,LPDWORD,LPWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetKerningPairsW, (HDC,DWORD,LPKERNINGPAIR) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetKeyNameTextW, (LONG,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetKeyboardLayoutNameW, (LPWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetLocaleInfoW, (LCID,LCTYPE,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetLogColorSpaceW, (HCOLORSPACE,LPLOGCOLORSPACEW,DWORD) ) -//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLogicalDriveStringsW, (DWORD,LPWSTR) ) -//DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetLongPathNameW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMenuItemInfoW, (HMENU,UINT,BOOL,LPMENUITEMINFOW) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetMenuStringW, (HMENU,UINT,LPWSTR,int,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMessageW, (LPMSG,HWND,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( gdi32, HMETAFILE, WINAPI, GetMetaFileW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetModuleFileNameW, (HINSTANCE,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, HMODULE, WINAPI, GetModuleHandleW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GetMonitorInfoW, (HMONITOR,LPMONITORINFO) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetNamedPipeHandleStateW, (HANDLE,PDWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetNumberFormatW, (LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetObjectW, (HGDIOBJ,int,PVOID) ) -DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetOpenFileNamePreviewW, (LPOPENFILENAMEW) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetOpenFileNameW, (LPOPENFILENAMEW) ) -DEFINE_UNICOWS_THUNK( gdi32, UINT, WINAPI, GetOutlineTextMetricsW, (HDC,UINT,LPOUTLINETEXTMETRICW) ) -DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, GetPrintProcessorDirectoryW, (LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetPrivateProfileIntW, (LPCWSTR,LPCWSTR,INT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionNamesW, (LPWSTR,DWORD,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileSectionW, (LPCWSTR,LPWSTR,DWORD,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetPrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetProfileIntW, (LPCWSTR,LPCWSTR,INT) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileSectionW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropA, (HWND,LPCSTR) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, GetPropW, (HWND,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetRoleTextW, (DWORD,LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( msvfw32, BOOL, WINAPI, GetSaveFileNamePreviewW, (LPOPENFILENAMEW) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, GetSaveFileNameW, (LPOPENFILENAMEW) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetShortPathNameW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, VOID, WINAPI, GetStartupInfoW, (LPSTARTUPINFOW) ) -DEFINE_UNICOWS_THUNK( oleacc, UINT, WINAPI, GetStateTextW, (DWORD,LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeExW, (LCID,DWORD,LPCWSTR,int,LPWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,CONST INT*) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPoint32W, ( HDC,LPCWSTR,int,LPSIZE) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentPointW, (HDC,LPCWSTR,int,LPSIZE) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, GetTextFaceW, (HDC,int,LPWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextMetricsW, (HDC,LPTEXTMETRICW) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, GetTimeFormatW, (LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, GetUserNameW, (LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVersionExW, (LPOSVERSIONINFOW) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetVolumeInformationW, (LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongA, (HWND,int) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, GetWindowLongW, (HWND,int) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, GetWindowModuleFileNameW, (HWND,LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextLengthW, (HWND) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, GetWindowTextW, (HWND,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetWindowsDirectoryW, (LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalAddAtomW, ( LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, ATOM, WINAPI, GlobalFindAtomW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GlobalGetAtomNameW, (ATOM,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, GopherFindFirstFileW, (HANDLE,LPCWSTR,LPCWSTR,LPVOID,DWORD,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, GrayStringW, (HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, ImageList_LoadImageW, (HINSTANCE,LPCWSTR,int,int,COLORREF,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuItemW, (HMENU,UINT,BOOL,LPCMENUITEMINFOW) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InsertMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, InternetFindNextFileW, (HANDLE,PVOID) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsBadStringPtrW, (LPCWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaNumericW, (WCHAR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharAlphaW, (WCHAR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharLowerW, (WCHAR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsCharUpperW, (WCHAR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsClipboardFormatAvailable, (UINT) ) -DEFINE_UNICOWS_THUNK( sensapi, BOOL, APIENTRY, IsDestinationReachableW, (LPCWSTR,LPVOID) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsDialogMessageW, (HWND,LPMSG) ) -DEFINE_UNICOWS_THUNK( advapi32, BOOL, WINAPI, IsTextUnicode, (PCVOID,int,LPINT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, IsValidCodePage, (UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, IsWindowUnicode, (HWND) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, LCMapStringW, (LCID,DWORD,LPCWSTR,int,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, HACCEL, WINAPI, LoadAcceleratorsW, (HINSTANCE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HBITMAP, WINAPI, LoadBitmapW, (HINSTANCE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorFromFileW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HCURSOR, WINAPI, LoadCursorW, (HINSTANCE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HICON, WINAPI, LoadIconW, (HINSTANCE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, LoadImageW, (HINSTANCE,LPCWSTR,UINT,int,int,UINT) ) -DEFINE_UNICOWS_THUNK( user32, HKL, WINAPI, LoadKeyboardLayoutW, (LPCWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryExW, (LPCWSTR,HANDLE,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, HINSTANCE, WINAPI, LoadLibraryW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuIndirectW, (const MENUTEMPLATE*) ) -DEFINE_UNICOWS_THUNK( user32, HMENU, WINAPI, LoadMenuW, (HINSTANCE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, LoadStringW, (HINSTANCE,UINT,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, HINSTANCE, WINAPI, MLLoadLibraryW, (LPCWSTR,HANDLE,DWORD,LPCWSTR,BOOL) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyExW, (UINT,UINT,HKL) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, MapVirtualKeyW, (UINT,UINT) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxExW, (HWND,LPCWSTR,LPCWSTR,UINT,WORD) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxIndirectW, (CONST MSGBOXPARAMSW*) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, MessageBoxW, (HWND,LPCWSTR,LPCWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, ModifyMenuW, (HMENU,UINT,UINT,UINT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, MoveFileW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, MultiByteToWideChar, (UINT,DWORD,LPCSTR,int,LPWSTR,int) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, MultinetGetConnectionPerformanceW, (LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharBuffW, (LPCSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, OemToCharW, (LPCSTR,LPWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenEventW, (DWORD,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenFileMappingW, (DWORD,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenMutexW, (DWORD,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, OpenPrinterW, (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenSemaphoreW, (DWORD,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, OpenWaitableTimerW, (DWORD,BOOL,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, void, WINAPI, OutputDebugStringW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PageSetupDlgW, (LPPAGESETUPDLGW) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, PeekConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PeekMessageW, (LPMSG,HWND,UINT,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, PlaySoundW, (LPCWSTR,HMODULE,DWORD) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, PolyTextOutW, (HDC,const POLYTEXTW*,int) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostMessageW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, PostThreadMessageW, (DWORD,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( comdlg32, BOOL, WINAPI, PrintDlgW, (LPPRINTDLGW) ) -DEFINE_UNICOWS_THUNK( comdlg32, DWORD, WINAPI, PrinterMessageBoxW, (HANDLE,DWORD,HWND,LPWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, QueryDosDeviceW, (LPCWSTR,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasConnectionNotificationW, (HANDLE, HANDLE, DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasCreatePhonebookEntryW, (HWND, LPCWSTR) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteEntryW, (LPCWSTR, LPCWSTR) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasDeleteSubEntryW, (LPCWSTR, LPCWSTR, DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEditPhonebookEntryW, (HWND, LPCWSTR, LPCWSTR) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumConnectionsW, (LPVOID, LPDWORD, LPDWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumDevicesW, (LPVOID, LPDWORD, LPDWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasEnumEntriesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPDWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetConnectStatusW, (HANDLE, LPVOID) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryDialParamsW, (LPCWSTR, LPVOID, LPBOOL) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, LPDWORD, LPBYTE, LPDWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasGetErrorStringW, (UINT, LPWSTR, DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasHangUpW, (HANDLE) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasRenameEntryW, (LPCWSTR, LPCWSTR, LPCWSTR) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryDialParamsW, (LPCWSTR, LPVOID, BOOL) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetEntryPropertiesW, (LPCWSTR, LPCWSTR, LPVOID, DWORD, LPBYTE, DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasSetSubEntryPropertiesW, (LPCWSTR, LPCWSTR, DWORD, LPVOID, DWORD, LPBYTE, DWORD) ) -DEFINE_UNICOWS_THUNK( rasapi32, DWORD, APIENTRY, RasValidateEntryNameW, (LPCWSTR, LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleInputW, (HANDLE,PINPUT_RECORD,DWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputCharacterW, (HANDLE,LPWSTR,DWORD,COORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleOutputW, (HANDLE,PCHAR_INFO,COORD,COORD,PSMALL_RECT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ReadConsoleW, (HANDLE,PVOID,DWORD,PDWORD,PVOID) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegConnectRegistryW, (LPCWSTR,HKEY,PHKEY) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyExW, (HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegCreateKeyW, (HKEY,LPCWSTR,PHKEY) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteKeyW, (HKEY,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegDeleteValueW, (HKEY,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyExW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumKeyW, (HKEY,DWORD,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegEnumValueW, (HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegLoadKeyW, (HKEY,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyExW, (HKEY,LPCWSTR,DWORD,REGSAM,PHKEY) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegOpenKeyW, (HKEY,LPCWSTR,PHKEY) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryInfoKeyW, (HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryMultipleValuesW, (HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueExW, (HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegQueryValueW, (HKEY,LPCWSTR,LPWSTR,PLONG) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegReplaceKeyW, (HKEY,LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSaveKeyW, (HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueExW, (HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegSetValueW, (HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( advapi32, LONG, WINAPI, RegUnLoadKeyW, (HKEY,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassExW, (CONST WNDCLASSEXW*) ) -DEFINE_UNICOWS_THUNK( user32, ATOM, WINAPI, RegisterClassW, (CONST WNDCLASSW*) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterClipboardFormatW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HDEVNOTIFY, WINAPI, RegisterDeviceNotificationW, (HANDLE,LPVOID,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, RegisterWindowMessageW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, RemoveDirectoryW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, RemoveFontResourceW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropA, (HWND,LPCSTR) ) -DEFINE_UNICOWS_THUNK( user32, HANDLE, WINAPI, RemovePropW, (HWND,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( comdlg32, HWND, WINAPI, ReplaceTextW, (LPFINDREPLACEW) ) -DEFINE_UNICOWS_THUNK( gdi32, HDC, WINAPI, ResetDCW, (HDC,const DEVMODEW*) ) -DEFINE_UNICOWS_THUNK( shell32, LPVOID, WINAPI, SHBrowseForFolderW, (LPVOID) ) -DEFINE_UNICOWS_THUNK( shell32, void, WINAPI, SHChangeNotify, (LONG,UINT,PCVOID,PCVOID) ) -DEFINE_UNICOWS_THUNK( shell32, INT, WINAPI, SHCreateDirectoryExW, (HWND,LPCWSTR,LPSECURITY_ATTRIBUTES) ) -DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, SHFileOperationW, (LPSHFILEOPSTRUCTW) ) -DEFINE_UNICOWS_THUNK( shell32, DWORD, WINAPI, SHGetFileInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetNewLinkInfoW, (LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) ) -DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, SHGetPathFromIDListW, (LPVOID,LPWSTR) ) -DEFINE_UNICOWS_THUNK( shell32, int, __stdcall, SQLGetPrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( shell32, BOOL, __stdcall, SQLWritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, ScrollConsoleScreenBufferW, (HANDLE,const SMALL_RECT*,const SMALL_RECT*,COORD,const CHAR_INFO*) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, SearchPathW, (LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SendDlgItemMessageW, (HWND,int,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendMessageCallbackW, (HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageTimeoutW, (HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD) ) -DEFINE_UNICOWS_THUNK( user32, LRESULT, WINAPI, SendMessageW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SendNotifyMessageW, (HWND,UINT,WPARAM,LPARAM) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, SetCalendarInfoW, (LCID,CALID,CALTYPE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetClassLongW, (HWND,int,LONG) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetComputerNameW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetConsoleTitleW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetCurrentDirectoryW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetDefaultCommConfigW, (LPCWSTR,LPCOMMCONFIG,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetDlgItemTextW, (HWND,int,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetEnvironmentVariableW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetFileAttributesW, (LPCWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, SetICMProfileW, (HDC,LPWSTR) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetJobW, (HANDLE,DWORD,DWORD,PBYTE,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetLocaleInfoW, (LCID,LCTYPE,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetMenuItemInfoW, ( HMENU,UINT,BOOL,LPCMENUITEMINFOW) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterDataW, (HANDLE,LPWSTR,DWORD,PBYTE,DWORD) ) -DEFINE_UNICOWS_THUNK( winspool, BOOL, WINAPI, SetPrinterW, (HANDLE,DWORD,PBYTE,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropA, (HWND,LPCSTR,HANDLE) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetPropW, (HWND,LPCWSTR,HANDLE) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, SetVolumeLabelW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongA, (HWND,int,LONG) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, SetWindowLongW, (HWND,int,LONG) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SetWindowTextW, (HWND,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookExW, (int,HOOKPROC,HINSTANCE,DWORD) ) -DEFINE_UNICOWS_THUNK( user32, HHOOK, WINAPI, SetWindowsHookW, (int,HOOKPROC) ) -DEFINE_UNICOWS_THUNK( shell32, int, WINAPI, ShellAboutW, (HWND,LPCWSTR,LPCWSTR,HICON) ) -DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, ShellExecuteExW, (LPSHELLEXECUTEINFOW) ) -DEFINE_UNICOWS_THUNK( shell32, HINSTANCE, WINAPI, ShellExecuteW, (HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT) ) -DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, Shell_NotifyIconW, (DWORD,PNOTIFYICONDATAW) ) -DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) ) -DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,CONST INT*,int) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) ) -DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,LPWSTR,LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) ) -DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) ) -DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) ) -DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, VerLanguageNameW, (DWORD,LPWSTR,DWORD) ) -#if ( __W32API_MAJOR_VERSION > 3 ) || ( __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION > 13 ) -DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, VerQueryValueW, (const LPVOID,LPCWSTR,LPVOID*,PUINT) ) -#else -DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, VerQueryValueW, (const LPVOID,LPWSTR,LPVOID*,PUINT) ) -#endif -DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanExW, (WCHAR,HKL) ) -DEFINE_UNICOWS_THUNK( user32, SHORT, WINAPI, VkKeyScanW, (WCHAR) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, SetupDecompressOrCopyFileW, (PCWSTR,PCWSTR,PUINT) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection2W, (LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnection3W, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetAddConnectionW, (LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnection2W, (LPCWSTR,DWORD,BOOL) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetCancelConnectionW, (LPCWSTR,BOOL) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetConnectionDialog1W, (LPCONNECTDLGSTRUCTW) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetDisconnectDialog1W, (LPDISCDLGSTRUCTW) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetEnumResourceW, (HANDLE,PDWORD,PVOID,PDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetConnectionW, (LPCWSTR,LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetLastErrorW, (PDWORD,LPWSTR,DWORD,LPWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetNetworkInformationW, (LPCWSTR,LPNETINFOSTRUCT) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetProviderNameW, (DWORD,LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceInformationW, (LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetResourceParentW, (LPNETRESOURCEW,LPVOID,LPDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUniversalNameW, (LPCWSTR,DWORD,PVOID,PDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetGetUserW, (LPCWSTR,LPWSTR,PDWORD) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetOpenEnumW, (DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE) ) -DEFINE_UNICOWS_THUNK( mpr, DWORD, APIENTRY, WNetUseConnectionW, (HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WaitNamedPipeW, (LPCWSTR,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, WideCharToMultiByte, (UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL) ) -DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, WinHelpW, (HWND,LPCWSTR,UINT,DWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleInputW, (HANDLE,const INPUT_RECORD*,DWORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputCharacterW, (HANDLE,LPCWSTR,DWORD,COORD,PDWORD) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleOutputW, (HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteConsoleW, (HANDLE,PCVOID,DWORD,PDWORD,PVOID) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileSectionW, (LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WritePrivateProfileStructW, (LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileSectionW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, WriteProfileStringW, (LPCWSTR,LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( avicap32, HWND, WINAPI, capCreateCaptureWindowW, (LPCWSTR, DWORD, int, int, int, int, HWND, int) ) -DEFINE_UNICOWS_THUNK( avicap32, BOOL, WINAPI, capGetDriverDescriptionW, (UINT, LPWSTR, int, LPWSTR, int) ) -DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcatW, (LPWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpW, (LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrcmpiW, ( LPCWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpyW, (LPWSTR,LPCWSTR) ) -DEFINE_UNICOWS_THUNK( kernel32, LPWSTR, WINAPI, lstrcpynW, (LPWSTR,LPCWSTR,int) ) -DEFINE_UNICOWS_THUNK( kernel32, int, WINAPI, lstrlenW, (LPCWSTR) ) -DEFINE_UNICOWS_THUNK( winmm, BOOL, WINAPI, sndPlaySoundW, (LPCWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( winmm, PROC, WINAPI, wglGetProcAddress, (LPCSTR) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPIV, wsprintfW, (LPWSTR,LPCWSTR,...) ) -DEFINE_UNICOWS_THUNK( user32, int, WINAPI, wvsprintfW, (LPWSTR,LPCWSTR,va_list arglist) ) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp deleted file mode 100644 index e0ae9f35e551..000000000000 --- a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "uwinapi.h" - -EXTERN_C LPITEMIDLIST WINAPI SHSimpleIDListFromPathW_Failure( LPCWSTR lpPathW ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return NULL; -} - -EXTERN_C LPITEMIDLIST WINAPI SHSimpleIDListFromPathW_WINDOWS( LPCWSTR lpPathW ) -{ - AUTO_WSTR2STR( lpPath ); - - return SHSimpleIDListFromPathA( lpPathA ); -} - - -EXTERN_C void WINAPI ResolveThunk_SHSimpleIDListFromPathW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName ) -{ - if ( (LONG)GetVersion < 0 ) - *lppfn = (FARPROC)SHSimpleIDListFromPathW_WINDOWS; - else - { - FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), MAKEINTRESOURCE(162) ); - if ( !lpfnResult ) - lpfnResult = (FARPROC)SHSimpleIDListFromPathW_Failure; - - *lppfn = lpfnResult; - } -} - - -DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp deleted file mode 100644 index 423e8238185b..000000000000 --- a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPCSTR lpszVolumeName) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp deleted file mode 100644 index e56d3df6fa9e..000000000000 --- a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.h" - -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPCWSTR lpszVolumeName) ) -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/Uwinapi.def b/sal/systools/win32/uwinapi/Uwinapi.def deleted file mode 100644 index 58893d5a54ad..000000000000 --- a/sal/systools/win32/uwinapi/Uwinapi.def +++ /dev/null @@ -1,22 +0,0 @@ -EXPORTS
- CommandLineToArgvW
- CopyFileW
- CopyFileExW
- CopyFileExA
- DeleteFileW
- DrawStateW
- GetLogicalDriveStringsW
- GetLongPathNameA
- GetLongPathNameW
- LoadLibraryExW
- LoadLibraryW
- MoveFileExA
- MoveFileExW
- MoveFileW
- GetVersion
- DllGetVersion
- lstrrchrA
- lstrrchrW
- lstrchrA
- lstrchrW
-
diff --git a/sal/systools/win32/uwinapi/Uwinapi.h b/sal/systools/win32/uwinapi/Uwinapi.h deleted file mode 100644 index da3e336af1c7..000000000000 --- a/sal/systools/win32/uwinapi/Uwinapi.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#pragma once - -#ifdef _UWINAPI_ -#define _KERNEL32_ -#define _USER32_ -#define _SHELL32_ -#endif - -#include <windows.h> -#include <malloc.h> - -#ifndef _UWINAPI_ -EXTERN_C WINBASEAPI DWORD UWINAPI_dwFakedVersion; -#endif - -EXTERN_C WINBASEAPI DWORD SetVersion( DWORD dwVersion ); - -/* Version macros */ - -#define MAKE_VER_WIN32( major, minor, build, isWindows ) \ -((DWORD)MAKELONG( MAKEWORD( major, minor ), (build) | ( isWindows ? 0x8000 : 0 ) )) - -#define MAKE_VER_WIN32_NT( major, minor, build ) \ - MAKE_VER_WIN32( major, minor, build, FALSE ) - -#define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \ - MAKE_VER_WIN32( major, minor, build, TRUE ) - -#define VER_WIN32_WINDOWS_95 MAKE_VER_WIN32_WINDOWS( 4, 0, 0 ) -#define VER_WIN32_WINDOWS_98 MAKE_VER_WIN32_WINDOWS( 4, 10, 0 ) -#define VER_WIN32_WINDOWS_ME MAKE_VER_WIN32_WINDOWS( 4, 90, 0 ) -#define VER_WIN32_NT_NT4 MAKE_VER_WIN32_NT( 4, 0, 0 ) -#define VER_WIN32_NT_2000 MAKE_VER_WIN32_NT( 5, 0, 0 ) -#define VER_WIN32_NT_XP MAKE_VER_WIN32_NT( 5, 1, 0 ) - - -EXTERN_C WINBASEAPI LPSTR WINAPI lstrchrA( LPCSTR lpString, CHAR c ); -EXTERN_C WINBASEAPI LPWSTR WINAPI lstrchrW( LPCWSTR lpString, WCHAR c ); -EXTERN_C WINBASEAPI LPSTR WINAPI lstrrchrA( LPCSTR lpString, CHAR c ); -EXTERN_C WINBASEAPI LPWSTR WINAPI lstrrchrW( LPCWSTR lpString, WCHAR c ); - -#ifdef UNICODE -#define lstrrchr lstrrchrW -#define lstrchr lstrchrW -#else -#define lstrrchr lstrrchrA -#define lstrchr lstrchrA -#endif - -#define IsValidHandle(Handle) ((DWORD)(Handle) + 1 > 1) - -#ifdef __cplusplus - -#define _AUTO_WSTR2STR( lpStrA, lpStrW ) \ -LPSTR lpStrA; \ -if ( lpStrW ) \ -{ \ - int cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \ - lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \ - WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \ -} \ -else \ - lpStrA = NULL; - - -#define AUTO_WSTR2STR( lpStr ) \ - _AUTO_WSTR2STR( lpStr##A, lpStr##W ) - -#define AUTO_STR( lpStr, cchBuffer ) \ -LPSTR lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL; - -#endif // __cplusplus - -#define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \ - MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, cchDestBuffer ) - -#define STR2WSTR( lpStr, cchBuffer ) \ - STRBUF2WSTR( lpStr, -1, cchBuffer ) - -#define WSTR2STR( lpStr, cchBuffer ) \ - WideCharToMultiByte( CP_ACP, 0, lpStr##W, -1, lpStr##A, cchBuffer, NULL, NULL ) - -EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); -EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); -EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); - - - - -#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ -EXTERN_C rettype calltype func##_##resolve params; \ -static rettype calltype func##_##Failure params; \ -static _declspec ( naked ) func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} \ -EXTERN_C rettype calltype func##_##resolve params - - - - - - - - - - - -#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ -static _declspec ( naked ) func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h deleted file mode 100644 index 91f83af1fc70..000000000000 --- a/sal/systools/win32/uwinapi/macros.h +++ /dev/null @@ -1,235 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define _UWINAPI_ -#include <systools/win32/uwinapi.h> - -#ifndef _INC_MALLOC -# include <malloc.h> -#endif - -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable:4740) -#endif - -#ifndef _INC_TCHAR -# ifdef UNICODE -# define _UNICODE -# endif -# include <tchar.h> -#endif - -// Globally disable "warning C4100: unreferenced formal parameter" caused by -// IMPLEMENT_THUNK: -#ifdef _MSC_VER -#pragma warning(disable:4100) -#endif - -/* Version macros */ - -#define MAKE_VER_WIN32( major, minor, build, isWindows ) \ -((DWORD)MAKELONG( MAKEWORD( major, minor ), (build) | ( isWindows ? 0x8000 : 0 ) )) - -#define MAKE_VER_WIN32_NT( major, minor, build ) \ - MAKE_VER_WIN32( major, minor, build, FALSE ) - -#define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \ - MAKE_VER_WIN32( major, minor, build, TRUE ) - -#define VER_WIN32_WINDOWS_95 MAKE_VER_WIN32_WINDOWS( 4, 0, 0 ) -#define VER_WIN32_WINDOWS_98 MAKE_VER_WIN32_WINDOWS( 4, 10, 0 ) -#define VER_WIN32_WINDOWS_ME MAKE_VER_WIN32_WINDOWS( 4, 90, 0 ) -#define VER_WIN32_NT_NT4 MAKE_VER_WIN32_NT( 4, 0, 0 ) -#define VER_WIN32_NT_2000 MAKE_VER_WIN32_NT( 5, 0, 0 ) -#define VER_WIN32_NT_XP MAKE_VER_WIN32_NT( 5, 1, 0 ) - - -#ifdef __cplusplus - -#define _AUTO_WSTR2STR( lpStrA, lpStrW ) \ -LPSTR lpStrA; \ -if ( lpStrW ) \ -{ \ - int cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \ - lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \ - WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \ -} \ -else \ - lpStrA = NULL; - - -#define AUTO_WSTR2STR( lpStr ) \ - _AUTO_WSTR2STR( lpStr##A, lpStr##W ) - -#define AUTO_STR( lpStr, cchBuffer ) \ -LPSTR lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL; - -#endif /* __cplusplus */ - - -#define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \ - MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, (int) cchDestBuffer ) - -#define STR2WSTR( lpStr, cchBuffer ) \ - STRBUF2WSTR( lpStr, -1, cchBuffer ) - -#define WSTR2STR( lpStr, cchBuffer ) \ - WideCharToMultiByte( CP_ACP, 0, lpStr##W, -1, lpStr##A, cchBuffer, NULL, NULL ) - -EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); -EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); -EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure ); - - - - -#ifdef __MINGW32__ -#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \ -static void func##_Thunk(); \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -EXTERN_C rettype calltype func params \ -{ \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -EXTERN_C rettype calltype func##_##resolve params; \ -static rettype calltype func##_##Failure params; \ -static void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \ - asm(" movl %ebp, %esp"); \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} \ -EXTERN_C rettype calltype func##_##resolve params -#else -#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ -EXTERN_C rettype calltype func##_##resolve params; \ -static rettype calltype func##_##Failure params; \ -static _declspec ( naked ) void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} \ -EXTERN_C rettype calltype func##_##resolve params -#endif - - - -#ifdef __MINGW32__ -#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \ -static void func##_Thunk(); \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -static void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \ - asm(" movl %ebp, %esp"); \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -EXTERN_C rettype calltype func params \ -{ \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} -#else -#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ -static _declspec ( naked ) void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; -#endif - - -#ifdef __MINGW32__ -#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \ -static void func##_Thunk(); \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -static rettype calltype func##_##Failure params; \ -static _declspec ( naked ) void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \ - asm(" movl %ebp, %esp"); \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - asm(" popl %ebp"); \ - asm(" jmp *(%0)"::"m"(module##_##func##_Ptr)); \ -} \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} -#else -#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ -static rettype calltype func##_##Failure params; \ -static _declspec ( naked ) void func##_Thunk() \ -{ \ - ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( naked ) rettype calltype func params \ -{ \ - _asm jmp [module##_##func##_Ptr] \ -} \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ -static rettype calltype func##_##Failure params \ -{ \ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ - return (rettype)0; \ -} -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index 1ec7706b8c0d..0989b6121135 100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -47,69 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type .ENDIF -SLOFILES= - -.IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"!="YES" - -SLOFILES+=\ - $(SLO)$/CheckTokenMembership.obj\ - $(SLO)$/CommandLineToArgvW.obj\ - $(SLO)$/CopyFileExA.obj\ - $(SLO)$/CopyFileExW.obj\ - $(SLO)$/DrawStateW.obj\ - $(SLO)$/EnumProcesses.obj\ - $(SLO)$/GetLogicalDriveStringsW.obj\ - $(SLO)$/GetLongPathNameA.obj\ - $(SLO)$/GetLongPathNameW.obj\ - $(SLO)$/GetModuleFileNameExA.obj\ - $(SLO)$/GetModuleFileNameExW.obj\ - $(SLO)$/GetProcessId.obj\ - $(SLO)$/GetUserDefaultUILanguage.obj\ - $(SLO)$/GetUserDomainA.obj\ - $(SLO)$/GetUserDomainW.obj\ - $(SLO)$/GetDiskFreeSpaceExA.obj\ - $(SLO)$/GetDiskFreeSpaceExW.obj\ - $(SLO)$/MoveFileExA.obj\ - $(SLO)$/MoveFileExW.obj\ - $(SLO)$/toolhelp.obj\ - $(SLO)$/DllGetVersion.obj\ - $(SLO)$/DllMain.obj\ - $(SLO)$/ResolveThunk.obj\ - $(SLO)$/ResolveUnicows.obj\ - $(SLO)$/FindFirstVolumeA.obj\ - $(SLO)$/FindFirstVolumeW.obj\ - $(SLO)$/FindNextVolumeA.obj\ - $(SLO)$/FindNextVolumeW.obj\ - $(SLO)$/FindVolumeClose.obj\ - $(SLO)$/FindFirstVolumeMountPointA.obj\ - $(SLO)$/FindFirstVolumeMountPointW.obj\ - $(SLO)$/FindNextVolumeMountPointA.obj\ - $(SLO)$/FindNextVolumeMountPointW.obj\ - $(SLO)$/FindVolumeMountPointClose.obj\ - $(SLO)$/GetVolumeNameForVolumeMountPointA.obj\ - $(SLO)$/GetVolumeNameForVolumeMountPointW.obj\ - $(SLO)$/DeleteVolumeMountPointA.obj\ - $(SLO)$/DeleteVolumeMountPointW.obj\ - $(SLO)$/GetVolumePathNameA.obj\ - $(SLO)$/GetVolumePathNameW.obj\ - $(SLO)$/SetVolumeMountPointA.obj\ - $(SLO)$/SetVolumeMountPointW.obj\ - $(SLO)$/PathAddBackslashW.obj\ - $(SLO)$/PathCompactPathExW.obj\ - $(SLO)$/PathFileExistsW.obj\ - $(SLO)$/PathFindExtensionW.obj\ - $(SLO)$/PathFindFileNameW.obj\ - $(SLO)$/PathIsFileSpecW.obj\ - $(SLO)$/PathIsUNCW.obj\ - $(SLO)$/PathRemoveExtensionW.obj\ - $(SLO)$/PathRemoveFileSpecW.obj\ - $(SLO)$/PathSetDlgItemPathW.obj\ - $(SLO)$/PathStripToRootW.obj\ - $(SLO)$/SHCreateItemFromParsingName.obj - -.ENDIF - -SLOFILES+=\ +SLOFILES=\ $(SLO)$/snprintf.obj\ $(SLO)$/snwprintf.obj diff --git a/sal/systools/win32/uwinapi/toolhelp.cpp b/sal/systools/win32/uwinapi/toolhelp.cpp deleted file mode 100644 index 411b6a2b6e17..000000000000 --- a/sal/systools/win32/uwinapi/toolhelp.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#include "macros.h" -#include <tlhelp32.h> - - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32First, (HANDLE hSnapshot, LPMODULEENTRY32 lpme ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32FirstW, (HANDLE hSnapshot, LPMODULEENTRY32W lpme ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32Next, (HANDLE hSnapshot, LPMODULEENTRY32 lpme ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Module32NextW, (HANDLE hSnapshot, LPMODULEENTRY32W lpme ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32First, (HANDLE hSnapshot, LPPROCESSENTRY32 lppe ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32FirstW, (HANDLE hSnapshot, LPPROCESSENTRY32W lppe ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32Next, (HANDLE hSnapshot, LPPROCESSENTRY32 lppe ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, Process32NextW, (HANDLE hSnapshot, LPPROCESSENTRY32W lppe ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - -IMPLEMENT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, CreateToolhelp32Snapshot, (DWORD dwFlags, DWORD th32ProcessID ) ) -{ - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return NULL; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/systools/win32/uwinapi/unicows.dxp b/sal/systools/win32/uwinapi/unicows.dxp deleted file mode 100644 index 771782a76b7b..000000000000 --- a/sal/systools/win32/uwinapi/unicows.dxp +++ /dev/null @@ -1,546 +0,0 @@ -;************************************************************************* -; -; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -; -; Copyright 2000, 2010 Oracle and/or its affiliates. -; -; OpenOffice.org - a multi-platform office productivity suite -; -; This file is part of OpenOffice.org. -; -; OpenOffice.org is free software: you can redistribute it and/or modify -; it under the terms of the GNU Lesser General Public License version 3 -; only, as published by the Free Software Foundation. -; -; OpenOffice.org is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Lesser General Public License version 3 for more details -; (a copy is included in the LICENSE file that accompanied this code). -; -; You should have received a copy of the GNU Lesser General Public License -; version 3 along with OpenOffice.org. If not, see -; <http://www.openoffice.org/license.html> -; for a copy of the LGPLv3 License. -; -;************************************************************************* -; -; Functions that are exported but not implemented by unicows.dll -; are only inserted as comment. -; -; In addition to MSDN Platform SDK documentation the following functions -; are not implemented too: -; AddMonitorW, FreeContextBufferW, GetPrinterDriverDirectoryW, -; MCIWndCreateW -; -; The following functions of unicows.dll are buggy: -; DrawStateW, GetLogicalDriveStringsW (both implemented in uwinapi.dll) -; -; The following functions of unicows.dll are wrapped but the ANSI versions -; do not exist on Win9x so the wrapper is useless: -; MoveFileExW, CopyFileExW (both implemented in uwinapi.dll along with the -; ANSI versions ) -; -; These functions do not exist on Win 95 and NT neither as Unicode -; nor as ANSI version, so the wrapper will fail on NT4 and Win 95 -; GetLongPathNameW ( implemented in uwinapi.dll along with the -; ANSI version ) -; -; These essential functions aren't implemented by unicows.dll because -; there's no ANSI version: -; CommandLineToArgvW (implemented by uwinapi.dll) -; -;************************************************************************* - -;AcquireCredentialsHandleW -AddAtomW -AddFontResourceW -AddJobW -;AddMonitorW -AddPortW -AddPrintProcessorW -AddPrintProvidorW -AddPrinterDriverW -AddPrinterW -AdvancedDocumentPropertiesW -AppendMenuW -BeginUpdateResourceW -BroadcastSystemMessageW -BuildCommDCBAndTimeoutsW -BuildCommDCBW -CallMsgFilterW -CallNamedPipeW -CallWindowProcA -CallWindowProcW -ChangeDisplaySettingsExW -ChangeDisplaySettingsW -ChangeMenuW -CharLowerBuffW -CharLowerW -CharNextW -CharPrevW -CharToOemBuffW -CharToOemW -CharUpperBuffW -CharUpperW -ChooseColorW -ChooseFontW -CommConfigDialogW -CompareStringW -ConfigurePortW -CopyAcceleratorTableW -CopyEnhMetaFileW -CopyFileExW -CopyFileW -CopyMetaFileW -CreateAcceleratorTableW -CreateColorSpaceW -CreateDCW -CreateDialogIndirectParamW -CreateDialogParamW -CreateDirectoryExW -CreateDirectoryW -CreateEnhMetaFileW -CreateEventW -CreateFileMappingW -CreateFileW -CreateFontIndirectW -CreateFontW -CreateICW -CreateMDIWindowW -CreateMailslotW -CreateMetaFileW -CreateMutexW -;CreateNamedPipeW -CreateProcessW -CreateScalableFontResourceW -CreateSemaphoreW -CreateStdAccessibleProxyW -CreateWaitableTimerW -CreateWindowExW -DdeConnect -DdeConnectList -DdeCreateStringHandleW -DdeInitializeW -DdeQueryConvInfo -DdeQueryStringW -DefDlgProcW -DefFrameProcW -DefMDIChildProcW -DefWindowProcW -DeleteFileW -DeleteMonitorW -DeletePortW -DeletePrintProcessorW -DeletePrintProvidorW -DeletePrinterDriverW -;DeviceCapabilitiesW -DialogBoxIndirectParamW -DialogBoxParamW -DispatchMessageW -DlgDirListComboBoxW -DlgDirListW -DlgDirSelectComboBoxExW -DlgDirSelectExW -;DocumentPropertiesW -DragQueryFileW -DrawStateW -DrawTextExW -DrawTextW -EnableWindow -EndUpdateResourceW -EnumCalendarInfoExW -EnumCalendarInfoW -EnumClipboardFormats -EnumDateFormatsExW -EnumDateFormatsW -EnumDisplayDevicesW -EnumDisplaySettingsExW -EnumDisplaySettingsW -EnumFontFamiliesExW -EnumFontFamiliesW -EnumFontsW -EnumICMProfilesW -;EnumMonitorsW -;EnumPortsW -;EnumPrintProcessorDatatypesW -;EnumPrintProcessorsW -;EnumPrinterDriversW -;EnumPrintersW -EnumPropsA -EnumPropsExA -EnumPropsExW -EnumPropsW -EnumSystemCodePagesW -EnumSystemLocalesW -EnumTimeFormatsW -;EnumerateSecurityPackagesW -ExpandEnvironmentStringsW -ExtTextOutW -ExtractIconExW -ExtractIconW -FatalAppExitW -FillConsoleOutputCharacterW -FindAtomW -;FindExecutableW -FindFirstChangeNotificationW -FindFirstFileW -FindNextFileW -FindResourceExW -FindResourceW -FindTextW -FindWindowExW -FindWindowW -FormatMessageW -;FreeContextBufferW -FreeEnvironmentStringsW -GetAltTabInfoW -GetAtomNameW -GetCPInfo -GetCPInfoExW -GetCalendarInfoW -;GetCharABCWidthsFloatW -GetCharABCWidthsW -GetCharWidthFloatW -GetCharWidthW -GetCharacterPlacementW -GetClassInfoExW -GetClassInfoW -GetClassLongW -GetClassNameW -GetClipboardData -GetClipboardFormatNameW -GetComputerNameW -GetConsoleTitleW -GetCurrencyFormatW -GetCurrentDirectoryW -GetCurrentHwProfileW -GetDateFormatW -GetDefaultCommConfigW -GetDiskFreeSpaceExW -GetDiskFreeSpaceW -GetDlgItemTextW -GetDriveTypeW -GetEnhMetaFileDescriptionW -GetEnhMetaFileW -GetEnvironmentStringsW -GetEnvironmentVariableW -GetFileAttributesExW -GetFileAttributesW -GetFileTitleW -GetFileVersionInfoSizeW -GetFileVersionInfoW -GetFullPathNameW -GetGlyphOutlineW -GetICMProfileW -;GetJobW -GetKerningPairsW -GetKeyNameTextW -GetKeyboardLayoutNameW -GetLocaleInfoW -GetLogColorSpaceW -GetLogicalDriveStringsW -GetLongPathNameW -GetMenuItemInfoW -GetMenuStringW -GetMessageW -GetMetaFileW -GetModuleFileNameW -GetModuleHandleW -GetMonitorInfoW -GetNamedPipeHandleStateW -GetNumberFormatW -GetObjectW -GetOpenFileNamePreviewW -GetOpenFileNameW -GetOutlineTextMetricsW -GetPrintProcessorDirectoryW -;GetPrinterDataW -;GetPrinterDriverDirectoryW -;GetPrinterDriverW -;GetPrinterW -GetPrivateProfileIntW -GetPrivateProfileSectionNamesW -GetPrivateProfileSectionW -GetPrivateProfileStringW -GetPrivateProfileStructW -;GetProcAddress -GetProfileIntW -GetProfileSectionW -GetProfileStringW -GetPropA -GetPropW -GetRoleTextW -GetSaveFileNamePreviewW -GetSaveFileNameW -GetShortPathNameW -GetStartupInfoW -GetStateTextW -GetStringTypeExW -GetStringTypeW -GetSystemDirectoryW -GetSystemWindowsDirectoryW -GetTabbedTextExtentW -GetTempFileNameW -GetTempPathW -GetTextExtentExPointW -GetTextExtentPoint32W -GetTextExtentPointW -GetTextFaceW -GetTextMetricsW -GetTimeFormatW -GetUserNameW -GetVersionExW -GetVolumeInformationW -GetWindowLongA -GetWindowLongW -GetWindowModuleFileNameW -GetWindowTextLengthW -GetWindowTextW -GetWindowsDirectoryW -GlobalAddAtomW -GlobalFindAtomW -GlobalGetAtomNameW -GrayStringW -;InitSecurityInterfaceW -;InitializeSecurityContextW -InsertMenuItemW -InsertMenuW -IsBadStringPtrW -IsCharAlphaNumericW -IsCharAlphaW -IsCharLowerW -IsCharUpperW -IsClipboardFormatAvailable -IsDestinationReachableW -IsDialogMessageW -IsTextUnicode -IsValidCodePage -IsWindowUnicode -LCMapStringW -LoadAcceleratorsW -LoadBitmapW -LoadCursorFromFileW -LoadCursorW -LoadIconW -LoadImageW -LoadKeyboardLayoutW -LoadLibraryExW -LoadLibraryW -LoadMenuIndirectW -LoadMenuW -LoadStringW -;MCIWndCreateW -MapVirtualKeyExW -MapVirtualKeyW -MessageBoxExW -MessageBoxIndirectW -MessageBoxW -ModifyMenuW -MoveFileW -MultiByteToWideChar -MultinetGetConnectionPerformanceW -OemToCharBuffW -OemToCharW -;OleUIAddVerbMenuW -;OleUIBusyW -;OleUIChangeIconW -;OleUIChangeSourceW -;OleUIConvertW -;OleUIEditLinksW -;OleUIInsertObjectW -;OleUIObjectPropertiesW -;OleUIPasteSpecialW -;OleUIPromptUserW -;OleUIUpdateLinksW -OpenEventW -OpenFileMappingW -OpenMutexW -OpenPrinterW -OpenSemaphoreW -OpenWaitableTimerW -OutputDebugStringW -PageSetupDlgW -PeekConsoleInputW -PeekMessageW -PlaySoundW -;PolyTextOutW -PostMessageW -PostThreadMessageW -PrintDlgW -;QueryContextAttributesW -;QueryCredentialsAttributesW -QueryDosDeviceW -;QuerySecurityPackageInfoW -RasConnectionNotificationW -RasCreatePhonebookEntryW -RasDeleteEntryW -RasDeleteSubEntryW -;RasDialW -RasEditPhonebookEntryW -RasEnumConnectionsW -RasEnumDevicesW -RasEnumEntriesW -RasGetConnectStatusW -RasGetEntryDialParamsW -RasGetEntryPropertiesW -RasGetErrorStringW -RasHangUpW -RasRenameEntryW -RasSetEntryDialParamsW -RasSetEntryPropertiesW -RasSetSubEntryPropertiesW -RasValidateEntryNameW -ReadConsoleInputW -ReadConsoleOutputCharacterW -ReadConsoleOutputW -ReadConsoleW -RegConnectRegistryW -RegCreateKeyExW -RegCreateKeyW -RegDeleteKeyW -RegDeleteValueW -RegEnumKeyExW -RegEnumKeyW -RegEnumValueW -RegLoadKeyW -RegOpenKeyExW -RegOpenKeyW -RegQueryInfoKeyW -RegQueryMultipleValuesW -RegQueryValueExW -RegQueryValueW -RegReplaceKeyW -RegSaveKeyW -RegSetValueExW -RegSetValueW -RegUnLoadKeyW -RegisterClassExW -RegisterClassW -RegisterClipboardFormatW -RegisterDeviceNotificationW -RegisterWindowMessageW -RemoveDirectoryW -RemoveFontResourceW -RemovePropA -RemovePropW -ReplaceTextW -ResetDCW -;ResetPrinterW -SHBrowseForFolderW -SHChangeNotify -SHFileOperationW -SHGetFileInfoW -SHGetNewLinkInfoW -SHGetPathFromIDListW -ScrollConsoleScreenBufferW -SearchPathW -SendDlgItemMessageW -SendMessageCallbackW -SendMessageTimeoutW -SendMessageW -SendNotifyMessageW -SetCalendarInfoW -SetClassLongW -SetComputerNameW -SetConsoleTitleW -SetCurrentDirectoryW -SetDefaultCommConfigW -SetDlgItemTextW -SetEnvironmentVariableW -SetFileAttributesW -SetICMProfileW -SetJobW -SetLocaleInfoW -SetMenuItemInfoW -SetPrinterDataW -SetPrinterW -SetPropA -SetPropW -SetVolumeLabelW -SetWindowLongA -SetWindowLongW -SetWindowTextW -SetWindowsHookExW -SetWindowsHookW -ShellAboutW -ShellExecuteExW -ShellExecuteW -Shell_NotifyIconW -StartDocPrinterW -StartDocW -SystemParametersInfoW -TabbedTextOutW -TextOutW -TranslateAcceleratorW -UnregisterClassW -UpdateResourceW -VerFindFileW -VerInstallFileW -VerLanguageNameW -VerQueryValueW -VkKeyScanExW -VkKeyScanW -WNetAddConnection2W -WNetAddConnection3W -WNetAddConnectionW -WNetCancelConnection2W -WNetCancelConnectionW -WNetConnectionDialog1W -WNetDisconnectDialog1W -WNetEnumResourceW -WNetGetConnectionW -WNetGetLastErrorW -WNetGetNetworkInformationW -WNetGetProviderNameW -WNetGetResourceInformationW -WNetGetResourceParentW -WNetGetUniversalNameW -WNetGetUserW -WNetOpenEnumW -WNetUseConnectionW -WaitNamedPipeW -WideCharToMultiByte -WinHelpW -WriteConsoleInputW -WriteConsoleOutputCharacterW -WriteConsoleOutputW -WriteConsoleW -WritePrivateProfileSectionW -WritePrivateProfileStringW -WritePrivateProfileStructW -WriteProfileSectionW -WriteProfileStringW -;auxGetDevCapsW -capCreateCaptureWindowW -capGetDriverDescriptionW -;joyGetDevCapsW -lstrcatW -lstrcmpW -lstrcmpiW -lstrcpyW -lstrcpynW -lstrlenW -;mciGetDeviceIDW -;mciGetErrorStringW -;mciSendCommandW -;mciSendStringW -;midiInGetDevCapsW -;midiInGetErrorTextW -;midiOutGetDevCapsW -;midiOutGetErrorTextW -;mixerGetControlDetailsW -;mixerGetDevCapsW -;mixerGetLineControlsW -;mixerGetLineInfoW -;mmioInstallIOProcW -;mmioOpenW -;mmioRenameW -;mmioStringToFOURCCW -sndPlaySoundW -;waveInGetDevCapsW -;waveInGetErrorTextW -;waveOutGetDevCapsW -;waveOutGetErrorTextW -wsprintfW -wvsprintfW
\ No newline at end of file diff --git a/sal/systools/win32/uwinapi/unicows_mingw.dxp b/sal/systools/win32/uwinapi/unicows_mingw.dxp deleted file mode 100644 index f898d4b2a27d..000000000000 --- a/sal/systools/win32/uwinapi/unicows_mingw.dxp +++ /dev/null @@ -1,544 +0,0 @@ -;************************************************************************* -; -; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -; -; Copyright 2000, 2010 Oracle and/or its affiliates. -; -; OpenOffice.org - a multi-platform office productivity suite -; -; This file is part of OpenOffice.org. -; -; OpenOffice.org is free software: you can redistribute it and/or modify -; it under the terms of the GNU Lesser General Public License version 3 -; only, as published by the Free Software Foundation. -; -; OpenOffice.org is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Lesser General Public License version 3 for more details -; (a copy is included in the LICENSE file that accompanied this code). -; -; You should have received a copy of the GNU Lesser General Public License -; version 3 along with OpenOffice.org. If not, see -; <http://www.openoffice.org/license.html> -; for a copy of the LGPLv3 License. -; -;************************************************************************* -; -; Functions that are exported but not implemented by unicows.dll -; are only inserted as comment. -; -; In addition to MSDN Platform SDK documentation the following functions -; are not implemented too: -; AddMonitorW, FreeContextBufferW, GetPrinterDriverDirectoryW, -; MCIWndCreateW -; -; The following functions of unicows.dll are buggy: -; DrawStateW, GetLogicalDriveStringsW (both implemented in uwinapi.dll) -; -; The following functions of unicows.dll are wrapped but the ANSI versions -; do not exist on Win9x so the wrapper is useless: -; MoveFileExW, CopyFileExW (both implemented in uwinapi.dll along with the -; ANSI versions ) -; -; These functions do not exist on Win 95 and NT neither as Unicode -; nor as ANSI version, so the wrapper will fail on NT4 and Win 95 -; GetLongPathNameW ( implemented in uwinapi.dll along with the -; ANSI version ) -; -; These essential functions aren't implemented by unicows.dll because -; there's no ANSI version: -; CommandLineToArgvW (implemented by uwinapi.dll) -; -;************************************************************************* - -;AcquireCredentialsHandleW@36 -AddAtomW@4 -AddFontResourceW@4 -AddJobW@20 -AddPortW@12 -AddPrintProcessorW@16 -AddPrintProvidorW@12 -AddPrinterDriverW@12 -AddPrinterW@12 -AdvancedDocumentPropertiesW@20 -AppendMenuW@16 -BeginUpdateResourceW@8 -BroadcastSystemMessageW@20 -BuildCommDCBAndTimeoutsW@12 -BuildCommDCBW@8 -CallMsgFilterW@8 -CallNamedPipeW@28 -CallWindowProcA@20 -CallWindowProcW@20 -ChangeDisplaySettingsExW@20 -ChangeDisplaySettingsW@8 -ChangeMenuW@20 -CharLowerBuffW@8 -CharLowerW@4 -CharNextW@4 -CharPrevW@8 -CharToOemBuffW@12 -CharToOemW@8 -CharUpperBuffW@8 -CharUpperW@4 -ChooseColorW@4 -ChooseFontW@4 -CommConfigDialogW@12 -CompareStringW@24 -ConfigurePortW@12 -CopyAcceleratorTableW@12 -CopyEnhMetaFileW@8 -CopyFileExW@24 -CopyFileW@12 -CopyMetaFileW@8 -CreateAcceleratorTableW@8 -CreateColorSpaceW@4 -CreateDCW@16 -CreateDialogIndirectParamW@20 -CreateDialogParamW@20 -CreateDirectoryExW@12 -CreateDirectoryW@8 -CreateEnhMetaFileW@16 -CreateEventW@16 -CreateFileMappingW@24 -CreateFileW@28 -CreateFontIndirectW@4 -CreateFontW@56 -CreateICW@16 -CreateMDIWindowW@40 -CreateMailslotW@16 -CreateMetaFileW@4 -CreateMutexW@12 -;CreateNamedPipeW@32 -CreateProcessW@40 -CreateScalableFontResourceW@16 -CreateSemaphoreW@16 -CreateStdAccessibleProxyW@20 -CreateWaitableTimerW@12 -CreateWindowExW@48 -DdeConnect@16 -DdeConnectList@20 -DdeCreateStringHandleW@12 -DdeInitializeW@16 -DdeQueryConvInfo@12 -DdeQueryStringW@20 -DefDlgProcW@16 -DefFrameProcW@20 -DefMDIChildProcW@16 -DefWindowProcW@16 -DeleteFileW@4 -DeleteMonitorW@12 -DeletePortW@12 -DeletePrintProcessorW@12 -DeletePrintProvidorW@12 -DeletePrinterDriverW@12 -;DeviceCapabilitiesW@20 -DialogBoxIndirectParamW@20 -DialogBoxParamW@20 -DispatchMessageW@4 -DlgDirListComboBoxW@20 -DlgDirListW@20 -DlgDirSelectComboBoxExW@16 -DlgDirSelectExW@16 -;DocumentPropertiesW@24 -DragQueryFileW@16 -DrawStateW@40 -DrawTextExW@24 -DrawTextW@20 -EnableWindow@8 -EndUpdateResourceW@8 -EnumCalendarInfoExW@16 -EnumCalendarInfoW@16 -EnumClipboardFormats@4 -EnumDateFormatsExW@12 -EnumDateFormatsW@12 -EnumDisplayDevicesW@16 -EnumDisplaySettingsExW@16 -EnumDisplaySettingsW@12 -EnumFontFamiliesExW@20 -EnumFontFamiliesW@16 -EnumFontsW@16 -EnumICMProfilesW@12 -;EnumMonitorsW@24 -;EnumPortsW@24 -;EnumPrintProcessorDatatypesW@28 -;EnumPrintProcessorsW@28 -;EnumPrinterDriversW@28 -;EnumPrintersW@28 -EnumPropsA@8 -EnumPropsExA@12 -EnumPropsExW@12 -EnumPropsW@8 -EnumSystemCodePagesW@8 -EnumSystemLocalesW@8 -EnumTimeFormatsW@12 -;EnumerateSecurityPackagesW@8 -ExpandEnvironmentStringsW@12 -ExtTextOutW@32 -ExtractIconExW@20 -ExtractIconW@12 -FatalAppExitW@8 -FillConsoleOutputCharacterW@20 -FindAtomW@4 -;FindExecutableW@12 -FindFirstChangeNotificationW@12 -FindFirstFileW@8 -FindNextFileW@8 -FindResourceExW@16 -FindResourceW@12 -FindTextW@4 -FindWindowExW@16 -FindWindowW@8 -FormatMessageW@28 -;FreeContextBuffer@4 -FreeEnvironmentStringsW@4 -GetAltTabInfoW@20 -GetAtomNameW@12 -GetCPInfo@8 -GetCPInfoExW@12 -GetCalendarInfoW@24 -;GetCharABCWidthsFloatW@16 -GetCharABCWidthsW@16 -GetCharWidthFloatW@16 -GetCharWidthW@16 -GetCharacterPlacementW@24 -GetClassInfoExW@12 -GetClassInfoW@12 -GetClassLongW@8 -GetClassNameW@12 -GetClipboardData@4 -GetClipboardFormatNameW@12 -GetComputerNameW@8 -GetConsoleTitleW@8 -GetCurrencyFormatW@24 -GetCurrentDirectoryW@8 -GetCurrentHwProfileW@4 -GetDateFormatW@24 -GetDefaultCommConfigW@12 -GetDiskFreeSpaceExW@16 -GetDiskFreeSpaceW@20 -GetDlgItemTextW@16 -GetDriveTypeW@4 -GetEnhMetaFileDescriptionW@12 -GetEnhMetaFileW@4 -GetEnvironmentStringsW@0 -GetEnvironmentVariableW@12 -GetFileAttributesExW@12 -GetFileAttributesW@4 -GetFileTitleW@12 -GetFileVersionInfoSizeW@8 -GetFileVersionInfoW@16 -GetFullPathNameW@16 -GetGlyphOutlineW@28 -GetICMProfileW@12 -;GetJobW@24 -GetKerningPairsW@12 -GetKeyNameTextW@12 -GetKeyboardLayoutNameW@4 -GetLocaleInfoW@16 -GetLogColorSpaceW@12 -GetLogicalDriveStringsW@8 -GetLongPathNameW@12 -GetMenuItemInfoW@16 -GetMenuStringW@20 -GetMessageW@16 -GetMetaFileW@4 -GetModuleFileNameW@12 -GetModuleHandleW@4 -GetMonitorInfoW@8 -GetNamedPipeHandleStateW@28 -GetNumberFormatW@24 -GetObjectW@12 -GetOpenFileNamePreviewW@4 -GetOpenFileNameW@4 -GetOutlineTextMetricsW@12 -GetPrintProcessorDirectoryW@24 -;GetPrinterDataW@24 -;GetPrinterDriverDirectoryW24 -;GetPrinterDriverW@24 -;GetPrinterW@20 -GetPrivateProfileIntW@16 -GetPrivateProfileSectionNamesW@12 -GetPrivateProfileSectionW@16 -GetPrivateProfileStringW@24 -GetPrivateProfileStructW@20 -GetProcAddress@8=Internal_GetProcAddress@8 -GetProfileIntW@12 -GetProfileSectionW@12 -GetProfileStringW@20 -GetPropA@8 -GetPropW@8 -GetRoleTextW@12 -GetSaveFileNamePreviewW@4 -GetSaveFileNameW@4 -GetShortPathNameW@12 -GetStartupInfoW@4 -GetStateTextW@12 -GetStringTypeExW@20 -GetStringTypeW@16 -GetSystemDirectoryW@8 -GetSystemWindowsDirectoryW@8 -GetTabbedTextExtentW@20 -GetTempFileNameW@16 -GetTempPathW@8 -GetTextExtentExPointW@28 -GetTextExtentPoint32W@16 -GetTextExtentPointW@16 -GetTextFaceW@12 -GetTextMetricsW@8 -GetTimeFormatW@24 -GetUserNameW@8 -GetVersionExW@4 -GetVolumeInformationW@32 -GetWindowLongA@8 -GetWindowLongW@8 -GetWindowModuleFileNameW@12 -GetWindowTextLengthW@4 -GetWindowTextW@12 -GetWindowsDirectoryW@8 -GlobalAddAtomW@4 -GlobalFindAtomW@4 -GlobalGetAtomNameW@12 -GrayStringW@36 -;InitSecurityInterfaceW@0 -;InitializeSecurityContextW@48 -InsertMenuItemW@16 -InsertMenuW@20 -IsBadStringPtrW@8 -IsCharAlphaNumericW@4 -IsCharAlphaW@4 -IsCharLowerW@4 -IsCharUpperW@4 -IsClipboardFormatAvailable@4 -IsDestinationReachableW@8 -IsDialogMessageW@8 -IsTextUnicode@12 -IsValidCodePage@4 -IsWindowUnicode@4 -LCMapStringW@24 -LoadAcceleratorsW@8 -LoadBitmapW@8 -LoadCursorFromFileW@4 -LoadCursorW@8 -LoadIconW@8 -LoadImageW@24 -LoadKeyboardLayoutW@8 -LoadLibraryExW@12 -LoadLibraryW@4 -LoadMenuIndirectW@4 -LoadMenuW@8 -LoadStringW@16 -;MCIWndCreateW@4 -MapVirtualKeyExW@12 -MapVirtualKeyW@8 -MessageBoxExW@20 -MessageBoxIndirectW@4 -MessageBoxW@16 -ModifyMenuW@20 -MoveFileW@8 -MultiByteToWideChar@24 -MultinetGetConnectionPerformanceW@8 -OemToCharBuffW@12 -OemToCharW@8 -;OleUIAddVerbMenuW@36 -;OleUIBusyW@4 -;OleUIChangeIconW@4 -;OleUIChangeSourceW@4 -;OleUIConvertW@4 -;OleUIEditLinksW@4 -;OleUIInsertObjectW@4 -;OleUIObjectPropertiesW@4 -;OleUIPasteSpecialW@4 -;OleUIPromptUserW@8 -;OleUIUpdateLinksW@16 -OpenEventW@12 -OpenFileMappingW@12 -OpenMutexW@12 -OpenPrinterW@12 -OpenSemaphoreW@12 -OpenWaitableTimerW@12 -OutputDebugStringW@4 -PageSetupDlgW@4 -PeekConsoleInputW@16 -PeekMessageW@20 -PlaySoundW@12 -;PolyTextOutW@12 -PostMessageW@16 -PostThreadMessageW@16 -PrintDlgW@4 -;QueryContextAttributesW@12 -;QueryCredentialsAttributesW@12 -QueryDosDeviceW@12 -;QuerySecurityPackageInfoW@8 -RasConnectionNotificationW@12 -RasCreatePhonebookEntryW@8 -RasDeleteEntryW@8 -RasDeleteSubEntryW@12 -;RasDialW@24 -RasEditPhonebookEntryW@12 -RasEnumConnectionsW@12 -RasEnumDevicesW@12 -RasEnumEntriesW@20 -RasGetConnectStatusW@8 -RasGetEntryDialParamsW@12 -RasGetEntryPropertiesW@24 -RasGetErrorStringW@12 -RasHangUpW@4 -RasRenameEntryW@12 -RasSetEntryDialParamsW@12 -RasSetEntryPropertiesW@24 -RasSetSubEntryPropertiesW@28 -RasValidateEntryNameW@8 -ReadConsoleInputW@16 -ReadConsoleOutputCharacterW@20 -ReadConsoleOutputW@20 -ReadConsoleW@20 -RegConnectRegistryW@12 -RegCreateKeyExW@36 -RegCreateKeyW@12 -RegDeleteKeyW@8 -RegDeleteValueW@8 -RegEnumKeyExW@32 -RegEnumKeyW@16 -RegEnumValueW@32 -RegLoadKeyW@12 -RegOpenKeyExW@20 -RegOpenKeyW@12 -RegQueryInfoKeyW@48 -RegQueryMultipleValuesW@20 -RegQueryValueExW@24 -RegQueryValueW@16 -RegReplaceKeyW@16 -RegSaveKeyW@12 -RegSetValueExW@24 -RegSetValueW@20 -RegUnLoadKeyW@8 -RegisterClassExW@4 -RegisterClassW@4 -RegisterClipboardFormatW@4 -RegisterDeviceNotificationW@12 -RegisterWindowMessageW@4 -RemoveDirectoryW@4 -RemoveFontResourceW@4 -RemovePropA@8 -RemovePropW@8 -ReplaceTextW@4 -ResetDCW@8 -;ResetPrinterW@8 -SHBrowseForFolderW@4 -SHChangeNotify@16 -SHFileOperationW@4 -SHGetFileInfoW@20 -SHGetNewLinkInfoW@20 -SHGetPathFromIDListW@8 -ScrollConsoleScreenBufferW@20 -SearchPathW@24 -SendDlgItemMessageW@20 -SendMessageCallbackW@24 -SendMessageTimeoutW@28 -SendMessageW@16 -SendNotifyMessageW@16 -SetCalendarInfoW@16 -SetClassLongW@12 -SetComputerNameW@4 -SetConsoleTitleW@4 -SetCurrentDirectoryW@4 -SetDefaultCommConfigW@12 -SetDlgItemTextW@12 -SetEnvironmentVariableW@8 -SetFileAttributesW@8 -SetICMProfileW@8 -SetJobW@20 -SetLocaleInfoW@12 -SetMenuItemInfoW@16 -SetPrinterDataW@20 -SetPrinterW@16 -SetPropA@12 -SetPropW@12 -SetVolumeLabelW@8 -SetWindowLongA@12 -SetWindowLongW@12 -SetWindowTextW@8 -SetWindowsHookExW@16 -SetWindowsHookW@8 -ShellAboutW@16 -ShellExecuteExW@4 -ShellExecuteW@24 -Shell_NotifyIconW@8 -StartDocPrinterW@12 -StartDocW@8 -SystemParametersInfoW@16 -TabbedTextOutW@32 -TextOutW@20 -TranslateAcceleratorW@12 -UnregisterClassW@8 -UpdateICMRegKeyW@16 -UpdateResourceW@24 -VerFindFileW@32 -VerInstallFileW@32 -VerLanguageNameW@12 -VerQueryValueW@16 -VkKeyScanExW@8 -VkKeyScanW@4 -WNetAddConnection2W@16 -WNetAddConnection3W@20 -WNetAddConnectionW@12 -WNetCancelConnection2W@12 -WNetCancelConnectionW@8 -WNetConnectionDialog1W@4 -WNetDisconnectDialog1W@4 -WNetEnumResourceW@16 -WNetGetConnectionW@12 -WNetGetLastErrorW@20 -WNetGetNetworkInformationW@8 -WNetGetProviderNameW@12 -WNetGetResourceInformationW@16 -WNetGetResourceParentW@12 -WNetGetUniversalNameW@16 -WNetGetUserW@12 -WNetOpenEnumW@20 -WNetUseConnectionW@32 -WaitNamedPipeW@8 -WideCharToMultiByte@32 -WinHelpW@16 -WriteConsoleInputW@16 -WriteConsoleOutputCharacterW@20 -WriteConsoleOutputW@20 -WriteConsoleW@20 -WritePrivateProfileSectionW@12 -WritePrivateProfileStringW@16 -WritePrivateProfileStructW@20 -WriteProfileSectionW@8 -WriteProfileStringW@12 -;auxGetDevCapsW@12 -capCreateCaptureWindowW@32 -capGetDriverDescriptionW@20 -;joyGetDevCapsW@12 -lstrcatW@8 -lstrcmpW@8 -lstrcmpiW@8 -lstrcpyW@8 -lstrcpynW@12 -lstrlenW@4 -;mciGetDeviceIDW@4 -;mciGetErrorStringW@12 -;mciSendCommandW@16 -;mciSendStringW@16 -;midiInGetDevCapsW@12 -;midiInGetErrorTextW@12 -;midiOutGetDevCapsW@12 -;mixerGetControlDetailsW@12 -;mixerGetDevCapsW@12 -;mixerGetLineControlsW@12 -;mixerGetLineInfoW@12 -;mmioInstallIOProcW@12 -;mmioOpenW@@12 -;mmioRenameW@16 -;sndPlaySoundW@8 -;waveInGetDevCapsW@12 -;waveInGetErrorTextW@12 -;waveOutGetDevCapsW@12 -;waveOutGetErrorTextW@12 -wsprintfW -wvsprintfW@12 diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp deleted file mode 100644 index 551671853ae0..000000000000 --- a/sal/systools/win32/uwinapi/uwinapi.dxp +++ /dev/null @@ -1,86 +0,0 @@ -;************************************************************************* -; -; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -; -; Copyright 2000, 2010 Oracle and/or its affiliates. -; -; OpenOffice.org - a multi-platform office productivity suite -; -; This file is part of OpenOffice.org. -; -; OpenOffice.org is free software: you can redistribute it and/or modify -; it under the terms of the GNU Lesser General Public License version 3 -; only, as published by the Free Software Foundation. -; -; OpenOffice.org is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Lesser General Public License version 3 for more details -; (a copy is included in the LICENSE file that accompanied this code). -; -; You should have received a copy of the GNU Lesser General Public License -; version 3 along with OpenOffice.org. If not, see -; <http://www.openoffice.org/license.html> -; for a copy of the LGPLv3 License. -; -;************************************************************************* - -DllGetVersion -;CheckTokenMembership -CommandLineToArgvW -CopyFileExA -CopyFileExW -CreateToolhelp32Snapshot -DrawStateW -EnumProcesses -GetDiskFreeSpaceExA -GetDiskFreeSpaceExW -GetLogicalDriveStringsW -GetLongPathNameA -GetLongPathNameW -GetModuleFileNameExA -GetModuleFileNameExW -GetProcessId -GetUserDefaultUILanguage -GetUserDomainA -GetUserDomainW -Module32First -Module32FirstW -Module32Next -Module32NextW -MoveFileExA -MoveFileExW -Process32First -Process32FirstW -Process32Next -Process32NextW -FindFirstVolumeA -FindFirstVolumeW -FindNextVolumeA -FindNextVolumeW -FindVolumeClose -FindFirstVolumeMountPointA -FindFirstVolumeMountPointW -FindNextVolumeMountPointA -FindNextVolumeMountPointW -FindVolumeMountPointClose -GetVolumeNameForVolumeMountPointA -GetVolumeNameForVolumeMountPointW -DeleteVolumeMountPointA -DeleteVolumeMountPointW -GetVolumePathNameA -GetVolumePathNameW -SetVolumeMountPointA -SetVolumeMountPointW -PathAddBackslashW -PathCompactPathExW -PathFileExistsW -PathFindExtensionW -PathFindFileNameW -PathIsFileSpecW -PathIsUNCW -PathRemoveExtensionW -PathRemoveFileSpecW -PathSetDlgItemPathW -PathStripToRootW -SHCreateItemFromParsingName diff --git a/sal/systools/win32/uwinapi/uwinapi_mingw.dxp b/sal/systools/win32/uwinapi/uwinapi_mingw.dxp deleted file mode 100644 index 81cc6faa0ea0..000000000000 --- a/sal/systools/win32/uwinapi/uwinapi_mingw.dxp +++ /dev/null @@ -1,90 +0,0 @@ -;************************************************************************* -; -; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -; -; Copyright 2000, 2010 Oracle and/or its affiliates. -; -; OpenOffice.org - a multi-platform office productivity suite -; -; This file is part of OpenOffice.org. -; -; OpenOffice.org is free software: you can redistribute it and/or modify -; it under the terms of the GNU Lesser General Public License version 3 -; only, as published by the Free Software Foundation. -; -; OpenOffice.org is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Lesser General Public License version 3 for more details -; (a copy is included in the LICENSE file that accompanied this code). -; -; You should have received a copy of the GNU Lesser General Public License -; version 3 along with OpenOffice.org. If not, see -; <http://www.openoffice.org/license.html> -; for a copy of the LGPLv3 License. -; -;************************************************************************* - -DllGetVersion@4 -CommandLineToArgvW@8 -CopyFileExA@24 -CopyFileExW@24 -CreateToolhelp32Snapshot@8 -DrawStateW@40 -EnumProcesses@12 -GetDiskFreeSpaceExA@16 -GetDiskFreeSpaceExW@16 -GetLogicalDriveStringsW@8 -GetLongPathNameA@12 -GetLongPathNameW@12 -GetModuleFileNameExA@16 -GetModuleFileNameExW@16 -GetProcessId@4 -GetUserDefaultUILanguage@0 -GetUserDomainA@8 -GetUserDomainW@8 -Module32First@8 -Module32FirstW@8 -Module32Next@8 -Module32NextW@8 -MoveFileExA@12 -MoveFileExW@12 -Process32First@8 -Process32FirstW@8 -Process32Next@8 -Process32NextW@8 -FindFirstVolumeA@8 -FindFirstVolumeW@8 -FindNextVolumeA@12 -FindNextVolumeW@12 -FindVolumeClose@4 -FindFirstVolumeMountPointA@12 -FindFirstVolumeMountPointW@12 -FindNextVolumeMountPointA@12 -FindNextVolumeMountPointW@12 -FindVolumeMountPointClose@4 -GetVolumeNameForVolumeMountPointA@12 -GetVolumeNameForVolumeMountPointW@12 -DeleteVolumeMountPointA@4 -DeleteVolumeMountPointW@4 -GetVolumePathNameA@12 -GetVolumePathNameW@12 -SetVolumeMountPointA@8 -SetVolumeMountPointW@8 -PathAddBackslashW@4 -PathCompactPathExW@16 -PathFileExistsW@4 -PathFindExtensionW@4 -PathFindFileNameW@4 -PathIsFileSpecW@4 -PathIsUNCW@4 -PathRemoveExtensionW@4 -PathRemoveFileSpecW@4 -PathSetDlgItemPathW@12 -PathStripToRootW@4 -SHCreateItemFromParsingName@16 -snprintf -snwprintf -vsnprintf -vsnwprintf - diff --git a/sal/systools/win32/uwinapi/win95sys.h b/sal/systools/win32/uwinapi/win95sys.h deleted file mode 100644 index f5500fc7ea9c..000000000000 --- a/sal/systools/win32/uwinapi/win95sys.h +++ /dev/null @@ -1,350 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#pragma once - -//Kernel32 objects - -#define K32OBJ_SEMAPHORE 0x1 -#define K32OBJ_EVENT 0x2 -#define K32OBJ_MUTEX 0x3 -#define K32OBJ_CRITICAL_SECTION 0x4 -#define K32OBJ_PROCESS 0x5 -#define K32OBJ_THREAD 0x6 -#define K32OBJ_FILE 0x7 -#define K32OBJ_CHANGE 0x8 -#define K32OBJ_CONSOLE 0x9 -#define K32OBJ_SCREEN_BUFFER 0xA -#define K32OBJ_MEM_MAPPED_FILE 0xB -#define K32OBJ_SERIAL 0xC -#define K32OBJ_DEVICE_IOCTL 0xD -#define K32OBJ_PIPE 0xE -#define K32OBJ_MAILSLOT 0xF -#define K32OBJ_TOOLHELP_SNAPSHOT 0x10 -#define K32OBJ_SOCKET 0x11 - - -//Process Database flags - -#define fDebugSingle 0x00000001 -#define fCreateProcessEvent 0x00000002 -#define fExitProcessEvent 0x00000004 -#define fWin16Process 0x00000008 -#define fDosProcess 0x00000010 -#define fConsoleProcess 0x00000020 -#define fFileApisAreOem 0x00000040 -#define fNukeProcess 0x00000080 -#define fServiceProcess 0x00000100 -#define fLoginScriptHack 0x00000800 - - -//Thread Database flags - -#define fCreateThreadEvent 0x00000001 -#define fCancelExceptionAbort 0x00000002 -#define fOnTempStack 0x00000004 -#define fGrowableStack 0x00000008 -#define fDelaySingleStep 0x00000010 -#define fOpenExeAsImmovableFile 0x00000020 -#define fCreateSuspended 0x00000040 -#define fStackOverflow 0x00000080 -#define fNestedCleanAPCs 0x00000100 -#define fWasOemNowAnsi 0x00000200 -#define fOKToSetThreadOem 0x00000400 - -#ifdef _MSC_VER -#pragma warning(disable:4103) -#endif -#pragma pack(1) - - -//MODREF and IMTE structures - -typedef struct _MODREF { - struct _MODREF *pNextModRef; // 00h - DWORD un1; // 04h - DWORD un2; // 08h - DWORD un3; // 0Ch - WORD mteIndex; // 10h - WORD un4; // 12h - DWORD un5; // 14h - PVOID ppdb; // 18h Pointer to process database - DWORD un6; // 1Ch - DWORD un7; // 20h - DWORD un8; // 24h -} MODREF, *PMODREF; - -typedef struct _IMTE { - DWORD un1; // 00h - PIMAGE_NT_HEADERS pNTHdr; // 04h - DWORD un2; // 08h - PSTR pszFileName; // 0Ch - PSTR pszModName; // 10h - WORD cbFileName; // 14h - WORD cbModName; // 16h - DWORD un3; // 18h - DWORD cSections; // 1Ch - DWORD un5; // 20h - DWORD baseAddress; // 24h - WORD hModule16; // 28h - WORD cUsage; // 2Ah - DWORD un7; // 2Ch - PSTR pszFileName2; // 30h - WORD cbFileName2; // 34h - DWORD pszModName2; // 36h - WORD cbModName2; // 3Ah -} IMTE, *PIMTE; - - -//Process Database structure - -typedef struct _ENVIRONMENT_DATABASE { -PSTR pszEnvironment; // 00h Pointer to Environment -DWORD un1; // 04h -PSTR pszCmdLine; // 08h Pointer to command line -PSTR pszCurrDirectory; // 0Ch Pointer to current directory -LPSTARTUPINFOA pStartupInfo;// 10h Pointer to STARTUPINFOA struct -HANDLE hStdIn; // 14h Standard Input -HANDLE hStdOut; // 18h Standard Output -HANDLE hStdErr; // 1Ch Standard Error -DWORD un2; // 20h -DWORD InheritConsole; // 24h -DWORD BreakType; // 28h -DWORD BreakSem; // 2Ch -DWORD BreakEvent; // 30h -DWORD BreakThreadID; // 34h -DWORD BreakHandlers; // 38h -} ENVIRONMENT_DATABASE, *PENVIRONMENT_DATABASE; - -typedef struct _KERNEL_OBJECT { -DWORD Type; // 00h KERNEL32 object type (5) -DWORD cReference; // 04h Number of references to process -} KERNEL_OBJECT, *PKERNEL_OBJECT; - -typedef struct _HANDLE_TABLE_ENTRY { - DWORD flags; // Valid flags depend on what type of object this is - PKERNEL_OBJECT pObject; // Pointer to the object that the handle refers to -} HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; - -typedef struct _HANDLE_TABLE { - DWORD cEntries; // Max number of handles in table - HANDLE_TABLE_ENTRY array[1]; // An array (number is given by cEntries) -} HANDLE_TABLE, *PHANDLE_TABLE; - - -typedef struct _PROCESS_DATABASE { -DWORD Type; // 00h KERNEL32 object type (5) -DWORD cReference; // 04h Number of references to process -DWORD un1; // 08h -DWORD someEvent; // 0Ch An event object (What's it used for???) -DWORD TerminationStatus; // 10h Returned by GetExitCodeProcess -DWORD un2; // 14h -DWORD DefaultHeap; // 18h Address of the process heap -DWORD MemoryContext; // 1Ch pointer to the process's context -DWORD flags; // 20h - // 0x00000001 - fDebugSingle - // 0x00000002 - fCreateProcessEvent - // 0x00000004 - fExitProcessEvent - // 0x00000008 - fWin16Process - // 0x00000010 - fDosProcess - // 0x00000020 - fConsoleProcess - // 0x00000040 - fFileApisAreOem - // 0x00000080 - fNukeProcess - // 0x00000100 - fServiceProcess - // 0x00000800 - fLoginScriptHack -DWORD pPSP; // 24h Linear address of PSP? -WORD PSPSelector; // 28h -WORD MTEIndex; // 2Ah -WORD cThreads; // 2Ch -WORD cNotTermThreads; // 2Eh -WORD un3; // 30h -WORD cRing0Threads; // 32h number of ring 0 threads -HANDLE HeapHandle; // 34h Heap to allocate handle tables out of - // This seems to always be the KERNEL32 heap -HTASK W16TDB; // 38h Win16 Task Database selector -DWORD MemMapFiles; // 3Ch memory mapped file list (?) -PENVIRONMENT_DATABASE pEDB; // 40h Pointer to Environment Database -PHANDLE_TABLE pHandleTable; // 44h Pointer to process handle table -struct _PROCESS_DATABASE *ParentPDB; // 48h Parent process database -PMODREF MODREFlist; // 4Ch Module reference list -DWORD ThreadList; // 50h Threads in this process -DWORD DebuggeeCB; // 54h Debuggee Context block? -DWORD LocalHeapFreeHead; // 58h Head of free list in process heap -DWORD InitialRing0ID; // 5Ch -CRITICAL_SECTION crst; // 60h -DWORD un4[3]; // 78h -DWORD pConsole; // 84h Pointer to console for process -DWORD tlsInUseBits1; // 88h // Represents TLS indices 0 - 31 -DWORD tlsInUseBits2; // 8Ch // Represents TLS indices 32 - 63 -DWORD ProcessDWORD; // 90h -struct _PROCESS_DATABASE *ProcessGroup; // 94h -DWORD pExeMODREF; // 98h pointer to EXE's MODREF -DWORD TopExcFilter; // 9Ch Top Exception Filter? -DWORD BasePriority; // A0h Base scheduling priority for process -DWORD HeapOwnList; // A4h Head of the list of process heaps -DWORD HeapHandleBlockList;// A8h Pointer to head of heap handle block list -DWORD pSomeHeapPtr; // ACh normally zero, but can a pointer to a - // moveable handle block in the heap -DWORD pConsoleProvider; // B0h Process that owns the console we're using? -WORD EnvironSelector; // B4h Selector containing process environment -WORD ErrorMode; // B6H SetErrorMode value (also thunks to Win16) -DWORD pevtLoadFinished; // B8h Pointer to event LoadFinished? -WORD UTState; // BCh -} PROCESS_DATABASE, *PPROCESS_DATABASE; - - -//TIB (Thread Information Block) structure - -typedef struct _SEH_record { - struct _SEH_record *pNext; - FARPROC pfnHandler; -} SEH_record, *PSEH_record; - -// This is semi-documented in the NTDDK.H file from the NT DDK -typedef struct _TIB { -PSEH_record pvExcept; // 00h Head of exception record list -PVOID pvStackUserTop; // 04h Top of user stack -PVOID pvStackUserBase; // 08h Base of user stack -WORD pvTDB; // 0Ch TDB -WORD pvThunksSS; // 0Eh SS selector used for thunking to 16 bits -DWORD SelmanList; // 10h -PVOID pvArbitrary; // 14h Available for application use -struct _tib *ptibSelf; // 18h Linear address of TIB structure -WORD TIBFlags; // 1Ch -WORD Win16MutexCount; // 1Eh -DWORD DebugContext; // 20h -DWORD pCurrentPriority; // 24h -DWORD pvQueue; // 28h Message Queue selector -PVOID *pvTLSArray; // 2Ch Thread Local Storage array -} TIB, *PTIB; - - -//TDBX structure - -typedef struct _TDBX { - DWORD ptdb; // 00h // PTHREAD_DATABASE - DWORD ppdb; // 04h // PPROCESDS_DATABASE - DWORD ContextHandle; // 08h - DWORD un1; // 0Ch - DWORD TimeOutHandle; // 10h - DWORD WakeParam; // 14h - DWORD BlockHandle; // 18h - DWORD BlockState; // 1Ch - DWORD SuspendCount; // 20h - DWORD SuspendHandle; // 24h - DWORD MustCompleteCount; // 28h - DWORD WaitExFlags; // 2Ch - // 0x00000001 - WAITEXBIT - // 0x00000002 - WAITACKBIT - // 0x00000004 - SUSPEND_APC_PENDING - // 0x00000008 - SUSPEND_TERMINATED - // 0x00000010 - BLOCKED_FOR_TERMINATION - // 0x00000020 - EMULATE_NPX - // 0x00000040 - WIN32_NPX - // 0x00000080 - EXTENDED_HANDLES - // 0x00000100 - FROZEN - // 0x00000200 - DONT_FREEZE - // 0x00000400 - DONT_UNFREEZE - // 0x00000800 - DONT_TRACE - // 0x00001000 - STOP_TRACING - // 0x00002000 - WAITING_FOR_CRST_SAFE - // 0x00004000 - CRST_SAFE - // 0x00040000 - BLOCK_TERMINATE_APC - DWORD SyncWaitCount; // 30h - DWORD QueuedSyncFuncs; // 34h - DWORD UserAPCList; // 38h - DWORD KernAPCList; // 3Ch - DWORD pPMPSPSelector; // 40h - DWORD BlockedOnID; // 44h - DWORD un2[7]; // 48h - DWORD TraceRefData; // 64h - DWORD TraceCallBack; // 68h - DWORD TraceEventHandle; // 6Ch - WORD TraceOutLastCS; // 70h - WORD K16TDB; // 72h - WORD K16PDB; // 74h - WORD DosPDBSeg; // 76h - WORD ExceptionCount; // 78h -} TDBX, *PTDBX; - - -//Thread Database structure - -typedef struct _THREAD_DATABASE { -DWORD Type; // 00h -DWORD cReference; // 04h -PPROCESS_DATABASE pProcess; // 08h -DWORD someEvent; // 0Ch An event object (What's it used for???) -DWORD pvExcept; // 10h This field through field 3CH is a TIB - // structure (see TIB.H) -DWORD TopOfStack; // 14h -DWORD StackLow; // 18h -WORD W16TDB; // 1Ch -WORD StackSelector16; // 1Eh Used when thunking down to 16 bits -DWORD SelmanList; // 20h -DWORD UserPointer; // 24h -PTIB pTIB; // 28h -WORD TIBFlags; // 2Ch TIBF_WIN32 = 1, TIBF_TRAP = 2 -WORD Win16MutexCount; // 2Eh -DWORD DebugContext; // 30h -PDWORD pCurrentPriority; // 34h -DWORD MessageQueue; // 38h -DWORD pTLSArray; // 3Ch -PPROCESS_DATABASE pProcess2;// 40h Another copy of the thread's process??? -DWORD Flags; // 44h - // 0x00000001 - fCreateThreadEvent - // 0x00000002 - fCancelExceptionAbort - // 0x00000004 - fOnTempStack - // 0x00000008 - fGrowableStack - // 0x00000010 - fDelaySingleStep - // 0x00000020 - fOpenExeAsImmovableFile - // 0x00000040 - fCreateSuspended - // 0x00000080 - fStackOverflow - // 0x00000100 - fNestedCleanAPCs - // 0x00000200 - fWasOemNowAnsi - // 0x00000400 - fOKToSetThreadOem -DWORD TerminationStatus; // 48h Returned by GetExitCodeThread -WORD TIBSelector; // 4Ch -WORD EmulatorSelector; // 4Eh -DWORD cHandles; // 50h -DWORD WaitNodeList; // 54h -DWORD un4; // 58h -DWORD Ring0Thread; // 5Ch -PTDBX pTDBX; // 60 -DWORD StackBase; // 64h -DWORD TerminationStack; // 68h -DWORD EmulatorData; // 6Ch -DWORD GetLastErrorCode; // 70h -DWORD DebuggerCB; // 74h -DWORD DebuggerThread; // 78h -PCONTEXT ThreadContext; // 7Ch // register context defined in WINNT.H -DWORD Except16List; // 80h -DWORD ThunkConnect; // 84h -DWORD NegStackBase; // 88h -DWORD CurrentSS; // 8Ch -DWORD SSTable; // 90h -DWORD ThunkSS16; // 94h -DWORD TLSArray[64]; // 98h -DWORD DeltaPriority; // 198h - -// The retail version breaks off somewhere around here. -// All the remaining fields are most likely only in the debug version - -DWORD un5[7]; // 19Ch -DWORD pCreateData16; // 1B8h -DWORD APISuspendCount; // 1BCh # of times SuspendThread has been called -DWORD un6; // 1C0h -DWORD WOWChain; // 1C4h -WORD wSSBig; // 1C8h -WORD un7; // 1CAh -DWORD lp16SwitchRec; // 1CCh -DWORD un8[6]; // 1D0h -DWORD pSomeCritSect1; // 1E8h -DWORD pWin16Mutex; // 1ECh -DWORD pWin32Mutex; // 1F0h -DWORD pSomeCritSect2; // 1F4h -DWORD un9; // 1F8h -DWORD ripString; // 1FCh -DWORD LastTlsSetValueEIP[64]; // 200h (parallel to TlsArray, contains EIP - // where TLS value was last set from) -} THREAD_DATABASE, *PTHREAD_DATABASE; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/test/unloading/exports.dxp b/sal/test/unloading/exports.dxp index 82adf8e8be12..9990690a92e1 100644 --- a/sal/test/unloading/exports.dxp +++ b/sal/test/unloading/exports.dxp @@ -1,4 +1,3 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory component_canUnload diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx index 7f25869156a8..539c1d69677d 100644 --- a/sal/test/unloading/samplelib1.cxx +++ b/sal/test/unloading/samplelib1.cxx @@ -136,10 +136,6 @@ static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMult // Standard UNO library interface ------------------------------------------------- extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw() { if (pRegistryKey) diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx index 75150bb9c50a..45042bec8ddc 100644 --- a/sal/test/unloading/samplelib2.cxx +++ b/sal/test/unloading/samplelib2.cxx @@ -126,10 +126,6 @@ static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMul // Standard UNO library interface ------------------------------------------------- extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw() { if (pRegistryKey) diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 22f85949dbae..3a3a164480ee 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -71,7 +71,7 @@ SHL1TARGET= $(TARGET) SHL1IMPLIB= i$(TARGET) .ELSE SHL1TARGET= uno_$(TARGET) -SHL1IMPLIB= $(SHL1TARGET) +SHL1IMPLIB= uno_$(TARGET) .ENDIF SHL1VERSIONMAP= $(TARGET).map SHL1RPATH=URELIB diff --git a/sal/util/sal.map b/sal/util/sal.map index 020e11fbcb57..152b02349d9c 100755 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -598,14 +598,19 @@ UDK_3.10 { # OOo 3.2 rtl_math_acosh; } UDK_3.9; - -UDK_3.11 { # OOo 3.4 +UDK_3.11 { # symbols available in >= OOo/LibO 3.4 global: osl_setEnvironment; osl_clearEnvironment; osl_setThreadName; } UDK_3.10; +LIBO_UDK_3.5 { # symbols available in >= LibO 3.5 + global: + rtl_stringbuffer_remove; + rtl_uStringbuffer_remove; +} UDK_3.10; + PRIVATE_1.0 { global: osl_detail_ObjectRegistry_storeAddresses; diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk index 79b18ac4f55d..8c0e7c4ed255 100644 --- a/sal/workben/makefile.mk +++ b/sal/workben/makefile.mk @@ -100,20 +100,6 @@ APP4STDLIBS=$(SALLIB) APP4DEPN=$(SLB)$/sal.lib # -# tgetpwnam -# -.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD" || \ - "$(OS)"=="DRAGONFLY" -OBJFILES+=\ - $(OBJ)$/tgetpwnam.obj - -APP5TARGET=tgetpwnam -APP5OBJS=$(OBJ)$/tgetpwnam.obj -APP5STDLIBS=$(SALLIB) -APP5DEPN=$(SLB)$/sal.lib -.ENDIF # (netbsd | freebsd) - -# # measure_oustrings # OBJFILES+=\ diff --git a/sal/workben/tgetpwnam.cxx b/sal/workben/tgetpwnam.cxx deleted file mode 100644 index c6fe6f917a93..000000000000 --- a/sal/workben/tgetpwnam.cxx +++ /dev/null @@ -1,250 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sal.hxx" - -#include <pwd.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> -#include <pthread.h> -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#ifndef NETBSD -#include <shadow.h> -#endif - -/* exercises some reentrant libc-fucntions */ - -extern "C" -{ - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct passwd* getpwnam_r(char*, struct passwd*, char *, int); - struct spwd* getspnam_r(char*, struct spwd*, char *, int); - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -} - -static int go; - - - -extern "C" void *workfunc1(void*) -{ - char buffer[256]; - struct tm sttm; - time_t nepoch; - struct passwd stpwd; - struct hostent sthostent; - int nerr; - - printf("starting thread 1 ...\n"); - while (go) { - getpwnam_r("hr", &stpwd, buffer, sizeof(buffer)); - gethostbyname_r("blauwal", &sthostent, buffer, sizeof(buffer), &nerr); - time(&nepoch); - localtime_r(&nepoch, &sttm); - } - return 0; -} - -extern "C" void *workfunc2(void*) -{ - char buffer[256]; - struct tm sttm; - time_t nepoch; - struct passwd stpwd; - struct hostent sthostent; - int nerr; - - printf("starting thread 2 ...\n"); - while(go) { - getpwnam_r("mh", &stpwd, buffer, sizeof(buffer)); - gethostbyname_r("hr-1242", &sthostent, buffer, sizeof(buffer), &nerr); - time(&nepoch); - localtime_r(&nepoch, &sttm); - } - return 0; -} - - -extern int h_errno; - -int main(int argc, char *argv[]) -{ - char buffer[256]; - struct tm *ptm; - time_t nepoch; - struct passwd *pwd, *pres1; -#ifndef NETBSD - struct spwd *spwd, *pres2; -#endif - struct hostent *phostent, *pres3; - char **p; - - pthread_t tid1,tid2; - int res1,res2; - - go = 1; - - pthread_create(&tid1, NULL, workfunc1, &res1); - pthread_create(&tid2, NULL, workfunc2, &res2); - - pwd = (struct passwd*)malloc(sizeof(struct passwd)); - - pres1 = getpwnam_r("hr", pwd, buffer, sizeof(buffer)); - - sleep(3); - - if (pres1) { - printf("Name: %s\n", pwd->pw_name); - printf("Passwd: %s\n", pwd->pw_passwd); - printf("Uid: %d\n", pwd->pw_uid); - printf("Gid: %d\n", pwd->pw_gid); -#ifdef NETBSD - printf("Change: %s", ctime(&pwd->pw_change)); - printf("Class: %s\n", pwd->pw_class); -#else - printf("Age: %s\n", pwd->pw_age); - printf("Comment: %s\n", pwd->pw_comment); -#endif - printf("Gecos: %s\n", pwd->pw_gecos); - printf("Dir: %s\n", pwd->pw_dir); - printf("Shell: %s\n", pwd->pw_shell); - } - else - printf("getpwnam_r() failed!\n"); - - free(pwd); - -#ifndef NETBSD - spwd = (struct spwd*)malloc(sizeof(struct spwd)); - - pres2 = getspnam_r("hr", spwd, buffer, sizeof(buffer)); - - if (pres2) { - printf("Name: %s\n", spwd->sp_namp); - printf("Passwd: %s\n", spwd->sp_pwdp); - printf("Last Change: %ld\n", spwd->sp_lstchg); - printf("Min: %ld\n", spwd->sp_min); - printf("Max: %ld\n", spwd->sp_max); - } - else - printf("getspnam_r() failed!\n"); - - free(spwd); -#endif - - ptm = (struct tm*)malloc(sizeof(struct tm)); - - time(&nepoch); - localtime_r(&nepoch, ptm); - - printf("Seconds: %d\n", ptm->tm_sec); - printf("Minutes: %d\n", ptm->tm_min); - printf("Hour: %d\n", ptm->tm_hour); - printf("Day of Month: %d\n", ptm->tm_mday); - printf("Month: %d\n", ptm->tm_mon); - printf("Year: %d\n", ptm->tm_year); - printf("Day of week: %d\n", ptm->tm_wday); - printf("Day in the year: %d\n", ptm->tm_yday); - printf("Daylight saving time: %d\n", ptm->tm_isdst); -#ifdef NETBSD - printf("Timezone: %s\n", ptm->tm_zone); -#else - printf("Timezone: %s\n", ptm->tm_name); -#endif - - free(ptm); - - phostent = (struct hostent*)malloc(sizeof(struct hostent)); - - pres3 = gethostbyname_r("blauwal", phostent, buffer, sizeof(buffer), h_errno); - - if (pres3) { - printf("Official Hostname: %s\n", phostent->h_name); - for ( p = phostent->h_aliases; *p != NULL; p++ ) - printf("Alias: %s\n", *p); - printf("Addresstype: %d\n", phostent->h_addrtype); - printf("Address length: %d\n", phostent->h_length); - if ( phostent->h_addrtype == AF_INET ) { - for ( p = phostent->h_addr_list; *p != NULL; *p++ ) - printf("Address: %s\n", inet_ntoa(**((in_addr**)p))); - } - } - - - /* test boundary conditions */ - char smallbuf[23]; /* buffer to small */ - pres3 = gethostbyname_r("blauwal", phostent, smallbuf, sizeof(smallbuf), h_errno); - if (!pres3) { - perror("Expect ERANGE"); - } - else - { - printf("ERROR: Check for buffersize went wrong\n"); - } - -#ifdef NETBSD - char exactbuf[35]; -#else - char exactbuf[24]; /* should be exact the necessary size */ -#endif - pres3 = gethostbyname_r("blauwal", phostent, exactbuf, sizeof(exactbuf), &h_errno); - if (!pres3) { - perror("Check with exact buffersize"); - } - else - { - printf("Boundary check ok\n"); - } - - /* test error conditions */ - pres3 = gethostbyname_r("nohost", phostent, buffer, sizeof(buffer), &h_errno); - if (!pres3) { - herror("Expect HOST_NOT_FOUND"); - } - else - { - printf("failed to detect non existant host\n"); - } - - free(phostent); - go = 0; /* atomic enough for our purposes */ - - pthread_join(tid1, NULL); - pthread_join(tid2, NULL); - - exit(0); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst index 256f094742f5..c7a1fe693919 100644 --- a/stoc/prj/build.lst +++ b/stoc/prj/build.lst @@ -1,4 +1,4 @@ -tc stoc : rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt NULL +tc stoc : DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL tc stoc usr1 - all tc_mkout NULL tc stoc\inc nmake - all tc_inc NULL tc stoc\source\defaultregistry nmake - all tc_defr tc_boot tc_inc NULL diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index 4826309c65bb..6a9096343480 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -126,12 +126,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 361b611e93d2..6feefe428bba 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -481,12 +481,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index f4b8995b8a00..50be56632735 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -3044,13 +3044,6 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 1f76914e672e..4359d25e67e6 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1222,12 +1222,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index b8d3939928d8..4b7961ba5da7 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -991,13 +991,6 @@ sal_Bool SAL_CALL component_canUnload( } //============================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -//============================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index a14481994e6a..4fe943601785 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -445,15 +445,6 @@ static struct ImplementationEntry g_entries[] = extern "C" { -// NOTE: component_canUnload is not exported, as the library cannot be unloaded. - -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 5c50e89693f1..ffdf02e1c36f 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -609,12 +609,6 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, - uno_Environment **) -{ - *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, void * pServiceManager, void * pRegistryKey) diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 86d96a76ce3a..4fd75a53060e 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -202,8 +202,26 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( throw(CannotActivateFactoryException, RuntimeException) { + rtl::OUString aPrefix; + if( xKey.is() ) + { + Reference<XRegistryKey > xActivatorKey = xKey->openKey( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) ); + if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII ) + { + Reference<XRegistryKey > xPrefixKey = xActivatorKey->openKey( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) ); + if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII ) + { + aPrefix = xPrefixKey->getAsciiValue(); + if( aPrefix.getLength() != 0 ) + aPrefix = aPrefix + OUSTR("_"); + } + } + } + return loadSharedLibComponentFactory( - expand_url( rLibName ), OUString(), rImplName, m_xSMgr, xKey ); + expand_url( rLibName ), OUString(), rImplName, m_xSMgr, xKey, aPrefix ); } diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 8aaee2ced7e9..ce382ce31f7e 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -213,12 +213,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index b05c94d4fba8..b45f53d3a714 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -521,12 +521,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) return g_moduleCount.canUnload( &g_moduleCount, pTime ); } -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 483c8ba5bc4e..a5dd8f5fa2b5 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -63,6 +63,7 @@ namespace css = com::sun::star; struct Implementation { rtl::OUString uri; rtl::OUString loader; + rtl::OUString prefix; std::vector< rtl::OUString > services; std::vector< rtl::OUString > singletons; }; @@ -103,6 +104,7 @@ private: rtl::Reference< Data > data_; rtl::OUString attrUri_; rtl::OUString attrLoader_; + rtl::OUString attrPrefix_; rtl::OUString attrImplementation_; }; @@ -238,6 +240,7 @@ Parser::Parser(rtl::OUString const & uri, rtl::Reference< Data > const & data): void Parser::handleComponent() { attrUri_ = rtl::OUString(); attrLoader_ = rtl::OUString(); + attrPrefix_ = rtl::OUString(); xmlreader::Span name; int nsId; while (reader_.nextAttribute(&nsId, &name)) { @@ -282,8 +285,29 @@ void Parser::handleComponent() { ": <component> has empty \"loader\" attribute"))), css::uno::Reference< css::uno::XInterface >()); } + } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && + name.equals(RTL_CONSTASCII_STRINGPARAM("prefix"))) + { + if (attrPrefix_.getLength() != 0) { + throw css::registry::InvalidRegistryException( + (reader_.getUrl() + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + ": <component> has multiple \"prefix\"" + " attributes"))), + css::uno::Reference< css::uno::XInterface >()); + } + attrPrefix_ = reader_.getAttributeValue(false).convertFromUtf8(); + if (attrPrefix_.getLength() == 0) { + throw css::registry::InvalidRegistryException( + (reader_.getUrl() + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + ": <component> has empty \"prefix\" attribute"))), + css::uno::Reference< css::uno::XInterface >()); + } } else { - OSL_FAIL ("unexpected component attribute, expected 'uri' or 'loader'"); + OSL_FAIL ("unexpected component attribute, expected 'uri' or 'loader' or 'prefix'"); } } if (attrUri_.getLength() == 0) { @@ -330,6 +354,7 @@ void Parser::handleImplementation() { } data_->implementations[attrImplementation_].uri = attrUri_; data_->implementations[attrImplementation_].loader = attrLoader_; + data_->implementations[attrImplementation_].prefix = attrPrefix_; } void Parser::handleService() { @@ -419,6 +444,7 @@ private: UNO LOCATION utf-8 ACTIVATOR utf-8 + PREFIX utf-8 SERVICES <service> ... @@ -436,7 +462,7 @@ private: */ enum State { STATE_ROOT, STATE_IMPLEMENTATIONS, STATE_IMPLEMENTATION, STATE_UNO, - STATE_LOCATION, STATE_ACTIVATOR, STATE_IMPLEMENTATION_SERVICES, + STATE_LOCATION, STATE_ACTIVATOR, STATE_PREFIX, STATE_IMPLEMENTATION_SERVICES, STATE_IMPLEMENTATION_SERVICE, STATE_IMPLEMENTATION_SINGLETONS, STATE_IMPLEMENTATION_SINGLETON, STATE_SERVICES, STATE_SERVICE, STATE_SINGLETONS, STATE_SINGLETON, STATE_REGISTEREDBY }; @@ -668,6 +694,8 @@ rtl::OUString Key::getAsciiValue() throw ( return data_->implementations[path_[1]].uri; case STATE_ACTIVATOR: return data_->implementations[path_[1]].loader; + case STATE_PREFIX: + return data_->implementations[path_[1]].prefix; default: throw css::registry::InvalidValueException( rtl::OUString( @@ -948,7 +976,7 @@ bool Key::find( if (path != 0) { *path = p; } - std::size_t const MAX_TRANSITIONS = 4; + std::size_t const MAX_TRANSITIONS = 5; struct StateInfo { css::registry::RegistryValueType type; std::size_t count; @@ -968,15 +996,18 @@ bool Key::find( { css::registry::RegistryValueType_NOT_DEFINED, 1, { { "UNO", STATE_UNO } } }, // STATE_UNO: - { css::registry::RegistryValueType_NOT_DEFINED, 4, + { css::registry::RegistryValueType_NOT_DEFINED, 5, { { "LOCATION", STATE_LOCATION }, { "ACTIVATOR", STATE_ACTIVATOR }, + { "PREFIX", STATE_PREFIX }, { "SERVICES", STATE_IMPLEMENTATION_SERVICES }, { "SINGLETONS", STATE_IMPLEMENTATION_SINGLETONS } } }, // STATE_LOCATION: { css::registry::RegistryValueType_ASCII, 0, {} }, // STATE_ACTIVATOR: { css::registry::RegistryValueType_ASCII, 0, {} }, + // STATE_PREFIX: + { css::registry::RegistryValueType_ASCII, 0, {} }, // STATE_IMPLEMENTATION_SERVICES: { css::registry::RegistryValueType_NOT_DEFINED, 1, { { 0, STATE_IMPLEMENTATION_SERVICE } } }, @@ -1084,15 +1115,17 @@ css::uno::Sequence< rtl::OUString > Key::getChildren() { } case STATE_UNO: { - css::uno::Sequence< rtl::OUString > seq(4); + css::uno::Sequence< rtl::OUString > seq(5); seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCATION")); seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ACTIVATOR")); - seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVICES")); - seq[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS")); + seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PREFIX")); + seq[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVICES")); + seq[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS")); return seq; } case STATE_LOCATION: case STATE_ACTIVATOR: + case STATE_PREFIX: case STATE_IMPLEMENTATION_SERVICE: case STATE_IMPLEMENTATION_SINGLETON: case STATE_SERVICE: diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx index 85b31be9c77e..4aa55d763ec1 100644 --- a/stoc/source/stocservices/stocservices.cxx +++ b/stoc/source/stocservices/stocservices.cxx @@ -96,12 +96,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx index f329f11fa542..69dbb9af9f97 100644 --- a/stoc/test/excomp/excomp1.cxx +++ b/stoc/test/excomp/excomp1.cxx @@ -155,12 +155,6 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /* pServiceManager */ , void * pRegistryKey ) { diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx index 0f1967a2c469..474667d9aca8 100644 --- a/stoc/test/excomp/excomp2.cxx +++ b/stoc/test/excomp/excomp2.cxx @@ -226,12 +226,6 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /* pServiceManager */, void * pRegistryKey ) { diff --git a/stoc/test/excomp/exports.dxp b/stoc/test/excomp/exports.dxp index 9630d7e06768..51703a04666a 100644 --- a/stoc/test/excomp/exports.dxp +++ b/stoc/test/excomp/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 8a8a6dd98a65..687e37a2d41c 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -882,14 +882,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - if (envTypeName != 0) { - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName, void * serviceManager, void *) { void * p = 0; diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 83e29e3d79f0..966705d12b0e 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -313,14 +313,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - if (envTypeName != 0) { - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName, void * serviceManager, void *) { void * p = 0; diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 0ec682f48d7e..e7f106e0f66a 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -292,12 +292,6 @@ extern "C" void SAL_CALL test_ServiceManager() extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map index ab5ed357b461..3cfb43578cb3 100644 --- a/stoc/test/testsmgr_cpnt.map +++ b/stoc/test/testsmgr_cpnt.map @@ -1,6 +1,5 @@ UDK_3_0_0 { global: - component_getImplementationEnvironment; component_writeInfo; component_getFactory; test_ServiceManager; diff --git a/store/prj/d.lst b/store/prj/d.lst index 871fcf85e436..b7809a7e1506 100644 --- a/store/prj/d.lst +++ b/store/prj/d.lst @@ -5,7 +5,6 @@ mkdir: %_DEST%\inc\store ..\util\store.xml %_DEST%\xml\store.xml ..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib -..\%__SRC%\lib\libstore*.dll.a %_DEST%\lib\libstore*.dll.a ..\%__SRC%\lib\libstore.*.* %_DEST%\lib\* ..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll diff --git a/store/util/makefile.mk b/store/util/makefile.mk index 5129273d81d0..801197cc8cde 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -59,7 +59,7 @@ SHL1TARGET= $(TARGET) .IF "$(COM)" == "MSC" SHL1IMPLIB= istore .ELSE -SHL1IMPLIB= store$(UDK_MAJOR) +SHL1IMPLIB= store .ENDIF SHL1VERSIONMAP= $(TARGET).map diff --git a/udkapi/Makefile b/udkapi/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/udkapi/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/offapi/com/sun/star/sync2/makefile.mk b/udkapi/Module_udkapi.mk index f158abd08930..7b4d0d878265 100644 --- a/offapi/com/sun/star/sync2/makefile.mk +++ b/udkapi/Module_udkapi.mk @@ -25,15 +25,14 @@ # #************************************************************************* -PRJ = ..$/..$/..$/.. -PRJNAME=offapi -TARGET = csssync2 -PACKAGE = com$/sun$/star$/sync2 -.INCLUDE: $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Module_Module,udkapi)) -IDLFILES = \ - BadPartnershipException.idl +$(eval $(call gb_Module_add_targets,udkapi,\ + UnoApi_udkapi \ + UnoApi_uretypes \ + Package_udkapi_inc \ + Package_udkapi_idl \ +)) -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk +# vim: set noet sw=4 ts=4: diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk new file mode 100644 index 000000000000..c8b6d60ce29f --- /dev/null +++ b/udkapi/Package_udkapi_idl.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_autopackage_idl,udkapi)) + diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk new file mode 100644 index 000000000000..27943e7ece03 --- /dev/null +++ b/udkapi/Package_udkapi_inc.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_autopackage_inc,udkapi)) + diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk new file mode 100644 index 000000000000..4c0dca9a5849 --- /dev/null +++ b/udkapi/UnoApi_udkapi.mk @@ -0,0 +1,468 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi)) + +$(eval $(call gb_UnoApiTarget_set_include,udkapi,\ + $$(INCLUDE) \ + -I$(SRCDIR)/udkapi \ + -I$(OUTDIR)/idl \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,\ + udkapi/com/sun/star/beans/Introspection \ + udkapi/com/sun/star/beans/PropertyBag \ + udkapi/com/sun/star/beans/PropertySet \ + udkapi/com/sun/star/bridge/Bridge \ + udkapi/com/sun/star/bridge/BridgeFactory \ + udkapi/com/sun/star/bridge/IiopBridge \ + udkapi/com/sun/star/bridge/OleApplicationRegistration \ + udkapi/com/sun/star/bridge/OleBridgeSupplier \ + udkapi/com/sun/star/bridge/OleBridgeSupplier2 \ + udkapi/com/sun/star/bridge/OleBridgeSupplierVar1 \ + udkapi/com/sun/star/bridge/OleObjectFactory \ + udkapi/com/sun/star/bridge/UrpBridge \ + udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration \ + udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier \ + udkapi/com/sun/star/bridge/oleautomation/Factory \ + udkapi/com/sun/star/corba/corba \ + udkapi/com/sun/star/corba/giop/giop \ + udkapi/com/sun/star/corba/iiop/iiop \ + udkapi/com/sun/star/corba/iop/iop \ + udkapi/com/sun/star/io/DataInputStream \ + udkapi/com/sun/star/io/DataOutputStream \ + udkapi/com/sun/star/io/MarkableInputStream \ + udkapi/com/sun/star/io/MarkableOutputStream \ + udkapi/com/sun/star/io/ObjectInputStream \ + udkapi/com/sun/star/io/ObjectOutputStream \ + udkapi/com/sun/star/io/Pipe \ + udkapi/com/sun/star/io/Pump \ + udkapi/com/sun/star/io/TextInputStream \ + udkapi/com/sun/star/io/TextOutputStream \ + udkapi/com/sun/star/java/JavaVirtualMachine \ + udkapi/com/sun/star/lang/MultiServiceFactory \ + udkapi/com/sun/star/lang/RegistryServiceManager \ + udkapi/com/sun/star/lang/ServiceManager \ + udkapi/com/sun/star/loader/Dynamic \ + udkapi/com/sun/star/loader/Java \ + udkapi/com/sun/star/loader/Java2 \ + udkapi/com/sun/star/loader/SharedLibrary \ + udkapi/com/sun/star/reflection/CoreReflection \ + udkapi/com/sun/star/reflection/ProxyFactory \ + udkapi/com/sun/star/reflection/TypeDescriptionManager \ + udkapi/com/sun/star/reflection/TypeDescriptionProvider \ + udkapi/com/sun/star/registry/DefaultRegistry \ + udkapi/com/sun/star/registry/ImplementationRegistration \ + udkapi/com/sun/star/registry/NestedRegistry \ + udkapi/com/sun/star/registry/SimpleRegistry \ + udkapi/com/sun/star/script/AllListenerAdapter \ + udkapi/com/sun/star/script/Converter \ + udkapi/com/sun/star/script/Engine \ + udkapi/com/sun/star/script/Invocation \ + udkapi/com/sun/star/script/InvocationAdapterFactory \ + udkapi/com/sun/star/script/JavaScript \ + udkapi/com/sun/star/security/AccessController \ + udkapi/com/sun/star/security/Policy \ + udkapi/com/sun/star/test/TestFactory \ + udkapi/com/sun/star/udk-modules \ + udkapi/com/sun/star/uno/NamingService \ + udkapi/com/sun/star/util/BootstrapMacroExpander \ + udkapi/com/sun/star/util/MacroExpander \ + udkapi/com/sun/star/util/logging/Logger \ + udkapi/com/sun/star/util/logging/LoggerRemote \ + udkapi/com/sun/star/util/theMacroExpander \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,\ + udkapi/com/sun/star/bridge/UnoUrlResolver \ + udkapi/com/sun/star/connection/Acceptor \ + udkapi/com/sun/star/connection/Connector \ + udkapi/com/sun/star/container/EnumerableMap \ + udkapi/com/sun/star/io/SequenceInputStream \ + udkapi/com/sun/star/io/SequenceOutputStream \ + udkapi/com/sun/star/io/TempFile \ + udkapi/com/sun/star/uri/ExternalUriReferenceTranslator \ + udkapi/com/sun/star/uri/UriReferenceFactory \ + udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand \ + udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript \ + udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory \ +)) + +$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,\ + udkapi/com/sun/star/beans/Ambiguous \ + udkapi/com/sun/star/beans/Defaulted \ + udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult \ + udkapi/com/sun/star/beans/GetPropertyTolerantResult \ + udkapi/com/sun/star/beans/IllegalTypeException \ + udkapi/com/sun/star/beans/IntrospectionException \ + udkapi/com/sun/star/beans/MethodConcept \ + udkapi/com/sun/star/beans/NamedValue \ + udkapi/com/sun/star/beans/NotRemoveableException \ + udkapi/com/sun/star/beans/Optional \ + udkapi/com/sun/star/beans/Pair \ + udkapi/com/sun/star/beans/Property \ + udkapi/com/sun/star/beans/PropertyAttribute \ + udkapi/com/sun/star/beans/PropertyChangeEvent \ + udkapi/com/sun/star/beans/PropertyConcept \ + udkapi/com/sun/star/beans/PropertyExistException \ + udkapi/com/sun/star/beans/PropertySetInfoChange \ + udkapi/com/sun/star/beans/PropertySetInfoChangeEvent \ + udkapi/com/sun/star/beans/PropertyState \ + udkapi/com/sun/star/beans/PropertyStateChangeEvent \ + udkapi/com/sun/star/beans/PropertyValue \ + udkapi/com/sun/star/beans/PropertyValues \ + udkapi/com/sun/star/beans/PropertyVetoException \ + udkapi/com/sun/star/beans/SetPropertyTolerantFailed \ + udkapi/com/sun/star/beans/StringPair \ + udkapi/com/sun/star/beans/TolerantPropertySetResultType \ + udkapi/com/sun/star/beans/UnknownPropertyException \ + udkapi/com/sun/star/beans/XExactName \ + udkapi/com/sun/star/beans/XFastPropertySet \ + udkapi/com/sun/star/beans/XHierarchicalPropertySet \ + udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo \ + udkapi/com/sun/star/beans/XIntroTest \ + udkapi/com/sun/star/beans/XIntrospection \ + udkapi/com/sun/star/beans/XIntrospectionAccess \ + udkapi/com/sun/star/beans/XMaterialHolder \ + udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet \ + udkapi/com/sun/star/beans/XMultiPropertySet \ + udkapi/com/sun/star/beans/XMultiPropertyStates \ + udkapi/com/sun/star/beans/XPropertiesChangeListener \ + udkapi/com/sun/star/beans/XPropertiesChangeNotifier \ + udkapi/com/sun/star/beans/XProperty \ + udkapi/com/sun/star/beans/XPropertyAccess \ + udkapi/com/sun/star/beans/XPropertyChangeListener \ + udkapi/com/sun/star/beans/XPropertyContainer \ + udkapi/com/sun/star/beans/XPropertySet \ + udkapi/com/sun/star/beans/XPropertySetInfo \ + udkapi/com/sun/star/beans/XPropertySetInfoChangeListener \ + udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier \ + udkapi/com/sun/star/beans/XPropertyState \ + udkapi/com/sun/star/beans/XPropertyStateChangeListener \ + udkapi/com/sun/star/beans/XPropertyWithState \ + udkapi/com/sun/star/beans/XTolerantMultiPropertySet \ + udkapi/com/sun/star/beans/XVetoableChangeListener \ + udkapi/com/sun/star/bridge/BridgeExistsException \ + udkapi/com/sun/star/bridge/InvalidProtocolChangeException \ + udkapi/com/sun/star/bridge/ModelDependent \ + udkapi/com/sun/star/bridge/ProtocolProperty \ + udkapi/com/sun/star/bridge/XBridge \ + udkapi/com/sun/star/bridge/XBridgeFactory \ + udkapi/com/sun/star/bridge/XBridgeSupplier \ + udkapi/com/sun/star/bridge/XBridgeSupplier2 \ + udkapi/com/sun/star/bridge/XInstanceProvider \ + udkapi/com/sun/star/bridge/XProtocolProperties \ + udkapi/com/sun/star/bridge/XUnoUrlResolver \ + udkapi/com/sun/star/bridge/oleautomation/Currency \ + udkapi/com/sun/star/bridge/oleautomation/Date \ + udkapi/com/sun/star/bridge/oleautomation/Decimal \ + udkapi/com/sun/star/bridge/oleautomation/NamedArgument \ + udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument \ + udkapi/com/sun/star/bridge/oleautomation/SCode \ + udkapi/com/sun/star/bridge/oleautomation/XAutomationObject \ + udkapi/com/sun/star/connection/AlreadyAcceptingException \ + udkapi/com/sun/star/connection/ConnectionSetupException \ + udkapi/com/sun/star/connection/NoConnectException \ + udkapi/com/sun/star/connection/SocketPermission \ + udkapi/com/sun/star/connection/XAcceptor \ + udkapi/com/sun/star/connection/XConnection \ + udkapi/com/sun/star/connection/XConnection2 \ + udkapi/com/sun/star/connection/XConnectionBroadcaster \ + udkapi/com/sun/star/connection/XConnector \ + udkapi/com/sun/star/container/ContainerEvent \ + udkapi/com/sun/star/container/ElementExistException \ + udkapi/com/sun/star/container/NoSuchElementException \ + udkapi/com/sun/star/container/XChild \ + udkapi/com/sun/star/container/XComponentEnumeration \ + udkapi/com/sun/star/container/XComponentEnumerationAccess \ + udkapi/com/sun/star/container/XContainer \ + udkapi/com/sun/star/container/XContainerApproveBroadcaster \ + udkapi/com/sun/star/container/XContainerApproveListener \ + udkapi/com/sun/star/container/XContainerListener \ + udkapi/com/sun/star/container/XContainerQuery \ + udkapi/com/sun/star/container/XContentEnumerationAccess \ + udkapi/com/sun/star/container/XElementAccess \ + udkapi/com/sun/star/container/XEnumerableMap \ + udkapi/com/sun/star/container/XEnumeration \ + udkapi/com/sun/star/container/XEnumerationAccess \ + udkapi/com/sun/star/container/XHierarchicalName \ + udkapi/com/sun/star/container/XHierarchicalNameAccess \ + udkapi/com/sun/star/container/XHierarchicalNameContainer \ + udkapi/com/sun/star/container/XHierarchicalNameReplace \ + udkapi/com/sun/star/container/XIdentifierAccess \ + udkapi/com/sun/star/container/XIdentifierContainer \ + udkapi/com/sun/star/container/XIdentifierReplace \ + udkapi/com/sun/star/container/XImplicitIDAccess \ + udkapi/com/sun/star/container/XImplicitIDContainer \ + udkapi/com/sun/star/container/XImplicitIDReplace \ + udkapi/com/sun/star/container/XIndexAccess \ + udkapi/com/sun/star/container/XIndexContainer \ + udkapi/com/sun/star/container/XIndexReplace \ + udkapi/com/sun/star/container/XMap \ + udkapi/com/sun/star/container/XNameAccess \ + udkapi/com/sun/star/container/XNameContainer \ + udkapi/com/sun/star/container/XNameReplace \ + udkapi/com/sun/star/container/XNamed \ + udkapi/com/sun/star/container/XSet \ + udkapi/com/sun/star/container/XStringKeyMap \ + udkapi/com/sun/star/container/XUniqueIDAccess \ + udkapi/com/sun/star/io/AlreadyConnectedException \ + udkapi/com/sun/star/io/BufferSizeExceededException \ + udkapi/com/sun/star/io/ConnectException \ + udkapi/com/sun/star/io/DataTransferEvent \ + udkapi/com/sun/star/io/FilePermission \ + udkapi/com/sun/star/io/IOException \ + udkapi/com/sun/star/io/NoRouteToHostException \ + udkapi/com/sun/star/io/NotConnectedException \ + udkapi/com/sun/star/io/SocketException \ + udkapi/com/sun/star/io/UnexpectedEOFException \ + udkapi/com/sun/star/io/UnknownHostException \ + udkapi/com/sun/star/io/WrongFormatException \ + udkapi/com/sun/star/io/XActiveDataControl \ + udkapi/com/sun/star/io/XActiveDataSink \ + udkapi/com/sun/star/io/XActiveDataSource \ + udkapi/com/sun/star/io/XActiveDataStreamer \ + udkapi/com/sun/star/io/XAsyncOutputMonitor \ + udkapi/com/sun/star/io/XConnectable \ + udkapi/com/sun/star/io/XDataExporter \ + udkapi/com/sun/star/io/XDataImporter \ + udkapi/com/sun/star/io/XDataInputStream \ + udkapi/com/sun/star/io/XDataOutputStream \ + udkapi/com/sun/star/io/XDataTransferEventListener \ + udkapi/com/sun/star/io/XInputStream \ + udkapi/com/sun/star/io/XInputStreamProvider \ + udkapi/com/sun/star/io/XMarkableStream \ + udkapi/com/sun/star/io/XObjectInputStream \ + udkapi/com/sun/star/io/XObjectOutputStream \ + udkapi/com/sun/star/io/XOutputStream \ + udkapi/com/sun/star/io/XPersist \ + udkapi/com/sun/star/io/XPersistObject \ + udkapi/com/sun/star/io/XSeekable \ + udkapi/com/sun/star/io/XSeekableInputStream \ + udkapi/com/sun/star/io/XSequenceOutputStream \ + udkapi/com/sun/star/io/XStream \ + udkapi/com/sun/star/io/XStreamListener \ + udkapi/com/sun/star/io/XTempFile \ + udkapi/com/sun/star/io/XTextInputStream \ + udkapi/com/sun/star/io/XTextOutputStream \ + udkapi/com/sun/star/io/XTruncate \ + udkapi/com/sun/star/io/XXMLExtractor \ + udkapi/com/sun/star/java/InvalidJavaSettingsException \ + udkapi/com/sun/star/java/JavaDisabledException \ + udkapi/com/sun/star/java/JavaInitializationException \ + udkapi/com/sun/star/java/JavaNotConfiguredException \ + udkapi/com/sun/star/java/JavaNotFoundException \ + udkapi/com/sun/star/java/JavaVMCreationFailureException \ + udkapi/com/sun/star/java/MissingJavaRuntimeException \ + udkapi/com/sun/star/java/RestartRequiredException \ + udkapi/com/sun/star/java/WrongJavaVersionException \ + udkapi/com/sun/star/java/XJavaThreadRegister_11 \ + udkapi/com/sun/star/java/XJavaVM \ + udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException \ + udkapi/com/sun/star/lang/ClassNotFoundException \ + udkapi/com/sun/star/lang/DisposedException \ + udkapi/com/sun/star/lang/EventObject \ + udkapi/com/sun/star/lang/IllegalAccessException \ + udkapi/com/sun/star/lang/IllegalArgumentException \ + udkapi/com/sun/star/lang/IndexOutOfBoundsException \ + udkapi/com/sun/star/lang/InvalidListenerException \ + udkapi/com/sun/star/lang/ListenerExistException \ + udkapi/com/sun/star/lang/Locale \ + udkapi/com/sun/star/lang/NoSuchFieldException \ + udkapi/com/sun/star/lang/NoSuchMethodException \ + udkapi/com/sun/star/lang/NoSupportException \ + udkapi/com/sun/star/lang/NotInitializedException \ + udkapi/com/sun/star/lang/NullPointerException \ + udkapi/com/sun/star/lang/ServiceNotRegisteredException \ + udkapi/com/sun/star/lang/SystemDependent \ + udkapi/com/sun/star/lang/WrappedTargetException \ + udkapi/com/sun/star/lang/WrappedTargetRuntimeException \ + udkapi/com/sun/star/lang/XComponent \ + udkapi/com/sun/star/lang/XConnectionPoint \ + udkapi/com/sun/star/lang/XConnectionPointContainer \ + udkapi/com/sun/star/lang/XEventListener \ + udkapi/com/sun/star/lang/XInitialization \ + udkapi/com/sun/star/lang/XLocalizable \ + udkapi/com/sun/star/lang/XMain \ + udkapi/com/sun/star/lang/XMultiComponentFactory \ + udkapi/com/sun/star/lang/XMultiServiceFactory \ + udkapi/com/sun/star/lang/XServiceDisplayName \ + udkapi/com/sun/star/lang/XServiceInfo \ + udkapi/com/sun/star/lang/XServiceName \ + udkapi/com/sun/star/lang/XSingleComponentFactory \ + udkapi/com/sun/star/lang/XSingleServiceFactory \ + udkapi/com/sun/star/lang/XTypeProvider \ + udkapi/com/sun/star/lang/XUnoTunnel \ + udkapi/com/sun/star/loader/CannotActivateFactoryException \ + udkapi/com/sun/star/loader/XImplementationLoader \ + udkapi/com/sun/star/reflection/FieldAccessMode \ + udkapi/com/sun/star/reflection/InvalidTypeNameException \ + udkapi/com/sun/star/reflection/InvocationTargetException \ + udkapi/com/sun/star/reflection/MethodMode \ + udkapi/com/sun/star/reflection/NoSuchTypeNameException \ + udkapi/com/sun/star/reflection/ParamInfo \ + udkapi/com/sun/star/reflection/ParamMode \ + udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth \ + udkapi/com/sun/star/reflection/XArrayTypeDescription \ + udkapi/com/sun/star/reflection/XCompoundTypeDescription \ + udkapi/com/sun/star/reflection/XConstantTypeDescription \ + udkapi/com/sun/star/reflection/XConstantsTypeDescription \ + udkapi/com/sun/star/reflection/XEnumTypeDescription \ + udkapi/com/sun/star/reflection/XIdlArray \ + udkapi/com/sun/star/reflection/XIdlClass \ + udkapi/com/sun/star/reflection/XIdlClassProvider \ + udkapi/com/sun/star/reflection/XIdlField \ + udkapi/com/sun/star/reflection/XIdlField2 \ + udkapi/com/sun/star/reflection/XIdlMember \ + udkapi/com/sun/star/reflection/XIdlMethod \ + udkapi/com/sun/star/reflection/XIdlReflection \ + udkapi/com/sun/star/reflection/XIndirectTypeDescription \ + udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription \ + udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2 \ + udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription \ + udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription \ + udkapi/com/sun/star/reflection/XInterfaceTypeDescription \ + udkapi/com/sun/star/reflection/XInterfaceTypeDescription2 \ + udkapi/com/sun/star/reflection/XMethodParameter \ + udkapi/com/sun/star/reflection/XModuleTypeDescription \ + udkapi/com/sun/star/reflection/XParameter \ + udkapi/com/sun/star/reflection/XPropertyTypeDescription \ + udkapi/com/sun/star/reflection/XProxyFactory \ + udkapi/com/sun/star/reflection/XPublished \ + udkapi/com/sun/star/reflection/XServiceConstructorDescription \ + udkapi/com/sun/star/reflection/XServiceTypeDescription \ + udkapi/com/sun/star/reflection/XServiceTypeDescription2 \ + udkapi/com/sun/star/reflection/XSingletonTypeDescription \ + udkapi/com/sun/star/reflection/XSingletonTypeDescription2 \ + udkapi/com/sun/star/reflection/XStructTypeDescription \ + udkapi/com/sun/star/reflection/XTypeDescription \ + udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration \ + udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess \ + udkapi/com/sun/star/reflection/XUnionTypeDescription \ + udkapi/com/sun/star/registry/CannotRegisterImplementationException \ + udkapi/com/sun/star/registry/InvalidRegistryException \ + udkapi/com/sun/star/registry/InvalidValueException \ + udkapi/com/sun/star/registry/MergeConflictException \ + udkapi/com/sun/star/registry/RegistryKeyType \ + udkapi/com/sun/star/registry/RegistryValueType \ + udkapi/com/sun/star/registry/XImplementationRegistration \ + udkapi/com/sun/star/registry/XImplementationRegistration2 \ + udkapi/com/sun/star/registry/XRegistryKey \ + udkapi/com/sun/star/registry/XSimpleRegistry \ + udkapi/com/sun/star/script/AllEventObject \ + udkapi/com/sun/star/script/ArrayWrapper \ + udkapi/com/sun/star/script/BasicErrorException \ + udkapi/com/sun/star/script/CannotConvertException \ + udkapi/com/sun/star/script/CannotCreateAdapterException \ + udkapi/com/sun/star/script/ContextInformation \ + udkapi/com/sun/star/script/FailReason \ + udkapi/com/sun/star/script/FinishEngineEvent \ + udkapi/com/sun/star/script/FinishReason \ + udkapi/com/sun/star/script/InterruptEngineEvent \ + udkapi/com/sun/star/script/InterruptReason \ + udkapi/com/sun/star/script/InvocationInfo \ + udkapi/com/sun/star/script/MemberType \ + udkapi/com/sun/star/script/ScriptEvent \ + udkapi/com/sun/star/script/ScriptEventDescriptor \ + udkapi/com/sun/star/script/XAllListener \ + udkapi/com/sun/star/script/XAllListenerAdapterService \ + udkapi/com/sun/star/script/XAutomationInvocation \ + udkapi/com/sun/star/script/XDebugging \ + udkapi/com/sun/star/script/XDefaultMethod \ + udkapi/com/sun/star/script/XDefaultProperty \ + udkapi/com/sun/star/script/XDirectInvocation \ + udkapi/com/sun/star/script/XEngine \ + udkapi/com/sun/star/script/XEngineListener \ + udkapi/com/sun/star/script/XErrorQuery \ + udkapi/com/sun/star/script/XEventAttacher \ + udkapi/com/sun/star/script/XEventAttacherManager \ + udkapi/com/sun/star/script/XInvocation \ + udkapi/com/sun/star/script/XInvocation2 \ + udkapi/com/sun/star/script/XInvocationAdapterFactory \ + udkapi/com/sun/star/script/XInvocationAdapterFactory2 \ + udkapi/com/sun/star/script/XLibraryAccess \ + udkapi/com/sun/star/script/XScriptEventsAttacher \ + udkapi/com/sun/star/script/XScriptEventsSupplier \ + udkapi/com/sun/star/script/XScriptListener \ + udkapi/com/sun/star/script/XStarBasicAccess \ + udkapi/com/sun/star/script/XStarBasicDialogInfo \ + udkapi/com/sun/star/script/XStarBasicLibraryInfo \ + udkapi/com/sun/star/script/XStarBasicModuleInfo \ + udkapi/com/sun/star/script/XTypeConverter \ + udkapi/com/sun/star/security/AccessControlException \ + udkapi/com/sun/star/security/AllPermission \ + udkapi/com/sun/star/security/RuntimePermission \ + udkapi/com/sun/star/security/XAccessControlContext \ + udkapi/com/sun/star/security/XAccessController \ + udkapi/com/sun/star/security/XAction \ + udkapi/com/sun/star/security/XPolicy \ + udkapi/com/sun/star/task/XInteractionAbort \ + udkapi/com/sun/star/task/XInteractionContinuation \ + udkapi/com/sun/star/task/XInteractionHandler \ + udkapi/com/sun/star/task/XInteractionHandler2 \ + udkapi/com/sun/star/task/XInteractionRequest \ + udkapi/com/sun/star/task/XInteractionRetry \ + udkapi/com/sun/star/test/TestEvent \ + udkapi/com/sun/star/test/XSimpleTest \ + udkapi/com/sun/star/test/XTest \ + udkapi/com/sun/star/test/XTestListener \ + udkapi/com/sun/star/test/bridge/XBridgeTest \ + udkapi/com/sun/star/test/performance/XPerformanceTest \ + udkapi/com/sun/star/uno/DeploymentException \ + udkapi/com/sun/star/uno/Exception \ + udkapi/com/sun/star/uno/RuntimeException \ + udkapi/com/sun/star/uno/SecurityException \ + udkapi/com/sun/star/uno/TypeClass \ + udkapi/com/sun/star/uno/Uik \ + udkapi/com/sun/star/uno/XAdapter \ + udkapi/com/sun/star/uno/XAggregation \ + udkapi/com/sun/star/uno/XComponentContext \ + udkapi/com/sun/star/uno/XCurrentContext \ + udkapi/com/sun/star/uno/XInterface \ + udkapi/com/sun/star/uno/XNamingService \ + udkapi/com/sun/star/uno/XReference \ + udkapi/com/sun/star/uno/XUnloadingPreference \ + udkapi/com/sun/star/uno/XWeak \ + udkapi/com/sun/star/uri/RelativeUriExcessParentSegments \ + udkapi/com/sun/star/uri/XExternalUriReferenceTranslator \ + udkapi/com/sun/star/uri/XUriReference \ + udkapi/com/sun/star/uri/XUriReferenceFactory \ + udkapi/com/sun/star/uri/XUriSchemeParser \ + udkapi/com/sun/star/uri/XVndSunStarExpandUrl \ + udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference \ + udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory \ + udkapi/com/sun/star/uri/XVndSunStarScriptUrl \ + udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference \ + udkapi/com/sun/star/util/XMacroExpander \ + udkapi/com/sun/star/util/XVeto \ + udkapi/com/sun/star/util/logging/LogLevel \ + udkapi/com/sun/star/util/logging/XLogger \ + udkapi/com/sun/star/util/logging/XLoggerRemote \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk new file mode 100644 index 000000000000..8fa615d5a083 --- /dev/null +++ b/udkapi/UnoApi_uretypes.mk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types)) + +$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\ + udkapi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/udkapi/com/sun/star/beans/makefile.mk b/udkapi/com/sun/star/beans/makefile.mk deleted file mode 100644 index 8e5aba61f382..000000000000 --- a/udkapi/com/sun/star/beans/makefile.mk +++ /dev/null @@ -1,101 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssbeans -PACKAGE=com$/sun$/star$/beans - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Ambiguous.idl\ - Defaulted.idl\ - GetDirectPropertyTolerantResult.idl\ - GetPropertyTolerantResult.idl\ - IllegalTypeException.idl\ - Introspection.idl\ - IntrospectionException.idl\ - MethodConcept.idl\ - NamedValue.idl\ - NotRemoveableException.idl\ - Optional.idl\ - Pair.idl\ - Property.idl\ - PropertyAttribute.idl\ - PropertyBag.idl\ - PropertyChangeEvent.idl\ - PropertyConcept.idl\ - PropertyExistException.idl\ - PropertySet.idl\ - PropertySetInfoChange.idl\ - PropertySetInfoChangeEvent.idl\ - PropertyState.idl\ - PropertyStateChangeEvent.idl\ - PropertyValue.idl\ - PropertyValues.idl\ - PropertyVetoException.idl\ - SetPropertyTolerantFailed.idl\ - StringPair.idl\ - TolerantPropertySetResultType.idl\ - UnknownPropertyException.idl\ - XExactName.idl\ - XFastPropertySet.idl\ - XHierarchicalPropertySet.idl\ - XHierarchicalPropertySetInfo.idl\ - XIntrospection.idl\ - XIntrospectionAccess.idl\ - XIntroTest.idl\ - XMaterialHolder.idl\ - XMultiPropertySet.idl\ - XMultiPropertyStates.idl\ - XMultiHierarchicalPropertySet.idl\ - XPropertiesChangeListener.idl\ - XPropertiesChangeNotifier.idl\ - XProperty.idl\ - XPropertyAccess.idl\ - XPropertyChangeListener.idl\ - XPropertyContainer.idl\ - XPropertySet.idl\ - XPropertySetInfo.idl\ - XPropertySetInfoChangeListener.idl\ - XPropertySetInfoChangeNotifier.idl\ - XPropertyState.idl\ - XPropertyStateChangeListener.idl\ - XPropertyWithState.idl\ - XTolerantMultiPropertySet.idl\ - XVetoableChangeListener.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/bridge/makefile.mk b/udkapi/com/sun/star/bridge/makefile.mk deleted file mode 100644 index 74c95bfced33..000000000000 --- a/udkapi/com/sun/star/bridge/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssbridge -PACKAGE=com$/sun$/star$/bridge - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ModelDependent.idl\ - OleApplicationRegistration.idl\ - OleBridgeSupplier.idl\ - OleBridgeSupplier2.idl\ - OleBridgeSupplierVar1.idl\ - OleObjectFactory.idl\ - XBridgeSupplier.idl\ - XBridgeSupplier2.idl\ - XBridge.idl \ - XBridgeFactory.idl\ - XInstanceProvider.idl\ - BridgeExistsException.idl \ - XUnoUrlResolver.idl \ - UnoUrlResolver.idl \ - XProtocolProperties.idl \ - ProtocolProperty.idl \ - InvalidProtocolChangeException.idl \ - Bridge.idl \ - BridgeFactory.idl \ - UrpBridge.idl \ - IiopBridge.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/bridge/oleautomation/makefile.mk b/udkapi/com/sun/star/bridge/oleautomation/makefile.mk deleted file mode 100644 index acb0365a4a71..000000000000 --- a/udkapi/com/sun/star/bridge/oleautomation/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssboleautomation -PACKAGE=com$/sun$/star$/bridge$/oleautomation - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ApplicationRegistration.idl\ - BridgeSupplier.idl\ - Factory.idl \ - Decimal.idl \ - Currency.idl \ - Date.idl \ - NamedArgument.idl \ - SCode.idl \ - PropertyPutArgument.idl \ - XAutomationObject.idl -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/connection/makefile.mk b/udkapi/com/sun/star/connection/makefile.mk deleted file mode 100644 index 616871af4a68..000000000000 --- a/udkapi/com/sun/star/connection/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssconnection -PACKAGE=com$/sun$/star$/connection - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - SocketPermission.idl\ - XConnection.idl\ - XConnection2.idl\ - XConnectionBroadcaster.idl\ - XAcceptor.idl\ - XConnector.idl\ - NoConnectException.idl\ - AlreadyAcceptingException.idl\ - ConnectionSetupException.idl \ - Connector.idl \ - Acceptor.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/container/makefile.mk b/udkapi/com/sun/star/container/makefile.mk deleted file mode 100644 index 5385b7e98c13..000000000000 --- a/udkapi/com/sun/star/container/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csscontainer -PACKAGE=com$/sun$/star$/container - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XIdentifierAccess.idl\ - XIdentifierReplace.idl\ - XIdentifierContainer.idl\ - ContainerEvent.idl\ - ElementExistException.idl\ - EnumerableMap.idl\ - NoSuchElementException.idl\ - XChild.idl\ - XUniqueIDAccess.idl\ - XComponentEnumeration.idl\ - XComponentEnumerationAccess.idl\ - XContainer.idl\ - XContainerApproveBroadcaster.idl\ - XContainerApproveListener.idl\ - XContainerListener.idl\ - XContainerQuery.idl\ - XContentEnumerationAccess.idl\ - XElementAccess.idl\ - XEnumerableMap.idl\ - XEnumeration.idl\ - XEnumerationAccess.idl\ - XHierarchicalName.idl\ - XHierarchicalNameAccess.idl\ - XHierarchicalNameReplace.idl\ - XHierarchicalNameContainer.idl\ - XImplicitIDAccess.idl\ - XImplicitIDContainer.idl\ - XImplicitIDReplace.idl\ - XIndexAccess.idl\ - XIndexContainer.idl\ - XIndexReplace.idl\ - XMap.idl\ - XNameAccess.idl\ - XNameContainer.idl\ - XNamed.idl\ - XNameReplace.idl\ - XSet.idl\ - XStringKeyMap.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/corba/giop/makefile.mk b/udkapi/com/sun/star/corba/giop/makefile.mk deleted file mode 100644 index 1e05e5619965..000000000000 --- a/udkapi/com/sun/star/corba/giop/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssgiop -PACKAGE=com$/sun$/star$/giop - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# ------------------------------------------------------------------------ - -IDLFILES=\ - giop.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/corba/iiop/makefile.mk b/udkapi/com/sun/star/corba/iiop/makefile.mk deleted file mode 100644 index c59fd00293ba..000000000000 --- a/udkapi/com/sun/star/corba/iiop/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssiiop -PACKAGE=com$/sun$/star$/iiop - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# ------------------------------------------------------------------------ - -IDLFILES=\ - iiop.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/corba/iop/makefile.mk b/udkapi/com/sun/star/corba/iop/makefile.mk deleted file mode 100644 index 982c68c9afb6..000000000000 --- a/udkapi/com/sun/star/corba/iop/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssiop -PACKAGE=com$/sun$/star$/iop - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# ------------------------------------------------------------------------ - -IDLFILES=\ - iop.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/corba/makefile.mk b/udkapi/com/sun/star/corba/makefile.mk deleted file mode 100644 index a959378cf827..000000000000 --- a/udkapi/com/sun/star/corba/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csscorba -PACKAGE=com$/sun$/star$/corba - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# ------------------------------------------------------------------------ - -IDLFILES=\ - corba.idl - -# ------------------------------------------------------------------ -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/io/makefile.mk b/udkapi/com/sun/star/io/makefile.mk deleted file mode 100644 index 3c8b0d5ac1d2..000000000000 --- a/udkapi/com/sun/star/io/makefile.mk +++ /dev/null @@ -1,99 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssio -PACKAGE=com$/sun$/star$/io - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - FilePermission.idl\ - BufferSizeExceededException.idl\ - MarkableInputStream.idl\ - MarkableOutputStream.idl\ - DataInputStream.idl\ - DataOutputStream.idl\ - DataTransferEvent.idl\ - IOException.idl\ - NotConnectedException.idl\ - AlreadyConnectedException.idl\ - ObjectInputStream.idl\ - ObjectOutputStream.idl\ - Pipe.idl\ - Pump.idl\ - SequenceInputStream.idl\ - SequenceOutputStream.idl\ - UnexpectedEOFException.idl\ - WrongFormatException.idl\ - XActiveDataControl.idl\ - XActiveDataSink.idl\ - XActiveDataSource.idl\ - XActiveDataStreamer.idl\ - XConnectable.idl\ - XDataExporter.idl\ - XDataImporter.idl\ - XDataInputStream.idl\ - XDataOutputStream.idl\ - XDataTransferEventListener.idl\ - XInputStream.idl\ - XStream.idl\ - XMarkableStream.idl\ - XObjectInputStream.idl\ - XObjectOutputStream.idl\ - XOutputStream.idl\ - XPersist.idl\ - XPersistObject.idl\ - XStreamListener.idl\ - XSeekable.idl\ - XSeekableInputStream.idl\ - XSequenceOutputStream.idl\ - TextInputStream.idl\ - TextOutputStream.idl\ - XTextInputStream.idl\ - XTextOutputStream.idl\ - XTruncate.idl\ - XXMLExtractor.idl\ - XInputStreamProvider.idl\ - UnknownHostException.idl\ - SocketException.idl\ - NoRouteToHostException.idl\ - ConnectException.idl \ - XAsyncOutputMonitor.idl\ - XTempFile.idl\ - TempFile.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/java/makefile.mk b/udkapi/com/sun/star/java/makefile.mk deleted file mode 100644 index bf7f467c9de0..000000000000 --- a/udkapi/com/sun/star/java/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssjava -PACKAGE=com$/sun$/star$/java - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - JavaVirtualMachine.idl\ - WrongJavaVersionException.idl\ - XJavaThreadRegister_11.idl\ - XJavaVM.idl\ - JavaInitializationException.idl\ - JavaDisabledException.idl\ - JavaNotConfiguredException.idl\ - MissingJavaRuntimeException.idl\ - JavaVMCreationFailureException.idl\ - JavaNotFoundException.idl \ - InvalidJavaSettingsException.idl \ - RestartRequiredException.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl index 378fed5d9ed6..9dc0018a23c3 100644 --- a/udkapi/com/sun/star/lang/SystemDependent.idl +++ b/udkapi/com/sun/star/lang/SystemDependent.idl @@ -61,18 +61,16 @@ published constants SystemDependent //------------------------------------------------------------------------- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32 - /** The called interface method returns a value specified for the - 32-bit Windows systems. + /** The called interface method returns a value specified for Windows. - <p>These are Windows NT, Windows 95, Windows 98 or higher. </p> + <p>These are Windows XP or higher. </p> */ const short SYSTEM_WIN32 = 1; //------------------------------------------------------------------------- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN16 - /** The called interface method returns a value specified for - the 16-bit Windows system. + /** The called interface method returns a value specified for 16-bit Windows. <p>This is Windows 3.11. </p> */ @@ -81,12 +79,12 @@ published constants SystemDependent //------------------------------------------------------------------------- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_JAVA - /** The called interface method returns a value specified for the system java. + /** The called interface method returns a value specified for Java. <p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>, <em>JDK 1.2</em> or higher. </p> - <p>The return should be a handle to a java object locked with + <p>The return should be a handle to a Java object locked with the call <code>JavaEnvironment->NewGlobalRef( ... )</code> by the callee. </p> */ @@ -94,8 +92,13 @@ published constants SystemDependent //------------------------------------------------------------------------- + // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2 + /** The called interface method returns a value specified for <em>OS/2</em>. + */ + const short SYSTEM_OS2 = 4; + // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC - /** The called interface method returns a value specified for the <em>MAC-OS</em> system. + /** The called interface method returns a value specified for <em>Mac OS X</em>. */ const short SYSTEM_MAC = 5; @@ -106,6 +109,20 @@ published constants SystemDependent */ const short SYSTEM_XWINDOW = 6; + //------------------------------------------------------------------------- + + // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_IOS + /** The called interface method returns a value specified for <em>iOS</em>. + */ + const short SYSTEM_IOS = 7; + + //------------------------------------------------------------------------- + + // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_ANDROID + /** The called interface method returns a value specified for <em>Android</em>. + */ + const short SYSTEM_ANDROID = 8; + }; //============================================================================= diff --git a/udkapi/com/sun/star/lang/makefile.mk b/udkapi/com/sun/star/lang/makefile.mk deleted file mode 100644 index b0a2d81725d5..000000000000 --- a/udkapi/com/sun/star/lang/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csslang -PACKAGE=com$/sun$/star$/lang - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - ArrayIndexOutOfBoundsException.idl\ - ClassNotFoundException.idl\ - DisposedException.idl\ - EventObject.idl\ - IllegalAccessException.idl\ - IllegalArgumentException.idl\ - IndexOutOfBoundsException.idl\ - InvalidListenerException.idl\ - ListenerExistException.idl\ - Locale.idl\ - MultiServiceFactory.idl\ - NoSuchFieldException.idl\ - NoSuchMethodException.idl\ - NoSupportException.idl\ - NotInitializedException.idl\ - NullPointerException.idl\ - RegistryServiceManager.idl\ - ServiceManager.idl\ - ServiceNotRegisteredException.idl\ - SystemDependent.idl\ - WrappedTargetException.idl\ - WrappedTargetRuntimeException.idl\ - XComponent.idl\ - XConnectionPoint.idl\ - XConnectionPointContainer.idl\ - XEventListener.idl\ - XInitialization.idl\ - XLocalizable.idl\ - XMultiServiceFactory.idl\ - XMultiComponentFactory.idl\ - XServiceDisplayName.idl\ - XServiceInfo.idl\ - XServiceName.idl\ - XSingleServiceFactory.idl\ - XSingleComponentFactory.idl\ - XTypeProvider.idl\ - XUnoTunnel.idl\ - XMain.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/loader/makefile.mk b/udkapi/com/sun/star/loader/makefile.mk deleted file mode 100644 index 3f3641b0df34..000000000000 --- a/udkapi/com/sun/star/loader/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssloader -PACKAGE=com$/sun$/star$/loader - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - CannotActivateFactoryException.idl\ - Java.idl\ - Java2.idl\ - Dynamic.idl\ - SharedLibrary.idl\ - XImplementationLoader.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/makefile.mk b/udkapi/com/sun/star/makefile.mk deleted file mode 100644 index ab74a150fd35..000000000000 --- a/udkapi/com/sun/star/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=api - -TARGET=css -PACKAGE=com$/sun$/star - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - udk-modules.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/reflection/makefile.mk b/udkapi/com/sun/star/reflection/makefile.mk deleted file mode 100644 index a8b1bc8e62a4..000000000000 --- a/udkapi/com/sun/star/reflection/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssreflection -PACKAGE=com$/sun$/star$/reflection - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - CoreReflection.idl\ - FieldAccessMode.idl\ - InvalidTypeNameException.idl\ - InvocationTargetException.idl\ - MethodMode.idl\ - NoSuchTypeNameException.idl\ - ParamInfo.idl\ - ParamMode.idl\ - ProxyFactory.idl\ - TypeDescriptionManager.idl\ - TypeDescriptionProvider.idl\ - TypeDescriptionSearchDepth.idl\ - XArrayTypeDescription.idl\ - XCompoundTypeDescription.idl\ - XConstantTypeDescription.idl\ - XConstantsTypeDescription.idl\ - XUnionTypeDescription.idl\ - XEnumTypeDescription.idl\ - XIdlArray.idl\ - XIdlClass.idl\ - XIdlClassProvider.idl\ - XIdlField.idl\ - XIdlField2.idl\ - XIdlMember.idl\ - XIdlMethod.idl\ - XIdlReflection.idl\ - XIndirectTypeDescription.idl\ - XInterfaceAttributeTypeDescription.idl\ - XInterfaceAttributeTypeDescription2.idl \ - XInterfaceMemberTypeDescription.idl\ - XInterfaceMethodTypeDescription.idl\ - XInterfaceTypeDescription.idl\ - XInterfaceTypeDescription2.idl \ - XMethodParameter.idl\ - XModuleTypeDescription.idl\ - XParameter.idl \ - XPropertyTypeDescription.idl\ - XProxyFactory.idl\ - XPublished.idl \ - XServiceConstructorDescription.idl \ - XServiceTypeDescription.idl\ - XServiceTypeDescription2.idl \ - XSingletonTypeDescription.idl\ - XSingletonTypeDescription2.idl \ - XStructTypeDescription.idl \ - XTypeDescription.idl\ - XTypeDescriptionEnumeration.idl\ - XTypeDescriptionEnumerationAccess.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/registry/makefile.mk b/udkapi/com/sun/star/registry/makefile.mk deleted file mode 100644 index 0e420aa848f6..000000000000 --- a/udkapi/com/sun/star/registry/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssregistry -PACKAGE=com$/sun$/star$/registry - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - CannotRegisterImplementationException.idl\ - DefaultRegistry.idl\ - ImplementationRegistration.idl\ - InvalidRegistryException.idl\ - InvalidValueException.idl\ - MergeConflictException.idl\ - NestedRegistry.idl\ - RegistryKeyType.idl\ - RegistryValueType.idl\ - SimpleRegistry.idl\ - XImplementationRegistration.idl\ - XImplementationRegistration2.idl\ - XRegistryKey.idl\ - XSimpleRegistry.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/security/makefile.mk b/udkapi/com/sun/star/security/makefile.mk deleted file mode 100644 index f8c66f9df85f..000000000000 --- a/udkapi/com/sun/star/security/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# build dependency: security -# security/auth -# security/auth/callback -# security/auth/login - -PRJ=..$/..$/..$/.. - -PRJNAME=udkapi - -TARGET=csssec -PACKAGE=com$/sun$/star$/security - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES= \ - AllPermission.idl \ - RuntimePermission.idl \ - Policy.idl \ - XPolicy.idl \ - AccessController.idl \ - XAccessController.idl \ - XAccessControlContext.idl \ - XAction.idl \ - AccessControlException.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/udkapi/com/sun/star/task/makefile.mk b/udkapi/com/sun/star/task/makefile.mk deleted file mode 100644 index e95d79ce4665..000000000000 --- a/udkapi/com/sun/star/task/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csstask -PACKAGE=com$/sun$/star$/task - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XInteractionAbort.idl\ - XInteractionContinuation.idl\ - XInteractionHandler.idl\ - XInteractionHandler2.idl\ - XInteractionRequest.idl\ - XInteractionRetry.idl -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/test/bridge/makefile.mk b/udkapi/com/sun/star/test/bridge/makefile.mk deleted file mode 100644 index 14347311ab55..000000000000 --- a/udkapi/com/sun/star/test/bridge/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssbridgetest -PACKAGE=com$/sun$/star$/test$/bridge - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XBridgeTest.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/test/makefile.mk b/udkapi/com/sun/star/test/makefile.mk deleted file mode 100644 index a1f2016bf27b..000000000000 --- a/udkapi/com/sun/star/test/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=csstest -PACKAGE=com$/sun$/star$/test - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - TestFactory.idl\ - XSimpleTest.idl\ - TestEvent.idl\ - XTest.idl\ - XTestListener.idl\ - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/test/performance/makefile.mk b/udkapi/com/sun/star/test/performance/makefile.mk deleted file mode 100644 index 00168c2a005d..000000000000 --- a/udkapi/com/sun/star/test/performance/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssperftest -PACKAGE=com$/sun$/star$/test$/performance - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XPerformanceTest.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/uno/makefile.mk b/udkapi/com/sun/star/uno/makefile.mk deleted file mode 100644 index d615b367fd5d..000000000000 --- a/udkapi/com/sun/star/uno/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssuno -PACKAGE=com$/sun$/star$/uno - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - Exception.idl\ - NamingService.idl\ - RuntimeException.idl\ - SecurityException.idl\ - DeploymentException.idl\ - TypeClass.idl\ - Uik.idl\ - XAdapter.idl\ - XAggregation.idl\ - XInterface.idl\ - XNamingService.idl\ - XReference.idl\ - XWeak.idl\ - XComponentContext.idl\ - XCurrentContext.idl\ - XUnloadingPreference.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/uri/makefile.mk b/udkapi/com/sun/star/uri/makefile.mk deleted file mode 100644 index 8b9a0b7a2b81..000000000000 --- a/udkapi/com/sun/star/uri/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/..$/..$/.. -PRJNAME := api -TARGET := cssuri - -PACKAGE := com$/sun$/star$/uri - -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -IDLFILES = \ - ExternalUriReferenceTranslator.idl \ - RelativeUriExcessParentSegments.idl \ - UriReferenceFactory.idl \ - UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl \ - UriSchemeParser_vndDOTsunDOTstarDOTscript.idl \ - VndSunStarPkgUrlReferenceFactory.idl \ - XExternalUriReferenceTranslator.idl \ - XUriReference.idl \ - XUriReferenceFactory.idl \ - XUriSchemeParser.idl \ - XVndSunStarExpandUrl.idl \ - XVndSunStarExpandUrlReference.idl \ - XVndSunStarPkgUrlReferenceFactory.idl \ - XVndSunStarScriptUrl.idl \ - XVndSunStarScriptUrlReference.idl - -.INCLUDE: target.mk -.INCLUDE: $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/util/logging/makefile.mk b/udkapi/com/sun/star/util/logging/makefile.mk deleted file mode 100644 index e48b71921edb..000000000000 --- a/udkapi/com/sun/star/util/logging/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ =..$/..$/..$/..$/.. -PRJNAME =logging -TARGET =cssulog -PACKAGE =com$/sun$/star$/util$/logging - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - LogLevel.idl\ - XLogger.idl\ - XLoggerRemote.idl\ - Logger.idl\ - LoggerRemote.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/com/sun/star/util/makefile.mk b/udkapi/com/sun/star/util/makefile.mk deleted file mode 100644 index 9c5e0276d415..000000000000 --- a/udkapi/com/sun/star/util/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. - -PRJNAME=api - -TARGET=cssutil -PACKAGE=com$/sun$/star$/util - -# --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# ------------------------------------------------------------------------ - -IDLFILES=\ - XVeto.idl \ - XMacroExpander.idl \ - MacroExpander.idl \ - BootstrapMacroExpander.idl \ - theMacroExpander.idl - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst index 071723a9e835..b51f2a247520 100644 --- a/udkapi/prj/build.lst +++ b/udkapi/prj/build.lst @@ -1,30 +1,3 @@ -ua udkapi : idlc NULL +ua udkapi : DESKTOP:idlc DESKTOP:codemaker NULL ua udkapi usr1 - all ua_mkout NULL -ua udkapi\com\sun\star\beans nmake - all ua_bean NULL -ua udkapi\com\sun\star\bridge nmake - all ua_brid NULL -ua udkapi\com\sun\star\bridge\oleautomation nmake - all ua_auto ua_brid NULL -ua udkapi\com\sun\star\connection nmake - all ua_connect NULL -ua udkapi\com\sun\star\container nmake - all ua_cont NULL -ua udkapi\com\sun\star\io nmake - all ua_io NULL -ua udkapi\com\sun\star\java nmake - all ua_java NULL -ua udkapi\com\sun\star\lang nmake - all ua_lang NULL -ua udkapi\com\sun\star\loader nmake - all ua_load NULL -ua udkapi\com\sun\star\reflection nmake - all ua_refl NULL -ua udkapi\com\sun\star\registry nmake - all ua_regis NULL -ua udkapi\com\sun\star\script nmake - all ua_scrpt NULL -ua udkapi\com\sun\star\test nmake - all ua_test NULL -ua udkapi\com\sun\star\test\performance nmake - all ua_tstperform NULL -ua udkapi\com\sun\star\test\bridge nmake - all ua_tstbridge NULL -ua udkapi\com\sun\star\corba\iop nmake - all ua_iop NULL -ua udkapi\com\sun\star\corba\giop nmake - all ua_giop NULL -ua udkapi\com\sun\star\corba\iiop nmake - all ua_iiop NULL -ua udkapi\com\sun\star\corba nmake - all ua_corba NULL -ua udkapi\com\sun\star\uno nmake - all ua_uno NULL -ua udkapi\com\sun\star\security nmake - all ua_sec ua_uno NULL -ua udkapi\com\sun\star\util nmake - all ua_uutil ua_lang ua_uno NULL -ua udkapi\com\sun\star\util\logging nmake - all ua_log NULL -ua udkapi\com\sun\star\task nmake - all ua_task ua_uno NULL -ua udkapi\com\sun\star\uri nmake - all ua_uri ua_uno NULL -ua udkapi\com\sun\star nmake - all ua_star NULL -ua udkapi\util nmake - all ua_util ua_bean ua_brid ua_auto ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_uri ua_star NULL - +ua udkapi\prj nmake - all ua_prj NULL diff --git a/offapi/util/makefile.pmk b/udkapi/prj/makefile.mk index f58201109ef7..c677d2b3ec3f 100644 --- a/offapi/util/makefile.pmk +++ b/udkapi/prj/makefile.mk @@ -25,10 +25,16 @@ # #************************************************************************* -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +PRJ=.. +TARGET=prj -LOCALIDLFILES=TRUE +.INCLUDE : settings.mk -URDDOC=TRUE +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) diff --git a/udkapi/util/makefile.mk b/udkapi/util/makefile.mk deleted file mode 100644 index 23dbd37822f3..000000000000 --- a/udkapi/util/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -PRJPCH= - -PRJNAME=udkapi -TARGET=udkapi - -#use_starjar=true - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : makefile.pmk - -# ------------------------------------------------------------------ - -UNOIDLDBFILES= \ - $(UCR)$/css.db \ - $(UCR)$/cssutil.db \ - $(UCR)$/cssbeans.db \ - $(UCR)$/cssbridge.db \ - $(UCR)$/cssboleautomation.db \ - $(UCR)$/cssconnection.db\ - $(UCR)$/csscontainer.db \ - $(UCR)$/cssio.db \ - $(UCR)$/cssjava.db \ - $(UCR)$/csslang.db \ - $(UCR)$/csssec.db \ - $(UCR)$/cssloader.db \ - $(UCR)$/cssreflection.db \ - $(UCR)$/cssregistry.db \ - $(UCR)$/cssscript.db \ - $(UCR)$/csstest.db \ - $(UCR)$/cssperftest.db \ - $(UCR)$/cssbridgetest.db \ - $(UCR)$/cssuno.db \ - $(UCR)$/cssulog.db \ - $(UCR)$/csscorba.db \ - $(UCR)$/cssiop.db \ - $(UCR)$/cssiiop.db \ - $(UCR)$/cssgiop.db \ - $(UCR)$/csstask.db \ - $(UCR)$/cssuri.db - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst index c229639c722a..15104e8ff6e8 100644 --- a/unoil/prj/build.lst +++ b/unoil/prj/build.lst @@ -1,4 +1,4 @@ -ul unoil :: codemaker offapi ridljar solenv cli_ure NULL +ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL ul unoil\javamaker nmake - all ul_javamaker NULL ul unoil\util nmake - all ul_util ul_javamaker NULL ul unoil\climaker nmake - all ul_climaker NULL
\ No newline at end of file diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index ee2ca081488c..816c58ef92ae 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -265,9 +265,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return ::cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, ::uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 68fe22e1fb19..960760c3fc1c 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return ::cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, ::uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index 9f2c40af19c8..e138b8d075eb 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map index 82a89b6b28fc..206137092f62 100644 --- a/ure/source/uretest/version.map +++ b/ure/source/uretest/version.map @@ -28,7 +28,6 @@ UDK_3_0_0 { global: component_getFactory; - component_getImplementationEnvironment; component_writeInfo; _ZTI*; diff --git a/xmlreader/prj/build.lst b/xmlreader/prj/build.lst index 7c37df8a7503..59b71b87d0a1 100644 --- a/xmlreader/prj/build.lst +++ b/xmlreader/prj/build.lst @@ -1,2 +1,2 @@ -xr xmlreader : BOOST:boost cppu offuh sal stlport NULL +xr xmlreader : BOOST:boost cppu offapi sal stlport NULL xr xmlreader\prj nmake - all xr_prj NULL diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst index e69de29bb2d1..a4c06081d7c9 100644 --- a/xmlreader/prj/d.lst +++ b/xmlreader/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a |