diff options
author | David Tardon <dtardon@redhat.com> | 2011-11-21 09:00:44 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-11-21 09:04:04 +0100 |
commit | 13bbf43b1356f9be9c5aac1f17f3781cf1935849 (patch) | |
tree | 23d47558252bb989e524808df7b5288892b411b1 /vcl/aqua | |
parent | 5ec603972f501062118b8ad5326a47287b3a1e59 (diff) |
convert aqua plugin to rtl::O(U)String
Diffstat (limited to 'vcl/aqua')
-rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 6 | ||||
-rw-r--r-- | vcl/aqua/source/app/salsys.cxx | 4 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salprn.cxx | 22 | ||||
-rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 6 | ||||
-rw-r--r-- | vcl/aqua/source/window/salmenu.cxx | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 4ef19f938749..f9f8253bafd9 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -258,13 +258,13 @@ sal_Bool ImplSVMainHook( int * pnInit ) // ======================================================================= -void SalAbort( const XubString& rErrorText, bool bDumpCore ) +void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) { if( !rErrorText.Len() ) fprintf( stderr, "Application Error " ); else fprintf( stderr, "%s ", - ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() ); + rtl::OUStringToOString( rErrorText, gsl_getSystemTextEncoding() ).getStr() ); if( bDumpCore ) abort(); else @@ -997,7 +997,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) // ----------------------------------------------------------------------- -XubString AquaSalInstance::GetDefaultPrinter() +rtl::OUString AquaSalInstance::GetDefaultPrinter() { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 6bda7feae1df..1f69be625290 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -138,8 +138,8 @@ static NSString* getStandardString( int nButtonId ) return aText.getLength() ? CreateNSString( aText) : nil; } -int AquaSalSystem::ShowNativeMessageBox( const String& rTitle, - const String& rMessage, +int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle, + const rtl::OUString& rMessage, int nButtonCombination, int nDefaultButton) { diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index db0136933f19..32168cb19a5f 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -1726,7 +1726,7 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // ----------------------------------------------------------------------- bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, - const String& rFontFileURL, const String& /*rFontName*/ ) + const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ ) { ::rtl::OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 5011564a9065..3a131b121cc2 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -300,9 +300,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) // ----------------------------------------------------------------------- -XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) +rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { - return XubString(); + return rtl::OUString(); } // ----------------------------------------------------------------------- @@ -451,9 +451,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag return aPageSize; } -sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName, - const String& i_rJobName, - const String& /*i_rAppName*/, +sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, + const rtl::OUString& i_rJobName, + const rtl::OUString& /*i_rAppName*/, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) @@ -693,9 +693,9 @@ AquaSalPrinter::~AquaSalPrinter() // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName, - const String& i_rJobName, - const String& i_rAppName, +sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName, + const rtl::OUString& i_rJobName, + const rtl::OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { @@ -704,9 +704,9 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName, // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/, - const XubString& /*i_rJobName*/, - const XubString& /*i_rAppName*/, +sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/, + const rtl::OUString& /*i_rJobName*/, + const rtl::OUString& /*i_rAppName*/, sal_uLong /*i_nCopies*/, bool /*i_bCollate*/, bool /*i_bDirect*/, diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 7733649f2768..573d4519c213 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -314,7 +314,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData ) } // ----------------------------------------------------------------------- -void AquaSalFrame::SetTitle(const XubString& rTitle) +void AquaSalFrame::SetTitle(const rtl::OUString& rTitle) { if ( !mpWindow ) return; @@ -1057,7 +1057,7 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 ) // ----------------------------------------------------------------------- -XubString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static std::map< sal_uInt16, rtl::OUString > aKeyMap; if( aKeyMap.empty() ) @@ -1144,7 +1144,7 @@ XubString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) // ----------------------------------------------------------------------- -XubString AquaSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode ) +rtl::OUString AquaSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode ) { return GetKeyName( nKeyCode ); } diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 368ca6ed9154..23d01805af24 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -677,7 +677,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag [pImage release]; } -void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText ) +void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText ) { if (!i_pSalMenuItem) return; @@ -712,7 +712,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, } } -void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; |