fwk: some follow up of rtl cleanup

Change-Id: I434e714b6e5a38795c0baca85b51eef85a4732fd

framework/source/classes/menumanager.cxx

@@ -569,13 +569,13 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
                     else
                     {
                         menuShortCut[1] = (char)( '1' + i );
-                        aMenuShortCut = OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut ) );
+                        aMenuShortCut = OUString::createFromAscii( menuShortCut );
                     }
                 }
                 else
                 {
                     aMenuShortCut = OUString::valueOf((sal_Int32)( i + 1 ));
-                    aMenuShortCut += OUString( ": " );
+                    aMenuShortCut += ": ";
                 }
 
                 // Abbreviate URL

framework/source/fwe/xml/menudocumenthandler.cxx

@@ -253,7 +253,7 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void)
     if ( m_nElementDepth > 0 )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "A closing element is missing!" );
+        aErrorMessage += "A closing element is missing!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -300,7 +300,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menubar expected!" );
+                aErrorMessage += "closing element menubar expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -411,7 +411,7 @@ throw( SAXException, RuntimeException )
             else
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "attribute id for element menu required!" );
+                aErrorMessage += "attribute id for element menu required!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
 
@@ -422,7 +422,7 @@ throw( SAXException, RuntimeException )
     else
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "element menu expected!" );
+        aErrorMessage += "element menu expected!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -448,7 +448,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menu expected!" );
+                aErrorMessage += "closing element menu expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -508,7 +508,7 @@ throw( SAXException, RuntimeException )
     else
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "unknown element found!" );
+        aErrorMessage += "unknown element found!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -534,7 +534,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menupopup expected!" );
+                aErrorMessage += "closing element menupopup expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -642,7 +642,7 @@ throw( SAXException, RuntimeException )
         else
         {
             OUString aErrorMessage = getErrorLineString();
-            aErrorMessage += OUString( "attribute id for element menu required!" );
+            aErrorMessage += "attribute id for element menu required!";
             throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
         }
 
@@ -712,7 +712,7 @@ throw( SAXException, RuntimeException )
     else
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "unknown element found!" );
+        aErrorMessage += "unknown element found!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -738,7 +738,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menu expected!" );
+                aErrorMessage += "closing element menu expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -752,7 +752,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menuitem expected!" );
+                aErrorMessage += "closing element menuitem expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -761,7 +761,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR )))
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( "closing element menuseparator expected!" );
+                aErrorMessage += "closing element menuseparator expected!";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }

framework/source/fwe/xml/statusbardocumenthandler.cxx

@@ -198,7 +198,7 @@ throw(  SAXException, RuntimeException )
         ( !m_bStatusBarStartFound && m_bStatusBarEndFound )     )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "No matching start or end element 'statusbar' found!" );
+        aErrorMessage += "No matching start or end element 'statusbar' found!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -219,7 +219,7 @@ throw(  SAXException, RuntimeException )
                 if ( m_bStatusBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'statusbar:statusbar' cannot be embeded into 'statusbar:statusbar'!" );
+                    aErrorMessage += "Element 'statusbar:statusbar' cannot be embeded into 'statusbar:statusbar'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -232,14 +232,14 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bStatusBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'statusbar:statusbaritem' must be embeded into element 'statusbar:statusbar'!" );
+                    aErrorMessage += "Element 'statusbar:statusbaritem' must be embeded into element 'statusbar:statusbar'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 if ( m_bStatusBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element statusbar:statusbaritem is not a container!" );
+                    aErrorMessage += "Element statusbar:statusbaritem is not a container!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -284,7 +284,7 @@ throw(  SAXException, RuntimeException )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute statusbar:align must have one value of 'left','right' or 'center'!" );
+                                    aErrorMessage += "Attribute statusbar:align must have one value of 'left','right' or 'center'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -309,7 +309,7 @@ throw(  SAXException, RuntimeException )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute statusbar:autosize must have value 'true' or 'false'!" );
+                                    aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -324,7 +324,7 @@ throw(  SAXException, RuntimeException )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute statusbar:autosize must have value 'true' or 'false'!" );
+                                    aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -339,7 +339,7 @@ throw(  SAXException, RuntimeException )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute statusbar:ownerdraw must have value 'true' or 'false'!" );
+                                    aErrorMessage += "Attribute statusbar:ownerdraw must have value 'true' or 'false'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -372,7 +372,7 @@ throw(  SAXException, RuntimeException )
                 if ( !bCommandURL )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute statusbar:url must have a value!" );
+                    aErrorMessage += "Required attribute statusbar:url must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
                         else
@@ -418,7 +418,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bStatusBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'statusbar' found, but no start element 'statusbar'" );
+                    aErrorMessage += "End element 'statusbar' found, but no start element 'statusbar'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -431,7 +431,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bStatusBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'" );
+                    aErrorMessage += "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 

framework/source/fwe/xml/toolboxdocumenthandler.cxx

@@ -210,7 +210,7 @@ throw(  SAXException, RuntimeException )
         ( !m_bToolBarStartFound && m_bToolBarEndFound )     )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "No matching start or end element 'toolbar' found!" );
+        aErrorMessage += "No matching start or end element 'toolbar' found!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -231,7 +231,7 @@ throw(  SAXException, RuntimeException )
                 if ( m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'toolbar:toolbar' cannot be embeded into 'toolbar:toolbar'!" );
+                    aErrorMessage += "Element 'toolbar:toolbar' cannot be embeded into 'toolbar:toolbar'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
                         else
@@ -280,7 +280,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'toolbar:toolbaritem' must be embeded into element 'toolbar:toolbar'!" );
+                    aErrorMessage += "Element 'toolbar:toolbaritem' must be embeded into element 'toolbar:toolbar'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -290,7 +290,7 @@ throw(  SAXException, RuntimeException )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element toolbar:toolbaritem is not a container!" );
+                    aErrorMessage += "Element toolbar:toolbaritem is not a container!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -346,7 +346,7 @@ throw(  SAXException, RuntimeException )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute toolbar:visible must have value 'true' or 'false'!" );
+                                    aErrorMessage += "Attribute toolbar:visible must have value 'true' or 'false'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -408,7 +408,7 @@ throw(  SAXException, RuntimeException )
                 if ( !bAttributeURL )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute toolbar:url must have a value!" );
+                    aErrorMessage += "Required attribute toolbar:url must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -461,7 +461,7 @@ throw(  SAXException, RuntimeException )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element toolbar:toolbarspace is not a container!" );
+                    aErrorMessage += "Element toolbar:toolbarspace is not a container!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -486,7 +486,7 @@ throw(  SAXException, RuntimeException )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element toolbar:toolbarbreak is not a container!" );
+                    aErrorMessage += "Element toolbar:toolbarbreak is not a container!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -511,7 +511,7 @@ throw(  SAXException, RuntimeException )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element toolbar:toolbarseparator is not a container!" );
+                    aErrorMessage += "Element toolbar:toolbarseparator is not a container!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -549,7 +549,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'toolbar' found, but no start element 'toolbar'" );
+                    aErrorMessage += "End element 'toolbar' found, but no start element 'toolbar'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -562,7 +562,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'" );
+                    aErrorMessage += "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -575,7 +575,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarBreakStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'" );
+                    aErrorMessage += "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -588,7 +588,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarSpaceStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'" );
+                    aErrorMessage += "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -601,7 +601,7 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bToolBarSeparatorStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'" );
+                    aErrorMessage += "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 

framework/source/fwe/xml/xmlnamespaces.cxx

@@ -104,7 +104,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th
         if ( aName.getLength() > index+1 )
         {
             OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) );
-            aAttributeName += OUString("^");
+            aAttributeName += "^";
             aAttributeName += aName.copy( index+1 );
             return aAttributeName;
         }
@@ -135,7 +135,7 @@ OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const   th
     if ( !aNamespace.isEmpty() )
     {
         aElementName = aNamespace;
-        aElementName += OUString("^");
+        aElementName += "^";
     }
     else
         return aName;

framework/source/services/substitutepathvars.cxx

@@ -257,7 +257,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu
         while ( nSharePoints < aSharePointNames.getLength() )
         {
             OUString aSharePointNodeName( m_aSharePointsNodeName );
-            aSharePointNodeName += OUString("/");
+            aSharePointNodeName += "/";
             aSharePointNodeName += aSharePointNames[ nSharePoints ];
 
             SubstituteRuleVector aRuleSet;

framework/source/uielement/langselectionstatusbarcontroller.cxx

@@ -264,45 +264,45 @@ throw (::com::sun::star::uno::RuntimeException)
         {
             //set selected language as current language for selection
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Current_";
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_SEL_NONE)
         {
             //set None as current language for selection
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE";
         }
         else if (nId == MID_LANG_SEL_RESET)
         {
             // reset language attributes for selection
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES";
         }
         else if (nId == MID_LANG_SEL_MORE)
         {
             //open the dialog "format/character" for current selection
-            aURL.Complete += OUString(".uno:FontDialog?Language:string=*");
+            aURL.Complete += ".uno:FontDialog?Language:string=*";
         }
         else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
             //set selected language for current paragraph
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Paragraph_";
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_PARA_NONE)
         {
             //set None as language for current paragraph
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE";
         }
         else if (nId == MID_LANG_PARA_RESET)
         {
             // reset language attributes for paragraph
-            aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+            aURL.Complete += ".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES";
         }
         else if (nId == MID_LANG_PARA_MORE)
         {
             //open the dialog "format/character" for current paragraph
-            aURL.Complete += OUString(".uno:FontDialogForParagraph");
+            aURL.Complete += ".uno:FontDialogForParagraph";
         }
 
         uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)) );

framework/source/uielement/recentfilesmenucontroller.cxx

@@ -156,13 +156,13 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                     {
                         char menuShortCut[5] = "~n: ";
                         menuShortCut[1] = (char)( '1' + i );
-                        aMenuShortCut = OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut ));
+                        aMenuShortCut = OUString::createFromAscii( menuShortCut );
                     }
                 }
                 else
                 {
                     aMenuShortCut = OUString::valueOf((sal_Int32)( i + 1 ));
-                    aMenuShortCut += OUString( ": " );
+                    aMenuShortCut += ": ";
                 }
 
                 // Abbreviate URL

framework/source/xml/imagesdocumenthandler.cxx

@@ -159,7 +159,7 @@ throw(  SAXException, RuntimeException )
         ( !m_bImageContainerStartFound && m_bImageContainerEndFound )    )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( "No matching start or end element 'image:imagecontainer' found!" );
+        aErrorMessage += "No matching start or end element 'image:imagecontainer' found!";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -181,7 +181,7 @@ throw(  SAXException, RuntimeException )
                 if ( m_bImageContainerStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" );
+                    aErrorMessage += "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -194,14 +194,14 @@ throw(  SAXException, RuntimeException )
                 if ( !m_bImageContainerStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" );
+                    aErrorMessage += "Element 'image:images' must be embeded into element 'image:imagecontainer'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 if ( m_bImagesStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:images' cannot be embeded into 'image:images'!" );
+                    aErrorMessage += "Element 'image:images' cannot be embeded into 'image:images'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -260,7 +260,7 @@ throw(  SAXException, RuntimeException )
                                     m_pImages = NULL;
 
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += OUString( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" );
+                                    aErrorMessage += "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -290,7 +290,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute xlink:href must have a value!" );
+                    aErrorMessage += "Required attribute xlink:href must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
             }
@@ -305,7 +305,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:entry' must be embeded into element 'image:images'!" );
+                    aErrorMessage += "Element 'image:entry' must be embeded into element 'image:images'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -352,7 +352,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute 'image:bitmap-index' must have a value >= 0!" );
+                    aErrorMessage += "Required attribute 'image:bitmap-index' must have a value >= 0!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -364,7 +364,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute 'image:command' must have a value!" );
+                    aErrorMessage += "Required attribute 'image:command' must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -382,7 +382,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" );
+                    aErrorMessage += "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -393,7 +393,7 @@ throw(  SAXException, RuntimeException )
                     m_pImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" );
+                    aErrorMessage += "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -413,7 +413,7 @@ throw(  SAXException, RuntimeException )
                     m_pExternalImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" );
+                    aErrorMessage += "Element 'image:externalentry' must be embeded into 'image:externalimages'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -425,7 +425,7 @@ throw(  SAXException, RuntimeException )
                     m_pExternalImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" );
+                    aErrorMessage += "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -469,7 +469,7 @@ throw(  SAXException, RuntimeException )
                     m_pExternalImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute 'image:command' must have a value!" );
+                    aErrorMessage += "Required attribute 'image:command' must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -483,7 +483,7 @@ throw(  SAXException, RuntimeException )
                     m_pExternalImages = NULL;
 
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += OUString( "Required attribute 'xlink:href' must have a value!" );
+                    aErrorMessage += "Required attribute 'xlink:href' must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }