[PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from accessibility (there was two equalsAsciiL leftovers too)

Hi, I'm going to send these on a per module basis for easier reviewing. (Previous 1.5M sized 
megapatch was very difficult to review)

Szabolcs

From b1e5ee9739d6df66f4a80e9fd513151d1668f1c6 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi <dezsiszabi@hotmail.com>
Date: Thu, 19 Apr 2012 09:51:41 +0200
Subject: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from accessibility

---
 .../source/java/WindowsAccessBridgeAdapter.cxx     |    4 +-
 .../source/extended/AccessibleBrowseBoxBase.cxx    |    2 +-
 .../extended/AccessibleBrowseBoxTableBase.cxx      |    9 +-
 .../source/extended/AccessibleGridControlBase.cxx  |    2 +-
 .../extended/AccessibleGridControlTableBase.cxx    |    9 +-
 .../extended/accessibleeditbrowseboxcell.cxx       |    4 +-
 .../source/extended/accessibleiconchoicectrl.cxx   |    8 +-
 .../extended/accessibleiconchoicectrlentry.cxx     |    8 +-
 .../source/extended/accessiblelistbox.cxx          |    6 +-
 .../source/extended/accessiblelistboxentry.cxx     |    8 +-
 accessibility/source/extended/accessibletabbar.cxx |    2 +-
 .../source/extended/accessibletabbarpage.cxx       |    2 +-
 .../source/extended/accessibletabbarpagelist.cxx   |    2 +-
 .../source/extended/textwindowaccessibility.cxx    |   98 +++++---------------
 .../source/helper/characterattributeshelper.cxx    |   24 +++---
 .../source/standard/vclxaccessiblebutton.cxx       |    8 +-
 .../source/standard/vclxaccessiblecheckbox.cxx     |    2 +-
 .../source/standard/vclxaccessiblecombobox.cxx     |    2 +-
 .../standard/vclxaccessibledropdowncombobox.cxx    |    2 +-
 .../standard/vclxaccessibledropdownlistbox.cxx     |    2 +-
 .../source/standard/vclxaccessibleedit.cxx         |    4 +-
 .../standard/vclxaccessiblefixedhyperlink.cxx      |    2 +-
 .../source/standard/vclxaccessiblefixedtext.cxx    |    2 +-
 .../source/standard/vclxaccessiblelist.cxx         |    2 +-
 .../source/standard/vclxaccessiblelistbox.cxx      |    2 +-
 .../source/standard/vclxaccessiblelistitem.cxx     |    6 +-
 .../source/standard/vclxaccessiblemenu.cxx         |    2 +-
 .../source/standard/vclxaccessiblemenubar.cxx      |    2 +-
 .../source/standard/vclxaccessiblemenuitem.cxx     |    2 +-
 .../standard/vclxaccessiblemenuseparator.cxx       |    2 +-
 .../source/standard/vclxaccessiblepopupmenu.cxx    |    2 +-
 .../source/standard/vclxaccessibleradiobutton.cxx  |    2 +-
 .../source/standard/vclxaccessiblescrollbar.cxx    |    2 +-
 .../source/standard/vclxaccessiblestatusbar.cxx    |    2 +-
 .../standard/vclxaccessiblestatusbaritem.cxx       |    2 +-
 .../source/standard/vclxaccessibletabcontrol.cxx   |    2 +-
 .../source/standard/vclxaccessibletabpage.cxx      |    2 +-
 .../source/standard/vclxaccessibletextfield.cxx    |    2 +-
 .../source/standard/vclxaccessibletoolbox.cxx      |    2 +-
 .../source/standard/vclxaccessibletoolboxitem.cxx  |    8 +-
 40 files changed, 100 insertions(+), 156 deletions(-)

diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx 
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 9ee03eb..2655b60 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -140,10 +140,10 @@ 
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
 
         if ( g_xUnoVirtualMachine.is() )
         {
-            OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java"));
+            OUString sJava("java");
             uno_getEnvironment(&pJava_environment, sJava.pData, g_xUnoVirtualMachine.get());
 
-            OUString 
sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
+            OUString sCppu_current_lb_name( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
             uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL);
 
             if ( pJava_environment && pUno_environment )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 4391ec5..c8a262f 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -375,7 +375,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
 Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleContext" ) );
+    const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" );
     return Sequence< OUString >( &aServiceName, 1 );
 }
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 3d31748..51bbdfc 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -321,16 +321,14 @@ void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nRow >= implGetRowCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this );
+        throw lang::IndexOutOfBoundsException( "row index is invalid", *this );
 }
 
 void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nColumn >= implGetColumnCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
+        throw lang::IndexOutOfBoundsException( "column index is invalid", *this );
 }
 
 void AccessibleBrowseBoxTableBase::ensureIsValidAddress(
@@ -345,8 +343,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nChildIndex >= implGetChildCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this );
+        throw lang::IndexOutOfBoundsException( "child index is invalid", *this );
 }
 
 // ============================================================================
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx 
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 6bf0ea7..e83f6a9 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -308,7 +308,7 @@ sal_Bool SAL_CALL AccessibleGridControlBase::supportsService(
 Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleContext" ) );
+    const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" );
     return Sequence< OUString >( &aServiceName, 1 );
 }
 // internal virtual methods ---------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx 
b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 46cd4e3..03894df 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -255,16 +255,14 @@ void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nRow >= m_aTable.GetRowCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this );
+        throw lang::IndexOutOfBoundsException( "row index is invalid", *this );
 }
 
 void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nColumn >= m_aTable.GetColumnCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
+        throw lang::IndexOutOfBoundsException( "column index is invalid", *this );
 }
 
 void AccessibleGridControlTableBase::ensureIsValidAddress(
@@ -279,8 +277,7 @@ void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
     throw ( lang::IndexOutOfBoundsException )
 {
     if( nChildIndex >= implGetChildCount() )
-        throw lang::IndexOutOfBoundsException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this );
+        throw lang::IndexOutOfBoundsException( "child index is invalid", *this );
 }
 
 // ============================================================================
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx 
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 3af5117..4527acf 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -136,11 +136,11 @@ namespace accessibility
         rtl::OUStringBuffer sName(mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< 
sal_uInt16 >( getColumnPos() ) ));
         if ( 0 == sName.getLength() )
         {
-            sName.appendAscii(RTL_CONSTASCII_STRINGPARAM("Column "));
+            sName.appendAscii("Column ");
             sName.append(getColumnPos());
         }
 
-        sName.appendAscii(RTL_CONSTASCII_STRINGPARAM(", Row "));
+        sName.appendAscii(", Row ");
         sName.append(getRowPos());
 
         return sName.makeStringAndClear();
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx 
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index c7894ad..05abf99 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -141,9 +141,9 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) 
throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(3);
-        aSupported[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
-        aSupported[1] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
-        aSupported[2] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControl") );
+        aSupported[0] = "com.sun.star.accessibility.AccessibleContext";
+        aSupported[1] = "com.sun.star.accessibility.AccessibleComponent";
+        aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControl";
         return aSupported;
     }
     // -----------------------------------------------------------------------------
@@ -212,7 +212,7 @@ namespace accessibility
 
         ::rtl::OUString sName = getCtrl()->GetAccessibleName();
         if ( sName.isEmpty() )
-            sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) );
+            sName = "IconChoiceControl";
         return sName;
     }
     // -----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx 
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 610c2b9..953e521 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -282,9 +282,9 @@ throw(RuntimeException)
     Sequence< ::rtl::OUString > 
AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< ::rtl::OUString > aSupported(3);
-        aSupported[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
-        aSupported[1] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
-        aSupported[2] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControlEntry") );
+        aSupported[0] = "com.sun.star.accessibility.AccessibleContext";
+        aSupported[1] = "com.sun.star.accessibility.AccessibleComponent";
+        aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControlEntry";
         return aSupported;
     }
     // -----------------------------------------------------------------------------
@@ -712,7 +712,7 @@ throw(RuntimeException)
         checkActionIndex_Impl( nIndex );
         EnsureIsAlive();
 
-        static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "Select" ) );
+        static const ::rtl::OUString sActionDesc( "Select" );
         return sActionDesc;
     }
     // -----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessiblelistbox.cxx 
b/accessibility/source/extended/accessiblelistbox.cxx
index 7dce4ef..92ec459 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -216,9 +216,9 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( 
RuntimeException )
     {
         Sequence< ::rtl::OUString > aSupported(3);
-        aSupported[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
-        aSupported[1] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
-        aSupported[2] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBox") );
+        aSupported[0] = "com.sun.star.accessibility.AccessibleContext";
+        aSupported[1] = "com.sun.star.accessibility.AccessibleComponent";
+        aSupported[2] = "com.sun.star.awt.AccessibleTreeListBox";
         return aSupported;
     }
     // -----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx 
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 74b99ac..1ddf8e7 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -289,9 +289,9 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) 
throw( RuntimeException )
     {
         Sequence< ::rtl::OUString > aSupported(3);
-        aSupported[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
-        aSupported[1] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
-        aSupported[2] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBoxEntry") );
+        aSupported[0] = "com.sun.star.accessibility.AccessibleContext";
+        aSupported[1] = "com.sun.star.accessibility.AccessibleComponent";
+        aSupported[2] = "com.sun.star.awt.AccessibleTreeListBoxEntry";
         return aSupported;
     }
     // -----------------------------------------------------------------------------
@@ -686,7 +686,7 @@ namespace accessibility
         checkActionIndex_Impl( nIndex );
         EnsureIsAlive();
 
-        static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "toggleExpand" ) );
+        static const ::rtl::OUString sActionDesc( "toggleExpand" );
         return sActionDesc;
     }
     // -----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/accessibletabbar.cxx 
b/accessibility/source/extended/accessibletabbar.cxx
index 6bfb0be..d09c51e 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -227,7 +227,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBar::getSupportedServiceNames() throw 
(RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.awt.AccessibleTabBar" ));
+        aNames[0] = "com.sun.star.awt.AccessibleTabBar";
         return aNames;
     }
 
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx 
b/accessibility/source/extended/accessibletabbarpage.cxx
index 70da3e8..1aee270 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -279,7 +279,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBarPage::getSupportedServiceNames() throw 
(RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.awt.AccessibleTabBarPage" ));
+        aNames[0] = "com.sun.star.awt.AccessibleTabBarPage";
         return aNames;
     }
 
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx 
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index fe3aaf1..1ec8d45 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -447,7 +447,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw 
(RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.awt.AccessibleTabBarPageList" ));
+        aNames[0] = "com.sun.star.awt.AccessibleTabBarPageList";
         return aNames;
     }
 
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index 39b332c..a658b86 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -152,12 +152,8 @@ ParagraphImpl::getAccessibleChild(::sal_Int32)
            ::css::uno::RuntimeException)
 {
     checkDisposed();
-    throw ::css::lang::IndexOutOfBoundsException(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "textwindowaccessibility.cxx:"
-                " ParagraphImpl::getAccessibleChild")),
-        static_cast< ::css::uno::XWeak * >(this));
+    throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
ParagraphImpl::getAccessibleChild",
+        static_cast< ::css::uno::XWeak * >(this) );
 }
 
 // virtual
@@ -633,11 +629,7 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< 
:
             getTextAtLineNumber( nLineNo ) :
             ::css::accessibility::TextSegment();
     } catch (const ::css::lang::IndexOutOfBoundsException&) {
-        throw ::css::uno::RuntimeException(
-            ::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "textwindowaccessibility.cxx:"
-                    " ParagraphImpl::getTextAtLineWithCaret") ),
+        throw ::css::uno::RuntimeException( "textwindowaccessibility.cxx: 
ParagraphImpl::getTextAtLineWithCaret",
             static_cast< ::css::uno::XWeak * >( this ) );
     }
 }
@@ -954,12 +946,8 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
     sal_Int32 nLength = m_rEngine.GetText(nNumber).Len();
         // XXX  numeric overflow
     if (nIndex < 0 || nIndex > nLength)
-        throw ::css::lang::IndexOutOfBoundsException(
-            ::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "textwindowaccessibility.cxx:"
-                    " Document::retrieveCharacterAttributes")),
-            static_cast< ::css::uno::XWeak * >(this));
+        throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::retrieveCharacterAttributes",
+            static_cast< ::css::uno::XWeak * >(this) );
     ::css::awt::Rectangle aBounds( 0, 0, 0, 0 );
     if ( nIndex == nLength )
     {
@@ -1022,12 +1010,8 @@ Document::retrieveCharacterAttributes(
     ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
         // XXX  numeric overflow
     if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len())
-        throw ::css::lang::IndexOutOfBoundsException(
-            ::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "textwindowaccessibility.cxx:"
-                    " Document::retrieveCharacterAttributes")),
-            static_cast< ::css::uno::XWeak * >(this));
+        throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::retrieveCharacterAttributes",
+            static_cast< ::css::uno::XWeak * >(this) );
 
     // retrieve default attributes
     tPropValMap aCharAttrSeq;
@@ -1108,8 +1092,7 @@ void Document::retrieveRunAttributesImpl(
     if ( pColor )
     {
         ::css::beans::PropertyValue aPropVal;
-        aPropVal.Name =
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) );
+        aPropVal.Name = "CharColor";
         aPropVal.Handle = -1;
         aPropVal.Value = mapFontColor( pColor->GetColor() );
         aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE;
@@ -1118,8 +1101,7 @@ void Document::retrieveRunAttributesImpl(
     if ( pWeight )
     {
         ::css::beans::PropertyValue aPropVal;
-        aPropVal.Name =
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) );
+        aPropVal.Name = "CharWeight";
         aPropVal.Handle = -1;
         aPropVal.Value = mapFontWeight( pWeight->getFontWeight() );
         aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE;
@@ -1154,11 +1136,7 @@ Document::retrieveRunAttributes(
     ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         // XXX  numeric overflow
     if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() )
-        throw ::css::lang::IndexOutOfBoundsException(
-            ::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "textwindowaccessibility.cxx:"
-                    " Document::retrieveRunAttributes") ),
+        throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::retrieveRunAttributes",
             static_cast< ::css::uno::XWeak * >( this ) );
 
     tPropValMap aRunAttrSeq;
@@ -1191,12 +1169,8 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "textwindowaccessibility.cxx:"
-                        " Document::changeParagraphText")),
-                static_cast< ::css::uno::XWeak * >(this));
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::changeParagraphText",
+                static_cast< ::css::uno::XWeak * >(this) );
         changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin),
                             static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText);
             // XXX  numeric overflow (2x)
@@ -1213,11 +1187,8 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                    "textwindowaccessibility.cxx:"
-                                    " Document::copyParagraphText")),
-                static_cast< ::css::uno::XWeak * >(this));
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::copyParagraphText",
+                static_cast< ::css::uno::XWeak * >(this) );
         m_rView.SetSelection(
             ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
                             ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
@@ -1237,26 +1208,20 @@ void Document::changeParagraphAttributes(
         // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "textwindowaccessibility.cxx:"
-                        " Document::changeParagraphAttributes")),
-                static_cast< ::css::uno::XWeak * >(this));
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::changeParagraphAttributes",
+                static_cast< ::css::uno::XWeak * >(this) );
 
         // FIXME  The new attributes are added to any attributes already set,
         // they do not replace the old attributes as required by
         // XAccessibleEditableText.setAttributes:
         for (::sal_Int32 i = 0; i < rAttributeSet.getLength(); ++i)
-            if (rAttributeSet[i].Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("CharColor")))
+            if ( rAttributeSet[i].Name == "CharColor" )
                 m_rEngine.SetAttrib(::TextAttribFontColor(
                                         mapFontColor(rAttributeSet[i].Value)),
                                     nNumber, static_cast< ::sal_uInt16 >(nBegin),
                                     static_cast< ::sal_uInt16 >(nEnd));
                     // XXX  numeric overflow (2x)
-            else if (rAttributeSet[i].Name.equalsAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM("CharWeight")))
+            else if ( rAttributeSet[i].Name == "CharWeight" )
                 m_rEngine.SetAttrib(::TextAttribFontWeight(
                                         mapFontWeight(rAttributeSet[i].Value)),
                                     nNumber, static_cast< ::sal_uInt16 >(nBegin),
@@ -1275,11 +1240,8 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                    "textwindowaccessibility.cxx:"
-                                    " Document::changeParagraphSelection")),
-                static_cast< ::css::uno::XWeak * >(this));
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::changeParagraphSelection",
+                static_cast< ::css::uno::XWeak * >(this) );
         m_rView.SetSelection(
             ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
                             ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
@@ -1300,11 +1262,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
         ::osl::MutexGuard aInternalGuard( GetMutex() );
         ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() )
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "textwindowaccessibility.cxx:"
-                        " Document::retrieveParagraphLineBoundary" ) ),
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::retrieveParagraphLineBoundary",
                 static_cast< ::css::uno::XWeak * >( this ) );
         ::sal_Int32 nLineStart = 0;
         ::sal_Int32 nLineEnd = 0;
@@ -1342,11 +1300,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
         ::osl::MutexGuard aInternalGuard( GetMutex() );
         ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) )
-            throw ::css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "textwindowaccessibility.cxx:"
-                        " Document::retrieveParagraphBoundaryOfLine" ) ),
+            throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::retrieveParagraphBoundaryOfLine",
                 static_cast< ::css::uno::XWeak * >( this ) );
         ::sal_Int32 nLineStart = 0;
         ::sal_Int32 nLineEnd = 0;
@@ -1443,12 +1397,8 @@ Document::getAccessibleChild(::sal_Int32 i)
     ::comphelper::OExternalLockGuard aGuard(this);
     init();
     if (i < 0 || i >= m_aVisibleEnd - m_aVisibleBegin)
-        throw ::css::lang::IndexOutOfBoundsException(
-            ::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "textwindowaccessibility.cxx:"
-                    " Document::getAccessibleChild")),
-            static_cast< ::css::uno::XWeak * >(this));
+        throw ::css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx: 
Document::getAccessibleChild",
+            static_cast< ::css::uno::XWeak * >(this) );
     return getAccessibleChild(m_aVisibleBegin
                               + static_cast< Paragraphs::size_type >(i));
 }
diff --git a/accessibility/source/helper/characterattributeshelper.cxx 
b/accessibility/source/helper/characterattributeshelper.cxx
index 7fd0a3b..4419757 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -34,18 +34,18 @@ using namespace ::com::sun::star::beans;
 
 CharacterAttributesHelper::CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, 
sal_Int32 nColor )
 {
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharBackColor" )),     makeAny( (sal_Int32) nBackColor ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharColor" )),         makeAny( (sal_Int32) nColor ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" )),   makeAny( (sal_Int16) rFont.GetCharSet() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" )),    makeAny( (sal_Int16) rFont.GetFamily() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharFontName" )),      makeAny( (::rtl::OUString) rFont.GetName() ) ) 
);
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" )),     makeAny( (sal_Int16) rFont.GetPitch() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharFontStyleName" )), makeAny( (::rtl::OUString) 
rFont.GetStyleName() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharHeight" )),        makeAny( (sal_Int16) rFont.GetSize().Height() 
) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" )),    makeAny( (sal_Int16) rFont.GetSize().Width() ) 
) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" )),     makeAny( (sal_Int16) rFont.GetStrikeout() ) ) 
);
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" )),     makeAny( (sal_Int16) rFont.GetUnderline() ) ) 
);
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "CharWeight" )),        makeAny( (float) rFont.GetWeight() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharBackColor",     makeAny( (sal_Int32) 
nBackColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharColor",         makeAny( (sal_Int32) 
nColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharFontCharSet",   makeAny( (sal_Int16) 
rFont.GetCharSet() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharFontFamily",    makeAny( (sal_Int16) 
rFont.GetFamily() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharFontName",      makeAny( 
(::rtl::OUString) rFont.GetName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharFontPitch",     makeAny( (sal_Int16) 
rFont.GetPitch() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharFontStyleName", makeAny( 
(::rtl::OUString) rFont.GetStyleName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharHeight",        makeAny( (sal_Int16) 
rFont.GetSize().Height() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharScaleWidth",    makeAny( (sal_Int16) 
rFont.GetSize().Width() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharStrikeout",     makeAny( (sal_Int16) 
rFont.GetStrikeout() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharUnderline",     makeAny( (sal_Int16) 
rFont.GetUnderline() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( "CharWeight",        makeAny( (float) 
rFont.GetWeight() ) ) );
 }
 
 
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx 
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f9ffa8e..3702b83 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -135,7 +135,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon
 Sequence< ::rtl::OUString > VCLXAccessibleButton::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleButton") 
);
+    aNames[0] = "com.sun.star.awt.AccessibleButton";
     return aNames;
 }
 
@@ -150,7 +150,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleButton::getSupportedServiceNames() thr
     ::rtl::OUString aName( VCLXAccessibleTextComponent::getAccessibleName() );
     sal_Int32 nLength = aName.getLength();
 
-    if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("..."), nLength - 3 ) )
+    if ( nLength >= 3 && aName.matchAsciiL( "...", nLength - 3 ) )
     {
         if ( nLength == 3 )
         {
@@ -163,12 +163,12 @@ Sequence< ::rtl::OUString > VCLXAccessibleButton::getSupportedServiceNames() 
thr
             aName = aName.copy( 0, nLength - 3 );
         }
     }
-    else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("<< "), 0 ) )
+    else if ( nLength >= 3 && aName.matchAsciiL( "<< ", 0 ) )
     {
         // remove the leading symbols
         aName = aName.copy( 3, nLength - 3 );
     }
-    else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(" >>"), nLength - 3 ) )
+    else if ( nLength >= 3 && aName.matchAsciiL( " >>", nLength - 3 ) )
     {
         // remove the trailing symbols
         aName = aName.copy( 0, nLength - 3 );
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx 
b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index fc92ab5..ba17bd9 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -185,7 +185,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp
 Sequence< ::rtl::OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleCheckBox") );
+    aNames[0] = "com.sun.star.awt.AccessibleCheckBox";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx 
b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index ec6a524..2d9e1f6 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -89,7 +89,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (vo
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleComboBox" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleComboBox";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx 
b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index b8d5430..c5067f4 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -112,7 +112,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceN
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleDropDownComboBox" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleDropDownComboBox";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx 
b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 24765a7..2a16a92 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -102,7 +102,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNa
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleDropDownListBox" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleDropDownListBox";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx 
b/accessibility/source/standard/vclxaccessibleedit.cxx
index 3070639..496c59b 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -203,7 +203,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen
 Sequence< ::rtl::OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleEdit") );
+    aNames[0] = "com.sun.star.awt.AccessibleEdit";
     return aNames;
 }
 
@@ -287,7 +287,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    static const ::rtl::OUString sAction( RTL_CONSTASCII_USTRINGPARAM( "activate" ) );
+    static const ::rtl::OUString sAction( "activate" );
     return sAction;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx 
b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index 833c2cc..199942c 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -76,7 +76,7 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar
 uno::Sequence< ::rtl::OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw 
(uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleFixedHyperlink") );
+    aNames[0] = "com.sun.star.awt.AccessibleFixedHyperlink";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx 
b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 01ab549..045f1d4 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -88,7 +88,7 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa
 Sequence< ::rtl::OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleFixedText") );
+    aNames[0] = "com.sun.star.awt.AccessibleFixedText";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index dfc36fc..e0a75b3 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -517,7 +517,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleList::getSupportedServiceNames (void)
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleList"));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleList";
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx 
b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 3bc0355..9af423a 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -100,7 +100,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (voi
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleListBox" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleListBox";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 9901373..d8377fb 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -245,9 +245,9 @@ sal_Bool VCLXAccessibleListItem::supportsService( const ::rtl::OUString& rServic
 Sequence< ::rtl::OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(3);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleContext" ));
-    aNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleComponent" ));
-    aNames[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleListItem" ));
+    aNames[0] = "com.sun.star.accessibility.AccessibleContext";
+    aNames[1] = "com.sun.star.accessibility.AccessibleComponent";
+    aNames[2] = "com.sun.star.accessibility.AccessibleListItem";
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx 
b/accessibility/source/standard/vclxaccessiblemenu.cxx
index 24b63e1..f350df8 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -110,7 +110,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC
 Sequence< ::rtl::OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenu") );
+    aNames[0] = "com.sun.star.awt.AccessibleMenu";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx 
b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 9d2c51d..40af277 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -149,7 +149,7 @@ void VCLXAccessibleMenuBar::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuBar") 
);
+    aNames[0] = "com.sun.star.awt.AccessibleMenuBar";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx 
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 10c72b4..b23eb9d 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -183,7 +183,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom
 Sequence< ::rtl::OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuItem") );
+    aNames[0] = "com.sun.star.awt.AccessibleMenuItem";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx 
b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 60ba1c0..a6869b9 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -66,7 +66,7 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
 Sequence< ::rtl::OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuSeparator") );
+    aNames[0] = "com.sun.star.awt.AccessibleMenuSeparator";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx 
b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 13bb7c5..21712c5 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -72,7 +72,7 @@ sal_Bool VCLXAccessiblePopupMenu::IsFocused()
 Sequence< ::rtl::OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessiblePopupMenu") );
+    aNames[0] = "com.sun.star.awt.AccessiblePopupMenu";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx 
b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 73eefb6..c0eb471 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -161,7 +161,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC
 Sequence< ::rtl::OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleRadioButton") );
+    aNames[0] = "com.sun.star.awt.AccessibleRadioButton";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx 
b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 812aed6..52e1ce9 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -124,7 +124,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone
 Sequence< ::rtl::OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleScrollBar") );
+    aNames[0] = "com.sun.star.awt.AccessibleScrollBar";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx 
b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 4783925..1766dbd 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -301,7 +301,7 @@ void VCLXAccessibleStatusBar::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleStatusBar") );
+    aNames[0] = "com.sun.star.awt.AccessibleStatusBar";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx 
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 54746e7..98edbd7 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -263,7 +263,7 @@ sal_Bool VCLXAccessibleStatusBarItem::supportsService( const ::rtl::OUString& rS
 Sequence< ::rtl::OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.awt.AccessibleStatusBarItem" ));
+    aNames[0] = "com.sun.star.awt.AccessibleStatusBarItem";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx 
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 26a9f39..25e5a40 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -361,7 +361,7 @@ void VCLXAccessibleTabControl::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTabControl") );
+    aNames[0] = "com.sun.star.awt.AccessibleTabControl";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx 
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index faa74af..d061f03 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -295,7 +295,7 @@ sal_Bool VCLXAccessibleTabPage::supportsService( const ::rtl::OUString& rService
 Sequence< ::rtl::OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabPage" 
));
+    aNames[0] = "com.sun.star.awt.AccessibleTabPage";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx 
b/accessibility/source/standard/vclxaccessibletextfield.cxx
index de7ec02..8c917c3 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -147,7 +147,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleTextField::getSupportedServiceNames (v
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleTextField" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleTextField";
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx 
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 1961879..59ae6b2 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -691,7 +691,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleToolBox::getSupportedServiceNames() th
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleToolBox" ));
+    aNames[nLength] = "com.sun.star.accessibility.AccessibleToolBox";
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx 
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 575d672..5657716 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -302,10 +302,10 @@ sal_Bool VCLXAccessibleToolBoxItem::supportsService( const ::rtl::OUString& 
rSer
 Sequence< ::rtl::OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw 
(RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(4);
-    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleContext" ));
-    aNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleComponent" ));
-    aNames[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleExtendedComponent" ));
-    aNames[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.accessibility.AccessibleToolBoxItem" ));
+    aNames[0] = "com.sun.star.accessibility.AccessibleContext";
+    aNames[1] = "com.sun.star.accessibility.AccessibleComponent";
+    aNames[2] = "com.sun.star.accessibility.AccessibleExtendedComponent";
+    aNames[3] = "com.sun.star.accessibility.AccessibleToolBoxItem";
     return aNames;
 }
 // -----------------------------------------------------------------------------
-- 
1.7.7