diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-10 15:32:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:37 +0200 |
| commit | 031035bb843a75d64029e0183834f508aebcac98 (patch) | |
| tree | 18879a6c1d59d1024db2696a858a3908049381a3 /sw | |
| parent | 440d1c137a9da117db4cc151b522e07284162acc (diff) | |
convert sw/inc/fmtcol.hxx from String to OUString
Change-Id: I534a97f8c787b269e31d3fc8c786c745266a9a18
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/fmtcol.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 0b90a786fb12..8b89070aa40d 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -190,7 +190,7 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient union { sal_uLong nSubCondition; - String* pFldExpression; + OUString* pFldExpression; } aSubCondition; public: @@ -199,7 +199,7 @@ public: SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, sal_uLong nSubCond = 0 ); SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, - const String& rSubExp ); + const OUString& rSubExp ); virtual ~SwCollCondition(); /// @@@ public copy ctor, but no copy assignment? @@ -215,7 +215,7 @@ public: sal_uLong GetCondition() const { return nCondition; } sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; } - const String* GetFldExpression() const + const OUString* GetFldExpression() const { return aSubCondition.pFldExpression; } void SetCondition( sal_uLong nCond, sal_uLong nSubCond ); @@ -235,7 +235,7 @@ protected: SwTxtFmtColl* pDerFrom = 0 ) : SwTxtFmtColl( rPool, pFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} - SwConditionTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName, + SwConditionTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, SwTxtFmtColl* pDerFrom = 0 ) : SwTxtFmtColl( rPool, rFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 3ef3472fe651..d4aa1f566e95 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -473,11 +473,11 @@ SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, } SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, - const String& rSubExp ) + const OUString& rSubExp ) : SwClient( pColl ), nCondition( nMasterCond ) { if( USRFLD_EXPRESSION & nCondition ) - aSubCondition.pFldExpression = new String( rSubExp ); + aSubCondition.pFldExpression = new OUString( rSubExp ); else aSubCondition.nSubCondition = 0; } @@ -486,7 +486,7 @@ SwCollCondition::SwCollCondition( const SwCollCondition& rCopy ) : SwClient( (SwModify*)rCopy.GetRegisteredIn() ), nCondition( rCopy.nCondition ) { if( USRFLD_EXPRESSION & rCopy.nCondition ) - aSubCondition.pFldExpression = new String( *rCopy.GetFldExpression() ); + aSubCondition.pFldExpression = new OUString( *rCopy.GetFldExpression() ); else aSubCondition.nSubCondition = rCopy.aSubCondition.nSubCondition; } @@ -510,7 +510,7 @@ int SwCollCondition::operator==( const SwCollCondition& rCmp ) const if( USRFLD_EXPRESSION & nCondition ) { // The SubCondition contains the expression for the UserField - const String* pTmp = aSubCondition.pFldExpression; + const OUString* pTmp = aSubCondition.pFldExpression; if( !pTmp ) pTmp = rCmp.aSubCondition.pFldExpression; if( pTmp ) |