Related: fdo#38838 drop String::EmptyString now as well

Change-Id: I849dbf3a40189e700036249b15dd8bde493083b6

9 files changed, 17 insertions, 21 deletions

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a7db1f7e77c8..f594638d4101 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -373,10 +373,6 @@ bool ImplInitAccessBridge( bool bAllowCancel, bool &rCancelled );
 FieldUnitStringList* ImplGetFieldUnits();
 FieldUnitStringList* ImplGetCleanedFieldUnits();
 
-
-inline const String& ImplGetSVEmptyStr()
-    { return String::EmptyString(); }
-
 // ImplDelData is used as a "dog tag" by a window when it
 // does something that could indirectly destroy the window
 // TODO: wild destruction of a window should not be possible
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 856ef1e09c11..5b2bd3d16d68 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -74,7 +74,7 @@ sal_Bool Help::SearchKeyword( const OUString& )
 
 OUString Help::GetHelpText( const OUString&, const Window* )
 {
-    return ImplGetSVEmptyStr();
+    return OUString();
 }
 
 // -----------------------------------------------------------------------
@@ -184,7 +184,7 @@ sal_Bool Help::ShowBalloon( Window* pParent,
                         const OUString& rHelpText )
 {
     ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0,
-                        rHelpText, ImplGetSVEmptyStr(), rScreenPos );
+                        rHelpText, OUString(), rScreenPos );
 
     return sal_True;
 }
@@ -196,7 +196,7 @@ sal_Bool Help::ShowBalloon( Window* pParent,
                         const OUString& rHelpText )
 {
     ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0,
-                        rHelpText, ImplGetSVEmptyStr(), rScreenPos, &rRect );
+                        rHelpText, OUString(), rScreenPos, &rRect );
 
     return sal_True;
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 47222d007158..c7c65fb5a043 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1094,7 +1094,7 @@ OUString Application::GetAppName()
     if ( pSVData->maAppData.mpAppName )
         return *(pSVData->maAppData.mpAppName);
     else
-        return ImplGetSVEmptyStr();
+        return OUString();
 }
 
 void Application::SetDisplayName( const OUString& rName )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f887260adc17..6fd9fd2f8a06 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2718,7 +2718,7 @@ void Edit::Cut()
     if ( !(GetStyle() & WB_PASSWORD ) )
     {
         Copy();
-        ReplaceSelected( ImplGetSVEmptyStr() );
+        ReplaceSelected( OUString() );
     }
 }
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index e0c7558ade9f..d994757afb17 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -427,7 +427,7 @@ void FormatterBase::ImplSetText( const OUString& rText, Selection* pNewSelection
 void FormatterBase::SetEmptyFieldValue()
 {
     if ( mpField )
-        mpField->SetText( ImplGetSVEmptyStr() );
+        mpField->SetText( OUString() );
     mbEmptyFieldValue = sal_True;
 }
 
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 12d15a22aaca..6a261064a4de 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -836,7 +836,7 @@ void PatternFormatter::SetString( const OUString& rStr )
 OUString PatternFormatter::GetString() const
 {
     if ( !GetField() )
-        return ImplGetSVEmptyStr();
+        return OUString();
     else
         return ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags );
 }
@@ -1870,7 +1870,7 @@ void DateFormatter::Reformat()
             SetDate( Date( Date::SYSTEM ) );
         else
         {
-            ImplSetText( ImplGetSVEmptyStr() );
+            ImplSetText( OUString() );
             SetEmptyFieldValueData( sal_True );
         }
     }
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 175e86d62135..b1e5df0d195a 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -278,7 +278,7 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n )
         else
         {
             mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND );
-            mpImplWin->SetString( ImplGetSVEmptyStr() );
+            mpImplWin->SetString( OUString() );
             Image aImage;
             mpImplWin->SetImage( aImage );
         }
@@ -993,7 +993,7 @@ void ListBox::Clear()
     if( IsDropDownBox() )
     {
         mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND );
-        mpImplWin->SetString( ImplGetSVEmptyStr() );
+        mpImplWin->SetString( OUString() );
         Image aImage;
         mpImplWin->SetImage( aImage );
         mpImplWin->Invalidate();
@@ -1008,7 +1008,7 @@ void ListBox::SetNoSelection()
     if( IsDropDownBox() )
     {
         mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND );
-        mpImplWin->SetString( ImplGetSVEmptyStr() );
+        mpImplWin->SetString( OUString() );
         Image aImage;
         mpImplWin->SetImage( aImage );
         mpImplWin->Invalidate();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index bbda65fa53b7..f5ce429bbd52 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1288,12 +1288,12 @@ sal_uInt16 Printer::GetPaperBinCount() const
 OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const
 {
     if ( IsDisplayPrinter() )
-        return ImplGetSVEmptyStr();
+        return OUString();
 
     if ( nPaperBin < GetPaperBinCount() )
         return mpInfoPrinter->GetPaperBinName( maJobSetup.ImplGetConstData(), nPaperBin );
     else
-        return ImplGetSVEmptyStr();
+        return OUString();
 }
 
 
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 83ab1ae135af..31c0c863fc3f 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -441,7 +441,7 @@ void InfoBox::ImplInitInfoBoxData()
 // -----------------------------------------------------------------------
 
 InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) :
-    MessBox( pParent, WB_OK | WB_DEF_OK, ImplGetSVEmptyStr(), rMessage )
+    MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage )
 {
     ImplInitInfoBoxData();
 }
@@ -477,7 +477,7 @@ void WarningBox::ImplInitWarningBoxData()
 
 WarningBox::WarningBox( Window* pParent, WinBits nStyle,
                         const OUString& rMessage ) :
-    MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+    MessBox( pParent, nStyle, OUString(), rMessage )
 {
     ImplInitWarningBoxData();
 }
@@ -522,7 +522,7 @@ void ErrorBox::ImplInitErrorBoxData()
 
 ErrorBox::ErrorBox( Window* pParent, WinBits nStyle,
                     const OUString& rMessage ) :
-    MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+    MessBox( pParent, nStyle, OUString(), rMessage )
 {
     ImplInitErrorBoxData();
 }
@@ -566,7 +566,7 @@ void QueryBox::ImplInitQueryBoxData()
 // -----------------------------------------------------------------------
 
 QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
-    MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+    MessBox( pParent, nStyle, OUString(), rMessage )
 {
     ImplInitQueryBoxData();
 }