1 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 29edfcb58754..5b99fea15544 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -33,13 +33,13 @@ class ScXMLImport;
 
 struct ScMyStyleNumberFormat
 {
-    rtl::OUString       sStyleName;
+    OUString       sStyleName;
     sal_Int32           nNumberFormat;
 
     ScMyStyleNumberFormat() : nNumberFormat(-1) {}
-    ScMyStyleNumberFormat(const rtl::OUString& rStyleName) :
+    ScMyStyleNumberFormat(const OUString& rStyleName) :
         sStyleName(rStyleName), nNumberFormat(-1) {}
-    ScMyStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nFormat) :
+    ScMyStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nFormat) :
         sStyleName(rStyleName), nNumberFormat(nFormat) {}
 };
 
@@ -58,13 +58,13 @@ class ScMyStyleNumberFormats
     ScMyStyleNumberFormatSet    aSet;
 
 public:
-    void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat);
-    sal_Int32 GetStyleNumberFormat(const rtl::OUString& rStyleName);
+    void AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat);
+    sal_Int32 GetStyleNumberFormat(const OUString& rStyleName);
 };
 
 struct ScMyCurrencyStyle
 {
-    rtl::OUString       sCurrency;
+    OUString       sCurrency;
     ::boost::shared_ptr<ScSimpleRangeList> mpRanges;
 
     ScMyCurrencyStyle() :
@@ -95,21 +95,21 @@ class ScMyStyleRanges : public SvRefBase
     ScMyCurrencyStylesSet*  pCurrencyList;
 
     void SetStylesToRanges(const ::std::list<ScRange>& rList,
-        const rtl::OUString* pStyleName, const sal_Int16 nCellType,
-        const rtl::OUString* pCurrency, ScXMLImport& rImport);
+        const OUString* pStyleName, const sal_Int16 nCellType,
+        const OUString* pCurrency, ScXMLImport& rImport);
 public:
     ScMyStyleRanges();
     ~ScMyStyleRanges();
     void AddRange(const ScRange& rRange, const sal_Int16 nType);
-    void AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency);
+    void AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency);
     void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc);
-    void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport);
+    void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport);
 };
 SV_DECL_IMPL_REF( ScMyStyleRanges );
 
 struct ScMyStyle
 {
-    rtl::OUString       sStyleName;
+    OUString       sStyleName;
     ScMyStyleRangesRef  xRanges;
 
     ScMyStyle() : xRanges(new ScMyStyleRanges()) {}
@@ -133,21 +133,21 @@ class ScMyStylesImportHelper
     ScMyStyles          aColDefaultStyles;
     ScMyStylesSet::iterator aRowDefaultStyle;
     ScXMLImport&        rImport;
-    rtl::OUString*      pStyleName;
-    rtl::OUString*      pPrevStyleName;
-    rtl::OUString*      pCurrency;
-    rtl::OUString*      pPrevCurrency;
+    OUString*      pStyleName;
+    OUString*      pPrevStyleName;
+    OUString*      pCurrency;
+    OUString*      pPrevCurrency;
     ScRange             aPrevRange;
     sal_Int16           nCellType;
     sal_Int16           nPrevCellType;
     bool                bPrevRangeAdded;
 
     void ResetAttributes();
-    ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName);
+    ScMyStylesSet::iterator GetIterator(const OUString* pStyleName);
     void AddDefaultRange(const ScRange& rRange);
     void AddSingleRange(const ScRange& rRange);
     void AddRange();
-    bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond)
+    bool IsEqual(const OUString* pFirst, const OUString* pSecond)
     {
         return ((pFirst && pSecond && pFirst->equals(*pSecond)) ||
                 (!pFirst && !pSecond) ||
@@ -157,10 +157,10 @@ class ScMyStylesImportHelper
 public:
     ScMyStylesImportHelper(ScXMLImport& rImport);
     ~ScMyStylesImportHelper();
-    void AddColumnStyle(const rtl::OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat);
-    void SetRowStyle(const rtl::OUString& rStyleName);
-    void SetAttributes(rtl::OUString* pStyleName,
-        rtl::OUString* pCurrency, const sal_Int16 nCellType);
+    void AddColumnStyle(const OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat);
+    void SetRowStyle(const OUString& rStyleName);
+    void SetAttributes(OUString* pStyleName,
+        OUString* pCurrency, const sal_Int16 nCellType);
     void AddRange(const ScRange& rRange);
     void AddCell(const ScAddress& rAddress);
     void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol