[Libreoffice-commits] core.git: 4 commits - svl/source svtools/source svx/source sw/source
Noel Grandin
noel at peralex.com
Fri Nov 8 07:45:20 CET 2013
svl/source/fsstor/fsfactory.cxx | 4
svl/source/fsstor/fsstorage.cxx | 9
svl/source/passwordcontainer/passwordcontainer.cxx | 18
svl/source/uno/pathservice.cxx | 2
svtools/source/config/extcolorcfg.cxx | 6
svtools/source/contnr/fileview.cxx | 6
svtools/source/contnr/templwin.cxx | 10
svtools/source/filter/exportdialog.cxx | 6
svtools/source/misc/langhelp.cxx | 6
svtools/source/uno/unoimap.cxx | 8
svx/source/core/graphichelper.cxx | 6
svx/source/dialog/docrecovery.cxx | 14
svx/source/dialog/srchdlg.cxx | 16
svx/source/dialog/svxbmpnumvalueset.cxx | 4
svx/source/fmcomp/fmgridif.cxx | 9
svx/source/form/fmshimp.cxx | 18
svx/source/form/formcontroller.cxx | 11
svx/source/form/legacyformcontroller.cxx | 4
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galmisc.cxx | 4
svx/source/gallery2/galtheme.cxx | 2
svx/source/items/rotmodit.cxx | 4
svx/source/sdr/overlay/overlaymanager.cxx | 2
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/svdraw/svdibrow.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 38 -
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 2
svx/source/unodraw/recoveryui.cxx | 14
svx/source/unodraw/unobtabl.cxx | 2
svx/source/unodraw/unoctabl.cxx | 2
svx/source/unodraw/unodtabl.cxx | 2
svx/source/unodraw/unogtabl.cxx | 2
svx/source/unodraw/unohtabl.cxx | 2
svx/source/unodraw/unomod.cxx | 54 +-
svx/source/unodraw/unomtabl.cxx | 2
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unopool.cxx | 2
svx/source/unodraw/unoshap4.cxx | 8
svx/source/unodraw/unoshcol.cxx | 4
svx/source/unodraw/unottabl.cxx | 2
svx/source/xml/xmleohlp.cxx | 12
sw/source/core/doc/dbgoutsw.cxx | 248 +++++-----
sw/source/core/doc/doc.cxx | 24
sw/source/core/doc/docglbl.cxx | 2
sw/source/core/doc/number.cxx | 30 -
sw/source/core/docnode/finalthreadmanager.cxx | 2
sw/source/core/docnode/retrieveinputstream.cxx | 2
sw/source/core/ole/ndole.cxx | 6
sw/source/core/swg/SwXMLTextBlocks1.cxx | 4
sw/source/core/text/txtftn.cxx | 4
sw/source/core/tox/tox.cxx | 4
sw/source/core/unocore/swunohelper.cxx | 4
sw/source/core/unocore/unochart.cxx | 13
sw/source/core/unocore/unocoll.cxx | 2
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoframe.cxx | 10
sw/source/core/unocore/unoidx.cxx | 9
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/view/printdata.cxx | 26 -
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmlform.cxx | 26 -
sw/source/filter/html/htmlforw.cxx | 18
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/filter/xml/wrtxml.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 2
sw/source/filter/xml/xmltexti.cxx | 6
sw/source/ui/app/docsh2.cxx | 4
sw/source/ui/dbui/dbmgr.cxx | 10
sw/source/ui/dbui/mmoutputpage.cxx | 4
sw/source/ui/docvw/srcedtw.cxx | 4
sw/source/ui/fldui/fldmgr.cxx | 10
sw/source/ui/shells/annotsh.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/table/chartins.cxx | 8
sw/source/ui/uiview/viewling.cxx | 2
sw/source/ui/uno/SwXDocumentSettings.cxx | 6
sw/source/ui/uno/swdetect.cxx | 18
sw/source/ui/uno/unoatxt.cxx | 4
sw/source/ui/uno/unomodule.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 32 -
sw/source/ui/utlui/unotools.cxx | 4
sw/source/ui/vba/vbaaddin.cxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/ui/vba/vbaapplication.cxx | 2
sw/source/ui/vba/vbaautotextentry.cxx | 6
sw/source/ui/vba/vbabookmark.cxx | 2
sw/source/ui/vba/vbabookmarks.cxx | 2
sw/source/ui/vba/vbaborders.cxx | 4
sw/source/ui/vba/vbacell.cxx | 2
sw/source/ui/vba/vbacells.cxx | 2
sw/source/ui/vba/vbacolumn.cxx | 2
sw/source/ui/vba/vbacolumns.cxx | 2
sw/source/ui/vba/vbadialog.cxx | 2
sw/source/ui/vba/vbadialogs.cxx | 2
sw/source/ui/vba/vbadocument.cxx | 6
sw/source/ui/vba/vbadocumentproperties.cxx | 4
sw/source/ui/vba/vbadocuments.cxx | 2
sw/source/ui/vba/vbafield.cxx | 6
sw/source/ui/vba/vbafind.cxx | 2
sw/source/ui/vba/vbafont.cxx | 2
sw/source/ui/vba/vbaformfield.cxx | 2
sw/source/ui/vba/vbaformfields.cxx | 2
sw/source/ui/vba/vbaframe.cxx | 2
sw/source/ui/vba/vbaframes.cxx | 2
sw/source/ui/vba/vbaglobals.cxx | 4
sw/source/ui/vba/vbaheaderfooter.cxx | 6
sw/source/ui/vba/vbaheaderfooterhelper.cxx | 16
sw/source/ui/vba/vbaheadersfooters.cxx | 2
sw/source/ui/vba/vbalistformat.cxx | 2
sw/source/ui/vba/vbalistgalleries.cxx | 2
sw/source/ui/vba/vbalistgallery.cxx | 2
sw/source/ui/vba/vbalistlevel.cxx | 2
sw/source/ui/vba/vbalistlevels.cxx | 2
sw/source/ui/vba/vbalisttemplate.cxx | 2
sw/source/ui/vba/vbalisttemplates.cxx | 2
sw/source/ui/vba/vbaoptions.cxx | 16
sw/source/ui/vba/vbapagesetup.cxx | 6
sw/source/ui/vba/vbapane.cxx | 4
sw/source/ui/vba/vbapanes.cxx | 2
sw/source/ui/vba/vbaparagraph.cxx | 4
sw/source/ui/vba/vbaparagraphformat.cxx | 4
sw/source/ui/vba/vbarange.cxx | 6
sw/source/ui/vba/vbareplacement.cxx | 2
sw/source/ui/vba/vbarevision.cxx | 2
sw/source/ui/vba/vbarevisions.cxx | 2
sw/source/ui/vba/vbarow.cxx | 2
sw/source/ui/vba/vbarows.cxx | 2
sw/source/ui/vba/vbasection.cxx | 2
sw/source/ui/vba/vbasections.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 12
sw/source/ui/vba/vbastyle.cxx | 2
sw/source/ui/vba/vbastyles.cxx | 8
sw/source/ui/vba/vbasystem.cxx | 2
sw/source/ui/vba/vbatable.cxx | 2
sw/source/ui/vba/vbatableofcontents.cxx | 2
sw/source/ui/vba/vbatables.cxx | 2
sw/source/ui/vba/vbatablesofcontents.cxx | 2
sw/source/ui/vba/vbatabstop.cxx | 2
sw/source/ui/vba/vbatabstops.cxx | 2
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/vba/vbavariable.cxx | 2
sw/source/ui/vba/vbavariables.cxx | 2
sw/source/ui/vba/vbaview.cxx | 18
sw/source/ui/vba/vbawindow.cxx | 2
sw/source/ui/vba/vbawrapformat.cxx | 2
151 files changed, 562 insertions(+), 583 deletions(-)
New commits:
commit 458ff29ac36b4a99b14fab99ddc14090cbbfb199
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:43:07 2013 +0200
remove unnecessary use of OUString constructor in SVL module
Change-Id: Ib3c2f2b43895fe45e9efff888bbd81d8be5969e4
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index c10b445..8a42548 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -40,8 +40,8 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< OUString > aRet(2);
- aRet[0] = OUString("com.sun.star.embed.FileSystemStorageFactory");
- aRet[1] = OUString("com.sun.star.comp.embed.FileSystemStorageFactory");
+ aRet[0] = "com.sun.star.embed.FileSystemStorageFactory";
+ aRet[1] = "com.sun.star.comp.embed.FileSystemStorageFactory";
return aRet;
}
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index fd8dd26..a1a7d40 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -233,8 +233,8 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
// create cursor for access to children
uno::Sequence< OUString > aProps( 2 );
OUString* pProps = aProps.getArray();
- pProps[0] = OUString("TargetURL");
- pProps[1] = OUString("IsFolder");
+ pProps[0] = "TargetURL";
+ pProps[1] = "IsFolder";
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
try
@@ -1064,8 +1064,7 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
throw io::IOException(); // TODO: error handling
uno::Sequence< OUString > aProps( 1 );
- OUString* pProps = aProps.getArray();
- pProps[0] = OUString("Title");
+ aProps[0] = "Title";
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
uno::Sequence< OUString > aResult;
@@ -1177,7 +1176,7 @@ sal_Bool SAL_CALL FSStorage::hasElements()
throw io::IOException(); // TODO: error handling
uno::Sequence< OUString > aProps( 1 );
- aProps[0] = OUString("TargetURL");
+ aProps[0] = "TargetURL";
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
try
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 09d82dc..293ad9f 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -253,7 +253,7 @@ void StorageItem::setUseStorage( bool bUse )
Sequence< OUString > sendNames(1);
Sequence< uno::Any > sendVals(1);
- sendNames[0] = OUString("UseStorage");
+ sendNames[0] = "UseStorage";
sendVals[0] <<= bUse;
@@ -265,7 +265,7 @@ void StorageItem::setUseStorage( bool bUse )
bool StorageItem::useStorage()
{
Sequence< OUString > aNodeNames( 1 );
- aNodeNames[0] = OUString("UseStorage");
+ aNodeNames[0] = "UseStorage";
Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames );
@@ -291,8 +291,8 @@ bool StorageItem::getEncodedMP( OUString& aResult )
}
Sequence< OUString > aNodeNames( 2 );
- aNodeNames[0] = OUString("HasMaster");
- aNodeNames[1] = OUString("Master");
+ aNodeNames[0] = "HasMaster";
+ aNodeNames[1] = "Master";
Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames );
@@ -316,8 +316,8 @@ void StorageItem::setEncodedMP( const OUString& aEncoded, bool bAcceptEmpty )
Sequence< OUString > sendNames(2);
Sequence< uno::Any > sendVals(2);
- sendNames[0] = OUString("HasMaster");
- sendNames[1] = OUString("Master");
+ sendNames[0] = "HasMaster";
+ sendNames[1] = "Master";
sal_Bool bHasMaster = ( !aEncoded.isEmpty() || bAcceptEmpty );
sendVals[0] <<= bHasMaster;
@@ -537,7 +537,7 @@ OUString PasswordContainer::EncodePasswords( vector< OUString > lines, const OUS
{
for( int ind = 0; ind < aSeq1.getLength(); ind++ )
if( resSeq[ind] != aSeq1[ind] )
- testOU = OUString();
+ testOU = "";
}
result = rtl_cipher_decode ( aEncoder, (sal_uInt8*)aSeq1.getArray(), aSeq1.getLength(),
@@ -1175,7 +1175,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
::osl::MutexGuard aGuard( mMutex );
if ( m_pStorageFile )
{
- m_aMasterPasswd = OUString();
+ m_aMasterPasswd = "";
m_pStorageFile->setEncodedMP( OUString() ); // let the master password be removed from configuration
}
}
@@ -1384,7 +1384,7 @@ Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) th
Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException)
{
Sequence< OUString > aRet(1);
- *aRet.getArray() = OUString("com.sun.star.task.PasswordContainer");
+ aRet[0] = "com.sun.star.task.PasswordContainer";
return aRet;
}
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 012d2ba..07b57a1 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -53,7 +53,7 @@ public:
throw(css::uno::RuntimeException)
{
css::uno::Sequence< OUString > aRet(1);
- aRet.getArray()[0] = OUString("com.sun.star.config.SpecialConfigManager");
+ aRet.getArray()[0] = "com.sun.star.config.SpecialConfigManager";
return aRet;
}
commit 81f5c65f7556bf0c08ce8a0d7029a9cc72319025
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:40:05 2013 +0200
remove unnecessary use of OUString constructor in SVTOOLS module
Change-Id: Iad58b125f16226cc6afa9d88d2c792065bbc244f
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 6456a9b..1e16126 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 929343a..97d2df3 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 a187e8b..a57a15a 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 b935acf..fe152ff 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 c7edaa6..96b2b34 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 02e0bf2..d128c9f 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;
commit 913b4e7d856ad6392588886a4124d05676e8968d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:37:03 2013 +0200
remove unnecessary use of OUString constructor in SVX module
Change-Id: I1506daaa4a3b736ee6bbb00100fca24df8368298
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index fb50173..df3015e 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -253,7 +253,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
}
if( aDefaultFormatName.getLength() == 0 )
- aDefaultFormatName = OUString( "PNG - Portable Network Graphic" );
+ aDefaultFormatName = "PNG - Portable Network Graphic";
xFilterManager->setCurrentFilter( aDefaultFormatName );
@@ -280,9 +280,9 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
Reference<css::drawing::XGraphicExportFilter> xGraphicExporter = css::drawing::GraphicExportFilter::create( xContext );
Sequence<PropertyValue> aDescriptor( 2 );
- aDescriptor[0].Name = OUString("MediaType");
+ aDescriptor[0].Name = "MediaType";
aDescriptor[0].Value <<= aExportMimeType;
- aDescriptor[1].Name = OUString("URL");
+ aDescriptor[1].Name = "URL";
aDescriptor[1].Value <<= sPath;
Reference< XComponent > xSourceDocument = Reference< XComponent >( xShape, UNO_QUERY_THROW );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index b12caee..a2586fc 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1432,7 +1432,7 @@ void BrokenRecoveryDialog::impl_refresh()
sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
m_aFileListLB.SetEntryData( nPos, (void*)&rInfo );
}
- m_sSavePath = OUString();
+ m_sSavePath = "";
m_aOkBtn.GrabFocus();
}
@@ -1926,11 +1926,11 @@ void BrokenRecoveryDialog::impl_askForSavePath()
{
#if defined(WNT)
- OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}");
+ OUString ustrValue = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}";
#elif defined( MACOSX )
- OUString ustrValue = OUString("~");
+ OUString ustrValue = "~";
#else
- OUString ustrValue = OUString("$SYSUSERCONFIG");
+ OUString ustrValue = "$SYSUSERCONFIG";
#endif
Bootstrap::expandMacros( ustrValue );
@@ -1948,11 +1948,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
static OUString GetPreviewURL()
{
- OUString aURL = GetCrashConfigDir();
-
- aURL += OUString( "/" );
- aURL += OUString( PRVFILE );
-
+ OUString aURL = GetCrashConfigDir() + "/" + PRVFILE;
return aURL;
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 42a1b1c..0b2fcad 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -122,12 +122,12 @@ struct SearchDlg_Impl
m_pSearchFormats->SetStyle(m_pSearchFormats->GetStyle() | WB_PATHELLIPSIS);
pParent->get(m_pReplaceFormats, "replaceformat");
m_pReplaceFormats->SetStyle(m_pReplaceFormats->GetStyle() | WB_PATHELLIPSIS);
- aCommand1URL.Complete = aCommand1URL.Main = OUString("vnd.sun.search:SearchViaComponent1");
- aCommand1URL.Protocol = OUString("vnd.sun.search:");
- aCommand1URL.Path = OUString("SearchViaComponent1");
- aCommand2URL.Complete = aCommand2URL.Main = OUString("vnd.sun.search:SearchViaComponent2");
- aCommand2URL.Protocol = OUString("vnd.sun.search:");
- aCommand2URL.Path = OUString("SearchViaComponent2");
+ aCommand1URL.Complete = aCommand1URL.Main = "vnd.sun.search:SearchViaComponent1";
+ aCommand1URL.Protocol = "vnd.sun.search:";
+ aCommand1URL.Path = "SearchViaComponent1";
+ aCommand2URL.Complete = aCommand2URL.Main = "vnd.sun.search:SearchViaComponent2";
+ aCommand2URL.Protocol = "vnd.sun.search:";
+ aCommand2URL.Path = "SearchViaComponent2";
}
~SearchDlg_Impl() { delete[] pRanges; }
};
@@ -1352,9 +1352,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
{
uno::Sequence < beans::PropertyValue > aArgs(2);
beans::PropertyValue* pArgs = aArgs.getArray();
- pArgs[0].Name = OUString("SearchString");
+ pArgs[0].Name = "SearchString";
pArgs[0].Value <<= OUString(m_pSearchLB->GetText());
- pArgs[1].Name = OUString("ParentWindow");
+ pArgs[1].Name = "ParentWindow";
pArgs[1].Value <<= VCLUnoHelper::GetInterface( this );
if(pBtn == m_pSearchComponent1PB)
{
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 31e83a0..331ff4d 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -301,9 +301,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
}
Sequence< PropertyValue > aProperties(2);
PropertyValue* pProperties = aProperties.getArray();
- pProperties[0].Name = OUString("NumberingType");
+ pProperties[0].Name = "NumberingType";
pProperties[0].Value <<= aNumberingTypes[i];
- pProperties[1].Name = OUString("Value");
+ pProperties[1].Name = "Value";
pProperties[1].Value <<= (sal_Int32)1;
try
{
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 939069f..cd399ce 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -423,7 +423,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw()
{
Sequence< OUString > aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
- aServiceNames[1] = OUString("com.sun.star.awt.UnoControl");
+ aServiceNames[1] = "com.sun.star.awt.UnoControl";
return aServiceNames;
}
@@ -1110,8 +1110,7 @@ namespace fmgridif
{
const OUString getDataModeIdentifier()
{
- static OUString s_sDataModeIdentifier = OUString( "DataMode" );
- return s_sDataModeIdentifier;
+ return OUString("DataMode");
}
}
using namespace fmgridif;
@@ -2468,8 +2467,8 @@ OUString FmXGridPeer::getMode() throw( RuntimeException )
{
aModes.realloc(2);
OUString* pModes = aModes.getArray();
- pModes[0] = OUString( "DataMode" );
- pModes[1] = OUString( "FilterMode" );
+ pModes[0] = "DataMode";
+ pModes[1] = "FilterMode";
}
return aModes;
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 2a1cd95..a18e929 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -511,9 +511,9 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
{
switch ( (::TriState)xCheckBox->getState() )
{
- case STATE_NOCHECK: *_pCurrentText = OUString("0" ); break;
- case STATE_CHECK: *_pCurrentText = OUString("1" ); break;
- default: *_pCurrentText = OUString(); break;
+ case STATE_NOCHECK: *_pCurrentText = "0"; break;
+ case STATE_CHECK: *_pCurrentText = "1"; break;
+ default: *_pCurrentText = ""; break;
}
}
return sal_True;
@@ -677,7 +677,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
implAdjustConfigCache();
// and register for changes on this settings
Sequence< OUString > aNames(1);
- aNames[0] = OUString("FormControlPilotsEnabled");
+ aNames[0] = "FormControlPilotsEnabled";
EnableNotification(aNames);
}
@@ -3442,7 +3442,7 @@ void FmXFormShell::CreateExternalView()
aColumnProps.realloc(pColumnProps - aColumnProps.getArray());
// columns props are a dispatch argument
- pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aColumnProps);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3529,7 +3529,7 @@ void FmXFormShell::CreateExternalView()
++pDispatchArgs;
// the
- pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aListBoxDescription);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3580,7 +3580,7 @@ void FmXFormShell::implAdjustConfigCache()
{
// get (cache) the wizard usage flag
Sequence< OUString > aNames(1);
- aNames[0] = OUString("FormControlPilotsEnabled");
+ aNames[0] = "FormControlPilotsEnabled";
Sequence< Any > aFlags = GetProperties(aNames);
if (1 == aFlags.getLength())
m_bUseWizards = ::cppu::any2bool(aFlags[0]);
@@ -3612,7 +3612,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
m_bUseWizards = _bUseThem;
Sequence< OUString > aNames(1);
- aNames[0] = OUString("FormControlPilotsEnabled");
+ aNames[0] = "FormControlPilotsEnabled";
Sequence< Any > aValues(1);
aValues[0] = ::cppu::bool2any(m_bUseWizards);
PutProperties(aNames, aValues);
@@ -4056,7 +4056,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf
Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) );
if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL)
{
- m_sCurrentValue = OUString();
+ m_sCurrentValue = "";
return sal_True;
}
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index f4e5e00..ed15160 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -699,7 +699,7 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) thro
// service names which are supported only, but cannot be used to created an
// instance at a service factory
Sequence< OUString > aNonCreatableServiceNames( 1 );
- aNonCreatableServiceNames[ 0 ] = OUString( "com.sun.star.form.FormControllerDispatcher" );
+ aNonCreatableServiceNames[ 0 ] = "com.sun.star.form.FormControllerDispatcher";
// services which can be used to created an instance at a service factory
Sequence< OUString > aCreatableServiceNames( getSupportedServiceNames_Static() );
@@ -727,8 +727,8 @@ Sequence< OUString> FormController::getSupportedServiceNames_Static(void)
if (!aServices.getLength())
{
aServices.realloc(2);
- aServices.getArray()[0] = OUString( "com.sun.star.form.runtime.FormController" );
- aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController");
+ aServices.getArray()[0] = "com.sun.star.form.runtime.FormController";
+ aServices.getArray()[1] = "com.sun.star.awt.control.TabController";
}
return aServices;
}
@@ -3530,9 +3530,8 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( Run
if (!aModes.getLength())
{
aModes.realloc(2);
- OUString* pModes = aModes.getArray();
- pModes[0] = OUString( "DataMode" );
- pModes[1] = OUString( "FilterMode" );
+ aModes[0] = "DataMode";
+ aModes[1] = "FilterMode";
}
return aModes;
}
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index df97d8f..211bf65 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -192,8 +192,8 @@ namespace svxform
Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException)
{
Sequence< OUString > aServices(2);
- aServices.getArray()[0] = OUString( "com.sun.star.form.FormController" );
- aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController");
+ aServices.getArray()[0] = "com.sun.star.form.FormController";
+ aServices.getArray()[1] = "com.sun.star.awt.control.TabController";
return aServices;
}
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index e7cea79..12f2a0a 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -231,7 +231,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() );
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString("Url");
+ aProps.getArray()[ 0 ] = "Url";
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 1b3409b..b1214d5 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -267,8 +267,8 @@ sal_Bool CreateDir( const INetURLObject& rURL )
uno::Sequence< OUString > aProps( 1 );
uno::Sequence< uno::Any > aValues( 1 );
- aProps.getArray()[ 0 ] = OUString("Title");
- aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
+ aProps[0] = "Title";
+ aValues[0] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() );
bRet = aParent.insertNewContent( OUString("application/vnd.sun.staroffice.fsys-folder"), aProps, aValues, aContent );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index dc2f48a..bcc4e5a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1138,7 +1138,7 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s
if( bFolder )
{
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString("Url");
+ aProps[ 0 ] = "Url";
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
if( xContentAccess.is() )
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index ef305aa..95798fe 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -71,7 +71,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * ) const
{
- rText = OUString();
+ rText = "";
switch ( ePres )
{
@@ -98,7 +98,7 @@ OUString SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const
case SVX_ROTATE_MODE_TOP:
case SVX_ROTATE_MODE_CENTER:
case SVX_ROTATE_MODE_BOTTOM:
- aText = OUString("...");
+ aText = "...";
break;
default:
OSL_FAIL("SvxRotateModeItem: falscher enum");
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 2509d16..6bb912e 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -135,7 +135,7 @@ namespace sdr
if(bUseReducedDisplayQualityForDrag)
{
uno::Sequence< beans::PropertyValue > xProperties(1);
- xProperties[0].Name = OUString("ReducedDisplayQuality");
+ xProperties[0].Name = "ReducedDisplayQuality";
xProperties[0].Value <<= true;
maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties);
}
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 23c9320..e549d79 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -111,7 +111,7 @@ namespace drawinglayer
if(!aSeq.getLength())
{
aSeq.realloc(1L);
- aSeq.getArray()[0L] = OUString("com.sun.star.graphic.PrimitiveFactory2D");
+ aSeq[0] = "com.sun.star.graphic.PrimitiveFactory2D";
}
return aSeq;
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 77ee1f5..dbda6ec 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -422,7 +422,7 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
pActualBullets[nIndex]->bIsCustomized = sal_True;
OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
- OUString aReplace = OUString("%LIST_NUM");
+ OUString aReplace = "%LIST_NUM";
OUString sNUM = OUString::number( nIndex + 1 );
aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM);
pActualBullets[nIndex]->sDescription = aStrFromRES;
@@ -1367,7 +1367,7 @@ void NumberingTypeMgr::Init()
{
aLevel.realloc(aLevel.getLength() + 1);
PropertyValue& rValue = aLevel.getArray()[aLevel.getLength() - 1];
- rValue.Name = OUString("Value");
+ rValue.Name = "Value";
rValue.Value <<= (sal_Int32)(j + 1);
if (j!=0)
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 2fa8e60..a8f4eb1 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -309,7 +309,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con
}
else
{
- sRet = OUString("???");
+ sRet = "???";
switch (_nColId)
{
case ITEMBROWSER_WHICHCOL_ID:
@@ -1016,7 +1016,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
}
else
{
- aEntry.aValue = OUString("InvalidItem");
+ aEntry.aValue = "InvalidItem";
}
ImpSetEntry(aEntry,nEntryNum);
nEntryNum++;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a254065..f7976e8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -447,16 +447,16 @@ void SvxStyleBox_Impl::Select()
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Value = makeAny( OUString( aSearchEntry ) );
- aArgs[1].Name = OUString("Family");
+ aArgs[1].Name = "Family";
aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
if( bCreateNew )
{
- aArgs[0].Name = OUString("Param");
+ aArgs[0].Name = "Param";
SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:StyleNewByExample"), aArgs);
}
else
{
- aArgs[0].Name = OUString("Template");
+ aArgs[0].Name = "Template";
SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs );
}
}
@@ -995,7 +995,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
aInfo.GetCharSet(),
SID_ATTR_CHAR_FONT );
aFontItem.QueryValue( aArgs[0].Value );
- aArgs[0].Name = OUString( "CharPreviewFontName" );
+ aArgs[0].Name = "CharPreviewFontName";
SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString( ".uno:CharPreviewFontName" ),
aArgs );
@@ -1035,7 +1035,7 @@ void SvxFontNameBox_Impl::Select()
EndPreview();
if ( pFontItem.get() )
{
- aArgs[0].Name = OUString( "CharFontName" );
+ aArgs[0].Name = "CharFontName";
SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString( ".uno:CharFontName" ),
aArgs );
@@ -1050,7 +1050,7 @@ void SvxFontNameBox_Impl::Select()
}
if ( pFontItem.get() )
{
- aArgs[0].Name = OUString( "CharPreviewFontName" );
+ aArgs[0].Name = "CharPreviewFontName";
SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString( ".uno:CharPreviewFontName" ),
aArgs );
@@ -1438,10 +1438,10 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
Any a;
Sequence< PropertyValue > aArgs( 2 );
- aArgs[0].Name = OUString( "OuterBorder" );
+ aArgs[0].Name = "OuterBorder";
aBorderOuter.QueryValue( a );
aArgs[0].Value = a;
- aArgs[1].Name = OUString( "InnerBorder" );
+ aArgs[1].Name = "InnerBorder";
aBorderInner.QueryValue( a );
aArgs[1].Value = a;
@@ -1611,7 +1611,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
Any a;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = OUString( "LineStyle" );
+ aArgs[0].Name = "LineStyle";
aLineItem.QueryValue( a, m_bIsWriter ? CONVERT_TWIPS : 0 );
aArgs[0].Value = a;
@@ -2587,29 +2587,29 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
{
case SID_ATTR_CHAR_COLOR2 :
bNoArgs = true;
- aCommand = OUString( ".uno:CharColorExt" );
- aParamName = OUString( "CharColorExt" );
+ aCommand = ".uno:CharColorExt";
+ aParamName = "CharColorExt";
break;
case SID_ATTR_CHAR_COLOR :
- aCommand = OUString( ".uno:Color" );
- aParamName = OUString( "Color" );
+ aCommand = ".uno:Color";
+ aParamName = "Color";
break;
case SID_BACKGROUND_COLOR :
- aCommand = OUString( ".uno:BackgroundColor" );
- aParamName = OUString( "BackgroundColor" );
+ aCommand = ".uno:BackgroundColor";
+ aParamName = "BackgroundColor";
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
bNoArgs = true;
- aCommand = OUString( ".uno:CharBackgroundExt" );
- aParamName = OUString( "CharBackgroundExt" );
+ aCommand = ".uno:CharBackgroundExt";
+ aParamName = "CharBackgroundExt";
break;
case SID_FRAME_LINECOLOR :
- aCommand = OUString( ".uno:FrameLineColor" );
- aParamName = OUString( "FrameLineColor" );
+ aCommand = ".uno:FrameLineColor";
+ aParamName = "FrameLineColor";
break;
}
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e1bac23..6089e39 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -395,7 +395,7 @@ css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedS
css::uno::Sequence< OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
+ aSNS[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -561,7 +561,7 @@ css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSuppor
css::uno::Sequence< OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController");
+ aSNS[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -662,7 +662,7 @@ css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupported
css::uno::Sequence< OUString > MatchCaseToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
+ aSNS[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -774,7 +774,7 @@ css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedSe
css::uno::Sequence< OUString > FindAllToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController");
+ aSNS[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -869,7 +869,7 @@ css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupporte
css::uno::Sequence< OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController");
+ aSNS[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -977,8 +977,8 @@ css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNa
css::uno::Sequence< OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< OUString > aSNS( 2 );
- aSNS.getArray()[0] = OUString( "com.sun.star.comp.svx.FindbarDispatcher" );
- aSNS.getArray()[1] = OUString( "com.sun.star.frame.ProtocolHandler" );
+ aSNS[0] = "com.sun.star.comp.svx.FindbarDispatcher";
+ aSNS[1] = "com.sun.star.frame.ProtocolHandler";
return aSNS;
}
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index bee7d66..5b9d90a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -501,14 +501,14 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
OUString aNameTo_Simplified("ChineseT2S");
OUString aNameTo_Traditional("ChineseS2T");
lang::Locale aLocale;
- aLocale.Language = OUString("zh");
+ aLocale.Language = "zh";
if( xContainer->hasByName( aNameTo_Simplified ) )
xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
xContainer->getByName( aNameTo_Simplified ), UNO_QUERY );
else
{
- aLocale.Country = OUString("TW");
+ aLocale.Country = "TW";
xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
xDictionaryList->addNewDictionary( aNameTo_Simplified
, aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
@@ -523,7 +523,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
xContainer->getByName( aNameTo_Traditional ), UNO_QUERY );
else
{
- aLocale.Country = OUString("CN");
+ aLocale.Country = "CN";
xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >(
xDictionaryList->addNewDictionary( aNameTo_Traditional
, aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index cff819f..af28cbb 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -91,7 +91,7 @@ uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedSer
uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[ 0 ] = OUString("com.sun.star.linguistic2.ChineseTranslationDialog");
+ aSNS[ 0 ] = "com.sun.star.linguistic2.ChineseTranslationDialog";
return aSNS;
}
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index ce51832..986afe7 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -140,7 +140,7 @@ OUString RecoveryUI::st_getImplementationName()
css::uno::Sequence< OUString > RecoveryUI::st_getSupportedServiceNames()
{
css::uno::Sequence< OUString > lServiceNames(1);
- lServiceNames.getArray() [0] = OUString("com.sun.star.dialog.RecoveryUI");
+ lServiceNames[0] = "com.sun.star.dialog.RecoveryUI";
return lServiceNames;
}
@@ -154,11 +154,11 @@ static OUString GetCrashConfigDir()
{
#if defined(WNT)
- OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}");
+ OUString ustrValue = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}";
#elif defined(MACOSX)
- OUString ustrValue = OUString("~");
+ OUString ustrValue = "~";
#else
- OUString ustrValue = OUString("$SYSUSERCONFIG");
+ OUString ustrValue = "$SYSUSERCONFIG";
#endif
Bootstrap::expandMacros( ustrValue );
@@ -179,11 +179,7 @@ static OUString GetCrashConfigDir()
static OUString GetUnsentURL()
{
- OUString aURL = GetCrashConfigDir();
-
- aURL += "/";
- aURL += OUString( LCKFILE );
-
+ OUString aURL = GetCrashConfigDir() + "/" + LCKFILE;
return aURL;
}
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 398ebc9..a5014b1 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -87,7 +87,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames(
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.BitmapTable" );
+ aSNS[0] = "com.sun.star.drawing.BitmapTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 82baea9..e059060 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -110,7 +110,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
uno::Sequence< OUString > SvxUnoColorTable::getSupportedServiceNames_Static(void) throw()
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.ColorTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.ColorTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index e6e8912..c55a118 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -68,7 +68,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( )
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.DashTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.DashTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 5cc1f9b..d74685b 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.GradientTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.GradientTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 2e4b1ba..de476db 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames(
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.HatchTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.HatchTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 85b2e77..0c9edde 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -131,23 +131,23 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint*
// #115423#
// case HINT_PAGECHG: // Page geaendert
-// aEvent.EventName = OUString( "PageModified" );
+// aEvent.EventName = "PageModified";
// pPage = pSdrHint->GetPage();
// break;
case HINT_PAGEORDERCHG: // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos)
- aEvent.EventName = OUString( "PageOrderModified" );
+ aEvent.EventName = "PageOrderModified";
pPage = pSdrHint->GetPage();
break;
case HINT_OBJCHG: // Objekt geaendert
- aEvent.EventName = OUString( "ShapeModified" );
+ aEvent.EventName = "ShapeModified";
pObj = pSdrHint->GetObject();
break;
case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt
- aEvent.EventName = OUString( "ShapeInserted" );
+ aEvent.EventName = "ShapeInserted";
pObj = pSdrHint->GetObject();
break;
case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt
- aEvent.EventName = OUString( "ShapeRemoved" );
+ aEvent.EventName = "ShapeRemoved";
pObj = pSdrHint->GetObject();
break;
// HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert
@@ -517,28 +517,28 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
sal_uInt16 i = 0;
- aSNS[i++] = OUString("com.sun.star.drawing.DashTable");
- aSNS[i++] = OUString("com.sun.star.drawing.GradientTable");
- aSNS[i++] = OUString("com.sun.star.drawing.HatchTable");
- aSNS[i++] = OUString("com.sun.star.drawing.BitmapTable");
- aSNS[i++] = OUString("com.sun.star.drawing.TransparencyGradientTable");
- aSNS[i++] = OUString("com.sun.star.drawing.MarkerTable");
- aSNS[i++] = OUString("com.sun.star.text.NumberingRules");
- aSNS[i++] = OUString("com.sun.star.image.ImageMapRectangleObject");
- aSNS[i++] = OUString("com.sun.star.image.ImageMapCircleObject");
- aSNS[i++] = OUString("com.sun.star.image.ImageMapPolygonObject");
-
- aSNS[i++] = OUString("com.sun.star.presentation.TitleTextShape");
- aSNS[i++] = OUString("com.sun.star.presentation.OutlinerShape");
- aSNS[i++] = OUString("com.sun.star.presentation.SubtitleShape");
- aSNS[i++] = OUString("com.sun.star.presentation.GraphicObjectShape");
- aSNS[i++] = OUString("com.sun.star.presentation.ChartShape");
- aSNS[i++] = OUString("com.sun.star.presentation.PageShape");
- aSNS[i++] = OUString("com.sun.star.presentation.OLE2Shape");
- aSNS[i++] = OUString("com.sun.star.presentation.TableShape");
- aSNS[i++] = OUString("com.sun.star.presentation.OrgChartShape");
- aSNS[i++] = OUString("com.sun.star.presentation.NotesShape");
- aSNS[i++] = OUString("com.sun.star.presentation.HandoutShape");
+ aSNS[i++] = "com.sun.star.drawing.DashTable";
+ aSNS[i++] = "com.sun.star.drawing.GradientTable";
+ aSNS[i++] = "com.sun.star.drawing.HatchTable";
+ aSNS[i++] = "com.sun.star.drawing.BitmapTable";
+ aSNS[i++] = "com.sun.star.drawing.TransparencyGradientTable";
+ aSNS[i++] = "com.sun.star.drawing.MarkerTable";
+ aSNS[i++] = "com.sun.star.text.NumberingRules";
+ aSNS[i++] = "com.sun.star.image.ImageMapRectangleObject";
+ aSNS[i++] = "com.sun.star.image.ImageMapCircleObject";
+ aSNS[i++] = "com.sun.star.image.ImageMapPolygonObject";
+
+ aSNS[i++] = "com.sun.star.presentation.TitleTextShape";
+ aSNS[i++] = "com.sun.star.presentation.OutlinerShape";
+ aSNS[i++] = "com.sun.star.presentation.SubtitleShape";
+ aSNS[i++] = "com.sun.star.presentation.GraphicObjectShape";
+ aSNS[i++] = "com.sun.star.presentation.ChartShape";
+ aSNS[i++] = "com.sun.star.presentation.PageShape";
+ aSNS[i++] = "com.sun.star.presentation.OLE2Shape";
+ aSNS[i++] = "com.sun.star.presentation.TableShape";
+ aSNS[i++] = "com.sun.star.presentation.OrgChartShape";
+ aSNS[i++] = "com.sun.star.presentation.NotesShape";
+ aSNS[i++] = "com.sun.star.presentation.HandoutShape";
DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" );
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 76c3e1b..ff9e4b2 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -144,7 +144,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames(
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.MarkerTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.MarkerTable";
return aSNS;
}
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index b0550a93..ee6ba75 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -822,7 +822,7 @@ sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSeq( 1 );
- aSeq.getArray()[0] = OUString("com.sun.star.drawing.ShapeCollection" );
+ aSeq.getArray()[0] = "com.sun.star.drawing.ShapeCollection";
return aSeq;
}
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 8686e0a..ace5ca0 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -408,7 +408,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( )
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.Defaults" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.Defaults";
return aSNS;
}
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index d26546f..46981b5 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -366,7 +366,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
{
::comphelper::IEmbeddedHelper *pPersist = mpObj->GetModel()->GetPersist();
if( (NULL == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) )
- aPersistName = OUString();
+ aPersistName = "";
}
}
@@ -461,14 +461,14 @@ sal_Bool SvxOle2Shape::createLink( const OUString& aLinkURL )
::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist();
uno::Sequence< beans::PropertyValue > aMediaDescr( 1 );
- aMediaDescr[0].Name = OUString("URL");
+ aMediaDescr[0].Name = "URL";
aMediaDescr[0].Value <<= aLinkURL;
uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler();
if ( xInteraction.is() )
{
aMediaDescr.realloc( 2 );
- aMediaDescr[1].Name = OUString( "InteractionHandler" );
+ aMediaDescr[1].Name = "InteractionHandler";
aMediaDescr[1].Value <<= xInteraction;
}
@@ -535,7 +535,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID)
if( pOle2Obj )
{
- rHexCLSID = OUString();
+ rHexCLSID = "";
if( pOle2Obj->IsEmpty() )
{
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 739ee75..2850e1e 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -232,8 +232,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames(
uno::Sequence< OUString > SvxShapeCollection::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSeq(2);
- aSeq.getArray()[0] = OUString("com.sun.star.drawing.Shapes");
- aSeq.getArray()[1] = OUString("com.sun.star.drawing.ShapeCollection");
+ aSeq.getArray()[0] = "com.sun.star.drawing.Shapes";
+ aSeq.getArray()[1] = "com.sun.star.drawing.ShapeCollection";
return aSeq;
}
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 26c532f..f2d8e5d 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.drawing.TransparencyGradientTable" );
+ aSNS.getArray()[0] = "com.sun.star.drawing.TransparencyGradientTable";
return aSNS;
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 7b47ddb..6feddd4 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -190,7 +190,7 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(OUString aURLNoPar,
sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' );
if( -1 == _nPos )
{
- rContainerStorageName = OUString();
+ rContainerStorageName = "";
rObjectStorageName = aURLNoPar;
}
else
@@ -292,7 +292,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
nPos = aURLNoPar.lastIndexOf( '/' );
if( -1 == nPos )
{
- rContainerStorageName = OUString();
+ rContainerStorageName = "";
rObjectStorageName = aURLNoPar.copy( nPathStart );
}
else if( nPos > nPathStart )
@@ -494,11 +494,11 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL(
else
{
// Objects are written using ::comphelper::IEmbeddedHelper::SaveAs
- sRetURL = OUString("./");
+ sRetURL = "./";
if( !aContainerStorageName.isEmpty() )
{
sRetURL += aContainerStorageName;
- sRetURL += OUString( '/' );
+ sRetURL += "/";
}
sRetURL += aObjectStorageName;
}
@@ -680,7 +680,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
mxTempStorage =
comphelper::OStorageHelper::GetTemporaryStorage();
Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 );
- aEmbDescr[0].Name = OUString( "StoreVisualReplacement" );
+ aEmbDescr[0].Name = "StoreVisualReplacement";
aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat);
if ( !bOasisFormat )
{
@@ -688,7 +688,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
if ( xGrInStream.is() )
{
aEmbDescr.realloc( 2 );
- aEmbDescr[1].Name = OUString( "VisualReplacement" );
+ aEmbDescr[1].Name = "VisualReplacement";
aEmbDescr[1].Value <<= xGrInStream;
}
}
commit a5536d9a0eac922d18f9008122034ca943d50148
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 17:16:50 2013 +0200
remove unnecessary use of OUString constructor in SW module
Change-Id: I015959dce567e5579ebb5c775fb57ae14e1cd3b1
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 233326a..f852557 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -115,130 +115,130 @@ map<sal_uInt16,OUString,CompareUShort> & GetItemWhichMap()
if (! bInitialized)
{
- aItemWhichMap[RES_CHRATR_CASEMAP] = OUString("CHRATR_CASEMAP");
- aItemWhichMap[RES_CHRATR_CHARSETCOLOR] = OUString("CHRATR_CHARSETCOLOR");
- aItemWhichMap[RES_CHRATR_COLOR] = OUString("CHRATR_COLOR");
- aItemWhichMap[RES_CHRATR_CONTOUR] = OUString("CHRATR_CONTOUR");
- aItemWhichMap[RES_CHRATR_CROSSEDOUT] = OUString("CHRATR_CROSSEDOUT");
- aItemWhichMap[RES_CHRATR_ESCAPEMENT] = OUString("CHRATR_ESCAPEMENT");
- aItemWhichMap[RES_CHRATR_FONT] = OUString("CHRATR_FONT");
- aItemWhichMap[RES_CHRATR_FONTSIZE] = OUString("CHRATR_FONTSIZE");
- aItemWhichMap[RES_CHRATR_KERNING] = OUString("CHRATR_KERNING");
- aItemWhichMap[RES_CHRATR_LANGUAGE] = OUString("CHRATR_LANGUAGE");
- aItemWhichMap[RES_CHRATR_POSTURE] = OUString("CHRATR_POSTURE");
- aItemWhichMap[RES_CHRATR_PROPORTIONALFONTSIZE] = OUString("CHRATR_PROPORTIONALFONTSIZE");
- aItemWhichMap[RES_CHRATR_SHADOWED] = OUString("CHRATR_SHADOWED");
- aItemWhichMap[RES_CHRATR_UNDERLINE] = OUString("CHRATR_UNDERLINE");
- aItemWhichMap[RES_CHRATR_OVERLINE] = OUString("CHRATR_OVERLINE");
- aItemWhichMap[RES_CHRATR_WEIGHT] = OUString("CHRATR_WEIGHT");
- aItemWhichMap[RES_CHRATR_WORDLINEMODE] = OUString("CHRATR_WORDLINEMODE");
- aItemWhichMap[RES_CHRATR_AUTOKERN] = OUString("CHRATR_AUTOKERN");
- aItemWhichMap[RES_CHRATR_BLINK] = OUString("CHRATR_BLINK");
- aItemWhichMap[RES_CHRATR_NOHYPHEN] = OUString("CHRATR_NOHYPHEN");
- aItemWhichMap[RES_CHRATR_NOLINEBREAK] = OUString("CHRATR_NOLINEBREAK");
- aItemWhichMap[RES_CHRATR_BACKGROUND] = OUString("CHRATR_BACKGROUND");
- aItemWhichMap[RES_CHRATR_HIGHLIGHT] = OUString("CHRATR_HIGHLIGHT");
- aItemWhichMap[RES_CHRATR_CJK_FONT] = OUString("CHRATR_CJK_FONT");
- aItemWhichMap[RES_CHRATR_CJK_FONTSIZE] = OUString("CHRATR_CJK_FONTSIZE");
- aItemWhichMap[RES_CHRATR_CJK_LANGUAGE] = OUString("CHRATR_CJK_LANGUAGE");
- aItemWhichMap[RES_CHRATR_CJK_POSTURE] = OUString("CHRATR_CJK_POSTURE");
- aItemWhichMap[RES_CHRATR_CJK_WEIGHT] = OUString("CHRATR_CJK_WEIGHT");
- aItemWhichMap[RES_CHRATR_CTL_FONT] = OUString("CHRATR_CTL_FONT");
- aItemWhichMap[RES_CHRATR_CTL_FONTSIZE] = OUString("CHRATR_CTL_FONTSIZE");
- aItemWhichMap[RES_CHRATR_CTL_LANGUAGE] = OUString("CHRATR_CTL_LANGUAGE");
- aItemWhichMap[RES_CHRATR_CTL_POSTURE] = OUString("CHRATR_CTL_POSTURE");
- aItemWhichMap[RES_CHRATR_CTL_WEIGHT] = OUString("CHRATR_CTL_WEIGHT");
- aItemWhichMap[RES_CHRATR_ROTATE] = OUString("CHRATR_ROTATE");
- aItemWhichMap[RES_CHRATR_EMPHASIS_MARK] = OUString("CHRATR_EMPHASIS_MARK");
- aItemWhichMap[RES_CHRATR_TWO_LINES] = OUString("CHRATR_TWO_LINES");
- aItemWhichMap[RES_CHRATR_SCALEW] = OUString("CHRATR_SCALEW");
- aItemWhichMap[RES_CHRATR_RELIEF] = OUString("CHRATR_RELIEF");
- aItemWhichMap[RES_CHRATR_HIDDEN] = OUString("CHRATR_HIDDEN");
- aItemWhichMap[RES_CHRATR_BOX] = OUString("CHRATR_BOX");
- aItemWhichMap[RES_CHRATR_SHADOW] = OUString("CHRATR_SHADOW");
- aItemWhichMap[RES_TXTATR_AUTOFMT] = OUString("TXTATR_AUTOFMT");
- aItemWhichMap[RES_TXTATR_INETFMT] = OUString("TXTATR_INETFMT");
- aItemWhichMap[RES_TXTATR_REFMARK] = OUString("TXTATR_REFMARK");
- aItemWhichMap[RES_TXTATR_TOXMARK] = OUString("TXTATR_TOXMARK");
- aItemWhichMap[RES_TXTATR_CHARFMT] = OUString("TXTATR_CHARFMT");
- aItemWhichMap[RES_TXTATR_DUMMY5] = OUString("TXTATR_DUMMY5");
- aItemWhichMap[RES_TXTATR_CJK_RUBY] = OUString("TXTATR_CJK_RUBY");
- aItemWhichMap[RES_TXTATR_UNKNOWN_CONTAINER] = OUString("TXTATR_UNKNOWN_CONTAINER");
- aItemWhichMap[RES_TXTATR_META] = OUString("TXTATR_META");
- aItemWhichMap[RES_TXTATR_METAFIELD] = OUString("TXTATR_METAFIELD");
- aItemWhichMap[RES_TXTATR_FIELD] = OUString("TXTATR_FIELD");
- aItemWhichMap[RES_TXTATR_FLYCNT] = OUString("TXTATR_FLYCNT");
- aItemWhichMap[RES_TXTATR_FTN] = OUString("TXTATR_FTN");
- aItemWhichMap[RES_TXTATR_DUMMY4] = OUString("TXTATR_DUMMY4");
- aItemWhichMap[RES_TXTATR_DUMMY3] = OUString("TXTATR_DUMMY3");
- aItemWhichMap[RES_TXTATR_DUMMY1] = OUString("TXTATR_DUMMY1");
- aItemWhichMap[RES_TXTATR_DUMMY2] = OUString("TXTATR_DUMMY2");
- aItemWhichMap[RES_PARATR_LINESPACING] = OUString("PARATR_LINESPACING");
- aItemWhichMap[RES_PARATR_ADJUST] = OUString("PARATR_ADJUST");
- aItemWhichMap[RES_PARATR_SPLIT] = OUString("PARATR_SPLIT");
- aItemWhichMap[RES_PARATR_ORPHANS] = OUString("PARATR_ORPHANS");
- aItemWhichMap[RES_PARATR_WIDOWS] = OUString("PARATR_WIDOWS");
- aItemWhichMap[RES_PARATR_TABSTOP] = OUString("PARATR_TABSTOP");
- aItemWhichMap[RES_PARATR_HYPHENZONE] = OUString("PARATR_HYPHENZONE");
- aItemWhichMap[RES_PARATR_DROP] = OUString("PARATR_DROP");
- aItemWhichMap[RES_PARATR_REGISTER] = OUString("PARATR_REGISTER");
- aItemWhichMap[RES_PARATR_NUMRULE] = OUString("PARATR_NUMRULE");
- aItemWhichMap[RES_PARATR_SCRIPTSPACE] = OUString("PARATR_SCRIPTSPACE");
- aItemWhichMap[RES_PARATR_HANGINGPUNCTUATION] = OUString("PARATR_HANGINGPUNCTUATION");
- aItemWhichMap[RES_PARATR_FORBIDDEN_RULES] = OUString("PARATR_FORBIDDEN_RULES");
- aItemWhichMap[RES_PARATR_VERTALIGN] = OUString("PARATR_VERTALIGN");
- aItemWhichMap[RES_PARATR_SNAPTOGRID] = OUString("PARATR_SNAPTOGRID");
- aItemWhichMap[RES_PARATR_CONNECT_BORDER] = OUString("PARATR_CONNECT_BORDER");
- aItemWhichMap[RES_FILL_ORDER] = OUString("FILL_ORDER");
- aItemWhichMap[RES_FRM_SIZE] = OUString("FRM_SIZE");
- aItemWhichMap[RES_PAPER_BIN] = OUString("PAPER_BIN");
- aItemWhichMap[RES_LR_SPACE] = OUString("LR_SPACE");
- aItemWhichMap[RES_UL_SPACE] = OUString("UL_SPACE");
- aItemWhichMap[RES_PAGEDESC] = OUString("PAGEDESC");
- aItemWhichMap[RES_BREAK] = OUString("BREAK");
- aItemWhichMap[RES_CNTNT] = OUString("CNTNT");
- aItemWhichMap[RES_HEADER] = OUString("HEADER");
- aItemWhichMap[RES_FOOTER] = OUString("FOOTER");
- aItemWhichMap[RES_PRINT] = OUString("PRINT");
- aItemWhichMap[RES_OPAQUE] = OUString("OPAQUE");
- aItemWhichMap[RES_PROTECT] = OUString("PROTECT");
- aItemWhichMap[RES_SURROUND] = OUString("SURROUND");
- aItemWhichMap[RES_VERT_ORIENT] = OUString("VERT_ORIENT");
- aItemWhichMap[RES_HORI_ORIENT] = OUString("HORI_ORIENT");
- aItemWhichMap[RES_ANCHOR] = OUString("ANCHOR");
- aItemWhichMap[RES_BACKGROUND] = OUString("BACKGROUND");
- aItemWhichMap[RES_BOX] = OUString("BOX");
- aItemWhichMap[RES_SHADOW] = OUString("SHADOW");
- aItemWhichMap[RES_FRMMACRO] = OUString("FRMMACRO");
- aItemWhichMap[RES_COL] = OUString("COL");
- aItemWhichMap[RES_KEEP] = OUString("KEEP");
- aItemWhichMap[RES_URL] = OUString("URL");
- aItemWhichMap[RES_EDIT_IN_READONLY] = OUString("EDIT_IN_READONLY");
- aItemWhichMap[RES_LAYOUT_SPLIT] = OUString("LAYOUT_SPLIT");
- aItemWhichMap[RES_CHAIN] = OUString("CHAIN");
- aItemWhichMap[RES_TEXTGRID] = OUString("TEXTGRID");
- aItemWhichMap[RES_LINENUMBER ] = OUString("LINENUMBER ");
- aItemWhichMap[RES_FTN_AT_TXTEND] = OUString("FTN_AT_TXTEND");
- aItemWhichMap[RES_END_AT_TXTEND] = OUString("END_AT_TXTEND");
- aItemWhichMap[RES_COLUMNBALANCE] = OUString("COLUMNBALANCE");
- aItemWhichMap[RES_FRAMEDIR] = OUString("FRAMEDIR");
- aItemWhichMap[RES_HEADER_FOOTER_EAT_SPACING] = OUString("HEADER_FOOTER_EAT_SPACING");
- aItemWhichMap[RES_ROW_SPLIT] = OUString("ROW_SPLIT");
- aItemWhichMap[RES_GRFATR_MIRRORGRF] = OUString("GRFATR_MIRRORGRF");
- aItemWhichMap[RES_GRFATR_CROPGRF] = OUString("GRFATR_CROPGRF");
- aItemWhichMap[RES_GRFATR_ROTATION] = OUString("GRFATR_ROTATION");
- aItemWhichMap[RES_GRFATR_LUMINANCE] = OUString("GRFATR_LUMINANCE");
- aItemWhichMap[RES_GRFATR_CONTRAST] = OUString("GRFATR_CONTRAST");
- aItemWhichMap[RES_GRFATR_CHANNELR] = OUString("GRFATR_CHANNELR");
- aItemWhichMap[RES_GRFATR_CHANNELG] = OUString("GRFATR_CHANNELG");
- aItemWhichMap[RES_GRFATR_CHANNELB] = OUString("GRFATR_CHANNELB");
- aItemWhichMap[RES_GRFATR_GAMMA] = OUString("GRFATR_GAMMA");
- aItemWhichMap[RES_GRFATR_INVERT] = OUString("GRFATR_INVERT");
- aItemWhichMap[RES_GRFATR_TRANSPARENCY] = OUString("GRFATR_TRANSPARENCY");
- aItemWhichMap[RES_GRFATR_DRAWMODE] = OUString("GRFATR_DRAWMODE");
- aItemWhichMap[RES_BOXATR_FORMAT] = OUString("BOXATR_FORMAT");
- aItemWhichMap[RES_BOXATR_FORMULA] = OUString("BOXATR_FORMULA");
- aItemWhichMap[RES_BOXATR_VALUE] = OUString("BOXATR_VALUE");
+ aItemWhichMap[RES_CHRATR_CASEMAP] = "CHRATR_CASEMAP";
+ aItemWhichMap[RES_CHRATR_CHARSETCOLOR] = "CHRATR_CHARSETCOLOR";
+ aItemWhichMap[RES_CHRATR_COLOR] = "CHRATR_COLOR";
+ aItemWhichMap[RES_CHRATR_CONTOUR] = "CHRATR_CONTOUR";
+ aItemWhichMap[RES_CHRATR_CROSSEDOUT] = "CHRATR_CROSSEDOUT";
+ aItemWhichMap[RES_CHRATR_ESCAPEMENT] = "CHRATR_ESCAPEMENT";
+ aItemWhichMap[RES_CHRATR_FONT] = "CHRATR_FONT";
+ aItemWhichMap[RES_CHRATR_FONTSIZE] = "CHRATR_FONTSIZE";
+ aItemWhichMap[RES_CHRATR_KERNING] = "CHRATR_KERNING";
+ aItemWhichMap[RES_CHRATR_LANGUAGE] = "CHRATR_LANGUAGE";
+ aItemWhichMap[RES_CHRATR_POSTURE] = "CHRATR_POSTURE";
+ aItemWhichMap[RES_CHRATR_PROPORTIONALFONTSIZE] = "CHRATR_PROPORTIONALFONTSIZE";
+ aItemWhichMap[RES_CHRATR_SHADOWED] = "CHRATR_SHADOWED";
+ aItemWhichMap[RES_CHRATR_UNDERLINE] = "CHRATR_UNDERLINE";
+ aItemWhichMap[RES_CHRATR_OVERLINE] = "CHRATR_OVERLINE";
+ aItemWhichMap[RES_CHRATR_WEIGHT] = "CHRATR_WEIGHT";
+ aItemWhichMap[RES_CHRATR_WORDLINEMODE] = "CHRATR_WORDLINEMODE";
+ aItemWhichMap[RES_CHRATR_AUTOKERN] = "CHRATR_AUTOKERN";
+ aItemWhichMap[RES_CHRATR_BLINK] = "CHRATR_BLINK";
+ aItemWhichMap[RES_CHRATR_NOHYPHEN] = "CHRATR_NOHYPHEN";
+ aItemWhichMap[RES_CHRATR_NOLINEBREAK] = "CHRATR_NOLINEBREAK";
+ aItemWhichMap[RES_CHRATR_BACKGROUND] = "CHRATR_BACKGROUND";
+ aItemWhichMap[RES_CHRATR_HIGHLIGHT] = "CHRATR_HIGHLIGHT";
+ aItemWhichMap[RES_CHRATR_CJK_FONT] = "CHRATR_CJK_FONT";
+ aItemWhichMap[RES_CHRATR_CJK_FONTSIZE] = "CHRATR_CJK_FONTSIZE";
+ aItemWhichMap[RES_CHRATR_CJK_LANGUAGE] = "CHRATR_CJK_LANGUAGE";
+ aItemWhichMap[RES_CHRATR_CJK_POSTURE] = "CHRATR_CJK_POSTURE";
+ aItemWhichMap[RES_CHRATR_CJK_WEIGHT] = "CHRATR_CJK_WEIGHT";
+ aItemWhichMap[RES_CHRATR_CTL_FONT] = "CHRATR_CTL_FONT";
+ aItemWhichMap[RES_CHRATR_CTL_FONTSIZE] = "CHRATR_CTL_FONTSIZE";
+ aItemWhichMap[RES_CHRATR_CTL_LANGUAGE] = "CHRATR_CTL_LANGUAGE";
+ aItemWhichMap[RES_CHRATR_CTL_POSTURE] = "CHRATR_CTL_POSTURE";
+ aItemWhichMap[RES_CHRATR_CTL_WEIGHT] = "CHRATR_CTL_WEIGHT";
+ aItemWhichMap[RES_CHRATR_ROTATE] = "CHRATR_ROTATE";
+ aItemWhichMap[RES_CHRATR_EMPHASIS_MARK] = "CHRATR_EMPHASIS_MARK";
+ aItemWhichMap[RES_CHRATR_TWO_LINES] = "CHRATR_TWO_LINES";
+ aItemWhichMap[RES_CHRATR_SCALEW] = "CHRATR_SCALEW";
+ aItemWhichMap[RES_CHRATR_RELIEF] = "CHRATR_RELIEF";
+ aItemWhichMap[RES_CHRATR_HIDDEN] = "CHRATR_HIDDEN";
+ aItemWhichMap[RES_CHRATR_BOX] = "CHRATR_BOX";
+ aItemWhichMap[RES_CHRATR_SHADOW] = "CHRATR_SHADOW";
+ aItemWhichMap[RES_TXTATR_AUTOFMT] = "TXTATR_AUTOFMT";
+ aItemWhichMap[RES_TXTATR_INETFMT] = "TXTATR_INETFMT";
+ aItemWhichMap[RES_TXTATR_REFMARK] = "TXTATR_REFMARK";
+ aItemWhichMap[RES_TXTATR_TOXMARK] = "TXTATR_TOXMARK";
+ aItemWhichMap[RES_TXTATR_CHARFMT] = "TXTATR_CHARFMT";
+ aItemWhichMap[RES_TXTATR_DUMMY5] = "TXTATR_DUMMY5";
+ aItemWhichMap[RES_TXTATR_CJK_RUBY] = "TXTATR_CJK_RUBY";
+ aItemWhichMap[RES_TXTATR_UNKNOWN_CONTAINER] = "TXTATR_UNKNOWN_CONTAINER";
+ aItemWhichMap[RES_TXTATR_META] = "TXTATR_META";
+ aItemWhichMap[RES_TXTATR_METAFIELD] = "TXTATR_METAFIELD";
+ aItemWhichMap[RES_TXTATR_FIELD] = "TXTATR_FIELD";
+ aItemWhichMap[RES_TXTATR_FLYCNT] = "TXTATR_FLYCNT";
+ aItemWhichMap[RES_TXTATR_FTN] = "TXTATR_FTN";
+ aItemWhichMap[RES_TXTATR_DUMMY4] = "TXTATR_DUMMY4";
+ aItemWhichMap[RES_TXTATR_DUMMY3] = "TXTATR_DUMMY3";
+ aItemWhichMap[RES_TXTATR_DUMMY1] = "TXTATR_DUMMY1";
+ aItemWhichMap[RES_TXTATR_DUMMY2] = "TXTATR_DUMMY2";
+ aItemWhichMap[RES_PARATR_LINESPACING] = "PARATR_LINESPACING";
+ aItemWhichMap[RES_PARATR_ADJUST] = "PARATR_ADJUST";
+ aItemWhichMap[RES_PARATR_SPLIT] = "PARATR_SPLIT";
+ aItemWhichMap[RES_PARATR_ORPHANS] = "PARATR_ORPHANS";
+ aItemWhichMap[RES_PARATR_WIDOWS] = "PARATR_WIDOWS";
+ aItemWhichMap[RES_PARATR_TABSTOP] = "PARATR_TABSTOP";
+ aItemWhichMap[RES_PARATR_HYPHENZONE] = "PARATR_HYPHENZONE";
+ aItemWhichMap[RES_PARATR_DROP] = "PARATR_DROP";
+ aItemWhichMap[RES_PARATR_REGISTER] = "PARATR_REGISTER";
+ aItemWhichMap[RES_PARATR_NUMRULE] = "PARATR_NUMRULE";
+ aItemWhichMap[RES_PARATR_SCRIPTSPACE] = "PARATR_SCRIPTSPACE";
+ aItemWhichMap[RES_PARATR_HANGINGPUNCTUATION] = "PARATR_HANGINGPUNCTUATION";
+ aItemWhichMap[RES_PARATR_FORBIDDEN_RULES] = "PARATR_FORBIDDEN_RULES";
+ aItemWhichMap[RES_PARATR_VERTALIGN] = "PARATR_VERTALIGN";
+ aItemWhichMap[RES_PARATR_SNAPTOGRID] = "PARATR_SNAPTOGRID";
+ aItemWhichMap[RES_PARATR_CONNECT_BORDER] = "PARATR_CONNECT_BORDER";
+ aItemWhichMap[RES_FILL_ORDER] = "FILL_ORDER";
+ aItemWhichMap[RES_FRM_SIZE] = "FRM_SIZE";
+ aItemWhichMap[RES_PAPER_BIN] = "PAPER_BIN";
+ aItemWhichMap[RES_LR_SPACE] = "LR_SPACE";
+ aItemWhichMap[RES_UL_SPACE] = "UL_SPACE";
+ aItemWhichMap[RES_PAGEDESC] = "PAGEDESC";
+ aItemWhichMap[RES_BREAK] = "BREAK";
+ aItemWhichMap[RES_CNTNT] = "CNTNT";
+ aItemWhichMap[RES_HEADER] = "HEADER";
+ aItemWhichMap[RES_FOOTER] = "FOOTER";
+ aItemWhichMap[RES_PRINT] = "PRINT";
+ aItemWhichMap[RES_OPAQUE] = "OPAQUE";
+ aItemWhichMap[RES_PROTECT] = "PROTECT";
+ aItemWhichMap[RES_SURROUND] = "SURROUND";
+ aItemWhichMap[RES_VERT_ORIENT] = "VERT_ORIENT";
+ aItemWhichMap[RES_HORI_ORIENT] = "HORI_ORIENT";
+ aItemWhichMap[RES_ANCHOR] = "ANCHOR";
+ aItemWhichMap[RES_BACKGROUND] = "BACKGROUND";
+ aItemWhichMap[RES_BOX] = "BOX";
+ aItemWhichMap[RES_SHADOW] = "SHADOW";
+ aItemWhichMap[RES_FRMMACRO] = "FRMMACRO";
+ aItemWhichMap[RES_COL] = "COL";
+ aItemWhichMap[RES_KEEP] = "KEEP";
+ aItemWhichMap[RES_URL] = "URL";
+ aItemWhichMap[RES_EDIT_IN_READONLY] = "EDIT_IN_READONLY";
+ aItemWhichMap[RES_LAYOUT_SPLIT] = "LAYOUT_SPLIT";
+ aItemWhichMap[RES_CHAIN] = "CHAIN";
+ aItemWhichMap[RES_TEXTGRID] = "TEXTGRID";
+ aItemWhichMap[RES_LINENUMBER ] = "LINENUMBER ";
+ aItemWhichMap[RES_FTN_AT_TXTEND] = "FTN_AT_TXTEND";
+ aItemWhichMap[RES_END_AT_TXTEND] = "END_AT_TXTEND";
+ aItemWhichMap[RES_COLUMNBALANCE] = "COLUMNBALANCE";
+ aItemWhichMap[RES_FRAMEDIR] = "FRAMEDIR";
+ aItemWhichMap[RES_HEADER_FOOTER_EAT_SPACING] = "HEADER_FOOTER_EAT_SPACING";
+ aItemWhichMap[RES_ROW_SPLIT] = "ROW_SPLIT";
+ aItemWhichMap[RES_GRFATR_MIRRORGRF] = "GRFATR_MIRRORGRF";
+ aItemWhichMap[RES_GRFATR_CROPGRF] = "GRFATR_CROPGRF";
+ aItemWhichMap[RES_GRFATR_ROTATION] = "GRFATR_ROTATION";
+ aItemWhichMap[RES_GRFATR_LUMINANCE] = "GRFATR_LUMINANCE";
+ aItemWhichMap[RES_GRFATR_CONTRAST] = "GRFATR_CONTRAST";
+ aItemWhichMap[RES_GRFATR_CHANNELR] = "GRFATR_CHANNELR";
+ aItemWhichMap[RES_GRFATR_CHANNELG] = "GRFATR_CHANNELG";
+ aItemWhichMap[RES_GRFATR_CHANNELB] = "GRFATR_CHANNELB";
+ aItemWhichMap[RES_GRFATR_GAMMA] = "GRFATR_GAMMA";
+ aItemWhichMap[RES_GRFATR_INVERT] = "GRFATR_INVERT";
+ aItemWhichMap[RES_GRFATR_TRANSPARENCY] = "GRFATR_TRANSPARENCY";
+ aItemWhichMap[RES_GRFATR_DRAWMODE] = "GRFATR_DRAWMODE";
+ aItemWhichMap[RES_BOXATR_FORMAT] = "BOXATR_FORMAT";
+ aItemWhichMap[RES_BOXATR_FORMULA] = "BOXATR_FORMULA";
+ aItemWhichMap[RES_BOXATR_VALUE] = "BOXATR_VALUE";
bInitialized = true;
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 98992d69..600689e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1356,9 +1356,7 @@ void SwDoc::CalculatePagesForPrinting(
if (aPageRange.isEmpty()) // empty string -> print all
{
// set page range to print to 'all pages'
- aPageRange = OUString::number( 1 );
- aPageRange += OUString( (sal_Unicode)'-');
- aPageRange += OUString::number( nDocPageCount );
+ aPageRange = OUString::number( 1 ) + "-" + OUString::number( nDocPageCount );
}
rData.SetPageRange( aPageRange );
@@ -1528,9 +1526,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
if (aPageRange.isEmpty()) // empty string -> print all
{
// set page range to print to 'all pages'
- aPageRange = OUString::number( 1 );
- aPageRange += OUString( (sal_Unicode)'-');
- aPageRange += OUString::number( nDocPageCount );
+ aPageRange = OUString::number( 1 ) + "-" + OUString::number( nDocPageCount );
}
StringRangeEnumerator aRange( aPageRange, 1, nDocPageCount, 0 );
@@ -1703,24 +1699,24 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields)
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
sal_Int32 n=0;
- aStat[n].Name = OUString("TableCount");
+ aStat[n].Name = "TableCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
- aStat[n].Name = OUString("ImageCount");
+ aStat[n].Name = "ImageCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
- aStat[n].Name = OUString("ObjectCount");
+ aStat[n].Name = "ObjectCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nOLE;
if ( mpDocStat->nPage )
{
- aStat[n].Name = OUString("PageCount");
+ aStat[n].Name = "PageCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nPage;
}
- aStat[n].Name = OUString("ParagraphCount");
+ aStat[n].Name = "ParagraphCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nPara;
- aStat[n].Name = OUString("WordCount");
+ aStat[n].Name = "WordCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nWord;
- aStat[n].Name = OUString("CharacterCount");
+ aStat[n].Name = "CharacterCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nChar;
- aStat[n].Name = OUString("NonWhitespaceCharacterCount");
+ aStat[n].Name = "NonWhitespaceCharacterCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces;
// For e.g. autotext documents there is no pSwgInfo (#i79945)
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index cf611ba..c19ffc3 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -223,7 +223,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
{
if( '.' != sExt[ 0 ] )
{
- sExt = OUString(".") + sExt;
+ sExt = "." + sExt;
}
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 6b992ab..e4f65e3 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1141,7 +1141,7 @@ namespace numfunc
void SwDefBulletConfig::SetToDefault()
{
- msFontname = OUString("OpenSymbol");
+ msFontname = "OpenSymbol";
mbUserDefinedFontname = false;
meFontWeight = WEIGHT_DONTKNOW;
meFontItalic = ITALIC_NONE;
@@ -1162,19 +1162,19 @@ namespace numfunc
{
uno::Sequence<OUString> aPropNames(13);
OUString* pNames = aPropNames.getArray();
- pNames[0] = OUString("BulletFont/FontFamilyname");
- pNames[1] = OUString("BulletFont/FontWeight");
- pNames[2] = OUString("BulletFont/FontItalic");
- pNames[3] = OUString("BulletCharLvl1");
- pNames[4] = OUString("BulletCharLvl2");
- pNames[5] = OUString("BulletCharLvl3");
- pNames[6] = OUString("BulletCharLvl4");
- pNames[7] = OUString("BulletCharLvl5");
- pNames[8] = OUString("BulletCharLvl6");
- pNames[9] = OUString("BulletCharLvl7");
- pNames[10] = OUString("BulletCharLvl8");
- pNames[11] = OUString("BulletCharLvl9");
- pNames[12] = OUString("BulletCharLvl10");
+ pNames[0] = "BulletFont/FontFamilyname";
+ pNames[1] = "BulletFont/FontWeight";
+ pNames[2] = "BulletFont/FontItalic";
+ pNames[3] = "BulletCharLvl1";
+ pNames[4] = "BulletCharLvl2";
+ pNames[5] = "BulletCharLvl3";
+ pNames[6] = "BulletCharLvl4";
+ pNames[7] = "BulletCharLvl5";
+ pNames[8] = "BulletCharLvl6";
+ pNames[9] = "BulletCharLvl7";
+ pNames[10] = "BulletCharLvl8";
+ pNames[11] = "BulletCharLvl9";
+ pNames[12] = "BulletCharLvl10";
return aPropNames;
}
@@ -1344,7 +1344,7 @@ namespace numfunc
{
com::sun::star::uno::Sequence<OUString> aPropNames(1);
OUString* pNames = aPropNames.getArray();
- pNames[0] = OUString("ChangeIndentOnTabAtFirstPosOfFirstListItem");
+ pNames[0] = "ChangeIndentOnTabAtFirstPosOfFirstListItem";
return aPropNames;
}
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 7ad4b57..2fdb442 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -452,7 +452,7 @@ namespace comp_FinalThreadManager {
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< OUString > s(1);
- s[0] = OUString("com.sun.star.util.JobManager");
+ s[0] = "com.sun.star.util.JobManager";
return s;
}
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index 1107dfb..050bd26 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -50,7 +50,7 @@ SwAsyncRetrieveInputStreamThread::~SwAsyncRetrieveInputStreamThread()
void SwAsyncRetrieveInputStreamThread::threadFunction()
{
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 1 );
- xProps[0].Name = OUString("URL");
+ xProps[0].Name = "URL";
xProps[0].Value <<= OUString( mrLinkedURL );
comphelper::MediaDescriptor aMedium( xProps );
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 3f624e0..7d87605 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -555,7 +555,7 @@ sal_Bool SwOLENode::UpdateLinkURL_Impl()
// TODO/LATER: there should be possible to get current mediadescriptor settings from the object
uno::Sequence< beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = OUString( "URL" );
+ aArgs[0].Name = "URL";
aArgs[0].Value <<= aNewLinkURL;
xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() );
@@ -593,7 +593,7 @@ void SwOLENode::BreakFileLink_Impl()
uno::Reference< embed::XLinkageSupport > xLinkSupport( aOLEObj.GetOleRef(), uno::UNO_QUERY_THROW );
xLinkSupport->breakLink( xStorage, aOLEObj.GetCurrentPersistName() );
DisconnectFileLink_Impl();
- maLinkURL = OUString();
+ maLinkURL = "";
}
catch( uno::Exception& )
{
@@ -924,7 +924,7 @@ uno::Sequence< OUString > SwOLELRUCache::GetPropertyNames()
{
Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
- pNames[0] = OUString("Writer/OLE_Objects");
+ pNames[0] = "Writer/OLE_Objects";
return aNames;
}
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index c0b05cb..c440aa0 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -272,7 +272,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText
sal_Bool bTextOnly = sal_True;
OUString aFolderName = GeneratePackageName ( rShort );
OUString aStreamName = aFolderName + ".xml";
- rText = OUString();
+ rText = "";
try
{
@@ -281,7 +281,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText
if ( !xAccess->hasByName( aStreamName ) || !xRoot->isStreamElement( aStreamName ) )
{
bTextOnly = sal_False;
- aStreamName = OUString("content.xml");
+ aStreamName = "content.xml";
}
uno::Reference < io::XStream > xContents = xRoot->openStreamElement( aStreamName, embed::ElementModes::READ );
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 8f66acf..e9476da 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1509,7 +1509,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
if( bFull )
{
// zweiter Versuch, wir kuerzen den String:
- aExpand = OUString("...");
+ aExpand = "...";
bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
if( bFull )
@@ -1584,7 +1584,7 @@ SwErgoSumPortion::SwErgoSumPortion(const OUString &rExp, const OUString& rStr)
aExpand += rStr;
// 7773: sinnvolle Massnahme: ein Blank Abstand zum Text
- aExpand += OUString(' ');
+ aExpand += " ";
SetWhichPor( POR_ERGOSUM );
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index d94ec5d..45c6a6c 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -100,10 +100,10 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId)
aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER;
aRet.push_back( aStartToken );
SwFormToken aSeparatorToken( TOKEN_TEXT );
- aSeparatorToken.sText = OUString(": ");
+ aSeparatorToken.sText = ": ";
aRet.push_back( aSeparatorToken );
SwFormToken aTextToken( TOKEN_TEXT );
- aTextToken.sText = OUString(", ");
+ aTextToken.sText = ", ";
for(sal_uInt16 i = 0; i < 5 ; i++)
{
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 3b89557..cd592eb8 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -200,9 +200,9 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize );
OUString* pProps = aProps.getArray();
- pProps[ 0 ] = OUString("Title");
+ pProps[ 0 ] = "Title";
if( pDateTimeList )
- pProps[ 1 ] = OUString("DateModified");
+ pProps[ 1 ] = "DateModified";
try
{
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 6c441c77..f5c86aa 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1319,7 +1319,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
for (sal_Int32 i = 0; i < nSortedRanges; ++i)
{
if (!aSortedCellRanges.isEmpty())
- aSortedCellRanges += OUString( (sal_Unicode) ';');
+ aSortedCellRanges += ";";
aSortedCellRanges += pSortedRanges[i];
}
@@ -1851,14 +1851,13 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML
if (aCellRange.aTableName != aFirstFoundTable)
throw lang::IllegalArgumentException();
- OUString aTmp( aCellRange.aTableName );
- aTmp += OUString((sal_Unicode) '.');
- aTmp += sw_GetCellName( aCellRange.aUpperLeft.nColumn,
+ OUString aTmp = aCellRange.aTableName + "." +
+ sw_GetCellName( aCellRange.aUpperLeft.nColumn,
aCellRange.aUpperLeft.nRow );
// does cell range consist of more than a single cell?
if (!aCellRange.aLowerRight.bIsEmpty)
{
- aTmp += OUString((sal_Unicode) ':');
+ aTmp += ":";
aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn,
aCellRange.aLowerRight.nRow );
}
@@ -2173,12 +2172,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
OUString aNew;
if (bUseCol)
{
- aRplc = OUString("%COLUMNLETTER");
+ aRplc = "%COLUMNLETTER";
aNew = OUString(aCellName.getStr(), pBuf - aCellName.getStr());
}
else
{
- aRplc = OUString("%ROWNUMBER");
+ aRplc = "%ROWNUMBER";
aNew = OUString(pBuf, (aCellName.getStr() + nLen) - pBuf);
}
aTxt = aTxt.replaceFirst( aRplc, aNew );
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 0705a1c..58f36a2 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1607,7 +1607,7 @@ sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( Runt
Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.text.Bookmarks");
+ aRet[0] = "com.sun.star.text.Bookmarks";
return aRet;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index beb33ef..ef26f6f 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2623,7 +2623,7 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
if( 2 <= nDotCount )
{
// #i51815#
- rName = OUString("DataBase.") + rName;
+ rName = "DataBase." + rName;
nResId = RES_DBFLD;
}
}
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 713f299..35157a2 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1187,7 +1187,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
pGrfObj = new GraphicObject;
pGrfObj->SetUserData( sTmp );
pGrfObj->SetSwapState();
- sGrfName = OUString();
+ sGrfName = "";
}
else if( sTmp.startsWith(sGraphicObjectProtocol) )
{
@@ -1195,7 +1195,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
sTmp.copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
- sGrfName = OUString();
+ sGrfName = "";
}
else
{
@@ -2239,7 +2239,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
pGrfObj = new GraphicObject;
pGrfObj->SetUserData( sGraphicURL );
pGrfObj->SetSwapState();
- sGraphicURL = OUString();
+ sGraphicURL = "";
}
else if( sGraphicURL.startsWith(sGraphicObjectProtocol) )
{
@@ -2247,7 +2247,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
- sGraphicURL = OUString();
+ sGraphicURL = "";
}
}
Graphic aGraphic;
@@ -2318,7 +2318,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if( !aClassName.MakeId( aCLSID ) )
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = OUString("CLSID invalid");
+ aExcept.Message = "CLSID invalid";
throw aExcept;
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 99fe888..2db7aa1 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1416,11 +1416,11 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException)
SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
if (m_pImpl->m_bIsDescriptor)
{
- uRet = OUString(m_pImpl->m_pProps->GetTOXBase().GetTOXName());
+ uRet = m_pImpl->m_pProps->GetTOXBase().GetTOXName();
}
else if(pSectionFmt)
{
- uRet = OUString(pSectionFmt->GetSection()->GetSectionName());
+ uRet = pSectionFmt->GetSection()->GetSectionName();
}
else
{
@@ -1730,7 +1730,7 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException)
SwTOXType *const pType = m_pImpl->GetTOXType();
if (pType && m_pImpl->m_pTOXMark)
{
- sRet = OUString(m_pImpl->m_pTOXMark->GetAlternativeText());
+ sRet = m_pImpl->m_pTOXMark->GetAlternativeText();
}
else if (m_pImpl->m_bIsDescriptor)
{
@@ -2504,8 +2504,7 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException)
if( TOX_CONTENT_SECTION == pSect->GetType() &&
pSect->GetFmt()->GetSectionNode())
{
- pArray[nCnt++] = OUString(
- static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName());
+ pArray[nCnt++] = static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName();
}
}
return aRet;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 0b07b54..6e20bf0 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -3063,7 +3063,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 67f0c71..de3772c 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1341,7 +1341,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 631f75c..192ae5a 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -196,7 +196,7 @@ SwPrintUIOptions::SwPrintUIOptions(
int nIdx = 0;
// load the writer PrinterOptions into the custom tab
- m_aUIProperties[nIdx].Name = OUString("OptionsUIFile");
+ m_aUIProperties[nIdx].Name = "OptionsUIFile";
m_aUIProperties[nIdx++].Value <<= OUString("modules/swriter/ui/printeroptions.ui");
// create "writer" section (new tab page in dialog)
@@ -271,7 +271,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create a bool option for paper tray
bDefaultVal = rDefaultPrintData.IsPaperFromSetup();
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
- aPaperTrayOpt.maGroupHint = OUString( "OptionsPageOptGroup" );
+ aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup";
m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ),
".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox",
"PrintPaperFromSetup",
@@ -280,7 +280,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// print range selection
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
- aPrintRangeOpt.maGroupHint = OUString( "PrintRange" );
+ aPrintRangeOpt.maGroupHint = "PrintRange";
aPrintRangeOpt.mbInternalOnly = sal_True;
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)),
OUString(),
@@ -294,15 +294,15 @@ SwPrintUIOptions::SwPrintUIOptions(
uno::Sequence< OUString > aWidgetIds( 3 );
aChoices[0] = aLocalizedStrings.GetString( 27 );
aChoicesDisabled[0] = sal_False;
- aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" );
+ aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0";
aWidgetIds[0] = "printallpages";
aChoices[1] = aLocalizedStrings.GetString( 28 );
aChoicesDisabled[1] = sal_False;
- aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" );
+ aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1";
aWidgetIds[1] = "printpages";
aChoices[2] = aLocalizedStrings.GetString( 29 );
aChoicesDisabled[2] = sal_Bool(! bHasSelection);
- aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" );
+ aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2";
aWidgetIds[2] = "printselection";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
aHelpIds, aPrintRangeName,
@@ -317,7 +317,7 @@ SwPrintUIOptions::SwPrintUIOptions(
aPageRangeOpt);
// print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
- aContentsOpt.maGroupHint = OUString( "JobPage" );
+ aContentsOpt.maGroupHint = "JobPage";
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)),
OUString(), aContentsOpt);
// create a list box for notes content
@@ -328,8 +328,8 @@ SwPrintUIOptions::SwPrintUIOptions(
aChoices[2] = aLocalizedStrings.GetString( 15 );
aChoices[3] = aLocalizedStrings.GetString( 16 );
aHelpIds.realloc( 2 );
- aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" );
- aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" );
+ aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText";
+ aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox";
vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False );
aAnnotOpt.mbEnabled = bHasPostIts;
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments",
@@ -343,7 +343,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create subsection for Page settings
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
- aPageSetOpt.maGroupHint = OUString( "LayoutPage" );
+ aPageSetOpt.maGroupHint = "LayoutPage";
if (!bWeb)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list