Clean up aEmptyStr

Change-Id: I5befe9deac917a28e80ed193b67ff29b5ba35149

8 files changed, 15 insertions, 19 deletions

diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index f0a59f62ca90..4ef4f2cf4e72 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -124,12 +124,12 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
         pOL->SetUpdateMode(false);
 
         // remove old selected text
-        pOV->InsertText( aEmptyStr );
+        pOV->InsertText( "" );
 
         // prepare undo
         ::svl::IUndoManager& rUndoMgr =  pOL->GetUndoManager();
         rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
-                                    aEmptyStr );
+                                    "" );
 
         // insert given text
         OUString aStr( cMark );
@@ -250,14 +250,14 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
                With that, we get unique attributes (and since there is no
                DeleteSelected() in OutlinerView, it is deleted by inserting an
                empty string). */
-            pOV->InsertText( aEmptyStr );
+            pOV->InsertText( "" );
 
             SfxItemSet aOldSet( mpDoc->GetPool(), EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, 0 );
             aOldSet.Put( pOV->GetAttribs() );
 
             ::svl::IUndoManager& rUndoMgr =  pOL->GetUndoManager();
             rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
-                                     aEmptyStr );
+                                     "" );
             pOV->InsertText(aChars, true);
 
             // set attributes (set font)
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index c4689548566b..2d3c5325af09 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -231,7 +231,7 @@ void FuInsertClipboard::DoExecute( SfxRequest&  )
                 ( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) )
             {
                 DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell);
-                INetBookmark        aINetBookmark( aEmptyStr, aEmptyStr );
+                INetBookmark        aINetBookmark( "", "" );
 
                 if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
                     aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -240,7 +240,7 @@ void FuInsertClipboard::DoExecute( SfxRequest&  )
                     ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                     aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                 {
-                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
                 }
             }
         }
@@ -412,7 +412,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
         else
         {
             ErrorHandler::HandleError(* new StringErrorInfo(ERRCODE_SFX_OLEGENERAL,
-                                        aEmptyStr ) );
+                                        "" ) );
         }
     }
     else
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 2e47df4e6f9a..6eac885048d3 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -411,7 +411,7 @@ void FuMorph::ImpInsertPolygons(
             if ( bLineColor )
             {
                 const basegfx::BColor aLineColor(basegfx::interpolate(aStartLineCol.getBColor(), aEndLineCol.getBColor(), fFactor));
-                aSet.Put( XLineColorItem( aEmptyStr, Color(aLineColor)));
+                aSet.Put( XLineColorItem( "", Color(aLineColor)));
             }
             else if ( bIgnoreLine )
                 aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
@@ -420,7 +420,7 @@ void FuMorph::ImpInsertPolygons(
             if ( bFillColor )
             {
                 const basegfx::BColor aFillColor(basegfx::interpolate(aStartFillCol.getBColor(), aEndFillCol.getBColor(), fFactor));
-                aSet.Put( XFillColorItem( aEmptyStr, Color(aFillColor)));
+                aSet.Put( XFillColorItem( "", Color(aFillColor)));
             }
             else if ( bIgnoreFill )
                 aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index c710bd57817f..51da996c5848 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -50,8 +50,6 @@ namespace embed {
 
 namespace sd {
 
-extern const OUString aEmptyStr;
-
 class DrawDocShell;
 class FrameView;
 class LayerTabBar;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 0136d122b91b..43dab6be0282 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -489,7 +489,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
 
                 if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, false ) )
                 {
-                    INetBookmark    aINetBookmark( aEmptyStr, aEmptyStr );
+                    INetBookmark    aINetBookmark( "", "" );
 
                     if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -498,7 +498,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                         ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                     {
-                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 93bd8f5cc624..da6598414edd 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -924,7 +924,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                                           GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ),
                                           nAction, false, nFormat ) )
                 {
-                    INetBookmark    aINetBookmark( aEmptyStr, aEmptyStr );
+                    INetBookmark    aINetBookmark( "", "" );
 
                     if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -933,7 +933,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                         ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                           aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                     {
-                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+                        InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
                     }
                 }
             }
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index d42107254cf6..87bfa3680f35 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -338,7 +338,7 @@ void View::DoPaste (vcl::Window* pWindow)
         {
             if( !InsertData( aDataHelper, aPos, nDnDAction, false ) )
             {
-                INetBookmark    aINetBookmark( aEmptyStr, aEmptyStr );
+                INetBookmark    aINetBookmark( "", "" );
 
                 if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&
                       aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) ||
@@ -347,7 +347,7 @@ void View::DoPaste (vcl::Window* pWindow)
                     ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) &&
                       aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) )
                 {
-                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), aEmptyStr, NULL );
+                    pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "", NULL );
                 }
             }
         }
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index d40db5c9220d..d1381fc69895 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -75,8 +75,6 @@ using namespace com::sun::star;
 
 namespace sd {
 
-const OUString aEmptyStr;
-
 /**
  * adjust Thumbpos and VisibleSize
  */