diff options
23 files changed, 65 insertions, 436 deletions
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index c31d5d2d9318..e77afba2eab4 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Executable_Executable,cppumaker)) $(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,cppumaker,\ - reg \ sal \ salhelper \ unoidl \ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index 9d55909d4835..57a0a74a3a97 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Executable_Executable,javamaker)) $(eval $(call gb_Executable_use_external,javamaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,javamaker,\ - reg \ sal \ salhelper \ unoidl \ diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx index c952c368b354..49d1d4b9cea8 100644 --- a/codemaker/inc/codemaker/codemaker.hxx +++ b/codemaker/inc/codemaker/codemaker.hxx @@ -21,18 +21,11 @@ #define INCLUDED_CODEMAKER_CODEMAKER_HXX #include "sal/config.h" -#include "codemaker/unotype.hxx" -#include "registry/types.h" -#include "rtl/ref.hxx" -#include "sal/types.h" - -#include <vector> namespace rtl { class OString; class OUString; } -class TypeManager; namespace codemaker { diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx index 9eafb91b4ee0..8bff48fc0809 100644 --- a/codemaker/inc/codemaker/commoncpp.hxx +++ b/codemaker/inc/codemaker/commoncpp.hxx @@ -20,7 +20,14 @@ #ifndef INCLUDED_CODEMAKER_COMMONCPP_HXX #define INCLUDED_CODEMAKER_COMMONCPP_HXX -#include "codemaker/codemaker.hxx" +#include "sal/config.h" + +#include "codemaker/unotype.hxx" + +namespace rtl { + class OString; + class OUString; +} namespace codemaker { namespace cpp { diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx index 8ff0a9a02d17..54d9403cda57 100644 --- a/codemaker/inc/codemaker/commonjava.hxx +++ b/codemaker/inc/codemaker/commonjava.hxx @@ -20,7 +20,11 @@ #ifndef INCLUDED_CODEMAKER_COMMONJAVA_HXX #define INCLUDED_CODEMAKER_COMMONJAVA_HXX -#include "codemaker/codemaker.hxx" +#include "sal/config.h" + +#include "codemaker/unotype.hxx" + +namespace rtl { class OString; } namespace codemaker { namespace java { diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx index 48e59897a2e7..fc6aba69ab1d 100644 --- a/codemaker/inc/codemaker/typemanager.hxx +++ b/codemaker/inc/codemaker/typemanager.hxx @@ -20,18 +20,17 @@ #ifndef INCLUDED_CODEMAKER_TYPEMANAGER_HXX #define INCLUDED_CODEMAKER_TYPEMANAGER_HXX -#include "codemaker/global.hxx" +#include "sal/config.h" + +#include <vector> + #include "codemaker/unotype.hxx" -#include "registry/registry.hxx" -#include "registry/types.h" #include "rtl/ref.hxx" +#include "rtl/string.hxx" +#include "rtl/textenc.h" +#include "rtl/ustring.hxx" #include "salhelper/simplereferenceobject.hxx" -#include <boost/unordered_map.hpp> -#include <list> -#include <vector> - -namespace typereg { class Reader; } namespace unoidl { class Entity; class Manager; @@ -39,46 +38,10 @@ namespace unoidl { class Provider; } -//typedef ::std::list< Registry* > RegistryList; -typedef ::std::vector< Registry* > RegistryList; -typedef ::std::pair< RegistryKey, sal_Bool > KeyPair; -typedef ::std::vector< KeyPair > RegistryKeyList; - -typedef ::boost::unordered_map -< - ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, - EqualString -> T2TypeClassMap; - -class TypeManager : public salhelper::SimpleReferenceObject -{ +class TypeManager: public salhelper::SimpleReferenceObject { public: TypeManager(); - sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() ); - - ::rtl::OString getTypeName(RegistryKey& rTypeKey) const; - - sal_Bool isValidType(const ::rtl::OString& name) const - { return searchTypeKey(name, 0).isValid(); } - RegistryKey getTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const - { return searchTypeKey(name, pIsExtraType); } - RegistryKeyList getTypeKeys(const ::rtl::OString& name) const; - typereg::Reader getTypeReader( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; - typereg::Reader getTypeReader(RegistryKey& rTypeKey) const; - RTTypeClass getTypeClass(const ::rtl::OString& name) const; - RTTypeClass getTypeClass(RegistryKey& rTypeKey) const; - - void setBase(const ::rtl::OString& base); - ::rtl::OString getBase() const { return m_base; } - - sal_Int32 getSize() const { return m_t2TypeClass.size(); } - - void loadProvider(OUString const & uri, bool primary); bool foundAtPrimaryProvider(OUString const & name) const; @@ -95,28 +58,19 @@ public: private: virtual ~TypeManager(); - RegistryKey searchTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; - void freeRegistries(); - - mutable T2TypeClassMap m_t2TypeClass; - RegistryList m_registries; - RegistryList m_extra_registries; - ::rtl::OString m_base; - rtl::Reference< unoidl::Manager > manager_; std::vector< rtl::Reference< unoidl::Provider > > primaryProviders_; }; -inline rtl::OString u2b(rtl::OUString const & s) { - return rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8); +inline OString u2b(OUString const & s) { + return OUStringToOString(s, RTL_TEXTENCODING_UTF8); } -inline rtl::OUString b2u(rtl::OString const & s) { - return rtl::OStringToOUString(s, RTL_TEXTENCODING_UTF8); +inline OUString b2u(OString const & s) { + return OStringToOUString(s, RTL_TEXTENCODING_UTF8); } -#endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx index 6d6038e02a87..b00de6658a99 100644 --- a/codemaker/inc/codemaker/unotype.hxx +++ b/codemaker/inc/codemaker/unotype.hxx @@ -48,7 +48,6 @@ namespace UnoType { SORT_STRING, SORT_TYPE, SORT_ANY, - SORT_SEQUENCE_TYPE, SORT_MODULE, SORT_ENUM_TYPE, @@ -63,24 +62,9 @@ namespace UnoType { SORT_ACCUMULATION_BASED_SERVICE, SORT_INTERFACE_BASED_SINGLETON, SORT_SERVICE_BASED_SINGLETON - - ,SORT_COMPLEX=SORT_SEQUENCE_TYPE //TODO }; - /** TODO - Maps from a binary UNO type name or UNO type registry name to its type - sort. - - @param type a binary UNO type name or UNO type registry name - - @return the sort of the UNO type denoted by the given type; the detection - of the correct sort is purely syntactical (especially, if the given input - is a UNO type registry name that denotes something other than a UNO type, - SORT_COMPLEX is returned) - */ - Sort getSort(rtl::OString const & type); - - /** TODO + /** Decomposes a UNO type name or UNO type registry name. @param type a binary UNO type name or UNO type registry name diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx index 3c67b3788e39..18082b827f33 100644 --- a/codemaker/source/codemaker/codemaker.cxx +++ b/codemaker/source/codemaker/codemaker.cxx @@ -17,36 +17,26 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sal/config.h" #include "codemaker/codemaker.hxx" - -#include "codemaker/options.hxx" -#include "codemaker/typemanager.hxx" -#include "codemaker/unotype.hxx" - -#include "osl/diagnose.h" -#include "registry/reader.hxx" -#include "registry/types.h" -#include "rtl/strbuf.h" -#include "rtl/string.h" +#include "codemaker/global.hxx" #include "rtl/string.hxx" +#include "rtl/textcvt.h" +#include "rtl/textenc.h" #include "rtl/ustring.hxx" -#include "sal/types.h" - -#include <vector> namespace codemaker { -rtl::OString convertString(rtl::OUString const & string) { - rtl::OString s; +OString convertString(OUString const & string) { + OString s; if (!string.convertToString( &s, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { - throw CannotDumpException("Failure converting string from UTF-16 to UTF-8"); + throw CannotDumpException( + "Failure converting string from UTF-16 to UTF-8"); } return s; } diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index 5116aba904d4..ff0e6f92a259 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -21,306 +21,19 @@ #include <cstdlib> #include <cstring> +#include <vector> -#include "rtl/alloc.h" +#include "codemaker/global.hxx" #include "codemaker/typemanager.hxx" -#include "registry/reader.hxx" -#include "registry/version.h" +#include "rtl/ref.hxx" +#include "rtl/ustring.hxx" #include "unoidl/unoidl.hxx" -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; +TypeManager::TypeManager(): manager_(new unoidl::Manager) {} -TypeManager::TypeManager(): m_base("UCR"), manager_(new unoidl::Manager) {} +TypeManager::~TypeManager() {} -TypeManager::~TypeManager() -{ - freeRegistries(); -} - -sal_Bool TypeManager::init( - const StringVector& regFiles, - StringVector const & extraFiles ) -{ - if (regFiles.empty()) - return sal_False; - - StringVector::const_iterator iter = regFiles.begin(); - - Registry tmpReg; - while (iter != regFiles.end()) - { - if (!tmpReg.open( convertToFileUrl(*iter), REG_READONLY)) - m_registries.push_back(new Registry(tmpReg)); - else - { - freeRegistries(); - return sal_False; - } - ++iter; - } - iter = extraFiles.begin(); - while (iter != extraFiles.end()) - { - if (!tmpReg.open( convertToFileUrl(*iter), REG_READONLY)) - m_extra_registries.push_back(new Registry(tmpReg)); - else - { - freeRegistries(); - return sal_False; - } - ++iter; - } - - return sal_True; -} - -::rtl::OString TypeManager::getTypeName(RegistryKey& rTypeKey) const -{ - OString typeName = OUStringToOString(rTypeKey.getName(), RTL_TEXTENCODING_UTF8); - - if (m_base.getLength() > 1) - typeName = typeName.copy(typeName.indexOf('/', 1) + 1); - else - typeName = typeName.copy(1); - - return typeName; -} - -typereg::Reader TypeManager::getTypeReader( - const OString& name, sal_Bool * pIsExtraType ) const -{ - typereg::Reader reader; - RegistryKey key(searchTypeKey(name, pIsExtraType)); - - if (key.isValid()) - { - RegValueType valueType; - sal_uInt32 valueSize; - - if (!key.getValueInfo(OUString(), &valueType, &valueSize)) - { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); - if (!key.getValue(OUString(), pBuffer)) - { - reader = typereg::Reader( - pBuffer, valueSize, true, TYPEREG_VERSION_1); - } - rtl_freeMemory(pBuffer); - } - } - return reader; -} - -typereg::Reader TypeManager::getTypeReader(RegistryKey& rTypeKey) const -{ - typereg::Reader reader; - - if (rTypeKey.isValid()) - { - RegValueType valueType; - sal_uInt32 valueSize; - - if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize)) - { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); - if (!rTypeKey.getValue(OUString(), pBuffer)) - { - reader = typereg::Reader( - pBuffer, valueSize, true, TYPEREG_VERSION_1); - } - rtl_freeMemory(pBuffer); - } - } - return reader; -} - - -RTTypeClass TypeManager::getTypeClass(const OString& name) const -{ - if (m_t2TypeClass.count(name) > 0) - { - return m_t2TypeClass[name]; - } else - { - RegistryKey key(searchTypeKey(name)); - - if (key.isValid()) - { - RegValueType valueType; - sal_uInt32 valueSize; - - if (!key.getValueInfo(OUString(), &valueType, &valueSize)) - { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); - if (!key.getValue(OUString(), pBuffer)) - { - typereg::Reader reader( - pBuffer, valueSize, false, TYPEREG_VERSION_1); - - RTTypeClass ret = reader.getTypeClass(); - - rtl_freeMemory(pBuffer); - - m_t2TypeClass[name] = ret; - return ret; - } - rtl_freeMemory(pBuffer); - } - } - } - - return RT_TYPE_INVALID; -} - -RTTypeClass TypeManager::getTypeClass(RegistryKey& rTypeKey) const -{ - OString name = getTypeName(rTypeKey); - - if (m_t2TypeClass.count(name) > 0) - { - return m_t2TypeClass[name]; - } else - { - if (rTypeKey.isValid()) - { - RegValueType valueType; - sal_uInt32 valueSize; - - if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize)) - { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); - if (!rTypeKey.getValue(OUString(), pBuffer)) - { - typereg::Reader reader( - pBuffer, valueSize, false, TYPEREG_VERSION_1); - - RTTypeClass ret = reader.getTypeClass(); - - rtl_freeMemory(pBuffer); - - m_t2TypeClass[name] = ret; - return ret; - } - rtl_freeMemory(pBuffer); - } - } - } - - return RT_TYPE_INVALID; -} - -void TypeManager::setBase(const OString& base) -{ - - if (base.lastIndexOf('/') == (base.getLength() - 1)) - m_base = base.copy(0, base.lastIndexOf('/') - 1); - else - m_base = base; -} - -void TypeManager::freeRegistries() -{ - RegistryList::const_iterator iter = m_registries.begin(); - while (iter != m_registries.end()) - { - delete *iter; - ++iter; - } - iter = m_extra_registries.begin(); - while (iter != m_extra_registries.end()) - { - delete *iter; - ++iter; - } -} - -RegistryKey TypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtraType ) - const -{ - OUString name( OStringToOUString(m_base + "/" + name_, RTL_TEXTENCODING_UTF8) ); - RegistryKey key, rootKey; - - RegistryList::const_iterator iter = m_registries.begin(); - while (iter != m_registries.end()) - { - if (!(*iter)->openRootKey(rootKey)) - { - if (!rootKey.openKey(name, key)) - { - if (pIsExtraType) - *pIsExtraType = sal_False; - return key; - } - } - ++iter; - } - iter = m_extra_registries.begin(); - while (iter != m_extra_registries.end()) - { - if (!(*iter)->openRootKey(rootKey)) - { - if (!rootKey.openKey(name, key)) - { - if (pIsExtraType) - *pIsExtraType = sal_True; - break; - } - } - ++iter; - } - - return key; -} - -RegistryKeyList TypeManager::getTypeKeys(const ::rtl::OString& name_) const -{ - RegistryKeyList keyList= RegistryKeyList(); - OString tmpName; - if ( name_ == "/" || name_ == m_base ) { - tmpName = m_base; - } else { - if ( m_base == "/" ) - tmpName = name_; - else - tmpName = m_base + "/" + name_; - } - - OUString name( OStringToOUString(tmpName, RTL_TEXTENCODING_UTF8) ); - RegistryKey key, rootKey; - - RegistryList::const_iterator iter = m_registries.begin(); - while (iter != m_registries.end()) - { - if (!(*iter)->openRootKey(rootKey)) - { - if (!rootKey.openKey(name, key)) - { - keyList.push_back(KeyPair(key, sal_False)); - } - } - ++iter; - } - iter = m_extra_registries.begin(); - while (iter != m_extra_registries.end()) - { - if (!(*iter)->openRootKey(rootKey)) - { - if (!rootKey.openKey(name, key)) - { - keyList.push_back(KeyPair(key, sal_True)); - } - } - ++iter; - } - - return keyList; -} - - -void TypeManager::loadProvider(rtl::OUString const & uri, bool primary) { +void TypeManager::loadProvider(OUString const & uri, bool primary) { rtl::Reference< unoidl::Provider > prov( unoidl::loadProvider(manager_, uri)); manager_->addProvider(prov); @@ -329,7 +42,7 @@ void TypeManager::loadProvider(rtl::OUString const & uri, bool primary) { } } -bool TypeManager::foundAtPrimaryProvider(rtl::OUString const & name) const { +bool TypeManager::foundAtPrimaryProvider(OUString const & name) const { if (name.isEmpty()) { return !primaryProviders_.empty(); } diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx index a0872ea33a37..5b76a04462b2 100644 --- a/codemaker/source/codemaker/unotype.cxx +++ b/codemaker/source/codemaker/unotype.cxx @@ -26,26 +26,6 @@ #include <vector> -codemaker::UnoType::Sort codemaker::UnoType::getSort(OString const & type) -{ - return type == "void" ? SORT_VOID - : type == "boolean" ? SORT_BOOLEAN - : type == "byte" ? SORT_BYTE - : type == "short" ? SORT_SHORT - : type == "unsigned short" ? SORT_UNSIGNED_SHORT - : type == "long" ? SORT_LONG - : type == "unsigned long" ? SORT_UNSIGNED_LONG - : type == "hyper" ? SORT_HYPER - : type == "unsigned hyper" ? SORT_UNSIGNED_HYPER - : type == "float" ? SORT_FLOAT - : type == "double" ? SORT_DOUBLE - : type == "char" ? SORT_CHAR - : type == "string" ? SORT_STRING - : type == "type" ? SORT_TYPE - : type == "any" ? SORT_ANY - : SORT_COMPLEX; -} - OString codemaker::UnoType::decompose( OString const & type, sal_Int32 * rank, std::vector< OString > * arguments) diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 295488d28890..5d8d79bb3f49 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -26,8 +26,6 @@ #include "codemaker/unotype.hxx" #include "osl/diagnose.h" -#include "registry/reader.hxx" -#include "registry/types.h" #include "rtl/strbuf.hxx" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index 84722d5908e0..20bdce402e51 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -27,8 +27,6 @@ #include "codemaker/unotype.hxx" #include "osl/diagnose.h" -#include "registry/reader.hxx" -#include "registry/types.h" #include "rtl/strbuf.h" #include "rtl/string.h" #include "rtl/string.hxx" diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 7540c02ed57c..8411f58a7702 100755 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -3357,9 +3357,9 @@ void ServiceType::dumpHxxFile( i->parameters.begin()); j != i->parameters.end(); ++j) { - if (codemaker::UnoType::getSort( - codemaker::UnoType::decompose( - u2b(j->type), 0, 0)) + if (m_typeMgr->getSort( + b2u(codemaker::UnoType::decompose( + u2b(j->type), 0, 0))) == codemaker::UnoType::SORT_CHAR) { includes.addCppuUnotypeHxx(); @@ -3506,9 +3506,9 @@ void ServiceType::dumpHxxFile( u2b(j->name), "param", codemaker::cpp::ITM_NONGLOBAL)); sal_Int32 rank; - if (codemaker::UnoType::getSort( - codemaker::UnoType::decompose( - u2b(j->type), &rank, 0)) + if (m_typeMgr->getSort( + b2u(codemaker::UnoType::decompose( + u2b(j->type), &rank, 0))) == codemaker::UnoType::SORT_CHAR) { o << "= ::com::sun::star::uno::Any(&" << param diff --git a/codemaker/source/cppumaker/dependencies.cxx b/codemaker/source/cppumaker/dependencies.cxx index 35a4ab37cd86..82ae4a1de026 100644 --- a/codemaker/source/cppumaker/dependencies.cxx +++ b/codemaker/source/cppumaker/dependencies.cxx @@ -23,6 +23,7 @@ #include <utility> #include <vector> +#include "codemaker/global.hxx" #include "codemaker/typemanager.hxx" #include "codemaker/unotype.hxx" diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index 9250153be6fd..2b1a9d5c020a 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -48,12 +48,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { } try { rtl::Reference< TypeManager > typeMgr(new TypeManager); - if (!typeMgr->init( - options.getInputFiles(), options.getExtraInputFiles())) - { - std::cerr << "Initialization of registries failed\n"; - return EXIT_FAILURE; - } for (std::vector< rtl::OString >::const_iterator i( options.getExtraInputFiles().begin()); i != options.getExtraInputFiles().end(); ++i) diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 3bd6ef4cc6d9..6f3186632fe1 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -28,6 +28,7 @@ #include <utility> #include <vector> +#include "codemaker/codemaker.hxx" #include "codemaker/exceptiontree.hxx" #include "codemaker/generatedtypeset.hxx" #include "codemaker/global.hxx" diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk index 1cb142e48887..3c6c791a23a1 100644 --- a/unodevtools/Executable_skeletonmaker.mk +++ b/unodevtools/Executable_skeletonmaker.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Executable_set_include,uno-skeletonmaker,\ )) $(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\ - reg \ sal \ salhelper \ unoidl \ diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 41ef20394654..435ee4d6d586 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -17,7 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include "codemaker/commoncpp.hxx" +#include "codemaker/global.hxx" #include "skeletoncommon.hxx" #include "skeletoncpp.hxx" diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 946181566b46..abd301269f7d 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -17,7 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + +#include "codemaker/codemaker.hxx" #include "codemaker/commoncpp.hxx" +#include "codemaker/global.hxx" #include "skeletoncommon.hxx" #include "skeletoncpp.hxx" diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx index 339dbad9ed99..b617eea614b4 100644 --- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -17,7 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include "codemaker/commonjava.hxx" +#include "codemaker/global.hxx" +#include "rtl/strbuf.hxx" #include "skeletoncommon.hxx" #include "skeletonjava.hxx" diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index 0d24942f6f33..cb84458ac752 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -21,7 +21,9 @@ #include <cstring> +#include "codemaker/codemaker.hxx" #include "codemaker/commonjava.hxx" +#include "codemaker/global.hxx" #include "skeletoncommon.hxx" #include "skeletonjava.hxx" diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index ae298d06e7f0..d233d68bbf39 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -22,6 +22,7 @@ #include "codemaker/commonjava.hxx" #include "codemaker/commoncpp.hxx" #include "codemaker/generatedtypeset.hxx" +#include "codemaker/global.hxx" #include "unoidl/unoidl.hxx" #include "skeletoncommon.hxx" diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx index c601245d85c2..98fab210bb7d 100644 --- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx +++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx @@ -18,6 +18,7 @@ */ #include <iostream> +#include "codemaker/global.hxx" #include "codemaker/typemanager.hxx" #include "sal/main.h" #include "rtl/process.h" |