diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /vcl | |
parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'vcl')
27 files changed, 120 insertions, 122 deletions
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 60bd5b42d599..7cf724ccf539 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -108,12 +108,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break; - case BUTTON_ABORT: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break; - case BUTTON_CANCEL: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break; - case BUTTON_RETRY: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break; - case BUTTON_YES: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break; - case BUTTON_NO : aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break; + case BUTTON_OK: aText = rtl::OUString( "OK" );break; + case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; + case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; + case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; + case BUTTON_YES: aText = rtl::OUString( "Yes" );break; + case BUTTON_NO : aText = rtl::OUString( "No" );break; } } return aText.isEmpty() ? nil : CreateNSString( aText); diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index f4b2df42b87b..36b6a9fca71c 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -63,12 +63,12 @@ bool DragSource::g_DropSuccess = false; OUString dragSource_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1")); + return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); } Sequence<OUString> dragSource_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"))); + return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDragSource")); } @@ -179,7 +179,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) { if (aArguments.getLength() < 2) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Not enough parameter.")), + throw Exception(OUString("DragSource::initialize: Not enough parameter."), static_cast<OWeakObject*>(this)); } @@ -197,13 +197,13 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) if (![mView respondsToSelector: @selector(registerMouseEventListener:)] || ![mView respondsToSelector: @selector(unregisterMouseEventListener:)]) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view doesn't support mouse listener")), + throw Exception(OUString("DragSource::initialize: Provided view doesn't support mouse listener"), static_cast<OWeakObject*>(this)); } NSWindow* pWin = [mView window]; if( ! pWin || ![pWin respondsToSelector: @selector(getSalFrame)] ) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view is not attached to a vcl frame")), + throw Exception(OUString("DragSource::initialize: Provided view is not attached to a vcl frame"), static_cast<OWeakObject*>(this)); } mpFrame = (AquaSalFrame*)[pWin performSelector: @selector(getSalFrame)]; @@ -212,7 +212,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) if (mDragSourceHelper == nil) { - throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Cannot initialize DragSource")), + throw Exception(OUString("DragSource::initialize: Cannot initialize DragSource"), static_cast<OWeakObject*>(this)); } diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 1b4751877c7c..1eeebc520186 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -56,13 +56,13 @@ using ::rtl::OUString; OUString dropTarget_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1")); + return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"); } Sequence<OUString> dropTarget_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"))); + return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDropTarget")); } @@ -385,7 +385,7 @@ void DropTarget::concludeDragOperation(id /*sender*/) { if (aArguments.getLength() < 2) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("DropTarget::initialize: Cannot install window event handler")), + throw RuntimeException(OUString("DropTarget::initialize: Cannot install window event handler"), static_cast<OWeakObject*>(this)); } diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 6d7ef1b8ed15..5d541972f82b 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -70,7 +70,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } @@ -93,7 +93,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) if (dp.get() == NULL) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } @@ -131,7 +131,7 @@ void OSXTransferable::initClipboardItemList() if (pboardFormats == NULL) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot get clipboard data")), + throw RuntimeException(OUString("AquaClipboard: Cannot get clipboard data"), static_cast<XTransferable*>(this)); } diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 87a7b6d10f74..0db1318695de 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -72,12 +72,12 @@ using ::rtl::OUString; OUString clipboard_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.AquaClipboard")); + return OUString("com.sun.star.datatransfer.clipboard.AquaClipboard"); } Sequence<OUString> clipboard_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"))); + return makeSequence(OUString("com.sun.star.datatransfer.clipboard.SystemClipboard")); } @@ -103,8 +103,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard if (mPasteboard == nil) { - throw RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create Cocoa pasteboard")), + throw RuntimeException(OUString("AquaClipboard: Cannot create Cocoa pasteboard"), static_cast<XClipboardEx*>(this)); } } @@ -118,7 +117,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard [mPasteboard release]; throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create pasteboard change listener")), + OUString("AquaClipboard: Cannot create pasteboard change listener"), static_cast<XClipboardEx*>(this)); } @@ -215,7 +214,7 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.push_back(listener); @@ -228,7 +227,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.remove(listener); diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index dab0bb9a9ecf..d27361a81f7d 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -400,7 +400,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // do we want a progress panel ? sal_Bool bShowProgressPanel = sal_True; - beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) ); + beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShowProgressPanel; if( ! i_rController.isShowDialogs() ) @@ -408,7 +408,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // possibly create one job for collated output sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ) ); + beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index da36cfab633f..10eb3c24e067 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1079,7 +1079,7 @@ rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "esc" ) ); + aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 953c38653772..72cd828c3628 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -63,9 +63,9 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; { rtl::OUString aDialog; if( nDialog == SHOWDIALOG_ID_ABOUT ) - aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABOUT")); + aDialog = rtl::OUString("ABOUT"); else if( nDialog == SHOWDIALOG_ID_PREFERENCES ) - aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PREFERENCES")); + aDialog = rtl::OUString("PREFERENCES"); const ApplicationEvent* pAppEvent = new ApplicationEvent( ApplicationEvent::TYPE_SHOWDIALOG, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx index c5dfabb9fd34..37ac4e4d99b1 100644 --- a/vcl/ios/source/app/salsys.cxx +++ b/vcl/ios/source/app/salsys.cxx @@ -108,12 +108,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break; - case BUTTON_ABORT: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break; - case BUTTON_CANCEL: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break; - case BUTTON_RETRY: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break; - case BUTTON_YES: aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break; - case BUTTON_NO : aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break; + case BUTTON_OK: aText = rtl::OUString( "OK" );break; + case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; + case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; + case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; + case BUTTON_YES: aText = rtl::OUString( "Yes" );break; + case BUTTON_NO : aText = rtl::OUString( "No" );break; } } return aText.getLength() ? CreateNSString( aText) : nil; diff --git a/vcl/ios/source/dtrans/iOSTransferable.cxx b/vcl/ios/source/dtrans/iOSTransferable.cxx index 1f335403d1ff..2ff71156c01d 100644 --- a/vcl/ios/source/dtrans/iOSTransferable.cxx +++ b/vcl/ios/source/dtrans/iOSTransferable.cxx @@ -66,11 +66,11 @@ Any SAL_CALL iOSTransferable::getTransferData( const DataFlavor& aFlavor ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); } - throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")), + throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"), static_cast<XTransferable*>(this)); // ??? return Any(); @@ -107,7 +107,7 @@ void iOSTransferable::initClipboardItemList() if (pboardFormats == NULL) { - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot get clipboard data")), + throw RuntimeException(OUString("IosClipboard: Cannot get clipboard data"), static_cast<XTransferable*>(this)); } diff --git a/vcl/ios/source/dtrans/ios_clipboard.cxx b/vcl/ios/source/dtrans/ios_clipboard.cxx index 03e493713bef..a7fc7af8ff9d 100644 --- a/vcl/ios/source/dtrans/ios_clipboard.cxx +++ b/vcl/ios/source/dtrans/ios_clipboard.cxx @@ -71,12 +71,12 @@ using ::rtl::OUString; OUString clipboard_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.IosClipboard")); + return OUString("com.sun.star.datatransfer.clipboard.IosClipboard"); } Sequence<OUString> clipboard_getSupportedServiceNames() { - return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"))); + return makeSequence(OUString("com.sun.star.datatransfer.clipboard.SystemClipboard")); } @@ -103,8 +103,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard) if (mPasteboard == nil) { - throw RuntimeException(OUString( - RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard")), + throw RuntimeException(OUString("IosClipboard: Cannot create pasteboard"), static_cast<XClipboardEx*>(this)); } } @@ -118,7 +117,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard) [mPasteboard release]; throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard change listener")), + OUString("IosClipboard: Cannot create pasteboard change listener"), static_cast<XClipboardEx*>(this)); } @@ -216,7 +215,7 @@ void SAL_CALL IosClipboard::addClipboardListener(const Reference< XClipboardList MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.push_back(listener); @@ -229,7 +228,7 @@ void SAL_CALL IosClipboard::removeClipboardListener(const Reference< XClipboardL MutexGuard aGuard(m_aMutex); if (!listener.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast<XClipboardEx*>(this), 1); mClipboardListeners.remove(listener); diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx index e619111ac768..43cc7ba24a45 100644 --- a/vcl/ios/source/window/salframe.cxx +++ b/vcl/ios/source/window/salframe.cxx @@ -635,7 +635,7 @@ rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "esc" ) ); + aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 314ade5e1960..c7ec909f1a1a 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -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( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) ); + xFilePicker->appendFilter( ::rtl::OUString( "*.PRN" ), ::rtl::OUString( "*.prn" ) ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index fe2a6a945d08..b303a221f52b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -728,7 +728,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) - aRet = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ) ); + aRet = rtl::OUString( "???" ); else { aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym ); diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 76ef59886ac4..b2de7a048333 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const pWMA->m_bWMshouldSwitchWorkspace = true; vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get(); - rtl::OUString aSetting( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WM" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShouldSwitchWorkspace" ) ) ) ); + rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ), + rtl::OUString( "ShouldSwitchWorkspace" ) ) ); if( aSetting.isEmpty() ) { if( m_aWMName.EqualsAscii( "awesome" ) ) @@ -996,7 +996,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const if( !aCountry.isEmpty() ) { - aLocaleString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")); + aLocaleString += ::rtl::OUString("_"); aLocaleString += aCountry; } if( !aVariant.isEmpty() ) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 80f6056006ed..1e621f18c2ae 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -476,7 +476,7 @@ void PPDParser::initPPDFiles() INetURLObject aPPDDir( *ppd_it, INET_PROT_FILE, INetURLObject::ENCODE_ALL ); scanPPDDir( aPPDDir.GetMainURL( INetURLObject::NO_DECODE ) ); } - if( rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() ) + if( rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ) { // last try: search in directory of executable (mainly for setup) OUString aExe; @@ -489,7 +489,7 @@ void PPDParser::initPPDFiles() #endif scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); #ifdef DEBUG - fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" ); + fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" ); #endif } } @@ -1978,7 +1978,7 @@ int PPDContext::getRenderResolution() const void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set - rPaper = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ); + rPaper = rtl::OUString( "A4" ); rWidth = 595; rHeight = 842; if( m_pParser ) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 133a342ce282..3f3353259189 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -1244,8 +1244,8 @@ static void lpgetSysQueueTokenHandler( rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); boost::unordered_set< OUString, OUStringHash > aUniqueSet; boost::unordered_set< OUString, OUStringHash > aOnlySet; - aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) ); - aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) ); + aUniqueSet.insert( OUString( "_all" ) ); + aUniqueSet.insert( OUString( "_default" ) ); // the eventual "all" attribute of the "_all" queue tells us, which // printers are to be used for this user at all diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 524717b558c1..6b284669ed30 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2882,7 +2882,7 @@ void X11SalFrame::beginUnicodeSequence() if( !rSeq.isEmpty() ) endUnicodeSequence(); - rSeq = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "u" ) ); + rSeq = rtl::OUString( "u" ); if( ! aDeleteWatch.isDeleted() ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 0527a827156d..290020883ee1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -906,7 +906,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( !bExtensionTypedIn && ( sToken != "*" ) ) { //if the filename does not already have the auto extension, stick it on - OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken; + OUString sExtension = OUString( "." ) + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx ); @@ -1469,7 +1469,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ": " )); + aLabel += rtl::OUString( ": " ); aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } @@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast<XFilePicker2*>( this ), 1 ); aAny = aArguments[0]; @@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast<XFilePicker2*>( this ), 1 ); sal_Int16 templateId = -1; @@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu break; default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -1855,7 +1855,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O if (!aToken.isEmpty()) { if (!aTokens.isEmpty()) - aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + aTokens += OUString(","); aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 6d5a9c68bcce..3f8b67bbacd3 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -66,7 +66,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) } else { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); if( !aNewURL.isEmpty() ) sURL = aNewURL; } @@ -82,7 +82,7 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) INetURLObject aURL(rURL); if (INET_PROT_FILE == aURL.GetProtocol()) { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); if( !aNewURL.isEmpty() ) { diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 904b47b1cb4a..83c92b2cf792 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper() void GtkPrintWrapper::impl_load() { - m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so.0"))); + m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0")); if (!m_aModule.is()) - m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so"))); + m_aModule.load(rtl::OUString("libgtk-x11-2.0.so")); if (!m_aModule.is()) return; diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index a0e4ac4aa7f3..025373488f71 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled } beans::PropertyValue* const pPrintContent( - m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent")))); + m_rController.getValue(rtl::OUString("PrintContent"))); if (pPrintContent) { @@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY); uno::Reference < XFilter > xFilter( - ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.PDFFilter"))), + ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")), UNO_QUERY); if (xFilter.is()) @@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); uno::Sequence<beans::PropertyValue> aFilterData(2); - aFilterData[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageLayout")); + aFilterData[0].Name = rtl::OUString("PageLayout"); aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPageOnLeft")); + aFilterData[1].Name = rtl::OUString("FirstPageOnLeft"); aFilterData[1].Value <<= sal_False; @@ -987,7 +987,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings aRangeText.AppendAscii(","); } aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText); } else if (pStr && !strcmp(pStr, "current")) @@ -1027,7 +1027,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (i < xSheets->getCount()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1)); } } @@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (aSelection.hasValue()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); + aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection"); aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } #endif uno::Sequence<beans::PropertyValue> aArgs(2); - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData")); + aArgs[0].Name = rtl::OUString("FilterData"); aArgs[0].Value <<= aFilterData; - aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream")); + aArgs[1].Name = rtl::OUString("OutputStream"); aArgs[1].Value <<= xOStm; xFilter->filter(aArgs); } @@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange() // TODO: use get_print_pages if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES)) { - beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintRange"))); + beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange")); if (!pVal) - pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent"))); + pVal = m_rController.getValue(rtl::OUString("PrintContent")); SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!"); if (pVal) { @@ -1093,7 +1093,7 @@ GtkPrintDialog::updateControllerPrintRange() if (nVal == 1) { - pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange"))); + pVal = m_rController.getValue(rtl::OUString("PageRange")); SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!"); if (pVal) { @@ -1135,9 +1135,9 @@ GtkPrintDialog::impl_readFromSettings() const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount")))); + rtl::OUString("CopyCount"))); const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate")))); + rtl::OUString("Collate"))); bool bChanged(false); @@ -1173,13 +1173,13 @@ const const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog")); pItem->setValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount")), + rtl::OUString("CopyCount"), rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); pItem->setValue(aPrintDialogStr, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate")), + rtl::OUString("Collate"), m_pWrapper->print_settings_get_collate(pSettings) - ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false"))) + ? rtl::OUString("true") + : rtl::OUString("false")) ; // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), ); g_object_unref(G_OBJECT(pSettings)); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 2bd096ae3901..d9cf2f0c6e01 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -71,12 +71,12 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); #ifdef ENABLE_TDE - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.TDEFilePicker")); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker"); #else // ENABLE_TDE - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker")); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker"); #endif // ENABLE_TDE return aRet; } @@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker() { if ( m_nFilePickerPid > 0 ) { - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) ); + sendCommand( ::rtl::OUString( "exit" ) ); waitpid( m_nFilePickerPid, NULL, 0 ); } @@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() // this is _not_ an osl::Condition, see i#93366 m_pCommandThread->execCondition().reset(); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) )); + sendCommand( ::rtl::OUString( "exec" )); m_pCommandThread->execCondition().wait(); @@ -184,8 +184,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) ::osl::MutexGuard aGuard( m_aMutex ); ::rtl::OUString aString = bMode? - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )): - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" )); + ::rtl::OUString( "setMultiSelection true" ): + ::rtl::OUString( "setMultiSelection false" ); sendCommand( aString ); } @@ -224,7 +224,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )), + sendCommand( ::rtl::OUString( "getDirectory" ), m_pCommandThread->getDirectoryCondition() ); return m_pCommandThread->getDirectory(); @@ -236,7 +236,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )), + sendCommand( ::rtl::OUString( "getFiles" ), m_pCommandThread->getFilesCondition() ); return m_pCommandThread->getFiles(); @@ -278,7 +278,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )), + sendCommand( ::rtl::OUString( "getCurrentFilter" ), m_pCommandThread->getCurrentFilterCondition() ); return m_pCommandThread->getCurrentFilter(); @@ -531,14 +531,14 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen uno::Any aAny; if ( 0 == rArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); aAny = rArguments[0]; if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); sal_Int16 templateId = -1; @@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -769,7 +769,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep else { throw uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )), + ::rtl::OUString( "the external file picker does not run" ), *this ); } } @@ -779,7 +779,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) if ( m_nFilePickerWrite < 0 ) return; - ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 ); + ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); #if OSL_DEBUG_LEVEL > 0 ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl; @@ -883,17 +883,17 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt const ElementToName *pPtr; const ElementToName pArray[] = { - { ControlActions::ADD_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItem" ) ) }, - { ControlActions::ADD_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItems" ) ) }, - { ControlActions::DELETE_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItem" ) ) }, - { ControlActions::DELETE_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItems" ) ) }, - { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setSelectedItem" ) ) }, - { ControlActions::GET_ITEMS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getItems" ) ) }, - { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItem" ) ) }, - { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItemIndex" ) ) }, - { ControlActions::SET_HELP_URL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setHelpURL" ) ) }, - { ControlActions::GET_HELP_URL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getHelpURL" ) ) }, - { 0, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "noAction" ) ) } + { ControlActions::ADD_ITEM, ::rtl::OUString( "addItem" ) }, + { ControlActions::ADD_ITEMS, ::rtl::OUString( "addItems" ) }, + { ControlActions::DELETE_ITEM, ::rtl::OUString( "deleteItem" ) }, + { ControlActions::DELETE_ITEMS, ::rtl::OUString( "deleteItems" ) }, + { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( "setSelectedItem" ) }, + { ControlActions::GET_ITEMS, ::rtl::OUString( "getItems" ) }, + { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( "getSelectedItem" ) }, + { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) }, + { ControlActions::SET_HELP_URL, ::rtl::OUString( "setHelpURL" ) }, + { ControlActions::GET_HELP_URL, ::rtl::OUString( "getHelpURL" ) }, + { 0, ::rtl::OUString( "noAction" ) } }; for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 86583d40529d..cd20d3da69e6 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -77,9 +77,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); - aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); - aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker")); + aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); return aRet; } } @@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) if (args.getLength() == 0) { throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), + rtl::OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) { throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), + rtl::OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) default: throw lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), + rtl::OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 31992b8d919a..9a8cac9b2b04 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2218,7 +2218,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); ::rtl::OUString aUserPath; - aBootstrap.getFrom( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath ); + aBootstrap.getFrom( rtl::OUString( "UserInstallation" ), aUserPath ); aUserPath += String( RTL_CONSTASCII_USTRINGPARAM("/user/config/fontnames.dat") ); String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 4db851ad177e..bf1a44de7570 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -55,7 +55,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 34a2c9ac78d4..3d67d486d982 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -48,7 +48,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); |