mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary use of OUString constructor in SVTOOLS module

Browse Source 
Change-Id: Iad58b125f16226cc6afa9d88d2c792065bbc244f
This commit is contained in:
Noel Grandin
2013-10-31 17:40:05 +02:00
parent 913b4e7d85
commit 81f5c65f75
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
svtools/source/config/extcolorcfg.cxx
View File

@@ -295,7 +295,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
{ {
//detect current scheme name //detect current scheme name
uno::Sequence < OUString > aCurrent(1); uno::Sequence < OUString > aCurrent(1);
aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); aCurrent.getArray()[0] = "ExtendedColorScheme/CurrentColorScheme";
uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
aCurrentVal.getConstArray()[0] >>= sScheme; aCurrentVal.getConstArray()[0] >>= sScheme;
} // if(!sScheme.getLength()) } // if(!sScheme.getLength())
@@ -312,7 +312,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
} }
if ( m_sLoadedScheme.isEmpty() ) if ( m_sLoadedScheme.isEmpty() )
m_sLoadedScheme = OUString("default"); m_sLoadedScheme = "default";
if ( sScheme != "default" ) if ( sScheme != "default" )
{ {
@@ -461,7 +461,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
{ {
//save current scheme name //save current scheme name
uno::Sequence < OUString > aCurrent(1); uno::Sequence < OUString > aCurrent(1);
aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); aCurrent.getArray()[0] = "ExtendedColorScheme/CurrentColorScheme";
uno::Sequence< uno::Any > aCurrentVal(1); uno::Sequence< uno::Any > aCurrentVal(1);
aCurrentVal.getArray()[0] <<= m_sLoadedScheme; aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
PutProperties(aCurrent, aCurrentVal); PutProperties(aCurrent, aCurrentVal);

6
svtools/source/contnr/fileview.cxx
View File

@@ -712,7 +712,7 @@ IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl)
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
maQuickSearchText = OUString(); maQuickSearchText = "";
mnSearchIndex = 0; mnSearchIndex = 0;
return 0; return 0;
@@ -977,7 +977,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
SvtContentEntry* pData = (SvtContentEntry*)pEntry->GetUserData(); SvtContentEntry* pData = (SvtContentEntry*)pEntry->GetUserData();
if ( pData ) if ( pData )
aURL = OUString( pData->maURL ); aURL = pData->maURL;
if ( aURL.isEmpty() ) if ( aURL.isEmpty() )
return bRet; return bRet;
@@ -1703,7 +1703,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
,mxCmdEnv ( xEnv ) ,mxCmdEnv ( xEnv )
{ {
maAllFilter = OUString("*.*"); maAllFilter = "*.*";
mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags ); mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags );
mpView->EnableCellFocus(); mpView->EnableCellFocus();
} }

10
svtools/source/contnr/templwin.cxx
View File

@@ -647,7 +647,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const OUString& rURL )
uno::Reference < task::XInteractionHandler2 > xInteractionHandler( uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
uno::Sequence < beans::PropertyValue> aProps(1); uno::Sequence < beans::PropertyValue> aProps(1);
aProps[0].Name = OUString( "InteractionHandler" ); aProps[0].Name = "InteractionHandler";
aProps[0].Value <<= xInteractionHandler; aProps[0].Value <<= xInteractionHandler;
m_xDocProps->loadFromMedium( rURL, aProps ); m_xDocProps->loadFromMedium( rURL, aProps );
pEditWin->fill( m_xDocProps, rURL ); 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( uno::Reference < task::XInteractionHandler2 > xInteractionHandler(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
aArgs[3].Name = OUString( "InteractionHandler" ); aArgs[3].Name = "InteractionHandler";
aArgs[3].Value <<= xInteractionHandler; aArgs[3].Value <<= xInteractionHandler;
b = sal_False; 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 >() ); m_xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() );
ViewEmptyWin(); ViewEmptyWin();
m_aOpenURL = OUString(); m_aOpenURL = "";
} }
else else
m_aOpenURL = aDispURL; m_aOpenURL = aDispURL;
@@ -761,13 +761,13 @@ void SvtFrameWindow_Impl::OpenFile( const OUString& rURL, sal_Bool bPreview, sal
aArgs[0].Name = "AsTemplate"; aArgs[0].Name = "AsTemplate";
aArgs[0].Value <<= bAsTemplate; aArgs[0].Value <<= bAsTemplate;
xDisp->dispatch( aURL, aArgs ); xDisp->dispatch( aURL, aArgs );
m_aOpenURL = OUString(); m_aOpenURL = "";
} }
else else
{ {
Sequence < PropertyValue > aArgs; Sequence < PropertyValue > aArgs;
xDisp->dispatch( aURL, aArgs ); xDisp->dispatch( aURL, aArgs );
m_aOpenURL = OUString(); m_aOpenURL = "";
} }
} }
} }

6
svtools/source/filter/exportdialog.cxx
View File

@@ -460,11 +460,11 @@ sal_Bool ExportDialog::GetGraphicStream()
OUString sFormat( maExt ); OUString sFormat( maExt );
uno::Sequence< beans::PropertyValue > aDescriptor( 3 ); uno::Sequence< beans::PropertyValue > aDescriptor( 3 );
aDescriptor[0].Name = OUString("OutputStream"); aDescriptor[0].Name = "OutputStream";
aDescriptor[0].Value <<= xOutputStream; aDescriptor[0].Value <<= xOutputStream;
aDescriptor[1].Name = OUString("FilterName"); aDescriptor[1].Name = "FilterName";
aDescriptor[1].Value <<= sFormat; aDescriptor[1].Value <<= sFormat;
aDescriptor[2].Name = OUString("FilterData"); aDescriptor[2].Name = "FilterData";
aDescriptor[2].Value <<= aNewFilterData; aDescriptor[2].Value <<= aNewFilterData;
uno::Reference< lang::XComponent > xSourceDoc; uno::Reference< lang::XComponent > xSourceDoc;

6
svtools/source/misc/langhelp.cxx
View File

@@ -19,14 +19,14 @@ void localizeWebserviceURI( OUString& rURI )
if ( aLang.equalsIgnoreAsciiCase("pt") if ( aLang.equalsIgnoreAsciiCase("pt")
&& Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("br") ) && Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("br") )
{ {
aLang = OUString("pt-br"); aLang = "pt-br";
} }
if ( aLang.equalsIgnoreAsciiCase("zh") ) if ( aLang.equalsIgnoreAsciiCase("zh") )
{ {
if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("cn") ) if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("cn") )
aLang = OUString("zh-cn"); aLang = "zh-cn";
if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("tw") ) if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("tw") )
aLang = OUString("zh-tw"); aLang = "zh-tw";
} }
rURI += aLang; rURI += aLang;

8
svtools/source/uno/unoimap.cxx
View File

@@ -393,18 +393,18 @@ Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames()
throw(RuntimeException) throw(RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS.getArray()[0] = OUString("com.sun.star.image.ImageMapObject" ); aSNS.getArray()[0] = "com.sun.star.image.ImageMapObject";
switch( mnType ) switch( mnType )
{ {
case IMAP_OBJ_POLYGON: case IMAP_OBJ_POLYGON:
default: default:
aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapPolygonObject" ); aSNS.getArray()[1] = "com.sun.star.image.ImageMapPolygonObject";
break; break;
case IMAP_OBJ_RECTANGLE: case IMAP_OBJ_RECTANGLE:
aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapRectangleObject" ); aSNS.getArray()[1] = "com.sun.star.image.ImageMapRectangleObject";
break; break;
case IMAP_OBJ_CIRCLE: case IMAP_OBJ_CIRCLE:
aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapCircleObject" ); aSNS.getArray()[1] = "com.sun.star.image.ImageMapCircleObject";
break; break;
} }
return aSNS; return aSNS;