RTL_CONSTASCII_(U)STRINGPARAM removed in vcl/source/window

Change-Id: I0210aa9984040dd8ecbe126097cf2de8d90d843d

7 files changed, 70 insertions, 76 deletions

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d76d359bc85e..ce98b75b502e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -478,9 +478,9 @@ Dialog::Dialog( WindowType nType )
     ImplInitDialogData();
 }
 
-#define BASEPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIConfig"))
-#define RELPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice.cfg"))
-#define SERVICENAME_PATHSETTINGS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings"))
+#define BASEPATH_SHARE_LAYER rtl::OUString("UIConfig")
+#define RELPATH_SHARE_LAYER rtl::OUString("soffice.cfg")
+#define SERVICENAME_PATHSETTINGS rtl::OUString("com.sun.star.util.PathSettings")
 
 rtl::OUString VclBuilderContainer::getUIRootDir()
 {
@@ -500,10 +500,10 @@ rtl::OUString VclBuilderContainer::getUIRootDir()
     // Note: May be an user uses URLs without a final slash! Check it ...
     nPos = sShareLayer.lastIndexOf('/');
     if (nPos != sShareLayer.getLength()-1)
-        sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+        sShareLayer += "/";
 
     sShareLayer += RELPATH_SHARE_LAYER; // folder
-    sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+    sShareLayer += "/";
     /*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
     return sShareLayer;
 }
@@ -779,7 +779,7 @@ sal_Bool Dialog::ImplStartExecuteModal()
     {
 #ifdef DBG_UTIL
         rtl::OStringBuffer aErrorStr;
-        aErrorStr.append(RTL_CONSTASCII_STRINGPARAM("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): "));
+        aErrorStr.append("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): ");
         aErrorStr.append(ImplGetDialogText(this));
         OSL_FAIL(aErrorStr.getStr());
 #endif
@@ -1228,7 +1228,7 @@ void Dialog::Resize()
 
 bool Dialog::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("border-width")))
+    if (rKey == "border-width")
         set_border_width(rValue.toInt32());
     else
         return SystemWindow::set_property(rKey, rValue);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f021fb82565b..7364b11ef6a9 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -289,9 +289,9 @@ void VclBox::setAllocation(const Size &rAllocation)
 
 bool VclBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("spacing")))
+    if (rKey == "spacing")
         set_spacing(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("homogeneous")))
+    else if (rKey == "homogeneous")
         set_homogeneous(toBool(rValue));
     else
         return VclContainer::set_property(rKey, rValue);
@@ -386,20 +386,20 @@ Size VclButtonBox::calculateRequisition() const
 
 bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("layout-style")))
+    if (rKey == "layout-style")
     {
         VclButtonBoxStyle eStyle = VCL_BUTTONBOX_DEFAULT_STYLE;
-        if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+        if (rValue == "start")
             eStyle = VCL_BUTTONBOX_START;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("spread")))
+        else if (rValue == "spread")
             eStyle = VCL_BUTTONBOX_SPREAD;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("edge")))
+        else if (rValue == "edge")
             eStyle = VCL_BUTTONBOX_EDGE;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+        else if (rValue == "start")
             eStyle = VCL_BUTTONBOX_START;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("end")))
+        else if (rValue == "end")
             eStyle = VCL_BUTTONBOX_END;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("center")))
+        else if (rValue == "center")
             eStyle = VCL_BUTTONBOX_CENTER;
         else
         {
@@ -407,7 +407,7 @@ bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rV
         }
         set_layout(eStyle);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("homogeneous")))
+    else if (rKey == "homogeneous")
         m_bHomogeneousGroups = toBool(rValue);
     else
         return VclBox::set_property(rKey, rValue);
@@ -933,15 +933,15 @@ bool toBool(const rtl::OString &rValue)
 
 bool VclGrid::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("row-spacing")))
+    if (rKey == "row-spacing")
         set_row_spacing(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("column-spacing")))
+    else if (rKey == "column-spacing")
         set_column_spacing(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("row-homogeneous")))
+    else if (rKey == "row-homogeneous")
         set_row_homogeneous(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("column-homogeneous")))
+    else if (rKey == "column-homogeneous")
         set_column_homogeneous(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("n-rows")))
+    else if (rKey == "n-rows")
         /*nothing to do*/;
     else
         return VclContainer::set_property(rKey, rValue);
@@ -1096,21 +1096,21 @@ void VclAlignment::setAllocation(const Size &rAllocation)
 
 bool VclAlignment::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("bottom-padding")))
+    if (rKey == "bottom-padding")
         m_nBottomPadding = rValue.toInt32();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-padding")))
+    else if (rKey == "left-padding")
         m_nLeftPadding = rValue.toInt32();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("right-padding")))
+    else if (rKey == "right-padding")
         m_nRightPadding = rValue.toInt32();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-padding")))
+    else if (rKey == "top-padding")
         m_nTopPadding = rValue.toInt32();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xalign")))
+    else if (rKey == "xalign")
         m_fXAlign = rValue.toFloat();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xscale")))
+    else if (rKey == "xscale")
         m_fXScale = rValue.toFloat();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yalign")))
+    else if (rKey == "yalign")
         m_fYAlign = rValue.toFloat();
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yscale")))
+    else if (rKey == "yscale")
         m_fYScale = rValue.toFloat();
     else
         return VclBin::set_property(rKey, rValue);
@@ -1221,9 +1221,9 @@ void VclExpander::setAllocation(const Size &rAllocation)
 
 bool VclExpander::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
 {
-    if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("expanded")))
+    if (rKey == "expanded")
         m_aDisclosureButton.Check(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("resize-toplevel")))
+    else if (rKey == "resize-toplevel")
         m_bResizeTopLevel = toBool(rValue);
     else
         return VclBin::set_property(rKey, rValue);
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index fa827ecbe6a6..ada63f772309 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -100,9 +100,8 @@ static sal_Bool ImplAccelDisabled()
     {
         rtl::OUString aStr =
             vcl::SettingsConfigItem::get()->
-            getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Menu" ) ),
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuppressAccelerators" ) ) );
-        nAccelDisabled = aStr.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0;
+            getValue( "Menu", "SuppressAccelerators" );
+        nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0;
     }
     return (nAccelDisabled == 1) ? sal_True : sal_False;
 }
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7005257ab35e..97614b2f1704 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -76,8 +76,8 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent )
     maHorzDim.Show();
     maVertDim.Show();
 
-    maHorzDim.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "2.0in" ) ) );
-    maVertDim.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "2.0in" ) ) );
+    maHorzDim.SetText( String( "2.0in" ) );
+    maVertDim.SetText( String( "2.0in" ) );
 }
 
 PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
@@ -498,7 +498,7 @@ void PrintDialog::JobTabPage::readFromSettings()
 
     aValue = pItem->getValue( rtl::OUString( "PrintDialog"  ),
                               rtl::OUString( "CollateBox"  ) );
-    if( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("alwaysoff")) )
+    if( aValue.equalsIgnoreAsciiCase("alwaysoff") )
     {
         mnCollateUIMode = 1;
         mpCollateBox->Check( sal_False );
@@ -509,7 +509,7 @@ void PrintDialog::JobTabPage::readFromSettings()
         mnCollateUIMode = 0;
         aValue = pItem->getValue( rtl::OUString( "PrintDialog"  ),
                                   rtl::OUString( "Collate"  ) );
-        mpCollateBox->Check( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) );
+        mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") );
     }
 }
 
@@ -537,7 +537,7 @@ void PrintDialog::OutputOptPage::readFromSettings()
     rtl::OUString aValue;
     aValue = pItem->getValue( rtl::OUString( "PrintDialog"  ),
                               rtl::OUString( "CollateSingleJobs"  ) );
-    if ( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+    if ( aValue.equalsIgnoreAsciiCase("true") )
     {
         mpCollateSingleJobsBox->Check( sal_True );
     }
@@ -1122,7 +1122,7 @@ void PrintDialog::setupOptionalUI()
         else
         {
             rtl::OStringBuffer sMessage;
-            sMessage.append(RTL_CONSTASCII_STRINGPARAM("Unsupported UI option: \""));
+            sMessage.append("Unsupported UI option: \"");
             sMessage.append(rtl::OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8));
             sMessage.append('"');
             OSL_FAIL( sMessage.getStr() );
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 5bd71f54f913..a107fc1ad7bd 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -242,7 +242,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
             try
             {
                     ::rtl::Reference< ::jvmaccess::VirtualMachine > xVM;
-                    uno::Reference< java::XJavaVM >                 xJavaVM( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), uno::UNO_QUERY );
+                    uno::Reference< java::XJavaVM >                 xJavaVM( xFactory->createInstance( rtl::OUString("com.sun.star.java.JavaVirtualMachine") ), uno::UNO_QUERY );
                     uno::Sequence< sal_Int8 >                       aProcessID( 17 );
 
                     rtl_getGlobalProcessId( (sal_uInt8*) aProcessID.getArray() );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a7a4b649da76..4e926f936e07 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4373,11 +4373,10 @@ Window::~Window()
             if ( bError )
             {
                 rtl::OStringBuffer aTempStr;
-                aTempStr.append(RTL_CONSTASCII_STRINGPARAM("Window ("));
+                aTempStr.append("Window (");
                 aTempStr.append(rtl::OUStringToOString(GetText(),
                                                        RTL_TEXTENCODING_UTF8));
-                aTempStr.append(RTL_CONSTASCII_STRINGPARAM(
-                                    ") with living SystemWindow(s) destroyed: "));
+                aTempStr.append(") with living SystemWindow(s) destroyed: ");
                 aTempStr.append(aErrorStr.toString());
                 OSL_FAIL(aTempStr.getStr());
                 // abort in non-pro version, this must be fixed!
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 7c7f910c4294..72d117df22d3 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1807,13 +1807,13 @@ namespace
     {
         VclAlign eRet = VCL_ALIGN_FILL;
 
-        if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("fill")))
+        if (rValue == "fill")
             eRet = VCL_ALIGN_FILL;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("start")))
+        else if (rValue == "start")
             eRet = VCL_ALIGN_START;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("end")))
+        else if (rValue == "end")
             eRet = VCL_ALIGN_END;
-        else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("center")))
+        else if (rValue == "center")
             eRet = VCL_ALIGN_CENTER;
         return eRet;
     }
@@ -1868,19 +1868,15 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
 
 bool Window::set_property(const OString &rKey, const OString &rValue)
 {
-    if (
-         (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("label"))) ||
-         (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("title"))) ||
-         (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("text")))
-       )
+    if ((rKey == "label") || (rKey == "title") || (rKey == "text") )
     {
         SetText(OStringToOUString(VclBuilder::convertMnemonicMarkup(rValue), RTL_TEXTENCODING_UTF8));
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("visible")))
+    else if (rKey == "visible")
         Show(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("sensitive")))
+    else if (rKey == "sensitive")
         Enable(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("resizable")))
+    else if (rKey == "resizable")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_SIZEABLE);
@@ -1888,7 +1884,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
             nBits |= WB_SIZEABLE;
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xalign")))
+    else if (rKey == "xalign")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_LEFT | WB_CENTER | WB_RIGHT);
@@ -1903,7 +1899,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
 
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("yalign")))
+    else if (rKey == "yalign")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_TOP | WB_VCENTER | WB_BOTTOM);
@@ -1918,7 +1914,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
 
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("wrap")))
+    else if (rKey == "wrap")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_WORDBREAK);
@@ -1926,33 +1922,33 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
             nBits |= WB_WORDBREAK;
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height-request")))
+    else if (rKey == "height-request")
         set_height_request(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-request")))
+    else if (rKey == "width-request")
         set_width_request(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hexpand")))
+    else if (rKey == "hexpand")
         set_hexpand(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("vexpand")))
+    else if (rKey == "vexpand")
         set_vexpand(toBool(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("halign")))
+    else if (rKey == "halign")
         set_halign(toAlign(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("valign")))
+    else if (rKey == "valign")
         set_valign(toAlign(rValue));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-markup")))
+    else if (rKey == "tooltip-markup")
         SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-text")))
+    else if (rKey == "tooltip-text")
         SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("border-width")))
+    else if (rKey == "border-width")
         set_border_width(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-left")))
+    else if (rKey == "margin-left")
         set_margin_left(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-right")))
+    else if (rKey == "margin-right")
         set_margin_right(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-top")))
+    else if (rKey == "margin-top")
         set_margin_top(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-bottom")))
+    else if (rKey == "margin-bottom")
         set_margin_bottom(rValue.toInt32());
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hscrollbar-policy")))
+    else if (rKey == "hscrollbar-policy")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_AUTOHSCROLL|WB_HSCROLL);
@@ -1962,7 +1958,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
             nBits |= WB_AUTOHSCROLL;
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("vscrollbar-policy")))
+    else if (rKey == "vscrollbar-policy")
     {
         WinBits nBits = GetStyle();
         nBits &= ~(WB_AUTOVSCROLL|WB_VSCROLL);
@@ -1972,7 +1968,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
             nBits |= WB_AUTOVSCROLL;
         SetStyle(nBits);
     }
-    else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("use-markup")))
+    else if (rKey == "use-markup")
     {
         //https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
         SAL_WARN_IF(toBool(rValue), "vcl.layout", "Use pango attributes instead of mark-up");