diff options
Diffstat (limited to 'bridges/source/cpp_uno')
17 files changed, 31 insertions, 34 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index be610bbd2a4d..ca05bb0ae1b4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 635c7e74c53b..8017045bcb7d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 0bf81064a588..665415290bcb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 335e05fad1fc..970431fce11b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -425,7 +425,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -538,7 +538,7 @@ namespace fprintf(stderr,"cpp_mediate6\n"); #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index 6d57c134f63a..fa96ed3c3704 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 9404471a1474..a06269a4477c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index ba384f74472d..5e97cdd35249 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index e571bd2a555c..c2bfe5ef912c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index ea0d05a50c92..689e54f092b2 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 95acfac20aa5..af5c4a245ee4 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); + throw RuntimeException( OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } // determine called method @@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); + throw RuntimeException(OUString( "no member description found!" ), (XInterface *)pCppI ); } } return eRet; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index 4129785d39be..a85d756a823f 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -32,9 +32,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; namespace { diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index b29e3a7dce26..e87512a571fc 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 7859fb505092..f9d220931000 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString("illegal vtable index!"), + throw RuntimeException( OUString("illegal vtable index!"), (XInterface *)pThis ); } @@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate( default: { throw RuntimeException( - rtl::OUString("no member description found!"), + OUString("no member description found!"), (XInterface *)pThis ); } } @@ -446,7 +446,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx index 73cb40fd3c99..64fd8e71e6bf 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx @@ -35,7 +35,7 @@ const DWORD MSVC_ExceptionCode = 0xe06d7363; const long MSVC_magic_number = 0x19930520L; //============================================================================== -type_info * msci_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * msci_getRTTI( OUString const & rUNOname ); //============================================================================== int msci_filterCppException( diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 32c0109757a0..dadae1f64499 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex ) - throw RuntimeException( rtl::OUString("Illegal vtable index!"), + throw RuntimeException( OUString("Illegal vtable index!"), reinterpret_cast<XInterface *>( pCppI ) ); // Determine called method @@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( rtl::OUString("No member description found!"), + throw RuntimeException( OUString("No member description found!"), reinterpret_cast<XInterface *>( pCppI ) ); } } @@ -456,7 +456,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx index df3fb70110ec..715514ffc7ce 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx @@ -38,7 +38,7 @@ typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind; //============================================================================== -type_info * mscx_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * mscx_getRTTI( OUString const & rUNOname ); //============================================================================== int mscx_filterCppException( diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 53b40f23447c..a293d9937ca0 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -245,7 +245,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const strDirectory = "/tmp"; strDirectory += "/.execoooXXXXXX"; - rtl::OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); + OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); char *tmpfname = new char[aTmpName.getLength()+1]; strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1); if ((block.fd = mkstemp(tmpfname)) == -1) |