From e699c7fcd150315e4fc3abf21c9d2e732ad9aae1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 20 Sep 2013 16:06:17 +0200 Subject: convert sc/.../servobj.hxx from String to OUString Change-Id: Ie2328bcca4e5858e510cfdd3f7c37e6f13f5129b --- sc/source/ui/docshell/servobj.cxx | 6 +++--- sc/source/ui/inc/servobj.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/source') diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 1778a6e0478a..b1ef12fc1619 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -66,7 +66,7 @@ void ScServerObjectSvtListenerForwarder::Notify( SvtBroadcaster& /* rBC */, cons pObj->Notify( aBroadcaster, rHint); } -ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) : +ScServerObject::ScServerObject( ScDocShell* pShell, const OUString& rItem ) : aForwarder( this ), pDocSh( pShell ), bRefreshListener( false ) @@ -141,7 +141,7 @@ sal_Bool ScServerObject::GetData( return false; // named ranges may have changed -> update aRange - if ( aItemStr.Len() ) + if ( !aItemStr.isEmpty() ) { ScRange aNew; if ( lcl_FillRangeFromName( aNew, pDocSh, aItemStr ) && aNew != aRange ) @@ -214,7 +214,7 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } else if (rBC.ISA(SfxApplication)) { - if ( aItemStr.Len() && rHint.ISA(SfxSimpleHint) && + if ( !aItemStr.isEmpty() && rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SC_HINT_AREAS_CHANGED ) { // check if named range was modified diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index af22738271ba..d0be4d692ec0 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -45,13 +45,13 @@ private: ScServerObjectSvtListenerForwarder aForwarder; ScDocShell* pDocSh; ScRange aRange; - String aItemStr; + OUString aItemStr; sal_Bool bRefreshListener; void Clear(); public: - ScServerObject( ScDocShell* pShell, const String& rItem ); + ScServerObject( ScDocShell* pShell, const OUString& rItem ); virtual ~ScServerObject(); virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, -- cgit