diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-20 11:07:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-21 09:22:58 +0000 |
| commit | 891e460b1296ba114bc7ef4142f8b3b761794974 (patch) | |
| tree | 24f2e73d2a902d3ef665df1f2faff0dae065c07d | |
| parent | 11c423794d034d90b9e177ff5bc9656818268488 (diff) | |
ditch some pesty XubStrings
Change-Id: I42a80b12d843b95e2ddc0872ee793ebbda050066
| -rw-r--r-- | sw/inc/fmturl.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index cc78d9c1c202..367c465fadda 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -60,7 +60,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; } - void SetURL( const String &rURL, sal_Bool bServerMap ); + void SetURL(const OUString &rURL, bool bServerMap); void SetMap( const ImageMap *pM ); ///< Pointer will be copied. const String &GetTargetFrameName()const { return sTargetFrameName; } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 180b145344dc..cbb50382fb5c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1740,7 +1740,7 @@ SfxPoolItem* SwFmtURL::Clone( SfxItemPool* ) const return new SwFmtURL( *this ); } -void SwFmtURL::SetURL( const XubString &rURL, sal_Bool bServerMap ) +void SwFmtURL::SetURL(const OUString &rURL, bool bServerMap) { sURL = rURL; bIsServerMap = bServerMap; @@ -1751,6 +1751,7 @@ void SwFmtURL::SetMap( const ImageMap *pM ) delete pMap; pMap = pM ? new ImageMap( *pM ) : 0; } + extern const SvEventDescription* sw_GetSupportedMacroItems(); bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -2086,7 +2087,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const // here we convert always! nMemberId &= ~CONVERT_TWIPS; bool bRet = true; - XubString aRet; + OUString aRet; switch ( nMemberId ) { case MID_CHAIN_PREVNAME: @@ -2101,7 +2102,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const OSL_ENSURE( !this, "unknown MemberId" ); bRet = false; } - rVal <<= OUString(aRet); + rVal <<= aRet; return bRet; } |