diff options
Diffstat (limited to 'vcl')
336 files changed, 2870 insertions, 2993 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index e67dc8f9d0f5..cd0390b146c1 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -230,9 +230,9 @@ class AndroidSalSystem : public SvpSalSystem { public: AndroidSalSystem() : SvpSalSystem() {} virtual ~AndroidSalSystem() {} - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; @@ -277,7 +277,7 @@ public: // Clobber the UI fonts #if 0 psp::FastPrintFontInfo aInfo; - aInfo.m_aFamilyName = rtl::OUString( "Roboto" ); + aInfo.m_aFamilyName = OUString( "Roboto" ); aInfo.m_eItalic = ITALIC_NORMAL; aInfo.m_eWeight = WEIGHT_NORMAL; aInfo.m_eWidth = WIDTH_NORMAL; @@ -285,7 +285,7 @@ public: #endif // FIXME: is 14 point enough ? - Font aFont( rtl::OUString( "Roboto" ), Size( 0, 14 ) ); + Font aFont( OUString( "Roboto" ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); @@ -320,15 +320,15 @@ void InitSalData() {} void DeInitSalData() {} void InitSalMain() {} -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { - rtl::OUString aError( rErrorText ); + OUString aError( rErrorText ); if( aError.isEmpty() ) - aError = rtl::OUString::createFromAscii("Unknown application error"); - LOGI("%s", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); + aError = OUString::createFromAscii("Unknown application error"); + LOGI("%s", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); LOGI("SalAbort: '%s'", - rtl::OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr()); if( bDumpCore ) abort(); else @@ -337,7 +337,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) const OUString& SalGetDesktopEnvironment() { - static rtl::OUString aEnv( "android" ); + static OUString aEnv( "android" ); return aEnv; } @@ -370,18 +370,18 @@ void DestroySalInstance( SalInstance *pInst ) #include <vcl/msgbox.hxx> -int AndroidSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, +int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) { (void)rButtons; (void)nDefButton; LOGI("LibreOffice native dialog '%s': '%s'", - rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); LOGI("Dialog '%s': '%s'", - rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); if (AndroidSalInstance::getInstance() != NULL) { diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 0c104009ea75..5a3ad3304768 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -120,12 +120,12 @@ NSMenu* AquaSalInstance::GetDynamicDockMenu() return pDockMenu; } -bool AquaSalInstance::isOnCommandLine( const rtl::OUString& rArg ) +bool AquaSalInstance::isOnCommandLine( const OUString& rArg ) { sal_uInt32 nArgs = osl_getCommandArgCount(); for( sal_uInt32 i = 0; i < nArgs; i++ ) { - rtl::OUString aArg; + OUString aArg; osl_getCommandArg( i, &aArg.pData ); if( aArg.equals( rArg ) ) return true; @@ -217,10 +217,10 @@ sal_Bool ImplSVMainHook( int * pnInit ) { [NSApp postEvent: pEvent atStart: NO]; - rtl::OUString aExeURL, aExe; + OUString aExeURL, aExe; osl_getExecutableFile( &aExeURL.pData ); osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData ); - rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) ); + OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) ); #ifdef DEBUG aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" ); @@ -241,13 +241,13 @@ sal_Bool ImplSVMainHook( int * pnInit ) // ======================================================================= -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) fprintf( stderr, "Application Error " ); else fprintf( stderr, "%s ", - rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() ); + OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() ); if( bDumpCore ) abort(); else @@ -264,7 +264,7 @@ void InitSalData() // ----------------------------------------------------------------------- -const ::rtl::OUString& SalGetDesktopEnvironment() +const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; @@ -923,7 +923,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalInstance::GetDefaultPrinter() +OUString AquaSalInstance::GetDefaultPrinter() { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -1013,7 +1013,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur // We need to re-encode file urls because osl_getFileURLFromSystemPath converts // to UTF-8 before encoding non ascii characters, which is not what other apps expect. -static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +static OUString translateToExternalUrl(const OUString& internalUrl) { uno::Reference< uno::XComponentContext > context( comphelper::getProcessComponentContext()); @@ -1023,7 +1023,7 @@ static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) // #i104525# many versions of OSX have problems with some URLs: // when an app requests OSX to add one of these URLs to the "Recent Items" list // then this app gets killed (TextEdit, Preview, etc. and also OOo) -static bool isDangerousUrl( const rtl::OUString& rUrl ) +static bool isDangerousUrl( const OUString& rUrl ) { // use a heuristic that detects all known cases since there is no official comment // on the exact impact and root cause of the OSX bug @@ -1051,10 +1051,10 @@ static bool isDangerousUrl( const rtl::OUString& rUrl ) return false; } -void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/) +void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/) { // Convert file URL for external use (see above) - rtl::OUString externalUrl = translateToExternalUrl(rFileUrl); + OUString externalUrl = translateToExternalUrl(rFileUrl); if( externalUrl.isEmpty() ) externalUrl = rFileUrl; diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index e849f013cbee..9886ecdf35b9 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -29,7 +29,6 @@ #include "svids.hrc" -using ::rtl::OUString; // ======================================================================= @@ -81,7 +80,7 @@ Rectangle AquaSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScr return aRet; } -rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) { NSArray* pScreens = [NSScreen screens]; OUString aRet; @@ -100,7 +99,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) static NSString* getStandardString( int nButtonId, bool bUseResources ) { - rtl::OUString aText; + OUString aText; if( bUseResources ) { aText = Button::GetStandardText( nButtonId ); @@ -109,19 +108,19 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( "OK" );break; - case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; - case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; - case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; - case BUTTON_YES: aText = rtl::OUString( "Yes" );break; - case BUTTON_NO : aText = rtl::OUString( "No" );break; + case BUTTON_OK: aText = OUString( "OK" );break; + case BUTTON_ABORT: aText = OUString( "Abort" );break; + case BUTTON_CANCEL: aText = OUString( "Cancel" );break; + case BUTTON_RETRY: aText = OUString( "Retry" );break; + case BUTTON_YES: aText = OUString( "Yes" );break; + case BUTTON_NO : aText = OUString( "No" );break; } } return aText.isEmpty() ? nil : CreateNSString( aText); } -int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, +int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources) { diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index b030ac8e0fb1..7b5787149844 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -44,9 +44,6 @@ using namespace com::sun::star::lang; using namespace cppu; using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; namespace // private { @@ -681,7 +678,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor return dp; } -bool DataFlavorMapper::isValidMimeContentType(const rtl::OUString& contentType) const +bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const { bool result = true; diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx index 7ef36401c3ca..ed78689c426c 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx @@ -126,11 +126,11 @@ public: private: /* Determines if the provided Mime content type is valid. */ - bool isValidMimeContentType(const rtl::OUString& contentType) const; + bool isValidMimeContentType(const OUString& contentType) const; private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; - typedef boost::unordered_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes; + typedef boost::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes; }; diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index 36b6a9fca71c..f2e6081be9ec 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -51,7 +51,6 @@ using namespace com::sun::star::lang; using namespace comphelper; using namespace std; -using ::rtl::OUString; // For OOo internal D&D we provide the Transferable without NSDragPboard // interference as a shortcut diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx index 5ca8ffc68aeb..2932a83e7cef 100644 --- a/vcl/aqua/source/dtrans/DragSource.hxx +++ b/vcl/aqua/source/dtrans/DragSource.hxx @@ -101,9 +101,9 @@ public: throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual void saveMouseEvent(NSEvent* theEvent); virtual unsigned int getSupportedDragOperations(bool isLocal) const; diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 1eeebc520186..6c359cc93430 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star; using namespace comphelper; -using ::rtl::OUString; OUString dropTarget_getImplementationName() { diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index d2050eca5b4f..988943873e6c 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -118,9 +118,9 @@ public: virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); // NSDraggingDestination protocol functions virtual NSDragOperation draggingEntered(id sender); diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 5d541972f82b..c71bfc452b01 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using ::rtl::OUString; namespace // private { diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 0db1318695de..383c7488aa2f 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace std; using namespace comphelper; -using ::rtl::OUString; @implementation EventListener; diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx index a12a3ec20f5e..2e7670588ede 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx @@ -97,7 +97,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------ @@ -127,13 +127,13 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); /* Get a reference to the used pastboard. diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx index ad62d0115355..06bf683afcb1 100644 --- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx +++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx @@ -236,7 +236,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs ) ByteCount nDummy; ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize), &fFontSize, &nDummy); String aUniName( &rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount ); - rtl::OString aCName(rtl::OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8)); + OString aCName(OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8)); fprintf( stderr, "ATSLayout( \"%s\" %d..%d of %d) with h=%4.1f\n", aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) ); #endif diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx index 1dae840c79b1..0c0f58023c94 100644 --- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx @@ -40,7 +40,7 @@ // and SFNT fonts on Mac usually do not contain an OS/2 table. static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA ) { - rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ); + OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ); // TODO: use a multi-string ignore-case matcher once it becomes available if( (aPSName.indexOf("regular") != -1) diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 02e86b1da5a1..f4518f9fb461 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -470,13 +470,13 @@ static bool AddLocalTempFontDirs( void ) // add private font files - rtl::OUString aBrandStr( "$BRAND_BASE_DIR" ); + OUString aBrandStr( "$BRAND_BASE_DIR" ); rtl_bootstrap_expandMacros( &aBrandStr.pData ); - rtl::OUString aBrandSysPath; + OUString aBrandSysPath; OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); - rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); - aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); + OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); + aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); aBrandFontDir.append( "/share/fonts/truetype/" ); return AddTempFontDir( aBrandFontDir.getStr() ); } @@ -513,14 +513,14 @@ void AquaSalGraphics::ClearDevFontCache() // ----------------------------------------------------------------------- bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, - const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ ) + const OUString& rFontFileURL, const OUString& /*rFontName*/ ) { - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); FSRef aNewRef; Boolean bIsDirectory = true; - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 ); + OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 ); OSStatus eStatus = FSPathMakeRef( (UInt8*)aCFileName.getStr(), &aNewRef, &bIsDirectory ); DBG_ASSERT( (eStatus==noErr) && !bIsDirectory, "vcl AddTempDevFont() with invalid fontfile name!" ); if( eStatus != noErr ) @@ -774,11 +774,11 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac #if OSL_DEBUG_LEVEL > 3 fprintf( stderr, "SetFont to (\"%s\", \"%s\", fontid=%d) for (\"%s\" \"%s\" weight=%d, slant=%d size=%dx%d orientation=%d)\n", - ::rtl::OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - ::rtl::OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), (int)nFontID, - ::rtl::OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - ::rtl::OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), pReqFont->GetWeight(), pReqFont->GetSlant(), pReqFont->mnHeight, diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index 5b78f3394f64..afedd3b9a339 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -136,7 +136,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath, } } -sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, +sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFontData, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, @@ -145,11 +145,11 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, // TODO: move more of the functionality here into the generic subsetter code // prepare the requested file name for writing the font-subset file - rtl::OUString aSysPath; + OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) return sal_False; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) ); + const OString aToFile( OUStringToOString( aSysPath, aThreadEncoding ) ); // get the raw-bytes from the font to be subset ByteVector aBuffer; diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index a2586ac22cc3..8e2ef02b3bac 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -461,7 +461,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& ) + const OUString& ) { sal_Bool bOK = sal_False; @@ -1168,7 +1168,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, * aCaption: A caption or title string (like button text etc) */ sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/, - const ImplControlValue& aValue, const rtl::OUString&, + const ImplControlValue& aValue, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index d32c6d943b0d..6b61398a87b5 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -44,8 +44,6 @@ using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::beans; -using ::rtl::OUString; -using ::rtl::OStringToOUString; // ======================================================================= @@ -225,7 +223,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio if( pPaper ) { - NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; + NSString* pPaperName = [CreateNSString( OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; [mpPrintInfo setPaperName: pPaperName]; } else if( i_nWidth > 0 && i_nHeight > 0 ) @@ -286,9 +284,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) +OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { - return rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------- @@ -376,9 +374,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag return aPageSize; } -sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& /*i_rAppName*/, +sal_Bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& /*i_rAppName*/, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) @@ -401,7 +399,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // do we want a progress panel ? sal_Bool bShowProgressPanel = sal_True; - beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) ); + beans::PropertyValue* pMonitor = i_rController.getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShowProgressPanel; if( ! i_rController.isShowDialogs() ) @@ -409,7 +407,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // possibly create one job for collated output sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); + beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; @@ -621,9 +619,9 @@ AquaSalPrinter::~AquaSalPrinter() // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, +sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { @@ -632,9 +630,9 @@ sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName, // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/, - const rtl::OUString& /*i_rJobName*/, - const rtl::OUString& /*i_rAppName*/, +sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, + const OUString& /*i_rJobName*/, + const OUString& /*i_rAppName*/, sal_uLong /*i_nCopies*/, bool /*i_bCollate*/, bool /*i_bDirect*/, @@ -696,7 +694,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) { NSString* pPaper = [pPaperNames objectAtIndex: i]; // first try to match the name - rtl::OString aPaperName( [pPaper UTF8String] ); + OString aPaperName( [pPaper UTF8String] ); Paper ePaper = PaperInfo::fromPSName( aPaperName ); if( ePaper != PAPER_USER ) { diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 1d03c30d95eb..608e9d891305 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -308,7 +308,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData ) } // ----------------------------------------------------------------------- -void AquaSalFrame::SetTitle(const rtl::OUString& rTitle) +void AquaSalFrame::SetTitle(const OUString& rTitle) { if ( !mpWindow ) return; @@ -352,14 +352,14 @@ void AquaSalFrame::SetIcon( sal_uInt16 ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL ) +void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 ) { - rtl::OUString aSysPath; + OUString aSysPath; osl_getSystemPathFromFileURL( i_rDocURL.pData, &aSysPath.pData ); NSString* pStr = CreateNSString( aSysPath ); if( pStr ) @@ -728,7 +728,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen) } } -void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ ) +void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } @@ -1054,74 +1054,74 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { - static std::map< sal_uInt16, rtl::OUString > aKeyMap; + static std::map< sal_uInt16, OUString > aKeyMap; if( aKeyMap.empty() ) { sal_uInt16 i; for( i = KEY_A; i <= KEY_Z; i++ ) - aKeyMap[ i ] = rtl::OUString( sal_Unicode( 'A' + (i - KEY_A) ) ); + aKeyMap[ i ] = OUString( sal_Unicode( 'A' + (i - KEY_A) ) ); for( i = KEY_0; i <= KEY_9; i++ ) - aKeyMap[ i ] = rtl::OUString( sal_Unicode( '0' + (i - KEY_0) ) ); + aKeyMap[ i ] = OUString( sal_Unicode( '0' + (i - KEY_0) ) ); for( i = KEY_F1; i <= KEY_F26; i++ ) { - rtl::OUStringBuffer aKey( 3 ); + OUStringBuffer aKey( 3 ); aKey.append( sal_Unicode( 'F' ) ); aKey.append( sal_Int32( i - KEY_F1 + 1 ) ); aKeyMap[ i ] = aKey.makeStringAndClear(); } - aKeyMap[ KEY_DOWN ] = rtl::OUString( sal_Unicode( 0x21e3 ) ); - aKeyMap[ KEY_UP ] = rtl::OUString( sal_Unicode( 0x21e1 ) ); - aKeyMap[ KEY_LEFT ] = rtl::OUString( sal_Unicode( 0x21e0 ) ); - aKeyMap[ KEY_RIGHT ] = rtl::OUString( sal_Unicode( 0x21e2 ) ); - aKeyMap[ KEY_HOME ] = rtl::OUString( sal_Unicode( 0x2196 ) ); - aKeyMap[ KEY_END ] = rtl::OUString( sal_Unicode( 0x2198 ) ); - aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); - aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); - aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); - aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); - aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); - aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); - aKeyMap[ KEY_DELETE ] = rtl::OUString( sal_Unicode( 0x2326 ) ); - aKeyMap[ KEY_ADD ] = rtl::OUString( sal_Unicode( '+' ) ); - aKeyMap[ KEY_SUBTRACT ] = rtl::OUString( sal_Unicode( '-' ) ); - aKeyMap[ KEY_DIVIDE ] = rtl::OUString( sal_Unicode( '/' ) ); - aKeyMap[ KEY_MULTIPLY ] = rtl::OUString( sal_Unicode( '*' ) ); - aKeyMap[ KEY_POINT ] = rtl::OUString( sal_Unicode( '.' ) ); - aKeyMap[ KEY_COMMA ] = rtl::OUString( sal_Unicode( ',' ) ); - aKeyMap[ KEY_LESS ] = rtl::OUString( sal_Unicode( '<' ) ); - aKeyMap[ KEY_GREATER ] = rtl::OUString( sal_Unicode( '>' ) ); - aKeyMap[ KEY_EQUAL ] = rtl::OUString( sal_Unicode( '=' ) ); - aKeyMap[ KEY_OPEN ] = rtl::OUString( sal_Unicode( 0x23cf ) ); + aKeyMap[ KEY_DOWN ] = OUString( sal_Unicode( 0x21e3 ) ); + aKeyMap[ KEY_UP ] = OUString( sal_Unicode( 0x21e1 ) ); + aKeyMap[ KEY_LEFT ] = OUString( sal_Unicode( 0x21e0 ) ); + aKeyMap[ KEY_RIGHT ] = OUString( sal_Unicode( 0x21e2 ) ); + aKeyMap[ KEY_HOME ] = OUString( sal_Unicode( 0x2196 ) ); + aKeyMap[ KEY_END ] = OUString( sal_Unicode( 0x2198 ) ); + aKeyMap[ KEY_PAGEUP ] = OUString( sal_Unicode( 0x21de ) ); + aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) ); + aKeyMap[ KEY_RETURN ] = OUString( sal_Unicode( 0x21a9 ) ); + aKeyMap[ KEY_ESCAPE ] = OUString( "esc" ); + aKeyMap[ KEY_TAB ] = OUString( sal_Unicode( 0x21e5 ) ); + aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) ); + aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) ); + aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) ); + aKeyMap[ KEY_ADD ] = OUString( sal_Unicode( '+' ) ); + aKeyMap[ KEY_SUBTRACT ] = OUString( sal_Unicode( '-' ) ); + aKeyMap[ KEY_DIVIDE ] = OUString( sal_Unicode( '/' ) ); + aKeyMap[ KEY_MULTIPLY ] = OUString( sal_Unicode( '*' ) ); + aKeyMap[ KEY_POINT ] = OUString( sal_Unicode( '.' ) ); + aKeyMap[ KEY_COMMA ] = OUString( sal_Unicode( ',' ) ); + aKeyMap[ KEY_LESS ] = OUString( sal_Unicode( '<' ) ); + aKeyMap[ KEY_GREATER ] = OUString( sal_Unicode( '>' ) ); + aKeyMap[ KEY_EQUAL ] = OUString( sal_Unicode( '=' ) ); + aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) ); /* yet unmapped KEYCODES: - aKeyMap[ KEY_INSERT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_CUT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_COPY ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_PASTE ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_UNDO ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_REPEAT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_FIND ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_PROPERTIES ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_FRONT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_CONTEXTMENU ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_MENU ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_HELP ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_HANGUL_HANJA ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_DECIMAL ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_TILDE ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_QUOTELEFT ]= rtl::OUString( sal_Unicode( ) ); + aKeyMap[ KEY_INSERT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_CUT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_COPY ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_PASTE ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_UNDO ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_REPEAT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_FIND ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_PROPERTIES ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_FRONT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_CONTEXTMENU ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_MENU ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_HELP ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_HANGUL_HANJA ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_DECIMAL ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_TILDE ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_QUOTELEFT ]= OUString( sal_Unicode( ) ); */ } - rtl::OUStringBuffer aResult( 16 ); + OUStringBuffer aResult( 16 ); sal_uInt16 nUnmodifiedCode = (nKeyCode & KEY_CODE); - std::map< sal_uInt16, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); + std::map< sal_uInt16, OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); if( it != aKeyMap.end() ) { if( (nKeyCode & KEY_SHIFT) != 0 ) diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 8f37ddc41d24..0bdf9ed8c729 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -62,11 +62,11 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; } else { - rtl::OUString aDialog; + OUString aDialog; if( nDialog == SHOWDIALOG_ID_ABOUT ) - aDialog = rtl::OUString("ABOUT"); + aDialog = OUString("ABOUT"); else if( nDialog == SHOWDIALOG_ID_PREFERENCES ) - aDialog = rtl::OUString("PREFERENCES"); + aDialog = OUString("PREFERENCES"); const ApplicationEvent* pAppEvent = new ApplicationEvent( ApplicationEvent::TYPE_SHOWDIALOG, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); @@ -668,7 +668,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag [pImage release]; } -void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText ) +void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const OUString& i_rText ) { if (!i_pSalMenuItem) return; @@ -703,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, } } -void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; @@ -779,7 +779,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, nItemModifier |= NSControlKeyMask; AquaSalMenuItem *pAquaSalMenuItem = (AquaSalMenuItem *) pSalMenuItem; - NSString* pString = CreateNSString( rtl::OUString( &nCommandKey, 1 ) ); + NSString* pString = CreateNSString( OUString( &nCommandKey, 1 ) ); [pAquaSalMenuItem->mpMenuItem setKeyEquivalent: pString]; [pAquaSalMenuItem->mpMenuItem setKeyEquivalentModifierMask: nItemModifier]; if (pString) diff --git a/vcl/coretext/salcoretextfontutils.cxx b/vcl/coretext/salcoretextfontutils.cxx index 3bcfa2285585..5b6b6c0027d3 100644 --- a/vcl/coretext/salcoretextfontutils.cxx +++ b/vcl/coretext/salcoretextfontutils.cxx @@ -155,7 +155,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo } CFStringRef string_ref = (CFStringRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontStyleNameAttribute); - rtl::OUString style(GetOUString(string_ref).toAsciiLowerCase()); + OUString style(GetOUString(string_ref).toAsciiLowerCase()); CFRelease(string_ref); // heuristics to adjust font slant diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx index 7fdd97532176..c1ace406d512 100644 --- a/vcl/coretext/salgdi.cxx +++ b/vcl/coretext/salgdi.cxx @@ -81,8 +81,8 @@ QuartzSalGraphics::~QuartzSalGraphics() #endif inline bool QuartzSalGraphics::AddTempDevFont( ImplDevFontList*, - const rtl::OUString& , - const rtl::OUString& ) + const OUString& , + const OUString& ) { OSL_ASSERT( FALSE ); return false; diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx index f6d1e2e8c759..fffb5aac2d20 100644 --- a/vcl/generic/app/gendisp.cxx +++ b/vcl/generic/app/gendisp.cxx @@ -21,7 +21,6 @@ #include <generic/gendisp.hxx> #include <generic/geninst.h> -using ::rtl::OUString; SalGenericDisplay::SalGenericDisplay() { diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 863ee708f480..b2a2af528af6 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -45,9 +45,6 @@ using namespace std; using namespace psp; using namespace utl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; /* * FontCache constructor @@ -103,7 +100,7 @@ void FontCache::flush() if( ! (aStream.IsOpen() && aStream.IsWritable()) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -118,8 +115,8 @@ void FontCache::flush() { const FontDirMap& rDir( dir_it->second.m_aEntries ); - rtl::OString aDirectory(rManager.getDirectory(dir_it->first)); - rtl::OStringBuffer aLine("FontCacheDirectory:"); + OString aDirectory(rManager.getDirectory(dir_it->first)); + OStringBuffer aLine("FontCacheDirectory:"); aLine.append(dir_it->second.m_nTimestamp); aLine.append(':'); aLine.append(aDirectory); @@ -226,7 +223,7 @@ void FontCache::flush() } aStream.WriteLine(aLine.makeStringAndClear()); } - aStream.WriteLine(rtl::OString()); + aStream.WriteLine(OString()); } } m_bDoFlush = false; @@ -245,7 +242,7 @@ void FontCache::read() if( ! aStream.IsOpen() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontCache::read: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::read: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -256,7 +253,7 @@ void FontCache::read() if ( !(aLine == CACHE_MAGIC) ) { #if OSL_DEBUG_LEVEL >1 - fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -278,7 +275,7 @@ void FontCache::read() sal_Int32 nTEnd = aLine.indexOf( ':', nSearchIndex ); if( nTEnd != -1 ) { - rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex ); + OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex ); nTimestamp = aTimeStamp.toInt64(); aDir = aLine.copy( nTEnd+1 ); } @@ -452,7 +449,7 @@ void FontCache::read() { if( pFont->m_bUserOverride ) { - rtl::OStringBuffer aFilePath(rManager.getDirectory(nDir)); + OStringBuffer aFilePath(rManager.getDirectory(nDir)); aFilePath.append('/').append(aFile); struct stat aStat; if( stat( aFilePath.getStr(), &aStat ) || diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 33aff6a36d3c..dc8dfa7976e1 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -94,9 +94,6 @@ using namespace psp; #include <algorithm> using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; namespace { @@ -124,8 +121,8 @@ public: FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleanish accessor methods - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; + boost::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; + boost::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical; private: void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); @@ -297,10 +294,10 @@ namespace /* FIXME-BCP47: once fontconfig supports language tags this * language-territory stuff needs to be changed! */ SAL_INFO_IF( !rLangTag.isIsoLocale(), "i18n", "localizedsorter::bestname - not an ISO locale"); - rtl::OString sLangMatch(rtl::OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); - rtl::OString sFullMatch = sLangMatch; + OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); + OString sFullMatch = sLangMatch; sFullMatch += OString('-'); - sFullMatch += rtl::OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); + sFullMatch += OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); std::vector<lang_and_element>::const_iterator aEnd = elements.end(); bool alreadyclosematch = false; @@ -504,7 +501,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i) memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*)); } -void PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ) +void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ) { #if OSL_DEBUG_LEVEL > 1 int nFonts = 0; @@ -696,7 +693,7 @@ void PrintFontManager::deinitFontconfig() FontCfgWrapper::release(); } -bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName ) +bool PrintFontManager::addFontconfigDir( const OString& rDirName ) { // workaround for a stability problems in older FC versions // when handling application specifc fonts @@ -714,7 +711,7 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName ) return false; // load dir-specific fc-config file too if available - const rtl::OString aConfFileName = rDirName + "/fc_local.conf"; + const OString aConfFileName = rDirName + "/fc_local.conf"; FILE* pCfgFile = fopen( aConfFileName.getStr(), "rb" ); if( pCfgFile ) { @@ -921,7 +918,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) return 0; } -bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ) +bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ) { bool bRet = false; @@ -933,7 +930,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r // Prefer scalable fonts FcPatternAddBool(pPattern, FC_SCALABLE, FcTrue); - const rtl::OString aTargetName = rtl::OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 ); + const OString aTargetName = OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 ); const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr(); FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8); @@ -1021,11 +1018,11 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r if( eFamilyRes == FcResultMatch ) { OString sFamily((sal_Char*)family); - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = + boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; - rPattern.maSearchName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); + rPattern.maSearchName = OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); bRet = true; } } @@ -1150,7 +1147,7 @@ ImplFontOptions* PrintFontManager::getFontOptions( OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( !sFamily.isEmpty() ) @@ -1220,7 +1217,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star // populate pattern with font characteristics const LanguageTag aLangTag(rLocale); - const rtl::OString aLangAttrib = mapToFontConfigLangTag(aLangTag); + const OString aLangAttrib = mapToFontConfigLangTag(aLangTag); if (!aLangAttrib.isEmpty()) FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr()); diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 8a1a5e1ea6b5..e86fceb11ce2 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -87,14 +87,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using ::comphelper::string::getToken; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OStringBuffer; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; /* * static helpers @@ -120,7 +112,7 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer ) // ------------------------------------------------------------------------- -static FontWeight parseWeight( const rtl::OString& rWeight ) +static FontWeight parseWeight( const OString& rWeight ) { FontWeight eWeight = WEIGHT_DONTKNOW; if (rWeight.indexOf("bold") != -1) @@ -237,7 +229,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr { bool bSuccess = false; - rtl::OString aFile( PrintFontManager::get().getFontFile( this ) ); + OString aFile( PrintFontManager::get().getFontFile( this ) ); TrueTypeFont* pTTFont = NULL; @@ -611,7 +603,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, m_eItalic = ITALIC_NONE; // weight - rtl::OString aWeight( pInfo->gfi->weight ); + OString aWeight( pInfo->gfi->weight ); m_eWeight = parseWeight( aWeight.toAsciiLowerCase() ); // pitch @@ -810,7 +802,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, continue; } - rtl::OStringBuffer aTranslate; + OStringBuffer aTranslate; if( pChar->code & 0xff000000 ) aTranslate.append((char)(pChar->code >> 24)); if( pChar->code & 0xffff0000 ) @@ -818,7 +810,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, if( pChar->code & 0xffffff00 ) aTranslate.append((char)((pChar->code & 0x0000ff00) >> 8 )); aTranslate.append((char)(pChar->code & 0xff)); - rtl::OUString aUni(rtl::OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding)); + OUString aUni(OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding)); pUnicodes[i] = aUni.toChar(); } else @@ -990,8 +982,8 @@ PrintFontManager::PrintFontManager() { for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) { - m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); + m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); if( aAdobeCodes[i].aAdobeStandardCode ) { m_aUnicodeToAdobecode.insert( ::boost::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); @@ -1043,7 +1035,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate // ------------------------------------------------------------------------- -std::vector<fontID> PrintFontManager::addFontFile( const ::rtl::OString& rFileName ) +std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), INetURLObject::FSYS_DETECT ); @@ -1103,7 +1095,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: } if (eFormat == UNKNOWN) { - rtl::OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) ); + OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) ); if( aExt.equalsIgnoreAsciiCase("pfb") || aExt.equalsIgnoreAsciiCase("pfa") ) eFormat = TYPE1; else if( aExt.equalsIgnoreAsciiCase("afm")) @@ -1124,7 +1116,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: for( unsigned int i = 0; i < SAL_N_ELEMENTS(pSuffix); i++ ) { - rtl::OString aName = rtl::OStringBuffer( + OString aName = OStringBuffer( rFontFile.copy(0, rFontFile.getLength() - 4)). append(pSuffix[i]).makeStringAndClear(); @@ -1470,7 +1462,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { bool bSuccess = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString aFile = getFontFile( pFont ); + OString aFile = getFontFile( pFont ); TrueTypeFont* pTTFont = NULL; TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); @@ -1524,8 +1516,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile.getStr() ); - rtl::OUString sPSName = aInfo.psname ? - rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : + OUString sPSName = aInfo.psname ? + OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : m_pAtoms->getString(ATOM_FAMILYNAME, pFont->m_nFamilyName); // poor font does not have a postscript name pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, sal_True ); @@ -1685,13 +1677,13 @@ void PrintFontManager::initialize() // part one - look for downloadable fonts rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - const ::rtl::OUString &rSalPrivatePath = psp::getFontPath(); + const OUString &rSalPrivatePath = psp::getFontPath(); // search for the fonts in SAL_PRIVATE_FONTPATH first; those are // the fonts installed with the office if( !rSalPrivatePath.isEmpty() ) { - OString aPath = rtl::OUStringToOString( rSalPrivatePath, aEncoding ); + OString aPath = OUStringToOString( rSalPrivatePath, aEncoding ); const bool bAreFCSubstitutionsEnabled = AreFCSubstitutionsEnabled(); sal_Int32 nIndex = 0; do @@ -1819,7 +1811,7 @@ void PrintFontManager::initialize() while( ! readdir_r( pDIR, (struct dirent*)aDirEntBuffer, &pDirEntry ) && pDirEntry ) { - rtl::OStringBuffer aFile(aDir); + OStringBuffer aFile(aDir); aFile.append('/').append(pDirEntry->d_name); struct stat aStat; if( ! stat( aFile.getStr(), &aStat ) @@ -1868,7 +1860,7 @@ void PrintFontManager::initialize() m_aFamilyTypes.find( font_it->second->m_nFamilyName ); if (it != m_aFamilyTypes.end()) continue; - const ::rtl::OUString& rFamily = + const OUString& rFamily = m_pAtoms->getString( ATOM_FAMILYNAME, font_it->second->m_nFamilyName); FontFamily eType = matchFamilyName( rFamily ); m_aFamilyTypes[ font_it->second->m_nFamilyName ] = eType; @@ -2213,7 +2205,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const // ------------------------------------------------------------------------- -FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) const +FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const { typedef struct { const char* mpName; @@ -2251,7 +2243,7 @@ FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) c { InitializeClass( "zapfchancery", FAMILY_SCRIPT ) } }; - rtl::OString aFamily = rtl::OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US ); + OString aFamily = OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US ); sal_uInt32 nLower = 0; sal_uInt32 nUpper = SAL_N_ELEMENTS(pFamilyMatch); @@ -2336,7 +2328,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const // ------------------------------------------------------------------------- -const ::rtl::OUString& PrintFontManager::getPSName( fontID nFontID ) const +const OUString& PrintFontManager::getPSName( fontID nFontID ) const { PrintFont* pFont = getFont( nFontID ); if( pFont && pFont->m_nPSName == 0 ) @@ -2442,7 +2434,7 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const if( pTTFontFile->m_nTypeFlags & TYPEFLAG_INVALID ) { TrueTypeFont* pTTFont = NULL; - rtl::OString aFile = getFontFile( pFont ); + OString aFile = getFontFile( pFont ); if( OpenTTFontFile( aFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) == SF_OK ) { // get type flags @@ -2616,7 +2608,7 @@ bool PrintFontManager::createFontSubset( // prepare system name for read access for subset source file // TODO: since this file is usually already mmapped there is no need to open it again - const rtl::OString aFromFile = getFontFile( pFont ); + const OString aFromFile = getFontFile( pFont ); TrueTypeFont* pTTFont = NULL; // TODO: rename to SfntFont TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); @@ -2628,7 +2620,7 @@ bool PrintFontManager::createFontSubset( if( osl_File_E_None != osl_getSystemPathFromFileURL( rOutFile.pData, &aSysPath.pData ) ) return false; const rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile( OUStringToOString( aSysPath, aEncoding ) ); + const OString aToFile( OUStringToOString( aSysPath, aEncoding ) ); // do CFF subsetting if possible int nCffLength = 0; @@ -2713,7 +2705,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, { TrueTypeFont* pTTFont = NULL; TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); - rtl::OString aFromFile = getFontFile( pFont ); + OString aFromFile = getFontFile( pFont ); if( OpenTTFontFile( aFromFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) != SF_OK ) return; int nGlyphs = GetTTGlyphCount( pTTFont ); @@ -2791,7 +2783,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, // ------------------------------------------------------------------------- -const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded ) const +const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const { PrintFont* pFont = getFont( nFont ); if( !pFont || @@ -2812,8 +2804,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { - std::pair< boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator, - boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator > range + std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator, + boost::unordered_multimap< sal_Unicode, OString >::const_iterator > range = m_aUnicodeToAdobename.equal_range( aChar ); std::list< OString > aRet; @@ -2831,10 +2823,10 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha } // ------------------------------------------------------------------------- -std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const rtl::OString& rName ) const +std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const { - std::pair< boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, - boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range + std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, + boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range = m_aAdobenameToUnicode.equal_range( rName ); std::list< sal_Unicode > aRet; diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index a339ca9ff037..94dcda14e75a 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -60,7 +60,7 @@ class FcGlyphFallbackSubstititution { // TODO: add a cache public: - bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const; + bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const; }; int SalGenericInstance::FetchFontSubstitutionFlags() @@ -116,7 +116,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList ) // ----------------------------------------------------------------------- -static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, rtl::OUString& rMissingCodes ) +static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes ) { FontSelectPattern aSubstituted(rFontSelData); psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); @@ -193,9 +193,9 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + const OString aOrigName(OUStringToOString(rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8)); - const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + const OString aSubstName(OUStringToOString(aOut.maSearchName, RTL_TEXTENCODING_UTF8)); printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ", aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(), @@ -223,7 +223,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa // ----------------------------------------------------------------------- bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, - rtl::OUString& rMissingCodes ) const + OUString& rMissingCodes ) const { // We dont' actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) @@ -244,9 +244,9 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + const OString aOrigName(OUStringToOString(rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8)); - const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + const OString aSubstName(OUStringToOString(aOut.maSearchName, RTL_TEXTENCODING_UTF8)); printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->", aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(), diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 7b1a5713da12..33db29819c79 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -32,11 +32,6 @@ #include "rtl/bootstrap.hxx" using ::rtl::Bootstrap; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; namespace psp { @@ -166,7 +161,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub #ifdef SYSTEM_PPD_DIR if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 ) { - rPathList.push_back( rtl::OStringToOUString( rtl::OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) ); + rPathList.push_back( OStringToOUString( OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) ); } #endif @@ -360,7 +355,7 @@ void psp::normPath( OString& rPath ) // double slashes and slash at end are probably // removed by realpath anyway, but since this runs // on many different platforms let's play it safe - rtl::OString aPath = rPath.replaceAll("//", "/"); + OString aPath = rPath.replaceAll("//", "/"); if( !aPath.isEmpty() && aPath[aPath.getLength()-1] == '/' ) aPath = aPath.copy(0, aPath.getLength()-1); diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 17e089ff6642..09a00dba182e 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -156,7 +156,7 @@ static int nDefaultPrioAntiAlias = 1; // FreetypeManager // ======================================================================= -FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName ) +FtFontFile::FtFontFile( const OString& rNativeFileName ) : maNativeFileName( rNativeFileName ), mpFileMap( NULL ), mnFileSize( 0 ), @@ -184,7 +184,7 @@ FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName ) // ----------------------------------------------------------------------- -FtFontFile* FtFontFile::FindFontFile( const ::rtl::OString& rNativeFileName ) +FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) { // font file already known? (e.g. for ttc, synthetic, aliased fonts) const char* pFileName = rNativeFileName.getStr(); @@ -299,7 +299,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz // ======================================================================= FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, - const ::rtl::OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, + const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, const ExtraKernInfo* pExtraKernInfo ) : maFaceFT( NULL ), @@ -568,7 +568,7 @@ FreetypeManager::~FreetypeManager() // ----------------------------------------------------------------------- -void FreetypeManager::AddFontFile( const rtl::OString& rNormalizedName, +void FreetypeManager::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr, const ExtraKernInfo* pExtraKernInfo ) { @@ -885,7 +885,7 @@ boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const return mpFontOptions; } -const ::rtl::OString* ServerFont::GetFontFileName() const +const OString* ServerFont::GetFontFileName() const { return mpFontInfo->GetFontFileName(); } diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index dea75b3b2332..2c31bb424449 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -37,20 +37,20 @@ class GraphiteFaceWrapper; class FtFontFile { public: - static FtFontFile* FindFontFile( const ::rtl::OString& rNativeFileName ); + static FtFontFile* FindFontFile( const OString& rNativeFileName ); bool Map(); void Unmap(); const unsigned char* GetBuffer() const { return mpFileMap; } int GetFileSize() const { return mnFileSize; } - const ::rtl::OString* GetFileName() const { return &maNativeFileName; } + const OString* GetFileName() const { return &maNativeFileName; } int GetLangBoost() const { return mnLangBoost; } private: - FtFontFile( const ::rtl::OString& rNativeFileName ); + FtFontFile( const OString& rNativeFileName ); - const ::rtl::OString maNativeFileName; + const OString maNativeFileName; const unsigned char* mpFileMap; int mnFileSize; int mnRefCount; @@ -64,7 +64,7 @@ class FtFontInfo { public: FtFontInfo( const ImplDevFontAttributes&, - const ::rtl::OString& rNativeFileName, + const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, const ExtraKernInfo* ); ~FtFontInfo(); @@ -77,7 +77,7 @@ public: #endif void ReleaseFaceFT( FT_FaceRec_* ); - const ::rtl::OString* GetFontFileName() const { return mpFontFile->GetFileName(); } + const OString* GetFontFileName() const { return mpFontFile->GetFileName(); } int GetFaceNum() const { return mnFaceNum; } int GetSynthetic() const { return mnSynthetic; } sal_IntPtr GetFontId() const { return mnFontId; } @@ -148,7 +148,7 @@ public: FreetypeManager(); ~FreetypeManager(); - void AddFontFile( const rtl::OString& rNormalizedName, + void AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&, const ExtraKernInfo* ); void AnnounceFonts( ImplDevFontList* ) const; diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 3ceb72442516..fa3659a3990f 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -89,7 +89,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) != -1) { - rtl::OString aFeatName = rtl::OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); + OString aFeatName = OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); nFontId ^= aFeatName.hashCode(); } #endif @@ -163,7 +163,7 @@ GlyphCache& GlyphCache::GetInstance() // ----------------------------------------------------------------------- -void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum, +void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA, const ExtraKernInfo* pExtraKern ) { if( mpFtManager ) diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 2e3739c063b3..42d98ad287d5 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -63,13 +63,13 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro rServerFont.GetGraphiteFace()->addFont(rServerFont.GetFontSelData().mnHeight, pFont); } maImpl.SetFont(pFont); - rtl::OString aLang(""); + OString aLang(""); if (rServerFont.GetFontSelData().meLanguage != LANGUAGE_DONTKNOW) { - aLang = rtl::OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(), + aLang = OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(), RTL_TEXTENCODING_UTF8 ); } - rtl::OString name = rtl::OUStringToOString( + OString name = OUStringToOString( rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); #ifdef DEBUG printf("GraphiteServerFontLayout %lx %s size %d %f\n", (long unsigned int)this, name.getStr(), @@ -79,17 +79,17 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; if (nFeat > 0) { - rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); + OString aFeat = name.copy(nFeat, name.getLength() - nFeat); mpFeatures = new grutils::GrFeatureParser( rServerFont.GetGraphiteFace()->face(), aFeat, aLang); #ifdef DEBUG if (mpFeatures) printf("GraphiteServerFontLayout %s/%s/%s %x language %d features %d errors\n", - rtl::OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(), + OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rServerFont.GetFontSelData().maTargetName, + OUStringToOString( rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rServerFont.GetFontSelData().maSearchName, + OUStringToOString( rServerFont.GetFontSelData().maSearchName, RTL_TEXTENCODING_UTF8 ).getStr(), rServerFont.GetFontSelData().meLanguage, (int)mpFeatures->numFeatures(), mpFeatures->parseErrors()); diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index c460558f641d..260fbc951cd5 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -788,7 +788,7 @@ PrinterGfx::PSSetFont () && rCurrent.maEncoding <= RTL_TEXTENCODING_USER_END) ) { - rtl::OString aReencodedFont = + OString aReencodedFont = psp::GlyphSet::GetReencodedFontName (rCurrent.maEncoding, rCurrent.maFont); @@ -1163,9 +1163,9 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize // first search the BoundingBox of the EPS data SvMemoryStream aStream( pPtr, nSize, STREAM_READ ); aStream.Seek( STREAM_SEEK_TO_BEGIN ); - rtl::OString aLine; + OString aLine; - rtl::OString aDocTitle; + OString aDocTitle; double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0; bool bEndComments = false; while( ! aStream.IsEof() @@ -1179,7 +1179,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize char cChar = aLine[1]; if( cChar == '%' ) { - if( aLine.matchIgnoreAsciiCase( rtl::OString( "%%BoundingBox:") ) ) + if( aLine.matchIgnoreAsciiCase( OString( "%%BoundingBox:") ) ) { aLine = WhitespaceToSpace( aLine.getToken(1, ':') ); if( !aLine.isEmpty() && aLine.indexOf( "atend" ) == -1 ) diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 583587002361..9ffb69cdcaa3 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -60,9 +60,6 @@ using namespace psp; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OUStringToOString; /* * static helpers @@ -79,19 +76,19 @@ typedef int(*faxFunction)(OUString&); static faxFunction pFaxNrFunction = NULL; } -static rtl::OUString getPdfDir( const PrinterInfo& rInfo ) +static OUString getPdfDir( const PrinterInfo& rInfo ) { - rtl::OUString aDir; + OUString aDir; sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); + OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); if( aToken.startsWith( "pdf=" ) ) { sal_Int32 nPos = 0; aDir = aToken.getToken( 1, '=', nPos ); if( aDir.isEmpty() && getenv( "HOME" ) ) - aDir = rtl::OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() ); + aDir = OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() ); break; } } @@ -227,14 +224,14 @@ static bool passFileToCommandLine( const OUString& rFilename, const OUString& rC bool bSuccess = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString aCmdLine(rtl::OUStringToOString(rCommandLine, aEncoding)); - rtl::OString aFilename(rtl::OUStringToOString(rFilename, aEncoding)); + OString aCmdLine(OUStringToOString(rCommandLine, aEncoding)); + OString aFilename(OUStringToOString(rFilename, aEncoding)); bool bPipe = aCmdLine.indexOf( "(TMP)" ) != -1 ? false : true; // setup command line for exec if( ! bPipe ) - aCmdLine = aCmdLine.replaceAll(rtl::OString("(TMP)"), aFilename); + aCmdLine = aCmdLine.replaceAll(OString("(TMP)"), aFilename); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "%s commandline: \"%s\"\n", @@ -362,7 +359,7 @@ static bool sendAFax( const OUString& rFaxNumber, const OUString& rFileName, con bSuccess = false; // clean up temp file - unlink(rtl::OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr()); + unlink(OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr()); return bSuccess; #else @@ -465,7 +462,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); + OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); if( aToken.match( "pdf=" ) ) { pInfo->maLocation = getPdfDir( rInfo ); @@ -487,7 +484,7 @@ void SalGenericInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) mbPrinterInit = true; } -rtl::OUString SalGenericInstance::GetDefaultPrinter() +OUString SalGenericInstance::GetDefaultPrinter() { mbPrinterInit = true; PrinterInfoManager& rManager( PrinterInfoManager::get() ); @@ -642,7 +639,7 @@ sal_Bool PspSalInfoPrinter::SetData( TenMuToPt( pJobSetup->mnPaperWidth ), TenMuToPt( pJobSetup->mnPaperHeight ) ); else - aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1); + aPaper = OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1); pKey = aData.m_pParser->getKey( OUString("PageSize") ); pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL; @@ -779,7 +776,7 @@ sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) return pKey ? pKey->countValues() : 0; } -rtl::OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) +OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -879,9 +876,9 @@ PspSalPrinter::~PspSalPrinter() { } -static rtl::OUString getTmpName() +static OUString getTmpName() { - rtl::OUString aTmp, aSys; + OUString aTmp, aSys; osl_createTempFile( NULL, NULL, &aTmp.pData ); osl_getSystemPathFromFileURL( aTmp.pData, &aSys.pData ); @@ -889,9 +886,9 @@ static rtl::OUString getTmpName() } sal_Bool PspSalPrinter::StartJob( - const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uLong nCopies, bool bCollate, bool bDirect, @@ -902,8 +899,8 @@ sal_Bool PspSalPrinter::StartJob( m_bFax = false; m_bPdf = false; - m_aFileName = pFileName ? *pFileName : rtl::OUString(); - m_aTmpFile = rtl::OUString(); + m_aFileName = pFileName ? *pFileName : OUString(); + m_aTmpFile = OUString(); m_nCopies = nCopies; m_bCollate = bCollate; @@ -930,7 +927,7 @@ sal_Bool PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::boost::unordered_map< OUString, OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; it = pJobSetup->maValueMap.find( OUString("FAX#") ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; @@ -948,7 +945,7 @@ sal_Bool PspSalPrinter::StartJob( if( m_aFileName.isEmpty() ) { - rtl::OUStringBuffer aFileName( getPdfDir( rInfo ) ); + OUStringBuffer aFileName( getPdfDir( rInfo ) ); aFileName.append( '/' ); aFileName.append( rJobName ); aFileName.appendAscii( ".pdf" ); @@ -1061,18 +1058,18 @@ struct PDFNewJobParameters struct PDFPrintFile { - rtl::OUString maTmpURL; + OUString maTmpURL; PDFNewJobParameters maParameters; - PDFPrintFile( const rtl::OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) + PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) : maTmpURL( i_rURL ) , maParameters( i_rNewParameters ) {} }; -sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, const rtl::OUString& i_rAppName, +sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { - OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? rtl::OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" ); + OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" ); // mark for endjob m_bIsPDFWriterJob = true; // reset IsLastPage @@ -1174,7 +1171,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O { // this is not a file URL, but it should // form it into a osl friendly file URL - rtl::OUString aTmp; + OUString aTmp; osl_getFileURLFromSystemPath( aPDFUrl.pData, &aTmp.pData ); aPDFUrl = aTmp; } @@ -1270,7 +1267,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O break; } } while( nBytesRead == buffer.size() ); - rtl::OUStringBuffer aBuf( i_rJobName.getLength() + 8 ); + OUStringBuffer aBuf( i_rJobName.getLength() + 8 ); aBuf.append( i_rJobName ); if( i > 0 || nCurJob > 0 ) { @@ -1295,7 +1292,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O for( size_t i = 0; i < aPDFFiles.size(); i++ ) { osl_removeFile( aPDFFiles[i].maTmpURL.pData ); - OSL_TRACE( "removed print PDF file %s", rtl::OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "removed print PDF file %s", OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); } } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 98601f034410..a26a844a19c4 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -57,8 +57,6 @@ using namespace psp; -using ::rtl::OUString; -using ::rtl::OString; // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer --------------- @@ -279,7 +277,7 @@ GenPspGraphics::GenPspGraphics() } void GenPspGraphics::Init( psp::JobData* pJob, psp::PrinterGfx* pGfx, - rtl::OUString* pPhone, bool bSwallow, + OUString* pPhone, bool bSwallow, SalInfoPrinter* pInfoPrinter ) { m_pJobData = pJob; @@ -700,7 +698,7 @@ private: bool mbVertical; bool mbArtItalic; bool mbArtBold; - rtl::OUString maText; + OUString maText; int mnMinCharPos; }; @@ -887,7 +885,7 @@ void GenPspGraphics::SetTextColor( SalColor nSalColor ) m_pPrinterGfx->SetTextColor (aColor); } -bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const rtl::OUString&,const rtl::OUString& ) +bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const OUString&,const OUString& ) { return false; } @@ -918,7 +916,7 @@ void GenPspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) pOutDev->ImplAddDevFontSubstitute( it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } @@ -1040,7 +1038,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe //-------------------------------------------------------------------------- sal_Bool GenPspGraphics::CreateFontSubset( - const rtl::OUString& rToFile, + const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -1171,8 +1169,8 @@ ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPri #if OSL_DEBUG_LEVEL > 2 if( bHasMapNames ) { - rtl::OString aOrigName(rtl::OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding())); - rtl::OString aAliasNames(rtl::OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding())); + OString aOrigName(OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding())); + OString aAliasNames(OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding())); SAL_INFO( "vcl.fonts", "using alias names " << aAliasNames.getStr() << " for font family " << aOrigName.getStr() ); } #endif @@ -1235,7 +1233,7 @@ void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastP pFontList->Add( pFD ); } -bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ) +bool GenPspGraphics::filterText( const OUString& rOrig, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ) { if( ! m_pPhoneNr ) return false; @@ -1253,7 +1251,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew sal_Int32 nPos; sal_Int32 nStart = 0; sal_Int32 nStop = rLen; - rtl::OUString aPhone = rOrig.copy( nIndex, rLen ); + OUString aPhone = rOrig.copy( nIndex, rLen ); if( ! m_bPhoneCollectionActive ) { @@ -1282,7 +1280,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew m_aPhoneCollection += aPhone.copy( nTokenStart, nTokenStop - nTokenStart ); if( ! m_bPhoneCollectionActive ) { - rtl::OUStringBuffer aPhoneNr; + OUStringBuffer aPhoneNr; aPhoneNr.append( "<Fax#>" ); aPhoneNr.append( m_aPhoneCollection ); aPhoneNr.append( "</Fax#>" ); @@ -1303,7 +1301,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew rCutStart = nStart+nIndex; rCutStop = nStop+nIndex; if (rCutStart != rCutStop) - rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : rtl::OUString() ) + rOrig.copy( rCutStop ); + rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : OUString() ) + rOrig.copy( rCutStop ); } return bRet && m_bSwallowFaxNo; @@ -1391,8 +1389,8 @@ const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs *pDataLen = aStat.st_size; #else // FIXME: test me ! ... - rtl::OUString aURL; - if( !osl::File::getFileURLFromSystemPath( rtl::OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) ) + OUString aURL; + if( !osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) ) return NULL; osl::File aFile( aURL ); if( aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock ) != osl::File::E_None ) diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index d5635e7e4d5b..d22d2c89e56d 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -43,10 +43,6 @@ using namespace vcl; using namespace psp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUStringToOString; GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical) : mnFontID (nFontID), diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index f469d9b2a3af..a062bb829b1b 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -42,7 +42,7 @@ private: sal_Int32 mnFontID; sal_Bool mbVertical; - rtl::OString maBaseName; + OString maBaseName; fonttype::type meBaseType; rtl_TextEncoding mnBaseEncoding; bool mbUseFontEncoding; @@ -55,12 +55,12 @@ private: char_list_t maCharList; glyph_list_t maGlyphList; - rtl::OString GetGlyphSetName (sal_Int32 nGlyphSetID); - rtl::OString GetCharSetName (sal_Int32 nGlyphSetID); + OString GetGlyphSetName (sal_Int32 nGlyphSetID); + OString GetCharSetName (sal_Int32 nGlyphSetID); sal_Int32 GetGlyphSetEncoding (sal_Int32 nGlyphSetID); - rtl::OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID); + OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID); - rtl::OString GetReencodedFontName (sal_Int32 nGlyphSetID); + OString GetReencodedFontName (sal_Int32 nGlyphSetID); void PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID); @@ -96,12 +96,12 @@ public: sal_Int32 GetFontID (); fonttype::type GetFontType (); - static rtl::OString + static OString GetReencodedFontName (rtl_TextEncoding nEnc, - const rtl::OString &rFontName); - static rtl::OString + const OString &rFontName); + static OString GetGlyphSetEncodingName (rtl_TextEncoding nEnc, - const rtl::OString &rFontName); + const OString &rFontName); sal_Bool IsVertical (); void DrawText (PrinterGfx &rGfx, const Point& rPoint, @@ -115,7 +115,7 @@ public: const sal_Int32* pDeltaArray, sal_Bool bUseGlyphs=sal_True); sal_Bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx); - sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< rtl::OString >& rSuppliedFonts ); + sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts ); }; diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 2d7ada98857c..5d61ff90a9bf 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -47,10 +47,6 @@ using namespace psp; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OStringBuffer; // forward declaration @@ -94,16 +90,16 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, */ osl::File* -PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rExtension) +PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension) { osl::File* pFile = NULL; - rtl::OUString aFile = rName + rExtension; - rtl::OUString aFileURL; + OUString aFile = rName + rExtension; + OUString aFileURL; osl::File::RC nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL ); if (nError != osl::File::E_None) return NULL; - aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL; + aFileURL = maSpoolDirName + OUString("/") + aFileURL; pFile = new osl::File (aFileURL); nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); @@ -194,9 +190,9 @@ PrinterJob::PrinterJob () : /* remove all our temporary files, uses external program "rm", since osl functionality is inadequate */ void -removeSpoolDir (const rtl::OUString& rSpoolDir) +removeSpoolDir (const OUString& rSpoolDir) { - rtl::OUString aSysPath; + OUString aSysPath; if( osl::File::E_None != osl::File::getSystemPathFromFileURL( rSpoolDir, aSysPath ) ) { // Conversion did not work, as this is quite a dangerous action, @@ -204,8 +200,8 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) OSL_FAIL( "psprint: couldn't remove spool directory" ); return; } - rtl::OString aSysPathByte = - rtl::OUStringToOString (aSysPath, osl_getThreadTextEncoding()); + OString aSysPathByte = + OUStringToOString (aSysPath, osl_getThreadTextEncoding()); sal_Char pSystem [128]; sal_Int32 nChar = 0; @@ -218,23 +214,23 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) /* creates a spool directory with a "pidgin random" value based on current system time */ -rtl::OUString +OUString createSpoolDir () { TimeValue aCur; osl_getSystemTime( &aCur ); sal_Int32 nRand = aCur.Seconds ^ (aCur.Nanosec/1000); - rtl::OUString aTmpDir; + OUString aTmpDir; osl_getTempDirURL( &aTmpDir.pData ); do { - rtl::OUStringBuffer aDir( aTmpDir.getLength() + 16 ); + OUStringBuffer aDir( aTmpDir.getLength() + 16 ); aDir.append( aTmpDir ); aDir.appendAscii( "/psp" ); aDir.append(nRand); - rtl::OUString aResult = aDir.makeStringAndClear(); + OUString aResult = aDir.makeStringAndClear(); if( osl::Directory::create( aResult ) == osl::FileBase::E_None ) { osl::File::setAttributes( aResult, @@ -245,7 +241,7 @@ createSpoolDir () } nRand++; } while( nRand ); - return rtl::OUString(); + return OUString(); } PrinterJob::~PrinterJob () @@ -293,7 +289,7 @@ static void WriteLocalTimePS( osl::File *rFile ) WritePS( rFile, "Unknown-Time" ); } -static bool isAscii( const rtl::OUString& rStr ) +static bool isAscii( const OUString& rStr ) { sal_Int32 nLen = rStr.getLength(); for( sal_Int32 i = 0; i < nLen; i++ ) @@ -304,10 +300,10 @@ static bool isAscii( const rtl::OUString& rStr ) sal_Bool PrinterJob::StartJob ( - const rtl::OUString& rFileName, + const OUString& rFileName, int nMode, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString& rJobName, + const OUString& rAppName, const JobData& rSetupData, PrinterGfx* pGraphics, bool bIsQuickJob @@ -325,9 +321,9 @@ PrinterJob::StartJob ( maSpoolDirName = createSpoolDir (); maJobTitle = rJobName; - rtl::OUString aExt(".ps"); - mpJobHeader = CreateSpoolFile (rtl::OUString("psp_head"), aExt); - mpJobTrailer = CreateSpoolFile (rtl::OUString("psp_tail"), aExt); + OUString aExt(".ps"); + mpJobHeader = CreateSpoolFile (OUString("psp_head"), aExt); + mpJobTrailer = CreateSpoolFile (OUString("psp_tail"), aExt); if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor return sal_False; @@ -336,7 +332,7 @@ PrinterJob::StartJob ( "%!PS-Adobe-3.0\n" "%%BoundingBox: (atend)\n" ); - rtl::OUString aFilterWS; + OUString aFilterWS; // Creator (this application) aFilterWS = WhitespaceToSpace( rAppName, sal_False ); @@ -346,7 +342,7 @@ PrinterJob::StartJob ( // For (user name) osl::Security aSecurity; - rtl::OUString aUserName; + OUString aUserName; if( aSecurity.getUserName( aUserName ) ) { WritePS (mpJobHeader, "%%For: ("); @@ -369,7 +365,7 @@ PrinterJob::StartJob ( * else omit %%Title */ aFilterWS = WhitespaceToSpace( rJobName, sal_False ); - rtl::OUString aTitle( aFilterWS ); + OUString aTitle( aFilterWS ); if( ! isAscii( aTitle ) ) { sal_Int32 nIndex = 0; @@ -377,7 +373,7 @@ PrinterJob::StartJob ( aTitle = rFileName.getToken( 0, '/', nIndex ); aTitle = WhitespaceToSpace( aTitle, sal_False ); if( ! isAscii( aTitle ) ) - aTitle = rtl::OUString(); + aTitle = OUString(); } maJobTitle = aFilterWS; @@ -429,7 +425,7 @@ PrinterJob::EndJob () return sal_False; // write document trailer according to Document Structuring Conventions (DSC) - rtl::OStringBuffer aTrailer(512); + OStringBuffer aTrailer(512); aTrailer.append( "%%Trailer\n" ); aTrailer.append( "%%BoundingBox: 0 0 " ); aTrailer.append( (sal_Int32)mnMaxWidthPt ); @@ -454,7 +450,7 @@ PrinterJob::EndJob () sal_Bool bSpoolToFile = !maFileName.isEmpty(); if (bSpoolToFile) { - const rtl::OString aFileName = rtl::OUStringToOString (maFileName, + const OString aFileName = OUStringToOString (maFileName, osl_getThreadTextEncoding()); if( mnFileMode ) { @@ -556,7 +552,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup) { int nRes = rJobSetup.m_aContext.getRenderResolution (); - rtl::OUString aPaper; + OUString aPaper; int nWidth, nHeight; rJobSetup.m_aContext.getPageSize (aPaper, nWidth, nHeight); @@ -590,11 +586,11 @@ PrinterJob::StartPage (const JobData& rJobSetup) { InitPaperSize (rJobSetup); - rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 - rtl::OUString aExt = aPageNo + rtl::OUString(".ps"); + OUString aPageNo = OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 + OUString aExt = aPageNo + OUString(".ps"); - osl::File* pPageHeader = CreateSpoolFile ( rtl::OUString("psp_pghead"), aExt); - osl::File* pPageBody = CreateSpoolFile ( rtl::OUString("psp_pgbody"), aExt); + osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt); + osl::File* pPageBody = CreateSpoolFile ( OUString("psp_pgbody"), aExt); maHeaderList.push_back (pPageHeader); maPageList.push_back (pPageBody); @@ -975,15 +971,15 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob ) WritePS (pFile, "%%BeginSetup\n%\n"); // download fonts - std::list< rtl::OString > aFonts[2]; + std::list< OString > aFonts[2]; m_pGraphics->writeResources( pFile, aFonts[0], aFonts[1] ); for( int i = 0; i < 2; i++ ) { if( !aFonts[i].empty() ) { - std::list< rtl::OString >::const_iterator it = aFonts[i].begin(); - rtl::OStringBuffer aLine( 256 ); + std::list< OString >::const_iterator it = aFonts[i].begin(); + OStringBuffer aLine( 256 ); if( i == 0 ) aLine.append( "%%DocumentSuppliedResources: font " ); else @@ -1009,7 +1005,7 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob ) if( ! bExternalDialog && rJob.m_nCopies > 1 ) { // setup code - rtl::OStringBuffer aLine("/#copies "); + OStringBuffer aLine("/#copies "); aLine.append(static_cast<sal_Int32>(rJob.m_nCopies)); aLine.append(" def\n"); sal_uInt64 nWritten = 0; diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index e2d3ca4b1a89..81da3844c5f0 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -158,7 +158,7 @@ WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength) } sal_Bool -WritePS (osl::File* pFile, const rtl::OString &rString) +WritePS (osl::File* pFile, const OString &rString) { sal_uInt64 nInLength = rString.getLength(); sal_uInt64 nOutLength = 0; @@ -170,9 +170,9 @@ WritePS (osl::File* pFile, const rtl::OString &rString) } sal_Bool -WritePS (osl::File* pFile, const rtl::OUString &rString) +WritePS (osl::File* pFile, const OUString &rString) { - return WritePS (pFile, rtl::OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US)); + return WritePS (pFile, OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US)); } /* diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx index 9187931e8f4c..55e3d3b4c129 100644 --- a/vcl/generic/print/psputil.hxx +++ b/vcl/generic/print/psputil.hxx @@ -43,8 +43,8 @@ sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst); sal_Bool WritePS (osl::File* pFile, const sal_Char* pString); sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength); -sal_Bool WritePS (osl::File* pFile, const rtl::OString &rString); -sal_Bool WritePS (osl::File* pFile, const rtl::OUString &rString); +sal_Bool WritePS (osl::File* pFile, const OString &rString); +sal_Bool WritePS (osl::File* pFile, const OUString &rString); class ConverterFactory { diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 633b7421b612..841a9db7a355 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -118,7 +118,7 @@ PrinterGfx::SetFont( // font and encoding will be set by drawText again immediately // before PSShowText mnFontID = nFontID; - maVirtualStatus.maFont = rtl::OString(); + maVirtualStatus.maFont = OString(); maVirtualStatus.maEncoding = RTL_TEXTENCODING_DONTKNOW; maVirtualStatus.mnTextHeight = nHeight; maVirtualStatus.mnTextWidth = nWidth; @@ -531,13 +531,13 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr, // they are installed on displays and printers, but get not embedded in // print files or documents because they are not licensed for use outside // the company. - rtl::OString aMessage( "The font " ); - aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID), + OString aMessage( "The font " ); + aMessage += OUStringToOString( mrFontMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US ); aMessage += " could not be downloaded\nbecause its license does not allow for that"; PSComment( aMessage.getStr() ); - rtl::OString aFontName = rtl::OUStringToOString( + OString aFontName = OUStringToOString( mrFontMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US); PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1); @@ -706,21 +706,21 @@ PrinterGfx::OnEndJob () } void -PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ) +PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts ) { // write all type 1 fonts std::list< sal_Int32 >::iterator aFont; // already in the document header ? for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont) { - const rtl::OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) ); - rtl::OUString aUNCPath; + const OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) ); + OUString aUNCPath; osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath); osl::File aFontFile (aUNCPath); // provide the pfb or pfa font as a (pfa-)font resource - rtl::OString aPostScriptName = - rtl::OUStringToOString ( mrFontMgr.getPSName(*aFont), + OString aPostScriptName = + OUStringToOString ( mrFontMgr.getPSName(*aFont), RTL_TEXTENCODING_ASCII_US ); WritePS (pFile, "%%BeginResource: font "); @@ -763,7 +763,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli aIter->PSUploadEncoding (pFile, *this); if( aIter->GetFontType() == fonttype::Builtin ) rNeededFonts.push_back( - rtl::OUStringToOString( + OUStringToOString( mrFontMgr.getPSName( aIter->GetFontID() ), RTL_TEXTENCODING_ASCII_US ) ); } diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx index 5458fe8a7539..8b6f3604ca41 100644 --- a/vcl/headless/svpelement.cxx +++ b/vcl/headless/svpelement.cxx @@ -158,21 +158,21 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket ) { int nFile = (int)pSocket; - rtl::OStringBuffer aBuf( 256 ), aAnswer( 256 ); + OStringBuffer aBuf( 256 ), aAnswer( 256 ); char c; while( read( nFile, &c, 1 ) && c != '\n' ) aBuf.append( sal_Char(c) ); - rtl::OString aCommand( aBuf.makeStringAndClear() ); + OString aCommand( aBuf.makeStringAndClear() ); if( aCommand.startsWith( "list" ) ) { - boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash > aMap; + boost::unordered_map< OString, std::list<SvpElement*>, OStringHash > aMap; for( std::list< SvpElement* >::const_iterator it = m_aElements.begin(); it != m_aElements.end(); ++it ) { std::list<SvpElement*>& rList = aMap[matchType(*it)]; rList.push_back( *it ); } - for( boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); + for( boost::unordered_map< OString, std::list<SvpElement*>, OStringHash>::const_iterator hash_it = aMap.begin(); hash_it != aMap.end(); ++hash_it ) { aAnswer.append( "ElementType: " ); diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 41f4629cf75c..18c84f3ef9e5 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -191,7 +191,7 @@ void SvpSalFrame::PostPaint(bool bImmediate) const } } -void SvpSalFrame::SetTitle( const rtl::OUString& ) +void SvpSalFrame::SetTitle( const OUString& ) { } @@ -400,9 +400,9 @@ void SvpSalFrame::EndExtTextInput( sal_uInt16 ) { } -rtl::OUString SvpSalFrame::GetKeyName( sal_uInt16 ) +OUString SvpSalFrame::GetKeyName( sal_uInt16 ) { - return rtl::OUString(); + return OUString(); } sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& ) diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 96733ec97d8c..2c4412fb2705 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -48,7 +48,7 @@ rDevice { #if OSL_DEBUG_LEVEL > 2 static int dbgStreamNum = 0; - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append( "debug" ); mkdir( aBuf.getStr(), 0777 ); aBuf.append( "/" ); diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 1e748231b637..717579f8e90a 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -341,7 +341,7 @@ void SvpSalGraphics::GetDevFontList( ImplDevFontList* pDevFontList ) // inform GlyphCache about this font provided by the PsPrint subsystem ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo ); aDFA.mnQuality += 4096; - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo ); } diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index 2faf8462fe1a..cb5941b9fce9 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -221,9 +221,9 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); // get device resolution @@ -270,7 +270,7 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -283,7 +283,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h index 39d9496a9fe0..ade5438ac580 100644 --- a/vcl/inc/aqua/salframe.h +++ b/vcl/inc/aqua/salframe.h @@ -107,9 +107,9 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetRepresentedURL( const rtl::OUString& ); + virtual void SetRepresentedURL( const OUString& ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); @@ -134,7 +134,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -147,7 +147,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetExtendedFrameStyle( SalExtStyle ); virtual void SetScreenNumber(unsigned int); - virtual void SetApplicationID( const rtl::OUString &rApplicationID ); + virtual void SetApplicationID( const OUString &rApplicationID ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h index 7498d57ee7cb..89469c779ae7 100644 --- a/vcl/inc/aqua/salinst.h +++ b/vcl/inc/aqua/salinst.h @@ -67,7 +67,7 @@ class AquaSalInstance : public SalInstance public: SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex - rtl::OUString maDefaultPrinter; + OUString maDefaultPrinter; oslThreadIdentifier maMainThread; bool mbWaitingYield; int mnActivePrintJobs; @@ -102,7 +102,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual SalTimer* CreateSalTimer(); virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); @@ -119,7 +119,7 @@ public: virtual void DestroyMenuItem( SalMenuItem* ); virtual SalSession* CreateSalSession(); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual void SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ); virtual void SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ); @@ -133,7 +133,7 @@ public: // check whether a particular string is passed on the command line // this is needed to avoid duplicate open events through a) command line and b) NSApp's openFile - static bool isOnCommandLine( const rtl::OUString& ); + static bool isOnCommandLine( const OUString& ); void wakeupYield(); diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/aqua/salmenu.h index 2f0383f53476..326bcd7f4cf2 100644 --- a/vcl/inc/aqua/salmenu.h +++ b/vcl/inc/aqua/salmenu.h @@ -65,9 +65,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/aqua/salprn.h index 5245d6912c1f..443cbe421e4f 100644 --- a/vcl/inc/aqua/salprn.h +++ b/vcl/inc/aqua/salprn.h @@ -82,7 +82,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter long& o_rPageWidth, long& o_rPageHeight ); virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ); virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ); @@ -91,9 +91,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter // and concentrate the real work in one class // implement pull model print system - sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& i_rAppName, + sal_Bool StartJob( const OUString* i_pFileName, + const OUString& rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ); sal_Bool EndJob(); @@ -127,17 +127,17 @@ class AquaSalPrinter : public SalPrinter AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ); virtual ~AquaSalPrinter(); - virtual sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + virtual sal_Bool StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, sal_uLong i_nCopies, bool i_bCollate, bool i_bDirect, ImplJobSetup* i_pSetupData ); // implement pull model print system - virtual sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& i_rAppName, + virtual sal_Bool StartJob( const OUString* i_pFileName, + const OUString& rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rListener ); diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h index 1a8bc8716b54..38bbe8a737c2 100644 --- a/vcl/inc/aqua/salsys.h +++ b/vcl/inc/aqua/salsys.h @@ -39,9 +39,9 @@ public: virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); }; diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/coretext/salgdi.h index 4ca5eb638a67..220e2e368781 100644 --- a/vcl/inc/coretext/salgdi.h +++ b/vcl/inc/coretext/salgdi.h @@ -183,10 +183,10 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -234,8 +234,8 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, - const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, + const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -248,7 +248,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index 02346cd31069..9a84b7790889 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -38,19 +38,19 @@ struct FPtrHash class CUPSManager : public PrinterInfoManager { - boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles; + boost::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles; int m_nDests; void* m_pDests; bool m_bNewDests; - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap; + boost::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap; - boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts; + boost::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts; - rtl::OString m_aUser; + OString m_aUser; // this is a security risk, but the CUPS API demands // to deliver a pointer to a static buffer containing // the password, so this cannot be helped - rtl::OString m_aPassword; + OString m_aPassword; osl::Mutex m_aCUPSMutex; oslThread m_aDestThread; @@ -72,27 +72,27 @@ public: static CUPSManager* tryLoadCUPS(); - const PPDParser* createCUPSParser( const rtl::OUString& rPrinter ); + const PPDParser* createCUPSParser( const OUString& rPrinter ); // wraps cupsGetPPD, so unlink after use ! const char* authenticateUser( const char* ); - virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); + virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); + virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); virtual void setupJobContextData( JobData& rData ); // changes the info about a named printer - virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ); // check if the printer configuration has changed virtual bool checkPrintersChanged( bool bWait ); // members for administration (->padmin) // disable for CUPS - virtual bool addPrinter( const rtl::OUString& rPrinterName, const ::rtl::OUString& rDriverName ); - virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false ); + virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ); + virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ); virtual bool writePrinterConfig(); - virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName ); + virtual bool setDefaultPrinter( const OUString& rPrinterName ); virtual bool addOrRemovePossible() const; }; diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx index 8a9e736605d6..ad2a8bbd10ac 100644 --- a/vcl/inc/fontcache.hxx +++ b/vcl/inc/fontcache.hxx @@ -43,7 +43,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontCacheEntry m_aEntry; }; - typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap; + typedef boost::unordered_map< OString, FontFile, OStringHash > FontDirMap; struct FontDir { sal_Int64 m_nTimestamp; @@ -71,15 +71,15 @@ public: FontCache(); ~FontCache(); - bool getFontCacheFile( int nDirID, const rtl::OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; + bool getFontCacheFile( int nDirID, const OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; void updateFontCacheEntry( const PrintFontManager::PrintFont*, bool bFlush ); void markEmptyDir( int nDirID, bool bNoFiles = true ); // returns false for non cached directory // a cached but empty directory will return true but not append anything - bool listDirectory( const rtl::OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; + bool listDirectory( const OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; // returns true for directoris that contain only user overridden fonts - bool scanAdditionalFiles( const rtl::OString& rDir ); + bool scanAdditionalFiles( const OString& rDir ); void flush(); }; diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx index 67226b0a5239..123544f0e38c 100644 --- a/vcl/inc/generic/gendata.hxx +++ b/vcl/inc/generic/gendata.hxx @@ -49,9 +49,9 @@ class VCL_DLLPUBLIC SalGenericData : public SalData SalGenericDataType m_eType; SalGenericDisplay *m_pDisplay; // cached hostname to avoid slow lookup - rtl::OUString m_aHostname; + OUString m_aHostname; // for transient storage of unicode strings eg. 'u123' by input methods - rtl::OUString m_aUnicodeEntry; + OUString m_aUnicodeEntry; public: SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); } virtual ~SalGenericData() {} @@ -60,13 +60,13 @@ class VCL_DLLPUBLIC SalGenericData : public SalData SalGenericDisplay *GetDisplay() const { return m_pDisplay; } void SetDisplay( SalGenericDisplay *pDisp ) { m_pDisplay = pDisp; } - const rtl::OUString& GetHostname() + const OUString& GetHostname() { if (m_aHostname.isEmpty()) osl_getLocalHostname( &m_aHostname.pData ); return m_aHostname; } - rtl::OUString &GetUnicodeCommand() + OUString &GetUnicodeCommand() { return m_aUnicodeEntry; } diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index 9e2b5ca47512..de47409e4fff 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -95,7 +95,7 @@ public: virtual void GetPrinterQueueInfo ( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState ( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual void PostPrintersChanged() = 0; virtual void updatePrinterUpdate(); virtual void jobStartedPrinterUpdate(); diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index d7397b4d01d7..698cc3e95dfc 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -49,7 +49,7 @@ public: long& rPageWidth, long& rPageHeight ); virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -57,9 +57,9 @@ public: class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter { public: - rtl::OUString m_aFileName; - rtl::OUString m_aTmpFile; - rtl::OUString m_aFaxNr; + OUString m_aFileName; + OUString m_aTmpFile; + OUString m_aFaxNr; bool m_bFax:1; bool m_bPdf:1; bool m_bSwallowFaxNo:1; @@ -76,16 +76,16 @@ public: virtual ~PspSalPrinter(); // overload all pure virtual methods - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual sal_Bool StartJob( const rtl::OUString*, - const rtl::OUString&, - const rtl::OUString&, + virtual sal_Bool StartJob( const OUString*, + const OUString&, + const OUString&, ImplJobSetup*, vcl::PrinterController& i_rController ); virtual sal_Bool EndJob(); diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 36c0e609fa67..4a1d8a00aa2b 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -39,9 +39,9 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics protected: psp::JobData* m_pJobData; psp::PrinterGfx* m_pPrinterGfx; - rtl::OUString* m_pPhoneNr; + OUString* m_pPhoneNr; bool m_bSwallowFaxNo; - rtl::OUString m_aPhoneCollection; + OUString m_aPhoneCollection; bool m_bPhoneCollectionActive; ServerFont* m_pServerFont[ MAX_FALLBACK ]; @@ -52,7 +52,7 @@ public: virtual ~GenPspGraphics(); void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx, - rtl::OUString* pPhone, bool bSwallow, + OUString* pPhone, bool bSwallow, SalInfoPrinter* pInfoPrinter ); // helper methods @@ -97,9 +97,9 @@ public: // graphics must drop any cached font info virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -175,7 +175,7 @@ public: virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); - virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); + virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index d51f222a4855..d60cc1766b14 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -33,13 +33,13 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem public: SalGenericSystem(); virtual ~SalGenericSystem(); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) = 0; - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); @@ -47,7 +47,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem // Simple helpers for X11 WM_CLASS hints static const char *getFrameResName(); static const char *getFrameClassName(); - static rtl::OString getFrameResName( SalExtStyle nStyle ); + static OString getFrameResName( SalExtStyle nStyle ); #endif }; diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 033b6463e984..24cda3c21040 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -72,7 +72,7 @@ public: static GlyphCache& GetInstance(); - void AddFontFile( const rtl::OString& rNormalizedName, + void AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&, const ExtraKernInfo* = NULL ); void AnnounceFonts( ImplDevFontList* ) const; @@ -184,7 +184,7 @@ public: ServerFont( const FontSelectPattern&, FtFontInfo* ); virtual ~ServerFont(); - const ::rtl::OString* GetFontFileName() const; + const OString* GetFontFileName() const; bool TestFont() const; FT_Face GetFtFace() const; int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index d69837e05d97..68a1069c07dc 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -160,7 +160,7 @@ typedef enum { struct GraphicsStatus { - rtl::OString maFont; + OString maFont; rtl_TextEncoding maEncoding; bool mbArtItalic; bool mbArtBold; @@ -264,7 +264,7 @@ public: { maVirtualStatus.maColor = rColor; } void PSUploadPS1Font (sal_Int32 nFontID); - void PSSetFont (const rtl::OString& rName, + void PSSetFont (const OString& rName, rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW) { maVirtualStatus.maFont = rName; maVirtualStatus.maEncoding = nEncoding; } @@ -302,7 +302,7 @@ public: void OnEndPage (); void OnEndJob (); - void writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ); + void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts ); PrintFontManager& GetFontMgr () { return mrFontMgr; } void drawVerticalizedText (const Point& rPoint, diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index 055b92d5a944..b60cc098323b 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -36,9 +36,9 @@ class PrinterJob { private: // private data - rtl::OUString maSpoolDirName; - rtl::OUString maFileName; // empty: spool to command, else spool to named file - rtl::OUString maJobTitle; + OUString maSpoolDirName; + OUString maFileName; // empty: spool to command, else spool to named file + OUString maJobTitle; int mnFileMode; osl::File* mpJobHeader; @@ -73,8 +73,8 @@ private: // private data private: // private methods - osl::File* CreateSpoolFile (const rtl::OUString& rName, - const rtl::OUString& rExtension); + osl::File* CreateSpoolFile (const OUString& rName, + const OUString& rExtension); void InitPaperSize (const JobData& rJobSetup); bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup ); @@ -94,7 +94,7 @@ public: // for usage in PrinterGfx osl::File* GetCurrentPageHeader (); osl::File* GetCurrentPageBody (); - const ::rtl::OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; } + const OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; } public: PrinterJob (); @@ -114,10 +114,10 @@ public: * the quick command for spooling should be used instead * of the normal command */ - sal_Bool StartJob (const rtl::OUString& rFileName, + sal_Bool StartJob (const OUString& rFileName, int nMode, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString& rJobName, + const OUString& rAppName, const JobData& rSetupData, PrinterGfx* pGraphics, bool bIsQuickJob diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index 26ff9b49198e..da8e619fd64c 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -40,8 +40,8 @@ namespace grutils static const char FEAT_PREFIX; static const char FEAT_SEPARATOR; static const char FEAT_ID_VALUE_SEPARATOR; - GrFeatureParser(const gr_face * face, const ::rtl::OString features, const ::rtl::OString lang); - GrFeatureParser(const gr_face * face, const ::rtl::OString lang); + GrFeatureParser(const gr_face * face, const OString features, const OString lang); + GrFeatureParser(const gr_face * face, const OString lang); ~GrFeatureParser(); //size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const; bool parseErrors() { return mbErrors; }; @@ -53,10 +53,10 @@ namespace grutils gr_feature_val * values() const { return mpSettings; }; private: GrFeatureParser(const GrFeatureParser & copy); - void setLang(const gr_face * face, const ::rtl::OString & lang); - bool isCharId(const ::rtl::OString & id, size_t offset, size_t length); - gr_uint32 getCharId(const ::rtl::OString & id, size_t offset, size_t length); - short getIntValue(const ::rtl::OString & id, size_t offset, size_t length); + void setLang(const gr_face * face, const OString & lang); + bool isCharId(const OString & id, size_t offset, size_t length); + gr_uint32 getCharId(const OString & id, size_t offset, size_t length); + short getIntValue(const OString & id, size_t offset, size_t length); size_t mnNumSettings; FeatId maLang; bool mbErrors; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index e4405c3d390c..147811d359c3 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -67,11 +67,11 @@ public: virtual unsigned int GetDisplayScreenCount(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); + virtual OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 342f542e2554..aa3cdd27ef9b 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -74,7 +74,7 @@ public: virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); @@ -102,7 +102,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -124,7 +124,7 @@ public: /*TODO: functional implementation */ virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } - virtual void SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; } + virtual void SetApplicationID(const OUString &rApplicationID) { (void) rApplicationID; } bool IsVisible() { return m_bVisible; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 50a3f872d5c6..3cf98ee2b1cc 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -120,8 +120,8 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 176002e34d27..7f625e86f4de 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -135,7 +135,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual void PostPrintersChanged(); // SalTimer @@ -158,7 +158,7 @@ public: virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual GenPspGraphics *CreatePrintGraphics(); }; diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index d2ae81f8ceff..a18b2931709c 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -496,8 +496,8 @@ public: sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } - void SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep ); - rtl::OUString GetMRUEntries( sal_Unicode cSep ) const; + void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ); + OUString GetMRUEntries( sal_Unicode cSep ) const; void SetMaxMRUCount( sal_uInt16 n ) { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); } sal_uInt16 GetMaxMRUCount() const { return maLBWindow.GetEntryList()->GetMaxMRUCount(); } sal_uInt16 GetDisplayLineCount() const diff --git a/vcl/inc/image.h b/vcl/inc/image.h index f16b595c2709..ec12a3d41aba 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -68,18 +68,18 @@ enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE }; struct ImageAryData { - ::rtl::OUString maName; + OUString maName; // Images identified by either name, or by id sal_uInt16 mnId; BitmapEx maBitmapEx; - ImageAryData( const rtl::OUString &aName, + ImageAryData( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ); ImageAryData( const ImageAryData& rData ); ~ImageAryData(); bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); } - void Load(const rtl::OUString &rPrefix); + void Load(const OUString &rPrefix); ImageAryData& operator=( const ImageAryData& rData ); }; @@ -89,12 +89,12 @@ struct ImageAryData struct ImplImageList { typedef std::vector<ImageAryData *> ImageAryDataVec; - typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash > + typedef boost::unordered_map< OUString, ImageAryData *, OUStringHash > ImageAryDataNameHash; ImageAryDataVec maImages; ImageAryDataNameHash maNameHash; - rtl::OUString maPrefix; + OUString maPrefix; Size maImageSize; sal_uIntPtr mnRefCount; @@ -102,7 +102,7 @@ struct ImplImageList ImplImageList( const ImplImageList &aSrc ); ~ImplImageList(); - void AddImage( const ::rtl::OUString &aName, + void AddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ); void RemoveImage( sal_uInt16 nPos ); }; diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 75009faafd5c..f42a0391bc90 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -45,14 +45,14 @@ public: ~ImplImageTree(); // check whether the icon style is installed - bool checkStyle(rtl::OUString const & style); + bool checkStyle(OUString const & style); bool loadImage( - rtl::OUString const & name, rtl::OUString const & style, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); bool loadDefaultImage( - rtl::OUString const & style, + OUString const & style, BitmapEx& bitmap); void shutDown(); @@ -62,34 +62,34 @@ public: private: bool doLoadImage( - rtl::OUString const & name, rtl::OUString const & style, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized); typedef std::list< std::pair< - rtl::OUString, + OUString, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > > > Paths; typedef boost::unordered_map< - rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache; + OUString, bool, OUStringHash > CheckStyleCache; typedef boost::unordered_map< - rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; + OUString, std::pair< bool, BitmapEx >, OUStringHash > IconCache; - rtl::OUString m_style; + OUString m_style; Paths m_paths; CheckStyleCache m_checkStyleCache; IconCache m_iconCache; bool m_cacheIcons; - void setStyle(rtl::OUString const & style ); + void setStyle(OUString const & style ); void resetPaths(); - bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists ); - bool iconCacheLookup( rtl::OUString const & name, bool localized, BitmapEx & bitmap ); + bool checkStyleCacheLookup( OUString const & style, bool &exists ); + bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); - bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap ); + bool find(std::vector< OUString > const & paths, BitmapEx & bitmap ); }; typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef; diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 529855895cec..262e8b5818da 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -45,8 +45,8 @@ struct ImplJobSetup { sal_uInt16 mnRefCount; // RefCount (only independ data) sal_uInt16 mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx - rtl::OUString maPrinterName; // Printer-Name - rtl::OUString maDriver; // Driver-Name + OUString maPrinterName; // Printer-Name + OUString maDriver; // Driver-Name Orientation meOrientation; // Orientation DuplexMode meDuplexMode; // Duplex sal_uInt16 mnPaperBin; // paper bin / in tray @@ -55,7 +55,7 @@ struct ImplJobSetup long mnPaperHeight; // paper height (100th mm) sal_uIntPtr mnDriverDataLen; // length of system specific data sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block) - ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap; + ::boost::unordered_map< OUString, OUString, OUStringHash > maValueMap; ImplJobSetup(); ImplJobSetup( const ImplJobSetup& rJobSetup ); diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 0842a013d1ac..cf5feb0093ca 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -189,7 +189,7 @@ class ImplGlyphFallbackFontSubstitution : public ImplFontSubstitution { public: - virtual bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const = 0; + virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0; }; // ----------------- @@ -220,7 +220,7 @@ public: ImplFontEntry* GetFontEntry( ImplDevFontList*, FontSelectPattern&, ImplDirectFontSubstitution* pDevSpecific ); ImplFontEntry* GetGlyphFallbackFont( ImplDevFontList*, FontSelectPattern&, - int nFallbackLevel, rtl::OUString& rMissingCodes ); + int nFallbackLevel, OUString& rMissingCodes ); void Release( ImplFontEntry* ); void Invalidate(); }; diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 9d5066ba5af5..140af384f13a 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -238,7 +238,7 @@ public: // suggest fonts for glyph fallback ImplDevFontListData* GetGlyphFallbackFont( FontSelectPattern&, - rtl::OUString& rMissingCodes, int nFallbackLevel ) const; + OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions void SetPreMatchHook( ImplPreMatchFontSubstitution* ); @@ -249,17 +249,17 @@ public: ImplGetDevFontList* GetDevFontList() const; ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const; - ImplDevFontListData* ImplFindByTokenNames(const rtl::OUString& rTokenStr) const; + ImplDevFontListData* ImplFindByTokenNames(const OUString& rTokenStr) const; protected: void InitMatchData() const; bool AreMapNamesAvailable() const { return mbMapNames; } - ImplDevFontListData* ImplFindByAliasName(const rtl::OUString& rSearchName, - const rtl::OUString& rShortName) const; + ImplDevFontListData* ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const; ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth, - FontItalic, const rtl::OUString& rSearchFamily) const; + FontItalic, const OUString& rSearchFamily) const; ImplDevFontListData* FindDefaultFont() const; private: diff --git a/vcl/inc/print.h b/vcl/inc/print.h index aabe813704f0..bd642c66bdd9 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -52,16 +52,16 @@ struct ImplPrnQueueData class VCL_PLUGIN_PUBLIC ImplPrnQueueList { public: - boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > + boost::unordered_map< OUString, sal_Int32, OUStringHash > m_aNameToIndex; std::vector< ImplPrnQueueData > m_aQueueInfos; - std::vector< rtl::OUString > m_aPrinterList; + std::vector< OUString > m_aPrinterList; ImplPrnQueueList() {} ~ImplPrnQueueList(); void Add( SalPrinterQueueInfo* pData ); - ImplPrnQueueData* Get( const rtl::OUString& rPrinter ); + ImplPrnQueueData* Get( const OUString& rPrinter ); }; // -------------- diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 296d5b89edea..30e5fe8e9b6b 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -52,8 +52,8 @@ namespace vcl Size maPreviewSize; VirtualDevice maPageVDev; Bitmap maPreviewBitmap; - rtl::OUString maReplacementString; - rtl::OUString maToolTipString; + OUString maReplacementString; + OUString maToolTipString; bool mbGreyscale; FixedLine maHorzDim; FixedLine maVertDim; @@ -70,8 +70,8 @@ namespace vcl virtual void DataChanged( const DataChangedEvent& ); void setPreview( const GDIMetaFile&, const Size& i_rPaperSize, - const rtl::OUString& i_rPaperName, - const rtl::OUString& i_rNoPageString, + const OUString& i_rPaperName, + const OUString& i_rNoPageString, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY, bool i_bGreyscale ); @@ -200,16 +200,16 @@ namespace vcl CancelButton* mpCancelButton; HelpButton* mpHelpButton; - rtl::OUString maPageStr; - rtl::OUString maNoPageStr; + OUString maPageStr; + OUString maNoPageStr; sal_Int32 mnCurPage; sal_Int32 mnCachedPages; - std::map< Window*, rtl::OUString > maControlToPropertyMap; - std::map< rtl::OUString, std::vector< Window* > > + std::map< Window*, OUString > maControlToPropertyMap; + std::map< OUString, std::vector< Window* > > maPropertyToWindowMap; std::map< Window*, sal_Int32 > maControlToNumValMap; - std::set< rtl::OUString > maReverseDependencySet; + std::set< OUString > maReverseDependencySet; Size maNupPortraitSize; Size maNupLandscapeSize; @@ -217,9 +217,9 @@ namespace vcl // internal, used for automatic Nup-Portrait/landscape Size maFirstPageSize; - rtl::OUString maPrintToFileText; - rtl::OUString maPrintText; - rtl::OUString maDefPrtText; + OUString maPrintToFileText; + OUString maPrintText; + OUString maDefPrtText; Size maDetailsCollapsedSize; Size maDetailsExpandedSize; @@ -235,7 +235,7 @@ namespace vcl void checkControlDependencies(); void checkOptionalControlDependencies(); void makeEnabled( Window* ); - void updateWindowFromProperty( const rtl::OUString& ); + void updateWindowFromProperty( const OUString& ); void setupOptionalUI(); void readFromSettings(); void storeToSettings(); diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h index 0e0dfe5493ad..ed7e233a7285 100644 --- a/vcl/inc/quartz/utils.h +++ b/vcl/inc/quartz/utils.h @@ -34,10 +34,10 @@ #include <rtl/ustring.hxx> -rtl::OUString GetOUString( CFStringRef ); -rtl::OUString GetOUString( NSString* ); -CFStringRef CreateCFString( const rtl::OUString& ); -NSString* CreateNSString( const rtl::OUString& ); +OUString GetOUString( CFStringRef ); +OUString GetOUString( NSString* ); +CFStringRef CreateCFString( const OUString& ); +NSString* CreateNSString( const OUString& ); std::ostream &operator <<(std::ostream& s, CGRect &rRect); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 0e5a92bf1d48..531d0d4f50b1 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -94,9 +94,6 @@ typedef sal_uInt64 SalExtStyle; #define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004) #define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008) -using ::rtl::OUString; -using ::rtl::OString; - struct SystemParentData; class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 21d73801b70d..f20cbe44592c 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -72,7 +72,7 @@ namespace basegfx { typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode typedef std::map< sal_Ucs, sal_Int32 > Ucs2SIntMap; typedef std::map< sal_Ucs, sal_uInt32 > Ucs2UIntMap; -typedef std::map< sal_Ucs, rtl::OString > Ucs2OStrMap; +typedef std::map< sal_Ucs, OString > Ucs2OStrMap; typedef std::vector< sal_Int32 > Int32Vector; // note: if you add any new methods to class SalGraphics using coordinates @@ -152,9 +152,9 @@ protected: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); /** Render bitmap with alpha channel @@ -251,7 +251,7 @@ public: // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ) = 0; - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) = 0; + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ) = 0; // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file @@ -265,7 +265,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -346,7 +346,7 @@ public: true: a substitution has taken place and rNewText rLen, rCutStart and rCutStop have been filled accordingly false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged */ - virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, + virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool supportsOperation( OutDevSupportType ) const = 0; @@ -472,7 +472,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, const OutputDevice *pOutDev ); // Query the native control's actual drawing region (including adornment) @@ -481,7 +481,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev ); diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 47bc126f7190..1dc696eb99ba 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -154,7 +154,7 @@ public: // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_* // this is only necessary because PrintFontManager is an exported vcl API and therefore // needs to be in libvcl while libvclplug_* do not contain exported C++ API - virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); + virtual void FillFontPathList( std::list< OString >& o_rFontPaths ); // dtrans implementation virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 77b1cd7986ef..addedfd4972b 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -36,7 +36,7 @@ struct SalItemParams MenuItemType eType; // MenuItem-Type MenuItemBits nBits; // MenuItem-Bits Menu* pMenu; // Pointer to Menu - rtl::OUString aText; // Menu-Text + OUString aText; // Menu-Text Image aImage; // Image }; @@ -45,10 +45,10 @@ struct SalMenuButtonItem { sal_uInt16 mnId; Image maImage; - rtl::OUString maToolTipText; + OUString maToolTipText; SalMenuButtonItem() : mnId( 0 ) {} - SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) + SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const OUString& i_rTTText = OUString() ) : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} }; @@ -74,9 +74,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ) = 0; virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0; virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0; - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText )= 0; + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText )= 0; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) = 0; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 63fbbc494c9c..9a23731e9b8e 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -35,13 +35,13 @@ namespace vcl { class PrinterController; } struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo { - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maLocation; - rtl::OUString maComment; + OUString maPrinterName; + OUString maDriver; + OUString maLocation; + OUString maComment; sal_uLong mnStatus; sal_uLong mnJobs; - rtl::OUString* mpSysData; + OUString* mpSysData; SalPrinterQueueInfo(); ~SalPrinterQueueInfo(); @@ -78,7 +78,7 @@ public: long& rPageWidth, long& rPageHeight ) = 0; virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait @@ -91,9 +91,9 @@ public: // public for Sal Implementation SalPrinter() {} virtual ~SalPrinter(); - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uLong nCopies, bool bCollate, bool bDirect, @@ -101,9 +101,9 @@ public: // public for Sal Implementation // implement for pull model print systems only, // default implementations (see salvtables.cxx) just returns sal_False - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, ImplJobSetup* pSetupData, vcl::PrinterController& rController ); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 484205d223e9..629f10133f80 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -320,7 +320,7 @@ struct ImplSVData ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; - boost::unordered_map< int, rtl::OUString >* mpPaperNames; + boost::unordered_map< int, OUString >* mpPaperNames; }; void ImplInitSVData(); diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 7fa82d9da609..6a00fadf6d07 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -60,7 +60,7 @@ struct ImplToolItem XubString maQuickHelpText; XubString maHelpText; String maCommandStr; - rtl::OString maHelpId; + OString maHelpId; Rectangle maRect; Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 9cf14676ad68..210053883ecb 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -201,8 +201,8 @@ class GtkSalFrame : public SalFrame bool m_bSendModChangeOnRelease; bool m_bWindowIsGtkPlug; bool m_bSetFocusOnMap; - rtl::OUString m_aTitle; - rtl::OUString m_sWMClass; + OUString m_aTitle; + OUString m_sWMClass; IMHandler* m_pIMHandler; @@ -351,7 +351,7 @@ public: // When Event is called, SalInstance::Yield() must be returned virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu *pSalMenu ); virtual SalMenu* GetMenu( void ); @@ -397,7 +397,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); // returns the input language used for the last key stroke @@ -427,7 +427,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rWMClass ); + virtual void SetApplicationID( const OUString &rWMClass ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 86003edd94b6..0edab313bd6a 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -45,13 +45,13 @@ public: virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption ); + const OUString& rCaption ); virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption, + const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); void updateSettings( AllSettings& rSettings ); @@ -132,9 +132,9 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption ); + const OUString& rCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& rCaption, + const ImplControlValue& aValue, const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); //helper methods for frame's UpdateSettings diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 4ad13a60e1db..83ea84fc5f61 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -109,7 +109,7 @@ public: virtual SalMenuItem* CreateMenuItem( const SalItemParams* ); virtual void DestroyMenuItem( SalMenuItem* pItem ); virtual SalTimer* CreateSalTimer(); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*, long nDX, long nDY, sal_uInt16 nBitCount, diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index f24d2c2a1428..b90379ad806e 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -46,15 +46,15 @@ public: using PspSalPrinter::StartJob; virtual sal_Bool StartJob( - const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData, + const OUString* i_pFileName, const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController); virtual sal_Bool EndJob(); private: bool impl_doJob( - const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData, + const OUString* i_pFileName, const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, int i_nCopies, bool i_bCollate, vcl::PrinterController& io_rController); private: diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index fc0632ffb87d..35915d8198e4 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -68,9 +68,9 @@ public: virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); virtual void ShowItem( unsigned nPos, sal_Bool bShow ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } @@ -84,7 +84,7 @@ public: virtual GActionGroup* GetActionGroup() { return mpActionGroup; } virtual sal_Bool IsItemVisible( unsigned nPos ); - void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ); + void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, unsigned nItemPos, sal_uInt16 nId, @@ -94,7 +94,7 @@ public: gboolean bIsSubmenu ); void NativeSetEnableItem( gchar* aCommand, gboolean bEnable ); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); - void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ); void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate( const gchar* aMenuCommand ); diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 3bd7988b07e7..c36c51149528 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -50,12 +50,12 @@ public: virtual bool IsUnifiedDisplay(); virtual unsigned int GetDisplayScreenCount(); virtual unsigned int GetDisplayBuiltInScreen(); - virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen); + virtual OUString GetDisplayScreenName (unsigned int nScreen); virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen); - virtual int ShowNativeDialog (const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog (const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton); SalX11Screen GetDisplayDefaultXScreen() { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); } diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2511495910b4..531c608327a0 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -310,8 +310,8 @@ public: void ModifierMapping(); void SimulateKeyPress( sal_uInt16 nKeyCode ); sal_uInt16 GetIndicatorState() const; - rtl::OUString GetKeyNameFromKeySym( KeySym keysym ) const; - rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) const; + OUString GetKeyNameFromKeySym( KeySym keysym ) const; + OUString GetKeyName( sal_uInt16 nKeyCode ) const; sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, @@ -410,8 +410,8 @@ public: // get foreign key names namespace vcl_sal { - rtl::OUString getKeysymReplacementName( - rtl::OUString pLang, + OUString getKeysymReplacementName( + OUString pLang, KeySym nSymbol ); } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 28a5446331ac..9c89af934873 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -114,9 +114,9 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame // icon id int mnIconID; - rtl::OUString m_aTitle; + OUString m_aTitle; - rtl::OUString m_sWMClass; + OUString m_sWMClass; SystemChildData maSystemChildData; @@ -208,7 +208,7 @@ public: virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); @@ -236,7 +236,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -249,7 +249,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rWMClass ); + virtual void SetApplicationID( const OUString &rWMClass ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 503872f973ad..c7c80913e368 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -233,8 +233,8 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index ea41c55ccb5e..a997457e8a0d 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -61,7 +61,7 @@ public: virtual bool AnyInput( sal_uInt16 nType ); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); + void FillFontPathList( std::list< OString >& o_rFontPaths ); void SetLib( SalXLib *pXLib ) { mpXLib = pXLib; } // dtrans implementation @@ -69,7 +69,7 @@ public: CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource(); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget(); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); }; #endif // _SV_SALINST_H diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 0daf6ebe591f..289b5dfb16bd 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -40,9 +40,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); }; diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 855edb75ed9e..29897289637e 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -25,13 +25,10 @@ #include "boost/scoped_ptr.hpp" #include "tools/link.hxx" +#include <rtl/ustring.hxx> #include "vclpluginapi.h" -namespace rtl { - class OString; - class OUString; -} class ICEConnectionObserver; class SalSession; @@ -40,7 +37,7 @@ class SessionManagerClient static SalSession * m_pSession; static boost::scoped_ptr< ICEConnectionObserver > m_pICEConnectionObserver; static SmcConn m_pSmcConnection; - static rtl::OString m_aClientID; + static OString m_aClientID; static bool m_bDocSaveDone; static void SaveYourselfProc( SmcConn connection, @@ -58,7 +55,7 @@ class SessionManagerClient static void InteractProc( SmcConn connection, SmPointer clientData ); - static rtl::OString getPreviousSessionID(); + static OString getPreviousSessionID(); DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void* ); DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void* ); @@ -73,8 +70,8 @@ public: static void saveDone(); static void interactionDone( bool bCancelShutdown ); - static rtl::OUString getExecName(); - static VCLPLUG_GEN_PUBLIC rtl::OString getSessionID(); + static OUString getExecName(); + static VCLPLUG_GEN_PUBLIC OString getSessionID(); }; #endif diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index f376743c321b..d3274645d219 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -38,10 +38,10 @@ public: virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 349f9cc67cbb..71fffc718deb 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -190,7 +190,7 @@ public: void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline void PushButton::Check( sal_Bool bCheck ) @@ -399,7 +399,7 @@ public: */ std::vector<RadioButton*> GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); /* * Group this RadioButton with another @@ -500,7 +500,7 @@ public: bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline void CheckBox::Check( sal_Bool bCheck ) diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 22ee5709e07f..f0637109716a 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -219,7 +219,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; #endif // _COMBOBOX_HXX diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx index 3d8d5ace9b1f..47c96facd472 100644 --- a/vcl/inc/vcl/configsettings.hxx +++ b/vcl/inc/vcl/configsettings.hxx @@ -31,7 +31,7 @@ namespace vcl { //........................................................................ - typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap; + typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; //==================================================================== @@ -40,9 +40,9 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { - boost::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings; + boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); void getValues(); SettingsConfigItem(); @@ -51,8 +51,8 @@ namespace vcl static SettingsConfigItem* get(); - const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const; - void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue ); + const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const; + void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); virtual void Commit(); }; diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 4c7149a5493b..d7994c61580e 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -82,7 +82,7 @@ public: protected: Dialog( WindowType nType ); - Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType ); + Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); protected: @@ -92,7 +92,7 @@ protected: public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual long Notify( NotifyEvent& rNEvt ); @@ -105,7 +105,7 @@ public: void setOptimalLayoutSize(); bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } virtual void queue_layout(); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); VclButtonBox* get_action_area(); VclBox* get_content_area(); @@ -153,7 +153,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog public: ModelessDialog( Window* pParent, const ResId& rResId ); - ModelessDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // --------------- @@ -164,7 +164,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog { public: ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ModalDialog( Window* pParent, const ResId& rResId ); protected: diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index aaa6e3a62f78..488758ab7d4a 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -87,7 +87,7 @@ private: DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* ); - SAL_DLLPRIVATE bool ImplTruncateToMaxLen( rtl::OUString&, sal_uInt32 nSelectionLen ) const; + SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_uInt32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); SAL_DLLPRIVATE OUString ImplGetText() const; @@ -227,7 +227,7 @@ public: AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const; + virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const; virtual Size CalcSize( sal_uInt16 nChars ) const; virtual xub_StrLen GetMaxVisChars() const; @@ -243,9 +243,9 @@ public: static PopupMenu* CreatePopupMenu(); static void DeletePopupMenu( PopupMenu* pMenu ); - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); // returns the minimum size a bordered Edit should have given the current // global style settings (needed by sc's inputwin.cxx) diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 50888c6472ab..babab8da29d2 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -518,7 +518,7 @@ public: virtual void Down(); virtual void First(); virtual void Last(); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; @@ -589,7 +589,7 @@ public: MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index c45762f867d7..b592d98a48d2 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -77,7 +77,7 @@ public: static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); void set_mnemonic_widget(Window *pWindow); Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -200,7 +200,7 @@ public: sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; #endif // _SV_FIXED_HXX diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index 98226249843a..d886d48b9854 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -64,7 +64,7 @@ public: void SetAlign( FontAlign ); FontAlign GetAlign() const; - void SetName( const rtl::OUString& rFamilyName ); + void SetName( const OUString& rFamilyName ); const String& GetName() const; void SetStyleName( const String& rStyleName ); const String& GetStyleName() const; diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 7490f018f174..05955f984710 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -76,9 +76,9 @@ struct FastPrintFontInfo fonttype::type m_eType; // font attributes - rtl::OUString m_aFamilyName; - rtl::OUString m_aStyleName; - std::list< rtl::OUString > m_aAliases; + OUString m_aFamilyName; + OUString m_aStyleName; + std::list< OUString > m_aAliases; FontFamily m_eFamilyStyle; FontItalic m_eItalic; FontWidth m_eWidth; @@ -193,7 +193,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager int m_nFamilyName; // atom std::list< int > m_aAliases; int m_nPSName; // atom - rtl::OUString m_aStyleName; + OUString m_aStyleName; FontItalic m_eItalic; FontWidth m_eWidth; FontWeight m_eWeight; @@ -214,7 +214,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager bool m_bUserOverride; std::map< sal_Unicode, sal_Int32 > m_aEncodingVector; - std::map< sal_Unicode, rtl::OString > m_aNonEncoded; + std::map< sal_Unicode, OString > m_aNonEncoded; PrintFont( fonttype::type eType ); virtual ~PrintFont(); @@ -226,8 +226,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct Type1FontFile : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aFontFile; // relative to directory - rtl::OString m_aMetricFile; // dito + OString m_aFontFile; // relative to directory + OString m_aMetricFile; // dito /* note: m_aFontFile and Metric file are not atoms because they should be fairly unique */ @@ -240,7 +240,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct TrueTypeFontFile : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aFontFile; // relative to directory + OString m_aFontFile; // relative to directory int m_nCollectionEntry; // 0 for regular fonts, 0 to ... for fonts stemming from collections unsigned int m_nTypeFlags; // copyright bits and PS-OpenType flag @@ -252,7 +252,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct BuiltinFont : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aMetricFile; + OString m_aMetricFile; BuiltinFont() : PrintFont( fonttype::Builtin ) {} virtual ~BuiltinFont(); @@ -262,22 +262,22 @@ class VCL_PLUGIN_PUBLIC PrintFontManager fontID m_nNextFontID; boost::unordered_map< fontID, PrintFont* > m_aFonts; boost::unordered_map< int, FontFamily > m_aFamilyTypes; - std::list< rtl::OUString > m_aPrinterDrivers; - std::list< rtl::OString > m_aFontDirectories; + std::list< OUString > m_aPrinterDrivers; + std::list< OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID - boost::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash > + boost::unordered_map< OString, std::set< fontID >, OStringHash > m_aFontFileToFontID; - boost::unordered_map< rtl::OString, int, rtl::OStringHash > + boost::unordered_map< OString, int, OStringHash > m_aDirToAtom; - boost::unordered_map< int, rtl::OString > m_aAtomToDir; + boost::unordered_map< int, OString > m_aAtomToDir; int m_nNextDirAtom; - boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash > + boost::unordered_multimap< OString, sal_Unicode, OStringHash > m_aAdobenameToUnicode; - boost::unordered_multimap< sal_Unicode, rtl::OString > + boost::unordered_multimap< sal_Unicode, OString > m_aUnicodeToAdobename; boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; @@ -286,28 +286,28 @@ class VCL_PLUGIN_PUBLIC PrintFontManager mutable std::vector< fontID > m_aOverrideFonts; - rtl::OString getAfmFile( PrintFont* pFont ) const; - rtl::OString getFontFile( PrintFont* pFont ) const; + OString getAfmFile( PrintFont* pFont ) const; + OString getFontFile( PrintFont* pFont ) const; - bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const; - rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code - void analyzeTrueTypeFamilyName( void* pTTFont, std::list< rtl::OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code + bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const; + OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code + void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code bool analyzeTrueTypeFile( PrintFont* pFont ) const; // finds the font id for the nFaceIndex face in this font file // There may be multiple font ids for TrueType collections - fontID findFontFileID( int nDirID, const rtl::OString& rFile, int nFaceIndex ) const; + fontID findFontFileID( int nDirID, const OString& rFile, int nFaceIndex ) const; // There may be multiple font ids for TrueType collections - std::vector<fontID> findFontFileIDs( int nDirID, const rtl::OString& rFile ) const; + std::vector<fontID> findFontFileIDs( int nDirID, const OString& rFile ) const; - bool knownFontFile( int nDirID, const rtl::OString& rFile ) const + bool knownFontFile( int nDirID, const OString& rFile ) const { return findFontFileID(nDirID, rFile, 0) != 0; } fontID findFontBuiltinID( int nPSNameAtom ) const; - FontFamily matchFamilyName( const rtl::OUString& rFamily ) const; + FontFamily matchFamilyName( const OUString& rFamily ) const; PrintFont* getFont( fontID nID ) const { @@ -318,15 +318,15 @@ class VCL_PLUGIN_PUBLIC PrintFontManager void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const; void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const; - rtl::OString getDirectory( int nAtom ) const; - int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false ); + OString getDirectory( int nAtom ) const; + int getDirectoryAtom( const OString& rDirectory, bool bCreate = false ); /* try to initialize fonts from libfontconfig called from <code>initialize()</code> */ void initFontconfig(); - void countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ); + void countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ); /* deinitialize fontconfig */ void deinitFontconfig(); @@ -341,7 +341,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager true if libfontconfig accepted the directory false else (e.g. no libfontconfig found) */ - bool addFontconfigDir(const rtl::OString& rDirectory); + bool addFontconfigDir(const OString& rDirectory); bool readOverrideMetrics(); @@ -357,7 +357,7 @@ public: static PrintFontManager& get(); // one instance only // There may be multiple font ids for TrueType collections - std::vector<fontID> addFontFile( const rtl::OString& rFileName ); + std::vector<fontID> addFontFile( const OString& rFileName ); void initialize(); @@ -383,7 +383,7 @@ public: // routines to get font info in small pieces // get a specific fonts PSName name - const rtl::OUString& getPSName( fontID nFontID ) const; + const OUString& getPSName( fontID nFontID ) const; // get a specific fonts family name aliases void getFontFamilyAliases( fontID nFontID ) const; @@ -438,7 +438,7 @@ public: } // get a specific fonts system dependent filename - rtl::OString getFontFileSysPath( fontID nFontID ) const + OString getFontFileSysPath( fontID nFontID ) const { return getFontFile( getFont( nFontID ) ); } @@ -473,7 +473,7 @@ public: // builtin; if ppNonEncoded is set and non encoded type1 glyphs exist // then *ppNonEncoded is set to the mapping for nonencoded glyphs. // the encoding vector contains -1 for non encoded glyphs - const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, rtl::OString >** ppNonEncoded ) const; + const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, OString >** ppNonEncoded ) const; // to get font substitution transparently use the // getKernPairs method of PrinterGfx @@ -485,7 +485,7 @@ public: bool isFontDownloadingAllowedForPrinting( fontID nFont ) const; // helper for type 1 fonts - std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; + std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator, boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator > @@ -493,7 +493,7 @@ public: { return m_aUnicodeToAdobecode.equal_range( aChar ); } - std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const; + std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const; std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > getUnicodeFromAdobeCode( sal_uInt8 aChar ) const @@ -515,7 +515,7 @@ public: // TODO: callers of this method should use its FontSubsetInfo counterpart directly bool createFontSubset( FontSubsetInfo&, fontID nFont, - const rtl::OUString& rOutFile, + const OUString& rOutFile, sal_Int32* pGlyphIDs, sal_uInt8* pNewEncoding, sal_Int32* pWidths, @@ -566,7 +566,7 @@ public: bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const; - bool Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ); + bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ); int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar ); }; diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 51cff9fc4cb9..bbdf14177b3b 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -238,8 +238,8 @@ public: @param nDataSize Length, in byte, of raw data */ -MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, - const rtl::OUString& rGraphicServiceName, +MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, + const OUString& rGraphicServiceName, const void* pData, sal_uInt32 nDataSize ); diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index 44a96cdb4c53..380298b500b8 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -51,7 +51,7 @@ struct ImpBuffer struct ImpSwap { - rtl::OUString maURL; + OUString maURL; sal_uLong mnDataSize; sal_uLong mnRefCount; diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx index b415d8fe7cb5..8f42119360d1 100644 --- a/vcl/inc/vcl/graphicfilter.hxx +++ b/vcl/inc/vcl/graphicfilter.hxx @@ -233,7 +233,7 @@ private: protected: - rtl::OUString aFilterPath; + OUString aFilterPath; FilterConfigCache* pConfig; FilterErrorEx* pErrorEx; sal_Bool bAbort; @@ -245,7 +245,7 @@ public: GraphicFilter( sal_Bool bUseConfig = sal_True ); ~GraphicFilter(); - void SetFilterPath( const rtl::OUString& rFilterPath ) { aFilterPath = rFilterPath; }; + void SetFilterPath( const OUString& rFilterPath ) { aFilterPath = rFilterPath; }; sal_uInt16 GetImportFormatCount(); sal_uInt16 GetImportFormatNumber( const String& rFormatName ); diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx index 839bf6a840f2..295df4a1a5e7 100644 --- a/vcl/inc/vcl/helper.hxx +++ b/vcl/inc/vcl/helper.hxx @@ -33,25 +33,25 @@ namespace osl { class File; } namespace psp { typedef int fontID; -void VCL_DLLPUBLIC getPrinterPathList( std::list< rtl::OUString >& rPathList, const char* pSubDir ); +void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir ); -// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here +// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -rtl::OUString VCL_DLLPUBLIC getFontPath(); +OUString VCL_DLLPUBLIC getFontPath(); bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile ); // normalized path (equivalent to realpath) -void VCL_DLLPUBLIC normPath( rtl::OString& rPath ); +void VCL_DLLPUBLIC normPath( OString& rPath ); // splits rOrgPath into dirname and basename // rOrgPath will be subject to normPath -void VCL_DLLPUBLIC splitPath( rtl::OString& rOrgPath, rtl::OString& rDir, rtl::OString& rBase ); +void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase ); enum whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; -// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here +// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -rtl::OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); +OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); } // namespace #endif // _PSPRINT_HELPER_HXX_ diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index ae9a2d092627..8ece881a9b03 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -70,9 +70,9 @@ public: I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); ~I18nHelper(); - sal_Int32 CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const; + sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; - sal_Bool MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const; + sal_Bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const; sal_Bool MatchMnemonic( const String& rString, sal_Unicode cMnemonicChar ) const; String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index 6c7ba0a70347..dc027f493a7f 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -84,14 +84,14 @@ class VCL_DLLPUBLIC ImageList public: ImageList( sal_uInt16 nInit = 8, sal_uInt16 nGrow = 4 ); ImageList( const ResId& rResId ); - ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, - const ::rtl::OUString& rPrefix, + ImageList( const ::std::vector< OUString >& rNameVector, + const OUString& rPrefix, const Color* pMaskColor = NULL ); ImageList( const ImageList& rImageList ); ~ImageList(); void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, - const std::vector< rtl::OUString > &rNameVector ); + const std::vector< OUString > &rNameVector ); void InsertFromHorizontalBitmap( const ResId& rResId, sal_uInt16 nCount, const Color *pNonAlphaMaskColor, @@ -102,23 +102,23 @@ public: sal_uInt16 GetImageCount() const; Size GetImageSize() const; - void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void AddImage( const OUString& rImageName, const Image& rImage ); - void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void ReplaceImage( const OUString& rImageName, const Image& rImage ); void RemoveImage( sal_uInt16 nId ); Image GetImage( sal_uInt16 nId ) const; - Image GetImage( const ::rtl::OUString& rImageName ) const; + Image GetImage( const OUString& rImageName ) const; sal_uInt16 GetImagePos( sal_uInt16 nId ) const; bool HasImageAtPos( sal_uInt16 nId ) const; - sal_uInt16 GetImagePos( const ::rtl::OUString& rImageName ) const; + sal_uInt16 GetImagePos( const OUString& rImageName ) const; sal_uInt16 GetImageId( sal_uInt16 nPos ) const; - ::rtl::OUString GetImageName( sal_uInt16 nPos ) const; - void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const; + OUString GetImageName( sal_uInt16 nPos ) const; + void GetImageNames( ::std::vector< OUString >& rNames ) const; ImageList& operator=( const ImageList& rImageList ); sal_Bool operator==( const ImageList& rImageList ) const; @@ -130,13 +130,13 @@ private: sal_uInt16 mnInitSize; sal_uInt16 mnGrowSize; - SAL_DLLPRIVATE void ImplInitBitmapEx( const ::rtl::OUString& rUserImageName, - const ::std::vector< ::rtl::OUString >& rImageNames, - const ::rtl::OUString& rSymbolsStyle, + SAL_DLLPRIVATE void ImplInitBitmapEx( const OUString& rUserImageName, + const ::std::vector< OUString >& rImageNames, + const OUString& rSymbolsStyle, BitmapEx& rBmpEx, const Color* pMaskColor ) const; SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize ); - SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const OUString& rImageName ) const; }; #endif // _SV_IMAGE_HXX diff --git a/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx index cf7c14861399..45ee445edcd6 100644 --- a/vcl/inc/vcl/imagerepository.hxx +++ b/vcl/inc/vcl/imagerepository.hxx @@ -48,7 +48,7 @@ namespace vcl whether or not the image could be loaded successfully. */ static bool loadImage( - const ::rtl::OUString& _rName, + const OUString& _rName, BitmapEx& _out_rImage, bool bSearchLanguageDependent, bool loadMissing = false diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx index 3f81877f230f..f6fb94fccab2 100644 --- a/vcl/inc/vcl/jobdata.hxx +++ b/vcl/inc/vcl/jobdata.hxx @@ -44,7 +44,7 @@ struct VCL_DLLPUBLIC JobData int m_nColorDevice; // 0: no override, -1 grey scale, +1 color int m_nPDFDevice; // 0: no override, -1 PostScript, +1: Automatically PDF, +2: Explicitly PDF orientation::type m_eOrientation; - ::rtl::OUString m_aPrinterName; + OUString m_aPrinterName; const PPDParser* m_pParser; PPDContext m_aContext; diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index a8cc29bb87ef..d8f489864297 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -53,15 +53,15 @@ public: JobSetup( const JobSetup& rJob ); ~JobSetup(); - rtl::OUString GetPrinterName() const; - rtl::OUString GetDriverName() const; + OUString GetPrinterName() const; + OUString GetDriverName() const; /* Get/SetValue are used to read/store additional * Parameters in the job setup that may be used * by the printer driver. One possible use are phone * numbers for faxes (which disguise as printers) */ - void SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue ); + void SetValue( const OUString& rKey, const OUString& rValue ); JobSetup& operator=( const JobSetup& rJob ); diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index e80ed7019f74..b0d57c392ab7 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -42,7 +42,7 @@ protected: BigInt mnMin; BigInt mnMax; BigInt mnCorrectedValue; - rtl::OUString maCurrencySymbol; + OUString maCurrencySymbol; sal_uInt16 mnType; sal_uInt16 mnDecimalDigits; sal_Bool mbThousandSep; diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 74dc854b8f44..79026116c473 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -223,7 +223,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; // ---------------- diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index ba6038de8bcd..c9bc3b538711 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -289,8 +289,8 @@ public: void SetHelpCommand( sal_uInt16 nItemId, const XubString& rString ); const XubString& GetHelpCommand( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } const Link& GetActivateHdl() const { return aActivateHdl; } diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index 4cad0a3fb8bf..961baaecd1ff 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -424,7 +424,7 @@ class VCL_DLLPUBLIC MetaTextAction : public MetaAction private: Point maPt; - rtl::OUString maStr; + OUString maStr; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -433,14 +433,14 @@ private: public: DECL_META_ACTION( Text, META_TEXT_ACTION ) - MetaTextAction( const Point& rPt, const rtl::OUString& rStr, + MetaTextAction( const Point& rPt, const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Point& GetPoint() const { return maPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } }; @@ -450,7 +450,7 @@ class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction private: Point maStartPt; - rtl::OUString maStr; + OUString maStr; sal_Int32* mpDXAry; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -463,7 +463,7 @@ protected: public: MetaTextArrayAction(); MetaTextArrayAction( const MetaTextArrayAction& rAction ); - MetaTextArrayAction( const Point& rStartPt, const rtl::OUString& rStr, + MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, sal_uInt16 nIndex, sal_uInt16 nLen ); @@ -478,7 +478,7 @@ public: virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); const Point& GetPoint() const { return maStartPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } sal_Int32* GetDXArray() const { return mpDXAry; } @@ -489,7 +489,7 @@ class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction private: Point maPt; - rtl::OUString maStr; + OUString maStr; sal_uInt32 mnWidth; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -500,14 +500,14 @@ public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const rtl::OUString& rStr, + const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Point& GetPoint() const { return maPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt32 GetWidth() const { return mnWidth; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } @@ -518,7 +518,7 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction private: Rectangle maRect; - rtl::OUString maStr; + OUString maStr; sal_uInt16 mnStyle; virtual sal_Bool Compare( const MetaAction& ) const; @@ -527,13 +527,13 @@ public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) MetaTextRectAction( const Rectangle& rRect, - const rtl::OUString& rStr, sal_uInt16 nStyle ); + const OUString& rStr, sal_uInt16 nStyle ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Rectangle& GetRect() const { return maRect; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetStyle() const { return mnStyle; } }; @@ -1254,7 +1254,7 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction { private: - rtl::OString maComment; + OString maComment; sal_Int32 mnValue; sal_uInt32 mnDataSize; sal_uInt8* mpData; @@ -1268,7 +1268,7 @@ protected: public: MetaCommentAction( sal_Int32 nValue = 0L ); MetaCommentAction( const MetaCommentAction& rAct ); - MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); + MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1278,7 +1278,7 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - const rtl::OString& GetComment() const { return maComment; } + const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } sal_uInt32 GetDataSize() const { return mnDataSize; } const sal_uInt8* GetData() const { return mpData; } diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index df433ff92e84..b0bb8e5c9389 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -1151,7 +1151,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption ); + OUString aCaption ); // Query the native control's actual drawing region (including adornment) sal_Bool GetNativeControlRegion( ControlType nType, @@ -1159,7 +1159,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption, + OUString aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) const; diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 3a0be8c5c199..59a118945cd4 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -54,7 +54,7 @@ struct PDFExtOutDevBookmarkEntry /** link target name, respectively destination name */ - rtl::OUString aBookmark; + OUString aBookmark; PDFExtOutDevBookmarkEntry() :nLinkId( -1 ) @@ -285,7 +285,7 @@ public : 0 for success -1 in case the link id does not exist */ - sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ); /** Create a new outline item @param nParent @@ -302,7 +302,7 @@ public : @returns the outline item id of the new item */ - sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); /** Create a new note on a page @@ -354,7 +354,7 @@ public : @returns the id of the newly created structural element */ - sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias = rtl::OUString() ); + sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias = OUString() ); /** end a logical structure element @see BeginStructureElement diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 4db5e293a5e5..3bfd5ed2f66f 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -224,9 +224,9 @@ public: protected: WidgetType Type; // primitive RTTI public: - rtl::OUString Name; // a distinct name to identify the control - rtl::OUString Description;// descriptive text for the contro (e.g. for tool tip) - rtl::OUString Text; // user text to appear on the control + OUString Name; // a distinct name to identify the control + OUString Description;// descriptive text for the contro (e.g. for tool tip) + OUString Text; // user text to appear on the control sal_uInt16 TextStyle; // style flags bool ReadOnly; Rectangle Location; // describes the area filled by the control @@ -319,7 +319,7 @@ public: will appear literally in the PDF file produced */ sal_Int32 Dest; - rtl::OUString URL; + OUString URL; bool Submit; bool SubmitGet; @@ -356,7 +356,7 @@ public: bool Selected; sal_Int32 RadioGroup; bool ButtonIsLeft; - rtl::OUString OnValue; // the value of the radio button if it is selected + OUString OnValue; // the value of the radio button if it is selected RadioButtonWidget() : AnyWidget( vcl::PDFWriter::RadioButton ), @@ -405,7 +405,7 @@ public: bool DropDown; bool Sort; bool MultiSelect; - std::vector<rtl::OUString> Entries; + std::vector<OUString> Entries; std::vector<sal_Int32> SelectedEntries; // if MultiSelect is false only the first entry of SelectedEntries // will be taken into account. the same is implicit for PDF < 1.4 @@ -428,7 +428,7 @@ public: struct ComboBoxWidget : public AnyWidget { bool Sort; - std::vector<rtl::OUString> Entries; + std::vector<OUString> Entries; // set the current value in AnyWidget::Text ComboBoxWidget() @@ -448,9 +448,9 @@ public: // the Location member of the AnyWidget which spcifies the coordinates // of the signature - rtl::OUString SigLocation; - rtl::OUString SigReason; - rtl::OUString SigContactInfo; + OUString SigLocation; + OUString SigReason; + OUString SigContactInfo; bool SigHidden; SignatureWidget() @@ -565,9 +565,9 @@ The following structure describes the permissions used in PDF security struct PDFWriterContext { /* must be a valid file: URL usable by osl */ - rtl::OUString URL; + OUString URL; /* the URL of the document being exported, used for relative links*/ - rtl::OUString BaseURL; + OUString BaseURL; /*if relative to file system should be formed*/ bool RelFsys;//i56629, i49415?, i64585? /*the action to set the PDF hyperlink to*/ @@ -622,10 +622,10 @@ The following structure describes the permissions used in PDF security PDFWriter::PDFDocInfo DocumentInfo; bool SignPDF; - rtl::OUString SignLocation; - rtl::OUString SignPassword; - rtl::OUString SignReason; - rtl::OUString SignContact; + OUString SignLocation; + OUString SignPassword; + OUString SignReason; + OUString SignContact; com::sun::star::lang::Locale DocumentLocale; // defines the document default language sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL ) // 0 here specifies a default handling @@ -726,8 +726,8 @@ The following structure describes the permissions used in PDF security std::set< ErrorCode > GetErrors(); static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > - InitEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, + InitEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ); @@ -895,7 +895,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); + sal_Int32 CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); /** Create a new destination to be used in a link @param rRect @@ -979,7 +979,7 @@ The following structure describes the permissions used in PDF security 0 for success -1 in case the link id does not exist */ - sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ); /** Resolve link in logical structure <p> If a link is created after the corresponding visual appearance was drawn @@ -1026,7 +1026,7 @@ The following structure describes the permissions used in PDF security @returns the outline item id of the new item */ - sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); /** Set an outline item's parent @@ -1055,7 +1055,7 @@ The following structure describes the permissions used in PDF security 0 if the item exists and the text was changed -1 if the item does not exist */ - sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); + sal_Int32 SetOutlineItemText( sal_Int32 nItem, const OUString& rText ); /** Set an outline item's destination @@ -1137,7 +1137,7 @@ The following structure describes the permissions used in PDF security @returns the new structure element's id for use in <code>SetCurrentStructureElement</code> */ - sal_Int32 BeginStructureElement( enum StructElement eType, const rtl::OUString& rAlias = rtl::OUString() ); + sal_Int32 BeginStructureElement( enum StructElement eType, const OUString& rAlias = OUString() ); /** end the current logical structure element <p> diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index ec04b2481763..80fbeaf4728a 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -57,7 +57,7 @@ class VCL_DLLPUBLIC PPDKey { friend class PPDParser; - typedef ::boost::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type; + typedef ::boost::unordered_map< OUString, PPDValue, OUStringHash > hash_type; typedef ::std::vector< PPDValue* > value_type; String m_aKey; @@ -121,7 +121,7 @@ class VCL_DLLPUBLIC PPDParser friend class CUPSManager; friend class PPDCache; - typedef ::boost::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; + typedef ::boost::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; typedef ::std::vector< PPDKey* > value_type; void insertKey( const String& rKey, PPDKey* pKey ); @@ -178,12 +178,12 @@ private: PPDParser( const String& rFile ); ~PPDParser(); - void parseOrderDependency(const rtl::OString& rLine); - void parseOpenUI(const rtl::OString& rLine); - void parseConstraint(const rtl::OString& rLine); - void parse( std::list< rtl::OString >& rLines ); + void parseOrderDependency(const OString& rLine); + void parseOpenUI(const OString& rLine); + void parseConstraint(const OString& rLine); + void parse( std::list< OString >& rLines ); - String handleTranslation(const rtl::OString& i_rString, bool i_bIsGlobalized); + String handleTranslation(const OString& i_rString, bool i_bIsGlobalized); static void scanPPDDir( const String& rDir ); static void initPPDFiles(); @@ -192,7 +192,7 @@ public: static const PPDParser* getParser( const String& rFile ); static String getPPDPrinterName( const String& rFile ); static void freeAll(); - static void getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh = false ); + static void getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh = false ); const String& getFilename() const { return m_aFile; } @@ -250,10 +250,10 @@ public: String getFont( int ) const; - rtl::OUString translateKey( const rtl::OUString& i_rKey, + OUString translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; - rtl::OUString translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, + OUString translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; }; @@ -301,7 +301,7 @@ public: // width, height in points, paper will contain the name of the selected // paper after the call - void getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const; + void getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const; }; } // namespace diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index e0a87e9af088..c40e8bc4ab4d 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -93,10 +93,10 @@ class VCL_DLLPUBLIC QueueInfo friend class Printer; private: - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maLocation; - rtl::OUString maComment; + OUString maPrinterName; + OUString maDriver; + OUString maLocation; + OUString maComment; sal_uInt32 mnStatus; sal_uInt32 mnJobs; @@ -105,10 +105,10 @@ public: QueueInfo( const QueueInfo& rInfo ); ~QueueInfo(); - const rtl::OUString& GetPrinterName() const { return maPrinterName; } - const rtl::OUString& GetDriver() const { return maDriver; } - const rtl::OUString& GetLocation() const { return maLocation; } - const rtl::OUString& GetComment() const { return maComment; } + const OUString& GetPrinterName() const { return maPrinterName; } + const OUString& GetDriver() const { return maDriver; } + const OUString& GetLocation() const { return maLocation; } + const OUString& GetComment() const { return maComment; } sal_uInt32 GetStatus() const { return mnStatus; } sal_uInt32 GetJobs() const { return mnJobs; } @@ -223,10 +223,10 @@ private: Printer* mpNext; VirtualDevice* mpDisplayDev; PrinterOptions* mpPrinterOptions; - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maPrintFile; - rtl::OUString maJobName; + OUString maPrinterName; + OUString maDriver; + OUString maPrintFile; + OUString maJobName; JobSetup maJobSetup; Point maPageOffset; Size maPaperSize; @@ -250,13 +250,13 @@ private: SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); - SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const rtl::OUString& rPrinterName, - const rtl::OUString* pDriver ); + SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, + const OUString* pDriver ); SAL_DLLPRIVATE void ImplUpdatePageData(); SAL_DLLPRIVATE void ImplUpdateFontList(); SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); - SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& ); + SAL_DLLPRIVATE bool StartJob( const OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& ); static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError ); @@ -279,17 +279,17 @@ public: Printer(); Printer( const JobSetup& rJobSetup ); Printer( const QueueInfo& rQueueInfo ); - Printer( const rtl::OUString& rPrinterName ); + Printer( const OUString& rPrinterName ); virtual ~Printer(); - static const std::vector< rtl::OUString >& GetPrinterQueues(); - static const QueueInfo* GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate ); - static rtl::OUString GetDefaultPrinterName(); + static const std::vector< OUString >& GetPrinterQueues(); + static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); + static OUString GetDefaultPrinterName(); virtual void Error(); - const rtl::OUString& GetName() const { return maPrinterName; } - const rtl::OUString& GetDriverName() const { return maDriver; } + const OUString& GetName() const { return maPrinterName; } + const OUString& GetDriverName() const { return maDriver; } sal_Bool IsDefPrinter() const { return mbDefPrinter; } sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } sal_Bool IsValid() const { return !IsDisplayPrinter(); } @@ -299,7 +299,7 @@ public: sal_Bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - void SetJobValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } + void SetJobValue( const OUString& rKey, const OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } sal_Bool Setup( Window* pWindow = NULL ); sal_Bool SetPrinterProps( const Printer* pPrinter ); @@ -325,16 +325,16 @@ public: sal_Bool SetPaperSizeUser( const Size& rSize ); sal_Bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); Paper GetPaper() const; - static rtl::OUString GetPaperName( Paper ePaper ); + static OUString GetPaperName( Paper ePaper ); // return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER - rtl::OUString GetPaperName( bool i_bPaperUser = true ) const; + OUString GetPaperName( bool i_bPaperUser = true ) const; // returns number of available paper formats int GetPaperInfoCount() const; // returns info about paper format nPaper const PaperInfo& GetPaperInfo( int nPaper ) const; sal_uInt16 GetPaperBinCount() const; - rtl::OUString GetPaperBinName( sal_uInt16 nPaperBin ) const; + OUString GetPaperBinName( sal_uInt16 nPaperBin ) const; const Size& GetPaperSizePixel() const { return maPaperSize; } Size GetPaperSize() const { return PixelToLogic( maPaperSize ); } @@ -347,7 +347,7 @@ public: sal_Bool IsPrinting() const { return mbPrinting; } - const rtl::OUString& GetCurJobName() const { return maJobName; } + const OUString& GetCurJobName() const { return maJobName; } sal_uInt16 GetCurPage() const { return mnCurPage; } sal_Bool IsJobActive() const { return mbJobActive; } @@ -445,20 +445,20 @@ public: /* get the PropertyValue of a Property */ - com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ); - const com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ) const; + com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName ); + const com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName ) const; /* get a bool property in case the property is unknown or not convertible to bool, i_bFallback is returned */ - sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const; + sal_Bool getBoolProperty( const OUString& i_rPropertyName, sal_Bool i_bFallback ) const; /* get an int property in case the property is unknown or not convertible to bool, i_nFallback is returned */ - sal_Int32 getIntProperty( const rtl::OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; + sal_Int32 getIntProperty( const OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; /* set a property value - can also be used to add another UI property */ - void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue ); + void setValue( const OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue ); void setValue( const com::sun::star::beans::PropertyValue& i_rValue ); /* return the currently active UI options. These are the same that were passed to setUIOptions. @@ -470,12 +470,12 @@ public: void setUIOptions( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); /* enable/disable an option; this can be used to implement dialog logic. */ - bool isUIOptionEnabled( const rtl::OUString& rPropName ) const; - bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice ) const; + bool isUIOptionEnabled( const OUString& rPropName ) const; + bool isUIChoiceEnabled( const OUString& rPropName, sal_Int32 nChoice ) const; /* returns the property name rPropName depends on or an empty string if no dependency exists. */ - rtl::OUString getDependency( const rtl::OUString& rPropName ) const; + OUString getDependency( const OUString& rPropName ) const; /* makeEnabled will chage the property rPropName depends on to the value that makes rPropName enabled. If the dependency itself is also disabled, no action will be performed. @@ -483,7 +483,7 @@ public: returns the property name rPropName depends on or an empty string if no change was made. */ - rtl::OUString makeEnabled( const rtl::OUString& rPropName ); + OUString makeEnabled( const OUString& rPropName ); virtual int getPageCount() const = 0; // must be overloaded by the app /* get the page parameters, namely the jobsetup that should be active for the page @@ -537,7 +537,7 @@ public: class VCL_DLLPUBLIC PrinterOptionsHelper { protected: - boost::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap; + boost::unordered_map< OUString, com::sun::star::uno::Any, OUStringHash > m_aPropertyMap; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties; public: @@ -553,7 +553,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper * if the optional output set is not NULL then the names of the changed properties are returned **/ bool processProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp, - std::set< rtl::OUString >* o_pChangeProp = NULL ); + std::set< OUString >* o_pChangeProp = NULL ); /* append to a sequence of property values the ui property sequence passed at creation * as the "ExtraPrintUIOptions" property. if that sequence was empty, no "ExtraPrintUIOptions" property * will be appended. @@ -561,38 +561,38 @@ class VCL_DLLPUBLIC PrinterOptionsHelper void appendPrintUIOptions( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rProps ) const; // returns an empty Any for not existing properties - com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const; + com::sun::star::uno::Any getValue( const OUString& i_rPropertyName ) const; - sal_Bool getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const; + sal_Bool getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const; // convenience for fixed strings sal_Bool getBoolValue( const char* i_pPropName, sal_Bool i_bDefault = sal_False ) const - { return getBoolValue( rtl::OUString::createFromAscii( i_pPropName ), i_bDefault ); } + { return getBoolValue( OUString::createFromAscii( i_pPropName ), i_bDefault ); } - sal_Int64 getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const; + sal_Int64 getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const; // convenience for fixed strings sal_Int64 getIntValue( const char* i_pPropName, sal_Int64 i_nDefault = 0 ) const - { return getIntValue( rtl::OUString::createFromAscii( i_pPropName ), i_nDefault ); } + { return getIntValue( OUString::createFromAscii( i_pPropName ), i_nDefault ); } - rtl::OUString getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault = rtl::OUString() ) const; + OUString getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault = OUString() ) const; // convenience for fixed strings - rtl::OUString getStringValue( const char* i_pPropName, const rtl::OUString& i_rDefault = rtl::OUString() ) const - { return getStringValue( rtl::OUString::createFromAscii( i_pPropName ), i_rDefault ); } + OUString getStringValue( const char* i_pPropName, const OUString& i_rDefault = OUString() ) const + { return getStringValue( OUString::createFromAscii( i_pPropName ), i_rDefault ); } // helper functions for user to create a single control struct UIControlOptions { - rtl::OUString maDependsOnName; + OUString maDependsOnName; sal_Int32 mnDependsOnEntry; sal_Bool mbAttachToDependency; - rtl::OUString maGroupHint; + OUString maGroupHint; sal_Bool mbInternalOnly; sal_Bool mbEnabled; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps; - UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(), + UIControlOptions( const OUString& i_rDependsOnName = OUString(), sal_Int32 i_nDependsOnEntry = -1, sal_Bool i_bAttachToDependency = sal_False, - const rtl::OUString& i_rGroupHint = rtl::OUString(), + const OUString& i_rGroupHint = OUString(), sal_Bool i_bInternalOnly = sal_False, sal_Bool i_bEnabled = sal_True ) @@ -604,56 +604,56 @@ class VCL_DLLPUBLIC PrinterOptionsHelper , mbEnabled( i_bEnabled ) {} }; - // note: in the following helper functions HelpIds are expected as an rtl::OUString - // the normal HelpId form is rtl::OString (byte string instead of UTF16 string) + // note: in the following helper functions HelpIds are expected as an OUString + // the normal HelpId form is OString (byte string instead of UTF16 string) // this is because the whole interface is base on UNO properties; in fact the structures // are passed over UNO interfaces. UNO does not know a byte string, hence the string is // transported via UTF16 strings. // Show general control - static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rType, + static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rType, const com::sun::star::beans::PropertyValue* i_pValue = NULL, const UIControlOptions& i_rControlOptions = UIControlOptions() ); // Show and set the title of a TagPage of id i_rID - static com::sun::star::uno::Any setGroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId); + static com::sun::star::uno::Any setGroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId); // Show and set the label of a VclFrame of id i_rID - static com::sun::star::uno::Any setSubgroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, + static com::sun::star::uno::Any setSubgroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, const UIControlOptions& i_rControlOptions = UIControlOptions()); // Show a bool option as a checkbox - static com::sun::star::uno::Any setBoolControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, + static com::sun::star::uno::Any setBoolControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Bool i_bValue, const UIControlOptions& i_rControlOptions = UIControlOptions()); // Show a set of choices in a list box - static com::sun::star::uno::Any setChoiceListControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices, + static com::sun::star::uno::Any setChoiceListControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const com::sun::star::uno::Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(), const UIControlOptions& i_rControlOptions = UIControlOptions()); // show a set of choices as radio buttons - static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices, + static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const com::sun::star::uno::Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(), const UIControlOptions& i_rControlOptions = UIControlOptions()); @@ -661,10 +661,10 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // show an integer range (e.g. a spin field) // note: max value < min value means do not apply min/max values - static com::sun::star::uno::Any setRangeControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, + static com::sun::star::uno::Any setRangeControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue = -1, sal_Int32 i_nMaxValue = -2, @@ -672,11 +672,11 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // show a string field // note: max value < min value means do not apply min/max values - static com::sun::star::uno::Any setEditControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, - const rtl::OUString& i_rValue, + static com::sun::star::uno::Any setEditControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, + const OUString& i_rValue, const UIControlOptions& i_rControlOptions = UIControlOptions()); }; diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx index f45737930a02..108b31504de1 100644 --- a/vcl/inc/vcl/printerinfomanager.hxx +++ b/vcl/inc/vcl/printerinfomanager.hxx @@ -38,18 +38,18 @@ class SystemQueueInfo; struct PrinterInfo : JobData { // basename of PPD - rtl::OUString m_aDriverName; + OUString m_aDriverName; // can be the queue - rtl::OUString m_aLocation; + OUString m_aLocation; // a user defined comment - rtl::OUString m_aComment; + OUString m_aComment; // a command line to pipe a PS-file to - rtl::OUString m_aCommand; + OUString m_aCommand; // a command line to pipe a PS-file to in case of direct print - rtl::OUString m_aQuickCommand; + OUString m_aQuickCommand; // a list of special features separated by ',' not used by psprint // but assigned from the outside (currently for "fax","pdf=","autoqueue","external_dialog") - rtl::OUString m_aFeatures; + OUString m_aFeatures; // a mapping of fonts to other fonts. // this provides a method for the user // to replace arbitrary fonts by printer builtin fonts @@ -60,7 +60,7 @@ struct PrinterInfo : JobData // this vector is currently implicitly given by the adobe // standard encoding bool m_bPerformFontSubstitution; - boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > + boost::unordered_map< OUString, OUString, OUStringHash > m_aFontSubstitutes; boost::unordered_map< fontID, fontID > m_aFontSubstitutions; @@ -78,9 +78,9 @@ public: struct SystemPrintQueue { - rtl::OUString m_aQueue; - rtl::OUString m_aLocation; - rtl::OUString m_aComment; + OUString m_aQueue; + OUString m_aLocation; + OUString m_aComment; }; protected: // needed for checkPrintersChanged: files (not necessarily existant) @@ -88,7 +88,7 @@ protected: struct WatchFile { // the file in question - rtl::OUString m_aFilePath; + OUString m_aFilePath; // the last know modification time or 0, if file did not exist TimeValue m_aModified; }; @@ -98,25 +98,25 @@ protected: { // configuration file containing this printer // empty means a freshly added printer that has to be saved yet - rtl::OUString m_aFile; + OUString m_aFile; // details other config files that have this printer // in case of removal all have to be removed - std::list< rtl::OUString > m_aAlternateFiles; + std::list< OUString > m_aAlternateFiles; // group in m_aFile containing the printer // this must be unique over all configuration files // it usually should be the printer name - rtl::OString m_aGroup; + OString m_aGroup; // whether changes need to be saved bool m_bModified; // the corresponding info and job data PrinterInfo m_aInfo; }; - boost::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters; + boost::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; PrinterInfo m_aGlobalDefaults; std::list< WatchFile > m_aWatchFiles; - rtl::OUString m_aDefaultPrinter; - rtl::OUString m_aSystemPrintCommand; + OUString m_aDefaultPrinter; + OUString m_aSystemPrintCommand; std::list< SystemPrintQueue > m_aSystemPrintQueues; @@ -125,7 +125,7 @@ protected: Type m_eType; bool m_bUseIncludeFeature; bool m_bUseJobPatch; - rtl::OUString m_aSystemDefaultPaper; + OUString m_aSystemDefaultPaper; bool m_bDisableCUPS; @@ -154,21 +154,21 @@ public: Type getType() const { return m_eType; } // lists the names of all known printers - void listPrinters( std::list< rtl::OUString >& rList ) const; + void listPrinters( std::list< OUString >& rList ) const; // gets the number of known printers int countPrinters() const { return m_aPrinters.size(); } // gets info about a named printer - const PrinterInfo& getPrinterInfo( const rtl::OUString& rPrinter ) const; + const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const; // gets the name of the default printer - const rtl::OUString& getDefaultPrinter() const { return m_aDefaultPrinter; } + const OUString& getDefaultPrinter() const { return m_aDefaultPrinter; } virtual void setupJobContextData( JobData& rData ); // changes the info about a named printer - virtual void changePrinterInfo( const rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ); // check if the printer configuration has changed // if bwait is true, then this method waits for eventual asynchronous @@ -180,14 +180,14 @@ public: // add a named printer // addPrinter fails if a printer with the same name already exists // or the driver does not exist - virtual bool addPrinter( const rtl::OUString& rPrinterName, const rtl::OUString& rDriverName ); + virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ); // remove a named printer // this fails if the config file belonging to this printer // is not writeable // if bCheckOnly is true, the printer is not really removed; // this is for checking if the removal would fail - virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false ); + virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ); // save the changes to all printers. this fails if there // is no writable config file at all @@ -195,24 +195,24 @@ public: // set a new default printer // fails if the specified printer does not exist - virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName ); + virtual bool setDefaultPrinter( const OUString& rPrinterName ); // primarily used internally but also by padmin // returns the printer queue names virtual const std::list< SystemPrintQueue >& getSystemPrintQueues(); // similar but returnse whole commandlines - virtual void getSystemPrintCommands( std::list< rtl::OUString >& rCommands ); + virtual void getSystemPrintCommands( std::list< OUString >& rCommands ); // abstract print command // returns a stdio FILE* that a postscript file may be written to // this may either be a regular file or the result of popen() - virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); + virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); // close the FILE* returned by startSpool and does the actual spooling // set bBanner to "false" will attempt to suppress banner printing // set bBanner to "true" will rely on the system default // returns a numerical job id - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); + virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); // for spadmin: whether adding or removing a printer is possible virtual bool addOrRemovePossible() const; @@ -221,7 +221,7 @@ public: bool getUseJobPatch() const { return m_bUseJobPatch; } // check whether a printer's feature string contains a subfeature - bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const; + bool checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const; // set m_bDisableCUPS and update printer config void setCUPSDisabled( bool ); diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index ebb42c365c4d..19dc20f3ba12 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -835,7 +835,7 @@ public: void SetPreferredSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; } - void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); + void SetPreferredSymbolsStyleName( const OUString &rName ); sal_uLong GetPreferredSymbolsStyle() const { return mpData->mnPreferredSymbolsStyle; } // check whether the symbols style is supported (icons are installed) @@ -844,11 +844,11 @@ public: sal_uLong GetCurrentSymbolsStyle() const; - void SetSymbolsStyleName( const ::rtl::OUString &rName ) + void SetSymbolsStyleName( const OUString &rName ) { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); } - ::rtl::OUString GetSymbolsStyleName() const + OUString GetSymbolsStyleName() const { return ImplSymbolsStyleToName( GetSymbolsStyle() ); } - ::rtl::OUString GetCurrentSymbolsStyleName() const + OUString GetCurrentSymbolsStyleName() const { return ImplSymbolsStyleToName( GetCurrentSymbolsStyle() ); } const Wallpaper& GetWorkspaceGradient() const @@ -877,8 +877,8 @@ public: { return !(*this == rSet); } protected: - ::rtl::OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; - sal_uLong ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; + OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; + sal_uLong ImplNameToSymbolsStyle( const OUString &rName ) const; }; // ---------------- diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index 4d38a2ea9dc0..4a902d17aeaa 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -101,7 +101,7 @@ public: const Link& GetLastHdl() const { return maLastHdlLink; } virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const; + virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const; virtual Size CalcSize( sal_uInt16 nChars ) const; }; diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 70ea7d65a62a..91aa97113179 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -160,8 +160,8 @@ public: using Window::GetQuickHelpText; const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; void StartProgressMode( const XubString& rText ); void SetProgressValue( sal_uInt16 nPercent ); @@ -175,9 +175,9 @@ public: const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Window::GetHelpId(); } Size CalcWindowSizePixel() const; diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx index 9a560d3b0bed..0d0949a3515f 100644 --- a/vcl/inc/vcl/strhelper.hxx +++ b/vcl/inc/vcl/strhelper.hxx @@ -29,16 +29,16 @@ namespace psp { VCL_DLLPUBLIC String GetCommandLineToken( int, const String& ); - VCL_DLLPUBLIC rtl::OString GetCommandLineToken(int, const rtl::OString&); + VCL_DLLPUBLIC OString GetCommandLineToken(int, const OString&); // gets one token of a unix command line style string // doublequote, singlequote and singleleftquote protect their respective // contents - VCL_DLLPUBLIC int GetCommandLineTokenCount(const rtl::OUString&); + VCL_DLLPUBLIC int GetCommandLineTokenCount(const OUString&); // returns number of tokens (zero if empty or whitespace only) VCL_DLLPUBLIC String WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True ); - VCL_DLLPUBLIC rtl::OString WhitespaceToSpace(const rtl::OString&, sal_Bool bProtect = sal_True); + VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, sal_Bool bProtect = sal_True); // returns a string with multiple adjacent occurrences of whitespace // converted to a single space. if bProtect is sal_True (nonzero), then // doublequote, singlequote and singleleftquote protect their respective @@ -51,7 +51,7 @@ namespace psp return rtl::math::stringToDouble(rStr, sal_Unicode('.'), sal_Unicode(0)); } - VCL_DLLPUBLIC inline double StringToDouble(const rtl::OString& rStr) + VCL_DLLPUBLIC inline double StringToDouble(const OString& rStr) { return rtl::math::stringToDouble(rStr, '.', static_cast<sal_Char>(0)); } @@ -61,7 +61,7 @@ namespace psp // returns the string len VCL_DLLPUBLIC inline int getValueOfDouble( char* pBuffer, double f, int nPrecision = 0) { - rtl::OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) ); + OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) ); int nLen = aStr.getLength(); std::strncpy( pBuffer, aStr.getStr(), nLen+1 ); // copy string including terminating zero return nLen; diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index e605f57e993c..3198a3d3be56 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -101,17 +101,17 @@ public: ApplicationEvent() {} explicit ApplicationEvent( - Type rEvent, const rtl::OUString& rData = rtl::OUString()): + Type rEvent, const OUString& rData = OUString()): aEvent(rEvent), aData(rData) {} Type GetEvent() const { return aEvent; } - const rtl::OUString& GetData() const { return aData; } + const OUString& GetData() const { return aData; } private: Type aEvent; - rtl::OUString aData; + OUString aData; }; @@ -348,7 +348,7 @@ public: /** Returns a string representing the desktop environment the process is currently running in. */ - static const ::rtl::OUString& GetDesktopEnvironment(); + static const OUString& GetDesktopEnvironment(); /** Add a file to the system shells recent document list if there is any. This function may have no effect under Unix because there is no @@ -362,7 +362,7 @@ public: If an empty string will be provided "application/octet-stream" will be used. */ - static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + static void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); /** Do we have a native / system file selector available ? */ diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx index 8de8d3a6bfa1..dccb08f8c579 100644 --- a/vcl/inc/vcl/svgdata.hxx +++ b/vcl/inc/vcl/svgdata.hxx @@ -53,7 +53,7 @@ private: sal_uInt32 mnSvgDataArrayLength; // The absolute Path if available - rtl::OUString maPath; + OUString maPath; // on demand created content basegfx::B2DRange maRange; @@ -65,13 +65,13 @@ private: void ensureSequenceAndRange(); public: - SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath); - SvgData(const rtl::OUString& rPath); + SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath); + SvgData(const OUString& rPath); /// data read const SvgDataArray& getSvgDataArray() const { return maSvgDataArray; } sal_uInt32 getSvgDataArrayLength() const { return mnSvgDataArrayLength; } - const rtl::OUString& getPath() const { return maPath; } + const OUString& getPath() const { return maPath; } /// data read and evtl. on demand creation const basegfx::B2DRange& getRange() const; diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index 1ec1f8876126..07661431a94a 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -188,7 +188,7 @@ public: sal_uInt16 GetIcon() const { return mnIcon; } // for systems like MacOSX which can display the URL a document is loaded from // separately from the window title - void SetRepresentedURL( const rtl::OUString& ); + void SetRepresentedURL( const OUString& ); void EnableSaveBackground( sal_Bool bSave = sal_True ); sal_Bool IsSaveBackgroundEnabled() const; @@ -212,8 +212,8 @@ public: const Size& GetMaxOutputSizePixel() const; Size GetResizeOutputSizePixel() const; - void SetWindowState(const rtl::OString& rStr); - rtl::OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const; + void SetWindowState(const OString& rStr); + OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const; void SetMenuBar( MenuBar* pMenuBar ); MenuBar* GetMenuBar() const { return mpMenuBar; } @@ -259,7 +259,7 @@ public: */ void SetScreenNumber( unsigned int nNewScreen ); - void SetApplicationID( const rtl::OUString &rApplicationID ); + void SetApplicationID( const OUString &rApplicationID ); void SetCloseHdl(const Link& rLink); const Link& GetCloseHdl() const; diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index f2928d9cadd9..05b8313b537b 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -167,9 +167,9 @@ public: const XubString& GetHelpText() const { return Control::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Control::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Control::GetHelpId(); } void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx index b6462b60b545..7555f3f01701 100644 --- a/vcl/inc/vcl/tabdlg.hxx +++ b/vcl/inc/vcl/tabdlg.hxx @@ -46,7 +46,7 @@ public: TabDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); TabDialog( Window* pParent, const ResId& rResId ); - TabDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ); diff --git a/vcl/inc/vcl/textview.hxx b/vcl/inc/vcl/textview.hxx index e6147c0657f1..314e30fa4f1e 100644 --- a/vcl/inc/vcl/textview.hxx +++ b/vcl/inc/vcl/textview.hxx @@ -82,7 +82,7 @@ protected: void ImpHideDDCursor(); void ImpShowDDCursor(); - bool ImplTruncateNewText( rtl::OUString& rNewText ) const; + bool ImplTruncateNewText( OUString& rNewText ) const; sal_Bool ImplCheckTextLen( const String& rNewText ); VirtualDevice* GetVirtualDevice(); @@ -125,7 +125,7 @@ public: String GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertNewText( const rtl::OUString& rNew, sal_Bool bSelect = sal_False ); + void InsertNewText( const OUString& rNew, sal_Bool bSelect = sal_False ); // deprecated: use InsertNewText instead void InsertText( const String& rNew, sal_Bool bSelect = sal_False ); diff --git a/vcl/inc/vcl/throbber.hxx b/vcl/inc/vcl/throbber.hxx index c6563e44dd21..f2995d7555bc 100644 --- a/vcl/inc/vcl/throbber.hxx +++ b/vcl/inc/vcl/throbber.hxx @@ -66,7 +66,7 @@ public: void setImageList( ::std::vector< Image > const& i_images ); // default images - static ::std::vector< ::rtl::OUString > + static ::std::vector< OUString > getDefaultImageURLs( const ImageSet i_imageSet ); protected: diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index e0c3635f631f..6106bb1bf0ba 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -225,7 +225,7 @@ private: using Window::ImplInvalidate; SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); - SAL_DLLPRIVATE const rtl::OUString ImplConvertMenuString( const XubString& rStr ); + SAL_DLLPRIVATE const OUString ImplConvertMenuString( const XubString& rStr ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); @@ -442,8 +442,8 @@ public: void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); const XubString& GetHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel() const; @@ -490,9 +490,9 @@ public: const XubString& GetHelpText() const { return DockingWindow::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { DockingWindow::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return DockingWindow::GetHelpId(); } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx index abbece972bb6..91168436c3ad 100644 --- a/vcl/inc/vcl/unohelp.hxx +++ b/vcl/inc/vcl/unohelp.hxx @@ -54,7 +54,7 @@ VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakI VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification(); //Get access to singleton Natural String Sorter collating for Application::GetLocale VCL_DLLPUBLIC const comphelper::string::NaturalStringSorter& getNaturalStringSorterForAppLocale(); -VCL_DLLPUBLIC ::rtl::OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); +VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); }} // namespace vcl::unohelper diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx index 353cc94f203c..63caa3b4c352 100644 --- a/vcl/inc/vcl/vclmedit.hxx +++ b/vcl/inc/vcl/vclmedit.hxx @@ -129,7 +129,7 @@ public: void SetTextSelectable( sal_Bool bTextSelectable ); void EnableCursor( sal_Bool bEnable ); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index fda621f83734..04bd8299a317 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -326,7 +326,7 @@ class VclSizeGroup; struct WindowResHeader { sal_uLong nObjMask; - rtl::OString aHelpId; + OString aHelpId; sal_uLong nRSStyle; }; @@ -929,11 +929,11 @@ public: void SetQuickHelpText( const XubString& rHelpText ); const XubString& GetQuickHelpText() const; - void SetHelpId( const rtl::OString& ); - const rtl::OString& GetHelpId() const; + void SetHelpId( const OString& ); + const OString& GetHelpId() const; - void SetUniqueId( const rtl::OString& ); - const rtl::OString& GetUniqueId() const; + void SetUniqueId( const OString& ); + const OString& GetUniqueId() const; Window* FindWindow( const Point& rPos ) const; @@ -1210,14 +1210,14 @@ public: * * @return false if property is unknown */ - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); /* * Sets a font attribute * * @return false if attribute is unknown */ - bool set_font_attribute(const rtl::OString &rKey, const rtl::OString &rValue); + bool set_font_attribute(const OString &rKey, const OString &rValue); /* * Adds this widget to the xGroup VclSizeGroup @@ -1269,7 +1269,7 @@ public: void SimulateKeyPress( sal_uInt16 nKeyCode ) const; - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; }; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index b35e3be60044..436144833edb 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -160,7 +160,7 @@ void ImplClearHDCCache( SalData* pData ); HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp = 0 ); void ImplReleaseCachedDC( sal_uLong nID ); -bool ImplAddTempFont( SalData&, const rtl::OUString& rFontFileURL ); +bool ImplAddTempFont( SalData&, const OUString& rFontFileURL ); void ImplReleaseTempFonts( SalData& ); HCURSOR ImplLoadSalCursor( int nId ); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 2a622195f37d..4076d61451d3 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -90,7 +90,7 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); @@ -117,7 +117,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -129,7 +129,7 @@ public: virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rApplicationID ); + virtual void SetApplicationID( const OUString &rApplicationID ); virtual void ResetClipRegion(); virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); @@ -140,8 +140,8 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ); // get foreign key names namespace vcl_sal { - rtl::OUString getKeysReplacementName( - rtl::OUString pLang, + OUString getKeysReplacementName( + OUString pLang, LONG nSymbol ); } diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index dca9497efd3a..b26671b10985 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -241,9 +241,9 @@ protected: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); virtual bool drawAlphaBitmap( const SalTwoRect&, @@ -299,7 +299,7 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -312,7 +312,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, long* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index e73070020b8c..5c3b0382870c 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -54,7 +54,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual SalTimer* CreateSalTimer(); virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); @@ -72,7 +72,7 @@ public: virtual void DestroyMenuItem( SalMenuItem* ); virtual SalSession* CreateSalSession(); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); }; diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index ff31f0531de1..67cffcfdb1f7 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -37,9 +37,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); HMENU mhMenu; // the menu handle diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 4911ce0f3d3a..d33716b9413d 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -50,9 +50,9 @@ class WinSalInfoPrinter : public SalInfoPrinter { public: WinSalGraphics* mpGraphics; // current Printer graphics - rtl::OUString maDriverName; // printer driver name - rtl::OUString maDeviceName; // printer device name - rtl::OUString maPortName; // printer port name + OUString maDriverName; // printer driver name + OUString maDeviceName; // printer device name + OUString maPortName; // printer port name HDC mhDC; // printer hdc sal_Bool mbGraphics; // is Graphics used public: @@ -70,7 +70,7 @@ public: long& rPageWidth, long& rPageHeight ); virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -98,9 +98,9 @@ public: virtual ~WinSalPrinter(); using SalPrinter::StartJob; - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h index 3c0bdeb7fe92..9c80b0641bc2 100644 --- a/vcl/inc/win/salsys.h +++ b/vcl/inc/win/salsys.h @@ -30,15 +30,15 @@ class WinSalSystem : public SalSystem public: struct DisplayMonitor { - rtl::OUString m_aName; - rtl::OUString m_aDeviceName; + OUString m_aName; + OUString m_aDeviceName; Rectangle m_aArea; Rectangle m_aWorkArea; sal_Int32 m_nStateFlags; DisplayMonitor() : m_nStateFlags( 0 ) {} - DisplayMonitor( const rtl::OUString& rName, - const rtl::OUString& rDevName, + DisplayMonitor( const OUString& rName, + const OUString& rDevName, const Rectangle& rArea, const Rectangle& rWorkArea, DWORD nStateFlags ) @@ -53,7 +53,7 @@ class WinSalSystem : public SalSystem }; private: std::vector<DisplayMonitor> m_aMonitors; - std::map<rtl::OUString, unsigned int> m_aDeviceNameToMonitor; + std::map<OUString, unsigned int> m_aDeviceNameToMonitor; unsigned int m_nPrimary; public: WinSalSystem() : m_nPrimary( 0 ) {} @@ -63,9 +63,9 @@ public: virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); bool initMonitors(); diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 55511918a635..97401f20d460 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -274,8 +274,8 @@ public: long mnY; long mnAbsScreenX; Point maPos; - rtl::OString maHelpId; - rtl::OString maUniqId; + OString maHelpId; + OString maUniqId; XubString maHelpText; XubString maQuickHelpText; InputContext maInputContext; diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 5b695f22bc95..a0893af2716a 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -133,9 +133,9 @@ class IosSalSystem : public SvpSalSystem { public: IosSalSystem() : SvpSalSystem() {} virtual ~IosSalSystem() {} - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; @@ -176,7 +176,7 @@ public: virtual void UpdateSettings( AllSettings &rSettings ) { // Clobber the UI fonts - Font aFont( rtl::OUString( "Helvetica" ), Size( 0, 14 ) ); + Font aFont( OUString( "Helvetica" ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); @@ -251,9 +251,9 @@ void DestroySalInstance( SalInstance *pInst ) delete pInst; } -int IosSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, +int IosSalSystem::ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) { (void)rButtons; diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 3af6955cbe7c..a480856a0fba 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -24,10 +24,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; PrinterInfoManager& PrinterInfoManager::get() { @@ -141,7 +137,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get return m_aSystemPrintQueues; } -bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& /* rPrinterName */, const char* /* pToken */ ) const +bool PrinterInfoManager::checkFeatureToken( const OUString& /* rPrinterName */, const char* /* pToken */ ) const { return false; } diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index bec3cc0d9c6d..8c57bc4e924e 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -46,8 +46,8 @@ class VclFiltersTest public: VclFiltersTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -60,8 +60,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool VclFiltersTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool VclFiltersTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { GraphicFilter aGraphicFilter(false); @@ -73,33 +73,33 @@ bool VclFiltersTest::load(const rtl::OUString &, void VclFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"), - rtl::OUString()); + OUString()); #endif } diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx index 8319752016b6..390692c0ffc8 100644 --- a/vcl/quartz/utils.cxx +++ b/vcl/quartz/utils.cxx @@ -25,44 +25,44 @@ #include "quartz/utils.h" -rtl::OUString GetOUString( CFStringRef rStr ) +OUString GetOUString( CFStringRef rStr ) { if( rStr == 0 ) - return rtl::OUString(); + return OUString(); CFIndex nLength = CFStringGetLength( rStr ); if( nLength == 0 ) - return rtl::OUString(); + return OUString(); const UniChar* pConstStr = CFStringGetCharactersPtr( rStr ); if( pConstStr ) - return rtl::OUString( pConstStr, nLength ); + return OUString( pConstStr, nLength ); UniChar* pStr = reinterpret_cast<UniChar*>( rtl_allocateMemory( sizeof(UniChar)*nLength ) ); CFRange aRange = { 0, nLength }; CFStringGetCharacters( rStr, aRange, pStr ); - rtl::OUString aRet( pStr, nLength ); + OUString aRet( pStr, nLength ); rtl_freeMemory( pStr ); return aRet; } -rtl::OUString GetOUString( NSString* pStr ) +OUString GetOUString( NSString* pStr ) { if( ! pStr ) - return rtl::OUString(); + return OUString(); int nLen = [pStr length]; if( nLen == 0 ) - return rtl::OUString(); + return OUString(); - rtl::OUStringBuffer aBuf( nLen+1 ); + OUStringBuffer aBuf( nLen+1 ); aBuf.setLength( nLen ); [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())]; return aBuf.makeStringAndClear(); } -CFStringRef CreateCFString( const rtl::OUString& rStr ) +CFStringRef CreateCFString( const OUString& rStr ) { return CFStringCreateWithCharacters(kCFAllocatorDefault, rStr.getStr(), rStr.getLength() ); } -NSString* CreateNSString( const rtl::OUString& rStr ) +NSString* CreateNSString( const OUString& rStr ) { return [[NSString alloc] initWithCharacters: rStr.getStr() length: rStr.getLength()]; } diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 2729ae982263..00e3d031dd07 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -506,7 +506,7 @@ DbgWindow::DbgWindow() : SetOutputSizePixel( Size( 600, 480 ) ); if ( pData->aDbgWinState ) { - rtl::OString aState( pData->aDbgWinState ); + OString aState( pData->aDbgWinState ); SetWindowState( aState ); } @@ -520,7 +520,7 @@ DbgWindow::DbgWindow() : sal_Bool DbgWindow::Close() { // remember window position - rtl::OString aState( GetWindowState() ); + OString aState( GetWindowState() ); DbgData* pData = DbgGetData(); size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.getLength() + 1U )) ? sizeof( pData->aDbgWinState ) : size_t(aState.getLength() + 1U ); @@ -574,7 +574,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU ) { PopupMenu aMenu; - aMenu.InsertItem( 1, rtl::OUString("copy to clipboard") ); + aMenu.InsertItem( 1, OUString("copy to clipboard") ); Point aPos; if ( rCommand.IsMouseEvent() ) @@ -593,9 +593,9 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) GetAssertionEntryRange( maLstBox.GetSelectEntryPos(), nAssertionFirst, nAssertionLast ); // build the string to copy to the clipboard - rtl::OUStringBuffer sAssertion; - rtl::OUString sLineFeed = convertLineEnd( - rtl::OUString("\n"), + OUStringBuffer sAssertion; + OUString sLineFeed = convertLineEnd( + OUString("\n"), GetSystemLineEnd()); while ( nAssertionFirst < nAssertionLast ) { @@ -782,7 +782,7 @@ DbgDialog::DbgDialog() : { maDebugName.Show(); - maDebugName.SetText(rtl::OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8)); + maDebugName.SetText(OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8)); maDebugName.SetMaxTextLen( sizeof( pData->aDebugName ) ); maDebugName.SetPosSizePixel( LogicToPixel( Point( 10, 130 ), aAppMap ), LogicToPixel( Size( 185, 14 ), aAppMap ) ); @@ -815,7 +815,7 @@ DbgDialog::DbgDialog() : { maInclClassFilter.Show(); - maInclClassFilter.SetText(rtl::OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8)); + maInclClassFilter.SetText(OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8)); maInclClassFilter.SetMaxTextLen( sizeof( pData->aInclClassFilter ) ); maInclClassFilter.SetPosSizePixel( LogicToPixel( Point( 10, 160 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -830,7 +830,7 @@ DbgDialog::DbgDialog() : { maExclClassFilter.Show(); - maExclClassFilter.SetText(rtl::OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8)); + maExclClassFilter.SetText(OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8)); maExclClassFilter.SetMaxTextLen( sizeof( pData->aExclClassFilter ) ); maExclClassFilter.SetPosSizePixel( LogicToPixel( Point( 115, 160 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -845,7 +845,7 @@ DbgDialog::DbgDialog() : { maInclFilter.Show(); - maInclFilter.SetText(rtl::OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8)); + maInclFilter.SetText(OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8)); maInclFilter.SetMaxTextLen( sizeof( pData->aInclFilter ) ); maInclFilter.SetPosSizePixel( LogicToPixel( Point( 10, 190 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -860,7 +860,7 @@ DbgDialog::DbgDialog() : { maExclFilter.Show(); - maExclFilter.SetText(rtl::OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8)); + maExclFilter.SetText(OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8)); maExclFilter.SetMaxTextLen( sizeof( pData->aExclFilter ) ); maExclFilter.SetPosSizePixel( LogicToPixel( Point( 115, 190 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -993,11 +993,11 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) aData.nWarningOut = ImplGetChannelId( maWarningBox, 0 ); aData.nErrorOut = ImplGetChannelId( maErrorBox, mnErrorOff ); - strncpy( aData.aDebugName, rtl::OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) ); - strncpy( aData.aInclClassFilter, rtl::OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) ); - strncpy( aData.aExclClassFilter, rtl::OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) ); - strncpy( aData.aInclFilter, rtl::OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) ); - strncpy( aData.aExclFilter, rtl::OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) ); + strncpy( aData.aDebugName, OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) ); + strncpy( aData.aInclClassFilter, OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) ); + strncpy( aData.aExclClassFilter, OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) ); + strncpy( aData.aInclFilter, OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) ); + strncpy( aData.aExclFilter, OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) ); aData.aDebugName[sizeof( aData.aDebugName )-1] = '\0'; aData.aInclClassFilter[sizeof( aData.aInclClassFilter )-1] = '\0'; aData.aExclClassFilter[sizeof( aData.aExclClassFilter )-1] = '\0'; @@ -1066,7 +1066,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) } if( (aData.nTestFlags & ~IMMEDIATE_FLAGS) != (pData->nTestFlags & ~IMMEDIATE_FLAGS) ) { - InfoBox aBox( this, rtl::OUString( + InfoBox aBox( this, OUString( "Some of the changed settings will only be active after " "restarting the process" ) ); @@ -1296,7 +1296,7 @@ void DbgDialogTest( Window* pWindow ) DbgOutTypef( DBG_OUT_ERROR, "%s should have a mnemonic char (~): %s", pClass, - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); // check text width int aWidth=0; @@ -1319,7 +1319,7 @@ void DbgDialogTest( Window* pWindow ) DbgOutTypef( DBG_OUT_ERROR, "%s exceeds window width: %s", pClass, - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -1328,7 +1328,7 @@ void DbgDialogTest( Window* pWindow ) if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) ) DbgOutTypef( DBG_OUT_ERROR, "FixedLine exceeds window width: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( pChild->GetType() == WINDOW_FIXEDTEXT ) @@ -1338,7 +1338,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "FixedText greater than one line, but WordBreak is not set: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( pChild->IsVisible() ) @@ -1356,7 +1356,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "FixedText exceeds window width: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -1386,13 +1386,13 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( !pTempChild->IsEnabled() && pChild->IsEnabled() ) { DbgOutTypef( DBG_OUT_ERROR, "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } } @@ -1481,7 +1481,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "No Max-Value is set: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( (pChild->GetType() == WINDOW_RADIOBUTTON) || @@ -1524,7 +1524,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Possible wrong childorder for dialogcontrol: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } aTabPos = aNewPos; } @@ -1536,7 +1536,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Window overlaps with sibling window: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } pRectAry[i] = aChildRect; @@ -1565,7 +1565,7 @@ class DbgMessageBox : public ErrorBox m_aMessage( rMessage ) { SetText("Debug Output"); - AddButton(rtl::OUString("Copy"), COPY_BUTTON_ID, 0); + AddButton(OUString("Copy"), COPY_BUTTON_ID, 0); } virtual void Click() @@ -1737,7 +1737,7 @@ void DbgPrintWindow( const char* pLine ) void DbgAbort( char const * i_message ) { - ::rtl::OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() ); + OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() ); Application::Abort( message ); } diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 1ed6efceaa48..95d1f5a32de9 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -100,7 +100,7 @@ inline bool is_formatting_mark( sal_Unicode c ) String vcl::I18nHelper::filterFormattingChars( const String& rStr ) { sal_Int32 nUnicodes = rStr.Len(); - rtl::OUStringBuffer aBuf( nUnicodes ); + OUStringBuffer aBuf( nUnicodes ); const sal_Unicode* pStr = rStr.GetBuffer(); while( nUnicodes-- ) { @@ -111,7 +111,7 @@ String vcl::I18nHelper::filterFormattingChars( const String& rStr ) return aBuf.makeStringAndClear(); } -sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const +sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& rStr2 ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); @@ -130,7 +130,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl: return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); } -sal_Bool vcl::I18nHelper::MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const +sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); @@ -157,7 +157,7 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& rString, sal_Unicode cMne if ( n != STRING_NOTFOUND ) { String aMatchStr( rString, n+1, STRING_LEN ); // not only one char, because of transliteration... - bEqual = MatchString( rtl::OUString(cMnemonicChar), aMatchStr ); + bEqual = MatchString( OUString(cMnemonicChar), aMatchStr ); } return bEqual; } diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 00baac95ac45..6601446e97f2 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -47,7 +47,7 @@ void SalFrame::Flush( const Rectangle& ) // ----------------------------------------------------------------------- -void SalFrame::SetRepresentedURL( const rtl::OUString& ) +void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } @@ -58,7 +58,7 @@ SalInstance::~SalInstance() { } -void SalInstance::FillFontPathList( std::list< rtl::OString >& ) +void SalInstance::FillFontPathList( std::list< OString >& ) { // do nothing } @@ -106,7 +106,7 @@ SalPrinter::~SalPrinter() { } -sal_Bool SalPrinter::StartJob( const rtl::OUString*, const rtl::OUString&, const rtl::OUString&, +sal_Bool SalPrinter::StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, vcl::PrinterController& ) { return sal_False; diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 728a1df66ef2..9c0f30b84fbb 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; -using ::rtl::OUString; SalSession::~SalSession() { @@ -341,7 +340,7 @@ OUString SAL_CALL vcl_session_getImplementationName() return OUString( "com.sun.star.frame.VCLSessionManagerClient" ); } -Sequence< rtl::OUString > SAL_CALL vcl_session_getSupportedServiceNames() +Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames() { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.frame.SessionManagerClient"; diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index adbadbe2ffb4..631b2e12f8a9 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -354,7 +354,7 @@ void ImplStyleData::SetStandardStyles() Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) ); aStdFont.SetCharSet( osl_getThreadTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); - aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( "en" ), rtl::OUString(), rtl::OUString() ) ) ); + aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( OUString( "en" ), OUString(), OUString() ) ) ); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -501,45 +501,45 @@ void StyleSettings::Set3DColors( const Color& rColor ) // ----------------------------------------------------------------------- -::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const +OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const { switch ( nStyle ) { - case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString("default"); - case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString("hicontrast"); - case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString("tango"); // industrial is dead - case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString("crystal"); - case STYLE_SYMBOLS_TANGO: return ::rtl::OUString("tango"); - case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen"); - case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic"); - case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human"); - case STYLE_SYMBOLS_TANGO_TESTING: return ::rtl::OUString("tango_testing"); + case STYLE_SYMBOLS_DEFAULT: return OUString("default"); + case STYLE_SYMBOLS_HICONTRAST: return OUString("hicontrast"); + case STYLE_SYMBOLS_INDUSTRIAL: return OUString("tango"); // industrial is dead + case STYLE_SYMBOLS_CRYSTAL: return OUString("crystal"); + case STYLE_SYMBOLS_TANGO: return OUString("tango"); + case STYLE_SYMBOLS_OXYGEN: return OUString("oxygen"); + case STYLE_SYMBOLS_CLASSIC: return OUString("classic"); + case STYLE_SYMBOLS_HUMAN: return OUString("human"); + case STYLE_SYMBOLS_TANGO_TESTING: return OUString("tango_testing"); } - return ::rtl::OUString("auto"); + return OUString("auto"); } // ----------------------------------------------------------------------- -sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const +sal_uLong StyleSettings::ImplNameToSymbolsStyle( const OUString &rName ) const { - if ( rName == ::rtl::OUString("default") ) + if ( rName == OUString("default") ) return STYLE_SYMBOLS_DEFAULT; - else if ( rName == ::rtl::OUString("hicontrast") ) + else if ( rName == OUString("hicontrast") ) return STYLE_SYMBOLS_HICONTRAST; - else if ( rName == ::rtl::OUString("industrial") ) + else if ( rName == OUString("industrial") ) return STYLE_SYMBOLS_TANGO; // industrial is dead - else if ( rName == ::rtl::OUString("crystal") ) + else if ( rName == OUString("crystal") ) return STYLE_SYMBOLS_CRYSTAL; - else if ( rName == ::rtl::OUString("tango") ) + else if ( rName == OUString("tango") ) return STYLE_SYMBOLS_TANGO; - else if ( rName == ::rtl::OUString("oxygen") ) + else if ( rName == OUString("oxygen") ) return STYLE_SYMBOLS_OXYGEN; - else if ( rName == ::rtl::OUString("classic") ) + else if ( rName == OUString("classic") ) return STYLE_SYMBOLS_CLASSIC; - else if ( rName == ::rtl::OUString("human") ) + else if ( rName == OUString("human") ) return STYLE_SYMBOLS_HUMAN; - else if ( rName == ::rtl::OUString("tango_testing") ) + else if ( rName == OUString("tango_testing") ) return STYLE_SYMBOLS_TANGO_TESTING; return STYLE_SYMBOLS_AUTO; @@ -553,11 +553,11 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) we check if any registered style name is a case-insensitive substring of the preferred style name. */ -void StyleSettings::SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ) +void StyleSettings::SetPreferredSymbolsStyleName( const OUString &rName ) { if ( !rName.isEmpty() ) { - ::rtl::OUString rNameLowCase( rName.toAsciiLowerCase() ); + OUString rNameLowCase( rName.toAsciiLowerCase() ); for( sal_uInt32 n = 0; n <= STYLE_SYMBOLS_THEMES_MAX; n++ ) if ( rNameLowCase.indexOf( ImplSymbolsStyleToName( n ) ) != -1 ) @@ -621,7 +621,7 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const sal_uLong StyleSettings::GetAutoSymbolsStyle() const { - rtl::OUString const & env = Application::GetDesktopEnvironment(); + OUString const & env = Application::GetDesktopEnvironment(); sal_uLong nRet; if ( env.equalsIgnoreAsciiCase("tde") || @@ -1047,10 +1047,10 @@ sal_Bool MiscSettings::GetDisablePrinting() const { if( mpData->mnDisablePrinting == (sal_uInt16)~0 ) { - rtl::OUString aEnable = + OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( "DesktopManagement" ), - rtl::OUString( "DisablePrinting" ) ); + getValue( OUString( "DesktopManagement" ), + OUString( "DisablePrinting" ) ); mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; } @@ -1103,10 +1103,10 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" ); if( !pEnv || !*pEnv ) { - rtl::OUString aEnable = + OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( "Accessibility" ), - rtl::OUString( "EnableATToolSupport" ) ); + getValue( OUString( "Accessibility" ), + OUString( "EnableATToolSupport" ) ); mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; } else @@ -1164,9 +1164,9 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) } vcl::SettingsConfigItem::get()-> - setValue( rtl::OUString( "Accessibility" ), - rtl::OUString( "EnableATToolSupport" ), - bEnable ? rtl::OUString("true") : rtl::OUString("false" ) ); + setValue( OUString( "Accessibility" ), + OUString( "EnableATToolSupport" ), + bEnable ? OUString("true") : OUString("false" ) ); mpData->mnEnableATT = bEnable ? 1 : 0; } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1692170517f0..b5acabe1fcc7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -211,7 +211,7 @@ Application* GetpApp() Application::Application() { // useful for themes at least, perhaps extensions too - rtl::OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED); + OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED); osl_setEnvironment(aVar.pData, aValue.pData); if( ! ImplGetSVData() ) @@ -289,7 +289,7 @@ sal_uInt16 Application::GetCommandLineParamCount() XubString Application::GetCommandLineParam( sal_uInt16 nParam ) { - rtl::OUString aParam; + OUString aParam; osl_getCommandArg( nParam, &aParam.pData ); return aParam; } @@ -310,11 +310,11 @@ const XubString& Application::GetAppFileName() static String aAppFileName; if( !aAppFileName.Len() ) { - rtl::OUString aExeFileName; + OUString aExeFileName; osl_getExecutableFile( &aExeFileName.pData ); // convert path to native file format - rtl::OUString aNativeFileName; + OUString aNativeFileName; osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); aAppFileName = aNativeFileName; } @@ -338,17 +338,17 @@ sal_uInt16 Application::Exception( sal_uInt16 nError ) #ifdef DBG_UTIL case EXC_RSCNOTLOADED: - Abort(rtl::OUString("Resource not loaded")); + Abort(OUString("Resource not loaded")); break; case EXC_SYSOBJNOTCREATED: - Abort(rtl::OUString("System Object not created")); + Abort(OUString("System Object not created")); break; default: - Abort(rtl::OUString("Unknown Error")); + Abort(OUString("Unknown Error")); break; #else default: - Abort(rtl::OUString()); + Abort(OUString()); break; #endif } @@ -1600,7 +1600,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) { #ifndef DISABLE_DYNLOADING - ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( + OUString aLibName = ::vcl::unohelper::CreateLibraryName( #ifdef LIBO_MERGELIBS "merged", #else @@ -1758,7 +1758,7 @@ bool Application::IsHeadlessModeRequested() { sal_uInt32 n = rtl_getAppCommandArgCount(); for (sal_uInt32 i = 0; i < n; ++i) { - rtl::OUString arg; + OUString arg; rtl_getAppCommandArg(i, &arg.pData); if ( arg == "--headless" || arg == "-headless" ) { return true; @@ -1812,12 +1812,12 @@ bool Application::GetShowImeStatusWindowDefault() && aInfo.MaximumCharSize > 1; } -const ::rtl::OUString& Application::GetDesktopEnvironment() +const OUString& Application::GetDesktopEnvironment() { return SalGetDesktopEnvironment(); } -void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) +void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index f919af686e6d..feec982e32b4 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -57,7 +57,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::awt; -using ::rtl::OUString; // ======================================================================= @@ -79,7 +78,7 @@ SalSystem* ImplGetSalSystem() } -static rtl::OUString ReplaceJavaErrorMessages( const rtl::OUString& rString ) +static OUString ReplaceJavaErrorMessages( const OUString& rString ) { return rString.replaceAll("%OK", Button::GetStandardText(BUTTON_OK)). replaceAll("%IGNORE", Button::GetStandardText(BUTTON_IGNORE)). @@ -186,7 +185,7 @@ ResMgr* ImplGetResMgr() "Missing vcl resource. This indicates that files vital to localization are missing. " "You might have a corrupt installation."; fprintf( stderr, "%s\n", pMsg ); - ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, rtl::OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) ); + ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) ); aBox.Execute(); } } @@ -237,7 +236,7 @@ FieldUnitStringList* ImplGetCleanedFieldUnits() pSVData->maCtrlData.mpCleanUnitStrings->reserve( nUnits ); for( size_t i = 0; i < nUnits; ++i ) { - rtl::OUString aUnit( (*pUnits)[i].first ); + OUString aUnit( (*pUnits)[i].first ); aUnit = comphelper::string::remove(aUnit, ' '); aUnit = aUnit.toAsciiLowerCase(); std::pair< String, FieldUnit > aElement( aUnit, (*pUnits)[i].second ); @@ -265,13 +264,13 @@ public: m_prevContext( context ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; }; -com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const rtl::OUString & Name ) +com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const OUString & Name ) throw (com::sun::star::uno::RuntimeException) { com::sun::star::uno::Any ret; @@ -347,8 +346,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString()); - rtl::OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString()); + OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -370,8 +369,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -393,8 +392,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -416,8 +415,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -439,8 +438,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && pResMgr ) { - rtl::OUString aTitle; - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString()); + OUString aTitle; + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString()); if( e.Message.startsWith("ClassNotFound") ) { diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 303c0999d5f8..f7533fdb5f05 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -81,7 +81,6 @@ #include "rtl/strbuf.hxx" #endif -using ::rtl::OUString; using namespace ::com::sun::star; // ======================================================================= @@ -217,14 +216,14 @@ public: : m_xNextContext( ctx ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; }; -uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const rtl::OUString& Name) throw (uno::RuntimeException) +uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException) { uno::Any retVal; @@ -284,11 +283,11 @@ sal_Bool InitVCL() pSVData->mpApp->Init(); // Fetch AppFileName and make it absolute before the workdir changes... - rtl::OUString aExeFileName; + OUString aExeFileName; osl_getExecutableFile( &aExeFileName.pData ); // convert path to native file format - rtl::OUString aNativeFileName; + OUString aNativeFileName; osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); pSVData->maAppData.mpAppFileName = new String( aNativeFileName ); @@ -362,7 +361,7 @@ void DeInitVCL() pSVData->mpImeStatus = NULL; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append( "DeInitVCL: some top Windows are still alive\n" ); long nTopWindowCount = Application::GetTopWindowCount(); long nBadTopWindows = nTopWindowCount; @@ -376,7 +375,7 @@ void DeInitVCL() else { aBuf.append( "text = \"" ); - aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) ); + aBuf.append( OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) ); aBuf.append( "\" type = \"" ); aBuf.append( typeid(*pWin).name() ); aBuf.append( "\", ptr = 0x" ); diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 3b15d25bd521..e5187c1d1dcc 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -45,7 +45,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() ); } -::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) +OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) { // create variable library name suffixes OUString aDLLSuffix = OUString::createFromAscii( SAL_STRINGIFY( DLLPOSTFIX ) ); @@ -58,7 +58,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte { aLibName += aDLLSuffix; } - aLibName += rtl::OUString( ".dll" ); + aLibName += OUString( ".dll" ); #else aLibName = OUString( "lib" ); aLibName += OUString::createFromAscii( pModName ); diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 9f1d9edf4df2..e2663669ef5c 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -77,7 +77,7 @@ namespace vcl { namespace unohelper { sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetString(); + aAny <<= (OUString)GetString(); } else { diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 18881de9e0cb..650fce07f7fc 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -43,7 +43,6 @@ #include "cppuhelper/compbase2.hxx" #include "cppuhelper/implbase1.hxx" -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -80,12 +79,12 @@ public: * XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); - static rtl::OUString getImplementationName_static(); - static Sequence< rtl::OUString > getSupportedServiceNames_static(); + static OUString getImplementationName_static(); + static Sequence< OUString > getSupportedServiceNames_static(); /* * XClipboard @@ -99,7 +98,7 @@ public: const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(RuntimeException); /* @@ -125,29 +124,29 @@ GenericClipboard::~GenericClipboard() { } -rtl::OUString GenericClipboard::getImplementationName_static() +OUString GenericClipboard::getImplementationName_static() { - return rtl::OUString( "com.sun.star.datatransfer.VCLGenericClipboard" ); + return OUString( "com.sun.star.datatransfer.VCLGenericClipboard" ); } -Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static() +Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"); return aRet; } -rtl::OUString GenericClipboard::getImplementationName() throw( RuntimeException ) +OUString GenericClipboard::getImplementationName() throw( RuntimeException ) { return getImplementationName_static(); } -Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException ) { return getSupportedServiceNames_static(); } -sal_Bool GenericClipboard::supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ) +sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) { Sequence< OUString > aServices( getSupportedServiceNames() ); sal_Int32 nServices = aServices.getLength(); @@ -190,9 +189,9 @@ void GenericClipboard::setContents( } } -rtl::OUString GenericClipboard::getName() throw( RuntimeException ) +OUString GenericClipboard::getName() throw( RuntimeException ) { - return rtl::OUString( "CLIPBOARD" ); + return OUString( "CLIPBOARD" ); } sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException ) diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 9fefd4ba7233..5218c28efe7b 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/dllapi.h> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index e4187ccf7325..87be8e0995df 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -35,7 +35,6 @@ #include <cppuhelper/implbase3.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 29f98622dbf6..d21312d0d23f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1007,7 +1007,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( aCtrlType, PART_BUTTON_DOWN, aInRect, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } } } @@ -1062,7 +1062,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) if( ((nState & CTRL_STATE_ROLLOVER)) || ! (GetStyle() & WB_FLATBUTTON) ) { bNativeOK = DrawNativeControl( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString()/*PushButton::GetText()*/ ); + aControlValue, OUString()/*PushButton::GetText()*/ ); } else { @@ -1128,7 +1128,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet ) // get native size of a 'default' button // and adjust the VCL button if more space for adornment is required if( GetNativeControlRegion( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBound, aCont ) ) { dLeft = aCont.Left() - aBound.Left(); @@ -1707,7 +1707,7 @@ Size PushButton::GetOptimalSize() const return CalcMinimumSize(); } -bool PushButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool PushButton::set_property(const OString &rKey, const OString &rValue) { if (rKey == "has-default") { @@ -2036,7 +2036,7 @@ void RadioButton::ImplDrawRadioButtonState() nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRect, nState, - aControlValue,rtl::OUString() ); + aControlValue,OUString() ); } @@ -2838,7 +2838,7 @@ void RadioButton::SetState( sal_Bool bCheck ) } } -bool RadioButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool RadioButton::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SetState(toBool(rValue)); @@ -2901,7 +2901,7 @@ Size RadioButton::ImplGetRadioImageSize() const // get native size of a radio button if( pThis->GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { aSize = aContentRgn.GetSize(); @@ -3010,7 +3010,7 @@ void RadioButton::ImplSetMinimumNWFSize() // get native size of a radiobutton if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { Size aSize = aContentRgn.GetSize(); @@ -3203,7 +3203,7 @@ void CheckBox::ImplDrawCheckBoxState() nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } if ( bNativeOK == sal_False ) @@ -3786,7 +3786,7 @@ void CheckBox::SetState( TriState eState ) } } -bool CheckBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool CheckBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SetState(toBool(rValue) ? STATE_CHECK : STATE_NOCHECK); @@ -3835,7 +3835,7 @@ Size CheckBox::ImplGetCheckImageSize() const // get native size of a check box if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { aSize = aContentRgn.GetSize(); @@ -3923,7 +3923,7 @@ void CheckBox::ImplSetMinimumNWFSize() // get native size of a radiobutton if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { Size aSize = aContentRgn.GetSize(); @@ -4123,7 +4123,7 @@ void DisclosureButton::ImplDrawCheckBoxState() nState |= CTRL_STATE_ROLLOVER; if( ! DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ) ) + aControlValue, OUString() ) ) { ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData ); if( ! rCtrlData.mpDisclosurePlus ) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index cc8282030c46..9c8e3b806754 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -130,7 +130,7 @@ void ComboBox::ImplCalcEditHeight() if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, - aControlValue, rtl::OUString(), + aControlValue, OUString(), aBoundRegion, aContentRegion ) ) { const long nNCHeight = aBoundRegion.GetHeight(); @@ -1039,7 +1039,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { nButtonDownWidth = aContent.getWidth(); } @@ -1156,7 +1156,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const { - long nCharWidth = GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('x'))); + long nCharWidth = GetTextWidth(OUString(static_cast<sal_Unicode>('x'))); if ( !IsDropDownBox() ) { Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel(); @@ -1514,7 +1514,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz Rectangle aArea( aPoint, rBorderOutSz ); if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) ); @@ -1525,7 +1525,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz // adjust the size of the edit field if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aContent.Move(-aPoint.X(), -aPoint.Y()); @@ -1560,7 +1560,7 @@ void ComboBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ComboBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool ComboBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "max-width-chars") setMaxWidthChars(rValue.toInt32()); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index bde19723ca7b..ce26c501ad61 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -214,7 +214,7 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars) } } -bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool Edit::set_property(const OString &rKey, const OString &rValue) { if (rKey == "width-chars") SetWidthInChars(rValue.toInt32()); @@ -473,7 +473,7 @@ OUString Edit::ImplGetText() const cEchoChar = mcEchoChar; else cEchoChar = '*'; - rtl::OUStringBuffer aText; + OUStringBuffer aText; comphelper::string::padToLength(aText, maText.getLength(), cEchoChar); return aText.makeStringAndClear(); } @@ -808,7 +808,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI OUString Edit::ImplGetValidString( const OUString& rString ) const { - rtl::OUString aValidString( rString ); + OUString aValidString( rString ); aValidString = comphelper::string::remove(aValidString, _LF); aValidString = comphelper::string::remove(aValidString, _CR); aValidString = aValidString.replace('\t', ' '); @@ -854,7 +854,7 @@ void Edit::ShowTruncationWarning( Window* pParent ) // ----------------------------------------------------------------------- -bool Edit::ImplTruncateToMaxLen( rtl::OUString& rStr, sal_uInt32 nSelectionLen ) const +bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_uInt32 nSelectionLen ) const { bool bWasTruncated = false; const sal_uInt32 nMaxLen = mnMaxTextLen < 65534 ? mnMaxTextLen : 65534; @@ -951,7 +951,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B // the text that needs to be checked is only the one // before the current cursor position OUString aOldText( maText.getStr(), nTmpPos); - rtl::OUString aTmpText( aOldText ); + OUString aTmpText( aOldText ); if (bCTLSequenceCheckingTypeAndReplace) { xISC->correctInputSequence( aTmpText, nTmpPos - 1, cChar, nCheckMode ); @@ -1434,7 +1434,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; if( ImplTruncateToMaxLen( aText, maSelection.Len() ) ) ShowTruncationWarning( const_cast<Edit*>(this) ); @@ -1853,7 +1853,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) bDone = sal_True; // read characters also when in ReadOnly if ( !mbReadOnly ) { - ImplInsertText(rtl::OUString(rKEvt.GetCharCode()), 0, sal_True); + ImplInsertText(OUString(rKEvt.GetCharCode()), 0, sal_True); if ( maAutocompleteHdl.IsSet() ) { if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) ) @@ -2841,7 +2841,7 @@ void Edit::SetSubEdit( Edit* pEdit ) } } -Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const +Size Edit::CalcMinimumSizeForText(const OUString &rString) const { Size aSize; if (mnWidthInChars != -1) @@ -2870,7 +2870,7 @@ Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const Rectangle aContent, aBound; if( const_cast<Edit*>(this)->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, - aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aRect, 0, aControlValue, OUString(), aBound, aContent) ) { if( aBound.GetHeight() > aSize.Height() ) aSize.Height() = aBound.GetHeight(); @@ -2904,7 +2904,7 @@ Size Edit::CalcSize( xub_StrLen nChars ) const { // width for N characters, independent from content. // works only correct for fixed fonts, average otherwise - Size aSz( GetTextWidth( rtl::OUString('x') ), GetTextHeight() ); + Size aSz( GetTextWidth( OUString('x') ), GetTextHeight() ); aSz.Width() *= nChars; aSz.Width() += ImplGetExtraOffset() * 2; aSz = CalcWindowSize( aSz ); @@ -2917,7 +2917,7 @@ xub_StrLen Edit::GetMaxVisChars() const { const Window* pW = mpSubEdit ? mpSubEdit : this; long nOutWidth = pW->GetOutputSizePixel().Width(); - long nCharWidth = GetTextWidth( rtl::OUString('x') ); + long nCharWidth = GetTextWidth( OUString('x') ); return nCharWidth ? (xub_StrLen)(nOutWidth/nCharWidth) : 0; } @@ -3070,7 +3070,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& if ( xDataObj->isDataFlavorSupported( aFlavor ) ) { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; ImplInsertText( aText ); bChanges = sal_True; @@ -3101,7 +3101,7 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE for( sal_Int32 i = 0; i < nEle; i++ ) { sal_Int32 nIndex = 0; - rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex ); + OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex ); if ( aMimetype == "text/plain" ) { mpDDInfo->bIsStringSupported = sal_True; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 3dead80ca9ed..1ee47e1dbf24 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -94,7 +94,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, sal_Bool bCurrency = sal_False ) { OUString aStr = rStr; - rtl::OUStringBuffer aStr1, aStr2; + OUStringBuffer aStr1, aStr2; sal_Bool bNegative = sal_False; sal_Int32 nDecPos; @@ -226,7 +226,7 @@ static void ImplUpdateSeparatorString( String& io_rText, const String& rOldDecSep, const String& rNewDecSep, const String& rOldThSep, const String& rNewThSep ) { - rtl::OUStringBuffer aBuf( io_rText.Len() ); + OUStringBuffer aBuf( io_rText.Len() ); xub_StrLen nIndexDec = 0, nIndexTh = 0, nIndex = 0; const sal_Unicode* pBuffer = io_rText.GetBuffer(); @@ -810,7 +810,7 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) : Show(); } -bool NumericField::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool NumericField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "digits") SetDecimalDigits(rValue.toInt32()); @@ -935,15 +935,15 @@ namespace { Size calcMinimumSize(const SpinField &rSpinField, const NumericFormatter &rFormatter) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Int32 nTextLen; - nTextLen = rtl::OUString::valueOf(rFormatter.GetMin()).getLength(); + nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength(); string::padToLength(aBuf, nTextLen, '9'); Size aMinTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); - nTextLen = rtl::OUString::valueOf(rFormatter.GetMax()).getLength(); + nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength(); string::padToLength(aBuf, nTextLen, '9'); Size aMaxTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); @@ -1093,10 +1093,10 @@ static sal_Bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, // ----------------------------------------------------------------------- -static rtl::OUString ImplMetricGetUnitText(const rtl::OUString& rStr) +static OUString ImplMetricGetUnitText(const OUString& rStr) { // fetch unit text - rtl::OUStringBuffer aStr; + OUStringBuffer aStr; for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i) { sal_Unicode c = rStr[i]; @@ -1131,7 +1131,7 @@ static const OUString ImplMetricToString( FieldUnit rUnit ) return OUString(); } -static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString) +static FieldUnit ImplStringToMetric(const OUString &rMetricString) { FieldUnitStringList* pList = ImplGetCleanedFieldUnits(); if( pList ) @@ -1151,9 +1151,9 @@ static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString) // ----------------------------------------------------------------------- -static FieldUnit ImplMetricGetUnit(const rtl::OUString& rStr) +static FieldUnit ImplMetricGetUnit(const OUString& rStr) { - rtl::OUString aStr = ImplMetricGetUnitText( rStr ); + OUString aStr = ImplMetricGetUnitText( rStr ); return ImplStringToMetric( aStr ); } @@ -1714,11 +1714,11 @@ Size MetricField::CalcMinimumSize() const return calcMinimumSize(*this, *this); } -bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool MetricField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "format") { - maCustomUnitText = rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); + maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); meUnit = FUNIT_CUSTOM; } else if (rKey == "digits") diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 785358017e41..97ec32d6bb44 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -158,7 +158,7 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) try { - rtl::OUString aCharStr(cChar); + OUString aCharStr(cChar); nType = ImplGetCharClass()->getStringType( aCharStr, 0, aCharStr.getLength(), Application::GetSettings().GetLanguageTag().getLocale() ); } @@ -209,7 +209,7 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask ) (cEditMask == EDITMASK_UPPERALPHANUM) || ( cEditMask == EDITMASK_UPPERALLCHAR ) ) { - cChar = ImplGetCharClass()->toUpper(rtl::OUString(cChar), 0, 1, + cChar = ImplGetCharClass()->toUpper(OUString(cChar), 0, 1, Application::GetSettings().GetLanguageTag().getLocale())[0]; } return cChar; @@ -429,7 +429,7 @@ static void ImplPatternProcessStrictModify( Edit* pEdit, // ----------------------------------------------------------------------- -static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen nCursorPos) +static xub_StrLen ImplPatternLeftPos(const OString& rEditMask, xub_StrLen nCursorPos) { // search non-literal predecessor xub_StrLen nNewPos = nCursorPos; @@ -448,7 +448,7 @@ static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen n // ----------------------------------------------------------------------- -static xub_StrLen ImplPatternRightPos( const OUString& rStr, const rtl::OString& rEditMask, +static xub_StrLen ImplPatternRightPos( const OUString& rStr, const OString& rEditMask, sal_uInt16 nFormatFlags, sal_Bool bSameMask, sal_Int32 nCursorPos ) { @@ -1304,7 +1304,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, } } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } // ----------------------------------------------------------------------- @@ -2236,7 +2236,7 @@ static sal_Bool ImplTimeGetValue( const OUString& rStr, Time& rTime, // Search for separators if (!rLocaleDataWrapper.getTimeSep().isEmpty()) { - rtl::OUStringBuffer aSepStr(",.;:/"); + OUStringBuffer aSepStr(",.;:/"); if ( !bDuration ) aSepStr.append('-'); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 35a47f323e5d..c92685696899 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -215,7 +215,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); WinBits nWinStyle = GetStyle(); - rtl::OUString aText( GetText() ); + OUString aText( GetText() ); sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle ); Point aPos = rPos; @@ -449,7 +449,7 @@ void FixedText::setMinWidthChars(sal_Int32 nWidth) } } -bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool FixedText::set_property(const OString &rKey, const OString &rValue) { if (rKey == "max-width-chars") setMaxWidthChars(rValue.toInt32()); @@ -1213,7 +1213,7 @@ const Image& FixedImage::GetModeImage( ) const return maImage; } -bool FixedImage::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool FixedImage::set_property(const OString &rKey, const OString &rValue) { if (rKey == "pixbuf") { diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 73e5c5d9a774..9ab5da4e8ef3 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2662,7 +2662,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) // ----------------------------------------------------------------------- -void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep ) +void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) { sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False; @@ -2695,7 +2695,7 @@ void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep // ----------------------------------------------------------------------- -rtl::OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const +OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const { OUStringBuffer aEntries; for ( sal_uInt16 n = 0; n < GetEntryList()->GetMRUCount(); n++ ) @@ -2824,11 +2824,11 @@ void ImplWin::ImplDraw( bool bLayout ) { Rectangle aParentRect( Point( 0, 0 ), pWin->GetSizePixel() ); pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentRect, - nState, aControlValue, rtl::OUString() ); + nState, aControlValue, OUString() ); } bNativeOK = DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } if( IsEnabled() ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 52f28e8cd470..73d164909495 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -123,7 +123,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, { XubString aStr = rStr; XubString aStr1; - rtl::OUStringBuffer aStr2; + OUStringBuffer aStr2; sal_uInt16 nDecPos; sal_Bool bNegative = sal_False; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 89de20bb4bcf..0ee0cfce13a5 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -121,7 +121,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) Rectangle aBoundingRgn( aCtrlRegion ); Rectangle aContentRgn( aCtrlRegion ); if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { sal_Int32 nHeight = aBoundingRgn.GetHeight(); @@ -630,7 +630,7 @@ void ListBox::Resize() Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); if ( GetNativeControlRegion( CTRL_LISTBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { long nTop = 0; // Convert back from border space to local coordinates @@ -643,7 +643,7 @@ void ListBox::Resize() // Adjust the size of the edit field if ( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // Convert back from border space to local coordinates aContent.Move( -aPoint.X(), -aPoint.Y() ); @@ -1243,7 +1243,7 @@ Size ListBox::CalcMinimumSize() const Size aTestSize( 100, 20 ); Rectangle aArea( aPoint, aTestSize ); if( const_cast<ListBox*>(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // use the themes drop down size aSz.Width() += aTestSize.Width() - aContent.GetWidth(); @@ -1260,7 +1260,7 @@ Size ListBox::CalcMinimumSize() const Rectangle aRect( Point( 0, 0 ), aSz ); Rectangle aContent, aBound; if( const_cast<ListBox*>(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, OUString(), aBound, aContent) ) { if( aBound.GetHeight() > aSz.Height() ) aSz.Height() = aBound.GetHeight(); @@ -1352,7 +1352,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const // Width if ( nColumns ) - aSz.Width() = nColumns * GetTextWidth( rtl::OUString('X') ); + aSz.Width() = nColumns * GetTextWidth( OUString('X') ); else aSz.Width() = aMinSz.Width(); @@ -1374,7 +1374,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const { - long nCharWidth = GetTextWidth( rtl::OUString(static_cast<sal_Unicode>('x')) ); + long nCharWidth = GetTextWidth( OUString(static_cast<sal_Unicode>('x')) ); if ( !IsDropDownBox() ) { Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel(); @@ -1487,7 +1487,7 @@ void ListBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool ListBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SelectEntryPos(rValue.toInt32()); diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 36d038e101cb..d00944a06fc7 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -125,7 +125,7 @@ namespace vcl if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() ) { m_pData->sCurrentSearchString += c; - OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", rtl::OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); + OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); if ( m_pData->sCurrentSearchString.Len() == 1 ) { // first character in the search -> remmeber diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 8a85bb5c8874..b3bc40906139 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -28,7 +28,6 @@ #include "rtl/string.hxx" #include "tools/rc.h" -using ::rtl::OUString; /* #i77549# @@ -319,9 +318,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) if ( GetStyle() & WB_HORZ ) { if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) && + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) && GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) ) { maBtn1Rect = aBtn1Region; maBtn2Rect = aBtn2Region; @@ -336,7 +335,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) maTrackRect = aTrackRegion; else maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); @@ -360,9 +359,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) else { if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_UP, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) && + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) && GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_DOWN, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) ) { maBtn1Rect = aBtn1Region; maBtn2Rect = aBtn2Region; @@ -377,7 +376,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) maTrackRect = aTrackRegion; else maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); @@ -548,7 +547,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) aCtrlRegion.Union( maPage2Rect ); aCtrlRegion.Union( maThumbRect ); bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT), - aCtrlRegion, nState, scrValue, rtl::OUString() ); + aCtrlRegion, nState, scrValue, OUString() ); } else { @@ -578,11 +577,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) if ( nDrawFlags & SCRBAR_DRAW_PAGE1 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, - scrValue, rtl::OUString() ); + scrValue, OUString() ); if ( nDrawFlags & SCRBAR_DRAW_PAGE2 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, - scrValue, rtl::OUString() ); + scrValue, OUString() ); } if ( (nDrawFlags & SCRBAR_DRAW_BTN1) || (nDrawFlags & SCRBAR_DRAW_BTN2) ) { @@ -620,11 +619,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) if ( nDrawFlags & SCRBAR_DRAW_BTN1 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, - scrValue, rtl::OUString() ); + scrValue, OUString() ); if ( nDrawFlags & SCRBAR_DRAW_BTN2 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, - scrValue, rtl::OUString() ); + scrValue, OUString() ); } if ( (nDrawFlags & SCRBAR_DRAW_THUMB) && !maThumbRect.IsEmpty() ) { @@ -648,7 +647,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) } bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_THUMB_HORZ : PART_THUMB_VERT), - aCtrlRegion, nState, scrValue, rtl::OUString() ); + aCtrlRegion, nState, scrValue, OUString() ); } } } diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 6bfaa2a9fd91..5d1b7c8ebd47 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -144,7 +144,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate ) const Rectangle aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) ); Rectangle aThumbBounds, aThumbContent; if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_HORZ, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), + aControlRegion, 0, ImplControlValue(), OUString(), aThumbBounds, aThumbContent ) ) { maThumbRect.Left() = mnThumbPixPos - aThumbBounds.GetWidth()/2; @@ -178,7 +178,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate ) const Rectangle aControlRegion( Rectangle( Point(0,0), Size( 10, SLIDER_THUMB_SIZE ) ) ); Rectangle aThumbBounds, aThumbContent; if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_VERT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), + aControlRegion, 0, ImplControlValue(), OUString(), aThumbBounds, aThumbContent ) ) { maThumbRect.Top() = mnThumbPixPos - aThumbBounds.GetHeight()/2; @@ -347,7 +347,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags ) const Rectangle aCtrlRegion( Point(0,0), GetOutputSizePixel() ); bool bNativeOK = DrawNativeControl( CTRL_SLIDER, nPart, - aCtrlRegion, nState, sldValue, rtl::OUString() ); + aCtrlRegion, nState, sldValue, OUString() ); if( bNativeOK ) return; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 0c58aee8e531..16dea7e8d30c 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -85,7 +85,7 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt { // only paint the embedded spin buttons, all buttons are painted at once bNativeOK = pWin->DrawNativeControl( CTRL_SPINBOX, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); } else { @@ -108,14 +108,14 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt Rectangle aNatRgn( aPt, aSize ); if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && pBorder->GetNativeControlRegion( CTRL_SPINBOX, PART_ENTIRE_CONTROL, - aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, rSpinbuttonValue, OUString(), aBound, aContent) ) { aSize = aContent.GetSize(); } Rectangle aRgn( aPt, aSize ); bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); pBorder->SetClipRegion(Region(oldRgn)); } @@ -131,7 +131,7 @@ sal_Bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbu { // only paint the standalone spin buttons, all buttons are painted at once bNativeOK = pWin->DrawNativeControl( CTRL_SPINBUTTONS, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); } return bNativeOK; } @@ -709,9 +709,9 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec bNativeRegionOK = pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_UP, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContentUp) && + aArea, 0, aControlValue, OUString(), aBound, aContentUp) && pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContentDown); + aArea, 0, aControlValue, OUString(), aBound, aContentDown); if( bNativeRegionOK ) { @@ -766,7 +766,7 @@ void SpinField::Resize() // adjust position and size of the edit field if ( GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) ); @@ -958,7 +958,7 @@ sal_Bool SpinField::ShowDropDown( sal_Bool ) return sal_False; } -Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const +Size SpinField::CalcMinimumSizeForText(const OUString &rString) const { Size aSz = Edit::CalcMinimumSizeForText(rString); @@ -971,9 +971,9 @@ Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const Rectangle aEntireBound, aEntireContent, aEditBound, aEditContent; if ( GetNativeControlRegion(CTRL_SPINBOX, PART_ENTIRE_CONTROL, - aArea, 0, aControlValue, rtl::OUString(), aEntireBound, aEntireContent) && + aArea, 0, aControlValue, OUString(), aEntireBound, aEntireContent) && GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aEditBound, aEditContent) + aArea, 0, aControlValue, OUString(), aEditBound, aEditContent) ) { aSz.Width() += (aEntireContent.GetWidth() - aEditContent.GetWidth()); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3722f80505a7..fc5a4bf80d2c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -299,7 +299,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ) Rectangle aBoundingRgn, aContentRgn; const ImplControlValue aControlValue; if(GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { return aContentRgn.GetSize(); @@ -313,7 +313,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ) // shorten Text if needed if ( aSize.Width()+4 >= nMaxWidth ) { - rtl::OUString aAppendStr("..."); + OUString aAppendStr("..."); pItem->maFormatText += aAppendStr; do { @@ -573,9 +573,9 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) if ( pOldPage ) { if ( mbRestoreHelpId ) - pCtrlParent->SetHelpId( rtl::OString() ); + pCtrlParent->SetHelpId( OString() ); if ( mbRestoreUnqId ) - pCtrlParent->SetUniqueId( rtl::OString() ); + pCtrlParent->SetUniqueId( OString() ); pOldPage->DeactivatePage(); } @@ -830,7 +830,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP; bNativeOK = DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - tiValue, rtl::OUString() ); + tiValue, OUString() ); } if( ! bLayout && !bNativeOK ) @@ -1096,7 +1096,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if( !aClipRgn.IsEmpty() ) bNativeOK = DrawNativeControl( CTRL_TAB_PANE, part, aRect, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } else { @@ -1360,7 +1360,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // call Help if existing @@ -2039,7 +2039,7 @@ const XubString& TabControl::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 7f5768056119..3197b257467c 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -88,11 +88,11 @@ namespace const Reference< com::sun::star::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(aContext) ); - ::std::vector< ::rtl::OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); + ::std::vector< OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); aImages.reserve( aImageURLs.size() ); ::comphelper::NamedValueCollection aMediaProperties; - for ( ::std::vector< ::rtl::OUString >::const_iterator imageURL = aImageURLs.begin(); + for ( ::std::vector< OUString >::const_iterator imageURL = aImageURLs.begin(); imageURL != aImageURLs.end(); ++imageURL ) @@ -220,9 +220,9 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList } //---------------------------------------------------------------------------------------------------------------------- -::std::vector< ::rtl::OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet ) +::std::vector< OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet ) { - ::std::vector< ::rtl::OUString > aImageURLs; + ::std::vector< OUString > aImageURLs; sal_Char const* const pResolutions[] = { "16", "32", "64" }; size_t const nImageCounts[] = { 6, 12, 12 }; @@ -242,7 +242,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList aImageURLs.reserve( nImageCounts[index] ); for ( size_t i=0; i<nImageCounts[index]; ++i ) { - ::rtl::OUStringBuffer aURL; + OUStringBuffer aURL; aURL.appendAscii( "private:graphicrepository/vcl/res/spinner-" ); aURL.appendAscii( pResolutions[index] ); aURL.appendAscii( "-" ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 7213ad1cbc3b..b03924c88d67 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -200,10 +200,10 @@ void TextEngine::SetFont( const Font& rFont ) maFont.SetAlign( ALIGN_TOP ); mpRefDev->SetFont( maFont); Size aTextSize; - aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" ")); + aTextSize.Width() = mpRefDev->GetTextWidth(OUString(" ")); aTextSize.Height() = mpRefDev->GetTextHeight(); if ( !aTextSize.Width() ) - aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX")); + aTextSize.Width() = mpRefDev->GetTextWidth(OUString("XXXX")); mnDefTab = (sal_uInt16)aTextSize.Width(); if ( !mnDefTab ) @@ -658,7 +658,7 @@ sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextS aCTLOptions.IsCTLFontEnabled() && aCTLOptions.IsCTLSequenceChecking() && nFirstPos != 0 && /* first char needs not to be checked */ - xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 ); + xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( OUString( c ), 0 ); return bIsSequenceChecking; } @@ -711,8 +711,8 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, // the text that needs to be checked is only the one // before the current cursor position - rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) ); - rtl::OUString aNewText( aOldText ); + OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) ); + OUString aNewText( aOldText ); if (aCTLOptions.IsCTLSequenceCheckingTypeAndReplace()) { xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode ); @@ -752,7 +752,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { - TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, rtl::OUString(c) ); + TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } @@ -2556,14 +2556,14 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) if ( aSel.HasRange() ) aSel = ImpDeleteText( aSel ); - rtl::OString aLine; + OString aLine; sal_Bool bDone = rInput.ReadLine( aLine ); - rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet())); + OUString aTmpStr(OStringToOUString(aLine, rInput.GetStreamCharSet())); while ( bDone ) { aSel = ImpInsertText( aSel, aTmpStr ); bDone = rInput.ReadLine( aLine ); - aTmpStr = rtl::OStringToOUString(aLine, rInput.GetStreamCharSet()); + aTmpStr = OStringToOUString(aLine, rInput.GetStreamCharSet()); if ( bDone ) aSel = ImpInsertParaBreak( aSel.GetEnd() ); } @@ -2657,7 +2657,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo aText.AppendAscii( "</P>" ); } - rOutput.WriteLine(rtl::OUStringToOString(aText, + rOutput.WriteLine(OUStringToOString(aText, rOutput.GetStreamCharSet())); } diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 153e3db8c323..17a29181134f 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -38,7 +38,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -56,7 +56,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -74,7 +74,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -93,7 +93,7 @@ public: virtual sal_Bool Merge( SfxUndoAction *pNextAction ); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -110,7 +110,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -127,7 +127,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; #endif // _TEXTUND2_HXX diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 2b38fc220090..3cbb85d6999c 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -41,7 +41,7 @@ namespace { // Shorten() -- inserts ellipsis (...) in the middle of a long text -void Shorten (rtl::OUString& rString) +void Shorten (OUString& rString) { unsigned nLen = rString.getLength(); if (nLen > 48) @@ -149,9 +149,9 @@ TextUndo::~TextUndo() { } -rtl::OUString TextUndo::GetComment() const +OUString TextUndo::GetComment() const { - return rtl::OUString(); + return OUString(); } void TextUndo::SetSelection( const TextSelection& rSel ) @@ -214,7 +214,7 @@ void TextUndoDelPara::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoDelPara::GetComment () const +OUString TextUndoDelPara::GetComment () const { return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr()); } @@ -248,7 +248,7 @@ void TextUndoConnectParas::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoConnectParas::GetComment () const +OUString TextUndoConnectParas::GetComment () const { return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr()); } @@ -282,7 +282,7 @@ void TextUndoSplitPara::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoSplitPara::GetComment () const +OUString TextUndoSplitPara::GetComment () const { return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr()); } @@ -334,12 +334,12 @@ sal_Bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction ) return sal_False; } -rtl::OUString TextUndoInsertChars::GetComment () const +OUString TextUndoInsertChars::GetComment () const { // multiple lines? - rtl::OUString sText(maText); + OUString sText(maText); Shorten(sText); - return rtl::OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText); + return OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText); } @@ -371,12 +371,12 @@ void TextUndoRemoveChars::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoRemoveChars::GetComment () const +OUString TextUndoRemoveChars::GetComment () const { // multiple lines? - rtl::OUString sText(maText); + OUString sText(maText); Shorten(sText); - return rtl::OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText); + return OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index 1474376f4464..a461bd78e7b0 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -73,7 +73,7 @@ public: virtual void Undo() = 0; virtual void Redo() = 0; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _TEXTUNDO_HXX diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index ff061bbd9b69..05ea5f2e16dc 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -107,7 +107,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetText(); + aAny <<= (OUString)GetText(); } else if ( nT == SOT_FORMATSTR_ID_HTML ) { @@ -706,7 +706,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) { if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsShift() && !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() && - ImplCheckTextLen( rtl::OUString('x') ) ) + ImplCheckTextLen( OUString('x') ) ) { aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, '\t', !IsInsertMode() ); bModified = sal_True; @@ -720,7 +720,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) // Shift-RETURN darf nicht geschluckt werden, weil dann keine // mehrzeilige Eingabe in Dialogen/Property-Editor moeglich. if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() && - !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( rtl::OUString('x') ) ) + !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( OUString('x') ) ) { mpImpl->mpTextEngine->UndoActionStart(); aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel ); @@ -755,7 +755,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) if ( TextEngine::IsSimpleCharInput( rKeyEvent ) ) { sal_Unicode nCharCode = rKeyEvent.GetCharCode(); - if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken... + if ( !mpImpl->mbReadOnly && ImplCheckTextLen( OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken... { aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True ); bModified = sal_True; @@ -1176,7 +1176,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; bool bWasTruncated = false; if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 ) @@ -1342,7 +1342,7 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect ) InsertNewText( rStr, bSelect ); } -void TextView::InsertNewText( const rtl::OUString& rStr, sal_Bool bSelect ) +void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect ) { // HideSelection(); mpImpl->mpTextEngine->UndoActionStart(); @@ -1957,7 +1957,7 @@ sal_Bool TextView::Read( SvStream& rInput ) return bDone; } -bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const +bool TextView::ImplTruncateNewText( OUString& rNewText ) const { bool bTruncated = false; @@ -2095,7 +2095,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv if ( xDataObj->isDataFlavorSupported( aFlavor ) ) { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aOUString; + OUString aOUString; aData >>= aOUString; aText = convertLineEnd(aOUString, LINEEND_LF); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index e7bc99cac493..c13fc5529e05 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -295,7 +295,7 @@ void ImpVclMEdit::ImpInitScrollBars() { ImpSetScrollBarRanges(); Size aCharBox; - aCharBox.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ); + aCharBox.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) ); aCharBox.Height() = mpTextWindow->GetTextHeight(); Size aOutSz = mpTextWindow->GetOutputSizePixel(); if ( mpHScrollBar ) @@ -653,7 +653,7 @@ Size ImpVclMEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const Size aSz; Size aCharSz; - aCharSz.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ); + aCharSz.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) ); aCharSz.Height() = mpTextWindow->GetTextHeight(); if ( nLines ) @@ -678,7 +678,7 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi { static const sal_Unicode sampleChar = { 'x' }; Size aOutSz = mpTextWindow->GetOutputSizePixel(); - Size aCharSz( mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ), mpTextWindow->GetTextHeight() ); + Size aCharSz( mpTextWindow->GetTextWidth( OUString(sampleChar) ), mpTextWindow->GetTextHeight() ); rnCols = (sal_uInt16) (aOutSz.Width()/aCharSz.Width()); rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height()); } @@ -779,7 +779,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) { // Damit die Selektion erhalten bleibt mbActivePopup = sal_True; - rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); + OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); @@ -880,7 +880,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) break; case SV_MENU_EDIT_INSERTSYMBOL: { - rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); + OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); @@ -1370,7 +1370,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& } } - rtl::OUString aText = GetText(); + OUString aText = GetText(); Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() ); sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height()); if ( !nLines ) @@ -1565,7 +1565,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable ) GetTextView()->EnableCursor( bEnable ); } -bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclMultiLineEdit::set_property(const OString &rKey, const OString &rValue) { if (rKey == "cursor-visible") EnableCursor(toBool(rValue)); diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 4fe25637a86e..e9b4e73a27b4 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; // ------------------------------------------------------------------------- // class ExtTextEngine // ------------------------------------------------------------------------- -ExtTextEngine::ExtTextEngine() : maGroupChars(rtl::OUString("(){}[]")) +ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]")) { } diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index b0a8bcfa5ba9..e354457bf676 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -87,7 +87,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) ) bIsPixelFormat = sal_True; } - rtl::OUString sTemp(SVLIBRARY("?")); + OUString sTemp(SVLIBRARY("?")); sal_Int32 nIndex = sTemp.indexOf(static_cast<sal_Unicode>('?')); sFilterName = sTemp.replaceAt(nIndex, 1, sFilterName); } @@ -194,7 +194,7 @@ void FilterConfigCache::ImplInit() else if (lFlags[0].equalsIgnoreAsciiCase("export")) aEntry.nFlags = 2; - ::rtl::OUString sFormatName; + OUString sFormatName; xFilterSet->getPropertyValue(SFORMATNAME) >>= sFormatName; aEntry.CreateFilterName( sFormatName ); @@ -286,7 +286,7 @@ void FilterConfigCache::ImplInitSmart() aEntry.sType = sExtension; aEntry.sUIName = sExtension; - rtl::OString sFlags( *pPtr++ ); + OString sFlags( *pPtr++ ); aEntry.nFlags = sFlags.toInt32(); OUString sUserData( OUString::createFromAscii( *pPtr ) ); @@ -427,7 +427,7 @@ String FilterConfigCache::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr { String aWildcard( GetImportFormatExtension( nFormat, nEntry ) ); if ( aWildcard.Len() ) - aWildcard.Insert( rtl::OUString("*."), 0 ); + aWildcard.Insert( OUString("*."), 0 ); return aWildcard; } @@ -541,7 +541,7 @@ String FilterConfigCache::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr { String aWildcard( GetExportFormatExtension( nFormat, nEntry ) ); if ( aWildcard.Len() ) - aWildcard.Insert( rtl::OUString("*."), 0 ); + aWildcard.Insert( OUString("*."), 0 ); return aWildcard; } diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 6423a90073e0..ceafbdec57b9 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -using ::rtl::OUString; using namespace ::utl ; // getProcessServiceFactory using namespace ::com::sun::star::lang ; // XMultiServiceFactory using namespace ::com::sun::star::beans ; // PropertyValue @@ -40,7 +39,7 @@ using namespace ::com::sun::star::container ; // using namespace ::com::sun::star::configuration; // using namespace ::com::sun::star::task ; // XStatusIndicator -static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const rtl::OUString& rTree ) +static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const OUString& rTree ) { sal_Bool bAvailable = !rTree.isEmpty(); if ( bAvailable ) @@ -89,7 +88,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv bAvailable = sal_False; else { - rtl::OUString aNode( getToken(rTree, i, '/') ); + OUString aNode( getToken(rTree, i, '/') ); if ( !xHierarchicalNameAccess->hasByHierarchicalName( aNode ) ) bAvailable = sal_False; else @@ -420,7 +419,7 @@ Sequence< PropertyValue > FilterConfigItem::GetFilterData() const Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { Reference< XStatusIndicator > xStatusIndicator; - const rtl::OUString sStatusIndicator( "StatusIndicator" ); + const OUString sStatusIndicator( "StatusIndicator" ); sal_Int32 i, nCount = aFilterData.getLength(); for ( i = 0; i < nCount; i++ ) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f031b550c159..ecfd46976800 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -335,7 +335,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio } rStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); if (bOK && !rStream.GetError()) { - rFormatExtension = rtl::OUString("MET"); + rFormatExtension = OUString("MET"); return sal_True; } } @@ -369,7 +369,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio sFirstBytes[14+nOffs] == 0x28 || sFirstBytes[14+nOffs] == 0x0c ) { - rFormatExtension = rtl::OUString("BMP"); + rFormatExtension = OUString("BMP"); return sal_True; } } @@ -385,13 +385,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( nFirstLong==0xd7cdc69a || nFirstLong==0x01000900 ) { - rFormatExtension = rtl::OUString("WMF"); + rFormatExtension = OUString("WMF"); return sal_True; } else if( nFirstLong == 0x01000000 && sFirstBytes[ 40 ] == 0x20 && sFirstBytes[ 41 ] == 0x45 && sFirstBytes[ 42 ] == 0x4d && sFirstBytes[ 43 ] == 0x46 ) { - rFormatExtension = rtl::OUString("EMF"); + rFormatExtension = OUString("EMF"); return sal_True; } } @@ -406,7 +406,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio sal_uInt8 nEncoding=sFirstBytes[2]; if( ( nVersion==0 || nVersion==2 || nVersion==3 || nVersion==5 ) && nEncoding<=1 ) { - rFormatExtension = rtl::OUString("PCX"); + rFormatExtension = OUString("PCX"); return sal_True; } } @@ -418,7 +418,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if ( nFirstLong==0x49492a00 || nFirstLong==0x4d4d002a ) { - rFormatExtension = rtl::OUString("TIF"); + rFormatExtension = OUString("TIF"); return sal_True; } } @@ -429,7 +429,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if ( nFirstLong==0x47494638 && (sFirstBytes[4]==0x37 || sFirstBytes[4]==0x39) && sFirstBytes[5]==0x61 ) { - rFormatExtension = rtl::OUString("GIF"); + rFormatExtension = OUString("GIF"); return sal_True; } } @@ -440,7 +440,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if (nFirstLong==0x89504e47 && nSecondLong==0x0d0a1a0a) { - rFormatExtension = rtl::OUString("PNG"); + rFormatExtension = OUString("PNG"); return sal_True; } } @@ -452,7 +452,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( ( nFirstLong==0xffd8ffe0 && sFirstBytes[6]==0x4a && sFirstBytes[7]==0x46 && sFirstBytes[8]==0x49 && sFirstBytes[9]==0x46 ) || ( nFirstLong==0xffd8fffe ) || ( 0xffd8ff00 == ( nFirstLong & 0xffffff00 ) ) ) { - rFormatExtension = rtl::OUString("JPG"); + rFormatExtension = OUString("JPG"); return sal_True; } } @@ -463,13 +463,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( nFirstLong==0x53564744 && sFirstBytes[4]==0x49 ) { - rFormatExtension = rtl::OUString("SVM"); + rFormatExtension = OUString("SVM"); return sal_True; } else if( sFirstBytes[0]==0x56 && sFirstBytes[1]==0x43 && sFirstBytes[2]==0x4C && sFirstBytes[3]==0x4D && sFirstBytes[4]==0x54 && sFirstBytes[5]==0x46 ) { - rFormatExtension = rtl::OUString("SVM"); + rFormatExtension = OUString("SVM"); return sal_True; } } @@ -486,7 +486,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 ) { - rFormatExtension = rtl::OUString("PCD"); + rFormatExtension = OUString("PCD"); return sal_True; } } @@ -498,7 +498,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if ( ( nFirstLong == 0x38425053 ) && ( (nSecondLong >> 16 ) == 1 ) ) { - rFormatExtension = rtl::OUString("PSD"); + rFormatExtension = OUString("PSD"); return sal_True; } } @@ -510,7 +510,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 ) && ImplSearchEntry( &sFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) ) { - rFormatExtension = rtl::OUString("EPS"); + rFormatExtension = OUString("EPS"); return sal_True; } } @@ -521,7 +521,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio //Binary DXF File Format if( strncmp( (const char*) sFirstBytes, "AutoCAD Binary DXF", 18 ) == 0 ) { - rFormatExtension = rtl::OUString("DXF"); + rFormatExtension = OUString("DXF"); return sal_True; } @@ -543,7 +543,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if (i+7<256 && (strncmp((const char*)(sFirstBytes+i),"SECTION",7)==0)) { - rFormatExtension = rtl::OUString("DXF"); + rFormatExtension = OUString("DXF"); return sal_True; } } @@ -556,7 +556,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if (isPCT(rStream, nStreamPos, nStreamLen)) { - rFormatExtension = rtl::OUString("PCT"); + rFormatExtension = OUString("PCT"); return sal_True; } } @@ -574,17 +574,17 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio { case '1' : case '4' : - rFormatExtension = rtl::OUString("PBM"); + rFormatExtension = OUString("PBM"); return sal_True; case '2' : case '5' : - rFormatExtension = rtl::OUString("PGM"); + rFormatExtension = OUString("PGM"); return sal_True; case '3' : case '6' : - rFormatExtension = rtl::OUString("PPM"); + rFormatExtension = OUString("PPM"); return sal_True; } } @@ -596,7 +596,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( nFirstLong == 0x59a66a95 ) { - rFormatExtension = rtl::OUString("RAS"); + rFormatExtension = OUString("RAS"); return sal_True; } } @@ -607,7 +607,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"/* XPM */", 256, 9 ) ) { - rFormatExtension = rtl::OUString("XPM"); + rFormatExtension = OUString("XPM"); return sal_True; } } @@ -631,7 +631,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio { if( ImplSearchEntry( pPtr, (sal_uInt8*)"_width", pBuf + nSize - pPtr, 6 ) ) { - rFormatExtension = rtl::OUString("XBM"); + rFormatExtension = OUString("XBM"); delete[] pBuf; return sal_True; } @@ -763,7 +763,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( sFirstBytes[ 0 ] == 'J' && sFirstBytes[ 1 ] == 'J' ) { - rFormatExtension = rtl::OUString("SGF"); + rFormatExtension = OUString("SGF"); return sal_True; } } @@ -925,14 +925,14 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName ) { - ::rtl::OUString aPathURL; + OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); - aPathURL += rtl::OUString( '/' ); + aPathURL += OUString( '/' ); - ::rtl::OUString aSystemPath; + OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); - aSystemPath += ::rtl::OUString( rFilterName ); + aSystemPath += OUString( rFilterName ); return String( aSystemPath ); } @@ -990,7 +990,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() if( !mpfnImport ) { #ifndef DISABLE_DYNLOADING - mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(rtl::OUString(IMPORT_FUNCTION_NAME)); + mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME)); #else if( maFiltername.EqualsAscii( "icd" ) ) mpfnImport = icdGraphicImport; @@ -1136,7 +1136,7 @@ void GraphicFilter::ImplInit() if( bUseConfig ) { - rtl::OUString url("$BRAND_BASE_DIR/program"); + OUString url("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(url); //TODO: detect failure utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath); } @@ -2108,7 +2108,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& String aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) ); osl::Module aLibrary( aPhysicalName ); - PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(rtl::OUString(EXPORT_FUNCTION_NAME)); + PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME)); // Dialog in DLL ausfuehren #else PFilterCall pFunc = NULL; @@ -2178,7 +2178,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( pData ) { sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; - rtl::OString aShortName; + OString aShortName; switch( pData->mnFormat ) { case( CVT_BMP ): aShortName = BMP_SHORTNAME; break; @@ -2199,14 +2199,14 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( GRAPHIC_NONE == pData->maGraphic.GetType() || pData->maGraphic.GetContext() ) // Import { // Import - nFormat = GetImportFormatNumberForShortName( rtl::OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); + nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); nRet = ImportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0; } #ifndef DISABLE_EXPORT else if( !aShortName.isEmpty() ) { // Export - nFormat = GetExportFormatNumberForShortName( rtl::OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); + nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); nRet = ExportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0; } #endif diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 22bb1891bef4..24a182dd2435 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -1128,7 +1128,7 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat ) case( GFF_SVG ) : pKeyName = "svg"; break; } - return rtl::OUString::createFromAscii(pKeyName); + return OUString::createFromAscii(pKeyName); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index fd231ff88fbb..baba25d5facd 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -45,7 +45,7 @@ GIFReader::GIFReader( SvStream& rStm ) : bGCTransparent ( sal_False ), bImGraphicReady ( sal_False ) { - maUpperName = rtl::OUString("SVIGIF"); + maUpperName = OUString("SVIGIF"); pSrcBuf = new sal_uInt8[ 256 ]; ClearImageExtensions(); } @@ -249,8 +249,8 @@ sal_Bool GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8); - rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3); + OString aAppId = read_uInt8s_ToOString(rIStm, 8); + OString aAppCode = read_uInt8s_ToOString(rIStm, 3); rIStm >> cSize; // NetScape-Extension diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index c3f83dfd79f9..fc725f00b096 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -36,7 +36,7 @@ XBMReader::XBMReader( SvStream& rStm ) : bStatus ( sal_True ) { pHexTable = new short[ 256 ]; - maUpperName = rtl::OUString("SVIXBM"); + maUpperName = OUString("SVIXBM"); InitTable(); } @@ -90,10 +90,10 @@ void XBMReader::InitTable() // ------------------------------------------------------------------------ -rtl::OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, +OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2, const char* pTok3 ) { - rtl::OString aRet; + OString aRet; sal_Int32 nPos1, nPos2, nPos3; bStatus = sal_False; @@ -186,9 +186,9 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) // ------------------------------------------------------------------------ -sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat ) +sal_Bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ) { - rtl::OString aLine; + OString aLine; long nRow = 0; long nCol = 0; long nBits = ( eFormat == XBM10 ) ? 16 : 8; @@ -218,7 +218,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine, for( sal_Int32 i = 0; ( i < nCount ) && ( nRow < nHeight ); ++i ) { - const rtl::OString aToken(comphelper::string::getToken(aLine,i, ',')); + const OString aToken(comphelper::string::getToken(aLine,i, ',')); const sal_Int32 nLen = aToken.getLength(); sal_Bool bProcessed = sal_False; @@ -274,7 +274,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) { rIStm.Seek( nLastPos ); bStatus = sal_False; - rtl::OString aLine = FindTokenLine( &rIStm, "#define", "_width" ); + OString aLine = FindTokenLine( &rIStm, "#define", "_width" ); if ( bStatus ) { diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index 387430887660..4b5b60124d19 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -52,10 +52,10 @@ class XBMReader : public GraphicReader sal_Bool bStatus; void InitTable(); - rtl::OString FindTokenLine( SvStream* pInStm, const char* pTok1, + OString FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2 = NULL, const char* pTok3 = NULL ); long ParseDefine( const sal_Char* pDefine ); - sal_Bool ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat ); + sal_Bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); public: diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 6977ed2ca197..947e53d67ab8 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -941,7 +941,7 @@ sal_Bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ? sal_Bool bRet=sal_False; // Returncode - aIniPath.Append(rtl::OUString("sgf.ini")); + aIniPath.Append(OUString("sgf.ini")); pSgfFonts = new SgfFontLst; diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 0d08ba310ef4..36564cc4fab3 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -327,7 +327,7 @@ public: String SVFName; // z.B. "Times New Roman" = 15 Chars sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in % SgfFontOne(); - void ReadOne(const rtl::OString& rID, rtl::OString& rDsc); + void ReadOne(const OString& rID, OString& rDsc); }; class SgfFontLst { diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index b011da279064..e4a5f4429c59 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -545,32 +545,32 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s case 92500: case 92501: case 92504: case 92505: { #if defined(WNT) - FNam=rtl::OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman + FNam=OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman #else - FNam=rtl::OUString("Times"); // ansonsten ist das einfach Times + FNam=OUString("Times"); // ansonsten ist das einfach Times #endif StdBrei=40; aFont.SetFamily(FAMILY_ROMAN); } break; case 94021: case 94022: case 94023: case 94024: { #if defined(WNT) - FNam=rtl::OUString("Arial"); // Univers ist unter Windows Arial + FNam=OUString("Arial"); // Univers ist unter Windows Arial #else - FNam=rtl::OUString("Helvetica"); // und ansonsten Helvetica + FNam=OUString("Helvetica"); // und ansonsten Helvetica #endif aFont.SetFamily(FAMILY_SWISS); StdBrei=47; } break; case 93950: case 93951: case 93952: case 93953: { #if defined(WNT) - FNam=rtl::OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New + FNam=OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New #else - FNam=rtl::OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier + FNam=OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier #endif aFont.SetFamily(FAMILY_ROMAN); aFont.SetPitch(PITCH_FIXED); } break; - default: FNam = rtl::OUString("Helvetica"); + default: FNam = OUString("Helvetica"); } aFont.SetName(FNam); //aFont.SetCharSet(CHARSET_SYSTEM); @@ -666,7 +666,7 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) if (c==' ') { - ChrWidth=(sal_uInt16)rOut.GetTextWidth( rtl::OUString('A') ); + ChrWidth=(sal_uInt16)rOut.GetTextWidth( OUString('A') ); if (rOut.GetFont().GetPitch()!=PITCH_FIXED) { ChrWidth=MulDiv(ChrWidth,DefaultSpace,100); } @@ -679,11 +679,11 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) BOOST_STATIC_ASSERT(sizeof(UCHAR) == 1); if (c>=MinChar /*&& c<=MaxChar*/) { - ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(reinterpret_cast<sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437)); + ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(reinterpret_cast<sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437)); } else { - ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('A'))); + ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(static_cast<sal_Unicode>('A'))); } } return ChrWidth; @@ -951,7 +951,7 @@ void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uIn { SetTextContext(rOut,T,UpcasePossible(c),DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv); if ((T.Schnitt & TextKaptBit)!=0 && UpcasePossible(c)) c=Upcase(c); - rtl::OUString s(reinterpret_cast<const sal_Char*>(&c), 1, + OUString s(reinterpret_cast<const sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437); rOut.DrawText( Point( Pos.x, Pos.y ), s ); } @@ -1130,7 +1130,7 @@ SgfFontOne::SgfFontOne() SVWidth=40; } -void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc ) +void SgfFontOne::ReadOne( const OString& rID, OString& Dsc ) { if ( Dsc.getLength() < 4 || ( Dsc[0] != '(' ) ) return; @@ -1148,14 +1148,14 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc ) i--; j++; } - SVFName = rtl::OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen - Dsc = rtl::OStringBuffer(Dsc).remove(i,j).makeStringAndClear(); + SVFName = OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen + Dsc = OStringBuffer(Dsc).remove(i,j).makeStringAndClear(); IFID = (sal_uInt32)rID.toInt32(); sal_Int32 nTokenCount = comphelper::string::getTokenCount(Dsc, ' '); for (sal_Int32 nIdx = 0; nIdx < nTokenCount; ++nIdx) { - rtl::OString s(Dsc.getToken(nIdx, ' ')); + OString s(Dsc.getToken(nIdx, ' ')); if (!s.isEmpty()) { s = s.toAsciiUpperCase(); @@ -1227,8 +1227,8 @@ void SgfFontLst::ReadList() aCfg.SetGroup("SGV Fonts fuer StarView"); sal_uInt16 Anz=aCfg.GetKeyCount(); sal_uInt16 i; - rtl::OString FID; - rtl::OString Dsc; + OString FID; + OString Dsc; for (i=0;i<Anz;i++) { diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index beed2a3b9471..e4e3e51afc68 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -895,7 +895,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons if( nLen > 1 ) { - nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( rtl::OUString(rText.GetChar( nLen - 1 )) ); + nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( OUString(rText.GetChar( nLen - 1 )) ); if( nWidth && nNormWidth && ( nWidth != nNormWidth ) ) { @@ -1507,7 +1507,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; default: - OSL_FAIL(rtl::OStringBuffer( + OSL_FAIL(OStringBuffer( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ). append(static_cast<sal_Int32>(nType)).getStr()); break; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index ec9a1b10e031..c19e48efd95d 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -245,7 +245,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) // debug code - write the stream to debug file /tmp/emf-stream.emf EMFP_DEBUG(int pos = pWMF->Tell(); pWMF->Seek(0); - SvFileStream file( rtl::OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); + SvFileStream file( OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); *pWMF >> file; file.Flush(); @@ -1083,7 +1083,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() *pWMF >> nChar; lfFaceName[ i ] = nChar; } - aLogFont.alfFaceName = rtl::OUString( lfFaceName ); + aLogFont.alfFaceName = OUString( lfFaceName ); pOut->CreateObject( nIndex, GDI_FONT, new WinMtfFontStyle( aLogFont ) ); } } @@ -1144,7 +1144,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() for ( i = 0, j = 0; i < aText.Len(); i++ ) { sal_Unicode cUniChar = aText.GetChar(i); - rtl::OString aCharacter(&cUniChar, 1, pOut->GetCharSet()); + OString aCharacter(&cUniChar, 1, pOut->GetCharSet()); pDX[ i ] = 0; for (sal_Int32 k = 0; ( k < aCharacter.getLength() ) && ( j < nLen ) && ( i < aText.Len() ); ++k) pDX[ i ] += pOldDx[ j++ ]; @@ -1168,7 +1168,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() *pTmp = nTmp; } #endif - aText = rtl::OUString(pBuf, nLen); + aText = OUString(pBuf, nLen); delete[] pBuf; } } diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 5e8f5f29a43b..63af42605fa3 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -283,7 +283,7 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags ) { if ( ( nAssertCount == 0 ) || ( bOnlyOnce == sal_False ) ) { - rtl::OStringBuffer aText("WMF/EMF Import: "); + OStringBuffer aText("WMF/EMF Import: "); if (pAction) aText.append(pAction); aText.append(" needs to be implemented"); @@ -321,7 +321,7 @@ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigI xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -1615,7 +1615,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry if( pDXArry ) { sal_uInt32 nLen = rText.Len(); - nTextWidth = aVDev.GetTextWidth( rtl::OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) ); + nTextWidth = aVDev.GetTextWidth( OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) ); if( nLen > 1 ) nTextWidth += pDXArry[ nLen - 2 ]; } diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 133df403bc31..e1dfed1ea678 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -508,7 +508,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) if ( nNewTextLen != nOriginalTextLen ) { sal_Unicode nUniChar = aText.GetChar(i); - rtl::OString aTmp(&nUniChar, 1, pOut->GetCharSet()); + OString aTmp(&nUniChar, 1, pOut->GetCharSet()); if ( aTmp.getLength() > 1 ) { sal_Int32 nDxCount = aTmp.getLength() - 1; diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 4f10ee17828e..1b862bab8005 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -336,7 +336,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) } *pWMF << nPitchFamily; - rtl::OString aFontName(rtl::OUStringToOString(rFont.GetName(), eFontNameEncoding)); + OString aFontName(OUStringToOString(rFont.GetName(), eFontNameEncoding)); for ( i = 0; i < W_LF_FACESIZE; i++ ) { sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0; @@ -438,8 +438,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& { const sal_Unicode* pBuf = rUniStr.GetBuffer(); const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet(); - rtl::OString aByteStr(rtl::OUStringToOString(rUniStr, aTextEncodingOrg)); - rtl::OUString aUniStr2(rtl::OStringToOUString(aByteStr, aTextEncodingOrg)); + OString aByteStr(OUStringToOString(rUniStr, aTextEncodingOrg)); + OUString aUniStr2(OStringToOUString(aByteStr, aTextEncodingOrg)); const sal_Unicode* pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { @@ -460,8 +460,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& aTextEncoding = getBestMSEncodingByChar(*pCheckChar); // try the next character } - aByteStr = rtl::OUStringToOString(rUniStr, aTextEncoding); - aUniStr2 = rtl::OStringToOUString(aByteStr, aTextEncoding); + aByteStr = OUStringToOString(rUniStr, aTextEncoding); + aUniStr2 = OStringToOUString(aByteStr, aTextEncoding); pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { @@ -535,12 +535,12 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint, return; } rtl_TextEncoding eChrSet = aSrcFont.GetCharSet(); - rtl::OString aByteString(rtl::OUStringToOString(rString, eChrSet)); + OString aByteString(OUStringToOString(rString, eChrSet)); TrueExtTextOut(rPoint,rString,aByteString,pDXAry); } void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, - const rtl::OString& rByteString, const sal_Int32 * pDXAry ) + const OString& rByteString, const sal_Int32 * pDXAry ) { WriteRecordHeader( 0, W_META_EXTTEXTOUT ); WritePointYX( rPoint ); @@ -565,7 +565,7 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, if ( nOriginalTextLen < nNewTextLen ) { sal_Unicode nUniChar = rString.GetChar(i); - rtl::OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); + OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); j = aTemp.getLength(); while ( --j > 0 ) *pWMF << (sal_uInt16)0; @@ -822,11 +822,11 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, void WMFWriter::WMFRecord_TextOut(const Point & rPoint, const String & rStr) { rtl_TextEncoding eChrSet = aSrcFont.GetCharSet(); - rtl::OString aString(rtl::OUStringToOString(rStr, eChrSet)); + OString aString(OUStringToOString(rStr, eChrSet)); TrueTextOut(rPoint, aString); } -void WMFWriter::TrueTextOut(const Point & rPoint, const rtl::OString& rString) +void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString) { WriteRecordHeader(0,W_META_TEXTOUT); @@ -1730,7 +1730,7 @@ sal_Bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index b05a8d217ec1..63c42ff31d27 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -158,8 +158,8 @@ private: void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry); void TrueExtTextOut(const Point & rPoint, const String & rString, - const rtl::OString& rByteString, const sal_Int32 * pDXAry); - void TrueTextOut(const Point & rPoint, const rtl::OString& rString); + const OString& rByteString, const sal_Int32 * pDXAry); + void TrueTextOut(const Point & rPoint, const OString& rString); void WMFRecord_LineTo(const Point & rPoint); void WMFRecord_MoveTo(const Point & rPoint); void WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 442af4ada75f..22f82249ef43 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -732,7 +732,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); // dummy + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy rOStm << nRest; // Count of remaining structures } } diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index fe620e72367f..7f9165258944 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -23,8 +23,6 @@ using namespace vcl; -using ::rtl::OString; -using ::rtl::OStringBuffer; OString PDFWriterImpl::BuiltinFont::getNameObject() const { diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 6f7147792804..8ea7a832c4c8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -89,14 +89,14 @@ BitmapEx::BitmapEx( const ResId& rResId ) : pResMgr->ReadLong(); const String aFileName( pResMgr->ReadString() ); - ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this, true ) ) { #ifdef DBG_UTIL - rtl::OStringBuffer aErrorStr( + OStringBuffer aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <"); - aErrorStr.append(rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); + aErrorStr.append(OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); OSL_FAIL(aErrorStr.getStr()); #endif } diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx index f76035df87dc..e42a28e1c3b5 100644 --- a/vcl/source/gdi/bmpconv.cxx +++ b/vcl/source/gdi/bmpconv.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::reflection; using namespace com::sun::star::awt; -using ::rtl::OUString; namespace vcl { diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index e8614e028d96..30b6f463f38c 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using ::rtl::OUString; #define SETTINGS_CONFIGNODE "VCL/Settings" @@ -65,7 +64,7 @@ void SettingsConfigItem::Commit() if( ! IsValidConfigMgr() ) return; - boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; + boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -145,7 +144,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + ::boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() ) { static OUString aEmpty; diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 0b669f10e28a..bdc23db0293a 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -199,7 +199,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont, char aName[32]; short nWeight; - rtl::OString aByteName(rtl::OUStringToOString(rFont.GetName(), + OString aByteName(OUStringToOString(rFont.GetName(), rOStm.GetStreamCharSet())); strncpy( aName, aByteName.getStr(), 32 ); @@ -849,12 +849,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if( nAryLen > 0L ) { @@ -912,12 +912,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if ( nUnicodeCommentActionNumber == i ) ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr ); rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) ); @@ -1278,7 +1278,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -1678,7 +1678,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaTextAction* pAct = (MetaTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -1699,7 +1699,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_TEXTARRAY_ACTION ): { MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction; - rtl::OString aText(rtl::OUStringToOString(pAct->GetText(), + OString aText(OUStringToOString(pAct->GetText(), rActualCharSet)); String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() ); sal_uLong nAryLen; @@ -1743,7 +1743,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -2406,7 +2406,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, #ifdef DBG_UTIL default: { - rtl::OStringBuffer aStr("Missing implementation for Action#: "); + OStringBuffer aStr("Missing implementation for Action#: "); aStr.append(static_cast<sal_Int32>(pAction->GetType())); aStr.append('!'); OSL_FAIL(aStr.getStr()); diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 50c105dc3ca9..4d313c5f1d43 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -334,7 +334,7 @@ void Font::SetAlign( FontAlign eAlign ) } } -void Font::SetName( const rtl::OUString& rFamilyName ) +void Font::SetName( const OUString& rFamilyName ) { DBG_CHKTHIS( Font, NULL ); @@ -783,7 +783,7 @@ namespace if( aInfo.ufamily ) o_rResult.SetName( aInfo.ufamily ); else if( aInfo.family ) - o_rResult.SetName( rtl::OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); // set weight if( aInfo.weight ) { @@ -838,9 +838,9 @@ namespace // set style name if( aInfo.usubfamily ) - o_rResult.SetStyleName( rtl::OUString( aInfo.usubfamily ) ); + o_rResult.SetStyleName( OUString( aInfo.usubfamily ) ); else if( aInfo.subfamily ) - o_rResult.SetStyleName( rtl::OUString::createFromAscii( aInfo.subfamily ) ); + o_rResult.SetStyleName( OUString::createFromAscii( aInfo.subfamily ) ); // cleanup CloseTTFont( pTTF ); @@ -898,7 +898,7 @@ namespace pClose++; if( pClose - pOpen > 1 ) { - o_rResult.SetName( rtl::OStringToOUString( rtl::OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); } } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index da87d3174044..da38c34e68fc 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -417,7 +417,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S if( xBitmapCanvas.is() ) { args[0] = uno::Any( xBitmapCanvas ); - xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString("com.sun.star.rendering.MtfRenderer"), + xMtfRenderer.set( xFactory->createInstanceWithArguments( OUString("com.sun.star.rendering.MtfRenderer"), args ), uno::UNO_QUERY ); if( xMtfRenderer.is() ) @@ -484,15 +484,15 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, if( !pData ) return; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; while( pData<pEndData && *pData ) aBuffer.append(static_cast<sal_Unicode>(*pData++)); - const ::rtl::OUString aRendererServiceName=aBuffer.makeStringAndClear(); + const OUString aRendererServiceName=aBuffer.makeStringAndClear(); ++pData; while( pData<pEndData && *pData ) aBuffer.append(static_cast<sal_Unicode>(*pData++)); - const ::rtl::OUString aGraphicServiceName=aBuffer.makeStringAndClear(); + const OUString aGraphicServiceName=aBuffer.makeStringAndClear(); ++pData; uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); @@ -1602,7 +1602,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaTextLineAction* pAct = (MetaTextLineAction*) pAction; // measure a test string to get ascend and descent right static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 }; - rtl::OUString aStr( pStr ); + OUString aStr( pStr ); Rectangle aRect; aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL ); @@ -3000,19 +3000,19 @@ void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, - const rtl::OUString& rGraphicServiceName, +MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, + const OUString& rGraphicServiceName, const void* _pData, sal_uInt32 nDataSize ) { const sal_uInt8* pData=(sal_uInt8*)_pData; // FIXME: Data gets copied twice, unfortunately - rtl::OString aRendererServiceName( + OString aRendererServiceName( rRendererServiceName.getStr(), rRendererServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); - rtl::OString aGraphicServiceName( + OString aGraphicServiceName( rGraphicServiceName.getStr(), rGraphicServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 415ae1413c88..11cb3b6c3268 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -329,7 +329,7 @@ ImageList::ImageList( const ResId& rResId ) : BitmapEx aEmpty; for( sal_Int32 i = 0; i < nCount; ++i ) { - rtl::OUString aName = pResMgr->ReadString(); + OUString aName = pResMgr->ReadString(); sal_uInt16 nId = static_cast< sal_uInt16 >( pResMgr->ReadLong() ); mpImplData->AddImage( aName, nId, aEmpty ); } @@ -339,8 +339,8 @@ ImageList::ImageList( const ResId& rResId ) : } } -ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, - const ::rtl::OUString& rPrefix, +ImageList::ImageList( const ::std::vector< OUString >& rNameVector, + const OUString& rPrefix, const Color* ) : mpImplData( NULL ), mnInitSize( 1 ), @@ -386,15 +386,15 @@ void ImageList::ImplInit( sal_uInt16 nItems, const Size &rSize ) mpImplData->maImageSize = rSize; } -void ImageAryData::Load(const rtl::OUString &rPrefix) +void ImageAryData::Load(const OUString &rPrefix) { static ImplImageTreeSingletonRef aImageTree; - ::rtl::OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); BitmapEx aBmpEx; - rtl::OUString aFileName = rPrefix; + OUString aFileName = rPrefix; aFileName += maName; #if OSL_DEBUG_LEVEL > 0 bool bSuccess = @@ -403,9 +403,9 @@ void ImageAryData::Load(const rtl::OUString &rPrefix) #if OSL_DEBUG_LEVEL > 0 if ( !bSuccess ) { - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "ImageAryData::Load: failed to load image '" ); - aMessage.append( ::rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); aMessage.append( "'" ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); } @@ -452,7 +452,7 @@ BitmapEx ImageList::GetAsHorizontalStrip() const } void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, - const std::vector< rtl::OUString > &rNameVector ) + const std::vector< OUString > &rNameVector ) { sal_uInt16 nItems = sal::static_int_cast< sal_uInt16 >( rNameVector.size() ); @@ -490,11 +490,11 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId, if ( nColorCount && pSearchColors && pReplaceColors ) aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount ); - std::vector< rtl::OUString > aNames( nCount ); + std::vector< OUString > aNames( nCount ); InsertFromHorizontalStrip( aBmpEx, aNames ); } -sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -505,7 +505,7 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const return 0; } -void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::AddImage( const OUString& rImageName, const Image& rImage ) { DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" ); @@ -516,7 +516,7 @@ void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage rImage.GetBitmapEx() ); } -void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::ReplaceImage( const OUString& rImageName, const Image& rImage ) { const sal_uInt16 nId = ImplGetImageId( rImageName ); @@ -577,7 +577,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const return aRet; } -Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const +Image ImageList::GetImage( const OUString& rImageName ) const { if( mpImplData ) { @@ -622,7 +622,7 @@ bool ImageList::HasImageAtPos( sal_uInt16 nId ) const return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND; } -sal_uInt16 ImageList::GetImagePos( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -648,29 +648,29 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const return 0; } -::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const +OUString ImageList::GetImageName( sal_uInt16 nPos ) const { DBG_CHKTHIS( ImageList, NULL ); if( mpImplData && (nPos < GetImageCount()) ) return mpImplData->maImages[ nPos ]->maName; - return ::rtl::OUString(); + return OUString(); } -void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const +void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" ); DBG_CHKTHIS( ImageList, NULL ); - rNames = ::std::vector< ::rtl::OUString >(); + rNames = ::std::vector< OUString >(); if( mpImplData ) { for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ ) { - const rtl::OUString& rName( mpImplData->maImages[ i ]->maName ); + const OUString& rName( mpImplData->maImages[ i ]->maName ); if( !rName.isEmpty()) rNames.push_back( rName ); } diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index b201a263a70a..63aee8a202a0 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -32,9 +32,9 @@ namespace vcl //= ImageRepository //==================================================================== //-------------------------------------------------------------------- - bool ImageRepository::loadImage( const ::rtl::OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) + bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadImage( _rName, sCurrentSymbolsStyle, _out_rImage, _bSearchLanguageDependent, loadMissing ); @@ -42,7 +42,7 @@ namespace vcl bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadDefaultImage( sCurrentSymbolsStyle,_out_rImage); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 2e90cf7d29a2..d980fc5f09c4 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -368,7 +368,7 @@ void ImpGraphic::ImplClear() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1096,7 +1096,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1286,7 +1286,7 @@ sal_Bool ImpGraphic::ImplSwapOut() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1392,7 +1392,7 @@ sal_Bool ImpGraphic::ImplSwapIn() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1655,7 +1655,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) if(mnSvgDataArrayLength) { SvgDataArray aNewData(new sal_uInt8[mnSvgDataArrayLength]); - rtl::OUString aPath; + OUString aPath; rIStm.Read(aNewData.get(), mnSvgDataArrayLength); aPath = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); @@ -1666,7 +1666,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) new SvgData( aNewData, mnSvgDataArrayLength, - rtl::OUString(aPath))); + OUString(aPath))); rImpGraphic = aSvgDataPtr; } diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 7bb76da3f510..f61a34588f27 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -38,7 +38,7 @@ ImageAryData::ImageAryData( const ImageAryData& rData ) : { } -ImageAryData::ImageAryData( const rtl::OUString &aName, +ImageAryData::ImageAryData( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ) : maName( aName ), mnId( nId ), maBitmapEx( aBitmap ) { @@ -82,7 +82,7 @@ ImplImageList::~ImplImageList() delete *aIt; } -void ImplImageList::AddImage( const ::rtl::OUString &aName, +void ImplImageList::AddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ) { ImageAryData *pImg = new ImageAryData( aName, nId, aBitmapEx ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 4b4cc078558a..29f3e7a1e2a9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -63,10 +63,10 @@ namespace { -rtl::OUString createPath( - rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale) +OUString createPath( + OUString const & name, sal_Int32 pos, OUString const & locale) { - rtl::OUStringBuffer b(name.copy(0, pos + 1)); + OUStringBuffer b(name.copy(0, pos + 1)); b.append(locale); b.append(name.copy(pos)); return b.makeStringAndClear(); @@ -94,7 +94,7 @@ boost::shared_ptr< SvStream > wrapFile(osl::File & file) void loadFromFile( osl::File & file, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapFile(file)); if (path.endsWith(".png")) @@ -131,7 +131,7 @@ boost::shared_ptr< SvStream > wrapStream( void loadFromStream( css::uno::Reference< css::io::XInputStream > const & stream, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapStream(stream)); if (path.endsWith(".png")) @@ -150,7 +150,7 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; } ImplImageTree::~ImplImageTree() {} -bool ImplImageTree::checkStyle(rtl::OUString const & style) +bool ImplImageTree::checkStyle(OUString const & style) { bool exists; @@ -163,9 +163,9 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) setStyle(style); exists = false; - const rtl::OUString sBrandURLSuffix("_brand"); + const OUString sBrandURLSuffix("_brand"); for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) { - ::rtl::OUString aURL = i->first; + OUString aURL = i->first; sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength(); // skip brand-specific icon themes; they are incomplete and thus not useful for this check if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) { @@ -190,7 +190,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) } bool ImplImageTree::loadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized, bool loadMissing ) { bool found = false; @@ -210,17 +210,17 @@ bool ImplImageTree::loadImage( } bool ImplImageTree::loadDefaultImage( - rtl::OUString const & style, + OUString const & style, BitmapEx& bitmap) { return doLoadImage( - rtl::OUString("res/grafikde.png"), + OUString("res/grafikde.png"), style, bitmap, false); } bool ImplImageTree::doLoadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) { setStyle(style); @@ -230,7 +230,7 @@ bool ImplImageTree::doLoadImage( if (!bitmap.IsEmpty()) { bitmap.SetEmpty(); } - std::vector< rtl::OUString > paths; + std::vector< OUString > paths; paths.push_back(name); if (localized) { sal_Int32 pos = name.lastIndexOf('/'); @@ -240,10 +240,10 @@ bool ImplImageTree::doLoadImage( Application::GetSettings().GetUILanguageTag().getLocale(); paths.push_back(createPath(name, pos, loc.Language)); if (!loc.Country.isEmpty()) { - rtl::OUStringBuffer b(loc.Language); + OUStringBuffer b(loc.Language); b.append(sal_Unicode('-')); b.append(loc.Country); - rtl::OUString p(createPath(name, pos, b.makeStringAndClear())); + OUString p(createPath(name, pos, b.makeStringAndClear())); paths.push_back(p); if (!loc.Variant.isEmpty()) { b.append(p); @@ -270,14 +270,14 @@ bool ImplImageTree::doLoadImage( } void ImplImageTree::shutDown() { - m_style = rtl::OUString(); + m_style = OUString(); // for safety; empty m_style means "not initialized" m_paths.clear(); m_iconCache.clear(); m_checkStyleCache.clear(); } -void ImplImageTree::setStyle(rtl::OUString const & style) { +void ImplImageTree::setStyle(OUString const & style) { OSL_ASSERT(!style.isEmpty()); // empty m_style means "not initialized" if (style != m_style) { m_style = style; @@ -289,7 +289,7 @@ void ImplImageTree::setStyle(rtl::OUString const & style) { void ImplImageTree::resetPaths() { m_paths.clear(); { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/program/edition/images"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); @@ -300,12 +300,12 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); b.appendAscii("_brand"); @@ -317,19 +317,19 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); + OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( url, css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); @@ -341,7 +341,7 @@ void ImplImageTree::resetPaths() { } if ( m_style == "default" ) { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images"); + OUString url( "$BRAND_BASE_DIR/share/config/images"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( @@ -350,7 +350,7 @@ void ImplImageTree::resetPaths() { } bool ImplImageTree::checkStyleCacheLookup( - rtl::OUString const & style, bool &exists) + OUString const & style, bool &exists) { CheckStyleCache::iterator i(m_checkStyleCache.find(style)); if (i != m_checkStyleCache.end()) { @@ -362,7 +362,7 @@ bool ImplImageTree::checkStyleCacheLookup( } bool ImplImageTree::iconCacheLookup( - rtl::OUString const & name, bool localized, BitmapEx & bitmap) + OUString const & name, bool localized, BitmapEx & bitmap) { IconCache::iterator i(m_iconCache.find(name)); if (i != m_iconCache.end() && i->second.first == localized) { @@ -374,11 +374,11 @@ bool ImplImageTree::iconCacheLookup( } bool ImplImageTree::find( - std::vector< rtl::OUString > const & paths, BitmapEx & bitmap) + std::vector< OUString > const & paths, BitmapEx & bitmap) { if (!m_cacheIcons) { for (Paths::iterator i(m_paths.begin()); i != m_paths.end(); ++i) { - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { @@ -399,7 +399,7 @@ bool ImplImageTree::find( try { i->second.set( comphelper::getProcessServiceFactory()->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"), + OUString( "com.sun.star.packages.zip.ZipFileAccess"), args), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { @@ -411,7 +411,7 @@ bool ImplImageTree::find( continue; } } - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 9b9b960c5cba..9ec7cf07f743 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -150,23 +150,23 @@ JobSetup::~JobSetup() } } -rtl::OUString JobSetup::GetPrinterName() const +OUString JobSetup::GetPrinterName() const { if ( mpData ) return mpData->maPrinterName; else - return rtl::OUString(); + return OUString(); } -rtl::OUString JobSetup::GetDriverName() const +OUString JobSetup::GetDriverName() const { if ( mpData ) return mpData->maDriver; else - return rtl::OUString(); + return OUString(); } -void JobSetup::SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) +void JobSetup::SetValue( const OUString& rKey, const OUString& rValue ) { if( ! mpData ) mpData = new ImplJobSetup(); @@ -349,9 +349,9 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ImplOldJobSetupData aOldData; memset( &aOldData, 0, sizeof( aOldData ) ); - rtl::OString aPrnByteName(rtl::OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); + OString aPrnByteName(OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 ); - rtl::OString aDriverByteName(rtl::OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); + OString aDriverByteName(OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 ); // nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen; int nPos = rOStream.Tell(); @@ -360,7 +360,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); - ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index c9c5e086e170..ef702cc969cd 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1181,7 +1181,7 @@ IMPL_META_ACTION( Text, META_TEXT_ACTION ) // ------------------------------------------------------------------------ -MetaTextAction::MetaTextAction( const Point& rPt, const rtl::OUString& rStr, +MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_TEXT_ACTION ), maPt ( rPt ), @@ -1291,7 +1291,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : // ------------------------------------------------------------------------ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, - const rtl::OUString& rStr, + const OUString& rStr, const sal_Int32* pDXAry, sal_uInt16 nIndex, sal_uInt16 nLen ) : @@ -1452,7 +1452,7 @@ IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) // ------------------------------------------------------------------------ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const rtl::OUString& rStr, + const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_STRETCHTEXT_ACTION ), maPt ( rPt ), @@ -1541,7 +1541,7 @@ IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) // ------------------------------------------------------------------------ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, - const rtl::OUString& rStr, sal_uInt16 nStyle ) : + const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), maRect ( rRect ), maStr ( rStr ), @@ -3956,7 +3956,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : // ------------------------------------------------------------------------ -MetaCommentAction::MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : +MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), mnValue ( nValue ) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index cfe02e9ea513..e47acb0afa66 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -1283,7 +1283,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const } ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData, - rtl::OUString& rMissingCodes, int nFallbackLevel ) const + OUString& rMissingCodes, int nFallbackLevel ) const { ImplDevFontListData* pFallbackData = NULL; @@ -1318,11 +1318,11 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r if( !bCached || (rFontSelData.maSearchName != aFontName) ) pRemainingCodes[ nRemainingLength++ ] = cChar; } - rMissingCodes = rtl::OUString( pRemainingCodes, nRemainingLength ); + rMissingCodes = OUString( pRemainingCodes, nRemainingLength ); } else { - rtl::OUString aOldMissingCodes = rMissingCodes; + OUString aOldMissingCodes = rMissingCodes; // call the hook to query the best matching glyph fallback font if( mpFallbackHook->FindFontSubstitute( rFontSelData, rMissingCodes ) ) // apply outdev3.cxx specific fontname normalization @@ -1417,8 +1417,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSea return pFoundData; } -ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName, - const rtl::OUString& rShortName) const +ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const { // short circuit for impossible font name alias if (rSearchName.isEmpty()) @@ -1462,7 +1462,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName ) return pFound; } -ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const +ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const OUString& rTokenStr) const { ImplDevFontListData* pFoundData = NULL; @@ -1536,7 +1536,7 @@ void ImplDevFontList::InitMatchData() const ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType, FontWeight eSearchWeight, FontWidth eSearchWidth, - FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const + FontItalic eSearchItalic, const OUString& rSearchFamilyName ) const { if( (eSearchItalic != ITALIC_NONE) && (eSearchItalic != ITALIC_DONTKNOW) ) nSearchType |= IMPL_FONT_ATTR_ITALIC; @@ -2316,7 +2316,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, namespace { - rtl::OUString stripCharSetFromName(rtl::OUString aName) + OUString stripCharSetFromName(OUString aName) { //I worry that someone will have a font which *does* have //e.g. "Greek" legitimately at the end of its name :-( @@ -2439,7 +2439,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, //Win 3.1/Win95 style fontnames which attempt to put the //charset encoding into the filename //http://www.webcenter.ru/~kazarn/eng/fonts_ttf.htm - rtl::OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); + OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); if (!sStrippedName.equals(rFSD.maTargetName)) { rFSD.maTargetName = sStrippedName; @@ -2672,7 +2672,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, } ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, - FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) + FontSelectPattern& rFontSelData, int nFallbackLevel, OUString& rMissingCodes ) { // get a candidate font for glyph fallback // unless the previously selected font got a device specific substitution @@ -3938,7 +3938,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind... for( int i = 0; i < nTestStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutTest(aChars, nTestStrLen); + const OUString aStrikeoutTest(aChars, nTestStrLen); // calculate approximation of strikeout atom size long nStrikeoutWidth = 0; @@ -3958,7 +3958,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, // build the strikeout string for( int i = nTestStrLen; i < nStrikeStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutText(aChars, nStrikeStrLen); + const OUString aStrikeoutText(aChars, nStrikeStrLen); if( mpFontEntry->mnOrientation ) ImplRotatePos( 0, 0, nDistX, nDistY, mpFontEntry->mnOrientation ); @@ -4699,7 +4699,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, rLineInfo.Clear(); if ( !rStr.isEmpty() && (nWidth > 0) ) { - ::rtl::OUString aText( rStr ); + OUString aText( rStr ); uno::Reference < i18n::XBreakIterator > xBI; // get service provider uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -5992,11 +5992,11 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay // get list of unicodes that need glyph fallback int nCharPos = -1; bool bRTL = false; - rtl::OUStringBuffer aMissingCodeBuf; + OUStringBuffer aMissingCodeBuf; while( rLayoutArgs.GetNextPos( &nCharPos, &bRTL) ) aMissingCodeBuf.append( rLayoutArgs.mpStr[ nCharPos ] ); rLayoutArgs.ResetPos(); - rtl::OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); + OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); FontSelectPattern aFontSelData = mpFontEntry->maFontSelData; @@ -6142,7 +6142,7 @@ xub_StrLen OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, xub_StrLen nRetVal = sal::static_int_cast<xub_StrLen>(pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor )); // calculate hyphenated break position - rtl::OUString aHyphenatorStr(nHyphenatorChar); + OUString aHyphenatorStr(nHyphenatorChar); sal_Int32 nTempLen = 1; SalLayout* pHyphenatorLayout = ImplLayout( aHyphenatorStr, 0, nTempLen ); if( pHyphenatorLayout ) @@ -6712,8 +6712,8 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, } else if ( nStyle & TEXT_DRAW_PATHELLIPSIS ) { - rtl::OUString aPath( rOrigStr ); - rtl::OUString aAbbreviatedPath; + OUString aPath( rOrigStr ); + OUString aAbbreviatedPath; osl_abbreviateSystemPath( aPath.pData, &aAbbreviatedPath.pData, nIndex, NULL ); aStr = aAbbreviatedPath; } diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 685f33e9f506..8e9535bece34 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -1126,7 +1126,7 @@ void OutputDevice::Erase() if( pWindow->IsEnabled() ) nState |= CTRL_STATE_ENABLED; bNativeOK = pWindow->DrawNativeControl( CTRL_WINDOW_BACKGROUND, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString() ); + nState, aControlValue, OUString() ); } } diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 449af1b598f0..4727ba6dedef 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -268,7 +268,7 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption ) + OUString aCaption ) { if( !lcl_enableNativeWidget( *this ) ) return sal_False; @@ -310,7 +310,7 @@ sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption, + OUString aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) const { diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 45eb7ed3de70..9895867062b4 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -81,7 +81,7 @@ struct SAL_DLLPRIVATE GlobalSyncData std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; std::deque< sal_uInt32 > mParauInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes; std::deque< PDFNote > mParaPDFNotes; std::deque< PDFWriter::PageTransition > mParaPageTransitions; @@ -290,7 +290,7 @@ struct SAL_DLLPRIVATE PageSyncData std::deque< PDFExtOutDevDataSync > mActions; std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::StructElement > mParaStructElements; std::deque< PDFWriter::StructAttribute > mParaStructAttributes; std::deque< PDFWriter::StructAttributeValue > mParaStructAttributeValues; @@ -691,14 +691,14 @@ sal_Int32 PDFExtOutDevData::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) mpGlobalSyncData->mParaInts.push_back( nDestId ); return 0; } -sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetLinkURL ); mpGlobalSyncData->mParaInts.push_back( nLinkId ); mpGlobalSyncData->mParaOUStrings.push_back( rURL ); return 0; } -sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateOutlineItem ); mpGlobalSyncData->mParaInts.push_back( nParent ); @@ -724,7 +724,7 @@ void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_u /* local (page), actions have to be played synchroniously to the actions of of the recorded metafile (created by each xRenderable->render()) */ - sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) + sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::BeginStructureElement ); mpPageSyncData->mParaStructElements.push_back( eType ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 855e844caa1b..21ed0cc8e664 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -326,7 +326,7 @@ sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle& return pImplementation->registerDestReference( nDestId, rRect, nPageNr, eType ); } //--->i56629 -sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriter::CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { return pImplementation->createNamedDest( sDestName, rRect, nPageNr, eType ); } @@ -340,7 +340,7 @@ sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) return pImplementation->setLinkDest( nLinkId, nDestId ); } -sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { return pImplementation->setLinkURL( nLinkId, rURL ); } @@ -350,7 +350,7 @@ void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId ) pImplementation->setLinkPropertyId( nLinkId, nPropertyId ); } -sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { return pImplementation->createOutlineItem( nParent, rText, nDestID ); } @@ -360,7 +360,7 @@ sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent return pImplementation->setOutlineItemParent( nItem, nNewParent ); } -sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ) +sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText ) { return pImplementation->setOutlineItemText( nItem, rText ); } @@ -375,7 +375,7 @@ void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_In pImplementation->createNote( rRect, rNote, nPageNr ); } -sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { return pImplementation->beginStructureElement( eType, rAlias ); } @@ -445,8 +445,8 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors() } com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > -PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c7cf75b32adf..6eefa3c1b5f7 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -85,13 +85,6 @@ using namespace vcl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OUStringHash; -using ::rtl::OStringBuffer; -using ::rtl::OUStringBuffer; #if (OSL_DEBUG_LEVEL < 3) #define COMPRESS_PAGES @@ -129,9 +122,9 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun: void doTestCode() { static const char* pHome = getenv( "HOME" ); - rtl::OUString aTestFile( "file://" ); - aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); - aTestFile += rtl::OUString( "/pdf_export_test.pdf" ); + OUString aTestFile( "file://" ); + aTestFile += OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); + aTestFile += OUString( "/pdf_export_test.pdf" ); PDFWriter::PDFWriterContext aContext; aContext.URL = aTestFile; @@ -620,7 +613,7 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin * Fhurter limitation: it is advisable to use standard ASCII characters for * OOo bookmarks. */ -static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer ) { const sal_Unicode* pStr = rString.getStr(); sal_Int32 nLen = rString.getLength(); @@ -645,7 +638,7 @@ static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& } //<--- i56629 -static void appendUnicodeTextString( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendUnicodeTextString( const OUString& rString, OStringBuffer& rBuffer ) { rBuffer.append( "FEFF" ); const sal_Unicode* pStr = rString.getStr(); @@ -700,7 +693,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // find or create a hierarchical field // first find the fully qualified name up to this field aDomain = aFullName.copy( 0, nTokenIndex-1 ); - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -761,7 +754,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( !aDomain.isEmpty() ) { - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it != m_aFieldNameMap.end() ) { OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" ); @@ -1874,14 +1867,14 @@ void PDFWriterImpl::setupDocInfo() void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ) { o_rIdentifier.clear(); //build the document id - rtl::OString aInfoValuesOut; + OString aInfoValuesOut; OStringBuffer aID( 1024 ); if( i_rDocInfo.Title.Len() ) appendUnicodeTextString( i_rDocInfo.Title, aID ); @@ -1901,7 +1894,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden osl_getSystemTime( &aGMT ); osl_getLocalTimeFromSystemTime( &aGMT, &aTVal ); osl_getDateTimeFromTimeValue( &aTVal, &aDT ); - rtl::OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); + OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); aCreationDateString.append( "D:" ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) ); @@ -2006,7 +1999,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden check if the Unicode string must be encrypted or not, perform the requested task, append the string as unicode hex, encrypted if needed */ -inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "<" ); if( m_aContext.Encryption.Encrypt() ) @@ -2041,7 +2034,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rOutBuffer.append( ">" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "(" ); sal_Int32 nChars = rInString.getLength(); @@ -2058,17 +2051,17 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInSt rOutBuffer.append( ")" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { - rtl::OStringBuffer aBufferString( rInString ); + OStringBuffer aBufferString( rInString ); appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer); } -void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) +void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) { - rtl::OString aBufferString( rtl::OUStringToOString( rInString, nEnc ) ); + OString aBufferString( OUStringToOString( rInString, nEnc ) ); sal_Int32 nLen = aBufferString.getLength(); - rtl::OStringBuffer aBuf( nLen ); + OStringBuffer aBuf( nLen ); const sal_Char* pT = aBufferString.getStr(); for( sal_Int32 i = 0; i < nLen; i++, pT++ ) @@ -2247,8 +2240,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { ImplDevFontAttributes aDFA; - aDFA.SetFamilyName( rtl::OUString::createFromAscii( rBuiltin.m_pName ) ); - aDFA.SetStyleName( rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ) ); + aDFA.SetFamilyName( OUString::createFromAscii( rBuiltin.m_pName ) ); + aDFA.SetStyleName( OUString::createFromAscii( rBuiltin.m_pStyleName ) ); aDFA.SetFamilyType( rBuiltin.m_eFamily ); aDFA.SetSymbolFlag( rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 ); aDFA.SetPitch( rBuiltin.m_ePitch ); @@ -2336,7 +2329,7 @@ public: const PDFWriterImpl::BuiltinFont&, long nPixelPerEM, int nOrientation ); - void SetText( const rtl::OUString& rText ) { maOrigText = rText; } + void SetText( const OUString& rText ) { maOrigText = rText; } virtual bool LayoutText( ImplLayoutArgs& ); virtual void InitFont() const; virtual void DrawText( SalGraphics& ) const; @@ -2361,7 +2354,7 @@ PDFSalLayout::PDFSalLayout( PDFWriterImpl& rPDFWriterImpl, bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { - const rtl::OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); + const OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); SetText( aText ); SetUnitsPerPixel( 1000 ); @@ -3106,7 +3099,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } sal_Int32 nFontDescriptor = 0; - rtl::OString aSubType( "/Type1" ); + OString aSubType( "/Type1" ); FontSubsetInfo aInfo; // fill in dummy values aInfo.m_nAscent = 1000; @@ -3136,7 +3129,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } else if( pFont->mbSubsettable ) { - aSubType = rtl::OString( "/TrueType" ); + aSubType = OString( "/TrueType" ); Int32Vector aGlyphWidths; Ucs2UIntMap aUnicodeMap; m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap ); @@ -3645,7 +3638,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical } else { - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "GetEmbedFontData failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -3732,7 +3725,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical aUnicodes.clear(); for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it ) { - rtl::OUString aStr( str_it->m_aUnicode ); + OUString aStr( str_it->m_aUnicode ); aEncWidths[nEncoded] = pRef->GetTextWidth( aStr ); nEncodedCodes[nEncoded] = str_it->m_aUnicode; nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded); @@ -4234,7 +4227,7 @@ bool PDFWriterImpl::emitFonts() else { const PhysicalFontFace* pFont = it->first; - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "CreateFontSubset failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -4617,7 +4610,7 @@ we check in the following sequence: } } - rtl::OUString aFileExtension = aTargetURL.GetFileExtension(); + OUString aFileExtension = aTargetURL.GetFileExtension(); // Check if the URL ends in '/': if yes it's a directory, // it will be forced to a URI link. @@ -4631,21 +4624,21 @@ we check in the following sequence: { sal_Int32 bChangeFileExtensionToPDF = false; //examine the file type (.odm .odt. .odp, odg, ods) - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odm" ) ) ) bChangeFileExtensionToPDF = true; - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odt" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odp" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odg" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "ods" ) ) ) bChangeFileExtensionToPDF = true; if( bChangeFileExtensionToPDF ) - aTargetURL.setExtension(rtl::OUString( "pdf" ) ); + aTargetURL.setExtension(OUString( "pdf" ) ); } //check if extension is pdf, see if GoToR should be forced - bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) ); + bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(OUString( "pdf" ) ); if( m_aContext.ForcePDFAction && bTargetHasPDFExtension ) nSetGoToRMode++; } @@ -4668,7 +4661,7 @@ we check in the following sequence: if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INET_PROT_FILE ) bSetRelative = true; - rtl::OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, + OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, if( nSetGoToRMode == 0 ) { switch( m_aContext.DefaultLinkAction ) @@ -4703,7 +4696,7 @@ we check in the following sequence: if( nSetGoToRMode ) { //add the fragment - rtl::OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); + OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); aLine.append("/GoToR"); aLine.append("/F"); bFileSpec = true; @@ -4729,7 +4722,7 @@ we check in the following sequence: //substitute the fragment aTargetURL.SetMark( aLineLoc.getStr() ); } - rtl::OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); + OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL, INetURLObject::WAS_ENCODED, bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE @@ -5329,7 +5322,7 @@ bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDi { // TODO: check and insert default streams - rtl::OString aStandardAppearance; + OString aStandardAppearance; switch( rWidget.m_eType ) { case PDFWriter::CheckBox: @@ -5502,7 +5495,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() appendUnicodeTextStringEncrypt( rWidget.m_aListEntries[ rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject, aValue ); } else - appendUnicodeTextStringEncrypt( rtl::OUString(), rWidget.m_nObject, aValue ); + appendUnicodeTextStringEncrypt( OUString(), rWidget.m_nObject, aValue ); aLine.append( "Ch" ); break; case PDFWriter::ComboBox: @@ -6416,7 +6409,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() OUString( "http://ahost.ax" ) ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); - const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as + const OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as // in link creation ( see PDFWriterImpl::emitLinkAnnotations ) const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -6554,7 +6547,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() aLine.append( " 0 obj\n" "<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier"); - rtl::OUString aComment( "sRGB IEC61966-2.1" ); + OUString aComment( "sRGB IEC61966-2.1" ); appendLiteralStringEncrypt( aComment ,nOIObject, aLine ); aLine.append("/DestOutputProfile "); aLine.append( nICCObject ); @@ -6565,7 +6558,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() } // formats the string for the XML stream -static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue) +static void escapeStringXML( const OUString& rStr, OUString &rValue) { const sal_Unicode* pUni = rStr.getStr(); int nLen = rStr.getLength(); @@ -6574,22 +6567,22 @@ static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue) switch( *pUni ) { case sal_Unicode('&'): - rValue += rtl::OUString( "&" ); + rValue += OUString( "&" ); break; case sal_Unicode('<'): - rValue += rtl::OUString( "<" ); + rValue += OUString( "<" ); break; case sal_Unicode('>'): - rValue += rtl::OUString( ">" ); + rValue += OUString( ">" ); break; case sal_Unicode('\''): - rValue += rtl::OUString( "'" ); + rValue += OUString( "'" ); break; case sal_Unicode('"'): - rValue += rtl::OUString( """ ); + rValue += OUString( """ ); break; default: - rValue += rtl::OUString( *pUni ); + rValue += OUString( *pUni ); break; } } @@ -6636,7 +6629,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:title>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); - rtl::OUString aTitle; + OUString aTitle; escapeStringXML( m_aContext.DocumentInfo.Title, aTitle ); aMetadataStream.append( OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6648,7 +6641,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:creator>\n" ); aMetadataStream.append( " <rdf:Seq>\n" ); aMetadataStream.append( " <rdf:li>" ); - rtl::OUString aAuthor; + OUString aAuthor; escapeStringXML( m_aContext.DocumentInfo.Author, aAuthor ); aMetadataStream.append( OUStringToOString( aAuthor , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6661,7 +6654,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:description>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); - rtl::OUString aSubject; + OUString aSubject; escapeStringXML( m_aContext.DocumentInfo.Subject, aSubject ); aMetadataStream.append( OUStringToOString( aSubject , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6680,7 +6673,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Producer.Len() ) { aMetadataStream.append( " <pdf:Producer>" ); - rtl::OUString aProducer; + OUString aProducer; escapeStringXML( m_aContext.DocumentInfo.Producer, aProducer ); aMetadataStream.append( OUStringToOString( aProducer , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</pdf:Producer>\n" ); @@ -6688,7 +6681,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Keywords.Len() ) { aMetadataStream.append( " <pdf:Keywords>" ); - rtl::OUString aKeywords; + OUString aKeywords; escapeStringXML( m_aContext.DocumentInfo.Keywords, aKeywords ); aMetadataStream.append( OUStringToOString( aKeywords , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</pdf:Keywords>\n" ); @@ -6701,7 +6694,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Creator.Len() ) { aMetadataStream.append( " <xmp:CreatorTool>" ); - rtl::OUString aCreator; + OUString aCreator; escapeStringXML( m_aContext.DocumentInfo.Creator, aCreator ); aMetadataStream.append( OUStringToOString( aCreator , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</xmp:CreatorTool>\n" ); @@ -7328,7 +7321,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs, cChar -= 0xf000; else { - rtl::OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); + OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); cChar = ((sal_Ucs)aChar[0]) & 0x00ff; } } @@ -8116,7 +8109,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa // multiline text if ( nStyle & TEXT_DRAW_MULTILINE ) { - rtl::OUString aLastLine; + OUString aLastLine; ImplMultiTextLineInfo aMultiLineInfo; ImplTextLineInfo* pLineInfo; xub_StrLen i; @@ -8580,7 +8573,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - rtl::OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? rtl::OUString("/") : rtl::OUString("X"); + OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? OUString("/") : OUString("X"); String aStrikeout = aStrikeoutChar; while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth ) aStrikeout.Append( aStrikeout ); @@ -10869,7 +10862,7 @@ sal_Int32 PDFWriterImpl::createLink( const Rectangle& rRect, sal_Int32 nPageNr ) } //--->i56629 -sal_Int32 PDFWriterImpl::createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriterImpl::createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { if( nPageNr < 0 ) nPageNr = m_nCurrentPage; @@ -11155,7 +11148,7 @@ bool PDFWriterImpl::checkEmitStructure() return bEmit; } -sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { if( m_nCurrentPage < 0 ) return -1; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b9fd8f8d143e..81ccbf649341 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -92,12 +92,12 @@ public: FontItalic m_eItalic; // Italic int m_aWidths[256]; // character metrics - rtl::OString getNameObject() const; + OString getNameObject() const; }; enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; - typedef std::map< rtl::OString, sal_Int32 > ResourceMap; + typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict { // note: handle fonts globally for performance @@ -106,7 +106,7 @@ public: ResourceMap m_aShadings; ResourceMap m_aPatterns; - void append( rtl::OStringBuffer&, sal_Int32 nFontDictObject ); + void append( OStringBuffer&, sal_Int32 nFontDictObject ); }; struct PDFPage @@ -140,35 +140,35 @@ public: // to page (useful for transformation matrices // if pOutPoint is set it will be updated to the emitted point // (in PDF map mode, that is 10th of point) - void appendPoint( const Point& rPoint, rtl::OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; + void appendPoint( const Point& rPoint, OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; // appends a B2DPoint without further transformation - void appendPixelPoint( const basegfx::B2DPoint& rPoint, rtl::OStringBuffer& rBuffer ) const; + void appendPixelPoint( const basegfx::B2DPoint& rPoint, OStringBuffer& rBuffer ) const; // appends a rectangle - void appendRect( const Rectangle& rRect, rtl::OStringBuffer& rBuffer ) const; + void appendRect( const Rectangle& rRect, OStringBuffer& rBuffer ) const; // converts a rectangle to 10th points page space void convertRect( Rectangle& rRect ) const; // appends a polygon optionally closing it - void appendPolygon( const Polygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const Polygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polygon optionally closing it - void appendPolygon( const basegfx::B2DPolygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const basegfx::B2DPolygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const PolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // converts a length (either vertical or horizontal; this // can be important if the source MapMode is not // symmetrical) to page length and appends it to the buffer // if pOutLength is set it will be updated to the emitted length // (in PDF map mode, that is 10th of point) - void appendMappedLength( sal_Int32 nLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; + void appendMappedLength( sal_Int32 nLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; // the same for double values - void appendMappedLength( double fLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; + void appendMappedLength( double fLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; // appends LineInfo // returns false if too many dash array entry were created for // the implementation limits of some PDF readers - bool appendLineInfo( const LineInfo& rInfo, rtl::OStringBuffer& rBuffer ) const; + bool appendLineInfo( const LineInfo& rInfo, OStringBuffer& rBuffer ) const; // appends a horizontal waveline with vertical offset (helper for drawWaveLine) - void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, rtl::OStringBuffer& rBuffer ) const; + void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, OStringBuffer& rBuffer ) const; sal_Int32 getWidth() const { return m_nPageWidth ? m_nPageWidth : m_pWriter->m_nInheritedPageWidth; } sal_Int32 getHeight() const { return m_nPageHeight ? m_nPageHeight : m_pWriter->m_nInheritedPageHeight; } @@ -345,7 +345,7 @@ public: struct EmbedCode { sal_Ucs m_aUnicode; - rtl::OString m_aName; + OString m_aName; }; struct EmbedEncoding { @@ -372,7 +372,7 @@ public: //--->i56629 struct PDFNamedDest { - rtl::OUString m_aDestName; + OUString m_aDestName; sal_Int32 m_nPage; PDFWriter::DestAreaType m_eType; Rectangle m_aRect; @@ -386,7 +386,7 @@ public: sal_Int32 m_nNextObject; sal_Int32 m_nPrevObject; std::vector< sal_Int32 > m_aChildren; - rtl::OUString m_aTitle; + OUString m_aTitle; sal_Int32 m_nDestID; PDFOutlineEntry() @@ -414,7 +414,7 @@ public: struct PDFLink : public PDFAnnotation { sal_Int32 m_nDest; // set to -1 for URL, to a dest else - rtl::OUString m_aURL; + OUString m_aURL; sal_Int32 m_nStructParent; // struct parent entry PDFLink() @@ -431,21 +431,21 @@ public: {} }; - typedef boost::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; - typedef boost::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; + typedef boost::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams; + typedef boost::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { PDFWriter::WidgetType m_eType; - rtl::OString m_aName; - rtl::OUString m_aDescription; - rtl::OUString m_aText; + OString m_aName; + OUString m_aDescription; + OUString m_aText; sal_uInt16 m_nTextStyle; - rtl::OUString m_aValue; - rtl::OString m_aDAString; - rtl::OString m_aDRDict; - rtl::OString m_aMKDict; - rtl::OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string + OUString m_aValue; + OString m_aDAString; + OString m_aDRDict; + OString m_aMKDict; + OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string // since the object number is not known at the moment // of filling m_aMKDict, the string will be encrypted when emitted. // the /CA string MUST BE the last added to m_aMKDict @@ -454,14 +454,14 @@ public: sal_Int32 m_nParent; // if not 0, parent's object number std::vector<sal_Int32> m_aKids; // widget children, contains object numbers std::vector<sal_Int32> m_aKidsIndex; // widget children, contains index to m_aWidgets - rtl::OUString m_aOnValue; + OUString m_aOnValue; sal_Int32 m_nTabOrder; // lowest number gets first in tab order sal_Int32 m_nRadioGroup; sal_Int32 m_nMaxLen; bool m_bSubmit; bool m_bSubmitGet; sal_Int32 m_nDest; - std::vector<rtl::OUString> m_aListEntries; + std::vector<OUString> m_aListEntries; std::vector<sal_Int32> m_aSelectedEntries; PDFAppearanceMap m_aAppearances; PDFWidget() @@ -514,7 +514,7 @@ public: { sal_Int32 m_nObject; PDFWriter::StructElement m_eType; - rtl::OString m_aAlias; + OString m_aAlias; sal_Int32 m_nOwnElement; // index into structure vector sal_Int32 m_nParentElement; // index into structure vector sal_Int32 m_nFirstPageObject; @@ -523,8 +523,8 @@ public: std::list< PDFStructureElementKid > m_aKids; PDFStructAttributes m_aAttributes; Rectangle m_aBBox; - rtl::OUString m_aActualText; - rtl::OUString m_aAltText; + OUString m_aActualText; + OUString m_aAltText; com::sun::star::lang::Locale m_aLocale; // m_aContents contains the element's marked content sequence @@ -544,7 +544,7 @@ public: struct PDFAddStream { - rtl::OUString m_aMimeType; + OUString m_aMimeType; PDFOutputStream* m_pStream; sal_Int32 m_nStreamObject; bool m_bCompress; @@ -632,13 +632,13 @@ private: */ sal_Int32 m_nCurrentStructElement; /* structure parent tree */ - std::vector< rtl::OString > m_aStructParentTree; + std::vector< OString > m_aStructParentTree; /* emit strucure marks currently (aka. NonStructElement or not) */ bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > + boost::unordered_map< OString, OString, OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -647,7 +647,7 @@ private: /* maps radio group id to index of radio group control in m_aWidgets */ std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; /* boost::unordered_map for field names, used to ensure unique field names */ - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; + boost::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap; /* contains Bitmaps for gradient functions until they are written * to the file stream */ @@ -807,9 +807,9 @@ i12626 /* the numerical value of the access permissions, according to PDF spec, must be signed */ sal_Int32 m_nAccessPermissions; /* string to hold the PDF creation date */ - rtl::OString m_aCreationDateString; + OString m_aCreationDateString; /* string to hold the PDF creation date, for PDF/A metadata */ - rtl::OString m_aCreationMetaDateString; + OString m_aCreationMetaDateString; /* the buffer where the data are encrypted, dynamically allocated */ sal_uInt8 *m_pEncryptionBuffer; /* size of the buffer */ @@ -826,19 +826,19 @@ i12626 void enableStringEncryption( register sal_Int32 nObject ); // test if the encryption is active, if yes than encrypt the unicode string and add to the OStringBuffer parameter - void appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); - void appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); + void appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); /* creates fonts and subsets that will be emitted later */ void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] ); /* emits a text object according to the passed layout */ /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */ - void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); - void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); + void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); + void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); void drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawRelief( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawShadow( SalLayout& rLayout, const String& rText, bool bTextLines ); @@ -899,9 +899,9 @@ i12626 return m_nFontDictObject; } /* push resource into current (redirected) resource dict */ - void pushResource( ResourceKind eKind, const rtl::OString& rResource, sal_Int32 nObject ); + void pushResource( ResourceKind eKind, const OString& rResource, sal_Int32 nObject ); - void appendBuiltinFontsToDict( rtl::OStringBuffer& rDict ) const; + void appendBuiltinFontsToDict( OStringBuffer& rDict ) const; /* writes a the font dictionary and emits all font objects * returns object id of font directory (or 0 on error) */ @@ -911,13 +911,13 @@ i12626 */ sal_Int32 emitResources(); // appends a dest - bool appendDest( sal_Int32 nDestID, rtl::OStringBuffer& rBuffer ); + bool appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ); // write all links bool emitLinkAnnotations(); // write all notes bool emitNoteAnnotations(); // write the appearance streams of a widget - bool emitAppearances( PDFWidget& rWidget, rtl::OStringBuffer& rAnnotDict ); + bool emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict ); // clean up radio button "On" values void ensureUniqueRadioOnValues(); // write all widgets @@ -932,7 +932,7 @@ i12626 sal_Int32 emitOutline(); // puts the attribute objects of a structure element into the returned string, // helper for emitStructure - rtl::OString emitStructureAttributes( PDFStructureElement& rEle ); + OString emitStructureAttributes( PDFStructureElement& rEle ); //--->i94258 // the maximum array elements allowed for PDF array object static const sal_uInt32 ncMaxPDFArraySize = 8191; @@ -1023,7 +1023,7 @@ i12626 methods for PDF security pad a password according algorithm 3.2, step 1 */ - static void padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); + static void padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); /* algorithm 3.2: compute an encryption key */ static bool computeEncryptionKey( EncHashTransporter*, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, @@ -1043,8 +1043,8 @@ i12626 static void computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ); static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength ); @@ -1063,15 +1063,15 @@ i12626 void writeG4Stream( BitmapReadAccess* i_pBitmap ); // color helper functions - void appendStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); - void appendNonStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); + void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); + void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl(); static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > - initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, + initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ); /* for OutputDevice so the reference device can have a list @@ -1217,9 +1217,9 @@ public: bool bTextLines = true ); void drawText( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, bool bTextLines = true ); void drawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove ); - void drawWaveTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStraightTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStrikeoutLine( rtl::OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); + void drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStraightTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStrikeoutLine( OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); void drawStrikeoutChar( const Point& rPos, long nWidth, FontStrikeout eStrikeout ); void drawLine( const Point& rStart, const Point& rStop ); @@ -1251,7 +1251,7 @@ public: void emitComment( const char* pComment ); //--->i56629 named destinations - sal_Int32 createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + sal_Int32 createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); //--->i59651 //emits output intent @@ -1265,19 +1265,19 @@ public: sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); - sal_Int32 setLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 setLinkURL( sal_Int32 nLinkId, const OUString& rURL ); void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId ); // outline - sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); sal_Int32 setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ); - sal_Int32 setOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); + sal_Int32 setOutlineItemText( sal_Int32 nItem, const OUString& rText ); sal_Int32 setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ); // notes void createNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 ); // structure elements - sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ); + sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ); void endStructureElement(); bool setCurrentStructureElement( sal_Int32 nElement ); bool setStructureAttribute( enum PDFWriter::StructAttribute eAttr, enum PDFWriter::StructAttributeValue eVal ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 03401a3b99d9..1252a122e879 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -543,7 +543,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa { SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); sal_Bool bSkipSequence = sal_False; - rtl::OString sSeqEnd; + OString sSeqEnd; if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" ) { @@ -740,7 +740,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa pAction = aMtf.GetAction( i ); if ( pAction->GetType() == META_COMMENT_ACTION ) { - rtl::OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); + OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); if (sComment == sSeqEnd) break; } @@ -1185,8 +1185,8 @@ void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject ) 1. init the document id, used both for building the document id and for building the encryption key(s) 2. build the encryption key following algorithms described in the PDF specification */ -uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { @@ -1279,10 +1279,10 @@ begin i12626 methods Implements Algorithm 3.2, step 1 only */ -void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) +void PDFWriterImpl::padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) { // get ansi-1252 version of the password string CHECKIT ! i12626 - rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); + OString aString( OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); //copy the string to the target sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 920d8277ad46..12b184169036 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -160,15 +160,15 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = rtl::OUString( "nodepath" ); + aVal.Name = OUString( "nodepath" ); if( i_bFile ) - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/File" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/File" ); else - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); aArgs.getArray()[0] <<= aVal; xConfigAccess = Reference< XNameAccess >( xConfigProvider->createInstanceWithArguments( - rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), + OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), UNO_QUERY ); if( xConfigAccess.is() ) { @@ -326,7 +326,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -348,10 +348,10 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) // ----------------------------------------------------------------------- -ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter ) +ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - boost::unordered_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it = + boost::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; @@ -387,7 +387,7 @@ void ImplDeletePrnQueueList() // ----------------------------------------------------------------------- -const std::vector<rtl::OUString>& Printer::GetPrinterQueues() +const std::vector<OUString>& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -396,7 +396,7 @@ const std::vector<rtl::OUString>& Printer::GetPrinterQueues() } // ----------------------------------------------------------------------- -const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate ) +const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ) { ImplSVData* pSVData = ImplGetSVData(); @@ -425,7 +425,7 @@ const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool // ----------------------------------------------------------------------- -rtl::OUString Printer::GetDefaultPrinterName() +OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); if( !pEnv || !*pEnv ) @@ -434,7 +434,7 @@ rtl::OUString Printer::GetDefaultPrinterName() return pSVData->mpDefInst->GetDefaultPrinter(); } - return rtl::OUString(); + return OUString(); } // ======================================================================= @@ -549,8 +549,8 @@ void Printer::ImplInitDisplay( const Window* pWindow ) // ----------------------------------------------------------------------- -SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const rtl::OUString& rPrinterName, - const rtl::OUString* pDriver ) +SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, + const OUString* pDriver ) { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -666,7 +666,7 @@ Printer::Printer( const QueueInfo& rQueueInfo ) // ----------------------------------------------------------------------- -Printer::Printer( const rtl::OUString& rPrinterName ) +Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( rPrinterName, NULL ); @@ -934,7 +934,7 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) } // Neuen Printer bauen - rtl::OUString aDriver = pPrinter->GetDriverName(); + OUString aDriver = pPrinter->GetDriverName(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( pPrinter->GetName(), &aDriver ); if ( pInfo ) { @@ -1239,12 +1239,12 @@ int Printer::GetPaperInfoCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( Paper ePaper ) +OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mpPaperNames ) { - pSVData->mpPaperNames = new boost::unordered_map< int, rtl::OUString >(); + pSVData->mpPaperNames = new boost::unordered_map< int, OUString >(); if( ImplGetResMgr() ) { ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) ); @@ -1265,19 +1265,19 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) } } - boost::unordered_map<int,rtl::OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); - return (it != pSVData->mpPaperNames->end()) ? it->second : rtl::OUString(); + boost::unordered_map<int,OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); + return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( bool i_bPaperUser ) const +OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); Paper ePaper = ImplGetPaperFormat( aPageSize.Width(), aPageSize.Height() ); if( ePaper == PAPER_USER ) ePaper = ImplGetPaperFormat( aPageSize.Height(), aPageSize.Width() ); - return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : rtl::OUString(); + return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } // ----------------------------------------------------------------------- @@ -1356,7 +1356,7 @@ sal_uInt16 Printer::GetPaperBinCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const +OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) return ImplGetSVEmptyStr(); @@ -1425,7 +1425,7 @@ sal_Bool Printer::EndJob() mbPrinting = sal_False; mnCurPrintPage = 0; - maJobName = rtl::OUString(); + maJobName = OUString(); mbDevOutput = sal_False; bRet = mpPrinter->EndJob(); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index c7ec909f1a1a..3d0e4b0390b5 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -130,15 +130,15 @@ class vcl::ImplPrinterControllerData public: struct ControlDependency { - rtl::OUString maDependsOnName; + OUString maDependsOnName; sal_Int32 mnDependsOnEntry; ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; - typedef boost::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; - typedef boost::unordered_map< rtl::OUString, Sequence< sal_Bool >, rtl::OUStringHash > ChoiceDisableMap; + typedef boost::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap; + typedef boost::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap; + typedef boost::unordered_map< OUString, Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap; boost::shared_ptr<Printer> mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -211,9 +211,9 @@ PrinterController::PrinterController( const boost::shared_ptr<Printer>& i_pPrint mpImplData->mpPrinter = i_pPrinter; } -static rtl::OUString queryFile( Printer* pPrinter ) +static OUString queryFile( Printer* pPrinter ) { - rtl::OUString aResult; + OUString aResult; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker = ui::dialogs::FilePicker::createWithMode(xContext, ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION); @@ -236,7 +236,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) ); #elif defined WNT (void)pPrinter; - xFilePicker->appendFilter( ::rtl::OUString( "*.PRN" ), ::rtl::OUString( "*.prn" ) ); + xFilePicker->appendFilter( OUString( "*.PRN" ), OUString( "*.prn" ) ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); @@ -248,7 +248,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK ) { - uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() ); + uno::Sequence< OUString > aPathSeq( xFilePicker->getFiles() ); INetURLObject aObj( aPathSeq[0] ); aResult = aObj.PathToFileName(); } @@ -284,7 +284,7 @@ void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pControlle ) { sal_Bool bSynchronous = sal_False; - beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( "Wait" ) ); + beans::PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) ); if( pVal ) pVal->Value >>= bSynchronous; @@ -313,7 +313,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr ErrorBox aBox( NULL, VclResId( SV_PRINT_NOPRINTERWARNING ) ); aBox.Execute(); } - pController->setValue( rtl::OUString( "IsDirect" ), + pController->setValue( OUString( "IsDirect" ), makeAny( sal_False ) ); } @@ -323,7 +323,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr // if no specific printer is already set, create the default printer if( ! pController->getPrinter() ) { - rtl::OUString aPrinterName( i_rInitSetup.GetPrinterName() ); + OUString aPrinterName( i_rInitSetup.GetPrinterName() ); boost::shared_ptr<Printer> pPrinter( new Printer( aPrinterName ) ); pPrinter->SetJobSetup( i_rInitSetup ); pController->setPrinter( pPrinter ); @@ -350,7 +350,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr beans::PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) ); if( pPagesVal ) { - rtl::OUString aPagesVal; + OUString aPagesVal; pPagesVal->Value >>= aPagesVal; if( !aPagesVal.isEmpty() ) { @@ -374,7 +374,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr { // do not overwrite PageRange if it is already set beans::PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) ); - rtl::OUString aRange; + OUString aRange; if( pRangeVal ) pRangeVal->Value >>= aRange; if( aRange.isEmpty() ) @@ -382,7 +382,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr sal_Int32 nPages = i_pController->getPageCount(); if( nPages > 0 ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.appendAscii( "1" ); if( nPages > 1 ) { @@ -405,35 +405,35 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr } // setup NUp printing from properties - sal_Int32 nRows = i_pController->getIntProperty( rtl::OUString( "NUpRows" ), 1 ); - sal_Int32 nCols = i_pController->getIntProperty( rtl::OUString( "NUpColumns" ), 1 ); + sal_Int32 nRows = i_pController->getIntProperty( OUString( "NUpRows" ), 1 ); + sal_Int32 nCols = i_pController->getIntProperty( OUString( "NUpColumns" ), 1 ); if( nRows > 1 || nCols > 1 ) { PrinterController::MultiPageSetup aMPS; aMPS.nRows = nRows > 1 ? nRows : 1; aMPS.nColumns = nCols > 1 ? nCols : 1; - sal_Int32 nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); + sal_Int32 nValue = i_pController->getIntProperty( OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); if( nValue >= 0 ) aMPS.nLeftMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); if( nValue >= 0 ) aMPS.nRightMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); if( nValue >= 0 ) aMPS.nTopMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); if( nValue >= 0 ) aMPS.nBottomMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); if( nValue >= 0 ) aMPS.nHorizontalSpacing = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); if( nValue >= 0 ) aMPS.nVerticalSpacing = nValue; - aMPS.bDrawBorder = i_pController->getBoolProperty( rtl::OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); + aMPS.bDrawBorder = i_pController->getBoolProperty( OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); aMPS.nOrder = static_cast<PrinterController::NupOrderType>(i_pController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder )); aMPS.aPaperSize = i_pController->getPrinter()->PixelToLogic( i_pController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ); - beans::PropertyValue* pPgSizeVal = i_pController->getValue( rtl::OUString( "NUpPaperSize" ) ); + beans::PropertyValue* pPgSizeVal = i_pController->getValue( OUString( "NUpPaperSize" ) ); awt::Size aSizeVal; if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) ) { @@ -473,18 +473,18 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr } if( aDlg.isPrintToFile() ) { - rtl::OUString aFile = queryFile( pController->getPrinter().get() ); + OUString aFile = queryFile( pController->getPrinter().get() ); if( aFile.isEmpty() ) { i_pController->abortJob(); return; } - pController->setValue( rtl::OUString( "LocalFileName" ), + pController->setValue( OUString( "LocalFileName" ), makeAny( aFile ) ); } else if( aDlg.isSingleJobs() ) { - pController->setValue( rtl::OUString( "PrintCollateAsSingleJobs" ), + pController->setValue( OUString( "PrintCollateAsSingleJobs" ), makeAny( sal_True ) ); } } @@ -495,8 +495,8 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr pController->pushPropertiesToPrinter(); - rtl::OUString aJobName; - beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( "JobName" ) ); + OUString aJobName; + beans::PropertyValue* pJobNameVal = pController->getValue( OUString( "JobName" ) ); if( pJobNameVal ) pJobNameVal->Value >>= aJobName; @@ -505,7 +505,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr pController->jobFinished( pController->getJobState() ); } -bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::PrinterController>& i_pController ) +bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::PrinterController>& i_pController ) { mnError = PRINTER_OK; @@ -547,16 +547,16 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: return sal_False; sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_pController->getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); + beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; } - beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( "LocalFileName" ) ); + beans::PropertyValue* pFileValue = i_pController->getValue( OUString( "LocalFileName" ) ); if( pFileValue ) { - rtl::OUString aFile; + OUString aFile; pFileValue->Value >>= aFile; if( !aFile.isEmpty() ) { @@ -566,7 +566,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: } } - rtl::OUString* pPrintFile = NULL; + OUString* pPrintFile = NULL; if ( mbPrintFile ) pPrintFile = &maPrintFile; mpPrinterOptions->ReadFromConfig( mbPrintFile ); @@ -721,8 +721,8 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: if( i_pController->isShowDialogs() && ! i_pController->isDirectPrint() ) { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinterUsed" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPrinterUsed" ), GetName() ); } @@ -753,8 +753,8 @@ const boost::shared_ptr<Printer>& PrinterController::getPrinter() const void PrinterController::setPrinter( const boost::shared_ptr<Printer>& i_rPrinter ) { mpImplData->mpPrinter = i_rPrinter; - setValue( rtl::OUString( "Name" ), - makeAny( rtl::OUString( i_rPrinter->GetName() ) ) ); + setValue( OUString( "Name" ), + makeAny( OUString( i_rPrinter->GetName() ) ) ); mpImplData->mnDefaultPaperBin = mpImplData->mpPrinter->GetPaperBin(); mpImplData->mnFixedPaperBin = -1; } @@ -791,7 +791,7 @@ bool PrinterController::setupPrinter( Window* i_pParent ) awt::Size aOverrideSize; aOverrideSize.Width = aNewPaperSize.Width(); aOverrideSize.Height = aNewPaperSize.Height(); - setValue( rtl::OUString( "OverridePageSize" ), + setValue( OUString( "OverridePageSize" ), makeAny( aOverrideSize ) ); mpImplData->mnFixedPaperBin = nNewPaperBin; } @@ -1286,7 +1286,7 @@ bool PrinterController::getReversePrint() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - boost::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet; + boost::unordered_set< OUString, OUStringHash > aMergeSet; size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; for( int i = 0; i < i_rMergeList.getLength(); i++ ) aMergeSet.insert( i_rMergeList[i].Name ); @@ -1301,26 +1301,26 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P aResult[nCur++] = mpImplData->maUIProperties[i]; } // append IsFirstPage - if( aMergeSet.find( rtl::OUString( "IsFirstPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsFirstPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsFirstPage" ); + aVal.Name = OUString( "IsFirstPage" ); aVal.Value <<= mpImplData->mbFirstPage; aResult[nCur++] = aVal; } // append IsLastPage - if( aMergeSet.find( rtl::OUString( "IsLastPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsLastPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsLastPage" ); + aVal.Name = OUString( "IsLastPage" ); aVal.Value <<= mpImplData->mbLastPage; aResult[nCur++] = aVal; } // append IsPrinter - if( aMergeSet.find( rtl::OUString( "IsPrinter" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsPrinter" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsPrinter" ); + aVal.Name = OUString( "IsPrinter" ); aVal.Value <<= sal_True; aResult[nCur++] = aVal; } @@ -1333,21 +1333,21 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const return mpImplData->maUIOptions; } -beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) +beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const +const beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rValue ) +void PrinterController::setValue( const OUString& i_rName, const Any& i_rValue ) { beans::PropertyValue aVal; aVal.Name = i_rName; @@ -1358,7 +1358,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa void PrinterController::setValue( const beans::PropertyValue& i_rValue ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1383,7 +1383,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ i_rOptions[i].Value >>= aOptProp; bool bIsEnabled = true; bool bHaveProperty = false; - rtl::OUString aPropName; + OUString aPropName; vcl::ImplPrinterControllerData::ControlDependency aDep; Sequence< sal_Bool > aChoicesDisabled; for( int n = 0; n < aOptProp.getLength(); n++ ) @@ -1435,10 +1435,10 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ } } -bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const +bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const { bool bEnabled = false; - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1489,7 +1489,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co return bEnabled; } -bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal_Int32 i_nValue ) const +bool PrinterController::isUIChoiceEnabled( const OUString& i_rProperty, sal_Int32 i_nValue ) const { bool bEnabled = true; ImplPrinterControllerData::ChoiceDisableMap::const_iterator it = @@ -1503,9 +1503,9 @@ bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal return bEnabled; } -rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty ) const +OUString PrinterController::getDependency( const OUString& i_rProperty ) const { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1515,9 +1515,9 @@ rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty return aDependency; } -rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty ) +OUString PrinterController::makeEnabled( const OUString& i_rProperty ) { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1565,12 +1565,12 @@ void PrinterController::createProgressDialog() if( ! mpImplData->mpProgress ) { sal_Bool bShow = sal_True; - beans::PropertyValue* pMonitor = getValue( rtl::OUString( "MonitorVisible" ) ); + beans::PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShow; else { - const com::sun::star::beans::PropertyValue* pVal = getValue( rtl::OUString( "IsApi" ) ); + const com::sun::star::beans::PropertyValue* pVal = getValue( OUString( "IsApi" ) ); if( pVal ) { sal_Bool bApi = sal_False; @@ -1608,17 +1608,17 @@ void PrinterController::pushPropertiesToPrinter() { sal_Int32 nCopyCount = 1; // set copycount and collate - const beans::PropertyValue* pVal = getValue( rtl::OUString( "CopyCount" ) ); + const beans::PropertyValue* pVal = getValue( OUString( "CopyCount" ) ); if( pVal ) pVal->Value >>= nCopyCount; sal_Bool bCollate = sal_False; - pVal = getValue( rtl::OUString( "Collate" ) ); + pVal = getValue( OUString( "Collate" ) ); if( pVal ) pVal->Value >>= bCollate; mpImplData->mpPrinter->SetCopyCount( static_cast<sal_uInt16>(nCopyCount), bCollate ); // duplex mode - pVal = getValue( rtl::OUString( "DuplexMode" ) ); + pVal = getValue( OUString( "DuplexMode" ) ); if( pVal ) { sal_Int16 nDuplex = view::DuplexMode::UNKNOWN; @@ -1634,17 +1634,17 @@ void PrinterController::pushPropertiesToPrinter() bool PrinterController::isShowDialogs() const { - sal_Bool bApi = getBoolProperty( rtl::OUString( "IsApi" ), sal_False ); + sal_Bool bApi = getBoolProperty( OUString( "IsApi" ), sal_False ); return ! bApi && ! Application::IsHeadlessModeEnabled(); } bool PrinterController::isDirectPrint() const { - sal_Bool bDirect = getBoolProperty( rtl::OUString( "IsDirect" ), sal_False ); + sal_Bool bDirect = getBoolProperty( OUString( "IsDirect" ), sal_False ); return bDirect == sal_True; } -sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, sal_Bool i_bFallback ) const +sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bool i_bFallback ) const { sal_Bool bRet = i_bFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1653,7 +1653,7 @@ sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, s return bRet; } -sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, sal_Int32 i_nFallback ) const +sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_Int32 i_nFallback ) const { sal_Int32 nRet = i_nFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1665,39 +1665,39 @@ sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, s /* * PrinterOptionsHelper **/ -Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const +Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const { Any aRet; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; return aRet; } -sal_Bool PrinterOptionsHelper::getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault ) const +sal_Bool PrinterOptionsHelper::getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault ) const { sal_Bool bRet = sal_False; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= bRet) ? bRet : i_bDefault; } -sal_Int64 PrinterOptionsHelper::getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault ) const +sal_Int64 PrinterOptionsHelper::getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault ) const { sal_Int64 nRet = 0; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= nRet) ? nRet : i_nDefault; } -rtl::OUString PrinterOptionsHelper::getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault ) const +OUString PrinterOptionsHelper::getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault ) const { - rtl::OUString aRet; + OUString aRet; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= aRet) ? aRet : i_rDefault; } bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i_rNewProp, - std::set< rtl::OUString >* o_pChangeProp ) + std::set< OUString >* o_pChangeProp ) { bool bChanged = false; @@ -1710,7 +1710,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { @@ -1738,16 +1738,16 @@ void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyV sal_Int32 nIndex = io_rProps.getLength(); io_rProps.realloc( nIndex+1 ); PropertyValue aVal; - aVal.Name = rtl::OUString( "ExtraPrintUIOptions" ); + aVal.Name = OUString( "ExtraPrintUIOptions" ); aVal.Value = makeAny( m_aUIProperties ); io_rProps[ nIndex ] = aVal; } } -Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpIds, - const rtl::OUString& i_rType, +Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpIds, + const OUString& i_rType, const PropertyValue* i_pVal, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { @@ -1774,51 +1774,51 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r sal_Int32 nUsed = 0; if( !i_rTitle.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "Text" ); + aCtrl[nUsed ].Name = OUString( "Text" ); aCtrl[nUsed++].Value = makeAny( i_rTitle ); } if( i_rHelpIds.getLength() ) { - aCtrl[nUsed ].Name = rtl::OUString( "HelpId" ); + aCtrl[nUsed ].Name = OUString( "HelpId" ); aCtrl[nUsed++].Value = makeAny( i_rHelpIds ); } - aCtrl[nUsed ].Name = rtl::OUString( "ControlType" ); + aCtrl[nUsed ].Name = OUString( "ControlType" ); aCtrl[nUsed++].Value = makeAny( i_rType ); - aCtrl[nUsed ].Name = rtl::OUString( "ID" ); + aCtrl[nUsed ].Name = OUString( "ID" ); aCtrl[nUsed++].Value = makeAny( i_rIDs ); if( i_pVal ) { - aCtrl[nUsed ].Name = rtl::OUString( "Property" ); + aCtrl[nUsed ].Name = OUString( "Property" ); aCtrl[nUsed++].Value = makeAny( *i_pVal ); } if( !i_rControlOptions.maDependsOnName.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnName" ); + aCtrl[nUsed ].Name = OUString( "DependsOnName" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.maDependsOnName ); if( i_rControlOptions.mnDependsOnEntry != -1 ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnEntry" ); + aCtrl[nUsed ].Name = OUString( "DependsOnEntry" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mnDependsOnEntry ); } if( i_rControlOptions.mbAttachToDependency ) { - aCtrl[nUsed ].Name = rtl::OUString( "AttachToDependency" ); + aCtrl[nUsed ].Name = OUString( "AttachToDependency" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mbAttachToDependency ); } } if( !i_rControlOptions.maGroupHint.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "GroupingHint" ); + aCtrl[nUsed ].Name = OUString( "GroupingHint" ); aCtrl[nUsed++].Value <<= i_rControlOptions.maGroupHint; } if( i_rControlOptions.mbInternalOnly ) { - aCtrl[nUsed ].Name = rtl::OUString( "InternalUIOnly" ); + aCtrl[nUsed ].Name = OUString( "InternalUIOnly" ); aCtrl[nUsed++].Value <<= sal_True; } if( ! i_rControlOptions.mbEnabled ) { - aCtrl[nUsed ].Name = rtl::OUString( "Enabled" ); + aCtrl[nUsed ].Name = OUString( "Enabled" ); aCtrl[nUsed++].Value <<= sal_False; } @@ -1831,45 +1831,45 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r return makeAny( aCtrl ); } -Any PrinterOptionsHelper::setGroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId) +Any PrinterOptionsHelper::setGroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Group"); } -Any PrinterOptionsHelper::setSubgroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, +Any PrinterOptionsHelper::setSubgroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Subgroup", NULL, i_rControlOptions); } -Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Bool i_bValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1878,16 +1878,16 @@ Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_bValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions); } -Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1895,11 +1895,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } @@ -1909,11 +1909,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, "Radio", &aVal, aOpt); } -Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1921,26 +1921,26 @@ Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, i_rHelpId, "List", &aVal, aOpt); } -Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue, sal_Int32 i_nMaxValue, @@ -1951,13 +1951,13 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, { sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 2 ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MinValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MinValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMinValue ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MaxValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MaxValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMaxValue ); } - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1966,19 +1966,19 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Range", &aVal, aOpt); } -Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, - const rtl::OUString& i_rValue, +Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, + const OUString& i_rValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1987,7 +1987,7 @@ Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_rValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Edit", &aVal, i_rControlOptions); } diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 5b6ec445da52..01137b635ae2 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -752,7 +752,7 @@ bool SalGraphics::DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, return drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency ); } -bool SalGraphics::filterText( const rtl::OUString&, rtl::OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) +bool SalGraphics::filterText( const OUString&, OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) { return false; } diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index dfbb40a4b792..13789539a4c3 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -20,7 +20,6 @@ #include <salgdi.hxx> -using ::rtl::OUString; /**************************************************************** * Placeholder for no native widgets diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 1db7c37e088a..e175edafcbb7 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -47,7 +47,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( // create replacement graphic from maSequence // create XPrimitive2DRenderer uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); + const OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); try { @@ -124,7 +124,7 @@ void SvgData::ensureSequenceAndRange() { // create SVG interpreter uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.SvgTools"); + const OUString aServiceName("com.sun.star.graphic.SvgTools"); try { @@ -170,7 +170,7 @@ void SvgData::ensureSequenceAndRange() ////////////////////////////////////////////////////////////////////////////// -SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath) +SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), maPath(rPath), diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 1e79f32731a9..a081188181ba 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -203,9 +203,9 @@ namespace vcl #if OSL_DEBUG_LEVEL > 1 if ( _pDXAry ) { - ::rtl::OStringBuffer aTrace; + OStringBuffer aTrace; aTrace.append( "ReferenceDeviceTextLayout::GetTextArray( " ); - aTrace.append( ::rtl::OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); + aTrace.append( OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); aTrace.append( " ): " ); aTrace.append( nTextWidth ); aTrace.append( " = ( " ); diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 1bff1e40373e..ec335005c60c 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -38,14 +38,14 @@ const char GrFeatureParser::FEAT_PREFIX = ':'; const char GrFeatureParser::FEAT_SEPARATOR = '&'; const char GrFeatureParser::FEAT_ID_VALUE_SEPARATOR = '='; -GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString lang) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const OString lang) : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { maLang.label[0] = maLang.label[1] = maLang.label[2] = maLang.label[3] = '\0'; setLang(pFace, lang); } -GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString features, const ::rtl::OString lang) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const OString features, const OString lang) : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { sal_Int32 nEquals = 0; @@ -62,7 +62,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString fea break; } // check for a lang=xxx specification - const ::rtl::OString aLangPrefix("lang"); + const OString aLangPrefix("lang"); if (features.match(aLangPrefix, pos )) { pos = nEquals + 1; @@ -146,7 +146,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString fea } } -void GrFeatureParser::setLang(const gr_face * pFace, const rtl::OString & lang) +void GrFeatureParser::setLang(const gr_face * pFace, const OString & lang) { FeatId aLang; aLang.num = 0; @@ -201,7 +201,7 @@ GrFeatureParser::~GrFeatureParser() } } -bool GrFeatureParser::isCharId(const rtl::OString & id, size_t offset, size_t length) +bool GrFeatureParser::isCharId(const OString & id, size_t offset, size_t length) { if (length > 4) return false; for (size_t i = 0; i < length; i++) @@ -215,7 +215,7 @@ bool GrFeatureParser::isCharId(const rtl::OString & id, size_t offset, size_t le return true; } -gr_uint32 GrFeatureParser::getCharId(const rtl::OString & id, size_t offset, size_t length) +gr_uint32 GrFeatureParser::getCharId(const OString & id, size_t offset, size_t length) { FeatId charId; charId.num = 0; @@ -233,7 +233,7 @@ gr_uint32 GrFeatureParser::getCharId(const rtl::OString & id, size_t offset, siz return charId.num; } -short GrFeatureParser::getIntValue(const rtl::OString & id, size_t offset, size_t length) +short GrFeatureParser::getIntValue(const OString & id, size_t offset, size_t length) { short value = 0; int sign = 1; diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 5b38618a5277..6951b95b857d 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -675,7 +675,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 ); OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"), + throw lang::IndexOutOfBoundsException(OUString("Palette index out of range"), static_cast<rendering::XBitmapPalette*>(this)); const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast<sal_uInt16>(nIndex)); @@ -697,7 +697,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"), + throw lang::IndexOutOfBoundsException(OUString("Palette index out of range"), static_cast<rendering::XBitmapPalette*>(this)); return sal_False; // read-only implementation diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 954413b603a2..7511ea0d2705 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -158,10 +158,10 @@ String GetCommandLineToken( int nToken, const String& rLine ) *pLeap = 0; - return rtl::OUString(pBuffer); + return OUString(pBuffer); } -rtl::OString GetCommandLineToken(int nToken, const rtl::OString& rLine) +OString GetCommandLineToken(int nToken, const OString& rLine) { sal_Int32 nLen = rLine.getLength(); if (!nLen) @@ -208,10 +208,10 @@ rtl::OString GetCommandLineToken(int nToken, const rtl::OString& rLine) *pLeap = 0; - return rtl::OString(pBuffer); + return OString(pBuffer); } -int GetCommandLineTokenCount(const rtl::OUString& rLine) +int GetCommandLineTokenCount(const OUString& rLine) { if (rLine.isEmpty()) return 0; @@ -314,10 +314,10 @@ String WhitespaceToSpace( const String& rLine, sal_Bool bProtect ) if( *pLeap == ' ' ) *pLeap = 0; - return rtl::OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); + return OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); } -rtl::OString WhitespaceToSpace(const rtl::OString& rLine, sal_Bool bProtect) +OString WhitespaceToSpace(const OString& rLine, sal_Bool bProtect) { sal_Int32 nLen = rLine.getLength(); if (!nLen) @@ -370,7 +370,7 @@ rtl::OString WhitespaceToSpace(const rtl::OString& rLine, sal_Bool bProtect) if( *pLeap == ' ' ) *pLeap = 0; - return rtl::OString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); + return OString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); } } // namespace diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index 69136d6b0b05..887060fb2269 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -29,7 +29,6 @@ using namespace vcl; using namespace com::sun::star::uno; using namespace com::sun::star::awt; -using ::rtl::OUString; DisplayConnection::DisplayConnection() { diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx index 939c55342744..9cf4fe7177a5 100644 --- a/vcl/source/uipreviewer/previewer.cxx +++ b/vcl/source/uipreviewer/previewer.cxx @@ -30,10 +30,10 @@ using namespace com::sun::star; int UIPreviewApp::Main() { - std::vector<rtl::OUString> uifiles; + std::vector<OUString> uifiles; for (sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i) { - rtl::OUString aFileUrl; + OUString aFileUrl; osl::File::getFileURLFromSystemPath(GetCommandLineParam(i), aFileUrl); uifiles.push_back(aFileUrl); } @@ -65,7 +65,7 @@ int UIPreviewApp::Main() Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG); { - VclBuilder aBuilder(pDialog, rtl::OUString(), uifiles[0]); + VclBuilder aBuilder(pDialog, OUString(), uifiles[0]); Dialog *pRealDialog = dynamic_cast<Dialog*>(aBuilder.get_widget_root()); if (!pRealDialog) @@ -73,7 +73,7 @@ int UIPreviewApp::Main() if (pRealDialog) { - pRealDialog->SetText(rtl::OUString("LibreOffice ui-previewer")); + pRealDialog->SetText(OUString("LibreOffice ui-previewer")); pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE); pRealDialog->Execute(); } @@ -83,7 +83,7 @@ int UIPreviewApp::Main() } catch (const uno::Exception &e) { - fprintf(stderr, "fatal error: %s\n", rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); + fprintf(stderr, "fatal error: %s\n", OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); } return EXIT_SUCCESS; diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index f2a8cb64d0d9..8e0af1615d41 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -39,7 +39,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( CUI_DLL_NAME ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); + aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); #else fp = CreateDialogFactory; #endif diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 60b20a6ab623..cbe9dec1bfb7 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1156,7 +1156,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei Rectangle aBounds( aCtrlRegion ); Rectangle aContent( aCtrlRegion ); if( pWin->GetNativeControlRegion( aCtrlType, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBounds, aContent ) ) { mnLeftBorder = aContent.Left() - aBounds.Left(); @@ -1367,14 +1367,14 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* Rectangle aContentRgn( aCtrlRegion ); if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn )) { aCtrlRegion=aContentRgn; } bNativeOK = pWin->DrawNativeControl( aCtrlType, aCtrlPart, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); // if the native theme draws the spinbuttons in one call, make sure the proper settings // are passed, this might force a redraw though.... (TODO: improve) diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 77c0e9c8cb8c..1f7de7a612f6 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -663,13 +663,13 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, Rectangle aBound, aContent; Rectangle aNatRgn( rRect ); if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, - aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) { // if bNoDraw is true then don't call the drawing routine // but just update the target rectangle if( bNoDraw || pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED, - aControlValue, rtl::OUString()) ) + aControlValue, OUString()) ) { rRect = aContent; return; @@ -1072,7 +1072,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo ImplControlValue aValue; ControlState nState = 0; Rectangle aRect(rStart,rStop); - if(nativeSupported && pWin->DrawNativeControl(CTRL_FIXEDLINE,nPart,aRect,nState,aValue,rtl::OUString())) + if(nativeSupported && pWin->DrawNativeControl(CTRL_FIXEDLINE,nPart,aRect,nState,aValue,OUString())) return; } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 30e757170b4f..c37588a74fde 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -50,9 +50,9 @@ // ======================================================================= -static rtl::OString ImplGetDialogText( Dialog* pDialog ) +static OString ImplGetDialogText( Dialog* pDialog ) { - rtl::OStringBuffer aErrorStr(rtl::OUStringToOString( + OStringBuffer aErrorStr(OUStringToOString( pDialog->GetText(), RTL_TEXTENCODING_UTF8)); if ( (pDialog->GetType() == WINDOW_MESSBOX) || (pDialog->GetType() == WINDOW_INFOBOX) || @@ -61,7 +61,7 @@ static rtl::OString ImplGetDialogText( Dialog* pDialog ) (pDialog->GetType() == WINDOW_QUERYBOX) ) { aErrorStr.append(", "); - aErrorStr.append(rtl::OUStringToOString( + aErrorStr.append(OUStringToOString( ((MessBox*)pDialog)->GetMessText(), RTL_TEXTENCODING_UTF8)); } return aErrorStr.makeStringAndClear(); @@ -477,18 +477,18 @@ Dialog::Dialog( WindowType nType ) ImplInitDialogData(); } -#define BASEPATH_SHARE_LAYER rtl::OUString("UIConfig") -#define RELPATH_SHARE_LAYER rtl::OUString("soffice.cfg") -#define SERVICENAME_PATHSETTINGS rtl::OUString("com.sun.star.util.PathSettings") +#define BASEPATH_SHARE_LAYER OUString("UIConfig") +#define RELPATH_SHARE_LAYER OUString("soffice.cfg") +#define SERVICENAME_PATHSETTINGS OUString("com.sun.star.util.PathSettings") -rtl::OUString VclBuilderContainer::getUIRootDir() +OUString VclBuilderContainer::getUIRootDir() { /*to-do, check if user config has an override before using shared one, etc*/ css::uno::Reference< css::beans::XPropertySet > xPathSettings( ::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sShareLayer; + OUString sShareLayer; xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer; // "UIConfig" is a "multi path" ... use first part only here! @@ -520,7 +520,7 @@ void Dialog::doDeferredInit(bool bResizable) mbIsDefferedInit = false; } -Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) +Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : SystemWindow( WINDOW_DIALOG ) , mbIsDefferedInit(true) { @@ -529,7 +529,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); } -Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType) +Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType) : SystemWindow( nType ) , mbIsDefferedInit(true) { @@ -815,7 +815,7 @@ sal_Bool Dialog::ImplStartExecuteModal() if ( mbInExecute ) { #ifdef DBG_UTIL - rtl::OStringBuffer aErrorStr; + OStringBuffer aErrorStr; aErrorStr.append("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): "); aErrorStr.append(ImplGetDialogText(this)); OSL_FAIL(aErrorStr.getStr()); @@ -1261,7 +1261,7 @@ void Dialog::Resize() queue_layout(); } -bool Dialog::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool Dialog::set_property(const OString &rKey, const OString &rValue) { if (rKey == "border-width") set_border_width(rValue.toInt32()); @@ -1293,7 +1293,7 @@ ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) : Show(); } -ModelessDialog::ModelessDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG) { } @@ -1315,7 +1315,7 @@ ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) : init( pParent, rResId ); } -ModalDialog::ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +ModalDialog::ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG) { } diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 32a32c8ecbaf..132722b44e34 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -419,7 +419,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni xCharClass = vcl::unohelper::CreateCharacterClassification(); const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - cCharCode = xCharClass->toUpper( rtl::OUString(cCharCode), 0, 1, rLocale )[0]; + cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0]; if ( i < nFormEnd ) pWindow = ImplGetNextWindow( pParent, i, i, sal_True ); @@ -432,7 +432,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni while ( nPos != STRING_NOTFOUND ) { cCompareChar = aStr.GetChar( nPos+1 ); - cCompareChar = xCharClass->toUpper( rtl::OUString(cCompareChar), 0, 1, rLocale )[0]; + cCompareChar = xCharClass->toUpper( OUString(cCompareChar), 0, 1, rLocale )[0]; if ( cCompareChar == cCharCode ) { if (pWindow->GetType() == WINDOW_FIXEDTEXT) diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index c79c226a8e22..70a1b5d7b5c8 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -185,7 +185,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) Rectangle aCtrlRegion( tmp, GetOutputSizePixel() ); DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); if( !ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { @@ -248,7 +248,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) aTBRect.Bottom() = aOutSz.Height() - 1; } DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aTBRect, nState, aControlValue, rtl::OUString() ); + aTBRect, nState, aControlValue, OUString() ); } } } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d1ac53b4dade..27bb34dec24d 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -291,7 +291,7 @@ void VclBox::setAllocation(const Size &rAllocation) } } -bool VclBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "spacing") set_spacing(rValue.toInt32()); @@ -490,7 +490,7 @@ Size VclButtonBox::calculateRequisition() const return addSpacing(addReqGroups(aReq), nVisibleChildren); } -bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclButtonBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "layout-style") { @@ -1026,12 +1026,12 @@ void VclGrid::setAllocation(const Size& rAllocation) } } -bool toBool(const rtl::OString &rValue) +bool toBool(const OString &rValue) { return (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1'); } -bool VclGrid::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclGrid::set_property(const OString &rKey, const OString &rValue) { if (rKey == "row-spacing") set_row_spacing(rValue.toInt32()); @@ -1177,7 +1177,7 @@ Window *VclFrame::get_child() return const_cast<Window*>(const_cast<const VclFrame*>(this)->get_child()); } -void VclFrame::set_label(const rtl::OUString &rLabel) +void VclFrame::set_label(const OUString &rLabel) { Window *pLabel = get_label_widget(); assert(pLabel); @@ -1223,7 +1223,7 @@ void VclAlignment::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, aChildPos, aAllocation); } -bool VclAlignment::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclAlignment::set_property(const OString &rKey, const OString &rValue) { if (rKey == "bottom-padding") m_nBottomPadding = rValue.toInt32(); @@ -1348,7 +1348,7 @@ void VclExpander::setAllocation(const Size &rAllocation) } } -bool VclExpander::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclExpander::set_property(const OString &rKey, const OString &rValue) { if (rKey == "expanded") m_aDisclosureButton.Check(toBool(rValue)); @@ -1452,7 +1452,7 @@ Size VclScrolledWindow::getVisibleChildSize() const return aRet; } -bool VclScrolledWindow::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue) { bool bRet = VclBin::set_property(rKey, rValue); m_aVScroll.Show((GetStyle() & WB_VSCROLL) != 0); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c8e02adada28..f0e7cf315031 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -98,7 +98,7 @@ static sal_Bool ImplAccelDisabled() if( nAccelDisabled == -1 ) { - rtl::OUString aStr = + OUString aStr = vcl::SettingsConfigItem::get()-> getValue( "Menu", "SuppressAccelerators" ); nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0; @@ -838,14 +838,14 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1 // is an id available, then call help with the id, otherwise // use help-index String aCommand = pMenu->GetItemCommand( nId ); - rtl::OString aHelpId( pMenu->GetHelpId( nId ) ); + OString aHelpId( pMenu->GetHelpId( nId ) ); if( aHelpId.isEmpty() ) aHelpId = OOO_HELP_INDEX; if ( aCommand.Len() ) pHelp->Start( aCommand, NULL ); else - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } bDone = sal_True; } @@ -1298,7 +1298,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) if ( nObjMask & RSC_MENUITEM_HELPID ) { - rtl::OString aHelpId( ReadByteStringRes() ); + OString aHelpId( ReadByteStringRes() ); if ( !bSep ) SetHelpId( nItemId, aHelpId ); } @@ -2035,7 +2035,7 @@ const XubString& Menu::ImplGetHelpText( sal_uInt16 nItemId ) const pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); if( !pData->aHelpText.Len() && !pData->aHelpId.isEmpty() ) - pData->aHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); + pData->aHelpText = pHelp->GetHelpText( OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } } @@ -2068,7 +2068,7 @@ const XubString& Menu::GetTipHelpText( sal_uInt16 nItemId ) const return ImplGetSVEmptyStr(); } -void Menu::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void Menu::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { MenuItemData* pData = pItemList->GetData( nItemId ); @@ -2076,9 +2076,9 @@ void Menu::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) pData->aHelpId = rHelpId; } -rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const +OString Menu::GetHelpId( sal_uInt16 nItemId ) const { - rtl::OString aRet; + OString aRet; MenuItemData* pData = pItemList->GetData( nItemId ); @@ -2087,7 +2087,7 @@ rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const if ( !pData->aHelpId.isEmpty() ) aRet = pData->aHelpId; else - aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); } return aRet; @@ -2582,7 +2582,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } if( ! bNativeOk ) @@ -2603,7 +2603,7 @@ static String getShortenedString( const String& i_rLong, Window* i_pWin, long i_ { if( nPos < aNonMnem.Len() && i_rLong.GetChar(nPos+1) == aNonMnem.GetChar(nPos) ) { - rtl::OUStringBuffer aBuf( i_rLong.Len() ); + OUStringBuffer aBuf( i_rLong.Len() ); aBuf.append( aNonMnem.GetBuffer(), nPos ); aBuf.append( sal_Unicode('~') ); aBuf.append( aNonMnem.GetBuffer()+nPos ); @@ -3674,7 +3674,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - rtl::OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); + OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); MenuItemData* pData = pItemList->Insert( 0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() ); pData->bIsTemporary = sal_True; @@ -5579,7 +5579,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) Point aPt; Rectangle aCtrlRect( aPt, GetOutputSizePixel() ); - DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() ); + DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, OUString() ); } ImplAddNWFSeparator( this, aMenubarValue ); @@ -5813,7 +5813,7 @@ void MenuBarWindow::Paint( const Rectangle& ) Point aPt; Rectangle aCtrlRegion( aPt, GetOutputSizePixel() ); - DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() ); + DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, OUString() ); } ImplAddNWFSeparator( this, aMenubarValue ); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 83c6f63c6177..45ceac4f7ffb 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -273,7 +273,7 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey ) if ( maMnemonics[nMnemonicIndex] ) { maMnemonics[nMnemonicIndex] = 0; - rtl::OUString aStr = rtl::OUStringBuffer(). + OUString aStr = OUStringBuffer(). append('(').append(MNEMONIC_CHAR).append(c). append(')').makeStringAndClear(); nIndex = rKey.Len(); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index baf837054f0d..c7f7da7a31ab 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -171,7 +171,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : sal_uInt16 nLoButtons = ReadShortRes(); sal_uInt16 nHiDefButton = ReadShortRes(); sal_uInt16 nLoDefButton = ReadShortRes(); - rtl::OString aHelpId( ReadByteStringRes() ); + OString aHelpId( ReadByteStringRes() ); /* sal_uInt16 bSysModal = */ ReadShortRes(); SetHelpId( aHelpId ); WinBits nBits = (((sal_uLong)nHiButtons << 16) + nLoButtons) | @@ -252,10 +252,10 @@ void MessBox::ImplPosControls() // Message-Text um Tabs bereinigen - rtl::OUString aTabStr(" "); + OUString aTabStr(" "); sal_uInt16 nIndex = 0; while ( nIndex != STRING_NOTFOUND ) - nIndex = aMessText.SearchAndReplace( rtl::OUString('\t'), aTabStr, nIndex ); + nIndex = aMessText.SearchAndReplace( OUString('\t'), aTabStr, nIndex ); // Wenn Fenster zu schmall, machen wir Dialog auch breiter if ( mpWindowImpl->mbFrame ) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d31b346c258a..b6751b2d07e7 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -202,14 +202,14 @@ void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt ) void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPreview, const Size& i_rOrigSize, - const rtl::OUString& i_rPaperName, - const rtl::OUString& i_rReplacement, + const OUString& i_rPaperName, + const OUString& i_rReplacement, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY, bool i_bGreyscale ) { - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); aBuf.append( maToolTipString ); SetQuickHelpText( aBuf.makeStringAndClear() ); maMtf = i_rNewPreview; @@ -325,7 +325,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect ) Font aFont( GetSettings().GetStyleSettings().GetFieldFont() ); aFont.SetSize( Size( 0, 24 ) ); SetFont( aFont ); - Size aSampleTextSize( GetTextWidth( rtl::OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() ); + Size aSampleTextSize( GetTextWidth( OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() ); Size aOutSize( GetOutputSizePixel() ); Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows ); @@ -341,7 +341,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect ) long nTextHeight = GetTextHeight(); for( int i = 0; i < nPages; i++ ) { - rtl::OUString aPageText( rtl::OUString::valueOf( sal_Int32(i+1) ) ); + OUString aPageText( OUString::valueOf( sal_Int32(i+1) ) ); int nX = 0, nY = 0; switch( mnOrderMode ) { @@ -499,10 +499,10 @@ PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder ) void PrintDialog::JobTabPage::readFromSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue; + OUString aValue; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateBox" ) ); + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "CollateBox" ) ); if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) { mnCollateUIMode = 1; @@ -512,8 +512,8 @@ void PrintDialog::JobTabPage::readFromSettings() else { mnCollateUIMode = 0; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "Collate" ) ); + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "Collate" ) ); mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") ); } } @@ -521,13 +521,13 @@ void PrintDialog::JobTabPage::readFromSettings() void PrintDialog::JobTabPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CopyCount" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "CopyCount" ), mpCopyCountField->GetText() ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "Collate" ), - mpCollateBox->IsChecked() ? rtl::OUString("true") : - rtl::OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "Collate" ), + mpCollateBox->IsChecked() ? OUString("true") : + OUString("false") ); } PrintDialog::OutputOptPage::OutputOptPage( VclBuilder *pUIBuilder ) @@ -539,9 +539,9 @@ PrintDialog::OutputOptPage::OutputOptPage( VclBuilder *pUIBuilder ) void PrintDialog::OutputOptPage::readFromSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateSingleJobs" ) ); + OUString aValue; + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "CollateSingleJobs" ) ); if ( aValue.equalsIgnoreAsciiCase("true") ) { mpCollateSingleJobsBox->Check( sal_True ); @@ -555,14 +555,14 @@ void PrintDialog::OutputOptPage::readFromSettings() void PrintDialog::OutputOptPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "ToFile" ), - mpToFileBox->IsChecked() ? rtl::OUString("true") - : rtl::OUString("false") ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateSingleJobs" ), - mpCollateSingleJobsBox->IsChecked() ? rtl::OUString("true") : - rtl::OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "ToFile" ), + mpToFileBox->IsChecked() ? OUString("true") + : OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "CollateSingleJobs" ), + mpCollateSingleJobsBox->IsChecked() ? OUString("true") : + OUString("false") ); } PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController ) @@ -602,8 +602,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont maJobPage.mpReverseOrderBox->Check( maPController->getReversePrint() ); // fill printer listbox - const std::vector< rtl::OUString >& rQueues( Printer::GetPrinterQueues() ); - for( std::vector< rtl::OUString >::const_iterator it = rQueues.begin(); + const std::vector< OUString >& rQueues( Printer::GetPrinterQueues() ); + for( std::vector< OUString >::const_iterator it = rQueues.begin(); it != rQueues.end(); ++it ) { maJobPage.mpPrinters->InsertEntry( *it ); @@ -617,8 +617,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont { // fall back to last printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - String aValue( pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinter" ) ) ); + String aValue( pItem->getValue( OUString( "PrintDialog" ), + OUString( "LastPrinter" ) ) ); if( maJobPage.mpPrinters->GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND ) { maJobPage.mpPrinters->SelectEntry( aValue ); @@ -703,7 +703,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont // setup dependencies checkControlDependencies(); - if ( maPController->getBoolProperty( rtl::OUString( "HideHelpButton" ), sal_False ) ) + if ( maPController->getBoolProperty( OUString( "HideHelpButton" ), sal_False ) ) mpHelpButton->Hide(); // set initial focus to "Number of copies" maJobPage.mpCopyCountField->GrabFocus(); @@ -725,8 +725,8 @@ void PrintDialog::readFromSettings() // read last selected tab page; if it exists, actiavte it SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPage" ) ); + OUString aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "LastPage" ) ); sal_uInt16 nCount = mpTabCtrl->GetPageCount(); for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -740,10 +740,10 @@ void PrintDialog::readFromSettings() mpOKButton->SetText( maOptionsPage.mpToFileBox->IsChecked() ? maPrintToFileText : maPrintText ); // persistent window state - rtl::OUString aWinState( pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "WindowState" ) ) ); + OUString aWinState( pItem->getValue( OUString( "PrintDialog" ), + OUString( "WindowState" ) ) ); if( !aWinState.isEmpty() ) - SetWindowState( rtl::OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) ); + SetWindowState( OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) ); if( maOptionsPage.mpToFileBox->IsChecked() ) { @@ -760,16 +760,16 @@ void PrintDialog::storeToSettings() // store last selected printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinter" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPrinter" ), maJobPage.mpPrinters->GetSelectEntry() ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPage" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPage" ), mpTabCtrl->GetPageText( mpTabCtrl->GetCurPageId() ) ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "WindowState" ), - rtl::OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 ) + pItem->setValue( OUString( "PrintDialog" ), + OUString( "WindowState" ), + OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 ) ); pItem->Commit(); } @@ -789,13 +789,13 @@ bool PrintDialog::isSingleJobs() return maOptionsPage.mpCollateSingleJobsBox->IsChecked(); } -void setHelpId( Window* i_pWindow, const Sequence< rtl::OUString >& i_rHelpIds, sal_Int32 i_nIndex ) +void setHelpId( Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex ) { if( i_nIndex >= 0 && i_nIndex < i_rHelpIds.getLength() ) - i_pWindow->SetHelpId( rtl::OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); + i_pWindow->SetHelpId( OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); } -static void setHelpText( Window* i_pWindow, const Sequence< rtl::OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) +static void setHelpText( Window* i_pWindow, const Sequence< OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) { // without a help text set and the correct smartID, // help texts will be retrieved from the online help system @@ -810,7 +810,7 @@ void PrintDialog::setupOptionalUI() { if (rOptions[i].Name == "OptionsUIFile") { - rtl::OUString sOptionsUIFile; + OUString sOptionsUIFile; rOptions[i].Value >>= sOptionsUIFile; Window *pCustom = get<Window>("customcontents"); @@ -826,18 +826,18 @@ void PrintDialog::setupOptionalUI() rOptions[i].Value >>= aOptProp; // extract ui element - rtl::OUString aCtrlType; - rtl::OString aID; - rtl::OUString aText; - rtl::OUString aPropertyName; - Sequence< rtl::OUString > aChoices; + OUString aCtrlType; + OString aID; + OUString aText; + OUString aPropertyName; + Sequence< OUString > aChoices; Sequence< sal_Bool > aChoicesDisabled; - Sequence< rtl::OUString > aHelpTexts; - Sequence< rtl::OUString > aIDs; - Sequence< rtl::OUString > aHelpIds; + Sequence< OUString > aHelpTexts; + Sequence< OUString > aIDs; + Sequence< OUString > aHelpIds; sal_Int64 nMinValue = 0, nMaxValue = 0; - rtl::OUString aGroupingHint; - rtl::OUString aDependsOnName; + OUString aGroupingHint; + OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; sal_Bool bUseDependencyRow = sal_False; @@ -847,7 +847,7 @@ void PrintDialog::setupOptionalUI() if ( rEntry.Name == "ID" ) { rEntry.Value >>= aIDs; - aID = rtl::OUStringToOString(aIDs[0], RTL_TEXTENCODING_UTF8); + aID = OUStringToOString(aIDs[0], RTL_TEXTENCODING_UTF8); } if ( rEntry.Name == "Text" ) { @@ -904,7 +904,7 @@ void PrintDialog::setupOptionalUI() { if( ! (rEntry.Value >>= aHelpTexts) ) { - rtl::OUString aHelpText; + OUString aHelpText; if( (rEntry.Value >>= aHelpText) ) { aHelpTexts.realloc( 1 ); @@ -916,7 +916,7 @@ void PrintDialog::setupOptionalUI() { if( ! (rEntry.Value >>= aHelpIds ) ) { - rtl::OUString aHelpId; + OUString aHelpId; if( (rEntry.Value >>= aHelpId) ) { aHelpIds.realloc( 1 ); @@ -943,7 +943,7 @@ void PrintDialog::setupOptionalUI() // set help id if (aHelpIds.getLength() > 0) - mpTabCtrl->SetHelpId(nPageId, rtl::OUStringToOString(aHelpIds.getConstArray()[0], RTL_TEXTENCODING_UTF8)); + mpTabCtrl->SetHelpId(nPageId, OUStringToOString(aHelpIds.getConstArray()[0], RTL_TEXTENCODING_UTF8)); // set help text if (aHelpTexts.getLength() > 0) @@ -1024,7 +1024,7 @@ void PrintDialog::setupOptionalUI() pVal->Value >>= nSelectVal; for( sal_Int32 m = 0; m < aChoices.getLength(); m++ ) { - aID = rtl::OUStringToOString(aIDs[m], RTL_TEXTENCODING_UTF8); + aID = OUStringToOString(aIDs[m], RTL_TEXTENCODING_UTF8); RadioButton* pBtn = get<RadioButton>(aID); if (!pBtn && mpCustomOptionsUIBuilder) pBtn = mpCustomOptionsUIBuilder->get<RadioButton>(aID); @@ -1108,7 +1108,7 @@ void PrintDialog::setupOptionalUI() if (!pField && mpCustomOptionsUIBuilder) pField = mpCustomOptionsUIBuilder->get<Edit>(aID); - rtl::OUString aCurVal; + OUString aCurVal; PropertyValue* pVal = maPController->getValue( aPropertyName ); if( pVal && pVal->Value.hasValue() ) pVal->Value >>= aCurVal; @@ -1126,9 +1126,9 @@ void PrintDialog::setupOptionalUI() } else { - rtl::OStringBuffer sMessage; + OStringBuffer sMessage; sMessage.append("Unsupported UI option: \""); - sMessage.append(rtl::OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8)); + sMessage.append(OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8)); sMessage.append('"'); OSL_FAIL( sMessage.getStr() ); } @@ -1189,7 +1189,7 @@ void PrintDialog::checkControlDependencies() void PrintDialog::checkOptionalControlDependencies() { - for( std::map< Window*, rtl::OUString >::iterator it = maControlToPropertyMap.begin(); + for( std::map< Window*, OUString >::iterator it = maControlToPropertyMap.begin(); it != maControlToPropertyMap.end(); ++it ) { bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second ); @@ -1204,7 +1204,7 @@ void PrintDialog::checkOptionalControlDependencies() // "Page Range" instead of "Print All" if the Edit gets modified if( maReverseDependencySet.find( it->second ) != maReverseDependencySet.end() ) { - rtl::OUString aDep( maPController->getDependency( it->second ) ); + OUString aDep( maPController->getDependency( it->second ) ); // if the dependency is at least enabled, then enable this control anyway if( !aDep.isEmpty() && maPController->isUIOptionEnabled( aDep ) ) bShouldbeEnabled = true; @@ -1228,12 +1228,12 @@ void PrintDialog::checkOptionalControlDependencies() } } -static rtl::OUString searchAndReplace( const rtl::OUString& i_rOrig, const char* i_pRepl, sal_Int32 i_nReplLen, const rtl::OUString& i_rRepl ) +static OUString searchAndReplace( const OUString& i_rOrig, const char* i_pRepl, sal_Int32 i_nReplLen, const OUString& i_rRepl ) { sal_Int32 nPos = i_rOrig.indexOfAsciiL( i_pRepl, i_nReplLen ); if( nPos != -1 ) { - rtl::OUStringBuffer aBuf( i_rOrig.getLength() ); + OUStringBuffer aBuf( i_rOrig.getLength() ); aBuf.append( i_rOrig.getStr(), nPos ); aBuf.append( i_rRepl ); if( nPos + i_nReplLen < i_rOrig.getLength() ) @@ -1245,14 +1245,14 @@ static rtl::OUString searchAndReplace( const rtl::OUString& i_rOrig, const char* void PrintDialog::updatePrinterText() { - const rtl::OUString aDefPrt( Printer::GetDefaultPrinterName() ); + const OUString aDefPrt( Printer::GetDefaultPrinterName() ); const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectEntry(), true ); if( pInfo ) { maJobPage.mpLocationTxt->SetText( pInfo->GetLocation() ); maJobPage.mpCommentTxt->SetText( pInfo->GetComment() ); // FIXME: status text - rtl::OUString aStatus; + OUString aStatus; if( aDefPrt == pInfo->GetPrinterName() ) aStatus = maDefPrtText; maJobPage.mpStatusTxt->SetText( aStatus ); @@ -1267,7 +1267,7 @@ void PrintDialog::updatePrinterText() void PrintDialog::setPreviewText( sal_Int32 ) { - rtl::OUString aNewText( searchAndReplace( maPageStr, "%n", 2, rtl::OUString::valueOf( mnCachedPages ) ) ); + OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::valueOf( mnCachedPages ) ) ); mpNumPagesText->SetText( aNewText ); } @@ -1306,7 +1306,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache ) Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ); mpPreviewWindow->setPreview( aMtf, aCurPageSize, aPrt->GetPaperName( false ), - nPages > 0 ? rtl::OUString() : maNoPageStr, + nPages > 0 ? OUString() : maNoPageStr, aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY(), aPrt->GetPrinterOptions().IsConvertToGreyscales() ); @@ -1517,7 +1517,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString("vcl/ui/printdialog"), mpOKButton ); + pHelp->Start( OUString("vcl/ui/printdialog"), mpOKButton ); } } else if( pButton == mpForwardBtn ) @@ -1562,7 +1562,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) } else if( pButton == maJobPage.mpCollateBox ) { - maPController->setValue( rtl::OUString( "Collate" ), + maPController->setValue( OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); checkControlDependencies(); } @@ -1570,7 +1570,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) { sal_Bool bChecked = maJobPage.mpReverseOrderBox->IsChecked(); maPController->setReversePrint( bChecked ); - maPController->setValue( rtl::OUString( "PrintReverse" ), + maPController->setValue( OUString( "PrintReverse" ), makeAny( bChecked ) ); preparePreview( true, true ); } @@ -1606,9 +1606,9 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) } else if( pEdit == maJobPage.mpCopyCountField ) { - maPController->setValue( rtl::OUString( "CopyCount" ), + maPController->setValue( OUString( "CopyCount" ), makeAny( sal_Int32(maJobPage.mpCopyCountField->GetValue()) ) ); - maPController->setValue( rtl::OUString( "Collate" ), + maPController->setValue( OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); } return 0; @@ -1623,7 +1623,7 @@ IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const { PropertyValue* pVal = NULL; - std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { pVal = maPController->getValue( it->second ); @@ -1636,10 +1636,10 @@ PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const return pVal; } -void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty ) +void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) { beans::PropertyValue* pValue = maPController->getValue( i_rProperty ); - std::map< rtl::OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); + std::map< OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); if( pValue && it != maPropertyToWindowMap.end() ) { const std::vector< Window* >& rWindows( it->second ); @@ -1690,10 +1690,10 @@ void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty ) void PrintDialog::makeEnabled( Window* i_pWindow ) { - std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { - rtl::OUString aDependency( maPController->makeEnabled( it->second ) ); + OUString aDependency( maPController->makeEnabled( it->second ) ); if( !aDependency.isEmpty() ) updateWindowFromProperty( aDependency ); } @@ -1781,7 +1781,7 @@ IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox ) } else { - rtl::OUString aVal( i_pBox->GetText() ); + OUString aVal( i_pBox->GetText() ); pVal->Value <<= aVal; } @@ -1871,7 +1871,7 @@ void PrintProgressDialog::implCalcProgressRect() Rectangle aControlRegion( Point(), Size( 100, mnProgressHeight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { mnProgressHeight = aNativeControlRegion.GetHeight(); @@ -1894,8 +1894,8 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax ) if( mnMax < 1 ) mnMax = 1; - rtl::OUString aNewText( searchAndReplace( maStr, "%p", 2, rtl::OUString::valueOf( mnCur ) ) ); - aNewText = searchAndReplace( aNewText, "%n", 2, rtl::OUString::valueOf( mnMax ) ); + OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::valueOf( mnCur ) ) ); + aNewText = searchAndReplace( aNewText, "%n", 2, OUString::valueOf( mnMax ) ); maText.SetText( aNewText ); // update progress diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index fca03519c4ff..505177d9836b 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -76,7 +76,7 @@ struct ImplStatusItem XubString maText; XubString maHelpText; XubString maQuickHelpText; - rtl::OString maHelpId; + OString maHelpId; void* mpUserData; sal_Bool mbVisible; XubString maAccessibleName; @@ -528,7 +528,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, pWindow->IntersectClipRegion( rFramePosSize ); } sal_Bool bNativeOK = pWindow->DrawNativeControl( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString() ); + CTRL_STATE_ENABLED, aValue, OUString() ); if( bNeedErase ) pWindow->Pop(); if( bNativeOK ) @@ -669,7 +669,7 @@ void StatusBar::ImplCalcProgressRect() Rectangle aControlRegion( Rectangle( (const Point&)Point(), maPrgsFrameRect.GetSize() ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) != sal_False ) { long nProgressHeight = aNativeControlRegion.GetHeight(); @@ -833,7 +833,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - rtl::OString aHelpId( GetHelpId( nItemId ) ); + OString aHelpId( GetHelpId( nItemId ) ); if ( aCommand.Len() || !aHelpId.isEmpty() ) { @@ -844,7 +844,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) if ( aCommand.Len() ) pHelp->Start( aCommand, this ); else if ( !aHelpId.isEmpty() ) - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } @@ -1236,7 +1236,7 @@ const XubString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const if ( pItem->maCommand.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommand, this ); if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -1273,7 +1273,7 @@ const XubString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void StatusBar::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1283,18 +1283,18 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) // ----------------------------------------------------------------------- -rtl::OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const +OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); - rtl::OString aRet; + OString aRet; if ( nPos != STATUSBAR_ITEM_NOTFOUND ) { ImplStatusItem* pItem = (*mpItemList)[ nPos ]; if ( !pItem->maHelpId.isEmpty() ) aRet = pItem->maHelpId; else - aRet = ::rtl::OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); } return aRet; @@ -1428,7 +1428,7 @@ Size StatusBar::CalcWindowSizePixel() const Rectangle aControlRegion( (const Point&)Point(), Size( nCalcWidth, nMinHeight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( pThis->GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { nProgressHeight = aNativeControlRegion.GetHeight(); @@ -1442,7 +1442,7 @@ Size StatusBar::CalcWindowSizePixel() const Rectangle aBound, aContent; Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) ); if( pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, - aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) { mpImplData->mnItemBorderWidth = ( aBound.GetHeight() - aContent.GetHeight() ) / 2; diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index c2f2f13a6f64..0a98fc2f4b57 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -190,12 +190,12 @@ void SystemChildWindow::ImplTestJavaException( void* pEnv ) jclass jcThrowable = pJavaEnv->FindClass("java/lang/Throwable"); jmethodID jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;"); jstring jsMessage = (jstring) pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage); - ::rtl::OUString ouMessage; + OUString ouMessage; if(jsMessage) { const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL); - ouMessage = ::rtl::OUString(jcMessage); + ouMessage = OUString(jcMessage); pJavaEnv->ReleaseStringChars(jsMessage, jcMessage); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 57f555258ad3..d37abdd4c16b 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -45,7 +45,7 @@ public: TaskPaneList* mpTaskPaneList; Size maMaxOutSize; - rtl::OUString maRepresentedURL; + OUString maRepresentedURL; Link maCloseHdl; }; @@ -229,7 +229,7 @@ void SystemWindow::Resizing( Size& ) // ----------------------------------------------------------------------- -void SystemWindow::SetRepresentedURL( const rtl::OUString& i_rURL ) +void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) { bool bChanged = (i_rURL != mpImplData->maRepresentedURL); mpImplData->maRepresentedURL = i_rURL; @@ -437,11 +437,11 @@ Size SystemWindow::GetResizeOutputSizePixel() const // ----------------------------------------------------------------------- static void ImplWindowStateFromStr(WindowStateData& rData, - const rtl::OString& rStr) + const OString& rStr) { sal_uLong nValidMask = 0; sal_Int32 nIndex = 0; - rtl::OString aTokenStr; + OString aTokenStr; aTokenStr = rStr.getToken(0, ',', nIndex); if (!aTokenStr.isEmpty()) @@ -552,13 +552,13 @@ static void ImplWindowStateFromStr(WindowStateData& rData, // ----------------------------------------------------------------------- -static rtl::OString ImplWindowStateToStr(const WindowStateData& rData) +static OString ImplWindowStateToStr(const WindowStateData& rData) { sal_uLong nValidMask = rData.GetMask(); if ( !nValidMask ) - return rtl::OString(); + return OString(); - rtl::OStringBuffer rStrBuf; + OStringBuffer rStrBuf; if ( nValidMask & WINDOWSTATE_MASK_X ) rStrBuf.append(static_cast<sal_Int32>(rData.GetX())); @@ -895,7 +895,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const // ----------------------------------------------------------------------- -void SystemWindow::SetWindowState(const rtl::OString& rStr) +void SystemWindow::SetWindowState(const OString& rStr) { if (rStr.isEmpty()) return; @@ -907,7 +907,7 @@ void SystemWindow::SetWindowState(const rtl::OString& rStr) // ----------------------------------------------------------------------- -rtl::OString SystemWindow::GetWindowState( sal_uLong nMask ) const +OString SystemWindow::GetWindowState( sal_uLong nMask ) const { WindowStateData aData; aData.SetMask( nMask ); @@ -1016,7 +1016,7 @@ void SystemWindow::SetScreenNumber(unsigned int nDisplayScreen) mpWindowImpl->mpFrame->SetScreenNumber( nDisplayScreen ); } -void SystemWindow::SetApplicationID(const rtl::OUString &rApplicationID) +void SystemWindow::SetApplicationID(const OUString &rApplicationID) { mpWindowImpl->mpFrame->SetApplicationID( rApplicationID ); } diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 7dfeb14c4a20..cedf2ea6756d 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -231,7 +231,7 @@ TabDialog::TabDialog( Window* pParent, const ResId& rResId ) : init(pParent, rResId); } -TabDialog::TabDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG) { ImplInitTabDialogData(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 5a57d4e42710..67225eaac30a 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -95,7 +95,7 @@ TabPage::TabPage( Window* pParent, const ResId& rResId ) : Show(); } -TabPage::TabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) +TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : Window(WINDOW_TABPAGE) { ImplInit(pParent, 0); @@ -156,7 +156,7 @@ void TabPage::Paint( const Rectangle& ) // that has to be scaled properly, clipping makes sure that we do not paint too much Rectangle aCtrlRegion( aPoint, GetOutputSizePixel() ); DrawNativeControl( CTRL_TAB_BODY, part, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2e7bddf1d908..809c8cd375ad 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -175,7 +175,7 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis ) Rectangle aArea( aPoint, pThis->GetOutputSizePixel() ); if ( pThis->GetNativeControlRegion(CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { width = pThis->mbHorz ? aContent.GetWidth() : aContent.GetHeight(); } @@ -301,7 +301,7 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis ) ControlState nState = CTRL_STATE_ENABLED; bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ, - aCtrlRegion, nState, aToolbarValue, rtl::OUString() ); + aCtrlRegion, nState, aToolbarValue, OUString() ); } if( bNativeOk ) @@ -497,7 +497,7 @@ sal_Bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) ControlState nState = CTRL_STATE_ENABLED; return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aCtrlRegion, nState, ImplControlValue(), rtl::OUString() ); + aCtrlRegion, nState, ImplControlValue(), OUString() ); } void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ) @@ -2936,7 +2936,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) ImplControlValue aControlValue; ControlState nState = 0; bNativeOk = DrawNativeControl( CTRL_TOOLBAR, nPart, - rRect, nState, aControlValue, rtl::OUString() ); + rRect, nState, aControlValue, OUString() ); } /* Draw the widget only if it can't be drawn natively. */ @@ -2993,7 +2993,7 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, - rRect, nState, aControlValue, rtl::OUString() ); + rRect, nState, aControlValue, OUString() ); } if( !bNativeOk ) @@ -4241,7 +4241,7 @@ const XubString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const if ( pItem->maCommandStr.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -4307,7 +4307,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - rtl::OString aHelpId( GetHelpId( nItemId ) ); + OString aHelpId( GetHelpId( nItemId ) ); if ( aCommand.Len() || !aHelpId.isEmpty() ) { @@ -4318,7 +4318,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) if ( aCommand.Len() ) pHelp->Start( aCommand, this ); else if ( !aHelpId.isEmpty() ) - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 85f7ca9c8830..c90b075c3c79 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -42,7 +42,6 @@ using namespace vcl; -using ::rtl::OUString; // ======================================================================= @@ -353,9 +352,9 @@ sal_Bool ImplToolItem::IsClipped() const // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -const rtl::OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) +const OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) { - rtl::OUString aCvtStr( rStr ); + OUString aCvtStr( rStr ); if ( mbMenuStrings ) aCvtStr = comphelper::string::stripEnd(aCvtStr, '.'); aCvtStr = MnemonicGenerator::EraseAllMnemonicChars( aCvtStr ); @@ -1693,7 +1692,7 @@ const XubString& ToolBox::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1703,9 +1702,9 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) // ----------------------------------------------------------------------- -rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const +OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const { - rtl::OString aRet; + OString aRet; ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1714,7 +1713,7 @@ rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const if ( !pItem->maHelpId.isEmpty() ) aRet = pItem->maHelpId; else - aRet = ::rtl::OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); } return aRet; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 629a1cf8bc5d..137bc26485a9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -105,7 +105,6 @@ using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star; using namespace com::sun; -using ::rtl::OUString; using ::com::sun::star::awt::XTopWindow; @@ -238,7 +237,7 @@ void Window::ImplInitAppFontData( Window* pWindow ) Rectangle aBoundingRgn( aCtrlRegion ); Rectangle aContentRgn( aCtrlRegion ); if( pWindow->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { // comment: the magical +6 is for the extra border in bordered @@ -1221,9 +1220,9 @@ void Window::ImplCallMove() // ----------------------------------------------------------------------- -static rtl::OString ImplAutoHelpID( ResMgr* pResMgr ) +static OString ImplAutoHelpID( ResMgr* pResMgr ) { - rtl::OString aRet; + OString aRet; if( pResMgr && Application::IsAutoHelpIdEnabled() ) aRet = pResMgr->GetAutoHelpId(); @@ -4215,7 +4214,7 @@ Window::Window( Window* pParent, const ResId& rResId ) #if OSL_DEBUG_LEVEL > 0 namespace { - rtl::OString lcl_createWindowInfo(const Window& i_rWindow) + OString lcl_createWindowInfo(const Window& i_rWindow) { // skip border windows, they don't carry information which helps diagnosing the problem const Window* pWindow( &i_rWindow ); @@ -4224,11 +4223,11 @@ namespace if ( !pWindow ) pWindow = &i_rWindow; - rtl::OStringBuffer aErrorString; + OStringBuffer aErrorString; aErrorString.append(' '); aErrorString.append(typeid( *pWindow ).name()); aErrorString.append(" ("); - aErrorString.append(rtl::OUStringToOString(pWindow->GetText(), RTL_TEXTENCODING_UTF8)); + aErrorString.append(OUStringToOString(pWindow->GetText(), RTL_TEXTENCODING_UTF8)); aErrorString.append(")"); return aErrorString.makeStringAndClear(); } @@ -4358,7 +4357,7 @@ Window::~Window() #if OSL_DEBUG_LEVEL > 0 if ( sal_True ) // always perform these tests in non-pro versions { - rtl::OStringBuffer aErrorStr; + OStringBuffer aErrorStr; sal_Bool bError = sal_False; Window* pTempWin; if (mpWindowImpl->mpFrameData != 0) @@ -4375,15 +4374,15 @@ Window::~Window() } if ( bError ) { - rtl::OStringBuffer aTempStr; + OStringBuffer aTempStr; aTempStr.append("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL(aTempStr.getStr()); // abort in non-pro version, this must be fixed! - GetpApp()->Abort(rtl::OStringToOUString( + GetpApp()->Abort(OStringToOUString( aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } } @@ -4401,18 +4400,18 @@ Window::~Window() } if ( bError ) { - rtl::OStringBuffer aTempStr( "Window (" ); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr( "Window (" ); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } if ( mpWindowImpl->mpFirstChild ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live children destroyed: "); pTempWin = mpWindowImpl->mpFirstChild; while ( pTempWin ) @@ -4421,13 +4420,13 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } if ( mpWindowImpl->mpFirstOverlap ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); pTempWin = mpWindowImpl->mpFirstOverlap; while ( pTempWin ) @@ -4436,7 +4435,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } Window* pMyParent = this; @@ -4450,11 +4449,11 @@ Window::~Window() } if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") still in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } } #endif @@ -4476,8 +4475,8 @@ Window::~Window() } else { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") not found in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); } @@ -4518,12 +4517,12 @@ Window::~Window() // #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below bHasFocussedChild = sal_True; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)). append(") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in non-pro version, this must be fixed! #endif } @@ -4900,7 +4899,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else { - String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + String aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); if ( aStrHelpId.Len() == 0 && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else @@ -4911,7 +4910,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) if( aStrHelpId.Len() > 0 ) pHelp->Start( aStrHelpId, this ); else - pHelp->Start( rtl::OUString( OOO_HELP_INDEX ), this ); + pHelp->Start( OUString( OOO_HELP_INDEX ), this ); } } } @@ -7926,7 +7925,7 @@ const XubString& Window::GetHelpText() const { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + String aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); bool bStrHelpId = (aStrHelpId.Len() > 0); if ( !mpWindowImpl->maHelpText.Len() && bStrHelpId ) @@ -7946,10 +7945,10 @@ const XubString& Window::GetHelpText() const static const char* pEnv = getenv( "HELP_DEBUG" ); if( pEnv && *pEnv ) { - rtl::OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); + OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); aTxt.append( mpWindowImpl->maHelpText ); aTxt.appendAscii( "\n------------------\n" ); - aTxt.append( rtl::OUString( aStrHelpId ) ); + aTxt.append( OUString( aStrHelpId ) ); mpWindowImpl->maHelpText = aTxt.makeStringAndClear(); } mpWindowImpl->mbHelpTextDynamic = sal_False; @@ -9689,9 +9688,9 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& / SetParent( pRealParent ); } -rtl::OUString Window::GetSurroundingText() const +OUString Window::GetSurroundingText() const { - return rtl::OUString(); + return OUString(); } Selection Window::GetSurroundingTextSelection() const diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx index 4a89bd5aec31..5816244c1372 100644 --- a/vcl/test/canvasbitmaptest.cxx +++ b/vcl/test/canvasbitmaptest.cxx @@ -66,7 +66,7 @@ SAL_IMPLEMENT_MAIN() uno::Reference< lang::XMultiServiceFactory > xMS; xMS = cppu::createRegistryServiceFactory( - rtl::OUString( "applicat.rdb" ), + OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -111,7 +111,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString("CanvasBitmap test harness") ); + SetText( OUString("CanvasBitmap test harness") ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -1024,7 +1024,7 @@ void Main() { TestWindow aWindow; aWindow.Execute(); - aWindow.SetText( rtl::OUString( "VCL - canvasbitmaptest" ) ); + aWindow.SetText( OUString( "VCL - canvasbitmaptest" ) ); Application::Execute(); } diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index 83c98872f0ad..b2cf7ada6761 100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx @@ -181,7 +181,7 @@ void MyApp::Main() MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "Drag And Drop - Workbench" ) ); + aMainWin.SetText( OUString( "Drag And Drop - Workbench" ) ); aMainWin.Show(); // test the clipboard code diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 7ff60cb3ed83..d29b43dd74d8 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -384,7 +384,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data, pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL( pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags); pPreeditData->aInputEv.mnCursorPos = call_data->caret; - pPreeditData->aInputEv.maText = rtl::OUString(pPreeditData->aText.pUnicodeBuffer, + pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer, pPreeditData->aText.nLength); pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first; @@ -546,7 +546,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) else { fprintf( stderr, "XIMStatusDataType %s not supported\n", - call_data->type == XIMBitmapType ? "XIMBitmapType" : rtl::OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() ); + call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() ); } #endif return; @@ -556,7 +556,7 @@ void SwitchIMCallback (XIC, XPointer, XPointer call_data) { XIMSwitchIMNotifyCallbackStruct* pCallData = (XIMSwitchIMNotifyCallbackStruct*)call_data; - ::vcl::I18NStatus::get().changeIM( rtl::OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); + ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } // ---------------------------------------------------------------------------------- diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index dd8abd8cc16b..54a0ae670258 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -568,7 +568,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) aTextEvent.mnTime = 0; aTextEvent.mpTextAttr = 0; aTextEvent.mnCursorPos = nLength; - aTextEvent.maText = rtl::OUString(pText, nLength); + aTextEvent.maText = OUString(pText, nLength); aTextEvent.mnCursorFlags = 0; aTextEvent.mnDeltaStart = 0; aTextEvent.mbOnlyCursor = False; diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 430aea2f43d7..0ba5fc14b54e 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -167,7 +167,7 @@ SetSystemLocale( const char* p_inlocale ) #ifdef SOLARIS static void -SetSystemEnvironment( const rtl::OUString& rLocale ) +SetSystemEnvironment( const OUString& rLocale ) { OUString LC_ALL_Var("LC_ALL"); osl_setEnvironment(LC_ALL_Var.pData, rLocale.pData); diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 53fa8c270ef2..5d7e7f20ea4b 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -597,7 +597,7 @@ void I18NStatus::setStatusText( const String& rText ) else pBuffer[i] = pCopy[i]; } - rtl::OUString aText( pBuffer ); + OUString aText( pBuffer ); m_pStatusWindow->setText( aText ); m_pStatusWindow->setPosition( m_pParent ); diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index b733c734e719..6356c61b3ba5 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -461,7 +461,7 @@ namespace vcl_sal { }; // translate keycodes, used within the displayed menu shortcuts - rtl::OUString getKeysymReplacementName( rtl::OUString pLang, KeySym nSymbol ) + OUString getKeysymReplacementName( OUString pLang, KeySym nSymbol ) { for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ ) { @@ -471,7 +471,7 @@ namespace vcl_sal { for( int m = aKeyboards[n].nReplacements ; m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } } } @@ -481,10 +481,10 @@ namespace vcl_sal { for( int m = SAL_N_ELEMENTS(aImplReplacements_English); m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } - return rtl::OUString(); + return OUString(); } } diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index c7f5351dc137..6202b34c077f 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -405,15 +405,15 @@ void SalXLib::Init() // is there a -display command line parameter? sal_uInt32 nParams = osl_getCommandArgCount(); - rtl::OUString aParam; - rtl::OString aDisplay; + OUString aParam; + OString aDisplay; for (sal_uInt16 i=0; i<nParams; i++) { osl_getCommandArg(i, &aParam.pData); if ( aParam == "-display" ) { osl_getCommandArg(i+1, &aParam.pData); - aDisplay = rtl::OUStringToOString( + aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding()); if ((pDisp = XOpenDisplay(aDisplay.getStr()))!=NULL) @@ -436,17 +436,17 @@ void SalXLib::Init() // Open $DISPLAY or default... char *pDisplay = getenv("DISPLAY"); if (pDisplay != NULL) - aDisplay = rtl::OString(pDisplay); + aDisplay = OString(pDisplay); pDisp = XOpenDisplay(pDisplay); } if ( !pDisp ) { - rtl::OUString aProgramFileURL; + OUString aProgramFileURL; osl_getExecutableFile( &aProgramFileURL.pData ); - rtl::OUString aProgramSystemPath; + OUString aProgramSystemPath; osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData); - rtl::OString aProgramName = rtl::OUStringToOString( + OString aProgramName = OUStringToOString( aProgramSystemPath, osl_getThreadTextEncoding() ); std::fprintf( stderr, "%s X11 error: Can't open display: %s\n", diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index fdc0c6814dc6..6867f4da1730 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -78,7 +78,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); using namespace vcl_sal; -using ::rtl::OUString; #define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) #define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 ) @@ -494,7 +493,7 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const 1 ); - rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); + OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); const char* argv[2]; argv[0] = "/bin/sh"; argv[1] = aExec.getStr(); @@ -587,7 +586,7 @@ void SalDisplay::Init() const char* pValStr = XGetDefault( pDisp_, "Xft", "dpi" ); if( pValStr != NULL ) { - const rtl::OString aValStr( pValStr ); + const OString aValStr( pValStr ); const long nDPI = (long) aValStr.toDouble(); // guard against insane resolution if( (nDPI >= 50) && (nDPI <= 500) ) @@ -723,10 +722,10 @@ sal_uInt16 SalDisplay::GetIndicatorState() const return nState; } -rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const +OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const { - rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); - rtl::OUString aRet; + OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); + OUString aRet; // return an empty string for keysyms that are not bound to // any key code @@ -734,7 +733,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) - aRet = rtl::OUString( "???" ); + aRet = OUString( "???" ); else { aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym ); @@ -743,9 +742,9 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const const char *pString = XKeysymToString( nKeySym ); int n = strlen( pString ); if( n > 2 && pString[n-2] == '_' ) - aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); + aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); else - aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); + aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); } } } @@ -789,7 +788,7 @@ void SalDisplay::ModifierMapping() XFreeModifiermap( pXModMap ); } -rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const +OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const { String aStrMap; String aCustomKeyName; diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 7cb72e8d5bf0..cfa587ec7f57 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -138,7 +138,7 @@ SalSession * SessionManagerClient::m_pSession = NULL; boost::scoped_ptr< ICEConnectionObserver > SessionManagerClient::m_pICEConnectionObserver; SmcConn SessionManagerClient::m_pSmcConnection = NULL; -rtl::OString SessionManagerClient::m_aClientID; +OString SessionManagerClient::m_aClientID; bool SessionManagerClient::m_bDocSaveDone = false; // HACK extern "C" { @@ -164,7 +164,7 @@ static void BuildSmPropertyList() { if( ! pSmProps ) { - rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); + OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); nSmProps = 5; pSmProps = new SmProp[ nSmProps ]; @@ -198,8 +198,8 @@ static void BuildSmPropertyList() pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.getLength()+1; pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr()); - rtl::OUString aUserName; - rtl::OString aUser; + OUString aUserName; + OString aUser; oslSecurity aSec = osl_getCurrentSecurity(); if( aSec ) { @@ -431,7 +431,7 @@ void SessionManagerClient::open(SalSession * pSession) aCallbacks.save_complete.client_data = NULL; aCallbacks.shutdown_cancelled.callback = ShutdownCanceledProc; aCallbacks.shutdown_cancelled.client_data = NULL; - rtl::OString aPrevId(getPreviousSessionID()); + OString aPrevId(getPreviousSessionID()); char* pClientID = NULL; char aErrBuf[1024]; m_pSmcConnection = SmcOpenConnection( NULL, @@ -476,7 +476,7 @@ void SessionManagerClient::open(SalSession * pSession) } } -rtl::OString SessionManagerClient::getSessionID() +OString SessionManagerClient::getSessionID() { return m_aClientID; } @@ -522,9 +522,9 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown ) } -rtl::OUString SessionManagerClient::getExecName() +OUString SessionManagerClient::getExecName() { - rtl::OUString aExec, aSysExec; + OUString aExec, aSysExec; osl_getExecutableFile( &aExec.pData ); osl_getSystemPathFromFileURL( aExec.pData, &aSysExec.pData ); @@ -534,18 +534,18 @@ rtl::OUString SessionManagerClient::getExecName() } -rtl::OString SessionManagerClient::getPreviousSessionID() +OString SessionManagerClient::getPreviousSessionID() { - rtl::OString aPrevId; + OString aPrevId; sal_uInt32 n = rtl_getAppCommandArgCount(); for (sal_uInt32 i = 0; i != n; ++i) { - ::rtl::OUString aArg; + OUString aArg; rtl_getAppCommandArg( i, &aArg.pData ); if(aArg.match("--session=")) { - aPrevId = rtl::OUStringToOString( + aPrevId = OUStringToOString( aArg.copy(RTL_CONSTASCII_LENGTH("--session=")), osl_getThreadTextEncoding()); break; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index b2de7a048333..c5fa4bc0540c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -211,7 +211,7 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay ) #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "Window Manager's name is \"%s\"\n", - rtl::OUStringToOString(pAdaptor->getWindowManagerName(), + OUStringToOString(pAdaptor->getWindowManagerName(), RTL_TEXTENCODING_UTF8).getStr()); #endif return pAdaptor; @@ -843,7 +843,7 @@ bool WMAdaptor::getNetWmName() && nItems != 0 ) { - rtl::OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 ); + OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 ); nVersionMajor = aMetaVersion.getToken(0, '.').toInt32(); nVersionMinor = aMetaVersion.getToken(1, '.').toInt32(); } @@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const pWMA->m_bWMshouldSwitchWorkspace = true; vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get(); - rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ), - rtl::OUString( "ShouldSwitchWorkspace" ) ) ); + OUString aSetting( pItem->getValue( OUString( "WM" ), + OUString( "ShouldSwitchWorkspace" ) ) ); if( aSetting.isEmpty() ) { if( m_aWMName.EqualsAscii( "awesome" ) ) @@ -981,27 +981,27 @@ void GnomeWMAdaptor::initAtoms() void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const { - rtl::OString aTitle(rtl::OUStringToOString(rWMName, + OString aTitle(OUStringToOString(rWMName, osl_getThreadTextEncoding())); /* FIXME-BCP47: what slumbering dogs may we wake up here? */ - ::rtl::OString aWMLocale; + OString aWMLocale; rtl_Locale* pLocale = NULL; osl_getProcessLocale( &pLocale ); if( pLocale ) { - ::rtl::OUString aLocaleString( pLocale->Language ); - ::rtl::OUString aCountry( pLocale->Country ); - ::rtl::OUString aVariant( pLocale->Variant ); + OUString aLocaleString( pLocale->Language ); + OUString aCountry( pLocale->Country ); + OUString aVariant( pLocale->Variant ); if( !aCountry.isEmpty() ) { - aLocaleString += ::rtl::OUString("_"); + aLocaleString += OUString("_"); aLocaleString += aCountry; } if( !aVariant.isEmpty() ) aLocaleString += aVariant; - aWMLocale = ::rtl::OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 ); + aWMLocale = OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 ); } else { @@ -1101,7 +1101,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const { WMAdaptor::setWMName( pFrame, rWMName ); - rtl::OString aTitle(rtl::OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8)); + OString aTitle(OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8)); const SystemEnvData* pEnv = pFrame->GetSystemData(); if( m_aWMAtoms[ NET_WM_NAME ] ) XChangeProperty( m_pDisplay, @@ -2386,7 +2386,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const */ void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const { - rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) ); + OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) ); XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, sal::static_int_cast<unsigned long>( aWmClient.getLength() ) }; XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp ); } diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index e98dfc2dce8f..465326b4209a 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -35,8 +35,6 @@ #include <unistd.h> #include <string.h> -using ::rtl::OUString; -using ::rtl::OString; static bool is_gnome_desktop( Display* pDisplay ) { @@ -246,7 +244,7 @@ static bool is_kde_desktop( Display* pDisplay ) return true; // does not exist => KDE3 } - rtl::OUString aVer( "3" ); + OUString aVer( "3" ); if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) { return true; @@ -263,7 +261,7 @@ static bool is_kde4_desktop( Display* pDisplay ) { if ( NULL != getenv( "KDE_FULL_SESSION" ) ) { - rtl::OUString aVer( "4" ); + OUString aVer( "4" ); const char *pVer = getenv( "KDE_SESSION_VERSION" ); if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index dee55c4b47c1..82f1ce9ee34c 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -44,7 +44,6 @@ using namespace cppu; using namespace osl; using namespace x11; -using ::rtl::OUString; X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper2< diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 19f56e842780..18c08b036f7e 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -61,7 +61,7 @@ namespace x11 { X11Clipboard( SelectionManager& rManager, Atom aSelection ); virtual ~X11Clipboard(); - static X11Clipboard* get( const ::rtl::OUString& rDisplayName, Atom aSelection ); + static X11Clipboard* get( const OUString& rDisplayName, Atom aSelection ); /* * XInitialization @@ -72,13 +72,13 @@ namespace x11 { * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); /* @@ -93,7 +93,7 @@ namespace x11 { const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(RuntimeException); /* @@ -125,7 +125,7 @@ namespace x11 { // ------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); + Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index f995006f5356..f262003e10f9 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; -using ::rtl::OUString; DropTarget::DropTarget() : ::cppu::WeakComponentImplHelper3< diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 46c2910ed8fb..90e14923b31f 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -82,9 +82,6 @@ using namespace cppu; using namespace x11; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OStringToOUString; // stubs to satisfy solaris compiler's rather rigid linking warning extern "C" @@ -1022,7 +1019,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In // ------------------------------------------------------------------------ -bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData ) +bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ) { bool bSuccess = false; diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 823cd5f259b7..5e6d45e1342c 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -51,7 +51,7 @@ namespace x11 { class PixmapHolder; // in bmp.hxx // ------------------------------------------------------------------------ - rtl_TextEncoding getTextPlainEncoding( const ::rtl::OUString& rMimeType ); + rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor { @@ -106,9 +106,9 @@ namespace x11 { virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); }; @@ -127,9 +127,9 @@ namespace x11 { virtual ~SelectionManagerHolder(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); // XInitialization @@ -157,7 +157,7 @@ namespace x11 { >, public SelectionAdaptor { - static ::boost::unordered_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); + static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -361,9 +361,9 @@ namespace x11 { Atom m_nXdndActionPrivate; // caching for atoms - ::boost::unordered_map< Atom, ::rtl::OUString > + ::boost::unordered_map< Atom, OUString > m_aAtomToString; - ::boost::unordered_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > + ::boost::unordered_map< OUString, Atom, OUStringHash > m_aStringToAtom; // the registered selections @@ -426,13 +426,13 @@ namespace x11 { bool handleXEvent( XEvent& rEvent ); // compound text conversion - ::rtl::OString convertToCompound( const ::rtl::OUString& rText ); - ::rtl::OUString convertFromCompound( const char* pText, int nLen = -1 ); + OString convertToCompound( const OUString& rText ); + OUString convertFromCompound( const char* pText, int nLen = -1 ); sal_Int8 getUserDragAction() const; sal_Int32 getSelectionTimeout(); public: - static SelectionManager& get( const ::rtl::OUString& rDisplayName = ::rtl::OUString() ); + static SelectionManager& get( const OUString& rDisplayName = OUString() ); Display * getDisplay() { return m_pDisplay; }; XLIB_Window getWindow() { return m_aWindow; }; @@ -446,19 +446,19 @@ namespace x11 { osl::Mutex& getMutex() { return m_aMutex; } - Atom getAtom( const ::rtl::OUString& rString ); - const ::rtl::OUString& getString( Atom nAtom ); + Atom getAtom( const OUString& rString ); + const OUString& getString( Atom nAtom ); // type conversion // note: convertTypeToNative does NOT clear the list, so you can append // multiple types to the same list - void convertTypeToNative( const ::rtl::OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false ); - ::rtl::OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat ); + void convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false ); + OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat ); void getNativeTypeList( const Sequence< com::sun::star::datatransfer::DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection ); // methods for transferable bool getPasteDataTypes( Atom selection, Sequence< ::com::sun::star::datatransfer::DataFlavor >& rTypes ); - bool getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData ); + bool getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ); // for XDropTarget to register/deregister itself void registerDropTarget( XLIB_Window aXLIB_Window, DropTarget* pTarget ); @@ -511,11 +511,11 @@ namespace x11 { // ------------------------------------------------------------------------ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_getSupportedServiceNames(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index dc2ff1766ee2..efc36b74205a 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; -using ::rtl::OUString; Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { @@ -62,7 +61,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { - static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; + static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, OUStringHash > m_aInstances; OUString aDisplayName; Atom nSelection; diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index ccc78570344d..bcf54b664d0f 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -35,7 +35,6 @@ using namespace osl; using namespace x11; -using ::rtl::OUString; X11Transferable::X11Transferable( diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 1b49496e1770..4266f1c5ca31 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -33,7 +33,7 @@ class DtransX11ConfigItem : public ::utl::ConfigItem { sal_Int32 m_nSelectionTimeout; - virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ); virtual void Commit(); public: DtransX11ConfigItem(); @@ -48,7 +48,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace x11; -using ::rtl::OUString; sal_Int32 SelectionManager::getSelectionTimeout() { diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 8cec77e5bda5..30a1e3b1e6e0 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -88,7 +88,6 @@ struct _XRegion BOX *rects; BOX extents; }; -using ::rtl::OUString; // =========================================================================== // PspKernInfo allows on-demand-querying of psprint provided kerning info (#i29881#) @@ -529,10 +528,10 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) // ---------------------------------------------------------------------------- bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) + const OUString& rFileURL, const OUString& rFontName ) { // inform PSP font manager - rtl::OUString aUSystemPath; + OUString aUSystemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFileURL, aUSystemPath ) ); rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); OString aOFileName( OUStringToOString( aUSystemPath, aEncoding ) ); @@ -556,7 +555,7 @@ bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID ); - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA ); } @@ -603,7 +602,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList ) // inform GlyphCache about this font provided by the PsPrint subsystem ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo ); aDFA.mnQuality += 4096; - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo ); } @@ -787,7 +786,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const //-------------------------------------------------------------------------- sal_Bool X11SalGraphics::CreateFontSubset( - const rtl::OUString& rToFile, + const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index cbe539420a05..2eec71744955 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -33,8 +33,6 @@ #include <cstdio> #include <unistd.h> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; extern "C" { typedef SalInstance*(*salFactoryProc)( oslModule pModule); } @@ -205,7 +203,7 @@ static SalInstance* autodetect_plugin() SalInstance* pInst = NULL; while( pList[nListEntry] && pInst == NULL ) { - rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) ); + OUString aTry( OUString::createFromAscii( pList[nListEntry] ) ); pInst = tryInstance( aTry ); #if OSL_DEBUG_LEVEL > 1 if( pInst ) @@ -277,12 +275,12 @@ void InitSalMain() { } -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) std::fprintf( stderr, "Application Error\n" ); else - std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); + std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); if( bDumpCore ) abort(); else @@ -293,10 +291,10 @@ static const char * desktop_strings[] = { "none", "unknown", "GNOME", "TDE", "KD const OUString& SalGetDesktopEnvironment() { - static rtl::OUString aRet; + static OUString aRet; if( aRet.isEmpty()) { - rtl::OUStringBuffer buf( 8 ); + OUStringBuffer buf( 8 ); buf.appendAscii( desktop_strings[ get_desktop_environment() ] ); aRet = buf.makeStringAndClear(); } diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 102d19c7e5b8..fe163bb4b35a 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -40,12 +40,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; -using ::rtl::OString; struct GetPPDAttribs { @@ -576,7 +570,7 @@ void CUPSManager::setupJobContextData( JobData& rData ) FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { OSL_TRACE( "endSpool: %s, %s", - rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), bQuickCommand ? "true" : "false" ); if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() ) @@ -635,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 ) { - rtl::OString aVal( rtl::OString::valueOf( sal_Int32( rJob.m_nCopies ) ) ); + OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) ); rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions ); } if( ! bBanner ) @@ -647,8 +641,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ) { OSL_TRACE( "endSpool: %s, %s, copy count = %d", - rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(), rDocumentJobData.m_nCopies ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index c55f64aad12f..d40fffd913a7 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -79,7 +79,7 @@ bool JobData::setPaper( int i_nWidth, int i_nHeight ) bool bSuccess = false; if( m_pParser ) { - rtl::OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) ); + OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) ); const PPDKey* pKey = m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) ); const PPDValue* pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL; @@ -114,12 +114,12 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes ) SvMemoryStream aStream; // write header job data - aStream.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("JobData 1"))); + aStream.WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("JobData 1"))); - rtl::OStringBuffer aLine; + OStringBuffer aLine; aLine.append(RTL_CONSTASCII_STRINGPARAM("printer=")); - aLine.append(rtl::OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8)); + aLine.append(OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8)); aStream.WriteLine(aLine.makeStringAndClear()); aLine.append(RTL_CONSTASCII_STRINGPARAM("orientation=")); @@ -176,7 +176,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes ) bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData ) { SvMemoryStream aStream( pData, bytes, STREAM_READ ); - rtl::OString aLine; + OString aLine; bool bVersion = false; bool bPrinter = false; bool bOrientation = false; @@ -205,7 +205,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(printerEquals))) { bPrinter = true; - rJobData.m_aPrinterName = rtl::OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8); + rJobData.m_aPrinterName = OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8); } else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(orientatationEquals))) { @@ -220,7 +220,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals))) { bMargin = true; - rtl::OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals))); + OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals))); rJobData.m_nLeftMarginAdjust = aValues.getToken(0, ',').toInt32(); rJobData.m_nRightMarginAdjust = aValues.getToken(1, ',').toInt32(); rJobData.m_nTopMarginAdjust = aValues.getToken(2, ',').toInt32(); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index de65253f3f2a..6b464e9d1cf9 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -70,8 +70,8 @@ namespace psp } }; - typedef boost::unordered_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; - typedef boost::unordered_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; + typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map; + typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map; key_translation_map m_aTranslations; public: @@ -80,46 +80,46 @@ namespace psp void insertValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, - const rtl::OUString& i_rTranslation, + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ); - void insertOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rTranslation, + void insertOption( const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) { - insertValue( i_rKey, i_rOption, rtl::OUString(), i_rTranslation, i_rLocale ); + insertValue( i_rKey, i_rOption, OUString(), i_rTranslation, i_rLocale ); } - void insertKey( const rtl::OUString& i_rKey, - const rtl::OUString& i_rTranslation, + void insertKey( const OUString& i_rKey, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) { - insertValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rTranslation, i_rLocale ); + insertValue( i_rKey, OUString(), OUString(), i_rTranslation, i_rLocale ); } - rtl::OUString translateValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, + OUString translateValue( + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; - rtl::OUString translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, + OUString translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const { - return translateValue( i_rKey, i_rOption, rtl::OUString(), i_rLocale ); + return translateValue( i_rKey, i_rOption, OUString(), i_rLocale ); } - rtl::OUString translateKey( const rtl::OUString& i_rKey, + OUString translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const { - return translateValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rLocale ); + return translateValue( i_rKey, OUString(), OUString(), i_rLocale ); } }; @@ -138,14 +138,14 @@ namespace psp static const char* pEnvLocale = getenv( "SAL_PPDPARSER_LOCALE" ); if( pEnvLocale && *pEnvLocale ) { - rtl::OString aStr( pEnvLocale ); + OString aStr( pEnvLocale ); sal_Int32 nLen = aStr.getLength(); - aLoc.Language = rtl::OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 ); + aLoc.Language = OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 ); if( nLen >=5 && aStr.getStr()[2] == '_' ) - aLoc.Country = rtl::OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 ); + aLoc.Country = OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 ); else - aLoc.Country = rtl::OUString(); - aLoc.Variant = rtl::OUString(); + aLoc.Country = OUString(); + aLoc.Variant = OUString(); } #endif } @@ -157,14 +157,14 @@ namespace psp } void PPDTranslator::insertValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, - const rtl::OUString& i_rTranslation, + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale ) { - rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); + OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { @@ -178,7 +178,7 @@ namespace psp } if( aKey.getLength() && !i_rTranslation.isEmpty() ) { - rtl::OUString aK( aKey.makeStringAndClear() ); + OUString aK( aKey.makeStringAndClear() ); com::sun::star::lang::Locale aLoc; aLoc.Language = i_rLocale.Language.toAsciiLowerCase(); aLoc.Country = i_rLocale.Country.toAsciiUpperCase(); @@ -187,16 +187,16 @@ namespace psp } } - rtl::OUString PPDTranslator::translateValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, + OUString PPDTranslator::translateValue( + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult; + OUString aResult; - rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); + OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { @@ -210,7 +210,7 @@ namespace psp } if( aKey.getLength() ) { - rtl::OUString aK( aKey.makeStringAndClear() ); + OUString aK( aKey.makeStringAndClear() ); key_translation_map::const_iterator it = m_aTranslations.find( aK ); if( it != m_aTranslations.end() ) { @@ -227,9 +227,9 @@ namespace psp } switch( nTry ) { - case 0: aLoc.Variant = rtl::OUString();break; - case 1: aLoc.Country = rtl::OUString();break; - case 2: aLoc.Language = rtl::OUString();break; + case 0: aLoc.Variant = OUString();break; + case 1: aLoc.Country = OUString();break; + case 2: aLoc.Language = OUString();break; } } } @@ -241,7 +241,7 @@ namespace psp { public: std::list< PPDParser* > aAllParsers; - boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; + boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles; PPDCache() : pAllPPDFiles(NULL) {} @@ -260,12 +260,9 @@ namespace psp using namespace psp; -using ::rtl::OUString; -using ::rtl::OStringBuffer; -using ::rtl::OUStringHash; #if OSL_DEBUG_LEVEL > 2 -#define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() ) +#define BSTRING(x) OUStringToOString( x, osl_getThreadTextEncoding() ) #endif namespace @@ -277,25 +274,25 @@ class PPDDecompressStream { SvFileStream* mpFileStream; SvMemoryStream* mpMemStream; - rtl::OUString maFileName; + OUString maFileName; // forbid copying PPDDecompressStream( const PPDDecompressStream& ); PPDDecompressStream& operator=(const PPDDecompressStream& ); public: - PPDDecompressStream( const rtl::OUString& rFile ); + PPDDecompressStream( const OUString& rFile ); ~PPDDecompressStream(); bool IsOpen() const; bool IsEof() const; - rtl::OString ReadLine(); - void Open( const rtl::OUString& i_rFile ); + OString ReadLine(); + void Open( const OUString& i_rFile ); void Close(); - const rtl::OUString& GetFileName() const { return maFileName; } + const OUString& GetFileName() const { return maFileName; } }; -PPDDecompressStream::PPDDecompressStream( const rtl::OUString& i_rFile ) : +PPDDecompressStream::PPDDecompressStream( const OUString& i_rFile ) : mpFileStream( NULL ), mpMemStream( NULL ) { @@ -307,7 +304,7 @@ PPDDecompressStream::~PPDDecompressStream() Close(); } -void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) +void PPDDecompressStream::Open( const OUString& i_rFile ) { Close(); @@ -320,7 +317,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) return; } - rtl::OString aLine; + OString aLine; mpFileStream->ReadLine( aLine ); mpFileStream->Seek( 0 ); @@ -371,9 +368,9 @@ bool PPDDecompressStream::IsEof() const return ( mpMemStream ? mpMemStream->IsEof() : ( mpFileStream ? mpFileStream->IsEof() : true ) ); } -rtl::OString PPDDecompressStream::ReadLine() +OString PPDDecompressStream::ReadLine() { - rtl::OString o_rLine; + OString o_rLine; if( mpMemStream ) mpMemStream->ReadLine( o_rLine ); else if( mpFileStream ) @@ -381,7 +378,7 @@ rtl::OString PPDDecompressStream::ReadLine() return o_rLine; } -static osl::FileBase::RC resolveLink( const rtl::OUString& i_rURL, rtl::OUString& o_rResolvedURL, rtl::OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 ) +static osl::FileBase::RC resolveLink( const OUString& i_rURL, OUString& o_rResolvedURL, OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 ) { salhelper::LinkResolver aResolver(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type | @@ -423,12 +420,12 @@ void PPDParser::scanPPDDir( const String& rDir ) osl::FileStatus aStatus( osl_FileStatus_Mask_FileName ); if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None ) { - rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 ); + OUStringBuffer aURLBuf( rDir.Len() + 64 ); aURLBuf.append( rDir ); aURLBuf.append( sal_Unicode( '/' ) ); aURLBuf.append( aStatus.getFileName() ); - rtl::OUString aFileURL, aFileName; + OUString aFileURL, aFileName; osl::FileStatus::Type eType = osl::FileStatus::Unknown; if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None ) @@ -487,7 +484,7 @@ void PPDParser::initPPDFiles() INetURLObject aDir( aExe ); aDir.removeSegment(); #ifdef DEBUG - fprintf( stderr, "scanning last chance dir: %s\n", rtl::OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); + fprintf( stderr, "scanning last chance dir: %s\n", OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); #endif scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); #ifdef DEBUG @@ -497,7 +494,7 @@ void PPDParser::initPPDFiles() } } -void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh ) +void PPDParser::getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh ) { PPDCache &rPPDCache = thePPDCache::get(); @@ -531,7 +528,7 @@ String PPDParser::getPPDFile( const String& rFile ) initPPDFiles(); // some PPD files contain dots beside the extension, so try name first // and cut of points after that - rtl::OUString aBase( rFile ); + OUString aBase( rFile ); sal_Int32 nLastIndex = aBase.lastIndexOf( sal_Unicode( '/' ) ); if( nLastIndex >= 0 ) aBase = aBase.copy( nLastIndex+1 ); @@ -560,7 +557,7 @@ String PPDParser::getPPDFile( const String& rFile ) String aRet; if( aStream.IsOpen() ) { - rtl::OString aLine = aStream.ReadLine(); + OString aLine = aStream.ReadLine(); if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("*PPD-Adobe")) == 0) aRet = aStream.GetFileName(); else @@ -590,8 +587,8 @@ String PPDParser::getPPDPrinterName( const String& rFile ) String aCurLine; while( ! aStream.IsEof() && aStream.IsOpen() ) { - rtl::OString aByteLine = aStream.ReadLine(); - aCurLine = rtl::OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252); + OString aByteLine = aStream.ReadLine(); + aCurLine = OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252); if( aCurLine.CompareIgnoreCaseToAscii( "*include:", 9 ) == COMPARE_EQUAL ) { aCurLine.Erase( 0, 9 ); @@ -630,7 +627,7 @@ const PPDParser* PPDParser::getParser( const String& rFile ) if( ! aFile.Len() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", ::rtl::OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() ); + fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() ); #endif return NULL; } @@ -682,17 +679,17 @@ PPDParser::PPDParser( const String& rFile ) : m_pTranslator( new PPDTranslator() ) { // read in the file - std::list< rtl::OString > aLines; + std::list< OString > aLines; PPDDecompressStream aStream( m_aFile ); if( aStream.IsOpen() ) { bool bLanguageEncoding = false; while( ! aStream.IsEof() ) { - rtl::OString aCurLine = aStream.ReadLine(); + OString aCurLine = aStream.ReadLine(); if( aCurLine[0] == '*' ) { - if (aCurLine.matchIgnoreAsciiCase(rtl::OString("*include:"))) + if (aCurLine.matchIgnoreAsciiCase(OString("*include:"))) { aCurLine = aCurLine.copy(9); aCurLine = comphelper::string::stripStart(aCurLine, ' '); @@ -704,14 +701,14 @@ PPDParser::PPDParser( const String& rFile ) : aCurLine = comphelper::string::stripStart(aCurLine, '"'); aCurLine = comphelper::string::stripEnd(aCurLine, '"'); aStream.Close(); - aStream.Open(getPPDFile(rtl::OStringToOUString(aCurLine, m_aFileEncoding))); + aStream.Open(getPPDFile(OStringToOUString(aCurLine, m_aFileEncoding))); continue; } else if( ! bLanguageEncoding && - aCurLine.matchIgnoreAsciiCase(rtl::OString("*languageencoding")) ) + aCurLine.matchIgnoreAsciiCase(OString("*languageencoding")) ) { bLanguageEncoding = true; // generally only the first one counts - rtl::OString aLower = aCurLine.toAsciiLowerCase(); + OString aLower = aCurLine.toAsciiLowerCase(); if( aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("isolatin1"), 17 ) != -1 || aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("windowsansi"), 17 ) != -1 ) m_aFileEncoding = RTL_TEXTENCODING_MS_1252; @@ -798,12 +795,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pImageableAreas == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no ImageableArea in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultImageableArea == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultImageableArea in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pPaperDimensions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PaperDimension" ) ) ); @@ -812,12 +809,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pPaperDimensions == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no PaperDimensions in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultPaperDimension == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultPaperDimensions in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pResolutions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ) ); @@ -826,12 +823,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pResolutions == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no Resolution in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultResolution == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultResolution in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ); @@ -840,12 +837,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pInputSlots == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no InputSlot in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultInputSlot == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultInputSlot in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pDuplexTypes = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) ); @@ -856,7 +853,7 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pFontList == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no Font in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } // fill in direct values @@ -917,7 +914,7 @@ static sal_uInt8 getNibble( sal_Char cChar ) return nRet; } -String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGlobalized) +String PPDParser::handleTranslation(const OString& i_rString, bool bIsGlobalized) { sal_Int32 nOrigLen = i_rString.getLength(); OStringBuffer aTrans( nOrigLen ); @@ -945,7 +942,7 @@ String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGloba namespace { - bool oddDoubleQuoteCount(rtl::OStringBuffer &rBuffer) + bool oddDoubleQuoteCount(OStringBuffer &rBuffer) { bool bHasOddCount = false; for (sal_Int32 i = 0; i < rBuffer.getLength(); ++i) @@ -957,20 +954,20 @@ namespace } } -void PPDParser::parse( ::std::list< rtl::OString >& rLines ) +void PPDParser::parse( ::std::list< OString >& rLines ) { - std::list< rtl::OString >::iterator line = rLines.begin(); + std::list< OString >::iterator line = rLines.begin(); PPDParser::hash_type::const_iterator keyit; while( line != rLines.end() ) { - rtl::OString aCurrentLine( *line ); + OString aCurrentLine( *line ); ++line; if( aCurrentLine[0] != '*' ) continue; if( aCurrentLine[1] == '%' ) continue; - rtl::OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') ); + OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') ); sal_Int32 nPos = aKey.indexOf('/'); if (nPos != -1) aKey = aKey.copy(0, nPos); @@ -1015,7 +1012,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) bQuery = true; } - String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); + String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); // handle CUPS extension for globalized PPDs bool bIsGlobalizedLine = false; com::sun::star::lang::Locale aTransLocale; @@ -1040,7 +1037,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nPos = aCurrentLine.indexOf(':'); if( nPos != -1 ) { - aOption = rtl::OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 ); + aOption = OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 ); aOption = GetCommandLineToken( 1, aOption ); int nTransPos = aOption.Search( '/' ); if( nTransPos != STRING_NOTFOUND ) @@ -1049,12 +1046,12 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) PPDValueType eType = eNo; String aValue; - rtl::OUString aOptionTranslation; - rtl::OUString aValueTranslation; + OUString aOptionTranslation; + OUString aValueTranslation; if( nPos != STRING_NOTFOUND ) { // found a colon, there may be an option - rtl::OString aLine = aCurrentLine.copy( 1, nPos-1 ); + OString aLine = aCurrentLine.copy( 1, nPos-1 ); aLine = WhitespaceToSpace( aLine ); sal_Int32 nTransPos = aLine.indexOf('/'); if (nTransPos != -1) @@ -1064,7 +1061,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) aLine = aCurrentLine.copy( nPos+1 ); if (!aLine.isEmpty()) { - rtl::OStringBuffer aBuffer(aLine); + OStringBuffer aBuffer(aLine); while (line != rLines.end() && oddDoubleQuoteCount(aBuffer)) { // copy the newlines also @@ -1092,7 +1089,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nTransPos = aLine.indexOf('"'); if (nTransPos == -1) nTransPos = aLine.getLength(); - aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); // after the second doublequote can follow a / and a translation if (nTransPos < aLine.getLength() - 2) { @@ -1109,7 +1106,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) else if(aLine[0] == '^') { aLine = aLine.copy(1); - aValue = rtl::OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252); eType = eSymbol; } else @@ -1122,7 +1119,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nTransPos = aLine.indexOf('/'); if (nTransPos == -1) nTransPos = aLine.getLength(); - aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); if (nTransPos+1 < aLine.getLength()) aValueTranslation = handleTranslation( aLine.copy( nTransPos+1 ), bIsGlobalizedLine ); eType = eString; @@ -1183,15 +1180,15 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) // second pass: fill in defaults for( line = rLines.begin(); line != rLines.end(); ++line ) { - rtl::OString aLine(*line); + OString aLine(*line); if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*Default"))) { - String aKey(rtl::OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252)); + String aKey(OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252)); sal_uInt16 nPos = aKey.Search( ':' ); if( nPos != STRING_NOTFOUND ) { aKey.Erase( nPos ); - rtl::OUString aOption(rtl::OStringToOUString( + OUString aOption(OStringToOUString( WhitespaceToSpace(aLine.copy(nPos+9)), RTL_TEXTENCODING_MS_1252)); keyit = m_aKeys.find( aKey ); @@ -1223,10 +1220,10 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) } } -void PPDParser::parseOpenUI(const rtl::OString& rLine) +void PPDParser::parseOpenUI(const OString& rLine) { String aTranslation; - rtl::OString aKey = rLine; + OString aKey = rLine; sal_Int32 nPos = aKey.indexOf(':'); if( nPos != -1 ) @@ -1240,7 +1237,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) aKey = GetCommandLineToken( 1, aKey ); aKey = aKey.copy(1); - String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); + String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); PPDParser::hash_type::const_iterator keyit = m_aKeys.find( aUniKey ); PPDKey* pKey; if( keyit == m_aKeys.end() ) @@ -1255,7 +1252,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) m_pTranslator->insertKey( pKey->getKey(), aTranslation ); sal_Int32 nIndex = 0; - rtl::OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) ); + OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) ); if( aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("boolean"))) pKey->m_eUIType = PPDKey::Boolean; else if (aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pickmany"))) @@ -1264,16 +1261,16 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) pKey->m_eUIType = PPDKey::PickOne; } -void PPDParser::parseOrderDependency(const rtl::OString& rLine) +void PPDParser::parseOrderDependency(const OString& rLine) { - rtl::OString aLine(rLine); + OString aLine(rLine); sal_Int32 nPos = aLine.indexOf(':'); if( nPos != -1 ) aLine = aLine.copy( nPos+1 ); sal_Int32 nOrder = GetCommandLineToken( 0, aLine ).toInt32(); - rtl::OString aSetup = GetCommandLineToken( 1, aLine ); - String aKey(rtl::OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252)); + OString aSetup = GetCommandLineToken( 1, aLine ); + String aKey(OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252)); if( aKey.GetChar( 0 ) != '*' ) return; // invalid order depency aKey.Erase( 0, 1 ); @@ -1303,11 +1300,11 @@ void PPDParser::parseOrderDependency(const rtl::OString& rLine) pKey->m_eSetupType = PPDKey::AnySetup; } -void PPDParser::parseConstraint( const rtl::OString& rLine ) +void PPDParser::parseConstraint( const OString& rLine ) { bool bFailed = false; - String aLine(rtl::OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252)); + String aLine(OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252)); aLine.Erase(0, rLine.indexOf(':') + 1); PPDConstraint aConstraint; int nTokens = GetCommandLineTokenCount( aLine ); @@ -1515,20 +1512,20 @@ String PPDParser::getFont( int nFont ) const return String(); } -rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey, +OUString PPDParser::translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); + OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); if( aResult.isEmpty() ) aResult = i_rKey; return aResult; } -rtl::OUString PPDParser::translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, +OUString PPDParser::translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); + OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); if( aResult.isEmpty() ) aResult = i_rOption; return aResult; @@ -1879,12 +1876,12 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const hash_type::const_iterator it; for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it ) { - rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); + OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); rBytes += aCopy.getLength(); rBytes += 1; // for ':' if( it->second ) { - aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); + aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); rBytes += aCopy.getLength(); } else @@ -1897,13 +1894,13 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const char* pRun = pBuffer; for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it ) { - rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); + OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); int nBytes = aCopy.getLength(); memcpy( pRun, aCopy.getStr(), nBytes ); pRun += nBytes; *pRun++ = ':'; if( it->second ) - aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); + aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); else aCopy = "*nil"; nBytes = aCopy.getLength(); @@ -1927,15 +1924,15 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) char* pRun = pBuffer; while( nBytes && *pRun ) { - rtl::OString aLine( pRun ); + OString aLine( pRun ); sal_Int32 nPos = aLine.indexOf(':'); if( nPos != -1 ) { - const PPDKey* pKey = m_pParser->getKey( rtl::OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) ); + const PPDKey* pKey = m_pParser->getKey( OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) ); if( pKey ) { const PPDValue* pValue = NULL; - rtl::OUString aOption(rtl::OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252)); + OUString aOption(OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252)); if (aOption != "*nil") pValue = pKey->getValue( aOption ); m_aCurrentValues[ pKey ] = pValue; @@ -1977,10 +1974,10 @@ int PPDContext::getRenderResolution() const // ------------------------------------------------------------------- -void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const +void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set - rPaper = rtl::OUString( "A4" ); + rPaper = OUString( "A4" ); rWidth = 595; rHeight = 842; if( m_pParser ) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 3f3353259189..cfe471f4ab20 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -54,10 +54,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; namespace psp { @@ -162,7 +158,7 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable ) void PrinterInfoManager::initSystemDefaultPaper() { - m_aSystemDefaultPaper = rtl::OStringToOUString( + m_aSystemDefaultPaper = OStringToOUString( PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()), RTL_TEXTENCODING_UTF8); } @@ -258,11 +254,11 @@ void PrinterInfoManager::initialize() if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found global defaults in %s\n", rtl::OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "found global defaults in %s\n", OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif aConfig.SetGroup( GLOBAL_DEFAULTS_GROUP ); - rtl::OString aValue( aConfig.ReadKey( "Copies" ) ); + OString aValue( aConfig.ReadKey( "Copies" ) ); if (!aValue.isEmpty()) m_aGlobalDefaults.m_nCopies = aValue.toInt32(); @@ -318,16 +314,16 @@ void PrinterInfoManager::initialize() // get the PPDContext of global JobData for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey ) { - rtl::OString aKey( aConfig.GetKeyName( nKey ) ); + OString aKey( aConfig.GetKeyName( nKey ) ); if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_"))) { aValue = aConfig.ReadKey( aKey ); - const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); + const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); if( pKey ) { m_aGlobalDefaults.m_aContext. setValue( pKey, - aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), sal_True ); } } @@ -384,7 +380,7 @@ void PrinterInfoManager::initialize() for( int nGroup = 0; nGroup < aConfig.GetGroupCount(); nGroup++ ) { aConfig.SetGroup( aConfig.GetGroupName( nGroup ) ); - rtl::OString aValue = aConfig.ReadKey( "Printer" ); + OString aValue = aConfig.ReadKey( "Printer" ); if (!aValue.isEmpty()) { OUString aPrinterName; @@ -403,10 +399,10 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aFontSubstitutes.clear(); aPrinter.m_aInfo.m_aFontSubstitutions.clear(); - aPrinterName = rtl::OStringToOUString(aValue.copy(nNamePos+1), + aPrinterName = OStringToOUString(aValue.copy(nNamePos+1), RTL_TEXTENCODING_UTF8); aPrinter.m_aInfo.m_aPrinterName = aPrinterName; - aPrinter.m_aInfo.m_aDriverName = rtl::OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aDriverName = OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); // set parser, merge settings // don't do this for CUPS printers as this is done @@ -460,14 +456,14 @@ void PrinterInfoManager::initialize() aValue = "lpr"; #endif } - aPrinter.m_aInfo.m_aCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); } aValue = aConfig.ReadKey( "QuickCommand" ); - aPrinter.m_aInfo.m_aQuickCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aQuickCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Features" ); - aPrinter.m_aInfo.m_aFeatures = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aFeatures = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); // override the settings in m_aGlobalDefaults if keys exist aValue = aConfig.ReadKey( "DefaultPrinter" ); @@ -475,10 +471,10 @@ void PrinterInfoManager::initialize() aDefaultPrinter = aPrinterName; aValue = aConfig.ReadKey( "Location" ); - aPrinter.m_aInfo.m_aLocation = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aLocation = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Comment" ); - aPrinter.m_aInfo.m_aComment = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aComment = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Copies" ); if (!aValue.isEmpty()) @@ -526,16 +522,16 @@ void PrinterInfoManager::initialize() // 2. Font substitution table for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey ) { - rtl::OString aKey( aConfig.GetKeyName( nKey ) ); + OString aKey( aConfig.GetKeyName( nKey ) ); if( aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")) && aPrinter.m_aInfo.m_pParser ) { aValue = aConfig.ReadKey( aKey ); - const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); + const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); if( pKey ) { aPrinter.m_aInfo.m_aContext. setValue( pKey, - aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), sal_True ); } } @@ -622,7 +618,7 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aComment = it->m_aComment; aPrinter.m_aInfo.m_aLocation = it->m_aLocation; aPrinter.m_bModified = false; - aPrinter.m_aGroup = rtl::OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin + aPrinter.m_aGroup = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin m_aPrinters[ aPrinterName ] = aPrinter; } @@ -766,22 +762,22 @@ bool PrinterInfoManager::writePrinterConfig() pConfig->DeleteGroup( it->second.m_aGroup ); // else some old keys may remain pConfig->SetGroup( it->second.m_aGroup ); - rtl::OStringBuffer aValue(rtl::OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8)); + OStringBuffer aValue(OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8)); aValue.append('/'); - aValue.append(rtl::OUStringToOString(it->first, RTL_TEXTENCODING_UTF8)); + aValue.append(OUStringToOString(it->first, RTL_TEXTENCODING_UTF8)); pConfig->WriteKey("Printer", aValue.makeStringAndClear()); pConfig->WriteKey( "DefaultPrinter", it->first == m_aDefaultPrinter ? "1" : "0" ); - pConfig->WriteKey( "Location", rtl::OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Comment", rtl::OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Command", rtl::OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "QuickCommand", rtl::OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Features", rtl::OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey("Copies", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies))); + pConfig->WriteKey( "Location", OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Comment", OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey("Copies", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies))); pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" ); - pConfig->WriteKey("PSLevel", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel))); - pConfig->WriteKey("PDFDevice", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice))); - pConfig->WriteKey("ColorDevice", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice))); - pConfig->WriteKey("ColorDepth", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth))); + pConfig->WriteKey("PSLevel", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel))); + pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice))); + pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice))); + pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth))); aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nLeftMarginAdjust)); aValue.append(','); aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nRightMarginAdjust)); @@ -797,12 +793,12 @@ bool PrinterInfoManager::writePrinterConfig() for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ ) { const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i ); - rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_")); - aKey.append(rtl::OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1)); + OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_")); + aKey.append(OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1)); const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey ); if (pValue) - aValue.append(rtl::OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1)); + aValue.append(OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1)); else aValue.append(RTL_CONSTASCII_STRINGPARAM("*nil")); pConfig->WriteKey(aKey.makeStringAndClear(), aValue.makeStringAndClear()); @@ -814,9 +810,9 @@ bool PrinterInfoManager::writePrinterConfig() for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst ) { - rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_")); - aKey.append(rtl::OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1)); - pConfig->WriteKey( aKey.makeStringAndClear(), rtl::OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) ); + OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_")); + aKey.append(OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1)); + pConfig->WriteKey( aKey.makeStringAndClear(), OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) ); } } } @@ -871,7 +867,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin bSuccess = true; #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "new printer %s, level = %d, pdfdevice = %d, colordevice = %d, depth = %d\n", - rtl::OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(), m_aPrinters[rPrinterName].m_aInfo.m_nPSLevel, m_aPrinters[rPrinterName].m_aInfo.m_nPDFDevice, m_aPrinters[rPrinterName].m_aInfo.m_nColorDevice, @@ -1044,12 +1040,12 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const fprintf( stderr, "substitute %s %s %d %d\n" " -> %s %s %d %d\n", - rtl::OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), + OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), it->m_eItalic == ITALIC_NONE ? "r" : it->m_eItalic == ITALIC_OBLIQUE ? "o" : it->m_eItalic == ITALIC_NORMAL ? "i" : "u", it->m_eWeight, it->m_eWidth, - rtl::OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), + OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), aInfo.m_eItalic == ITALIC_NONE ? "r" : aInfo.m_eItalic == ITALIC_OBLIQUE ? "o" : aInfo.m_eItalic == ITALIC_NORMAL ? "i" : "u", aInfo.m_eWeight, aInfo.m_eWidth @@ -1095,7 +1091,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get return m_aSystemPrintQueues; } -bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const +bool PrinterInfoManager::checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const { const PrinterInfo& rPrinterInfo( getPrinterInfo( rPrinterName ) ); sal_Int32 nIndex = 0; @@ -1113,10 +1109,10 @@ bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, c FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { const PrinterInfo& rPrinterInfo = getPrinterInfo (rPrintername); - const rtl::OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? + const OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand; - rtl::OString aShellCommand = rtl::OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); - aShellCommand += rtl::OString( " 2>/dev/null" ); + OString aShellCommand = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); + aShellCommand += OString( " 2>/dev/null" ); return popen (aShellCommand.getStr(), "w"); } @@ -1155,7 +1151,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "not setting default paper, already set %s\n", - ::rtl::OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif return; } @@ -1172,12 +1168,12 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const if( pPaperVal ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "setting default paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "setting default paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif rContext.setValue( pPageSizeKey, pPaperVal ); #if OSL_DEBUG_LEVEL > 1 pPaperVal = rContext.getValue( pPageSizeKey ); - fprintf( stderr, "-> got paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "-> got paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif } } @@ -1221,7 +1217,7 @@ OUString SystemQueueInfo::getCommand() const } struct SystemCommandParameters; -typedef void(* tokenHandler)(const std::list< rtl::OString >&, +typedef void(* tokenHandler)(const std::list< OString >&, std::list< PrinterInfoManager::SystemPrintQueue >&, const SystemCommandParameters*); @@ -1237,7 +1233,7 @@ struct SystemCommandParameters #if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) static void lpgetSysQueueTokenHandler( - const std::list< rtl::OString >& i_rLines, + const std::list< OString >& i_rLines, std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, const SystemCommandParameters* ) { @@ -1251,9 +1247,9 @@ static void lpgetSysQueueTokenHandler( // printers are to be used for this user at all // find _all: line - rtl::OString aAllLine( "_all:" ); - rtl::OString aAllAttr( "all=" ); - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + OString aAllLine( "_all:" ); + OString aAllAttr( "all=" ); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { if( it->indexOf( aAllLine, 0 ) == 0 ) @@ -1262,7 +1258,7 @@ static void lpgetSysQueueTokenHandler( ++it; while( it != i_rLines.end() ) { - rtl::OString aClean( WhitespaceToSpace( *it ) ); + OString aClean( WhitespaceToSpace( *it ) ); if( aClean.indexOf( aAllAttr, 0 ) == 0 ) { // insert the comma separated entries into the set of printers to use @@ -1271,7 +1267,7 @@ static void lpgetSysQueueTokenHandler( { OString aTok( aClean.getToken( 0, ',', nPos ) ); if( !aTok.isEmpty() ) - aOnlySet.insert( rtl::OStringToOUString( aTok, aEncoding ) ); + aOnlySet.insert( OStringToOUString( aTok, aEncoding ) ); } break; } @@ -1281,9 +1277,9 @@ static void lpgetSysQueueTokenHandler( } bool bInsertAttribute = false; - rtl::OString aDescrStr( "description=" ); - rtl::OString aLocStr( "location=" ); - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + OString aDescrStr( "description=" ); + OString aLocStr( "location=" ); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { sal_Int32 nPos = 0; @@ -1291,7 +1287,7 @@ static void lpgetSysQueueTokenHandler( nPos = it->indexOf( ':', 0 ); if( nPos != -1 ) { - OUString aSysQueue( rtl::OStringToOUString( it->copy( 0, nPos ), aEncoding ) ); + OUString aSysQueue( OStringToOUString( it->copy( 0, nPos ), aEncoding ) ); // do not insert duplicates (e.g. lpstat tends to produce such lines) // in case there was a "_all" section, insert only those printer explicitly // set in the "all" attribute @@ -1315,18 +1311,18 @@ static void lpgetSysQueueTokenHandler( nPos = it->indexOf( aDescrStr, 0 ); if( nPos != -1 ) { - rtl::OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) ); + OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) ); if( !aComment.isEmpty() ) - o_rQueues.back().m_aComment = rtl::OStringToOUString(aComment, aEncoding); + o_rQueues.back().m_aComment = OStringToOUString(aComment, aEncoding); continue; } // look for "location" attribute, inser as location nPos = it->indexOf( aLocStr, 0 ); if( nPos != -1 ) { - rtl::OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) ); + OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) ); if( !aLoc.isEmpty() ) - o_rQueues.back().m_aLocation = rtl::OStringToOUString(aLoc, aEncoding); + o_rQueues.back().m_aLocation = OStringToOUString(aLoc, aEncoding); continue; } } @@ -1334,17 +1330,17 @@ static void lpgetSysQueueTokenHandler( } #endif static void standardSysQueueTokenHandler( - const std::list< rtl::OString >& i_rLines, + const std::list< OString >& i_rLines, std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); boost::unordered_set< OUString, OUStringHash > aUniqueSet; - rtl::OString aForeToken( i_pParms->pForeToken ); - rtl::OString aAftToken( i_pParms->pAftToken ); + OString aForeToken( i_pParms->pForeToken ); + OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing */ - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { sal_Int32 nPos = 0; @@ -1364,7 +1360,7 @@ static void standardSysQueueTokenHandler( if( nAftPos != -1 ) { // get the queue name between fore and aft tokens - OUString aSysQueue( rtl::OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) ); + OUString aSysQueue( OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) ); // do not insert duplicates (e.g. lpstat tends to produce such lines) if( aUniqueSet.find( aSysQueue ) == aUniqueSet.end() ) { @@ -1396,13 +1392,13 @@ void SystemQueueInfo::run() { char pBuffer[1024]; FILE *pPipe; - std::list< rtl::OString > aLines; + std::list< OString > aLines; /* Discover which command we can use to get a list of all printer queues */ for( unsigned int i = 0; i < SAL_N_ELEMENTS(aParms); i++ ) { aLines.clear(); - rtl::OStringBuffer aCmdLine( 128 ); + OStringBuffer aCmdLine( 128 ); aCmdLine.append( aParms[i].pQueueCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand ); @@ -1411,7 +1407,7 @@ void SystemQueueInfo::run() if( (pPipe = popen( aCmdLine.getStr(), "r" )) ) { while( fgets( pBuffer, 1024, pPipe ) ) - aLines.push_back( rtl::OString( pBuffer ) ); + aLines.push_back( OString( pBuffer ) ); if( ! pclose( pPipe ) ) { std::list< PrinterInfoManager::SystemPrintQueue > aSysPrintQueues; @@ -1419,7 +1415,7 @@ void SystemQueueInfo::run() MutexGuard aGuard( m_aMutex ); m_bChanged = true; m_aQueues = aSysPrintQueues; - m_aCommand = rtl::OUString::createFromAscii( aParms[i].pPrintCommand ); + m_aCommand = OUString::createFromAscii( aParms[i].pPrintCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "success\n" ); #endif diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 3ea05095faac..ec482e7801e2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1951,7 +1951,7 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen ) } } -void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass ) +void X11SalFrame::SetApplicationID( const OUString &rWMClass ) { if( rWMClass != m_sWMClass && ! IsChildWindow() ) { @@ -1966,10 +1966,10 @@ void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass ) void X11SalFrame::updateWMClass() { XClassHint* pClass = XAllocClassHint(); - rtl::OString aResName = SalGenericSystem::getFrameResName( mnExtStyle ); + OString aResName = SalGenericSystem::getFrameResName( mnExtStyle ); pClass->res_name = const_cast<char*>(aResName.getStr()); - rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); + OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); @@ -2305,7 +2305,7 @@ sal_Bool X11SalFrame::PostEvent( void *pData ) // Title -void X11SalFrame::SetTitle( const rtl::OUString& rTitle ) +void X11SalFrame::SetTitle( const OUString& rTitle ) { if( ! ( IsChildWindow() || (nStyle_ & SAL_FRAME_STYLE_FLOAT ) ) ) { @@ -2377,7 +2377,7 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -rtl::OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) { return GetDisplay()->GetKeyName( nKeyCode ); } @@ -2882,13 +2882,13 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode ) void X11SalFrame::beginUnicodeSequence() { - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); DeletionListener aDeleteWatch( this ); if( !rSeq.isEmpty() ) endUnicodeSequence(); - rSeq = rtl::OUString( "u" ); + rSeq = OUString( "u" ); if( ! aDeleteWatch.isDeleted() ) { @@ -2909,7 +2909,7 @@ void X11SalFrame::beginUnicodeSequence() bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) { bool bRet = false; - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); if( !rSeq.isEmpty() ) { // range check @@ -2917,7 +2917,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) (c >= sal_Unicode('a') && c <= sal_Unicode('f')) || (c >= sal_Unicode('A') && c <= sal_Unicode('F')) ) { - rtl::OUStringBuffer aBuf( rSeq.getLength() + 1 ); + OUStringBuffer aBuf( rSeq.getLength() + 1 ); aBuf.append( rSeq ); aBuf.append( c ); rSeq = aBuf.makeStringAndClear(); @@ -2945,20 +2945,20 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) bool X11SalFrame::endUnicodeSequence() { - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); DeletionListener aDeleteWatch( this ); if( rSeq.getLength() > 1 && rSeq.getLength() < 6 ) { // cut the "u" - rtl::OUString aNumbers( rSeq.copy( 1 ) ); + OUString aNumbers( rSeq.copy( 1 ) ); sal_Int32 nValue = aNumbers.toInt32( 16 ); if( nValue >= 32 ) { sal_uInt16 nTextAttr = EXTTEXTINPUT_ATTR_UNDERLINE; SalExtTextInputEvent aEv; aEv.mnTime = 0; - aEv.maText = rtl::OUString( sal_Unicode(nValue) ); + aEv.maText = OUString( sal_Unicode(nValue) ); aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnDeltaStart = 0; @@ -2968,7 +2968,7 @@ bool X11SalFrame::endUnicodeSequence() } } bool bWasInput = !rSeq.isEmpty(); - rSeq = rtl::OUString(); + rSeq = OUString(); if( bWasInput && ! aDeleteWatch.isDeleted() ) CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL); return bWasInput; diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index d4153786c8ff..3dbce852a1e8 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -36,10 +36,10 @@ using namespace ::com::sun::star; // FIXME static G_CONST_RETURN gchar * -getAsConst( const rtl::OString& rString ) +getAsConst( const OString& rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; aUgly[nIdx] = rString; @@ -116,13 +116,13 @@ action_wrapper_get_localized_name (AtkAction *, gint) } #define ACTION_NAME_PAIR( OOoName, AtkName ) \ - std::pair< const rtl::OUString, const gchar * > ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName ) + std::pair< const OUString, const gchar * > ( OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName ) static G_CONST_RETURN gchar * action_wrapper_get_name (AtkAction *action, gint i) { - static std::map< rtl::OUString, const gchar * > aNameMap; + static std::map< OUString, const gchar * > aNameMap; if( aNameMap.empty() ) { @@ -135,15 +135,15 @@ action_wrapper_get_name (AtkAction *action, accessibility::XAccessibleAction* pAction = getAction( action ); if( pAction ) { - std::map< rtl::OUString, const gchar * >::iterator iter; + std::map< OUString, const gchar * >::iterator iter; - rtl::OUString aDesc( pAction->getAccessibleActionDescription( i ) ); + OUString aDesc( pAction->getAccessibleActionDescription( i ) ); iter = aNameMap.find( aDesc ); if( iter != aNameMap.end() ) return iter->second; - std::pair< const rtl::OUString, const gchar * > aNewVal( aDesc, + std::pair< const OUString, const gchar * > aNewVal( aDesc, g_strdup( OUStringToConstGChar(aDesc) ) ); if( aNameMap.insert( aNewVal ).second ) @@ -166,7 +166,7 @@ action_wrapper_get_name (AtkAction *action, */ static inline void -appendKeyStrokes(rtl::OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes) +appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes) { for( sal_Int32 i = 0; i < rKeyStrokes.getLength(); i++ ) { @@ -222,7 +222,7 @@ action_wrapper_get_keybinding (AtkAction *action, if( xBinding.is() ) { - rtl::OStringBuffer aRet; + OStringBuffer aRet; sal_Int32 nmax = std::min( xBinding->getAccessibleKeyBindingCount(), (sal_Int32) 3 ); for( sal_Int32 n = 0; n < nmax; n++ ) diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d0aabd69feb0..7f1d5bd3fe99 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -84,7 +84,7 @@ editable_text_wrapper_set_text_contents( AtkEditableText *text, accessibility::XAccessibleEditableText* pEditableText = getEditableText( text ); if( pEditableText ) { - rtl::OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 ); + OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 ); pEditableText->setText( aString ); } } @@ -103,7 +103,7 @@ editable_text_wrapper_insert_text( AtkEditableText *text, accessibility::XAccessibleEditableText* pEditableText = getEditableText( text ); if( pEditableText ) { - rtl::OUString aString ( string, length, RTL_TEXTENCODING_UTF8 ); + OUString aString ( string, length, RTL_TEXTENCODING_UTF8 ); if( pEditableText->insertText( aString, *pos ) ) *pos += length; } diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index ed4333ede35c..d7a3852d9cbb 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -60,7 +60,7 @@ hyper_link_get_uri( AtkHyperlink *pLink, { try { uno::Any aAny = getHyperlink( pLink )->getAccessibleActionObject( i ); - rtl::OUString aUri = aAny.get< rtl::OUString > (); + OUString aUri = aAny.get< OUString > (); return OUStringToGChar(aUri); } catch(const uno::Exception& e) { diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index 8e833225b833..c58a54eef5e5 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -28,13 +28,13 @@ using namespace ::com::sun::star; // FIXME static G_CONST_RETURN gchar * -getAsConst( rtl::OUString rString ) +getAsConst( OUString rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; - aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return aUgly[ nIdx ].getStr(); } diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index 8d1b1bd616c8..f4d02cea0cb5 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -289,22 +289,22 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven case accessibility::AccessibleEventId::NAME_CHANGED: { - rtl::OUString aName; + OUString aName; if( aEvent.NewValue >>= aName ) { atk_object_set_name(atk_obj, - rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); } } break; case accessibility::AccessibleEventId::DESCRIPTION_CHANGED: { - rtl::OUString aDescription; + OUString aDescription; if( aEvent.NewValue >>= aDescription ) { atk_object_set_description(atk_obj, - rtl::OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr()); } } break; diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index f823d32a3725..662eec113b52 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -45,13 +45,13 @@ atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccess // FIXME static G_CONST_RETURN gchar * -getAsConst( rtl::OUString rString ) +getAsConst( OUString rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; - aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return aUgly[ nIdx ].getStr(); } diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index f8b06e5f4944..5ac6856222b7 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -68,7 +68,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText, gint * start_offset, gint * end_offset ) { accessibility::TextSegment aTextSegment; - rtl::OUString aString; + OUString aString; gint start = 0, end = 0; if( !rTextSegment.SegmentText.isEmpty() ) @@ -274,7 +274,7 @@ text_wrapper_get_text (AtkText *text, if( pTextSegment->SegmentStart == start_offset && pTextSegment->SegmentEnd == end_offset ) { - rtl::OString aUtf8 = rtl::OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 ); + OString aUtf8 = OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 ); return g_strdup( aUtf8.getStr() ); } } @@ -283,7 +283,7 @@ text_wrapper_get_text (AtkText *text, accessibility::XAccessibleText* pText = getText( text ); if( pText ) { - rtl::OUString aText; + OUString aText; sal_Int32 n = pText->getCharacterCount(); if( -1 == end_offset ) @@ -291,7 +291,7 @@ text_wrapper_get_text (AtkText *text, else if( start_offset < n ) aText = pText->getTextRange(start_offset, end_offset); - ret = g_strdup( rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() ); + ret = g_strdup( OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() ); } } catch(const uno::Exception& e) { @@ -537,7 +537,7 @@ text_wrapper_get_run_attributes( AtkText *text, if( pText && pTextAttributes ) { uno::Sequence< beans::PropertyValue > aAttributeList = - pTextAttributes->getRunAttributes( offset, uno::Sequence< rtl::OUString > () ); + pTextAttributes->getRunAttributes( offset, uno::Sequence< OUString > () ); pSet = attribute_set_new_from_property_values( aAttributeList, true, text ); // #i100938# @@ -615,7 +615,7 @@ text_wrapper_get_default_attributes( AtkText *text ) if( pTextAttributes ) { uno::Sequence< beans::PropertyValue > aAttributeList = - pTextAttributes->getDefaultAttributes( uno::Sequence< rtl::OUString > () ); + pTextAttributes->getDefaultAttributes( uno::Sequence< OUString > () ); pSet = attribute_set_new_from_property_values( aAttributeList, false, text ); } diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 23738f9009b9..a5612b43e39f 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -532,7 +532,7 @@ String2Underline( uno::Any& rAny, const gchar * value ) static gchar* GetString(const uno::Any& rAny) { - rtl::OString aFontName = rtl::OUStringToOString( rAny.get< rtl::OUString > (), RTL_TEXTENCODING_UTF8 ); + OString aFontName = OUStringToOString( rAny.get< OUString > (), RTL_TEXTENCODING_UTF8 ); if( !aFontName.isEmpty() ) return g_strdup( aFontName.getStr() ); @@ -543,11 +543,11 @@ GetString(const uno::Any& rAny) static bool SetString( uno::Any& rAny, const gchar * value ) { - rtl::OString aFontName( value ); + OString aFontName( value ); if( !aFontName.isEmpty() ) { - rAny = uno::makeAny( rtl::OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); + rAny = uno::makeAny( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); return true; } @@ -709,8 +709,8 @@ Locale2String(const uno::Any& rAny) { lang::Locale aLocale = rAny.get<lang::Locale> (); return g_strdup_printf( "%s-%s", - rtl::OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() ); + OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() ); } static bool @@ -725,11 +725,11 @@ String2Locale( uno::Any& rAny, const gchar * value ) lang::Locale aLocale; - aLocale.Language = rtl::OUString::createFromAscii(str_array[0]); + aLocale.Language = OUString::createFromAscii(str_array[0]); if( str_array[1] != NULL ) { gchar * country = g_ascii_strup(str_array[1], -1); - aLocale.Country = rtl::OUString::createFromAscii(country); + aLocale.Country = OUString::createFromAscii(country); g_free(country); } @@ -1339,7 +1339,7 @@ attribute_set_map_to_property_values( if( ! g_TextAttrMap[text_attr].toPropertyValue( aAttributeList[nIndex].Value, attribute->value) ) return false; - aAttributeList[nIndex].Name = rtl::OUString::createFromAscii( g_TextAttrMap[text_attr].name ); + aAttributeList[nIndex].Name = OUString::createFromAscii( g_TextAttrMap[text_attr].name ); aAttributeList[nIndex].State = beans::PropertyState_DIRECT_VALUE; ++nIndex; } diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index e5de208d6281..fd396c8f7083 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -95,7 +95,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) { role = ATK_ROLE_TOOL_TIP; pChild->SetAccessibleRole( AccessibleRole::LABEL ); - accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); } else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW ) { @@ -105,7 +105,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) // This is a top-level menu popup. Register it. role = ATK_ROLE_POPUP_MENU; pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU ); - accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); } } } diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 2e7824eb0f94..4c9d5d612d33 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -325,8 +325,8 @@ wrapper_get_name( AtkObject *atk_obj ) { uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext); try { - rtl::OString aName = - rtl::OUStringToOString( + OString aName = + OUStringToOString( xContext->getAccessibleName(), RTL_TEXTENCODING_UTF8); @@ -357,8 +357,8 @@ wrapper_get_description( AtkObject *atk_obj ) { uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext); try { - rtl::OString aDescription = - rtl::OUStringToOString( + OString aDescription = + OUStringToOString( xContext->getAccessibleDescription(), RTL_TEXTENCODING_UTF8); @@ -711,7 +711,7 @@ ensureTypeFor( uno::XInterface *pAccessible ) { int i; int bTypes[ aTypeTableSize ] = { 0, }; - rtl::OString aTypeName( "OOoAtkObj" ); + OString aTypeName( "OOoAtkObj" ); for( i = 0; i < aTypeTableSize; i++ ) { diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 1427a26d45a3..e613cfa1e90d 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -65,7 +65,7 @@ struct _AtkObjectWrapper AtkObject *child_about_to_be_removed; gint index_of_child_about_to_be_removed; -// ::rtl::OString * m_pKeyBindings +// OString * m_pKeyBindings }; struct _AtkObjectWrapperClass @@ -106,13 +106,13 @@ void valueIfaceInit(AtkValueIface *iface); (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_WRAPPER, AtkObjectWrapper)) static inline gchar * -OUStringToGChar(const rtl::OUString& rString ) +OUStringToGChar(const OUString& rString ) { - rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + OString aUtf8 = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return g_strdup( aUtf8.getStr() ); } -#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() +#define OUStringToConstGChar( string ) OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() #endif /* __ATK_WRAPPER_HXX__ */ diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index af98ba210736..dac0f28f4105 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -49,7 +49,6 @@ using namespace vcl_sal; -using ::rtl::OUString; /*************************************************************** * class GtkSalDisplay * @@ -680,7 +679,7 @@ void GtkData::Init() osl_getExecutableFile( &aProgramFileURL.pData ); OUString aProgramSystemPath; osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData); - OString aProgramName = rtl::OUStringToOString( + OString aProgramName = OUStringToOString( aProgramSystemPath, osl_getThreadTextEncoding() ); fprintf( stderr, "%s X11 error: Can't open display: %s\n", diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 07172468846d..554c26c9be97 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -279,22 +279,22 @@ extern "C" typedef void(* addItemFnc)(void *, const char *); } -void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) +void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) { - rtl::OString sGtkURL; + OString sGtkURL; rtl_TextEncoding aSystemEnc = osl_getThreadTextEncoding(); if ((aSystemEnc == RTL_TEXTENCODING_UTF8) || !rFileUrl.startsWith( "file://" )) - sGtkURL = rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8); + sGtkURL = OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8); else { //Non-utf8 locales are a bad idea if trying to work with non-ascii filenames //Decode %XX components - rtl::OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8); + OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8); //Convert back to system locale encoding - rtl::OString sSystemUrl = rtl::OUStringToOString(sDecodedUri, aSystemEnc); + OString sSystemUrl = OUStringToOString(sDecodedUri, aSystemEnc); //Encode to an escaped ASCII-encoded URI gchar *g_uri = g_filename_to_uri(sSystemUrl.getStr(), NULL, NULL); - sGtkURL = rtl::OString(g_uri); + sGtkURL = OString(g_uri); g_free(g_uri); } #if GTK_CHECK_VERSION(2,10,0) diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index bc06b25a1ccc..e389eb4ae0a4 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -242,14 +242,14 @@ Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScre return GetDisplayScreenPosSizePixel( nScreen ); } -rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) +OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) { gchar *pStr; gint nMonitor; GdkScreen *pScreen; pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) - return rtl::OUString(); + return OUString(); #if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0) pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor); @@ -267,23 +267,23 @@ rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) else pStr = g_strdup_printf ("%d", nScreen); #endif - rtl::OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8); + OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8); g_free (pStr); return aRet; } // convert ~ to indicate mnemonic to '_' -static rtl::OString MapToGtkAccelerator(const rtl::OUString &rStr) +static OString MapToGtkAccelerator(const OUString &rStr) { - return rtl::OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8); + return OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8); } -int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtonNames, +int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage, + const std::list< OUString >& rButtonNames, int nDefaultButton) { - rtl::OString aTitle (rtl::OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8)); - rtl::OString aMessage (rtl::OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8)); + OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8)); + OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8)); GtkDialog *pDialog = GTK_DIALOG ( g_object_new (GTK_TYPE_MESSAGE_DIALOG, @@ -292,7 +292,7 @@ int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUSt "text", aMessage.getStr(), NULL)); int nButton = 0; - std::list< rtl::OUString >::const_iterator it; + std::list< OUString >::const_iterator it; for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it) gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++); gtk_dialog_set_default_response (pDialog, nDefaultButton); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index eebfe68c3b01..5672b030b76e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -236,7 +236,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window); gtk_widget_show (scrolled_window); - rtl::OString sExpand(getenv("SAL_EXPANDFPICKER")); + OString sExpand(getenv("SAL_EXPANDFPICKER")); sal_Int32 nExpand = sExpand.toInt32(); switch (nExpand) { @@ -368,22 +368,22 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) struct FilterEntry { protected: - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sFilter; + OUString m_sTitle; + OUString m_sFilter; UnoFilterList m_aSubFilters; public: - FilterEntry( const ::rtl::OUString& _rTitle, const ::rtl::OUString& _rFilter ) + FilterEntry( const OUString& _rTitle, const OUString& _rFilter ) :m_sTitle( _rTitle ) ,m_sFilter( _rFilter ) { } - FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ); + FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ); - ::rtl::OUString getTitle() const { return m_sTitle; } - ::rtl::OUString getFilter() const { return m_sFilter; } + OUString getTitle() const { return m_sTitle; } + OUString getFilter() const { return m_sFilter; } /// determines if the filter has sub filter (i.e., the filter is a filter group in real) sal_Bool hasSubFilters( ) const; @@ -402,7 +402,7 @@ public: //===================================================================== //--------------------------------------------------------------------- -FilterEntry::FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ) +FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { @@ -422,13 +422,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) } static bool -isFilterString( const rtl::OUString &rFilterString, const char *pMatch ) +isFilterString( const OUString &rFilterString, const char *pMatch ) { sal_Int32 nIndex = 0; - rtl::OUString aToken; + OUString aToken; bool bIsFilter = true; - rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch)); + OUString aMatch(OUString::createFromAscii(pMatch)); do { @@ -444,8 +444,8 @@ isFilterString( const rtl::OUString &rFilterString, const char *pMatch ) return bIsFilter; } -static rtl::OUString -shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) +static OUString +shrinkFilterName( const OUString &rFilterName, bool bAllowNoStar = false ) { int i; int nBracketLen = -1; @@ -463,11 +463,11 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) if( nBracketEnd <= 0 ) continue; if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); else if (bAllowNoStar) { if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); } } } @@ -503,10 +503,10 @@ namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: - const ::rtl::OUString& rTitle; + const OUString& rTitle; public: - FilterTitleMatch( const ::rtl::OUString& _rTitle ) : rTitle( _rTitle ) { } + FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } //............................................................................ bool operator () ( const FilterEntry& _rEntry ) @@ -536,7 +536,7 @@ namespace { //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const ::rtl::OUString& rTitle ) +sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { sal_Bool bRet = sal_False; @@ -574,7 +574,7 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilte } //------------------------------------------------------------------------------------ -void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ) +void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) { @@ -591,7 +591,7 @@ void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrent // //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) +void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -612,7 +612,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const // //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) +void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -679,7 +679,7 @@ void SalGtkFilePicker::UpdateFilterfromUI() } } -rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -699,7 +699,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE // XFilterGroupManager functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) +void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -713,7 +713,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroup throw IllegalArgumentException(); // ensure that we have a filter list - ::rtl::OUString sInitialCurrentFilter; + OUString sInitialCurrentFilter; if( aFilters.getLength() ) sInitialCurrentFilter = aFilters[0].First; @@ -740,7 +740,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER(m_pDialog), bMode ); } -void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) +void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -755,7 +755,7 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER( m_pDialog ), aStr.getStr() ); } -void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory ) +void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -763,18 +763,18 @@ void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirec implsetDisplayDirectory(rDirectory); } -rtl::OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; return implgetDisplayDirectory(); } -uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) { // no member access => no mutex needed - uno::Sequence< rtl::OUString > aFiles = getSelectedFiles(); + uno::Sequence< OUString > aFiles = getSelectedFiles(); /* The previous multiselection API design was completely broken and unimplementable for some hetrogenous pseudo-URIs eg. search:// @@ -784,7 +784,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::R return aFiles; } -uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -800,7 +800,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw GtkFileChooserAction eAction = gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog )); - uno::Sequence< rtl::OUString > aSelectedFiles(nCount); + uno::Sequence< OUString > aSelectedFiles(nCount); // Convert to OOo for( GSList *pElem = pPathList; pElem; pElem = pElem->next) @@ -828,7 +828,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw { if( aSelectedFiles[nIndex].indexOf('.') > 0 ) { - rtl::OUString sExtension; + OUString sExtension; nTokenIndex = 0; do sExtension = aSelectedFiles[nIndex].getToken( 0, '.', nTokenIndex ); @@ -838,8 +838,8 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw { static const OUString aStarDot( "*." ); - ::rtl::OUString aNewFilter; - ::rtl::OUString aOldFilter = getCurrentFilter(); + OUString aNewFilter; + OUString aOldFilter = getCurrentFilter(); sal_Bool bChangeFilter = sal_True; for ( FilterList::iterator aListIter = m_pFilterList->begin(); aListIter != m_pFilterList->end(); @@ -886,8 +886,8 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() ); nTokenIndex = 0; - rtl::OUString sToken; - // rtl::OUString strExt; + OUString sToken; + // OUString strExt; do { sToken = aFilter.getToken( 0, '.', nTokenIndex ); @@ -930,7 +930,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw // XExecutableDialog functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::setTitle( const rtl::OUString& rTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1131,11 +1131,11 @@ static void HackWidthToFirst(GtkComboBox *pWidget) gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1); } -static void ComboBoxAppendText(GtkComboBox *pCombo, const rtl::OUString &rStr) +static void ComboBoxAppendText(GtkComboBox *pCombo, const OUString &rStr) { GtkTreeIter aIter; GtkListStore *pStore = GTK_LIST_STORE(gtk_combo_box_get_model(pCombo)); - rtl::OString aStr = rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8); + OString aStr = OUStringToOString(rStr, RTL_TEXTENCODING_UTF8); gtk_list_store_append(pStore, &aIter); gtk_list_store_set(pStore, &aIter, 0, aStr.getStr(), -1); } @@ -1349,7 +1349,7 @@ throw( uno::RuntimeException ) OSL_TRACE("enable unknown control %d", nControlId ); } -void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel ) +void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1386,7 +1386,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS OSL_TRACE("Can't set label on list"); } -rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) +OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1469,8 +1469,8 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString( ": " ); - aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); + aLabel += OUString( ": " ); + aLabel += OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander), @@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast<XFilePicker2*>( this ), 1 ); aAny = aArguments[0]; @@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast<XFilePicker2*>( this ), 1 ); sal_Int16 templateId = -1; @@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu break; default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -1831,7 +1831,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O GtkFileFilter *filter = gtk_file_filter_new(); OUString aShrunkName = shrinkFilterName( rFilter ); - OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); + OString aFilterName = OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName.getStr() ); static const OUString aStarDot( "*." ); @@ -1843,7 +1843,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O else { sal_Int32 nIndex = 0; - rtl::OUString aToken; + OUString aToken; do { aToken = rType.getToken( 0, ';', nIndex ); @@ -1858,16 +1858,16 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, - g_strdup( rtl::OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), + g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), (GDestroyNotify) g_free ); - OSL_TRACE( "fustering with %s", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); + OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); } #if OSL_DEBUG_LEVEL > 0 else { g_warning( "Duff filter token '%s'\n", - rtl::OUStringToOString( + OUStringToOString( rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr() ); } #endif @@ -1906,7 +1906,7 @@ void SalGtkFilePicker::SetFilters() if (m_aInitialFilter.isEmpty()) m_aInitialFilter = m_aCurrentFilter; - rtl::OUString sPseudoFilter; + OUString sPseudoFilter; if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) ) { std::set<OUString> aAllFormats; @@ -1932,7 +1932,7 @@ void SalGtkFilePicker::SetFilters() } if (aAllFormats.size() > 1) { - rtl::OUString sAllFilter; + OUString sAllFilter; std::set<OUString>::const_iterator aEnd = aAllFormats.end(); for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index c9fbb9ab8fc9..6a2df47f0707 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -37,8 +37,6 @@ // Implementation class for the XFilePicker Interface //---------------------------------------------------------- -using ::rtl::OUString; -using ::rtl::OString; struct FilterEntry; struct ElementEntry_Impl; @@ -80,7 +78,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // XExecutableDialog functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() @@ -93,44 +91,44 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory( ) + virtual OUString SAL_CALL getDisplayDirectory( ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------------------------------------------ // XFilePicker2 functions //------------------------------------------------------------------------------------ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------ // XFilterManager functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter ) + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter( ) + virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------------------------------------------ // XFilterGroupManager functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------ @@ -146,10 +144,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel ) + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ @@ -208,10 +206,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base SalGtkFilePicker( const SalGtkFilePicker& ); SalGtkFilePicker& operator=( const SalGtkFilePicker& ); - sal_Bool FilterNameExists( const ::rtl::OUString& rTitle ); + sal_Bool FilterNameExists( const OUString& rTitle ); sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); - void ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ); + void ensureFilterList( const OUString& _rInitialCurrentFilter ); void impl_fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void impl_directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); @@ -220,7 +218,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base private: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - ::rtl::OUString msPlayLabel; + OUString msPlayLabel; FilterList *m_pFilterList; GtkWidget *m_pVBox; @@ -244,7 +242,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base bool mbToggleVisibility[TOGGLE_LAST]; bool mbToggleChecked[TOGGLE_LAST]; - static const rtl::OString m_ToggleLabels[TOGGLE_LAST]; + static const OString m_ToggleLabels[TOGGLE_LAST]; enum { PLAY, @@ -269,8 +267,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base gulong mnHID_FolderChange; gulong mnHID_SelectionChange; - ::rtl::OUString m_aCurrentFilter; - ::rtl::OUString m_aInitialFilter; + OUString m_aCurrentFilter; + OUString m_aInitialFilter; bool bVersionWidthUnset; sal_Bool mbPreviewState; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index d950dd8dbf9c..e08fdf78f2c4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -70,7 +70,7 @@ void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) { } -void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory ) +void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -91,7 +91,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDir aTxt.getStr() ); } -rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -105,7 +105,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run return aCurrentFolderName; } -rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExc return aSelectedFolderName; } -void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescription*/ ) +void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ ) throw( uno::RuntimeException ) { } @@ -128,13 +128,13 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescri // XExecutableDialog functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException ) { SolarMutexGuard g; OSL_ASSERT( m_pDialog != NULL ); - ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); + OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index ca0746288b85..2e7aef490fa8 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -41,7 +41,7 @@ class SalGtkFolderPicker : // XExecutableDialog functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute( ) @@ -51,16 +51,16 @@ class SalGtkFolderPicker : // XFolderPicker functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& rDirectory ) + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getDisplayDirectory( ) + virtual OUString SAL_CALL getDisplayDirectory( ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getDirectory( ) + virtual OUString SAL_CALL getDirectory( ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDescription( const rtl::OUString& rDescription ) + virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException ); //------------------------------------------------ diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index db74fc750d38..f69adf4a6bdf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -42,12 +42,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) +OUString SalGtkPicker::uritounicode(const gchar* pIn) { if (!pIn) - return rtl::OUString(); + return OUString(); - rtl::OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn), + OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn), RTL_TEXTENCODING_UTF8 ); INetURLObject aURL(sURL); @@ -58,7 +58,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL); if ( pEncodedFileName ) { - rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), + OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), osl_getThreadTextEncoding()); INetURLObject aCurrentURL(sEncoded, INetURLObject::FSYS_UNX); aCurrentURL.SetHost(aURL.GetHost()); @@ -74,7 +74,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) return sURL; } -rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) +OString SalGtkPicker::unicodetouri(const OUString &rURL) { // all the URLs are handled by office in UTF-8 ( and encoded with "%xx" codes based on UTF-8 ) // so the Gnome FP related URLs should be converted accordingly @@ -182,7 +182,7 @@ void SalGtkPicker::setGtkLanguage() OUString aLocaleString( Application::GetSettings().GetUILanguageTag().getGlibcLocaleString( ".UTF-8")); if (!aLocaleString.isEmpty()) { - rtl::OUString envVar( "LANGUAGE" ); + OUString envVar( "LANGUAGE" ); osl_setEnvironment( envVar.pData, aLocaleString.pData ); } bSet = true; @@ -204,7 +204,7 @@ SalGtkPicker::~SalGtkPicker() } } -void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory ) +void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -223,23 +223,23 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirec aTxt.getStr() ); } -rtl::OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); gchar* pCurrentFolder = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) ); - ::rtl::OUString aCurrentFolderName = uritounicode(pCurrentFolder); + OUString aCurrentFolderName = uritounicode(pCurrentFolder); g_free( pCurrentFolder ); return aCurrentFolderName; } -void SAL_CALL SalGtkPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); + OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 196e8e901f6b..477c707dd71f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -48,21 +48,21 @@ class SalGtkPicker osl::Mutex m_rbHelperMtx; GtkWidget *m_pDialog; protected: - virtual void SAL_CALL implsetTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL implsetTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL implsetDisplayDirectory( const rtl::OUString& rDirectory ) + virtual void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL implgetDisplayDirectory( ) + virtual OUString SAL_CALL implgetDisplayDirectory( ) throw( com::sun::star::uno::RuntimeException ); - rtl::OUString uritounicode(const gchar *pIn); - rtl::OString unicodetouri(const rtl::OUString &rURL); + OUString uritounicode(const gchar *pIn); + OString unicodetouri(const OUString &rURL); // to instantiate own services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - rtl::OUString getResString( sal_Int32 aId ); + OUString getResString( sal_Int32 aId ); private: void setGtkLanguage(); }; diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index 498a74ce4579..ec588c1f00c3 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -68,9 +68,9 @@ static sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) return -1; } -rtl::OUString SalGtkPicker::getResString( sal_Int32 aId ) +OUString SalGtkPicker::getResString( sal_Int32 aId ) { - rtl::OUString aResString; + OUString aResString; try { // translate the control id to a resource id diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 83c92b2cf792..df123c5cc1a7 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper() void GtkPrintWrapper::impl_load() { - m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0")); + m_aModule.load(OUString("libgtk-x11-2.0.so.0")); if (!m_aModule.is()) - m_aModule.load(rtl::OUString("libgtk-x11-2.0.so")); + m_aModule.load(OUString("libgtk-x11-2.0.so")); if (!m_aModule.is()) return; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 405fcc3a65c8..4ece2aa4c1ce 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -60,7 +60,6 @@ GtkSalGraphics::~GtkSalGraphics() { } -using ::rtl::OUString; /************************************* * Cached native widget objects diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index c97e16e01212..c87f7652d18a 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -95,7 +95,7 @@ public: } void updateControllerPrintRange(); #if 0 - void ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings* pSettings) const; + void ExportAsPDF(const OUString &rFileURL, GtkPrintSettings* pSettings) const; #endif ~GtkPrintDialog(); @@ -130,7 +130,7 @@ private: private: GtkWidget* m_pDialog; vcl::PrinterController& m_rController; - std::map<GtkWidget*, rtl::OUString> m_aControlToPropertyMap; + std::map<GtkWidget*, OUString> m_aControlToPropertyMap; std::map<GtkWidget*, sal_Int32> m_aControlToNumValMap; boost::shared_ptr<GtkPrintWrapper> m_pWrapper; }; @@ -138,8 +138,8 @@ private: struct GtkSalPrinter_Impl { - rtl::OString m_sSpoolFile; - rtl::OUString m_sJobName; + OString m_sSpoolFile; + OUString m_sJobName; GtkPrinter* m_pPrinter; GtkPrintSettings* m_pSettings; @@ -197,9 +197,9 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter) bool GtkSalPrinter::impl_doJob( - const rtl::OUString* const i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + const OUString* const i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* const io_pSetupData, const int i_nCopies, const bool i_bCollate, @@ -231,9 +231,9 @@ GtkSalPrinter::impl_doJob( sal_Bool GtkSalPrinter::StartJob( - const rtl::OUString* const i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + const OUString* const i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController) { @@ -245,9 +245,9 @@ GtkSalPrinter::StartJob( m_pImpl.reset(new GtkSalPrinter_Impl()); m_pImpl->m_sJobName = i_rJobName; - rtl::OString sFileName; + OString sFileName; if (i_pFileName) - sFileName = rtl::OUStringToOString(*i_pFileName, osl_getThreadTextEncoding()); + sFileName = OUStringToOString(*i_pFileName, osl_getThreadTextEncoding()); GtkPrintDialog aDialog(io_rController); if (!aDialog.run()) @@ -265,7 +265,7 @@ GtkSalPrinter::StartJob( const gchar *pStr = gtk_print_settings_get(m_pImpl->m_pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); if (pStr && !strcmp(pStr, "pdf")) { - aDialog.ExportAsPDF(rtl::OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings); + aDialog.ExportAsPDF(OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings); bDoJob = false; } } @@ -277,10 +277,10 @@ GtkSalPrinter::StartJob( bool bCollate = false; //To-Do proper name, watch for encodings - sFileName = rtl::OString("/tmp/hacking.ps"); + sFileName = OString("/tmp/hacking.ps"); m_pImpl->m_sSpoolFile = sFileName; - rtl::OUString aFileName = rtl::OStringToOUString(sFileName, osl_getThreadTextEncoding()); + OUString aFileName = OStringToOUString(sFileName, osl_getThreadTextEncoding()); //To-Do, swap ps/pdf for gtk_printer_accepts_ps()/gtk_printer_accepts_pdf() ? @@ -315,7 +315,7 @@ GtkSalPrinter::EndJob() #endif GtkPrintJob* const pJob = pWrapper->print_job_new( - rtl::OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(), m_pImpl->m_pPrinter, m_pImpl->m_pSettings, pPageSetup); GError* error = NULL; @@ -344,13 +344,13 @@ namespace void lcl_setHelpText( GtkWidget* const io_pWidget, - const uno::Sequence<rtl::OUString>& i_rHelpTexts, + const uno::Sequence<OUString>& i_rHelpTexts, const sal_Int32 i_nIndex) { #if GTK_CHECK_VERSION(2,12,0) if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength()) gtk_widget_set_tooltip_text(io_pWidget, - rtl::OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); #else (void)io_pWidget; (void)i_rHelpTexts; @@ -362,8 +362,8 @@ lcl_setHelpText( static GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, - const rtl::OUString &i_rText, - const uno::Sequence<rtl::OUString> &i_rHelpTexts, + const OUString &i_rText, + const uno::Sequence<OUString> &i_rHelpTexts, sal_Int32* const io_pCurHelpText) { GtkWidget* const pLabel = gtk_label_new(NULL); @@ -372,7 +372,7 @@ lcl_makeFrame( { gchar* const pText = g_markup_printf_escaped("<b>%s</b>", - rtl::OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr()); gtk_label_set_markup_with_mnemonic(GTK_LABEL(pLabel), pText); g_free(pText); } @@ -391,11 +391,11 @@ lcl_makeFrame( void lcl_extractHelpTextsOrIds( const beans::PropertyValue& rEntry, - uno::Sequence<rtl::OUString>& rHelpStrings) + uno::Sequence<OUString>& rHelpStrings) { if (!(rEntry.Value >>= rHelpStrings)) { - rtl::OUString aHelpString; + OUString aHelpString; if ((rEntry.Value >>= aHelpString)) { rHelpStrings.realloc(1); @@ -473,8 +473,8 @@ GtkPrintDialog::impl_initDialog() void GtkPrintDialog::impl_initCustomTab() { - typedef std::map<rtl::OUString, GtkWidget*> DependencyMap_t; - typedef std::vector<std::pair<GtkWidget*, rtl::OUString> > CustomTabs_t; + typedef std::map<OUString, GtkWidget*> DependencyMap_t; + typedef std::vector<std::pair<GtkWidget*, OUString> > CustomTabs_t; const uno::Sequence<beans::PropertyValue>& rOptions(m_rController.getUIOptions()); DependencyMap_t aPropertyToDependencyRowMap; @@ -489,15 +489,15 @@ GtkPrintDialog::impl_initCustomTab() uno::Sequence<beans::PropertyValue> aOptProp; rOptions[i].Value >>= aOptProp; - rtl::OUString aCtrlType; - rtl::OUString aText; - rtl::OUString aPropertyName; - uno::Sequence<rtl::OUString> aChoices; + OUString aCtrlType; + OUString aText; + OUString aPropertyName; + uno::Sequence<OUString> aChoices; uno::Sequence<sal_Bool> aChoicesDisabled; - uno::Sequence<rtl::OUString> aHelpTexts; + uno::Sequence<OUString> aHelpTexts; sal_Int64 nMinValue = 0, nMaxValue = 0; sal_Int32 nCurHelpText = 0; - rtl::OUString aDependsOnName; + OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; sal_Bool bUseDependencyRow = sal_False; sal_Bool bIgnore = sal_False; @@ -509,7 +509,7 @@ GtkPrintDialog::impl_initCustomTab() const beans::PropertyValue& rEntry(aOptProp[ n ]); if ( rEntry.Name == "Text" ) { - rtl::OUString aValue; + OUString aValue; rEntry.Value >>= aValue; aText = aValue.replace('~', '_'); } @@ -537,7 +537,7 @@ GtkPrintDialog::impl_initCustomTab() rEntry.Value >>= nMaxValue; else if ( rEntry.Name == "HelpId" ) { - uno::Sequence<rtl::OUString> aHelpIds; + uno::Sequence<OUString> aHelpIds; lcl_extractHelpTextsOrIds(rEntry, aHelpIds); Help* const pHelp = Application::GetHelp(); if (pHelp) @@ -619,7 +619,7 @@ GtkPrintDialog::impl_initCustomTab() if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bool")) && pCurParent) { pWidget = gtk_check_button_new_with_mnemonic( - rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); lcl_setHelpText(pWidget, aHelpTexts, 0); m_aControlToPropertyMap[pWidget] = aPropertyName; @@ -649,14 +649,14 @@ GtkPrintDialog::impl_initCustomTab() { pWidget = gtk_radio_button_new_with_mnemonic_from_widget( GTK_RADIO_BUTTON(m == 0 ? NULL : pWidget), - rtl::OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr()); lcl_setHelpText(pWidget, aHelpTexts, nCurHelpText++); m_aControlToPropertyMap[pWidget] = aPropertyName; m_aControlToNumValMap[pWidget] = m; GtkWidget* const pRow = gtk_hbox_new(FALSE, 12); gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); - aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(m)] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal); gtk_widget_set_sensitive(pWidget, m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL); @@ -684,7 +684,7 @@ GtkPrintDialog::impl_initCustomTab() for (sal_Int32 m = 0; m != aChoices.getLength(); m++) { lcl_combo_box_text_append(pWidget, - rtl::OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr()); } sal_Int32 nSelectVal = 0; @@ -698,12 +698,12 @@ GtkPrintDialog::impl_initCustomTab() { pWidget = gtk_entry_new(); - rtl::OUString aCurVal; + OUString aCurVal; pVal = m_rController.getValue(aPropertyName); if (pVal && pVal->Value.hasValue()) pVal->Value >>= aCurVal; gtk_entry_set_text(GTK_ENTRY(pWidget), - rtl::OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr()); } else if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Range")) && pCurParent) { @@ -725,7 +725,7 @@ GtkPrintDialog::impl_initCustomTab() if (!aText.isEmpty()) { GtkWidget* const pLabel = gtk_label_new_with_mnemonic( - rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); gtk_label_set_mnemonic_widget(GTK_LABEL(pLabel), pWidget); gtk_box_pack_start(GTK_BOX(pHbox), pLabel, FALSE, FALSE, 0); } @@ -743,7 +743,7 @@ GtkPrintDialog::impl_initCustomTab() { if (bUseDependencyRow && !aDependsOnName.isEmpty()) { - pRow = aPropertyToDependencyRowMap[aDependsOnName + rtl::OUString::valueOf(nDependsOnValue)]; + pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)]; if (!pRow) { gtk_widget_destroy(pWidget); @@ -759,7 +759,7 @@ GtkPrintDialog::impl_initCustomTab() gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0); } if (!pGroup) - aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(sal_Int32(0))] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow; gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); } } @@ -773,7 +773,7 @@ GtkPrintDialog::impl_initCustomTab() { gtk_widget_show_all(aI->first); m_pWrapper->print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(m_pDialog), aI->first, - gtk_label_new(rtl::OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr())); + gtk_label_new(OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr())); } } @@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled } beans::PropertyValue* const pPrintContent( - m_rController.getValue(rtl::OUString("PrintContent"))); + m_rController.getValue(OUString("PrintContent"))); if (pPrintContent) { @@ -835,7 +835,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled void GtkPrintDialog::impl_checkOptionalControlDependencies() { - for (std::map<GtkWidget*, rtl::OUString>::iterator it = m_aControlToPropertyMap.begin(); + for (std::map<GtkWidget*, OUString>::iterator it = m_aControlToPropertyMap.begin(); it != m_aControlToPropertyMap.end(); ++it) { gtk_widget_set_sensitive(it->first, m_rController.isUIOptionEnabled(it->second)); @@ -847,7 +847,7 @@ beans::PropertyValue* GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const { beans::PropertyValue* pVal(0); - std::map<GtkWidget*, rtl::OUString>::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget)); + std::map<GtkWidget*, OUString>::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget)); if (aIt != m_aControlToPropertyMap.end()) { pVal = m_rController.getValue(aIt->second); @@ -936,7 +936,7 @@ GtkPrintDialog::run() } #if 0 -void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings *pSettings) const +void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSettings) const { uno::Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Reference < XFrame > xFrame(xDesktop->getActiveFrame()); @@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY); uno::Reference < XFilter > xFilter( - ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")), + ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.PDFFilter")), UNO_QUERY); if (xFilter.is()) @@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); uno::Sequence<beans::PropertyValue> aFilterData(2); - aFilterData[0].Name = rtl::OUString("PageLayout"); + aFilterData[0].Name = OUString("PageLayout"); aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = rtl::OUString("FirstPageOnLeft"); + aFilterData[1].Name = OUString("FirstPageOnLeft"); aFilterData[1].Value <<= sal_False; @@ -987,8 +987,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings aRangeText.AppendAscii(","); } aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); - aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText); + aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Value <<= OUString(aRangeText); } else if (pStr && !strcmp(pStr, "current")) { @@ -1012,7 +1012,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xSheets = uno::Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY); if (xSheets.is()) { - const rtl::OUString &rName = xName->getName(); + const OUString &rName = xName->getName(); sal_Int32 i; @@ -1027,8 +1027,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (i < xSheets->getCount()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); - aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1)); + aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1)); } } } @@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (aSelection.hasValue()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection"); + aFilterData[aFilterData.getLength()-1].Name = OUString("Selection"); aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } #endif uno::Sequence<beans::PropertyValue> aArgs(2); - aArgs[0].Name = rtl::OUString("FilterData"); + aArgs[0].Name = OUString("FilterData"); aArgs[0].Value <<= aFilterData; - aArgs[1].Name = rtl::OUString("OutputStream"); + aArgs[1].Name = OUString("OutputStream"); aArgs[1].Value <<= xOStm; xFilter->filter(aArgs); } @@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange() // TODO: use get_print_pages if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES)) { - beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange")); + beans::PropertyValue* pVal = m_rController.getValue(OUString("PrintRange")); if (!pVal) - pVal = m_rController.getValue(rtl::OUString("PrintContent")); + pVal = m_rController.getValue(OUString("PrintContent")); SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!"); if (pVal) { @@ -1093,11 +1093,11 @@ GtkPrintDialog::updateControllerPrintRange() if (nVal == 1) { - pVal = m_rController.getValue(rtl::OUString("PageRange")); + pVal = m_rController.getValue(OUString("PageRange")); SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!"); if (pVal) { - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; gint num_ranges; const GtkPageRange* const pRanges = m_pWrapper->print_settings_get_page_ranges(pSettings, &num_ranges); for (gint i = 0; i != num_ranges && pRanges; ++i) @@ -1133,11 +1133,11 @@ GtkPrintDialog::impl_readFromSettings() vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr("PrintDialog"); - const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr, - rtl::OUString("CopyCount"))); - const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr, - rtl::OUString("Collate"))); + const OUString aPrintDialogStr("PrintDialog"); + const OUString aCopyCount(pItem->getValue(aPrintDialogStr, + OUString("CopyCount"))); + const OUString aCollate(pItem->getValue(aPrintDialogStr, + OUString("Collate"))); bool bChanged(false); @@ -1171,17 +1171,17 @@ const vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr("PrintDialog"); + const OUString aPrintDialogStr("PrintDialog"); pItem->setValue(aPrintDialogStr, - rtl::OUString("CopyCount"), - rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); + OUString("CopyCount"), + OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); pItem->setValue(aPrintDialogStr, - rtl::OUString("Collate"), + OUString("Collate"), m_pWrapper->print_settings_get_collate(pSettings) - ? rtl::OUString("true") - : rtl::OUString("false")) + ? OUString("true") + : OUString("false")) ; - // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), ); + // pItem->setValue(aPrintDialog, OUString::createFromAscii("ToFile"), ); g_object_unref(G_OBJECT(pSettings)); pItem->Commit(); } diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 3e9da947db95..efd6c13800d8 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1333,11 +1333,11 @@ sal_Bool GtkSalFrame::PostEvent( void* pData ) return sal_True; } -void GtkSalFrame::SetTitle( const rtl::OUString& rTitle ) +void GtkSalFrame::SetTitle( const OUString& rTitle ) { m_aTitle = rTitle; if( m_pWindow && ! isChild() ) - gtk_window_set_title( GTK_WINDOW(m_pWindow), rtl::OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); + gtk_window_set_title( GTK_WINDOW(m_pWindow), OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); } static inline sal_uInt8 * @@ -1552,7 +1552,7 @@ static void initClientId() if (!bOnce) { bOnce = true; - const rtl::OString& rID = SessionManagerClient::getSessionID(); + const OString& rID = SessionManagerClient::getSessionID(); if (!rID.isEmpty()) gdk_set_sm_client_id(rID.getStr()); } @@ -2133,7 +2133,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen ) void GtkSalFrame::updateWMClass() { - rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); + OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); Display *display; @@ -2150,7 +2150,7 @@ void GtkSalFrame::updateWMClass() if( IS_WIDGET_REALIZED( m_pWindow ) ) { XClassHint* pClass = XAllocClassHint(); - rtl::OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle ); + OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle ); pClass->res_name = const_cast<char*>(aResName.getStr()); pClass->res_class = const_cast<char*>(pResClass); XSetClassHint( display, @@ -2160,7 +2160,7 @@ void GtkSalFrame::updateWMClass() } } -void GtkSalFrame::SetApplicationID( const rtl::OUString &rWMClass ) +void GtkSalFrame::SetApplicationID( const OUString &rWMClass ) { if( rWMClass != m_sWMClass && ! isChild() ) { @@ -2548,14 +2548,14 @@ void GtkSalFrame::Sync() gdk_display_sync( getGdkDisplay() ); } -rtl::OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { #if !GTK_CHECK_VERSION(3,0,0) return getDisplay()->GetKeyName( nKeyCode ); #else (void)nKeyCode; # warning FIXME - key names - return rtl::OUString(); + return OUString(); #endif } @@ -4200,13 +4200,13 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon if (xText.is()) { sal_uInt32 nPosition = xText->getCaretPosition(); - rtl::OUString sAllText = xText->getText(); + OUString sAllText = xText->getText(); if (sAllText.isEmpty()) return sal_False; - rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8); - rtl::OUString sCursorText(sAllText.copy(0, nPosition)); + OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8); + OUString sCursorText(sAllText.copy(0, nPosition)); gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(), - rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength()); + OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength()); return sal_True; } diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 132d3a301c25..688fda4a9419 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -49,8 +49,8 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo if ( !pMenu ) return NULL; - rtl::OUString aMenuCommand = pMenu->GetItemCommand( nId ); - gchar* aCommandStr = g_strdup( rtl::OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString aMenuCommand = pMenu->GetItemCommand( nId ); + gchar* aCommandStr = g_strdup( OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); aCommand = g_strdup( aCommandStr ); // Some items could have duplicated commands. A new one should be generated. @@ -551,12 +551,12 @@ void GtkSalMenu::NativeSetEnableItem( gchar* aCommand, gboolean bEnable ) g_lo_action_group_set_action_enabled( pActionGroup, aCommand, bEnable ); } -void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ) +void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ) { SolarMutexGuard aGuard; // Replace the '~' character with '_'. - rtl::OUString aText = rText.replace( '~', '_' ); - rtl::OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ); + OUString aText = rText.replace( '~', '_' ); + OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ); // Update item text only when necessary. gchar* aLabel = g_lo_menu_get_label_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos ); @@ -568,7 +568,7 @@ void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const g_free( aLabel ); } -void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) +void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ) { SolarMutexGuard aGuard; @@ -662,7 +662,7 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSub GtkSalMenuItem *pSalItem = maItems[ nPos ]; String aItemCommand = mpVCLMenu->GetItemCommand( pSalItem->mnId ); - gchar* aItemCommandStr = (gchar*) rtl::OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); + gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 ) { @@ -764,7 +764,7 @@ void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow ) } -void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const rtl::OUString& ) +void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& ) { } @@ -772,7 +772,7 @@ void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& ) { } -void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const rtl::OUString& ) +void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const OUString& ) { } diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 281be6f42c3e..50a2003192a3 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -773,7 +773,7 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext *context, sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& ) + const OUString& ) { GtkStateFlags flags; GtkShadowType shadow; @@ -997,7 +997,7 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr, } sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, - const ImplControlValue&, const rtl::OUString&, + const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { /* TODO: all this funcions needs improvements */ @@ -1306,7 +1306,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() ); fprintf( stderr, "font match %s, name AFTER: \"%s\"\n", aInfo.m_nID != 0 ? "succeeded" : "failed", - rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); int nPointHeight = 0; /*sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B(); diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index c7f30edeabe9..d281949f6e37 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -50,26 +50,26 @@ sal_Bool SAL_CALL UnxFilePickerCommandThread::result() return m_aResult; } -::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter() +OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter() { ::osl::MutexGuard aGuard( m_aMutex ); return m_aGetCurrentFilter; } -::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getDirectory() +OUString SAL_CALL UnxFilePickerCommandThread::getDirectory() { ::osl::MutexGuard aGuard( m_aMutex ); return m_aGetDirectory; } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() { ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nSize = m_aGetFiles.size(); - uno::Sequence< ::rtl::OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize ); + uno::Sequence< OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize ); if ( nSize == 1 ) aFiles[0] = m_aGetFiles.front(); @@ -78,18 +78,18 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() // First entry in the sequence must be the dirname, the others are the // filenames, so we have to rearrange the list... - ::rtl::OUString aFront = m_aGetFiles.front(); + OUString aFront = m_aGetFiles.front(); sal_Int32 nLastSlash = aFront.lastIndexOf( '/' ); - aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): ::rtl::OUString(); + aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): OUString(); ++nLastSlash; sal_Int32 nIdx = 1; - for ( ::std::list< ::rtl::OUString >::const_iterator it = m_aGetFiles.begin(); + for ( ::std::list< OUString >::const_iterator it = m_aGetFiles.begin(); it != m_aGetFiles.end(); ++it, ++nIdx ) { sal_Int32 nLength = (*it).getLength() - nLastSlash; - aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): ::rtl::OUString(); + aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): OUString(); } } @@ -133,7 +133,7 @@ void SAL_CALL UnxFilePickerCommandThread::run() if ( strcmp( pEntryBegin, "exited" ) == 0 ) bShouldExit = sal_True; else - handleCommand( ::rtl::OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); + handleCommand( OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); pEntryBegin = pEntryEnd + 1; } @@ -162,7 +162,7 @@ void SAL_CALL UnxFilePickerCommandThread::run() } } -void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &rCommand ) +void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rCommand ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,12 +171,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & OUStringToOString( rCommand, RTL_TEXTENCODING_ASCII_US ).getStr() << "\"" << ::std::endl; #endif - ::std::list< ::rtl::OUString > aList = tokenize( rCommand ); + ::std::list< OUString > aList = tokenize( rCommand ); if ( aList.empty() ) return; - ::rtl::OUString aCommandName = aList.front(); + OUString aCommandName = aList.front(); aList.pop_front(); if ( aCommandName == "accept" ) @@ -201,7 +201,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aCommandName == "value" ) { - ::rtl::OUString aType; + OUString aType; if ( !aList.empty() ) { aType = aList.front(); @@ -226,7 +226,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aType == "string" ) { - ::rtl::OUString aValue; + OUString aValue; if ( !aList.empty() ) aValue = aList.front(); @@ -235,9 +235,9 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aType == "stringList" ) { - uno::Sequence< ::rtl::OUString > aSequence( aList.size() ); + uno::Sequence< OUString > aSequence( aList.size() ); sal_Int32 nIdx = 0; - for ( ::std::list< ::rtl::OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx ) + for ( ::std::list< OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx ) aSequence[nIdx] = (*it); m_aGetValue <<= aSequence; @@ -251,12 +251,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aCommandName == "currentFilter" ) { - m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front(); + m_aGetCurrentFilter = aList.empty()? OUString(): aList.front(); m_aGetCurrentFilterCondition.set(); } else if ( aCommandName == "currentDirectory" ) { - m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front(); + m_aGetDirectory = aList.empty()? OUString(): aList.front(); m_aGetDirectoryCondition.set(); } else @@ -268,10 +268,10 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } } -::std::list< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const ::rtl::OUString &rCommand ) +::std::list< OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const OUString &rCommand ) { - ::std::list< ::rtl::OUString > aList; - ::rtl::OUStringBuffer aBuffer( 1024 ); + ::std::list< OUString > aList; + OUStringBuffer aBuffer( 1024 ); const sal_Unicode *pUnicode = rCommand.getStr(); const sal_Unicode *pEnd = pUnicode + rCommand.getLength(); diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index 787899af7fbc..ef569740eaec 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -84,13 +84,13 @@ protected: sal_Bool m_aResult; ::osl::Condition m_aGetCurrentFilterCondition; - ::rtl::OUString m_aGetCurrentFilter; + OUString m_aGetCurrentFilter; ::osl::Condition m_aGetDirectoryCondition; - ::rtl::OUString m_aGetDirectory; + OUString m_aGetDirectory; ::osl::Condition m_aGetFilesCondition; - ::std::list< ::rtl::OUString > m_aGetFiles; + ::std::list< OUString > m_aGetFiles; ::osl::Condition m_aGetValueCondition; ::com::sun::star::uno::Any m_aGetValue; @@ -103,13 +103,13 @@ public: sal_Bool SAL_CALL result(); ::osl::Condition& SAL_CALL getCurrentFilterCondition() { return m_aGetCurrentFilterCondition; } - ::rtl::OUString SAL_CALL getCurrentFilter(); + OUString SAL_CALL getCurrentFilter(); ::osl::Condition& SAL_CALL getDirectoryCondition() { return m_aGetDirectoryCondition; } - ::rtl::OUString SAL_CALL getDirectory(); + OUString SAL_CALL getDirectory(); ::osl::Condition& SAL_CALL getFilesCondition() { return m_aGetFilesCondition; } - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(); ::osl::Condition& SAL_CALL getValueCondition() { return m_aGetValueCondition; } ::com::sun::star::uno::Any SAL_CALL getValue(); @@ -117,8 +117,8 @@ public: protected: virtual void SAL_CALL run(); - virtual void SAL_CALL handleCommand( const ::rtl::OUString &rCommand/*, sal_Bool &rQuit*/ ); - ::std::list< ::rtl::OUString > SAL_CALL tokenize( const ::rtl::OUString &rCommand ); + virtual void SAL_CALL handleCommand( const OUString &rCommand/*, sal_Bool &rQuit*/ ); + ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand ); }; #endif // _UNXCOMMANDTHREAD_HXX_ diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index afd4350f8719..5ccc84251544 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -68,15 +68,15 @@ namespace const bool STARTUP_SUSPENDED = true; const bool STARTUP_ALIVE = false; - uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() + uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + uno::Sequence<OUString> aRet(3); + aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); #if ENABLE_TDE - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.TDEFilePicker"); #else // ENABLE_TDE - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.KDEFilePicker"); #endif // ENABLE_TDE return aRet; } @@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker() { if ( m_nFilePickerPid > 0 ) { - sendCommand( ::rtl::OUString( "exit" ) ); + sendCommand( OUString( "exit" ) ); waitpid( m_nFilePickerPid, NULL, 0 ); } @@ -148,13 +148,13 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFil m_pNotifyThread->removeFilePickerListener( xListener ); } -void SAL_CALL UnxFilePicker::setTitle( const rtl::OUString &rTitle ) +void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setTitle " ); appendEscaped( aBuffer, rTitle ); @@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() // this is _not_ an osl::Condition, see i#93366 m_pCommandThread->execCondition().reset(); - sendCommand( ::rtl::OUString( "exec" )); + sendCommand( OUString( "exec" )); m_pCommandThread->execCondition().wait(); @@ -183,20 +183,20 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aString = bMode? - ::rtl::OUString( "setMultiSelection true" ): - ::rtl::OUString( "setMultiSelection false" ); + OUString aString = bMode? + OUString( "setMultiSelection true" ): + OUString( "setMultiSelection false" ); sendCommand( aString ); } -void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName ) +void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setDefaultName " ); appendEscaped( aBuffer, rName ); @@ -204,13 +204,13 @@ void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName ) sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirectory ) +void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setDirectory " ); appendEscaped( aBuffer, rDirectory ); @@ -218,37 +218,37 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirector sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory() +OUString SAL_CALL UnxFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getDirectory" ), + sendCommand( OUString( "getDirectory" ), m_pCommandThread->getDirectoryCondition() ); return m_pCommandThread->getDirectory(); } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getFiles" ), + sendCommand( OUString( "getFiles" ), m_pCommandThread->getFilesCondition() ); return m_pCommandThread->getFiles(); } -void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) +void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendFilter " ); appendEscaped( aBuffer, rTitle ); @@ -258,13 +258,13 @@ void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle ) +void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setCurrentFilter " ); appendEscaped( aBuffer, rTitle ); @@ -272,25 +272,25 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle ) sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter() +OUString SAL_CALL UnxFilePicker::getCurrentFilter() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getCurrentFilter" ), + sendCommand( OUString( "getCurrentFilter" ), m_pCommandThread->getCurrentFilterCondition() ); return m_pCommandThread->getCurrentFilter(); } -void SAL_CALL UnxFilePicker::appendFilterGroup( const rtl::OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters ) +void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendFilterGroup " ); appendEscaped( aBuffer, rGroupTitle ); @@ -314,13 +314,13 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aType; - ::rtl::OUString aAction; + OUString aType; + OUString aAction; sal_Int32 nTitleId; if ( controlIdInfo( nControlId, aType, nTitleId ) && controlActionInfo( nControlAction, aAction ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setValue " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -342,7 +342,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA case ControlActions::ADD_ITEM: case ControlActions::SET_HELP_URL: { - ::rtl::OUString aString; + OUString aString; if ( rValue >>= aString ) { aBuffer.appendAscii( " ", 1 ); @@ -353,7 +353,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA case ControlActions::ADD_ITEMS: { - uno::Sequence< ::rtl::OUString > aSequence; + uno::Sequence< OUString > aSequence; if ( rValue >>= aSequence ) { for ( sal_Int32 nIdx = 0; nIdx < aSequence.getLength(); ++nIdx ) @@ -395,11 +395,11 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aAction; + OUString aAction; if ( controlActionInfo( nControlAction, aAction ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "getValue " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -421,7 +421,7 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "enableControl " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -430,13 +430,13 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) +void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setLabel " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -446,7 +446,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUStri sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) +OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) throw ( uno::RuntimeException ) { // FIXME getLabel() is not yet implemented @@ -454,7 +454,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) ::osl::MutexGuard aGuard( m_aMutex ); // TODO return m_pImpl->getLabel(nControlId); - return ::rtl::OUString(); + return OUString(); } /* TODO @@ -531,21 +531,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen uno::Any aAny; if ( 0 == rArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); aAny = rArguments[0]; if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); sal_Int16 templateId = -1; aAny >>= templateId; - ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" )); - ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" )); + OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" )); + OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" )); switch ( templateId ) { @@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -647,16 +647,16 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent ) removeFilePickerListener( xFilePickerListener ); } -rtl::OUString SAL_CALL UnxFilePicker::getImplementationName() +OUString SAL_CALL UnxFilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } -sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); + uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; ) { @@ -667,7 +667,7 @@ sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceNa return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames() throw( uno::RuntimeException ) { return FilePicker_getSupportedServiceNames(); @@ -704,14 +704,14 @@ void UnxFilePicker::initFilePicker() // The executable name #if ENABLE_TDE - rtl::OUString helperurl("${ORIGIN}/tdefilepicker"); + OUString helperurl("${ORIGIN}/tdefilepicker"); #else // ENABLE_TDE - rtl::OUString helperurl("${ORIGIN}/kdefilepicker"); + OUString helperurl("${ORIGIN}/kdefilepicker"); #endif // ENABLE_TDE rtl::Bootstrap::expandMacros( helperurl ); - rtl::OUString helperpath; + OUString helperpath; osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath ); - rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding())); + OString helper( OUStringToOString( helperpath, osl_getThreadTextEncoding())); // ID of the main window const int nIdLen = 20; @@ -769,17 +769,17 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep else { throw uno::RuntimeException( - ::rtl::OUString( "the external file picker does not run" ), + OUString( "the external file picker does not run" ), *this ); } } -void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) +void UnxFilePicker::sendCommand( const OUString &rCommand ) { if ( m_nFilePickerWrite < 0 ) return; - ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); + OString aUtfString = OUStringToOString( rCommand + OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); #if OSL_DEBUG_LEVEL > 0 ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl; @@ -788,7 +788,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) write( m_nFilePickerWrite, aUtfString.getStr(), aUtfString.getLength() ); } -void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition ) +void UnxFilePicker::sendCommand( const OUString &rCommand, ::osl::Condition &rCondition ) { rCondition.reset(); @@ -797,7 +797,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Conditi rCondition.wait(); } -void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString ) +void UnxFilePicker::appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ) { const sal_Unicode *pUnicode = rString.getStr(); const sal_Unicode *pEnd = pUnicode + rString.getLength(); @@ -819,20 +819,20 @@ void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl:: rBuffer.appendAscii( "\"", 1 ); } -sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId ) +sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) { typedef struct { sal_Int16 nId; - const ::rtl::OUString *pType; + const OUString *pType; sal_Int32 nTitle; } ElementToName; - const ::rtl::OUString aCheckBox( "checkbox" ); - const ::rtl::OUString aControl( "control" ); - const ::rtl::OUString aEdit( "edit" ); - const ::rtl::OUString aLabel( "label" ); - const ::rtl::OUString aListBox( "listbox" ); - const ::rtl::OUString aPushButton( "pushbutton" ); + const OUString aCheckBox( "checkbox" ); + const OUString aControl( "control" ); + const OUString aEdit( "edit" ); + const OUString aLabel( "label" ); + const OUString aListBox( "listbox" ); + const OUString aPushButton( "pushbutton" ); const ElementToName *pPtr; const ElementToName pArray[] = @@ -873,27 +873,27 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rT return sal_False; } -sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUString &rType ) +sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) { typedef struct { sal_Int16 nId; - const ::rtl::OUString pType; + const OUString pType; } ElementToName; const ElementToName *pPtr; const ElementToName pArray[] = { - { ControlActions::ADD_ITEM, ::rtl::OUString( "addItem" ) }, - { ControlActions::ADD_ITEMS, ::rtl::OUString( "addItems" ) }, - { ControlActions::DELETE_ITEM, ::rtl::OUString( "deleteItem" ) }, - { ControlActions::DELETE_ITEMS, ::rtl::OUString( "deleteItems" ) }, - { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( "setSelectedItem" ) }, - { ControlActions::GET_ITEMS, ::rtl::OUString( "getItems" ) }, - { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( "getSelectedItem" ) }, - { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) }, - { ControlActions::SET_HELP_URL, ::rtl::OUString( "setHelpURL" ) }, - { ControlActions::GET_HELP_URL, ::rtl::OUString( "getHelpURL" ) }, - { 0, ::rtl::OUString( "noAction" ) } + { ControlActions::ADD_ITEM, OUString( "addItem" ) }, + { ControlActions::ADD_ITEMS, OUString( "addItems" ) }, + { ControlActions::DELETE_ITEM, OUString( "deleteItem" ) }, + { ControlActions::DELETE_ITEMS, OUString( "deleteItems" ) }, + { ControlActions::SET_SELECT_ITEM, OUString( "setSelectedItem" ) }, + { ControlActions::GET_ITEMS, OUString( "getItems" ) }, + { ControlActions::GET_SELECTED_ITEM, OUString( "getSelectedItem" ) }, + { ControlActions::GET_SELECTED_ITEM_INDEX, OUString( "getSelectedItemIndex" ) }, + { ControlActions::SET_HELP_URL, OUString( "setHelpURL" ) }, + { ControlActions::GET_HELP_URL, OUString( "getHelpURL" ) }, + { 0, OUString( "noAction" ) } }; for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr ) @@ -906,12 +906,12 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) { - ::rtl::OUString aType; + OUString aType; sal_Int32 nTitleId; if ( controlIdInfo( nControlId, aType, nTitleId ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendControl " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -924,7 +924,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) } } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSelectedFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles() throw( uno::RuntimeException ) { return getFiles(); diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index afc5b6cae4d1..198eba03a962 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -83,34 +83,34 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); /* TODO XFilePreview @@ -125,7 +125,7 @@ public: // XFilePicker2 - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -142,9 +142,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); private: // prevent copy and assignment @@ -156,14 +156,14 @@ protected: void checkFilePicker() throw( ::com::sun::star::uno::RuntimeException ); // Async sendCommand - void sendCommand( const ::rtl::OUString &rCommand ); + void sendCommand( const OUString &rCommand ); // Synchronized sendCommand - void sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition ); - void appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString ); + void sendCommand( const OUString &rCommand, ::osl::Condition &rCondition ); + void appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ); private: - sal_Bool controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId ); - sal_Bool controlActionInfo( sal_Int16 nControlId, ::rtl::OUString &rType ); + sal_Bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); + sal_Bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); void sendAppendControlCommand( sal_Int16 nControlId ); }; diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index 36e74cef1de7..266f190f49e9 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -65,7 +65,7 @@ public: void SAL_CALL fileSelectionChanged(); /* TODO void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - rtl::OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; + OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL dialogSizeChanged( ); */ diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 07706b2ec921..9c6e19d4a3ed 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -127,8 +127,8 @@ void KDEXLib::Init() m_nFakeCmdLineArgs = 1; sal_uInt16 nIdx; int nParams = osl_getCommandArgCount(); - rtl::OString aDisplay; - rtl::OUString aParam, aBin; + OString aDisplay; + OUString aParam, aBin; for ( nIdx = 0; nIdx < nParams; ++nIdx ) { @@ -136,7 +136,7 @@ void KDEXLib::Init() if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); - aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); + aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() ); m_nFakeCmdLineArgs = 3; m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs ]; @@ -149,7 +149,7 @@ void KDEXLib::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); - rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() ); + OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() ); // make a copy of the string list for freeing it since @@ -214,7 +214,7 @@ extern "C" { if( ! ( pNoXInitThreads && *pNoXInitThreads ) ) XInitThreads(); - rtl::OString aVersion( qVersion() ); + OString aVersion( qVersion() ); SAL_INFO( "vcl.kde", "qt version string is \"" << aVersion << "\"" ); sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0, nMicro = 0; diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index cd20d3da69e6..d2731b095168 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -74,23 +74,23 @@ namespace const bool STARTUP_SUSPENDED = true; const bool STARTUP_ALIVE = false; - uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() + uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); + uno::Sequence<OUString> aRet(3); + aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); return aRet; } } -rtl::OUString toOUString(const QString& s) +OUString toOUString(const QString& s) { // QString stores UTF16, just like OUString - return rtl::OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length()); + return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length()); } -QString toQString(const rtl::OUString& s) +QString toQString(const OUString& s) { return QString::fromUtf16(s.getStr(), s.getLength()); } @@ -133,7 +133,7 @@ void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFi m_xListener.clear(); } -void SAL_CALL KDE4FilePicker::setTitle( const rtl::OUString &title ) +void SAL_CALL KDE4FilePicker::setTitle( const OUString &title ) throw( uno::RuntimeException ) { _dialog->setCaption(toQString(title)); @@ -194,28 +194,28 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) _dialog->setMode(KFile::File | KFile::LocalOnly); } -void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name ) +void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) throw( uno::RuntimeException ) { const QString url = toQString(name); _dialog->setSelection(url); } -void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir ) +void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) throw( uno::RuntimeException ) { const QString url = toQString(dir); _dialog->setUrl(KUrl(url)); } -rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() +OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { QString dir = _dialog->baseUrl().url(); return toOUString(dir); } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() throw( uno::RuntimeException ) { QStringList rawFiles = _dialog->selectedFiles(); @@ -252,10 +252,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() } // add all files and leading directory to outgoing OO sequence - uno::Sequence< ::rtl::OUString > seq(files.size()); + uno::Sequence< OUString > seq(files.size()); for (int i = 0; i < files.size(); ++i) { - rtl::OUString aFile(toOUString(files[i])), aURL; + OUString aFile(toOUString(files[i])), aURL; osl_getFileURLFromSystemPath(aFile.pData, &aURL.pData ); seq[i] = aURL; } @@ -263,13 +263,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() return seq; } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() throw( uno::RuntimeException ) { return getFiles(); } -void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const ::rtl::OUString &filter ) +void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { QString t = toQString(title); @@ -291,7 +291,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const _filter.append(QString("%1|%2").arg(f).arg(t)); } -void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title ) +void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { QString t = toQString(title); @@ -299,7 +299,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title ) _dialog->filterWidget()->setCurrentFilter(t); } -rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() +OUString SAL_CALL KDE4FilePicker::getCurrentFilter() throw( uno::RuntimeException ) { // _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc", @@ -315,7 +315,7 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() return toOUString(filter); } -void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const uno::Sequence<beans::StringPair>& filters) +void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& , const uno::Sequence<beans::StringPair>& filters) throw( lang::IllegalArgumentException, uno::RuntimeException ) { const sal_uInt16 length = filters.getLength(); @@ -419,7 +419,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl } } -void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUString &label ) +void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label ) throw( uno::RuntimeException ) { QWidget* widget = _customWidgets[controlId]; @@ -453,7 +453,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUStri } } -rtl::OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) +OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) throw ( uno::RuntimeException ) { QWidget* widget = _customWidgets[controlId]; @@ -550,7 +550,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) if (_resMgr && resId != -1) { - rtl::OUString s = String(ResId( resId, *_resMgr )); + OUString s = String(ResId( resId, *_resMgr )); label = toQString(s); label.replace("~", "&"); } @@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) if (args.getLength() == 0) { throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) { throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -699,16 +699,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) } } -rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName() +OUString SAL_CALL KDE4FilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } -sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); + uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; ) { @@ -719,7 +719,7 @@ sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceN return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() throw( uno::RuntimeException ) { return FilePicker_getSupportedServiceNames(); diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 1170f96597b8..01eb8084c81d 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -88,34 +88,34 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); /* TODO XFilePreview @@ -130,7 +130,7 @@ public: // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -148,9 +148,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); private: // prevent copy and assignment diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 39c3a52a48ab..b25afd652564 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -67,7 +67,7 @@ class KDESalGraphics : public X11SalGraphics virtual sal_Bool drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); /** Check if the bounding regions match. @@ -89,7 +89,7 @@ class KDESalGraphics : public X11SalGraphics virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); }; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 73915ee74cfe..0e5a88b16558 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -122,8 +122,8 @@ void KDEXLib::Init() sal_uInt16 nIdx; int nParams = osl_getCommandArgCount(); - rtl::OString aDisplay; - rtl::OUString aParam, aBin; + OString aDisplay; + OUString aParam, aBin; for ( nIdx = 0; nIdx < nParams; ++nIdx ) { @@ -131,7 +131,7 @@ void KDEXLib::Init() if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); - aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); + aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs + 2 ]; m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 0 ] = strdup( "-display" ); @@ -144,7 +144,7 @@ void KDEXLib::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); - rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() ); + OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() ); m_pFreeCmdLineArgs[1] = strdup( "--nocrashhandler" ); diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 45c158437b4f..1061e39e5580 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -60,7 +60,7 @@ extern "C" { #if QT_VERSION < 0x050000 // Qt 4.x support needs >= 4.1.0 - rtl::OString aVersion( qVersion() ); + OString aVersion( qVersion() ); SAL_INFO( "vcl.kde4", "qt version string is " << aVersion ); sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0; diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index d911b5c8205c..66a07753271c 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -90,17 +90,17 @@ Rectangle X11SalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre return GetDisplayScreenPosSizePixel( nScreen ); } -rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) { - rtl::OUString aScreenName; + OUString aScreenName; SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay(); if( pSalDisp->IsXinerama() ) { const std::vector< Rectangle >& rScreens = pSalDisp->GetXineramaScreens(); if( nScreen >= rScreens.size() ) nScreen = 0; - rtl::OUStringBuffer aBuf( 256 ); - aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); + OUStringBuffer aBuf( 256 ); + aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); aBuf.appendAscii( " [" ); aBuf.append( static_cast<sal_Int32>(nScreen) ); aBuf.append( sal_Unicode(']') ); @@ -110,8 +110,8 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) { if( nScreen >= static_cast<unsigned int>(pSalDisp->GetXScreenCount()) ) nScreen = 0; - rtl::OUStringBuffer aBuf( 256 ); - aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); + OUStringBuffer aBuf( 256 ); + aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); // search backwards for ':' int nPos = aBuf.getLength(); if( nPos > 0 ) @@ -131,7 +131,7 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) return aScreenName; } -int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUString& rMessage, const std::list< rtl::OUString >& rButtons, int nDefButton ) +int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton ) { int nRet = -1; @@ -144,7 +144,7 @@ int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUSt aWarn.Clear(); sal_uInt16 nButton = 0; - for( std::list< rtl::OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) + for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) { aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 ); nButton++; diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 1fdf622e98c7..3262ce31ab72 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -63,8 +63,8 @@ sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, s if( GetMonitorInfoW( reinterpret_cast<HMONITOR>(hMonitor), &aInfo ) ) { aInfo.szDevice[CCHDEVICENAME-1] = 0; - rtl::OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aInfo.szDevice) ); - std::map< rtl::OUString, unsigned int >::const_iterator it = + OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aInfo.szDevice) ); + std::map< OUString, unsigned int >::const_iterator it = m_aDeviceNameToMonitor.find( aDeviceName ); if( it != m_aDeviceNameToMonitor.end() ) { @@ -100,12 +100,12 @@ bool WinSalSystem::initMonitors() { int w = GetSystemMetrics( SM_CXSCREEN ); int h = GetSystemMetrics( SM_CYSCREEN ); - m_aMonitors.push_back( DisplayMonitor( rtl::OUString(), - rtl::OUString(), + m_aMonitors.push_back( DisplayMonitor( OUString(), + OUString(), Rectangle( Point(), Size( w, h ) ), Rectangle( Point(), Size( w, h ) ), 0 ) ); - m_aDeviceNameToMonitor[ rtl::OUString() ] = 0; + m_aDeviceNameToMonitor[ OUString() ] = 0; m_nPrimary = 0; RECT aWorkRect; if( SystemParametersInfo( SPI_GETWORKAREA, 0, &aWorkRect, 0 ) ) @@ -117,7 +117,7 @@ bool WinSalSystem::initMonitors() DISPLAY_DEVICEW aDev; aDev.cb = sizeof( aDev ); DWORD nDevice = 0; - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; + boost::unordered_map< OUString, int, OUStringHash > aDeviceStringCount; while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) @@ -125,8 +125,8 @@ bool WinSalSystem::initMonitors() { aDev.DeviceName[31] = 0; aDev.DeviceString[127] = 0; - rtl::OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aDev.DeviceName) ); - rtl::OUString aDeviceString( reinterpret_cast<const sal_Unicode *>(aDev.DeviceString) ); + OUString aDeviceName( reinterpret_cast<const sal_Unicode *>(aDev.DeviceName) ); + OUString aDeviceString( reinterpret_cast<const sal_Unicode *>(aDev.DeviceString) ); if( aDeviceStringCount.find( aDeviceString ) == aDeviceStringCount.end() ) aDeviceStringCount[ aDeviceString ] = 1; else @@ -143,15 +143,15 @@ bool WinSalSystem::initMonitors() EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) ); // append monitor numbers to name strings - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); + boost::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount ); unsigned int nMonitorCount = m_aMonitors.size(); for( unsigned int i = 0; i < nMonitorCount; i++ ) { - const rtl::OUString& rDev( m_aMonitors[i].m_aName ); + const OUString& rDev( m_aMonitors[i].m_aName ); if( aDeviceStringCount[ rDev ] > 1 ) { int nInstance = aDeviceStringCount[ rDev ] - (-- aDevCount[ rDev ] ); - rtl::OUStringBuffer aBuf( rDev.getLength() + 8 ); + OUStringBuffer aBuf( rDev.getLength() + 8 ); aBuf.append( rDev ); aBuf.appendAscii( " (" ); aBuf.append( sal_Int32( nInstance ) ); @@ -188,10 +188,10 @@ Rectangle WinSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aWorkArea : Rectangle(); } -rtl::OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) { initMonitors(); - return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : rtl::OUString(); + return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString(); } // ----------------------------------------------------------------------- @@ -211,7 +211,7 @@ static int DEFAULT_BTN_MAPPING_TABLE[][8] = { MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON2, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1 } //RETRY_CANCEL }; -int WinSalSystem::ShowNativeMessageBox(const rtl::OUString& rTitle, const rtl::OUString& rMessage, int nButtonCombination, int nDefaultButton, SAL_UNUSED_PARAMETER bool) +int WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString& rMessage, int nButtonCombination, int nDefaultButton, SAL_UNUSED_PARAMETER bool) { DBG_ASSERT( nButtonCombination >= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK && nButtonCombination <= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL && diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 021ebc75e0c6..26e75a0bba54 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -70,7 +70,7 @@ // ======================================================================= -void SalAbort( const rtl::OUString& rErrorText, bool ) +void SalAbort( const OUString& rErrorText, bool ) { ImplFreeSalGDI(); @@ -1015,9 +1015,9 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn @param aFileUrl The file url of the document. */ -void WinSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/) +void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/) { - rtl::OUString system_path; + OUString system_path; osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl, system_path); OSL_ENSURE(osl::FileBase::E_None == rc, "Invalid file url"); @@ -1059,9 +1059,9 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() // ----------------------------------------------------------------------- -const ::rtl::OUString& SalGetDesktopEnvironment() +const OUString& SalGetDesktopEnvironment() { - static ::rtl::OUString aDesktopEnvironment( "Windows" ); + static OUString aDesktopEnvironment( "Windows" ); return aDesktopEnvironment; } diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 4ac1f4b983a5..51c8a5b8d831 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -37,7 +37,6 @@ #include <region.h> -using ::rtl::OStringBuffer; // ======================================================================= // comment out to prevent use of beziers on GDI functions diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 3d7a40017689..1d08d50585bf 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -93,7 +93,7 @@ class ImplFontAttrCache { private: FontAttrMap aFontAttributes; - rtl::OUString aCacheFileName; + OUString aCacheFileName; String aBaseURL; sal_Bool bModified; @@ -184,7 +184,7 @@ ImplFontAttrCache::~ImplFontAttrCache() ++aIter; } // EOF Marker - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(aCacheFile, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(aCacheFile, OString()); } } } @@ -439,10 +439,10 @@ class WinGlyphFallbackSubstititution public: explicit WinGlyphFallbackSubstititution( HDC ); - bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingChars ) const; + bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingChars ) const; private: HDC mhDC; - bool HasMissingChars( const PhysicalFontFace*, const rtl::OUString& rMissingChars ) const; + bool HasMissingChars( const PhysicalFontFace*, const OUString& rMissingChars ) const; }; inline WinGlyphFallbackSubstititution::WinGlyphFallbackSubstititution( HDC hDC ) @@ -453,7 +453,7 @@ void ImplGetLogFontFromFontSelect( HDC, const FontSelectPattern*, LOGFONTW&, bool /*bTestVerticalAvail*/ ); // does a font face hold the given missing characters? -bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pFace, const rtl::OUString& rMissingChars ) const +bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pFace, const OUString& rMissingChars ) const { const ImplWinFontData* pWinFont = static_cast<const ImplWinFontData*>(pFace); const ImplFontCharMap* pCharMap = pWinFont->GetImplFontCharMap(); @@ -512,14 +512,14 @@ namespace // get the default font for a specified locale const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); - const rtl::OUString aDefault = rDefaults.getUserInterfaceFont(rLocale); + const OUString aDefault = rDefaults.getUserInterfaceFont(rLocale); return rDevFontList.ImplFindByTokenNames(aDefault); } } // find a fallback font for missing characters // TODO: should stylistic matches be searched and prefered? -bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, rtl::OUString& rMissingChars ) const +bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingChars ) const { // guess a locale matching to the missing chars com::sun::star::lang::Locale aLocale; @@ -990,7 +990,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { - rtl::OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) ); + OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) ); if (!aFontName.isEmpty()) { rFont.SetName( aFontName ); @@ -1870,7 +1870,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0; else pInfo->mbCourier = FALSE; - String aName = rtl::OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName)); + String aName = OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName)); pInfo->mpName = &aName; memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) ); pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet; @@ -1906,8 +1906,8 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, struct TempFontItem { - ::rtl::OUString maFontFilePath; - ::rtl::OString maResourcePath; + OUString maFontFilePath; + OString maResourcePath; TempFontItem* mpNextItem; }; @@ -1936,10 +1936,10 @@ static int WINAPI __AddFontResourceExW( LPCWSTR lpszfileName, DWORD fl, PVOID pd } #endif -bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) +bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL ) { int nRet = 0; - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); #ifdef FR_PRIVATE @@ -1961,7 +1961,7 @@ bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) ::DeleteFileA( aResourceName ); rtl_TextEncoding theEncoding = osl_getThreadTextEncoding(); - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding ); + OString aCFileName = OUStringToOString( aUSytemPath, theEncoding ); // TODO: font should be private => need to investigate why it doesn't work then if( !::CreateScalableFontResourceA( 0, aResourceName, aCFileName.getStr(), NULL ) ) return false; @@ -1971,7 +1971,7 @@ bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) if( nRet > 0 ) { TempFontItem* pNewItem = new TempFontItem; - pNewItem->maResourcePath = rtl::OString( aResourceName ); + pNewItem->maResourcePath = OString( aResourceName ); pNewItem->maFontFilePath = aUSytemPath.getStr(); pNewItem->mpNextItem = rSalData.mpTempFontItem; rSalData.mpTempFontItem = pNewItem; @@ -2017,7 +2017,7 @@ void ImplReleaseTempFonts( SalData& rSalData ) static bool ImplGetFontAttrFromFile( const String& rFontFileURL, ImplDevFontAttributes& rDFA ) { - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); // get FontAttributes from a *fot file @@ -2042,11 +2042,11 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, // Create font resource file (typically with a .fot file name extension). rtl_TextEncoding theEncoding = osl_getThreadTextEncoding(); - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding ); + OString aCFileName = OUStringToOString( aUSytemPath, theEncoding ); ::CreateScalableFontResourceA( 0, aResourceName, aCFileName.getStr(), NULL ); // Open and read the font resource file - rtl::OUString aFotFileName = rtl::OStringToOUString( aResourceName, osl_getThreadTextEncoding() ); + OUString aFotFileName = OStringToOUString( aResourceName, osl_getThreadTextEncoding() ); osl::FileBase::getFileURLFromSystemPath( aFotFileName, aFotFileName ); osl::File aFotFile( aFotFileName ); osl::FileBase::RC aError = aFotFile.open( osl_File_OpenFlag_Read ); @@ -2110,9 +2110,9 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, // ----------------------------------------------------------------------- bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const rtl::OUString& rFontFileURL, const rtl::OUString& rFontName ) + const OUString& rFontFileURL, const OUString& rFontName ) { - RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", rtl::OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); ImplDevFontAttributes aDFA; aDFA.SetFamilyName(rFontName); @@ -2179,7 +2179,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // since we are only interested in fonts that could not be // registered before because of missing administration rights // only the font path of the user installation is needed - ::rtl::OUString aPath; + OUString aPath; osl_getExecutableFile( &aPath.pData ); aPath = aPath.copy( 0, aPath.lastIndexOf('/') ); String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') ); @@ -2193,12 +2193,12 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) osl::DirectoryItem aDirItem; String aEmptyString; - ::rtl::OUString aBootStrap; + OUString aBootStrap; rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); - ::rtl::OUString aUserPath; - aBootstrap.getFrom( rtl::OUString( "UserInstallation" ), aUserPath ); + OUString aUserPath; + aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath ); aUserPath += String( RTL_CONSTASCII_USTRINGPARAM("/user/config/fontnames.dat") ); String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); @@ -2548,7 +2548,7 @@ int ScopedTrueTypeFont::open(void * pBuffer, sal_uInt32 nLen, return OpenTTFontBuffer(pBuffer, nLen, nFaceNum, &m_pFont); } -sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, +sal_Bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, long* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo ) { @@ -2577,11 +2577,11 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, DBG_ASSERT( aWinMetric.tmPitchAndFamily & TMPF_TRUETYPE, "can only subset TT font" ); #endif - rtl::OUString aSysPath; + OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) return FALSE; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile(rtl::OUStringToOString(aSysPath, aThreadEncoding)); + const OString aToFile(OUStringToOString(aSysPath, aThreadEncoding)); // check if the font has a CFF-table const DWORD nCffTag = CalcTag( "CFF " ); @@ -2736,7 +2736,7 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, nFNLen--; if( nFNLen == 0 ) *pDataLen = 0; - rInfo.m_aPSName = rtl::OUString(reinterpret_cast<const sal_Unicode*>(aFaceName), nFNLen); + rInfo.m_aPSName = OUString(reinterpret_cast<const sal_Unicode*>(aFaceName), nFNLen); rInfo.m_nAscent = +aTm.tmAscent; rInfo.m_nDescent = -aTm.tmDescent; rInfo.m_aFontBBox = Rectangle( Point( -aTm.tmOverhang, -aTm.tmDescent ), diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 4ee3f60c1bd2..842d06d63917 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -49,7 +49,6 @@ using namespace std; -using ::rtl::OUString; typedef map< wstring, HTHEME > ThemeMap; static ThemeMap aThemeMap; diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index dda80b3ca9a6..113fb1887d46 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -91,7 +91,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ui::dialogs; -using ::rtl::OUString; // ======================================================================= @@ -181,7 +180,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for ( i = 0; i < nInfoPrn4; i++ ) { SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; - pInfo->maPrinterName = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo4[i].pPrinterName) ); + pInfo->maPrinterName = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo4[i].pPrinterName) ); pInfo->mnStatus = 0; pInfo->mnJobs = 0; pInfo->mpSysData = NULL; @@ -208,22 +207,22 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) if( GetPrinterW( hPrinter, 2, (LPBYTE)pWinInfo2, nBytes, &nBytes ) ) { if( pWinInfo2->pDriverName ) - pInfo->maDriver = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); + pInfo->maDriver = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); XubString aPortName; if ( pWinInfo2->pPortName ) - aPortName = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); + aPortName = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); // pLocation can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pLocation && *pWinInfo2->pLocation ) - pInfo->maLocation = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); + pInfo->maLocation = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); else pInfo->maLocation = aPortName; // pComment can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pComment ) - pInfo->maComment = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); + pInfo->maComment = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); pInfo->mnStatus = ImplWinQueueStatusToSal( pWinInfo2->Status ); pInfo->mnJobs = pWinInfo2->cJobs; if( ! pInfo->mpSysData ) - pInfo->mpSysData = new rtl::OUString(aPortName); + pInfo->mpSysData = new OUString(aPortName); } rtl_freeMemory(pWinInfo2); } @@ -240,7 +239,7 @@ void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) } // ----------------------------------------------------------------------- -rtl::OUString WinSalInstance::GetDefaultPrinter() +OUString WinSalInstance::GetDefaultPrinter() { DWORD nChars = 0; GetDefaultPrinterW( NULL, &nChars ); @@ -270,7 +269,7 @@ rtl::OUString WinSalInstance::GetDefaultPrinter() return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) ); } else - return rtl::OUString(); + return OUString(); } // ======================================================================= @@ -1118,7 +1117,7 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn pPrinter->maDeviceName = pQueueInfo->maPrinterName; pPrinter->maPortName = pQueueInfo->mpSysData ? *pQueueInfo->mpSysData - : rtl::OUString(); + : OUString(); // check if the provided setup data match the actual printer ImplTestSalJobSetup( pPrinter, pSetupData, TRUE ); @@ -1279,7 +1278,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) // ----------------------------------------------------------------------- -rtl::OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) +OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) { XubString aPaperBinName; @@ -1519,9 +1518,9 @@ static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt ) return nRet; } -sal_Bool WinSalPrinter::StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString&, +sal_Bool WinSalPrinter::StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString&, sal_uLong nCopies, bool bCollate, bool /*bDirect*/, diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index bc3f8021743c..e9a28031d54c 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -59,9 +59,6 @@ typedef boost::unordered_map<int,int> IntMap; #define DROPPED_OUTGLYPH 0xFFFF -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #include <config_mingw.h> @@ -2752,14 +2749,14 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplW mpFont = gr_make_font_with_advance_fn(static_cast<float>(-aLogFont.lfHeight), hDC, gr_fontAdvance, rWFD.GraphiteFace()); maImpl.SetFont(mpFont); - const rtl::OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), + const OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), RTL_TEXTENCODING_ASCII_US); - rtl::OString name = rtl::OUStringToOString( + OString name = OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; if (nFeat > 0) { - rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); + OString aFeat = name.copy(nFeat, name.getLength() - nFeat); mpFeatures = new grutils::GrFeatureParser(rWFD.GraphiteFace(), aFeat.getStr(), aLang.getStr()); } else diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index 0d53261a8eeb..ad16a6432e63 100644 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -183,7 +183,7 @@ namespace vcl_sal { }; // translate keycodes, used within the displayed menu shortcuts - rtl::OUString getKeysReplacementName( rtl::OUString pLang, LONG nSymbol ) + OUString getKeysReplacementName( OUString pLang, LONG nSymbol ) { for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ ) { @@ -193,12 +193,12 @@ namespace vcl_sal { for( int m = aKeyboards[n].nReplacements ; m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } } } - return rtl::OUString(); + return OUString(); } } diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index a668d72551d3..145cabec1ac5 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -90,7 +90,6 @@ using ::std::max; #include <sehandler.hxx> #endif -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1096,7 +1095,7 @@ sal_Bool WinSalFrame::PostEvent( void* pData ) // ----------------------------------------------------------------------- -void WinSalFrame::SetTitle( const rtl::OUString& rTitle ) +void WinSalFrame::SetTitle( const OUString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" ); @@ -1897,7 +1896,7 @@ void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) } } -void WinSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ ) +void WinSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } @@ -2385,8 +2384,8 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, int nKeyLen = 0; if ( lParam ) { - rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); - rtl::OUString aRet; + OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); + OUString aRet; aRet = ::vcl_sal::getKeysReplacementName( aLang, lParam ); if( aRet.isEmpty() ) @@ -2446,7 +2445,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, // ----------------------------------------------------------------------- -rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static const UINT nMaxKeyLen = 350; sal_Unicode aKeyBuf[ nMaxKeyLen ]; @@ -2641,9 +2640,9 @@ rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) } if( !nKeyBufLen ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); + return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } // ----------------------------------------------------------------------- @@ -5166,7 +5165,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_RESULTSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = rtl::OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); + aEvt.maText = OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; } @@ -5192,7 +5191,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_COMPSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = rtl::OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); + aEvt.maText = OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; BYTE* pAttrBuf = NULL; @@ -5450,7 +5449,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam; LRESULT nRet = 0; SalSurroundingTextRequestEvent aEvt; - aEvt.maText = rtl::OUString(); + aEvt.maText = OUString(); aEvt.mnStart = aEvt.mnEnd = 0; UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR ); @@ -5504,7 +5503,7 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) WinSalFrame* pFrame = GetWindowPtr( hWnd ); LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam; SalSurroundingTextRequestEvent aEvt; - aEvt.maText = rtl::OUString(); + aEvt.maText = OUString(); aEvt.mnStart = aEvt.mnEnd = 0; pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt ); diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index d292708fc1ab..a82af6558903 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -312,7 +312,7 @@ void WinSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, con } } -void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ) +void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) { if( pSalMenuItem ) { @@ -344,7 +344,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rt } } -void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const rtl::OUString& rKeyName ) +void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const OUString& rKeyName ) { if( pSalMenuItem ) { diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 703bb00bdadb..261643dedfbc 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -68,7 +68,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString("OutDev grinding") ); + SetText( OUString("OutDev grinding") ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -888,7 +888,7 @@ int GrindApp::Main() for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - ::rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam == "--help" || aParam == "-h" ) bHelp = true; diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index a77bcb1171cc..b085d9824634 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -73,7 +73,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText(rtl::OUString("VCL - Workbench")); + aMainWin.SetText(OUString("VCL - Workbench")); aMainWin.Show(); Application::Execute(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 60c9659f96ed..d5b196460236 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -53,12 +53,6 @@ using namespace comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringBuffer; -using ::rtl::OStringBuffer; // Forward declaration void Main(); @@ -112,8 +106,8 @@ public: sal_Bool Close(); - void parseList( const rtl::OString& rList ); - rtl::OString processCommand( const rtl::OString& rCommand ); + void parseList( const OString& rList ); + OString processCommand( const OString& rCommand ); DECL_LINK( ListHdl, Button* ); DECL_LINK( SelectHdl, ListBox* ); @@ -123,7 +117,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "SvpClient" ) ); + aMainWin.SetText( OUString( "SvpClient" ) ); aMainWin.Show(); Application::Execute(); @@ -163,34 +157,34 @@ sal_Bool MyWin::Close() return bRet; } -void MyWin::parseList( const rtl::OString& rList ) +void MyWin::parseList( const OString& rList ) { sal_Int32 nTokenPos = 0; - rtl::OUString aElementType; + OUString aElementType; m_aSvpBitmaps.Clear(); while( nTokenPos >= 0 ) { - rtl::OString aLine = rList.getToken( 0, '\n', nTokenPos ); + OString aLine = rList.getToken( 0, '\n', nTokenPos ); if( ! aLine.getLength() || *aLine.getStr() == '#' ) continue; if( aLine.startsWith( "ElementType: " ) ) - aElementType = rtl::OStringToOUString( aLine.copy( 13 ), RTL_TEXTENCODING_ASCII_US ); + aElementType = OStringToOUString( aLine.copy( 13 ), RTL_TEXTENCODING_ASCII_US ); else { - rtl::OUStringBuffer aNewElement( 64 ); + OUStringBuffer aNewElement( 64 ); aNewElement.append( aElementType ); aNewElement.appendAscii( ": " ); - aNewElement.append( rtl::OStringToOUString( aLine, RTL_TEXTENCODING_ASCII_US ) ); + aNewElement.append( OStringToOUString( aLine, RTL_TEXTENCODING_ASCII_US ) ); m_aSvpBitmaps.InsertEntry( aNewElement.makeStringAndClear() ); } } } -rtl::OString MyWin::processCommand( const rtl::OString& rCommand ) +OString MyWin::processCommand( const OString& rCommand ) { static const char* pEnv = getenv("SVP_LISTENER_PORT"); - rtl::OStringBuffer aAnswer; + OStringBuffer aAnswer; int nPort = (pEnv && *pEnv) ? atoi(pEnv) : 8000; int nSocket = socket( PF_INET, SOCK_STREAM, 0 ); if( nSocket >= 0) @@ -243,7 +237,7 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, ) { OStringBuffer aCommand( 64 ); aCommand.append( "get " ); - aCommand.append( rtl::OUStringToOString( aEntry.Copy( nPos+2 ), RTL_TEXTENCODING_ASCII_US ) ); + aCommand.append( OUStringToOString( aEntry.Copy( nPos+2 ), RTL_TEXTENCODING_ASCII_US ) ); OString aAnswer( processCommand( aCommand.makeStringAndClear() ) ); SvMemoryStream aStream( aAnswer.getLength() ); aStream.Write( aAnswer.getStr(), aAnswer.getLength() ); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index ef95b371f756..52b13a0ccc17 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Forward declaration void Main(); @@ -53,7 +51,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -84,7 +82,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "VCL - Workbench" ) ); + aMainWin.SetText( OUString( "VCL - Workbench" ) ); aMainWin.Show(); Application::Execute(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 32cd9a21059e..af7c7cf02890 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -46,7 +46,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -76,7 +76,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "VCLDemo - VCL Workbench" ) ); + aMainWin.SetText( OUString( "VCLDemo - VCL Workbench" ) ); aMainWin.Show(); Application::Execute(); |