diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-03 13:04:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-04 09:10:03 +0200 |
| commit | dc2710a57eb7d65c03df40a54fafe0fb4a7e29d9 (patch) | |
| tree | 5382c17d936d485dea906b16ec15df709abd2ceb | |
| parent | 165b06cde6db152a4d3e781f97830c6d4ee8297a (diff) | |
convert sc/inc/nameuno.hxx from String to OUString
Change-Id: I99faf0c59c890a1de0e038053e2d97bf1a017270
| -rw-r--r-- | sc/inc/nameuno.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 7a5c619fce9c..33def642ad3f 100644 --- a/sc/inc/nameuno.hxx +++ b/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(); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index a14584b10a07..a2e706dac7df 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/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 ); } |