diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-31 17:40:05 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-08 08:44:34 +0200 |
commit | 81f5c65f7556bf0c08ce8a0d7029a9cc72319025 (patch) | |
tree | 1661cf1181d2618f325261ffeffc7b00a1309162 /svtools | |
parent | 913b4e7d856ad6392588886a4124d05676e8968d (diff) |
remove unnecessary use of OUString constructor in SVTOOLS module
Change-Id: Iad58b125f16226cc6afa9d88d2c792065bbc244f
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/templwin.cxx | 10 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/langhelp.cxx | 6 | ||||
-rw-r--r-- | svtools/source/uno/unoimap.cxx | 8 |
6 files changed, 21 insertions, 21 deletions
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 6456a9b8cc90..1e1612671565 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -295,7 +295,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) { //detect current scheme name uno::Sequence < OUString > aCurrent(1); - aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); + aCurrent.getArray()[0] = "ExtendedColorScheme/CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) @@ -312,7 +312,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) } if ( m_sLoadedScheme.isEmpty() ) - m_sLoadedScheme = OUString("default"); + m_sLoadedScheme = "default"; if ( sScheme != "default" ) { @@ -461,7 +461,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name uno::Sequence < OUString > aCurrent(1); - aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); + aCurrent.getArray()[0] = "ExtendedColorScheme/CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 929343a11ff9..97d2df300f0d 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -712,7 +712,7 @@ IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl) { ::osl::MutexGuard aGuard( maMutex ); - maQuickSearchText = OUString(); + maQuickSearchText = ""; mnSearchIndex = 0; return 0; @@ -977,7 +977,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, SvtContentEntry* pData = (SvtContentEntry*)pEntry->GetUserData(); if ( pData ) - aURL = OUString( pData->maURL ); + aURL = pData->maURL; if ( aURL.isEmpty() ) return bRet; @@ -1703,7 +1703,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mxCmdEnv ( xEnv ) { - maAllFilter = OUString("*.*"); + maAllFilter = "*.*"; mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags ); mpView->EnableCellFocus(); } diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index a187e8b445ae..a57a15a76b21 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -647,7 +647,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const OUString& rURL ) uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); uno::Sequence < beans::PropertyValue> aProps(1); - aProps[0].Name = OUString( "InteractionHandler" ); + aProps[0].Name = "InteractionHandler"; aProps[0].Value <<= xInteractionHandler; m_xDocProps->loadFromMedium( rURL, aProps ); pEditWin->fill( m_xDocProps, rURL ); @@ -728,7 +728,7 @@ void SvtFrameWindow_Impl::OpenFile( const OUString& rURL, sal_Bool bPreview, sal uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); - aArgs[3].Name = OUString( "InteractionHandler" ); + aArgs[3].Name = "InteractionHandler"; aArgs[3].Value <<= xInteractionHandler; b = sal_False; @@ -748,7 +748,7 @@ void SvtFrameWindow_Impl::OpenFile( const OUString& rURL, sal_Bool bPreview, sal { m_xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() ); ViewEmptyWin(); - m_aOpenURL = OUString(); + m_aOpenURL = ""; } else m_aOpenURL = aDispURL; @@ -761,13 +761,13 @@ void SvtFrameWindow_Impl::OpenFile( const OUString& rURL, sal_Bool bPreview, sal aArgs[0].Name = "AsTemplate"; aArgs[0].Value <<= bAsTemplate; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = OUString(); + m_aOpenURL = ""; } else { Sequence < PropertyValue > aArgs; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = OUString(); + m_aOpenURL = ""; } } } diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b935acf1d096..fe152ff683c4 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -460,11 +460,11 @@ sal_Bool ExportDialog::GetGraphicStream() OUString sFormat( maExt ); uno::Sequence< beans::PropertyValue > aDescriptor( 3 ); - aDescriptor[0].Name = OUString("OutputStream"); + aDescriptor[0].Name = "OutputStream"; aDescriptor[0].Value <<= xOutputStream; - aDescriptor[1].Name = OUString("FilterName"); + aDescriptor[1].Name = "FilterName"; aDescriptor[1].Value <<= sFormat; - aDescriptor[2].Name = OUString("FilterData"); + aDescriptor[2].Name = "FilterData"; aDescriptor[2].Value <<= aNewFilterData; uno::Reference< lang::XComponent > xSourceDoc; diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index c7edaa60fcae..96b2b3496336 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -19,14 +19,14 @@ void localizeWebserviceURI( OUString& rURI ) if ( aLang.equalsIgnoreAsciiCase("pt") && Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("br") ) { - aLang = OUString("pt-br"); + aLang = "pt-br"; } if ( aLang.equalsIgnoreAsciiCase("zh") ) { if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("cn") ) - aLang = OUString("zh-cn"); + aLang = "zh-cn"; if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("tw") ) - aLang = OUString("zh-tw"); + aLang = "zh-tw"; } rURI += aLang; diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 02e0bf250782..d128c9f86752 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -393,18 +393,18 @@ Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aSNS( 2 ); - aSNS.getArray()[0] = OUString("com.sun.star.image.ImageMapObject" ); + aSNS.getArray()[0] = "com.sun.star.image.ImageMapObject"; switch( mnType ) { case IMAP_OBJ_POLYGON: default: - aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapPolygonObject" ); + aSNS.getArray()[1] = "com.sun.star.image.ImageMapPolygonObject"; break; case IMAP_OBJ_RECTANGLE: - aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapRectangleObject" ); + aSNS.getArray()[1] = "com.sun.star.image.ImageMapRectangleObject"; break; case IMAP_OBJ_CIRCLE: - aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapCircleObject" ); + aSNS.getArray()[1] = "com.sun.star.image.ImageMapCircleObject"; break; } return aSNS; |