String and OUString cleaning in xmloff

Change-Id: I85d7fd7733814c60a048a7f87d43fbcbb83b0eb0

sw/source/core/inc/SwXMLBlockImport.hxx

@@ -30,6 +30,7 @@
 #define _SW_XMLBLOCKIMPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
+#include <tools/string.hxx>
 
 class SwXMLTextBlocks;
 class SwXMLBlockListImport : public SvXMLImport

sw/source/core/swg/SwXMLSectionList.cxx

@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
+#include <tools/string.hxx>
 #include <SwXMLSectionList.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <tools/string.hxx>
 #include <vector>
 
 using namespace ::com::sun::star;

xmloff/source/style/styleexp.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <tools/debug.hxx>
-#include <tools/string.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
@@ -42,9 +41,6 @@
 #include <set>
 #include <boost/scoped_ptr.hpp>
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::style;
@@ -57,7 +53,7 @@ using ::com::sun::star::document::XEventsSupplier;
 
 XMLStyleExport::XMLStyleExport(
         SvXMLExport& rExp,
-        const ::rtl::OUString& rPoolStyleName,
+        const OUString& rPoolStyleName,
         SvXMLAutoStylePoolP *pAutoStyleP ) :
     rExport( rExp ),
     sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
@@ -84,7 +80,7 @@ void XMLStyleExport::exportStyleContent( const Reference< XStyle >& )
 
 sal_Bool XMLStyleExport::exportStyle(
         const Reference< XStyle >& rStyle,
-          const OUString& rXMLFamily,
+        const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
         const Reference< XNameAccess >& xStyles,
         const OUString* pPrefix )
@@ -396,12 +392,12 @@ void XMLStyleExport::exportStyleFamily(
        // If next styles are supported and used styles should be exported only,
     // the next style may be unused but has to be exported, too. In this case
     // the names of all exported styles are remembered.
-    boost::scoped_ptr<std::set<String> > pExportedStyles(0);
+    boost::scoped_ptr<std::set<OUString> > pExportedStyles(0);
     sal_Bool bFirstStyle = sal_True;
 
-    const uno::Sequence< ::rtl::OUString> aSeq = xStyles->getElementNames();
-    const ::rtl::OUString* pIter = aSeq.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aSeq.getLength();
+    const uno::Sequence< OUString> aSeq = xStyles->getElementNames();
+    const OUString* pIter = aSeq.getConstArray();
+    const OUString* pEnd   = pIter + aSeq.getLength();
     for(;pIter != pEnd;++pIter)
     {
         Reference< XStyle > xStyle;
@@ -434,7 +430,7 @@ void XMLStyleExport::exportStyleFamily(
                         xPropSet->getPropertySetInfo();
 
                     if( xPropSetInfo->hasPropertyByName( sFollowStyle ) )
-                        pExportedStyles.reset(new std::set<String>());
+                        pExportedStyles.reset(new std::set<OUString>());
                     bFirstStyle = sal_False;
                 }
 
@@ -487,7 +483,7 @@ void XMLStyleExport::exportStyleFamily(
 
                 OUString sNextName;
                 xPropSet->getPropertyValue( sFollowStyle ) >>= sNextName;
-                String sTmp( sNextName );
+                OUString sTmp( sNextName );
                 // if the next style hasn't been exported by now, export it now
                 // and remember its name.
                 if( xStyle->getName() != sNextName &&

xmloff/source/style/xmlnumfe.cxx

@@ -1795,7 +1795,7 @@ sal_uInt32 SvXMLNumFmtExport::ForceSystemLanguage( sal_uInt32 nKey )
     {
         DBG_ASSERT( pFormatter != NULL, "format without formatter?" );
 
-        xub_StrLen nErrorPos;
+        sal_Int32 nErrorPos;
         short nType = pFormat->GetType();
 
         sal_uInt32 nNewKey = pFormatter->GetFormatForLanguageIfBuiltIn(
@@ -1807,7 +1807,7 @@ sal_uInt32 SvXMLNumFmtExport::ForceSystemLanguage( sal_uInt32 nKey )
         }
         else
         {
-            String aFormatString( pFormat->GetFormatstring() );
+            OUString aFormatString( pFormat->GetFormatstring() );
             pFormatter->PutandConvertEntry(
                             aFormatString,
                             nErrorPos, nType, nNewKey,

xmloff/source/style/xmlnumi.cxx

@@ -34,7 +34,6 @@
 
 #include <tools/debug.hxx>
 #include <tools/fontenum.hxx>
-#include <tools/string.hxx>
 
 #include <sax/tools/converter.hxx>
 
@@ -55,9 +54,6 @@
 #include <xmloff/xmlnumi.hxx>
 
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::style;
@@ -69,9 +65,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::io;
 
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
 static sal_Char const XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] =
         "SymbolTextDistance";
 static sal_Char const XML_UNO_NAME_NRULE_PARENT_NUMBERING[] =
@@ -491,7 +484,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
                 || ((300 == nUPD) && (nBuildId <= 9573))))
         {
             // #i93908# OOo < 3.4 wrote a bogus suffix for bullet chars
-            sSuffix = ::rtl::OUString(); // clear it
+            sSuffix = OUString(); // clear it
         }
     }
 

xmloff/source/style/xmlstyle.cxx

@@ -56,8 +56,6 @@
 #include <set>
 #include <vector>
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::std::vector;
 
 using namespace ::com::sun::star;
@@ -101,7 +99,7 @@ const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap()
 
 void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
                                       const OUString& rLocalName,
-                                         const OUString& rValue )
+                                      const OUString& rValue )
 {
     // TODO: use a map here
     if( XML_NAMESPACE_STYLE == nPrefixKey )
@@ -164,8 +162,8 @@ SvXMLStyleContext::~SvXMLStyleContext()
 }
 
 SvXMLImportContext *SvXMLStyleContext::CreateChildContext( sal_uInt16 nPrefix,
-                                            const OUString& rLocalName,
-                                            const uno::Reference< xml::sax::XAttributeList > & )
+                                                           const OUString& rLocalName,
+                                                           const uno::Reference< xml::sax::XAttributeList > & )
 {
     return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 }
@@ -290,7 +288,8 @@ public:
     void Clear();
 
     const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily,
-                            const OUString& rName, sal_Bool bCreateIndex ) const;
+                                                    const OUString& rName,
+                                                    sal_Bool bCreateIndex ) const;
     sal_Bool IsAutomaticStyle() const { return bAutomaticStyle; }
 };
 
@@ -334,10 +333,9 @@ void SvXMLStylesContext_Impl::Clear()
     aStyles.clear();
 }
 
-const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
-                                  sal_uInt16 nFamily,
-                                  const OUString& rName,
-                                  sal_Bool bCreateIndex ) const
+const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uInt16 nFamily,
+                                                                         const OUString& rName,
+                                                                         sal_Bool bCreateIndex ) const
 {
     const SvXMLStyleContext *pStyle = 0;
 
@@ -399,10 +397,9 @@ sal_Bool SvXMLStylesContext::IsAutomaticStyle() const
     return mpImpl->IsAutomaticStyle();
 }
 
-SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
-        sal_uInt16 p_nPrefix,
-        const OUString& rLocalName,
-        const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPrefix,
+                                                                const OUString& rLocalName,
+                                                                const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
     SvXMLStyleContext *pStyle = NULL;
 
@@ -566,8 +563,7 @@ sal_Bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const
     return sal_True;
 }
 
-sal_uInt16 SvXMLStylesContext::GetFamily(
-        const ::rtl::OUString& rValue ) const
+sal_uInt16 SvXMLStylesContext::GetFamily( const OUString& rValue ) const
 {
     sal_uInt16 nFamily = 0U;
     if( IsXMLToken( rValue, XML_PARAGRAPH ) )
@@ -716,9 +712,7 @@ Reference < XAutoStyleFamily > SvXMLStylesContext::GetAutoStyles( sal_uInt16 nFa
             xAutoStyles = mxParaAutoStyles;
         else
         {
-            sName = bPara ?
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphStyles" ) ):
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "CharacterStyles" ) );
+            sName = bPara ? OUString( "ParagraphStyles" ): OUString( "CharacterStyles" );
             Reference< XAutoStylesSupplier > xAutoStylesSupp(   GetImport().GetModel(), UNO_QUERY );
             Reference< XAutoStyles > xAutoStyleFamilies = xAutoStylesSupp->getAutoStyles();
             if (xAutoStyleFamilies->hasByName(sName))
@@ -746,16 +740,14 @@ Reference < XNameContainer > SvXMLStylesContext::GetStylesContainer(
         if( mxParaStyles.is() )
             xStyles = mxParaStyles;
         else
-            sName =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphStyles" ) );
+            sName = "ParagraphStyles";
         break;
 
     case XML_STYLE_FAMILY_TEXT_TEXT:
         if( mxTextStyles.is() )
             xStyles = mxTextStyles;
         else
-            sName =
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "CharacterStyles" ) );
+            sName = "CharacterStyles";
         break;
     }
     if( !xStyles.is() && !sName.isEmpty() )
@@ -788,7 +780,7 @@ Reference < XNameContainer > SvXMLStylesContext::GetStylesContainer(
 
 OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const
 {
-    String sServiceName;
+    OUString sServiceName;
     switch( nFamily )
     {
     case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
@@ -822,8 +814,8 @@ SvXMLStylesContext::~SvXMLStylesContext()
 }
 
 SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix,
-                                         const OUString& rLocalName,
-                                         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+                                                            const OUString& rLocalName,
+                                                            const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
     SvXMLImportContext *pContext = 0;