Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ASCII_STR, ASCII_STRING, CONST_ASCII, ASCSTR, ASCII, DEFINE_CONST_UNICODE, DEFINE_CONST_OUSTRING

Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f
Reviewed-on: https://gerrit.libreoffice.org/1954
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

3 files changed, 71 insertions, 75 deletions

diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index 4d2aa68b25c4..2956faf4f45a 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -22,19 +22,19 @@
 
 #include <svx/svdtrans.hxx>
 
-inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
+inline OUString GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
 {
-    String aVal = rtl::OUString::valueOf(static_cast<sal_Int64>(
-        MetricField::ConvertValue(nVal_100, 2, MAP_100TH_MM, eFieldUnit)));
+    OUStringBuffer aVal = OUString::number(
+        MetricField::ConvertValue(nVal_100, 2, MAP_100TH_MM, eFieldUnit));
 
-    while( aVal.Len() < 3 )
-        aVal.Insert( sal_Unicode('0'), 0 );
+    while( aVal.getLength() < 3 )
+        aVal.insert( 0, "0" );
 
-    aVal.Insert( cSep, aVal.Len() - 2 );
-    aVal += sal_Unicode(' ');
-    aVal += SdrFormatter::GetUnitStr( eFieldUnit );
+    aVal.insert( aVal.getLength() - 2, cSep );
+    aVal.append(" ");
+    aVal.append(SdrFormatter::GetUnitStr( eFieldUnit ));
 
-    return aVal;
+    return aVal.makeStringAndClear();
 }
 
 #endif // _SVX_DLG_DLGUNIT_HXX
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index ddf0f3bb5d8c..9ffe510ffdd2 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -57,17 +57,17 @@
 #include "dlgunit.hxx"
 
 #define SELF_TARGET         "_self"
-#define IMAP_ALL_FILTER     "<Alle>"
-#define IMAP_CERN_FILTER    "MAP - CERN"
-#define IMAP_NCSA_FILTER    "MAP - NCSA"
-#define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
-#define IMAP_ALL_TYPE       "*.*"
-#define IMAP_BINARY_TYPE    "*.sip"
-#define IMAP_CERN_TYPE      "*.map"
-#define IMAP_NCSA_TYPE      "*.map"
-#define IMAP_BINARY_EXT     "sip"
-#define IMAP_CERN_EXT       "map"
-#define IMAP_NCSA_EXT       "map"
+#define IMAP_ALL_FILTER     OUString("<Alle>")
+#define IMAP_CERN_FILTER    OUString("MAP - CERN")
+#define IMAP_NCSA_FILTER    OUString("MAP - NCSA")
+#define IMAP_BINARY_FILTER  OUString("SIP - StarView ImageMap")
+#define IMAP_ALL_TYPE       OUString("*.*")
+#define IMAP_BINARY_TYPE    OUString("*.sip")
+#define IMAP_CERN_TYPE      OUString("*.map")
+#define IMAP_NCSA_TYPE      OUString("*.map")
+#define IMAP_BINARY_EXT     OUString("sip")
+#define IMAP_CERN_EXT       OUString("map")
+#define IMAP_NCSA_EXT       OUString("map")
 
 /******************************************************************************/
 
@@ -166,8 +166,8 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
 
     aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE );
-    aStbStatus.InsertItem( 2, 10 + GetTextWidth( DEFINE_CONST_UNICODE( " 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN );
-    aStbStatus.InsertItem( 3, 10 + GetTextWidth( DEFINE_CONST_UNICODE( " 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN );
 
     aFtURL.Disable();
     maURLBox.Disable();
@@ -474,12 +474,12 @@ void SvxIMapDlg::DoOpen()
         com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
 
     ImageMap        aLoadIMap;
-    const String    aFilter( DEFINE_CONST_UNICODE( IMAP_ALL_FILTER ) );
+    const String    aFilter( IMAP_ALL_FILTER );
 
-    aDlg.AddFilter( aFilter, DEFINE_CONST_UNICODE( IMAP_ALL_TYPE ) );
-    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_CERN_FILTER ), DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
-    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ), DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
-    aDlg.AddFilter( DEFINE_CONST_UNICODE( IMAP_BINARY_FILTER ), DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ) );
+    aDlg.AddFilter( aFilter, IMAP_ALL_TYPE );
+    aDlg.AddFilter( IMAP_CERN_FILTER, IMAP_CERN_TYPE );
+    aDlg.AddFilter( IMAP_NCSA_FILTER, IMAP_NCSA_TYPE );
+    aDlg.AddFilter( IMAP_BINARY_FILTER, IMAP_BINARY_TYPE );
 
     aDlg.SetCurrentFilter( aFilter );
     aDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
@@ -514,16 +514,16 @@ sal_Bool SvxIMapDlg::DoSave()
     ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
 
-    const String    aBinFilter( DEFINE_CONST_UNICODE( IMAP_BINARY_FILTER ) );
-    const String    aCERNFilter( DEFINE_CONST_UNICODE( IMAP_CERN_FILTER ) );
-    const String    aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) );
+    const String    aBinFilter( IMAP_BINARY_FILTER );
+    const String    aCERNFilter( IMAP_CERN_FILTER );
+    const String    aNCSAFilter( IMAP_NCSA_FILTER );
     SdrModel*       pModel = pIMapWnd->GetSdrModel();
     const sal_Bool bChanged = pModel->IsChanged();
     sal_Bool            bRet = false;
 
-    aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
-    aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
-    aDlg.AddFilter( aBinFilter, DEFINE_CONST_UNICODE( IMAP_BINARY_TYPE ) );
+    aDlg.AddFilter( aCERNFilter, IMAP_CERN_TYPE );
+    aDlg.AddFilter( aNCSAFilter, IMAP_NCSA_TYPE );
+    aDlg.AddFilter( aBinFilter, IMAP_BINARY_TYPE );
 
     aDlg.SetCurrentFilter( aCERNFilter );
     aDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
@@ -537,17 +537,17 @@ sal_Bool SvxIMapDlg::DoSave()
         if ( aFilter == aBinFilter )
         {
             nFormat = IMAP_FORMAT_BIN;
-            aExt = DEFINE_CONST_UNICODE( IMAP_BINARY_EXT );
+            aExt = IMAP_BINARY_EXT;
         }
         else if ( aFilter == aCERNFilter )
         {
             nFormat = IMAP_FORMAT_CERN;
-            aExt = DEFINE_CONST_UNICODE( IMAP_CERN_EXT );
+            aExt = IMAP_CERN_EXT;
         }
         else if ( aFilter == aNCSAFilter )
         {
             nFormat = IMAP_FORMAT_NCSA;
-            aExt = DEFINE_CONST_UNICODE( IMAP_NCSA_EXT );
+            aExt = IMAP_NCSA_EXT;
         }
         else
         {
@@ -597,7 +597,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
         aEdtText.SetText( rInfo.aMarkAltText );
 
         if ( !rInfo.aMarkTarget.Len() )
-            maCbbTarget.SetText( DEFINE_CONST_UNICODE( SELF_TARGET ) );
+            maCbbTarget.SetText( SELF_TARGET );
         else
             maCbbTarget.SetText( rInfo.aMarkTarget );
     }
@@ -643,7 +643,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
             aEdtText.SetText( rInfo.aMarkAltText );
 
         if ( !rInfo.aMarkTarget.Len() )
-            maCbbTarget.SetText( DEFINE_CONST_UNICODE( SELF_TARGET ) );
+            maCbbTarget.SetText( SELF_TARGET );
         else
             maCbbTarget.SetText(  rInfo.aMarkTarget );
     }
@@ -653,15 +653,13 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
 
 IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
 {
-    String aStr;
     const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Point& rMousePos = pWnd->GetMousePos();
     const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
     const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
 
-    aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
-    aStr.Append( DEFINE_CONST_UNICODE( " / " ) );
-    aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) );
+    OUString aStr = GetUnitString( rMousePos.X(), eFieldUnit, cSep ) +
+                    " / " + GetUnitString( rMousePos.Y(), eFieldUnit, cSep );
 
     aStbStatus.SetItemText( 2, aStr );
 
@@ -670,15 +668,13 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
 
 IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
 {
-    String aStr;
     const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Size& rSize = pWnd->GetGraphicSize();
     const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
     const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
 
-    aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
-    aStr.Append( DEFINE_CONST_UNICODE( " x " ) );
-    aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) );
+    OUString aStr = GetUnitString( rSize.Width(), eFieldUnit, cSep ) +
+                    " x " + GetUnitString( rSize.Height(), eFieldUnit, cSep );
 
     aStbStatus.SetItemText( 3, aStr );
 
@@ -717,7 +713,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
     aNewInfo.aMarkAltText = aEdtText.GetText();
 
     if ( !aTargetText.Len() )
-        aNewInfo.aMarkTarget = DEFINE_CONST_UNICODE( SELF_TARGET );
+        aNewInfo.aMarkTarget = SELF_TARGET;
     else
         aNewInfo.aMarkTarget = aTargetText;
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 3d6b18bfd280..f38c616b7cb2 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -66,15 +66,15 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::dom::events;
 using namespace ::svx;
 
-#define CFGNAME_DATANAVIGATOR       DEFINE_CONST_UNICODE("DataNavigator")
-#define CFGNAME_SHOWDETAILS         DEFINE_CONST_UNICODE("ShowDetails")
-#define MSG_VARIABLE                DEFINE_CONST_UNICODE("%1")
-#define MODELNAME                   DEFINE_CONST_UNICODE("$MODELNAME")
-#define INSTANCENAME                DEFINE_CONST_UNICODE("$INSTANCENAME")
-#define ELEMENTNAME                 DEFINE_CONST_UNICODE("$ELEMENTNAME")
-#define ATTRIBUTENAME               DEFINE_CONST_UNICODE("$ATTRIBUTENAME")
-#define SUBMISSIONNAME              DEFINE_CONST_UNICODE("$SUBMISSIONNAME")
-#define BINDINGNAME                 DEFINE_CONST_UNICODE("$BINDINGNAME")
+#define CFGNAME_DATANAVIGATOR       "DataNavigator"
+#define CFGNAME_SHOWDETAILS         "ShowDetails"
+#define MSG_VARIABLE                "%1"
+#define MODELNAME                   "$MODELNAME"
+#define INSTANCENAME                "$INSTANCENAME"
+#define ELEMENTNAME                 "$ELEMENTNAME"
+#define ATTRIBUTENAME               "$ATTRIBUTENAME"
+#define SUBMISSIONNAME              "$SUBMISSIONNAME"
+#define BINDINGNAME                 "$BINDINGNAME"
 
 //............................................................................
 namespace svxform
@@ -1103,10 +1103,10 @@ namespace svxform
                     css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
                     sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
-                    String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME;
+                    OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME);
                     QueryBox aQBox( this, SVX_RES( nResId ) );
-                    String sMessText = aQBox.GetMessText();
-                    sMessText.SearchAndReplace(
+                    OUString sMessText = aQBox.GetMessText();
+                    sMessText = sMessText.replaceFirst(
                         sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, sal_False ) );
                     aQBox.SetMessText( sMessText );
                     if ( aQBox.Execute() == RET_YES )
@@ -1135,9 +1135,9 @@ namespace svxform
                 DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
                 bool bSubmission = ( DGTSubmission == m_eGroup );
                 sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
-                rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
-                String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME;
-                rtl::OUString sName;
+                OUString sProperty = bSubmission ? OUString(PN_SUBMISSION_ID) : OUString(PN_BINDING_ID);
+                OUString sSearch = bSubmission ? OUString(SUBMISSIONNAME) : OUString(BINDINGNAME);
+                OUString sName;
                 try
                 {
                     pNode->m_xPropSet->getPropertyValue( sProperty ) >>= sName;
@@ -1667,8 +1667,8 @@ namespace svxform
                             {
                                 // error: model name already exists
                                 ErrorBox aErrBox( this, SVX_RES( RID_ERR_DOUBLE_MODELNAME ) );
-                                String sMessText = aErrBox.GetMessText();
-                                sMessText.SearchAndReplace( MSG_VARIABLE, sNewName );
+                                OUString sMessText = aErrBox.GetMessText();
+                                sMessText = sMessText.replaceFirst( MSG_VARIABLE, sNewName );
                                 aErrBox.SetMessText( sMessText );
                                 aErrBox.Execute();
                                 bShowDialog = true;
@@ -1766,8 +1766,8 @@ namespace svxform
                 case MID_MODELS_REMOVE :
                 {
                     QueryBox aQBox( this, SVX_RES( RID_QRY_REMOVE_MODEL ) );
-                    String sText = aQBox.GetMessText();
-                    sText.SearchAndReplace( MODELNAME, sSelectedModel );
+                    OUString sText = aQBox.GetMessText();
+                    sText = sText.replaceFirst( MODELNAME, sSelectedModel );
                     aQBox.SetMessText( sText );
                     if ( aQBox.Execute() == RET_YES )
                     {
@@ -1871,8 +1871,8 @@ namespace svxform
                     {
                         String sInstName = pPage->GetInstanceName();
                         QueryBox aQBox( this, SVX_RES( RID_QRY_REMOVE_INSTANCE ) );
-                        String sMessText = aQBox.GetMessText();
-                        sMessText.SearchAndReplace( INSTANCENAME, sInstName );
+                        OUString sMessText = aQBox.GetMessText();
+                        sMessText = sMessText.replaceFirst( INSTANCENAME, sInstName );
                         aQBox.SetMessText( sMessText );
                         if ( aQBox.Execute() == RET_YES )
                         {
@@ -2670,8 +2670,8 @@ namespace svxform
         {
             // Error and don't close the dialog
             ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLNAME ) );
-            String sMessText = aErrBox.GetMessText();
-            sMessText.SearchAndReplace( MSG_VARIABLE, sNewName );
+            OUString sMessText = aErrBox.GetMessText();
+            sMessText = sMessText.replaceFirst( MSG_VARIABLE, sNewName );
             aErrBox.SetMessText( sMessText );
             aErrBox.Execute();
             return 0;
@@ -3342,8 +3342,8 @@ namespace svxform
             if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) )
             {
                 ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLPREFIX ) );
-                String sMessText = aErrBox.GetMessText();
-                sMessText.SearchAndReplace( MSG_VARIABLE, sPrefix );
+                OUString sMessText = aErrBox.GetMessText();
+                sMessText = sMessText.replaceFirst( MSG_VARIABLE, sPrefix );
                 aErrBox.SetMessText( sMessText );
                 aErrBox.Execute();
                 return 0;
@@ -3667,9 +3667,9 @@ namespace svxform
             css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
         INetURLObject aFile( SvtPathOptions().GetWorkPath() );
 
-        aDlg.AddFilter( m_sAllFilterName, DEFINE_CONST_UNICODE(FILEDIALOG_FILTER_ALL) );
-        String sFilterName( DEFINE_CONST_UNICODE("XML") );
-        aDlg.AddFilter( sFilterName, DEFINE_CONST_UNICODE("*.xml") );
+        aDlg.AddFilter( m_sAllFilterName, OUString(FILEDIALOG_FILTER_ALL) );
+        String sFilterName( "XML" );
+        aDlg.AddFilter( sFilterName, OUString("*.xml") );
         aDlg.SetCurrentFilter( sFilterName );
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );