convert sc/inc/l*.hxx from String to OUString

Change-Id: I52f9989cead1fc84e659fe0e4180a9c85388355d

4 files changed, 15 insertions, 15 deletions

diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 318a390c0f7f..b5788e8e7706 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -66,7 +66,7 @@ class ScSheetLinkObj : public cppu::WeakImplHelper4<
 private:
     SfxItemPropertySet      aPropSet;
     ScDocShell*             pDocShell;
-    String                  aFileName;
+    OUString                aFileName;
     XRefreshListenerArr_Impl aRefreshListeners;
 
     ScTableLink*            GetLink_Impl() const;
@@ -74,7 +74,7 @@ private:
     void                    ModifyRefreshDelay_Impl( sal_Int32 nRefresh );
 
 public:
-                            ScSheetLinkObj(ScDocShell* pDocSh, const String& rName);
+                            ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName);
     virtual                 ~ScSheetLinkObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -378,16 +378,16 @@ class ScDDELinkObj : public cppu::WeakImplHelper5<
 {
 private:
     ScDocShell*             pDocShell;
-    String                  aAppl;
-    String                  aTopic;
-    String                  aItem;
+    OUString                aAppl;
+    OUString                aTopic;
+    OUString                aItem;
     XRefreshListenerArr_Impl aRefreshListeners;
 
     void                    Refreshed_Impl();
 
 public:
-                            ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
-                                            const String& rT, const String& rI);
+                            ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
+                                            const OUString& rT, const OUString& rI);
     virtual                 ~ScDDELinkObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index aa8f4f7e698b..9bfc5417dbe7 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -63,7 +63,7 @@ public:
         union
         {
             double          mfVal;
-            const String *  mpStr;
+            const OUString *mpStr;
         };
         bool                mbAlloc  : 1;
         bool                mbString : 1;
@@ -94,7 +94,7 @@ public:
             mfVal = fVal;
         }
 
-        void setString( const String * pStr )
+        void setString( const OUString * pStr )
         {
             deleteString();
             mbAlloc = false;
@@ -102,11 +102,11 @@ public:
             mpStr = pStr;
         }
 
-        void setString( const String & rStr )
+        void setString( const OUString & rStr )
         {
             deleteString();
             mbAlloc = mbString = true;
-            mpStr = new String( rStr);
+            mpStr = new OUString( rStr);
         }
 
         bool operator==( const QueryCriteria & r ) const
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index 235bb04ed4c5..a676a72374e9 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -56,7 +56,7 @@ ScLookupCache::QueryCriteria::QueryCriteria( const ScLookupCache::QueryCriteria
 {
     if (r.mbString && r.mpStr)
     {
-        mpStr = new String( *r.mpStr);
+        mpStr = new OUString( *r.mpStr);
         mbAlloc = mbString = true;
     }
 }
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index eef68a120e90..744c1e45505c 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -76,7 +76,7 @@ SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.
 
 //------------------------------------------------------------------------
 
-ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const String& rName) :
+ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) :
     aPropSet( lcl_GetSheetLinkMap() ),
     pDocShell( pDocSh ),
     aFileName( rName )
@@ -1045,8 +1045,8 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException)
 
 //------------------------------------------------------------------------
 
-ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
-                            const String& rT, const String& rI) :
+ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
+                            const OUString& rT, const OUString& rI) :
     pDocShell( pDocSh ),
     aAppl( rA ),
     aTopic( rT ),