diff options
| author | Matteo Casalin <matteo.casalin@gmx.com> | 2013-01-23 23:48:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-25 00:57:42 +0000 |
| commit | bc84545cb2c58f1f267ed2efb770bb5624ee7c70 (patch) | |
| tree | 035a60a265858d4b18fa7cb0139d8a4aee7dd23b | |
| parent | 0d6e43bd788c075675b549ff4f63f706406cefa5 (diff) | |
OUString: remove namespace and chained appends
Change-Id: I1eb7e61f3151c0469db26c69439e16be0f7063df
Reviewed-on: https://gerrit.libreoffice.org/1833
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/inc/hhcwrp.hxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/lingu/hhcwrp.cxx | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 18fcd65be37e..be20aa2f206c 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -66,7 +66,7 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion void SelectNewUnit_impl( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); void ChangeText( const String &rNewText, - const ::rtl::OUString& rOrigText, + const OUString& rOrigText, const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, SwPaM *pCrsr ); void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); @@ -75,15 +75,15 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion inline void SetDrawObj( sal_Bool bNew ) { m_bIsDrawObj = bNew; } protected: - virtual void GetNextPortion( ::rtl::OUString& rNextPortion, + virtual void GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, sal_Bool bAllowImplicitChangesForNotConvertibleText ); virtual void HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); virtual void ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const OUString& rOrigText, + const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ); diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 260afda6d880..fb0615c16031 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -49,7 +49,6 @@ #include <unomid.h> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; @@ -169,7 +168,7 @@ SwHHCWrapper::~SwHHCWrapper() void SwHHCWrapper::GetNextPortion( - ::rtl::OUString& rNextPortion, + OUString& rNextPortion, LanguageType& rLangOfPortion, sal_Bool bAllowChanges ) { @@ -380,15 +379,12 @@ void SwHHCWrapper::ChangeText_impl( const String &rNewText, sal_Bool bKeepAttrib void SwHHCWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, + const OUString& rOrigText, const OUString& rReplaceWith, const uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) { - static OUString aBracketedStart( "(" ); - static OUString aBracketedEnd( ")" ); - OSL_ENSURE( nUnitStart >= 0 && nUnitEnd >= nUnitStart, "wrong arguments" ); if (!(nUnitStart >= 0 && nUnitEnd >= nUnitStart)) return; @@ -413,12 +409,12 @@ void SwHHCWrapper::ReplaceUnit( break; case eReplacementBracketed : { - (((aNewTxt = aOrigTxt) += aBracketedStart) += rReplaceWith) += aBracketedEnd; + aNewTxt = aOrigTxt + "(" + rReplaceWith + ")"; } break; case eOriginalBracketed : { - (((aNewTxt = rReplaceWith) += aBracketedStart) += aOrigTxt) += aBracketedEnd; + aNewTxt = rReplaceWith + "(" + aOrigTxt + ")"; } break; case eReplacementAbove : |