convert sc/inc/nameuno.hxx from String to OUString

Change-Id: I99faf0c59c890a1de0e038053e2d97bf1a017270

sc/inc/nameuno.hxx

@@ -60,20 +60,20 @@ class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper6<
 private:
     rtl::Reference< ScNamedRangesObj > mxParent;
     ScDocShell*             pDocShell;
-    String                  aName;
+    OUString                aName;
     com::sun::star::uno::Reference< com::sun::star::container::XNamed > mxSheet;
 
 private:
 friend class ScVbaName;
     ScRangeData*            GetRangeData_Impl();
-    void                    Modify_Impl( const String* pNewName,
-                                        const ScTokenArray* pNewTokens, const String* pNewContent,
+    void                    Modify_Impl( const OUString* pNewName,
+                                        const ScTokenArray* pNewTokens, const OUString* pNewContent,
                                         const ScAddress* pNewPos, const sal_uInt16* pNewType,
                                         const formula::FormulaGrammar::Grammar eGrammar );
     SCTAB                   GetTab_Impl();
 
 public:
-                            ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const String& rNm,
+                            ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const OUString& rNm,
                                     com::sun::star::uno::Reference< com::sun::star::container::XNamed > xSheet = com::sun::star::uno::Reference< com::sun::star::container::XNamed > ());
     virtual                 ~ScNamedRangeObj();
 

sc/source/ui/unoobj/nameuno.cxx

@@ -85,7 +85,7 @@ static bool lcl_UserVisibleName(const ScRangeData& rData)
     return !rData.HasType(RT_DATABASE);
 }
 
-ScNamedRangeObj::ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const String& rNm, Reference<container::XNamed> xSheet):
+ScNamedRangeObj::ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const OUString& rNm, Reference<container::XNamed> xSheet):
     mxParent(xParent),
     pDocShell( pDocSh ),
     aName( rNm ),
@@ -149,7 +149,7 @@ SCTAB ScNamedRangeObj::GetTab_Impl()
 
 // sheet::XNamedRange
 
-void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* pNewTokens, const String* pNewContent,
+void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* pNewTokens, const OUString* pNewContent,
                                     const ScAddress* pNewPos, const sal_uInt16* pNewType,
                                     const formula::FormulaGrammar::Grammar eGrammar )
 {
@@ -224,7 +224,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
     SolarMutexGuard aGuard;
     //! Formeln anpassen ?????
 
-    String aNewStr(aNewName);
+    OUString aNewStr(aNewName);
     // GRAM_PODF_A1 for API compatibility.
     Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
 
@@ -247,7 +247,7 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent )
                                                 throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    String aContStr(aContent);
+    OUString aContStr(aContent);
     // GRAM_PODF_A1 for API compatibility.
     Modify_Impl( NULL, NULL, &aContStr, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
 }