diff options
-rw-r--r-- | rdbmaker/source/codemaker/dependency.cxx | 4 | ||||
-rw-r--r-- | rdbmaker/source/codemaker/options.cxx | 3 | ||||
-rw-r--r-- | rdbmaker/source/codemaker/typemanager.cxx | 5 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/rdbmaker.cxx | 7 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/rdboptions.cxx | 3 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/rdbtype.cxx | 35 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/specialtypemanager.cxx | 3 | ||||
-rw-r--r-- | rdbmaker/source/rdbmaker/typeblop.cxx | 3 | ||||
-rw-r--r-- | registry/source/reflwrit.cxx | 4 | ||||
-rw-r--r-- | registry/source/regimpl.cxx | 6 | ||||
-rw-r--r-- | registry/source/regimpl.hxx | 3 | ||||
-rw-r--r-- | registry/test/testmerge.cxx | 3 | ||||
-rw-r--r-- | registry/test/testregcpp.cxx | 5 | ||||
-rw-r--r-- | registry/workben/regspeed.cxx | 3 | ||||
-rw-r--r-- | registry/workben/regtest.cxx | 4 |
15 files changed, 37 insertions, 54 deletions
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx index 866abb452d5d..8df5fd4bbeff 100644 --- a/rdbmaker/source/codemaker/dependency.cxx +++ b/rdbmaker/source/codemaker/dependency.cxx @@ -30,8 +30,8 @@ #include <rtl/alloc.h> #include <codemaker/dependency.hxx> -using namespace rtl; - +using ::rtl::OString; +using ::rtl::OStringBuffer; TypeDependency::TypeDependency() { m_pImpl = new TypeDependencyImpl(); diff --git a/rdbmaker/source/codemaker/options.cxx b/rdbmaker/source/codemaker/options.cxx index 0d87f38d8786..7090e282b715 100644 --- a/rdbmaker/source/codemaker/options.cxx +++ b/rdbmaker/source/codemaker/options.cxx @@ -28,8 +28,7 @@ #include <codemaker/options.hxx> -using namespace rtl; - +using ::rtl::OString; Options::Options() { } diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx index f4fffecb3d31..075b8f2a30dd 100644 --- a/rdbmaker/source/codemaker/typemanager.cxx +++ b/rdbmaker/source/codemaker/typemanager.cxx @@ -30,8 +30,9 @@ #include <osl/file.hxx> #include <codemaker/typemanager.hxx> -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; TypeManager::TypeManager() { m_pImpl = new TypeManagerImpl(); diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx index 35b0f6bd843d..d9d5b4b506e7 100644 --- a/rdbmaker/source/rdbmaker/rdbmaker.cxx +++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx @@ -53,9 +53,14 @@ #define PATH_DELEMITTER '/' -using namespace rtl; using namespace osl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; + FileStream listFile; RegistryKey rootKey; Registry regFile; diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx index 7326da281152..cc78f7a7e1da 100644 --- a/rdbmaker/source/rdbmaker/rdboptions.cxx +++ b/rdbmaker/source/rdbmaker/rdboptions.cxx @@ -30,8 +30,7 @@ #include "rdboptions.hxx" -using namespace rtl; - +using ::rtl::OString; sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { diff --git a/rdbmaker/source/rdbmaker/rdbtype.cxx b/rdbmaker/source/rdbmaker/rdbtype.cxx index 9c10bf05647c..7c76ee6cd564 100644 --- a/rdbmaker/source/rdbmaker/rdbtype.cxx +++ b/rdbmaker/source/rdbmaker/rdbtype.cxx @@ -34,8 +34,9 @@ #include "rdbtype.hxx" #include "rdboptions.hxx" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; sal_Bool isBaseType(const OString& type) { if ( type.equals("long") || @@ -119,12 +120,6 @@ sal_Bool produceType(const OString& typeName, { if (typeDependencies.isGenerated(typeName) ) return sal_True; -/* - RegistryKey typeKey = typeMgr.getTypeKey(typeName); - - if (!typeKey.isValid()) - return sal_False; -*/ if( !checkTypeDependencies(typeMgr, typeDependencies, typeName, bDepend)) return sal_False; @@ -135,26 +130,6 @@ sal_Bool produceType(const OString& typeName, o << typeName.getStr() << "\n"; } else { -/* - RegValueType valueType; - sal_uInt32 valueSize; - - if (typeKey.getValueInfo(OUString(), &valueType, &valueSize)) - { - if (typeName.equals("/")) - return sal_True; - else - return sal_False; - } - - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); - - if (typeKey.getValue(OUString(), pBuffer)) - { - rtl_freeMemory(pBuffer); - return sal_False; - } -*/ TypeReader reader = typeMgr.getTypeReader(typeName); if (!reader.isValid()) @@ -170,18 +145,14 @@ sal_Bool produceType(const OString& typeName, RegistryKey typeKey; if ( regKey.createKey( OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), typeKey) ) { -// rtl_freeMemory(pBuffer); return sal_False; } if ( typeKey.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)reader.getBlop(), reader.getBlopSize()) ) -// if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) ) { -// rtl_freeMemory(pBuffer); return sal_False; } -// rtl_freeMemory(pBuffer); } } diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx index 153f4e68de57..a5fe51b1acd5 100644 --- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx +++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx @@ -36,8 +36,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName ); sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop); } -using namespace rtl; - +using ::rtl::OString; SpecialTypeManager::SpecialTypeManager() { m_pImpl = new SpecialTypeManagerImpl(); diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index 0eb9115e2822..8c0c80244dde 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -50,7 +50,8 @@ using namespace com::sun::star::reflection; using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace cppu; -using namespace rtl; + +using ::rtl::OUString; static Reference< XHierarchicalNameAccess > xNameAccess; diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 6d4cc9a94e3e..69cffead8372 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -43,11 +43,11 @@ #include "reflcnst.hxx" -using namespace rtl; +using ::rtl::OString; + namespace { -// Throws std::bad_alloc: inline rtl::OString toByteString(rtl_uString const * str) { return rtl::OString( str->buffer, str->length, RTL_TEXTENCODING_UTF8, diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index e43f8054d32b..0976c23555c7 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -61,10 +61,14 @@ #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> -using namespace rtl; using namespace osl; using namespace store; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; + namespace { void printString(rtl::OUString const & s) { diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index 64e0cc8c401f..80b6470704c5 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -62,9 +62,6 @@ #define REG_GUARD(mutex) \ osl::Guard< osl::Mutex > aGuard( mutex ); -// @@@ using namespace rtl; -// @@@ using namespace osl; - class ORegKey; class RegistryTypeReader; diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index 8997b247189c..d91117be2be3 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -42,7 +42,8 @@ using namespace std; -using namespace rtl; + +using ::rtl::OUString; sal_Int32 lValue1 = 123456789; sal_Int32 lValue2 = 54321; diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index 283eb4b253e5..427f5428be7d 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -41,7 +41,10 @@ #include <rtl/ustring.hxx> using namespace std; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; void test_coreReflection() { diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx index db400a73729b..584fac277d85 100644 --- a/registry/workben/regspeed.cxx +++ b/registry/workben/regspeed.cxx @@ -103,7 +103,8 @@ protected: }; #endif -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OUStringToOString; #if (defined UNX) || (defined OS2) int main( int argc, char * argv[] ) diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx index b2ed50070d72..fb45c62e2a20 100644 --- a/registry/workben/regtest.cxx +++ b/registry/workben/regtest.cxx @@ -37,7 +37,9 @@ #include <rtl/alloc.h> using namespace std; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; #if (defined UNX) || (defined OS2) int main() |