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

Change-Id: I849dbf3a40189e700036249b15dd8bde493083b6

23 files changed, 52 insertions, 64 deletions

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 920be54a1daa..bde476718386 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -139,28 +139,28 @@ static inline String GetViewOptUserItem( const SvtViewOptions& rOpt )
 struct ModuleToGroupNameMap_Impl
 {
     const char* m_pModule;
-    String      m_sGroupName;
-    sal_uInt16      m_nNodeId;
+    OUString    m_sGroupName;
+    sal_uInt16  m_nNodeId;
 };
 
 static OfaPageResource* pPageRes = NULL;
 
 static ModuleToGroupNameMap_Impl ModuleMap[] =
 {
-    { "ProductName", String::EmptyString(), SID_GENERAL_OPTIONS },
-    { "LanguageSettings", String::EmptyString(), SID_LANGUAGE_OPTIONS },
-    { "Internet", String::EmptyString(), SID_INET_DLG },
-    { "LoadSave", String::EmptyString(), SID_FILTER_DLG },
-    { "Writer", String::EmptyString(), SID_SW_EDITOPTIONS },
-    { "WriterWeb", String::EmptyString(), SID_SW_ONLINEOPTIONS },
-    { "Math", String::EmptyString(), SID_SM_EDITOPTIONS },
-    { "Calc", String::EmptyString(), SID_SC_EDITOPTIONS },
-    { "Impress", String::EmptyString(), SID_SD_EDITOPTIONS },
-    { "Draw", String::EmptyString(), SID_SD_GRAPHIC_OPTIONS },
-    { "Charts", String::EmptyString(), SID_SCH_EDITOPTIONS },
-    { "Base", String::EmptyString(), SID_SB_STARBASEOPTIONS },
-
-    { NULL, String::EmptyString(), 0xFFFF }
+    { "ProductName", OUString(), SID_GENERAL_OPTIONS },
+    { "LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS },
+    { "Internet", OUString(), SID_INET_DLG },
+    { "LoadSave", OUString(), SID_FILTER_DLG },
+    { "Writer", OUString(), SID_SW_EDITOPTIONS },
+    { "WriterWeb", OUString(), SID_SW_ONLINEOPTIONS },
+    { "Math", OUString(), SID_SM_EDITOPTIONS },
+    { "Calc", OUString(), SID_SC_EDITOPTIONS },
+    { "Impress", OUString(), SID_SD_EDITOPTIONS },
+    { "Draw", OUString(), SID_SD_GRAPHIC_OPTIONS },
+    { "Charts", OUString(), SID_SCH_EDITOPTIONS },
+    { "Base", OUString(), SID_SB_STARBASEOPTIONS },
+
+    { NULL, OUString(), 0xFFFF }
 };
 
 static void setGroupName( const OUString& rModule, const String& rGroupName )
@@ -222,7 +222,7 @@ static void deleteGroupNames()
 {
     sal_uInt16 nIndex = 0;
     while ( ModuleMap[ nIndex ].m_pModule )
-        ModuleMap[ nIndex++ ].m_sGroupName = String::EmptyString();
+        ModuleMap[ nIndex++ ].m_sGroupName = OUString();
 }
 
 static sal_uInt16 getGroupNodeId( const OUString& rModule )
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 57d77fbe2836..2e410132eebc 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -474,7 +474,7 @@ const SfxItemSet * SvxEditEngineForwarder::GetEmptyItemSetPtr()
 
 void SvxEditEngineForwarder::AppendParagraph()
 {
-    rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
+    rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), OUString() );
 }
 
 sal_uInt16 SvxEditEngineForwarder::AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet & /*rSet*/ )
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index d07c68a97a3a..8a98d64aaa45 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -548,7 +548,7 @@ const SfxItemSet * SvxOutlinerForwarder::GetEmptyItemSetPtr()
 void SvxOutlinerForwarder::AppendParagraph()
 {
     EditEngine& rEditEngine = const_cast< EditEngine& >( rOutliner.GetEditEngine() );
-    rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
+    rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), OUString() );
 }
 
 sal_uInt16 SvxOutlinerForwarder::AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet & /*rSet*/ )
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index b744f88e44e3..56b6e9c8aa21 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -170,7 +170,6 @@ public:
                             { return Append( UniString( concat ) ); }
 #endif
 
-    static const UniString& EmptyString();
     sal_Int32           ToInt32() const;
 
     UniString&          Assign( const UniString& rStr );
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 833102102739..ccbe256d29d5 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -117,11 +117,11 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
     /*  Line ends are now created with an empty name. The
         checkForUniqueItem() method then finds a unique name for the item's
         value. */
-    aItemSet.Put( XLineStartItem( String::EmptyString(), ::basegfx::B2DPolyPolygon( aTriangle ) ) );
+    aItemSet.Put( XLineStartItem( OUString(), ::basegfx::B2DPolyPolygon( aTriangle ) ) );
     aItemSet.Put( XLineStartWidthItem( 200 ) );
     aItemSet.Put( XLineStartCenterItem( false ) );
     aItemSet.Put( XFillStyleItem( XFILL_SOLID ) );
-    aItemSet.Put( XFillColorItem( String::EmptyString(), ScDetectiveFunc::GetCommentColor() ) );
+    aItemSet.Put( XFillColorItem( OUString(), ScDetectiveFunc::GetCommentColor() ) );
     aItemSet.Put( SdrCaptionEscDirItem( SDRCAPT_ESCBESTFIT ) );
 
     // shadow
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 64e3f0d755d9..d7a62b698196 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -975,7 +975,7 @@ sal_uInt16 XclExpChSourceLink::ConvertStringSequence( const Sequence< Reference<
     sal_uInt16 nFontIdx = EXC_FONT_APP;
     if( rStringSeq.hasElements() )
     {
-        mxString = XclExpStringHelper::CreateString( GetRoot(), String::EmptyString(), EXC_STR_FORCEUNICODE | EXC_STR_8BITLENGTH | EXC_STR_SEPARATEFORMATS );
+        mxString = XclExpStringHelper::CreateString( GetRoot(), OUString(), EXC_STR_FORCEUNICODE | EXC_STR_8BITLENGTH | EXC_STR_SEPARATEFORMATS );
         Reference< XBreakIterator > xBreakIt = GetDoc().GetBreakIterator();
         namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
 
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index fb16dda287b2..1df40dfb7b1a 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2747,12 +2747,12 @@ bool XclImpChTypeGroup::HasConnectorLines() const
     return ( xConLine != maChartLines.end() && xConLine->second->HasLine() );
 }
 
-const String& XclImpChTypeGroup::GetSingleSeriesTitle() const
+OUString XclImpChTypeGroup::GetSingleSeriesTitle() const
 {
     // no automatic title for series with trendlines or error bars
     // pie charts always show an automatic title, even if more series exist
     return (mxFirstSeries && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ?
-        mxFirstSeries->GetTitle() : String::EmptyString();
+        mxFirstSeries->GetTitle() : OUString();
 }
 
 void XclImpChTypeGroup::ConvertChart3d( ScfPropertySet& rPropSet ) const
@@ -3590,9 +3590,9 @@ XclImpChLegendRef XclImpChAxesSet::GetLegend() const
     return xLegend;
 }
 
-const String& XclImpChAxesSet::GetSingleSeriesTitle() const
+OUString XclImpChAxesSet::GetSingleSeriesTitle() const
 {
-    return (maTypeGroups.size() == 1) ? maTypeGroups.begin()->second->GetSingleSeriesTitle() : String::EmptyString();
+    return (maTypeGroups.size() == 1) ? maTypeGroups.begin()->second->GetSingleSeriesTitle() : OUString();
 }
 
 void XclImpChAxesSet::Convert( Reference< XDiagram > xDiagram ) const
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 206a0930dfda..6d53ae9dc9cb 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -111,7 +111,7 @@ void XclImpRoot::InitializeTable( SCTAB nScTab )
     GetPageSettings().Initialize();
     GetTabViewSettings().Initialize();
     // delete the automatically generated codename
-    GetDoc().SetCodeName( nScTab, String::EmptyString() );
+    GetDoc().SetCodeName( nScTab, OUString() );
 }
 
 void XclImpRoot::FinalizeTable()
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 974155aac6d4..00def4658a36 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -339,7 +339,7 @@ String XclControlHelper::ExtractFromMacroDescriptor(
             rDescriptor.ListenerType.equalsAscii( spTbxListenerData[ eEventType ].mpcListenerType ) &&
             rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType ].mpcEventMethod ) )
         return XclTools::GetXclMacroName( rDescriptor.ScriptCode );
-    return String::EmptyString();
+    return OUString();
 }
 
 // ============================================================================
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 308ca4c2ce07..4f10b75753cc 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -414,7 +414,7 @@ public:
     /** Returns true, if the source link contains explicit string data. */
     inline bool         HasString() const { return mxString && !mxString->IsEmpty(); }
     /** Returns explicit string data or an empty string. */
-    inline const String& GetString() const { return mxString ? mxString->GetText() : String::EmptyString(); }
+    OUString            GetString() const { return mxString ? mxString->GetText() : OUString(); }
     /** Returns the number of data points of this source link. */
     sal_uInt16          GetCellCount() const;
 
@@ -828,7 +828,7 @@ public:
     /** Returns true, if the series contains child series (e.g. trend lines). */
     inline bool         HasChildSeries() const { return !maTrendLines.empty() || !maErrorBars.empty(); }
     /** Returns series title or an empty string, if the series does not contain a title. */
-    inline const String& GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : String::EmptyString(); }
+    OUString            GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : OUString(); }
 
     /** Returns true, if the series line is smoothed. */
     inline bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
@@ -1066,7 +1066,7 @@ public:
     /** Returns the default series data format. */
     inline XclImpChDataFormatRef GetGroupFormat() const { return mxGroupFmt; }
     /** Returns series title, if the chart type group contains only one single series. */
-    const String&       GetSingleSeriesTitle() const;
+    OUString            GetSingleSeriesTitle() const;
 
     /** Converts and writes all 3D settings to the passed diagram. */
     void                ConvertChart3d( ScfPropertySet& rPropSet ) const;
@@ -1303,7 +1303,7 @@ public:
     /** Looks for a legend in all chart type groups and returns it. */
     XclImpChLegendRef   GetLegend() const;
     /** Returns series title, if the axes set contains only one single series. */
-    const String&       GetSingleSeriesTitle() const;
+    OUString            GetSingleSeriesTitle() const;
 
     /** Creates a coordinate system and converts all series and axis settings. */
     void                Convert( XDiagramRef xDiagram ) const;
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 5a675be518f6..ee9305c8dc7a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -228,7 +228,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
 
                 ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
                 if ( pInfo && !pInfo->GetHlink().isEmpty() )
-                    ScGlobal::OpenURL( pInfo->GetHlink(), String::EmptyString() );
+                    ScGlobal::OpenURL( pInfo->GetHlink(), OUString() );
             }
             break;
 
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 13b1e42400af..97f5e95b2f3c 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -52,13 +52,6 @@ DBG_NAME( UniString )
 
 UniString::UniString(char c): mpData(ImplAllocData(1)) { mpData->maStr[0] = c; }
 
-namespace { struct Empty : public rtl::Static< const UniString, Empty> {}; }
-
-const UniString& UniString::EmptyString()
-{
-    return Empty::get();
-}
-
 sal_Int32 UniString::ToInt32() const
 {
     DBG_CHKTHIS( UniString, DbgCheckUniString );
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index b8c1311a815a..2e143efdf0ed 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -23,7 +23,7 @@
 FileChangedQueryBox::FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ) :
     MessBox(pParent, 0,
             ResId(STR_FILECHANGED_TITLE, *pResMgr).toString(),
-            String::EmptyString() )
+            OUString() )
 {
     SetImage( QueryBox::GetStandardImage() );
 
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 06f6b174dfd2..3fa467434e65 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -25,7 +25,7 @@
 LockFailedQueryBox::LockFailedQueryBox( Window* pParent, ResMgr* pResMgr ) :
     MessBox(pParent, 0,
             ResId(STR_LOCKFAILED_TITLE, *pResMgr).toString(),
-            String::EmptyString() )
+            OUString() )
 {
     SetImage( ErrorBox::GetStandardImage() );
 
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();
 }