summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-26 22:24:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-27 08:00:32 +0200
commita6050c32f30796743f9ab9b2a5c793ced9b8f747 (patch)
treea2fa6d05708d1c99414893064adaee56460ac728
parent01ed4bf52db701c4e7824f4a92b5a3afa2a5ca4b (diff)
Clean up aEmpty
Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469
-rw-r--r--basic/source/classes/sb.cxx11
-rw-r--r--cui/source/dialogs/hyphen.cxx5
-rw-r--r--cui/source/dialogs/linkdlg.cxx5
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx13
-rw-r--r--desktop/source/app/officeipcthread.cxx15
-rw-r--r--editeng/source/uno/unofield.cxx3
-rw-r--r--editeng/source/uno/unotext.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx3
-rw-r--r--fpicker/source/office/iodlg.cxx5
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx3
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx3
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--linguistic/source/spelldta.cxx3
-rw-r--r--lotuswordpro/source/filter/lwpbulletstylemgr.cxx8
-rw-r--r--lotuswordpro/source/filter/lwpsilverbullet.cxx21
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx10
-rw-r--r--oox/source/drawingml/shape.cxx3
-rw-r--r--oox/source/ppt/dgmimport.cxx7
-rw-r--r--sc/source/core/data/documen3.cxx3
-rw-r--r--sc/source/core/data/validat.cxx3
-rw-r--r--sc/source/ui/app/inputhdl.cxx5
-rw-r--r--sc/source/ui/docshell/tablink.cxx3
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx5
-rw-r--r--sc/source/ui/undo/undotab.cxx3
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx9
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx6
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx6
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx5
-rw-r--r--sc/source/ui/view/viewfun3.cxx9
-rw-r--r--sc/source/ui/view/viewfun7.cxx6
-rw-r--r--sd/source/core/EffectMigration.cxx3
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx3
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx16
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx5
-rw-r--r--sfx2/source/dialog/templdlg.cxx23
-rw-r--r--sfx2/source/doc/doctempl.cxx9
-rw-r--r--svtools/source/control/inettbc.cxx14
-rw-r--r--svx/source/dialog/passwd.cxx7
-rw-r--r--svx/source/svdraw/svdmodel.cxx9
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx11
-rw-r--r--svx/source/unodraw/unoshape.cxx5
-rw-r--r--xmloff/source/draw/shapeexport.cxx5
42 files changed, 121 insertions, 179 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0fb82bfba764..2dc69d6a2c29 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -415,21 +415,20 @@ SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
{
if( nCreator == SBXCR_SBX )
{
- OUString aEmpty;
switch( nSbxId )
{
case SBXID_BASIC:
return new StarBASIC( NULL );
case SBXID_BASICMOD:
- return new SbModule( aEmpty );
+ return new SbModule( "" );
case SBXID_BASICPROP:
- return new SbProperty( aEmpty, SbxVARIANT, NULL );
+ return new SbProperty( "", SbxVARIANT, NULL );
case SBXID_BASICMETHOD:
- return new SbMethod( aEmpty, SbxVARIANT, NULL );
+ return new SbMethod( "", SbxVARIANT, NULL );
case SBXID_JSCRIPTMOD:
- return new SbJScriptModule( aEmpty );
+ return new SbJScriptModule( "" );
case SBXID_JSCRIPTMETH:
- return new SbJScriptMethod( aEmpty, SbxVARIANT, NULL );
+ return new SbJScriptMethod( "", SbxVARIANT, NULL );
}
}
return NULL;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 1f4185d26381..9b7dd37e194c 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -172,11 +172,10 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
nPos = nIdx == -1 ? 0 : nIdx + 1;
nPos1 = nPos; //save for later use in 2) below
const OUString aTmp( sal_Unicode( HYPH_POS_CHAR ) );
- const OUString aEmpty;
while (nPos != -1)
{
nPos++;
- aTxt = aTxt.replaceFirst( aTmp, aEmpty, &nPos);
+ aTxt = aTxt.replaceFirst( aTmp, "", &nPos);
}
// 2) remove all hyphenation positions from the start that are not considered by the core
@@ -189,7 +188,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
while (nPos != -1)
{
nPos++;
- aLeft = aLeft.replaceFirst( aTmp, aEmpty, &nPos );
+ aLeft = aLeft.replaceFirst( aTmp, "", &nPos );
if (nPos != -1)
++m_nHyphenationPositionsOffset;
}
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 39a753e16b74..d59c11587c57 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -496,9 +496,8 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
m_pPbChangeSource->Disable();
m_pPbBreakLink->Disable();
- OUString aEmpty;
- m_pFtFullSourceName->SetText( aEmpty );
- m_pFtFullTypeName->SetText( aEmpty );
+ m_pFtFullSourceName->SetText( "" );
+ m_pFtFullTypeName->SetText( "" );
}
if( pLinkMgr && pLinkMgr->GetPersist() )
pLinkMgr->GetPersist()->SetModified();
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index ab2285d68555..bd1b07b11d2e 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -117,18 +117,17 @@ IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *,
Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED : m_pPasswdToModifyED;
Edit* pRepeatEdit = !bToOpenMatch? m_pReenterPasswdToOpenED : m_pReenterPasswdToModifyED;
- OUString aEmpty;
if (nMismatch == 1)
{
- pEdit->SetText( aEmpty );
- pRepeatEdit->SetText( aEmpty );
+ pEdit->SetText( "" );
+ pRepeatEdit->SetText( "" );
}
else if (nMismatch == 2)
{
- m_pPasswdToOpenED->SetText( aEmpty );
- m_pReenterPasswdToOpenED->SetText( aEmpty );
- m_pPasswdToModifyED->SetText( aEmpty );
- m_pReenterPasswdToModifyED->SetText( aEmpty );
+ m_pPasswdToOpenED->SetText( "" );
+ m_pReenterPasswdToOpenED->SetText( "" );
+ m_pPasswdToModifyED->SetText( "" );
+ m_pReenterPasswdToModifyED->SetText( "" );
}
pEdit->GrabFocus();
}
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 71fcfc3c9921..c406336bbb86 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1066,16 +1066,15 @@ bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest
static DispatchWatcher::DispatchList aDispatchList;
- OUString aEmpty;
// Create dispatch list for dispatch watcher
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList, DispatchWatcher::REQUEST_OPEN, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aViewList, DispatchWatcher::REQUEST_VIEW, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aStartList, DispatchWatcher::REQUEST_START, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintList, DispatchWatcher::REQUEST_PRINT, aEmpty, aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList, DispatchWatcher::REQUEST_OPEN, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aViewList, DispatchWatcher::REQUEST_VIEW, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aStartList, DispatchWatcher::REQUEST_START, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintList, DispatchWatcher::REQUEST_PRINT, "", aRequest.aModule );
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintToList, DispatchWatcher::REQUEST_PRINTTO, aRequest.aPrinterName, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, aEmpty, aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, "", aRequest.aModule );
+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, "", aRequest.aModule );
AddConversionsToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aConversionList, aRequest.aConversionParams, aRequest.aPrinterName, aRequest.aModule, aRequest.aConversionOut, aRequest.bTextCat );
bool bShutdown( false );
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index dd6bf4371947..31a32877a8c9 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -453,7 +453,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
OUString aContent;
OUString aFirstName;
OUString aLastName;
- OUString aEmpty;
// do we have CurrentPresentation given?
// mimic behaviour of writer, which means:
@@ -476,7 +475,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
}
// #92009# pass fixed attribute to constructor
- pData = new SvxAuthorField( aFirstName, aLastName, aEmpty,
+ pData = new SvxAuthorField( aFirstName, aLastName, "",
mpImpl->mbBoolean1 ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR );
if( !mpImpl->mbBoolean2 )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 7b35d6e721d3..b008c433fe69 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -377,8 +377,7 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString()
}
else
{
- const OUString aEmpty;
- return aEmpty;
+ return "";
}
}
@@ -1864,8 +1863,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
if( bAbsorb )
{
- const OUString aEmpty;
- pForwarder->QuickInsertText( aEmpty, aRange );
+ pForwarder->QuickInsertText( "", aRange );
aRange.nEndPos = aRange.nStartPos;
aRange.nEndPara = aRange.nStartPara;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 693e37f27d48..c05c7ae050b4 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -131,8 +131,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox* rURLBox, const OUString& rURL )
else
{
rURLBox->SetBaseURL( sInstPath );
- OUString aEmpty;
- rURLBox->SetText( aEmpty );
+ rURLBox->SetText( "" );
}
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6b875793a8e9..156d103142d7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2268,7 +2268,6 @@ std::vector<OUString> SvtFileDialog::GetPathList() const
bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter )
{
- OUString aEmpty;
OUString aReversePath = comphelper::string::reverseString(rPath);
sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' );
sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD );
@@ -2284,7 +2283,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilt
nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos );
}
- rFilter = aEmpty;
+ rFilter.clear();
if ( nWildCardPos != -1 )
{
@@ -2331,7 +2330,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilt
else
{
rFilter = rPath;
- rPath = aEmpty;
+ rPath.clear();
}
}
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 54f30690767a..08d947e3a17a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -348,11 +348,10 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
rRequest->getArgumentOrDefault(PROP_FILTER_GROUP, css::uno::Sequence< css::beans::StringPair >());
// SYNCHRONIZED->
- OUString aEmpty;
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( m_lFilters.numFilter() > 0 && aFilterGroup.getLength() > 0 )
- m_lFilters.addFilter( STRING_SEPARATOR, aEmpty, sal_True );
+ m_lFilters.addFilter( STRING_SEPARATOR, "", sal_True );
::sal_Int32 c = aFilterGroup.getLength();
::sal_Int32 i = 0;
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 71176480a40a..70229e9357c1 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -156,7 +156,6 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) th
// find new font name and set check mark!
sal_uInt16 nChecked = 0;
sal_uInt16 nItemCount = m_xPopupMenu->getItemCount();
- OUString aEmpty;
for( sal_uInt16 i = 0; i < nItemCount; i++ )
{
sal_uInt16 nItemId = m_xPopupMenu->getItemId( i );
@@ -169,7 +168,7 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) th
// TODO: must be replaced by implementation of VCL, when available
sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' );
if ( nIndex >= 0 )
- aText = aText.replaceAt( nIndex, 1, aEmpty );
+ aText = aText.replaceAt( nIndex, 1, "" );
// TODO: must be replaced by implementation of VCL, when available
if ( aText == m_aFontFamilyName )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 946571eaa378..421cb05213a1 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1150,7 +1150,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
framework::AddonMenuManager::MergeAddonHelpMenu( rFrame, static_cast<MenuBar *>(pMenu), m_xContext );
}
- OUString aEmpty;
bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
sal_uInt16 nItemCount = pMenu->GetItemCount();
OUString aItemCommand;
@@ -1190,7 +1189,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if (!pMenu->GetHelpCommand(nItemId).isEmpty())
{
aModuleIdentifier = pMenu->GetHelpCommand( nItemId );
- pMenu->SetHelpCommand( nItemId, aEmpty );
+ pMenu->SetHelpCommand( nItemId, "" );
}
if ( m_xPopupMenuControllerFactory.is() &&
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index f1d5d7b00023..34c931290578 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -110,7 +110,6 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
Reference< XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage )
{
- static const OUString aEmpty;
bool bSthRemoved = false;
sal_Int32 nLen = rSeq.getLength();
OUString *pEntries = rSeq.getArray();
@@ -120,7 +119,7 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
pEntries[i], nLanguage, false, true ) );
if (xNegEntry.is())
{
- pEntries[i] = aEmpty;
+ pEntries[i].clear();
bSthRemoved = true;
}
}
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 2c7a86e7e7ec..34f9c563e9ca 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -100,25 +100,23 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr()
OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
LwpIndentOverride* pIndent)
{
- OUString aEmpty;
-
if(!pPara || !pIndent || !pBullOver)
{
- return aEmpty;
+ return "";
}
LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
if (!pSilverBullet)
{
assert(false);
- return aEmpty;
+ return "";
}
LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
if (!pBulletPara)
{
assert(false);
- return aEmpty;
+ return "";
}
LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 3ae7567bda38..a695c9001644 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -189,12 +189,10 @@ void LwpSilverBullet::RegisterStyle()
*/
OUString LwpSilverBullet::GetBulletFontName()
{
- OUString aEmpty;
-
//foundry has been set?
if (!m_pFoundry)
{
- return aEmpty;
+ return "";
}
LwpFontManager& rFontMgr = m_pFoundry->GetFontManger();
@@ -205,7 +203,7 @@ OUString LwpSilverBullet::GetBulletFontName()
//final fontid is valid?
if (nFinalFont > 255 || nFinalFont == 0)
{
- return aEmpty;
+ return "";
}
//get font name from font manager.
@@ -251,12 +249,10 @@ LwpPara* LwpSilverBullet::GetBulletPara()
*/
OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
{
- OUString aEmpty;
-
if (!pParaNumber)
{
assert(false);
- return aEmpty;
+ return "";
}
OUString strNumChar("1");
@@ -303,7 +299,7 @@ OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
}
break;
case NUMCHAR_none:
- strNumChar = aEmpty;
+ strNumChar.clear();
break;
default:
break;
@@ -359,7 +355,7 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos)
*/
OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
{
- OUString aRet, aEmpty;
+ OUString aRet;
sal_uInt16 nHideBit = (1 << nPos);
bool bDivisionName = false;
bool bSectionName = false;
@@ -367,7 +363,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
LwpFrib* pParaFrib = m_pBulletPara->GetFribs().GetFribs();
if (!pParaFrib)
{
- return aEmpty;
+ return "";
}
while (pParaFrib)
@@ -377,7 +373,7 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
ModifierInfo* pMoInfo = pParaFrib->GetModifiers();
if (!pMoInfo)
{
- return aEmpty;
+ return "";
}
sal_uInt16 nHideLevels = pMoInfo->aTxtAttrOverride.GetHideLevels();
sal_uInt16 nType = static_cast<LwpFribDocVar*>(pParaFrib)->GetType();
@@ -435,11 +431,10 @@ OUString LwpSilverBullet::GetDivisionName()
OUString LwpSilverBullet::GetSectionName()
{
- OUString aEmpty;
LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY).get());
if (!pStory)
{
- return aEmpty;
+ return "";
}
return pStory->GetSectionName();
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 5618be859e85..ef8b3896df03 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -500,15 +500,13 @@ void loadDiagram( const ShapePtr& pShape,
DiagramLayoutPtr pLayout( new DiagramLayout() );
pDiagram->setLayout( pLayout );
- OUString aEmpty;
-
// data
if( rXDataModelDom.is() )
importFragment(rFilter,
rXDataModelDom,
"OOXData",
pDiagram,
- new DiagramDataFragmentHandler( rFilter, aEmpty, pData ));
+ new DiagramDataFragmentHandler( rFilter, "", pData ));
// layout
if( rXLayoutDom.is() )
@@ -516,7 +514,7 @@ void loadDiagram( const ShapePtr& pShape,
rXLayoutDom,
"OOXLayout",
pDiagram,
- new DiagramLayoutFragmentHandler( rFilter, aEmpty, pLayout ));
+ new DiagramLayoutFragmentHandler( rFilter, "", pLayout ));
// style
if( rXQStyleDom.is() )
@@ -524,7 +522,7 @@ void loadDiagram( const ShapePtr& pShape,
rXQStyleDom,
"OOXStyle",
pDiagram,
- new DiagramQStylesFragmentHandler( rFilter, aEmpty, pDiagram->getStyles() ));
+ new DiagramQStylesFragmentHandler( rFilter, "", pDiagram->getStyles() ));
// colors
if( rXColorStyleDom.is() )
@@ -532,7 +530,7 @@ void loadDiagram( const ShapePtr& pShape,
rXColorStyleDom,
"OOXColor",
pDiagram,
- new ColorFragmentHandler( rFilter, aEmpty, pDiagram->getColors() ));
+ new ColorFragmentHandler( rFilter, "", pDiagram->getColors() ));
// diagram loaded. now lump together & attach to shape
pDiagram->addTo(pShape);
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f4e2e41cb730..ec57a0cf1b65 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -581,8 +581,7 @@ Reference< XShape > Shape::createAndInsert(
uno::Reference< text::XText > xText( mxShape, uno::UNO_QUERY );
if ( xText.is() )
{
- OUString aEmpty;
- xText->setString( aEmpty );
+ xText->setString( "" );
}
}
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 4cf8b2b0b62c..1e70c4275d27 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -62,7 +62,6 @@ bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException,
file:///<path-to-oox-module>/source/dump/pptxdumper.ini. */
OOX_DUMP_FILE( ::oox::dump::pptx::Dumper );
- OUString aEmpty;
OUString aFragmentPath = getFragmentPathFromFirstTypeFromOfficeDoc( "diagramLayout" );
Reference<drawing::XShapes> xParentShape(getParentShape(),
@@ -71,10 +70,10 @@ bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException,
new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) );
drawingml::loadDiagram(pShape,
*this,
- aEmpty,
+ "",
aFragmentPath,
- aEmpty,
- aEmpty);
+ "",
+ "");
oox::drawingml::ThemePtr pTheme(
new oox::drawingml::Theme());
basegfx::B2DHomMatrix aMatrix;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 2353e91f17bd..2b8dc9afa57c 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1947,7 +1947,6 @@ void ScDocument::SetExtDocOptions( ScExtDocOptions* pNewOptions )
void ScDocument::DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow )
{
- OUString aEmpty;
OUStringBuffer aTotal;
OUString aCellStr;
SCCOL nCol;
@@ -1963,7 +1962,7 @@ void ScDocument::DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
aTotal.append(aCellStr);
}
if (nCol != nStartCol || nRow != nStartRow)
- SetString(nCol,nRow,nTab,aEmpty);
+ SetString(nCol,nRow,nTab,"");
}
SetString(nStartCol,nStartRow,nTab,aTotal.makeStringAndClear());
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index bb19d024f4f1..42d06a623edf 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -125,8 +125,7 @@ ScValidationData::~ScValidationData()
bool ScValidationData::IsEmpty() const
{
- OUString aEmpty;
- ScValidationData aDefault( SC_VALID_ANY, SC_COND_EQUAL, aEmpty, aEmpty, GetDocument(), ScAddress() );
+ ScValidationData aDefault( SC_VALID_ANY, SC_COND_EQUAL, "", "", GetDocument(), ScAddress() );
return EqualEntries( aDefault );
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f1b18377234a..777c8b8fc7e6 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2991,15 +2991,14 @@ void ScInputHandler::ClearText()
DataChanging(); // Cannot be new
- OUString aEmpty;
if (pTableView)
{
- pTableView->GetEditEngine()->SetText( aEmpty );
+ pTableView->GetEditEngine()->SetText( "" );
pTableView->SetSelection( ESelection(0,0, 0,0) );
}
if (pTopView)
{
- pTopView->GetEditEngine()->SetText( aEmpty );
+ pTopView->GetEditEngine()->SetText( "" );
pTopView->SetSelection( ESelection(0,0, 0,0) );
}
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 742b79a24a0c..3239b5a97c6f 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -97,12 +97,11 @@ ScTableLink::~ScTableLink()
// Verbindung aufheben
StopRefreshTimer();
- OUString aEmpty;
ScDocument& rDoc = pImpl->m_pDocSh->GetDocument();
SCTAB nCount = rDoc.GetTableCount();
for (SCTAB nTab=0; nTab<nCount; nTab++)
if (rDoc.IsLinked(nTab) && aFileName.equals(rDoc.GetLinkDoc(nTab)))
- rDoc.SetLink( nTab, SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty, 0 );
+ rDoc.SetLink( nTab, SC_LINK_NONE, "", "", "", "", 0 );
delete pImpl;
}
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 0c94d8b3c7fa..7670949fa3d8 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -106,14 +106,13 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
//sal_Int8 nAction(DND_ACTION_MOVE);
//Point aPos;
const OUString aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
- const OUString aEmpty;
SdrObject* pResult = pDrawView->ApplyGraphicToObject(
*pPickObj,
rGraphic,
aBeginUndo,
- bAsLink ? rFileName : aEmpty,
- bAsLink ? rFilterName : aEmpty);
+ bAsLink ? rFileName : OUString(),
+ bAsLink ? rFilterName : OUString());
if(pResult)
{
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index e6acdbd6f9d1..f18acd2af3e8 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1086,12 +1086,11 @@ OUString ScUndoRemoveLink::GetComment() const
void ScUndoRemoveLink::DoChange( bool bLink ) const
{
ScDocument& rDoc = pDocShell->GetDocument();
- OUString aEmpty;
for (sal_uInt16 i=0; i<nCount; i++)
if (bLink) // establish link
rDoc.SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay );
else // remove link
- rDoc.SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty, 0 );
+ rDoc.SetLink( pTabs[i], SC_LINK_NONE, "", "", "", "", 0 );
pDocShell->UpdateLinks();
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 7895ef94179a..a2c83b4b37de 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7588,8 +7588,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode )
OUString aUrl(getLinkUrl());
OUString aSheet(getLinkSheetName());
- OUString aEmpty;
- link( aUrl, aSheet, aEmpty, aEmpty, nLinkMode );
+ link( aUrl, aSheet, "", "", nLinkMode );
}
OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std::exception)
@@ -7612,8 +7611,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl )
sheet::SheetLinkMode eMode = getLinkMode();
OUString aSheet(getLinkSheetName());
- OUString aEmpty;
- link( aLinkUrl, aSheet, aEmpty, aEmpty, eMode );
+ link( aLinkUrl, aSheet, "", "", eMode );
}
OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException, std::exception)
@@ -7636,8 +7634,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName
sheet::SheetLinkMode eMode = getLinkMode();
OUString aUrl(getLinkUrl());
- OUString aEmpty;
- link( aUrl, aLinkSheetName, aEmpty, aEmpty, eMode );
+ link( aUrl, aLinkSheetName, "", "", eMode );
}
void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName,
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5373bf812308..f99622c346a0 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1999,7 +1999,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
OUString aNewLabel;
OUString aOldValues;
OUString aNewValues;
- OUString aEmpty;
for( sal_Int32 nNewIndex = 0; nNewIndex < aNewSequences.getLength(); nNewIndex++ )
{
@@ -2010,7 +2009,10 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( xOld.is() && xNew.is() )
{
- aOldLabel = aNewLabel = aOldValues = aNewValues = aEmpty;
+ aOldLabel.clear();
+ aNewLabel.clear();
+ aOldValues.clear();
+ aNewValues.clear();
if( xOld.is() && xOld->getLabel().is() )
aOldLabel = xOld->getLabel()->getSourceRangeRepresentation();
if( xNew.is() && xNew->getLabel().is() )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 715cec1cacd5..fa9d99d14686 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -828,8 +828,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp
OUString aStrVal;
if ( aValue >>= aStrVal )
{
- OUString aEmpty;
- ScDPServiceDesc aServiceDesc(aEmpty, aEmpty, aEmpty, aEmpty, aEmpty);
+ ScDPServiceDesc aServiceDesc("", "", "", "", "");
const ScDPServiceDesc* pOldDesc = pDPObject->GetDPServiceDesc();
if (pOldDesc)
@@ -845,8 +844,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp
uno::Sequence<beans::PropertyValue> aArgSeq;
if ( aValue >>= aArgSeq )
{
- OUString aEmpty;
- ScDPServiceDesc aServiceDesc(aEmpty, aEmpty, aEmpty, aEmpty, aEmpty);
+ ScDPServiceDesc aServiceDesc("", "", "", "", "");
const ScDPServiceDesc* pOldDesc = pDPObject->GetDPServiceDesc();
if (pOldDesc)
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index d0d694daaf07..b351694636e3 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -256,9 +256,8 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport
{
// descriptor has to be complete anyway
- OUString aEmpty;
- aDescriptor[svx::daDataSource] <<= aEmpty;
- aDescriptor[svx::daCommand] <<= aEmpty;
+ aDescriptor[svx::daDataSource] <<= OUString();
+ aDescriptor[svx::daCommand] <<= OUString();
aDescriptor[svx::daCommandType] <<= (sal_Int32)sdb::CommandType::TABLE;
}
rEvent.State <<= aDescriptor.createPropertyValueSequence();
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d994e2b2a6fb..e6227831651b 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -754,10 +754,9 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
ReadGraphic( *xStm, aGraphic );
- const OUString aEmpty;
const OUString aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, aGraphic, aBeginUndo, aEmpty, aEmpty ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, aGraphic, aBeginUndo, "", "" ))
{
return true;
}
@@ -770,10 +769,9 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
if( pScDrawView && aDataHelper.GetGDIMetaFile( SotClipboardFormatId::GDIMETAFILE, aMtf ) )
{
- const OUString aEmpty;
const OUString aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aMtf), aBeginUndo, aEmpty, aEmpty ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aMtf), aBeginUndo, "", "" ))
{
return true;
}
@@ -786,10 +784,9 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
if( pScDrawView && aDataHelper.GetBitmapEx( SotClipboardFormatId::BITMAP, aBmpEx ) )
{
- const OUString aEmpty;
const OUString aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aBmpEx), aBeginUndo, aEmpty, aEmpty ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aBmpEx), aBeginUndo, "", "" ))
{
return true;
}
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 311924e60d89..3bed5d9e9faa 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -365,16 +365,14 @@ bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
bool ScViewFunc::PasteBitmapEx( const Point& rPos, const BitmapEx& rBmpEx )
{
- OUString aEmpty;
Graphic aGraphic(rBmpEx);
- return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
+ return PasteGraphic( rPos, aGraphic, "", "" );
}
bool ScViewFunc::PasteMetaFile( const Point& rPos, const GDIMetaFile& rMtf )
{
- OUString aEmpty;
Graphic aGraphic(rMtf);
- return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
+ return PasteGraphic( rPos, aGraphic, "", "" );
}
bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index abfa32106465..4261b7e78d41 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -644,10 +644,9 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
}
else
{
- OUString aEmpty;
CustomAnimationPresetPtr pShapePreset( rPresets.getEffectDescriptor( "ooo-entrance-appear" ) );
- Reference< XAnimationNode > xNode( pPreset->create( aEmpty ) );
+ Reference< XAnimationNode > xNode( pPreset->create( "" ) );
DBG_ASSERT( xNode.is(), "EffectMigration::SetTextAnimationEffect(), could not create preset!" );
if( xNode.is() )
{
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 3783d7e85008..d63bc65c254e 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -659,8 +659,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
if( (nNodeType == AnimationNodeType::ANIMATEMOTION) ||
(nNodeType == AnimationNodeType::ANIMATETRANSFORM) )
{
- OUString aEmpty;
- aAttributeName = aEmpty;
+ aAttributeName.clear();
}
else
{
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 55b0d5bae421..059f94732f22 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -191,8 +191,6 @@ static HMENU createSystrayMenu( )
{ SvtModuleOptions::EModule::MATH, IDM_MATH, ICON_MATH_DOCUMENT, MATH_URL },
};
- OUString aEmpty;
-
// insert the menu entries for launching the applications
for ( size_t i = 0; i < sizeof( aMenuItems ) / sizeof( aMenuItems[0] ); ++i )
{
@@ -208,21 +206,21 @@ static HMENU createSystrayMenu( )
continue;
addMenuItem( hMenu, aMenuItems[i].nMenuItemID, aMenuItems[i].nMenuIconID,
- pShutdownIcon->GetUrlDescription( sURL ), pos, true, aEmpty );
+ pShutdownIcon->GetUrlDescription( sURL ), pos, true, "" );
}
// insert the remaining menu entries
addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE,
- pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, aEmpty);
- addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
+ pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, "");
+ addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
addMenuItem( hMenu, IDM_OPEN, ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, OUString("SHELL32"));
- addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
+ addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
#endif
- addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, aEmpty );
- addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
- addMenuItem( hMenu, IDM_EXIT, 0, pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ), pos, false, aEmpty );
+ addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, "" );
+ addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
+ addMenuItem( hMenu, IDM_EXIT, 0, pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ), pos, false, "" );
// indicate status of autostart folder
CheckMenuItem( hMenu, IDM_INSTALL, MF_BYCOMMAND | (ShutdownIcon::GetAutostart() ? MF_CHECKED : MF_UNCHECKED) );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 408a34346491..43fd167fbe6e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -840,9 +840,8 @@ IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void)
DateTime now( DateTime::SYSTEM );
util::DateTime uDT( now.GetUNODateTime() );
m_pCreateValFt->SetText( ConvertDateTime_Impl( aName, uDT, rLocaleWrapper ) );
- OUString aEmpty;
- m_pChangeValFt->SetText( aEmpty );
- m_pPrintValFt->SetText( aEmpty );
+ m_pChangeValFt->SetText( "" );
+ m_pPrintValFt->SetText( "" );
const tools::Time aTime( 0 );
m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aTime ) );
m_pDocNoValFt->SetText(OUString('1'));
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ffc5674bc61d..ba176f00cce7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -879,14 +879,13 @@ void SfxCommonTemplateDialog_Impl::Initialize()
SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
{
- OUString aEmpty;
#if defined STYLESPREVIEW
Execute_Impl(SID_STYLE_END_PREVIEW,
OUString(), OUString(),
0, 0, 0, 0 );
#endif
if ( bIsWater )
- Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
+ Execute_Impl(SID_STYLE_WATERCAN, "", "", 0);
GetWindow()->Hide();
impl_clear();
if ( pStyleSheetPool )
@@ -1732,7 +1731,6 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
{
- OUString aEmpty;
switch(nEntry)
{
case SID_STYLE_WATERCAN:
@@ -1746,13 +1744,13 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
const OUString aTemplName(
GetSelectedEntry());
Execute_Impl(
- SID_STYLE_WATERCAN, aTemplName, aEmpty,
+ SID_STYLE_WATERCAN, aTemplName, "",
(sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
bCheck = true;
}
else
{
- Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
+ Execute_Impl(SID_STYLE_WATERCAN, "", "", 0);
bCheck = false;
}
CheckItem(nEntry, bCheck);
@@ -1784,7 +1782,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
pStyleSheetPool->SetSearchMask(eFam, nFilter);
const OUString aTemplName(pDlg->GetName());
Execute_Impl(SID_STYLE_NEW_BY_EXAMPLE,
- aTemplName, aEmpty,
+ aTemplName, "",
(sal_uInt16)GetFamilyItem_Impl()->GetFamily(),
nFilter);
}
@@ -1795,7 +1793,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
case SID_STYLE_UPDATE_BY_EXAMPLE:
{
Execute_Impl(SID_STYLE_UPDATE_BY_EXAMPLE,
- aEmpty, aEmpty,
+ "", "",
(sal_uInt16)GetFamilyItem_Impl()->GetFamily());
break;
}
@@ -1880,7 +1878,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox
// Handler for the New-Buttons
void SfxCommonTemplateDialog_Impl::NewHdl(void *)
{
- OUString aEmpty;
if ( nActFamily != 0xffff && (pTreeBox || aFmtLb->GetSelectionCount() <= 1))
{
vcl::Window* pTmp;
@@ -1905,7 +1902,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
pStyleSheetPool->SetSearchMask(eFam,nMask);
Execute_Impl(SID_STYLE_NEW,
- aEmpty, GetSelectedEntry(),
+ "", GetSelectedEntry(),
( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
nMask);
@@ -2120,11 +2117,10 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
// only if that region is allowed
0 != pFamilyState[nActFamily-1] && (pTreeBox || aFmtLb->GetSelectionCount() <= 1) )
{
- OUString aEmpty;
Execute_Impl(SID_STYLE_WATERCAN,
- aEmpty, aEmpty, 0);
+ "", "", 0);
Execute_Impl(SID_STYLE_WATERCAN,
- GetSelectedEntry(), aEmpty,
+ GetSelectedEntry(), "",
( sal_uInt16 )GetFamilyItem_Impl()->GetFamily());
}
EnableItem(SID_STYLE_WATERCAN, !bWaterDisabled);
@@ -2415,12 +2411,11 @@ Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck)
{
- OUString aEmpty;
switch(nMesId)
{
case SID_STYLE_WATERCAN :
if(!bCheck && IsCheckedItem(SID_STYLE_WATERCAN))
- Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
+ Execute_Impl(SID_STYLE_WATERCAN, "", "", 0);
//fall-through
case SID_STYLE_NEW_BY_EXAMPLE:
case SID_STYLE_UPDATE_BY_EXAMPLE:
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index b3a1dd0b5c8f..ade4fa4a1684 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1059,7 +1059,6 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s
return false;
uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
- OUString aEmpty;
if ( nIdx == USHRT_MAX )
{
@@ -1070,8 +1069,8 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s
if ( xTemplates->renameGroup( pRegion->GetTitle(), rName ) )
{
pRegion->SetTitle( rName );
- pRegion->SetTargetURL( aEmpty );
- pRegion->SetHierarchyURL( aEmpty );
+ pRegion->SetTargetURL( "" );
+ pRegion->SetHierarchyURL( "" );
return true;
}
}
@@ -1090,8 +1089,8 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s
rName ) )
{
pEntry->SetTitle( rName );
- pEntry->SetTargetURL( aEmpty );
- pEntry->SetHierarchyURL( aEmpty );
+ pEntry->SetTargetURL( "" );
+ pEntry->SetHierarchyURL( "" );
return true;
}
}
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index c0753a61047a..cd04a853279c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -694,7 +694,7 @@ void SvtMatchContext_Impl::doExecute()
bool bFull = false;
INetURLObject aCurObj;
- OUString aEmpty, aCurString, aCurMainURL;
+ OUString aCurString, aCurMainURL;
INetURLObject aObj;
aObj.SetSmartProtocol( eSmartProt == INetProtocol::NotValid ? INetProtocol::Http : eSmartProt );
for( ;; )
@@ -735,9 +735,9 @@ void SvtMatchContext_Impl::doExecute()
aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
else
{
- aCurObj.SetMark( aEmpty );
- aCurObj.SetParam( aEmpty );
- aCurObj.SetURLPath( aEmpty );
+ aCurObj.SetMark( "" );
+ aCurObj.SetParam( "" );
+ aCurObj.SetURLPath( "" );
aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
}
@@ -754,9 +754,9 @@ void SvtMatchContext_Impl::doExecute()
aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
else
{
- aCurObj.SetMark( aEmpty );
- aCurObj.SetParam( aEmpty );
- aCurObj.SetURLPath( aEmpty );
+ aCurObj.SetMark( "" );
+ aCurObj.SetParam( "" );
+ aCurObj.SetURLPath( "" );
aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
}
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index ebb736cdbfbe..bca9ea1bc39c 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -27,13 +27,12 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void)
{
bool bOK = true;
short nRet = RET_OK;
- OUString aEmpty;
if ( m_pNewPasswdED->GetText() != m_pRepeatPasswdED->GetText() )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, aRepeatPasswdErrStr)->Execute();
- m_pNewPasswdED->SetText( aEmpty );
- m_pRepeatPasswdED->SetText( aEmpty );
+ m_pNewPasswdED->SetText( "" );
+ m_pRepeatPasswdED->SetText( "" );
m_pNewPasswdED->GrabFocus();
bOK = false;
}
@@ -41,7 +40,7 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void)
if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, aOldPasswdErrStr)->Execute();
- m_pOldPasswdED->SetText( aEmpty );
+ m_pOldPasswdED->SetText( "" );
m_pOldPasswdED->GrabFocus();
bOK = false;
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ff9004e7cba1..5478cdc43d93 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -479,8 +479,7 @@ void SdrModel::BegUndo()
{
if( mpImpl->mpUndoManager )
{
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction(aEmpty,aEmpty);
+ mpImpl->mpUndoManager->EnterListAction("","");
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -501,8 +500,7 @@ void SdrModel::BegUndo(const OUString& rComment)
{
if( mpImpl->mpUndoManager )
{
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction( rComment, aEmpty );
+ mpImpl->mpUndoManager->EnterListAction( rComment, "" );
nUndoLevel++;
}
else if( IsUndoEnabled() )
@@ -524,8 +522,7 @@ void SdrModel::BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrR
{
aComment = aComment.replaceFirst("%1", rObjDescr);
}
- const OUString aEmpty;
- mpImpl->mpUndoManager->EnterListAction( aComment,aEmpty );
+ mpImpl->mpUndoManager->EnterListAction( aComment,"" );
nUndoLevel++;
}
else if( IsUndoEnabled() )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 0582dc24cf31..80575617116b 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -347,12 +347,11 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
{
SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
- OUString aEmpty;
- appendEntry(0, aEmpty, maImgDepth0);
- appendEntry(1, aEmpty, maImgDepth1);
- appendEntry(2, aEmpty, maImgDepth2);
- appendEntry(3, aEmpty, maImgDepth3);
- appendEntry(4, aEmpty, maImgDepth4);
+ appendEntry(0, "", maImgDepth0);
+ appendEntry(1, "", maImgDepth1);
+ appendEntry(2, "", maImgDepth2);
+ appendEntry(3, "", maImgDepth3);
+ appendEntry(4, "", maImgDepth4);
appendEntry(5, SVX_RESSTR(RID_SVXSTR_INFINITY), maImgDepthInfinity);
appendEntry(6, SVX_RESSTR(RID_SVXSTR_CUSTOM));
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index bea3c9c49d7f..35423a2f8b80 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1581,12 +1581,11 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
case XATTR_LINEEND:
case XATTR_LINESTART:
{
- const OUString aEmpty;
const basegfx::B2DPolyPolygon aEmptyPoly;
if( nWID == XATTR_LINEEND )
- rSet.Put( XLineEndItem( aEmpty, aEmptyPoly ) );
+ rSet.Put( XLineEndItem( "", aEmptyPoly ) );
else
- rSet.Put( XLineStartItem( aEmpty, aEmptyPoly ) );
+ rSet.Put( XLineStartItem( "", aEmptyPoly ) );
return true;
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 96b673d3755b..7ed11ef9df45 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -484,12 +484,11 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
if( nCount )
{
- const OUString aEmpty;
- aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, aEmpty, xPropStates );
+ aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates );
if(aShapeInfo.msTextStyleName.isEmpty())
{
// Style did not exist, add it to AutoStalePool
- aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, aEmpty, xPropStates);
+ aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates);
}
}
}