Clean up aEmpty

Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469

4 files changed, 22 insertions, 31 deletions

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;
         }
     }