diff options
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/source/app/salinfo.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/app/salinst.cxx | 4 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 18 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 10 | ||||
-rw-r--r-- | vcl/win/source/window/salmenu.cxx | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index ae10ae4c270e..9ac68b0f0c78 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -228,7 +228,7 @@ static int DEFAULT_BTN_MAPPING_TABLE[][8] = { MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON2, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1 } //RETRY_CANCEL }; -int WinSalSystem::ShowNativeMessageBox(const String& rTitle, const String& rMessage, int nButtonCombination, int nDefaultButton) +int WinSalSystem::ShowNativeMessageBox(const rtl::OUString& rTitle, const rtl::OUString& rMessage, int nButtonCombination, int nDefaultButton) { DBG_ASSERT( nButtonCombination >= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK && nButtonCombination <= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL && diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index caf0d273cba1..d657f6a35603 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -84,11 +84,11 @@ // ======================================================================= -void SalAbort( const XubString& rErrorText, bool ) +void SalAbort( const rtl::OUString& rErrorText, bool ) { ImplFreeSalGDI(); - if ( !rErrorText.Len() ) + if ( rErrorText.isEmpty() ) { // #112255# make sure crash reporter is triggered RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 658cecc79d21..c587235b7b5f 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2344,7 +2344,7 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, // ----------------------------------------------------------------------- bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const String& rFontFileURL, const String& rFontName ) + const rtl::OUString& rFontFileURL, const rtl::OUString& rFontName ) { RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", rtl::OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index dc67b8d3ebfb..6a4c0e06573c 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -253,7 +253,7 @@ void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) } // ----------------------------------------------------------------------- -XubString WinSalInstance::GetDefaultPrinter() +rtl::OUString WinSalInstance::GetDefaultPrinter() { DWORD nChars = 0; GetDefaultPrinterW( NULL, &nChars ); @@ -283,7 +283,7 @@ XubString WinSalInstance::GetDefaultPrinter() return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) ); } else - return XubString(); + return rtl::OUString(); } // ======================================================================= @@ -1297,7 +1297,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) // ----------------------------------------------------------------------- -XubString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) +rtl::OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) { XubString aPaperBinName; @@ -1538,9 +1538,9 @@ static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt ) return nRet; } -sal_Bool WinSalPrinter::StartJob( const XubString* pFileName, - const XubString& rJobName, - const XubString&, +sal_Bool WinSalPrinter::StartJob( const rtl::OUString* pFileName, + const rtl::OUString& rJobName, + const rtl::OUString&, sal_uLong nCopies, bool bCollate, bool /*bDirect*/, @@ -1656,12 +1656,12 @@ sal_Bool WinSalPrinter::StartJob( const XubString* pFileName, DOCINFOW aInfo; memset( &aInfo, 0, sizeof( DOCINFOW ) ); aInfo.cbSize = sizeof( aInfo ); - aInfo.lpszDocName = (LPWSTR)rJobName.GetBuffer(); + aInfo.lpszDocName = (LPWSTR)rJobName.getStr(); if ( pFileName || aOutFileName.getLength() ) { - if ( (pFileName && pFileName->Len()) || aOutFileName.getLength() ) + if ( (pFileName && !pFileName->isEmpty()) || aOutFileName.getLength() ) { - aInfo.lpszOutput = (LPWSTR)( (pFileName && pFileName->Len()) ? pFileName->GetBuffer() : aOutFileName.getStr()); + aInfo.lpszOutput = (LPWSTR)( (pFileName && !pFileName->isEmpty()) ? pFileName->getStr() : aOutFileName.getStr()); } else aInfo.lpszOutput = L"FILE:"; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 5c6bee5f717f..083746bce1ce 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1105,7 +1105,7 @@ sal_Bool WinSalFrame::PostEvent( void* pData ) // ----------------------------------------------------------------------- -void WinSalFrame::SetTitle( const XubString& rTitle ) +void WinSalFrame::SetTitle( const rtl::OUString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" ); @@ -2449,7 +2449,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, // ----------------------------------------------------------------------- -XubString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static const int nMaxKeyLen = 350; sal_Unicode aKeyBuf[ nMaxKeyLen ]; @@ -2644,14 +2644,14 @@ XubString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) } if( !nKeyBufLen ) - return XubString(); + return rtl::OUString(); - return XubString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); + return rtl::OUString::createFromAscii( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } // ----------------------------------------------------------------------- -XubString WinSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode ) +rtl::OUString WinSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode ) { return GetKeyName( nKeyCode ); } diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index aa81ee4f44f9..63ce7ef62043 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -323,7 +323,7 @@ void WinSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, con } } -void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText ) +void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ) { if( pSalMenuItem ) { @@ -355,7 +355,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const Xu } } -void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const XubString& rKeyName ) +void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const rtl::OUString& rKeyName ) { if( pSalMenuItem ) { |