expand out the A2S macro

Which is not doing anything useful anymore.

Change-Id: I83422e811d52a77b65655924c07b55dd7229449c

4 files changed, 14 insertions, 21 deletions

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 4b6dd3b79c4d..4e2316a7b07d 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -44,8 +44,6 @@ const char UNO_ALIGNRIGHT[]            = ".uno:AlignRight";
 const char UNO_ALIGNTOP[]              = ".uno:AlignTop";
 const char UNO_ALIGNVCENTER[]          = ".uno:AlignVCenter";
 
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
 //////////////////////////////////////////////////////////////////////////////
 // namespace open
 
@@ -316,11 +314,11 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create (
     SfxBindings* pBindings)
 {
     if (pParent == NULL)
-        throw lang::IllegalArgumentException(A2S("no parent Window given to AlignmentPropertyPanel::Create"), NULL, 0);
+        throw lang::IllegalArgumentException("no parent Window given to AlignmentPropertyPanel::Create", NULL, 0);
     if ( ! rxFrame.is())
-        throw lang::IllegalArgumentException(A2S("no XFrame given to AlignmentPropertyPanel::Create"), NULL, 1);
+        throw lang::IllegalArgumentException("no XFrame given to AlignmentPropertyPanel::Create", NULL, 1);
     if (pBindings == NULL)
-        throw lang::IllegalArgumentException(A2S("no SfxBindings given to AlignmentPropertyPanel::Create"), NULL, 2);
+        throw lang::IllegalArgumentException("no SfxBindings given to AlignmentPropertyPanel::Create", NULL, 2);
 
     return new AlignmentPropertyPanel(
         pParent,
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index d7bc7ab39c38..34b823b48afa 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -51,8 +51,6 @@ const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
 const char UNO_LINESTYLE[] = ".uno:LineStyle";
 const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor";
 
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
 //////////////////////////////////////////////////////////////////////////////
 // helpers
 
@@ -373,11 +371,11 @@ CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create (
     SfxBindings* pBindings)
 {
     if (pParent == NULL)
-        throw lang::IllegalArgumentException(A2S("no parent Window given to CellAppearancePropertyPanel::Create"), NULL, 0);
+        throw lang::IllegalArgumentException("no parent Window given to CellAppearancePropertyPanel::Create", NULL, 0);
     if ( ! rxFrame.is())
-        throw lang::IllegalArgumentException(A2S("no XFrame given to CellAppearancePropertyPanel::Create"), NULL, 1);
+        throw lang::IllegalArgumentException("no XFrame given to CellAppearancePropertyPanel::Create", NULL, 1);
     if (pBindings == NULL)
-        throw lang::IllegalArgumentException(A2S("no SfxBindings given to CellAppearancePropertyPanel::Create"), NULL, 2);
+        throw lang::IllegalArgumentException("no SfxBindings given to CellAppearancePropertyPanel::Create", NULL, 2);
 
     return new CellAppearancePropertyPanel(
         pParent,
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 229b9c40bcb9..fdeceabb08dc 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -43,8 +43,6 @@ const char UNO_NUMBERFORMATCURRENCY[] = ".uno:NumberFormatCurrency";
 const char UNO_NUMBERFORMATDATE[]     = ".uno:NumberFormatDate";
 const char UNO_INSERTFIXEDTEXT[]      = ".uno:InsertFixedText";
 
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
 //////////////////////////////////////////////////////////////////////////////
 // namespace open
 
@@ -193,11 +191,11 @@ NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create (
     SfxBindings* pBindings)
 {
     if (pParent == NULL)
-        throw lang::IllegalArgumentException(A2S("no parent Window given to NumberFormatPropertyPanel::Create"), NULL, 0);
+        throw lang::IllegalArgumentException("no parent Window given to NumberFormatPropertyPanel::Create", NULL, 0);
     if ( ! rxFrame.is())
-        throw lang::IllegalArgumentException(A2S("no XFrame given to NumberFormatPropertyPanel::Create"), NULL, 1);
+        throw lang::IllegalArgumentException("no XFrame given to NumberFormatPropertyPanel::Create", NULL, 1);
     if (pBindings == NULL)
-        throw lang::IllegalArgumentException(A2S("no SfxBindings given to NumberFormatPropertyPanel::Create"), NULL, 2);
+        throw lang::IllegalArgumentException("no SfxBindings given to NumberFormatPropertyPanel::Create", NULL, 2);
 
     return new NumberFormatPropertyPanel(
         pParent,
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 0de7e83fc147..4366c2f06902 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -43,14 +43,13 @@ using ::rtl::OUString;
 
 namespace sc { namespace sidebar {
 
-#define A2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
 #define IMPLEMENTATION_NAME "org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"
 #define SERVICE_NAME "com.sun.star.ui.UIElementFactory"
 
 
 ::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName (void)
 {
-    return A2S(IMPLEMENTATION_NAME);
+    return OUString(IMPLEMENTATION_NAME);
 }
 
 
@@ -66,7 +65,7 @@ cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance(
 cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void)
 {
     cssu::Sequence<OUString> aServiceNames (1);
-    aServiceNames[0] = A2S(SERVICE_NAME);
+    aServiceNames[0] = SERVICE_NAME;
     return aServiceNames;
 
 }
@@ -102,15 +101,15 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
     ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( ! xParentWindow.is() || pParentWindow==NULL)
         throw RuntimeException(
-            A2S("PanelFactory::createUIElement called without ParentWindow"),
+            "PanelFactory::createUIElement called without ParentWindow",
             NULL);
     if ( ! xFrame.is())
         throw RuntimeException(
-            A2S("PanelFactory::createUIElement called without Frame"),
+            "PanelFactory::createUIElement called without Frame",
             NULL);
     if (pBindings == NULL)
         throw RuntimeException(
-            A2S("PanelFactory::createUIElement called without SfxBindings"),
+            "PanelFactory::createUIElement called without SfxBindings",
             NULL);
 
 #define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s))