diff options
Diffstat (limited to 'vcl/source')
104 files changed, 1040 insertions, 1064 deletions
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 |