From e73b23562911c15e9996eea70d3aff4983a2018c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 7 Mar 2012 16:52:06 +0000 Subject: tidy up WW8FormulaControl, with knock on results elsewhere --- sw/source/core/bastyp/calc.cxx | 2 +- sw/source/core/doc/doc.cxx | 2 +- sw/source/core/doc/docfld.cxx | 17 ++--- sw/source/core/doc/doclay.cxx | 4 +- sw/source/core/edit/editsh.cxx | 2 +- sw/source/core/fields/authfld.cxx | 2 +- sw/source/core/fields/dbfld.cxx | 40 ++++++----- sw/source/core/fields/ddefld.cxx | 12 ++-- sw/source/core/fields/docufld.cxx | 106 ++++++++++++++++------------- sw/source/core/fields/expfld.cxx | 26 +++---- sw/source/core/fields/fldbas.cxx | 21 +++--- sw/source/core/fields/flddat.cxx | 11 ++- sw/source/core/fields/flddropdown.cxx | 61 ++++++++--------- sw/source/core/fields/macrofld.cxx | 46 +++++++------ sw/source/core/fields/reffld.cxx | 12 ++-- sw/source/core/fields/scrptfld.cxx | 12 ++-- sw/source/core/fields/tblcalc.cxx | 4 +- sw/source/core/fields/usrfld.cxx | 10 +-- sw/source/core/unocore/unocoll.cxx | 2 +- sw/source/core/unocore/unofield.cxx | 2 +- sw/source/filter/html/htmlfldw.cxx | 4 +- sw/source/filter/ww8/wrtww8.hxx | 4 +- sw/source/filter/ww8/ww8atr.cxx | 8 +-- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/filter/ww8/ww8par.hxx | 22 +++--- sw/source/filter/ww8/ww8par3.cxx | 20 +++--- sw/source/filter/ww8/ww8scan.cxx | 4 +- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/config/optload.cxx | 6 +- sw/source/ui/dbui/dbmgr.cxx | 8 +-- sw/source/ui/fldui/DropDownFieldDialog.cxx | 2 +- sw/source/ui/fldui/flddinf.cxx | 2 +- sw/source/ui/fldui/flddok.cxx | 4 +- sw/source/ui/fldui/fldfunc.cxx | 6 +- sw/source/ui/fldui/fldmgr.cxx | 2 +- sw/source/ui/fldui/fldref.cxx | 2 +- sw/source/ui/fldui/fldvar.cxx | 4 +- sw/source/ui/fldui/inpdlg.cxx | 8 +-- sw/source/ui/fldui/javaedit.cxx | 6 +- sw/source/ui/frmdlg/cption.cxx | 7 +- sw/source/ui/inc/fldmgr.hxx | 2 +- sw/source/ui/inc/javaedit.hxx | 8 +-- sw/source/ui/shells/textfld.cxx | 2 +- sw/source/ui/utlui/content.cxx | 4 +- 44 files changed, 271 insertions(+), 262 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index dc5e7c4892a7..c5ea8de21e8e 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -591,7 +591,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) if( 0 != ( pFnd = Find( sDBNum, VarTable, TBLSZ ) ) ) nTmpRec = ((SwCalcExp*)pFnd)->nValue.GetULong(); - String sResult; + rtl::OUString sResult; double nNumber = DBL_MAX; long nLang = SvxLocaleToLanguage( pLclData->getLocale() ); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 52c9a70da33f..64f14f481ada 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1822,7 +1822,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const // Return the names of all set references in the Doc //JP 24.06.96: If the array pointer is 0, then just return whether a RefMark is set in the Doc // OS 25.06.96: From now on we always return the reference count -sal_uInt16 SwDoc::GetRefMarks( std::vector* pNames ) const +sal_uInt16 SwDoc::GetRefMarks( std::vector* pNames ) const { const SfxPoolItem* pItem; const SwTxtRefMark* pTxtRef; diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 69a8a045b93d..f19d64c58876 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2257,14 +2257,11 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) } } - String sTrue( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "TRUE" ))), - sFalse( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "FALSE" ))); + rtl::OUString sTrue("TRUE"), sFalse("FALSE"); sal_Bool bIsDBMgr = 0 != rDoc.GetNewDBMgr(); sal_uInt16 nWhich, n; - const String* pFormel = 0; + const rtl::OUString* pFormel = 0; const SfxPoolItem* pItem; sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_FIELD ); for( n = 0; n < nMaxItems; ++n ) @@ -2303,9 +2300,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) if( GETFLD_ALL == eGetMode ) { pFormel = &pFld->GetPar1(); - if( !pFormel->Len() || pFormel->Equals( sFalse )) + if (pFormel->isEmpty() || pFormel->equals(sFalse)) ((SwHiddenParaField*)pFld)->SetHidden( sal_False ); - else if( pFormel->Equals( sTrue )) + else if (pFormel->equals(sTrue)) ((SwHiddenParaField*)pFld)->SetHidden( sal_True ); else break; @@ -2320,9 +2317,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) if( GETFLD_ALL == eGetMode ) { pFormel = &pFld->GetPar1(); - if( !pFormel->Len() || pFormel->Equals( sFalse )) + if (pFormel->isEmpty() || pFormel->equals(sFalse)) ((SwHiddenTxtField*)pFld)->SetValue( sal_True ); - else if( pFormel->Equals( sTrue )) + else if (pFormel->equals(sTrue)) ((SwHiddenTxtField*)pFld)->SetValue( sal_False ); else break; @@ -2364,7 +2361,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) break; } - if( pFormel && pFormel->Len() ) + if (pFormel && !pFormel->isEmpty()) { GetBodyNode( *pTxtFld, nWhich ); pFormel = 0; diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index c1841353a863..08e4f4062fcb 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1176,7 +1176,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, { for( sal_uInt16 i = pTxtFmtCollTbl->Count(); i; ) { - if( (*pTxtFmtCollTbl)[ --i ]->GetName() == pType->GetName() ) + if( (*pTxtFmtCollTbl)[ --i ]->GetName().Equals(pType->GetName()) ) { pColl = (*pTxtFmtCollTbl)[i]; break; @@ -1532,7 +1532,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, { for( sal_uInt16 i = pTxtFmtCollTbl->Count(); i; ) { - if( (*pTxtFmtCollTbl)[ --i ]->GetName() == pType->GetName() ) + if( (*pTxtFmtCollTbl)[ --i ]->GetName().Equals(pType->GetName()) ) { pColl = (*pTxtFmtCollTbl)[i]; break; diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 41d113aa2ffa..1ecffe62579a 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -519,7 +519,7 @@ const SwFmtRefMark* SwEditShell::GetRefMark( const String& rName ) const } // returne die Namen aller im Doc gesetzten Referenzen -sal_uInt16 SwEditShell::GetRefMarks( std::vector* pStrings ) const +sal_uInt16 SwEditShell::GetRefMarks( std::vector* pStrings ) const { return GetDoc()->GetRefMarks( pStrings ); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index d0bed29cf951..7c06cffb55d0 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -613,7 +613,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const return pEntry->GetAuthorField( eField ); } -void SwAuthorityField::SetPar1(const String& rStr) +void SwAuthorityField::SetPar1(const rtl::OUString& rStr) { SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp(); pInitType->RemoveField(m_nHandle); diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 66ebfc9c6ff0..8e8d21950be9 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -79,10 +79,8 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& { if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty()) { - sName = aDBData.sDataSource; - sName += DB_DELIM; - sName += (String)aDBData.sCommand; - sName += DB_DELIM; + sName = rtl::OUStringBuffer(aDBData.sDataSource).append(DB_DELIM). + append(aDBData.sCommand).append(DB_DELIM).makeStringAndClear(); } sName += GetColumnName(); } @@ -99,7 +97,7 @@ SwFieldType* SwDBFieldType::Copy() const } //------------------------------------------------------------------------------ -const String& SwDBFieldType::GetName() const +const rtl::OUString& SwDBFieldType::GetName() const { return sName; } @@ -216,9 +214,9 @@ void SwDBField::InitContent() { if (!IsInitialized()) { - aContent = '<'; - aContent += ((SwDBFieldType*)GetTyp())->GetColumnName(); - aContent += '>'; + aContent = rtl::OUStringBuffer().append('<') + .append(((const SwDBFieldType*)GetTyp())->GetColumnName()) + .append('>').makeStringAndClear(); } } @@ -365,7 +363,7 @@ void SwDBField::Evaluate() else { // Bei Strings sal_True wenn Laenge > 0 sonst sal_False - SetValue(aContent.Len() ? 1 : 0); + SetValue(aContent.isEmpty() ? 0 : 1); } } bInitialized = sal_True; @@ -375,9 +373,9 @@ void SwDBField::Evaluate() Beschreibung: Namen erfragen --------------------------------------------------------------------*/ -const String& SwDBField::GetPar1() const +const rtl::OUString& SwDBField::GetPar1() const { - return ((SwDBFieldType*)GetTyp())->GetName(); + return ((const SwDBFieldType*)GetTyp())->GetName(); } sal_uInt16 SwDBField::GetSubType() const @@ -470,10 +468,10 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) } break; case FIELD_PROP_PAR1: - ::GetString( rAny, aContent ); + rAny >>= aContent; break; case FIELD_PROP_PAR2: - ::GetString( rAny, sFieldCode ); + rAny >>= sFieldCode; break; default: OSL_FAIL("illegal property"); @@ -651,12 +649,12 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc) Beschreibung: Bedingung --------------------------------------------------------------------*/ -const String& SwDBNextSetField::GetPar1() const +const rtl::OUString& SwDBNextSetField::GetPar1() const { return aCond; } -void SwDBNextSetField::SetPar1(const String& rStr) +void SwDBNextSetField::SetPar1(const rtl::OUString& rStr) { aCond = rStr; } @@ -681,7 +679,7 @@ bool SwDBNextSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch( nWhichId ) { case FIELD_PROP_PAR3: - ::GetString( rAny, aCond ); + rAny >>= aCond; break; default: bRet = SwDBNameInfField::PutValue( rAny, nWhichId ); @@ -754,12 +752,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc) Beschreibung: LogDBName --------------------------------------------------------------------*/ -const String& SwDBNumSetField::GetPar1() const +const rtl::OUString& SwDBNumSetField::GetPar1() const { return aCond; } -void SwDBNumSetField::SetPar1(const String& rStr) +void SwDBNumSetField::SetPar1(const rtl::OUString& rStr) { aCond = rStr; } @@ -768,12 +766,12 @@ void SwDBNumSetField::SetPar1(const String& rStr) Beschreibung: Bedingung --------------------------------------------------------------------*/ -String SwDBNumSetField::GetPar2() const +rtl::OUString SwDBNumSetField::GetPar2() const { return aPar2; } -void SwDBNumSetField::SetPar2(const String& rStr) +void SwDBNumSetField::SetPar2(const rtl::OUString& rStr) { aPar2 = rStr; } @@ -801,7 +799,7 @@ bool SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch( nWhichId ) { case FIELD_PROP_PAR3: - ::GetString( rAny, aCond ); + rAny >>= aCond; break; case FIELD_PROP_FORMAT: { diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index cd654f5e3ef3..e12dd6425121 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -272,7 +272,7 @@ SwFieldType* SwDDEFieldType::Copy() const return pType; } -const String& SwDDEFieldType::GetName() const +const rtl::OUString& SwDDEFieldType::GetName() const { return aName; } @@ -420,21 +420,21 @@ SwField* SwDDEField::Copy() const Beschreibung: Parameter des Typen erfragen Name --------------------------------------------------------------------*/ -const String& SwDDEField::GetPar1() const +const rtl::OUString& SwDDEField::GetPar1() const { - return ((SwDDEFieldType*)GetTyp())->GetName(); + return ((const SwDDEFieldType*)GetTyp())->GetName(); } /*-------------------------------------------------------------------- Beschreibung: Parameter des Typen erfragen Commando --------------------------------------------------------------------*/ -String SwDDEField::GetPar2() const +rtl::OUString SwDDEField::GetPar2() const { - return ((SwDDEFieldType*)GetTyp())->GetCmd(); + return ((const SwDDEFieldType*)GetTyp())->GetCmd(); } -void SwDDEField::SetPar2(const String& rStr) +void SwDDEField::SetPar2(const rtl::OUString& rStr) { ((SwDDEFieldType*)GetTyp())->SetCmd(rStr); } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 1da184926fe1..1f2e16e7e994 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -229,14 +229,14 @@ SwField* SwPageNumberField::Copy() const return pTmp; } -String SwPageNumberField::GetPar2() const +rtl::OUString SwPageNumberField::GetPar2() const { - return String::CreateFromInt32(nOffset); + return rtl::OUString::valueOf(static_cast(nOffset)); } -void SwPageNumberField::SetPar2(const String& rStr) +void SwPageNumberField::SetPar2(const rtl::OUString& rStr) { - nOffset = (short)rStr.ToInt32(); + nOffset = (short)rStr.toInt32(); } sal_uInt16 SwPageNumberField::GetSubType() const @@ -1361,7 +1361,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType, : SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub), bIsHidden(sal_True), bValid(sal_False) { - bCanToggle = aCond.Len() > 0; + bCanToggle = aCond.getLength() > 0; } String SwHiddenTxtField::Expand() const @@ -1484,13 +1484,13 @@ SwField* SwHiddenTxtField::Copy() const Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar1(const String& rStr) +void SwHiddenTxtField::SetPar1(const rtl::OUString& rStr) { aCond = rStr; - bCanToggle = aCond.Len() > 0; + bCanToggle = aCond.getLength() > 0; } -const String& SwHiddenTxtField::GetPar1() const +const rtl::OUString& SwHiddenTxtField::GetPar1() const { return aCond; } @@ -1499,21 +1499,24 @@ const String& SwHiddenTxtField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar2(const String& rStr) +void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr) { - if(nSubType == TYP_CONDTXTFLD) + if (nSubType == TYP_CONDTXTFLD) { - sal_uInt16 nPos = rStr.Search('|'); - aTRUETxt = rStr.Copy(0, nPos); - - if(nPos != STRING_NOTFOUND) - aFALSETxt = rStr.Copy(nPos + 1); + sal_Int32 nPos = rStr.indexOf('|'); + if (nPos == STRING_NOTFOUND) + aTRUETxt = rStr; + else + { + aTRUETxt = rStr.copy(0, nPos); + aFALSETxt = rStr.copy(nPos + 1); + } } else aTRUETxt = rStr; } -String SwHiddenTxtField::GetPar2() const +rtl::OUString SwHiddenTxtField::GetPar2() const { String aRet(aTRUETxt); if(nSubType == TYP_CONDTXTFLD) @@ -1531,7 +1534,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { - const String* pOut = 0; + const rtl::OUString* pOut = 0; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -1556,7 +1559,7 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const OSL_FAIL("illegal property"); } if( pOut ) - rAny <<= OUString( *pOut ); + rAny <<= *pOut; return true; } @@ -1566,21 +1569,22 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { case FIELD_PROP_PAR1: { - String sVal; - SetPar1(::GetString( rAny, sVal )); + rtl::OUString sVal; + rAny >>= sVal; + SetPar1(sVal); } break; case FIELD_PROP_PAR2: - ::GetString( rAny, aTRUETxt ); + rAny >>= aTRUETxt; break; case FIELD_PROP_PAR3: - ::GetString( rAny, aFALSETxt ); + rAny >>= aFALSETxt; break; case FIELD_PROP_BOOL1: bIsHidden = *(sal_Bool*)rAny.getValue(); break; case FIELD_PROP_PAR4: - ::GetString( rAny, aContent); + rAny >>= aContent; bValid = sal_True; break; default: @@ -1686,7 +1690,7 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch ( nWhichId ) { case FIELD_PROP_PAR1: - ::GetString( rAny, aCond ); + rAny >>= aCond; break; case FIELD_PROP_BOOL1: bIsHidden = *(sal_Bool*)rAny.getValue(); @@ -1702,12 +1706,12 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenParaField::SetPar1(const String& rStr) +void SwHiddenParaField::SetPar1(const rtl::OUString& rStr) { aCond = rStr; } -const String& SwHiddenParaField::GetPar1() const +const rtl::OUString& SwHiddenParaField::GetPar1() const { return aCond; } @@ -1771,12 +1775,12 @@ SwField* SwPostItField::Copy() const Beschreibung: Author setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar1(const String& rStr) +void SwPostItField::SetPar1(const rtl::OUString& rStr) { sAuthor = rStr; } -const String& SwPostItField::GetPar1() const +const rtl::OUString& SwPostItField::GetPar1() const { return sAuthor; } @@ -1785,12 +1789,12 @@ const String& SwPostItField::GetPar1() const Beschreibung: Text fuers PostIt setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar2(const String& rStr) +void SwPostItField::SetPar2(const rtl::OUString& rStr) { sTxt = rStr; } -String SwPostItField::GetPar2() const +rtl::OUString SwPostItField::GetPar2() const { return sTxt; } @@ -1876,10 +1880,10 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch( nWhichId ) { case FIELD_PROP_PAR1: - ::GetString( rAny, sAuthor ); + rAny >>= sAuthor; break; case FIELD_PROP_PAR2: - ::GetString( rAny, sTxt ); + rAny >>= sTxt; //#i100374# new string via api, delete complex text object so SwPostItNote picks up the new string if (mpText) { @@ -2090,14 +2094,14 @@ SwField* SwRefPageSetField::Copy() const return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn ); } -String SwRefPageSetField::GetPar2() const +rtl::OUString SwRefPageSetField::GetPar2() const { - return String::CreateFromInt32( GetOffset() ); + return rtl::OUString::valueOf(static_cast(GetOffset())); } -void SwRefPageSetField::SetPar2(const String& rStr) +void SwRefPageSetField::SetPar2(const rtl::OUString& rStr) { - SetOffset( (short) rStr.ToInt32() ); + SetOffset( (short) rStr.toInt32() ); } bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const @@ -2434,24 +2438,24 @@ SwField* SwJumpEditField::Copy() const // Platzhalter-Text -const String& SwJumpEditField::GetPar1() const +const rtl::OUString& SwJumpEditField::GetPar1() const { return sTxt; } -void SwJumpEditField::SetPar1(const String& rStr) +void SwJumpEditField::SetPar1(const rtl::OUString& rStr) { sTxt = rStr; } // HinweisText -String SwJumpEditField::GetPar2() const +rtl::OUString SwJumpEditField::GetPar2() const { return sHelp; } -void SwJumpEditField::SetPar2(const String& rStr) +void SwJumpEditField::SetPar2(const rtl::OUString& rStr) { sHelp = rStr; } @@ -2509,10 +2513,10 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) } break; case FIELD_PROP_PAR1 : - ::GetString( rAny, sHelp ); + rAny >>= sHelp; break; case FIELD_PROP_PAR2 : - ::GetString( rAny, sTxt); + rAny >>= sTxt; break; default: OSL_FAIL("illegal property"); @@ -2555,14 +2559,14 @@ SwField* SwCombinedCharField::Copy() const sCharacters ); } -const String& SwCombinedCharField::GetPar1() const +const rtl::OUString& SwCombinedCharField::GetPar1() const { return sCharacters; } -void SwCombinedCharField::SetPar1(const String& rStr) +void SwCombinedCharField::SetPar1(const rtl::OUString& rStr) { - sCharacters = rStr.Copy( 0, MAX_COMBINED_CHARACTERS ); + sCharacters = rStr.copy(0, std::min(rStr.getLength(), MAX_COMBINED_CHARACTERS)); } bool SwCombinedCharField::QueryValue( uno::Any& rAny, @@ -2584,11 +2588,15 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny, { switch( nWhichId ) { - case FIELD_PROP_PAR1: - ::GetString( rAny, sCharacters ).Erase( MAX_COMBINED_CHARACTERS ); + case FIELD_PROP_PAR1: + { + rtl::OUString sTmp; + rAny >>= sTmp; + SetPar1(sTmp); + } break; - default: - OSL_FAIL("illegal property"); + default: + OSL_FAIL("illegal property"); } return true; } diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index b4b53e563774..4888bd8b8a9d 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -397,12 +397,12 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld ) } } -String SwGetExpField::GetPar2() const +rtl::OUString SwGetExpField::GetPar2() const { return GetFormula(); } -void SwGetExpField::SetPar2(const String& rStr) +void SwGetExpField::SetPar2(const rtl::OUString& rStr) { SetFormula(rStr); } @@ -524,7 +524,7 @@ SwFieldType* SwSetExpFieldType::Copy() const return pNew; } -const String& SwSetExpFieldType::GetName() const +const rtl::OUString& SwSetExpFieldType::GetName() const { return sName; } @@ -951,12 +951,12 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc Beschreibung: Parameter setzen --------------------------------------------------------------------*/ -const String& SwSetExpField::GetPar1() const +const rtl::OUString& SwSetExpField::GetPar1() const { - return ((SwSetExpFieldType*)GetTyp())->GetName(); + return ((const SwSetExpFieldType*)GetTyp())->GetName(); } -String SwSetExpField::GetPar2() const +rtl::OUString SwSetExpField::GetPar2() const { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); @@ -965,11 +965,11 @@ String SwSetExpField::GetPar2() const return GetExpandedFormula(); } -void SwSetExpField::SetPar2(const String& rStr) +void SwSetExpField::SetPar2(const rtl::OUString& rStr) { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); - if( !(nType & nsSwGetSetExpType::GSE_SEQ) || rStr.Len() ) + if( !(nType & nsSwGetSetExpType::GSE_SEQ) || !rStr.isEmpty() ) { if (nType & nsSwGetSetExpType::GSE_STRING) SetFormula(rStr); @@ -1071,7 +1071,7 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch( nWhichId ) { case FIELD_PROP_PAR1: - ::GetString( rAny, aContent ); + rAny >>= aContent; break; case FIELD_PROP_PAR2: ::GetString( rAny, aPText ); @@ -1091,12 +1091,12 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwInputField::SetPar1(const String& rStr) +void SwInputField::SetPar1(const rtl::OUString& rStr) { aContent = rStr; } -const String& SwInputField::GetPar1() const +const rtl::OUString& SwInputField::GetPar1() const { return aContent; } @@ -1105,12 +1105,12 @@ const String& SwInputField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwInputField::SetPar2(const String& rStr) +void SwInputField::SetPar2(const rtl::OUString& rStr) { aPText = rStr; } -String SwInputField::GetPar2() const +rtl::OUString SwInputField::GetPar2() const { return aPText; } diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 144191cd2f41..e85fca13732f 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -149,9 +149,14 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId ) { } -const String& SwFieldType::GetName() const +namespace { - return aEmptyStr; + rtl::OUString aEmptyOUStr; +} + +const rtl::OUString& SwFieldType::GetName() const +{ + return aEmptyOUStr; } bool SwFieldType::QueryValue( uno::Any&, sal_uInt16 ) const @@ -265,14 +270,14 @@ String SwField::GetFieldName() const Beschreibung: Parameter setzen auslesen --------------------------------------------------------------------*/ -const String& SwField::GetPar1() const +const rtl::OUString& SwField::GetPar1() const { - return aEmptyStr; + return aEmptyOUStr; } -String SwField::GetPar2() const +rtl::OUString SwField::GetPar2() const { - return aEmptyStr; + return rtl::OUString(); } String SwField::GetFormula() const @@ -280,10 +285,10 @@ String SwField::GetFormula() const return GetPar2(); } -void SwField::SetPar1(const String& ) +void SwField::SetPar1(const rtl::OUString& ) {} -void SwField::SetPar2(const String& ) +void SwField::SetPar2(const rtl::OUString& ) {} sal_uInt16 SwField::GetSubType() const diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 22cd105022f1..a990f094b619 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -115,17 +115,16 @@ void SwDateTimeField::SetSubType(sal_uInt16 nType) nSubType = nType; } -void SwDateTimeField::SetPar2(const String& rStr) +void SwDateTimeField::SetPar2(const rtl::OUString& rStr) { - nOffset = rStr.ToInt32(); + nOffset = rStr.toInt32(); } -String SwDateTimeField::GetPar2() const +rtl::OUString SwDateTimeField::GetPar2() const { if (nOffset) - return String::CreateFromInt32(nOffset); - else - return aEmptyStr; + return rtl::OUString::valueOf(static_cast(nOffset)); + return rtl::OUString(); } void SwDateTimeField::SetDateTime(const DateTime& rDT) diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index f3f39cd02f0c..84c6cae939dc 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -80,7 +80,7 @@ String SwDropDownField::Expand() const String sSelect = GetSelectedItem(); if(!sSelect.Len()) { - vector::const_iterator aIt = aValues.begin(); + vector::const_iterator aIt = aValues.begin(); if ( aIt != aValues.end()) sSelect = *aIt; } @@ -95,27 +95,27 @@ SwField * SwDropDownField::Copy() const return new SwDropDownField(*this); } -const String & SwDropDownField::GetPar1() const +const rtl::OUString & SwDropDownField::GetPar1() const { return GetSelectedItem(); } -String SwDropDownField::GetPar2() const +rtl::OUString SwDropDownField::GetPar2() const { return GetName(); } -void SwDropDownField::SetPar1(const String & rStr) +void SwDropDownField::SetPar1(const rtl::OUString & rStr) { SetSelectedItem(rStr); } -void SwDropDownField::SetPar2(const String & rName) +void SwDropDownField::SetPar2(const rtl::OUString & rName) { SetName(rName); } -void SwDropDownField::SetItems(const vector & rItems) +void SwDropDownField::SetItems(const vector & rItems) { aValues = rItems; aSelectedItem = aEmptyString; @@ -137,62 +137,61 @@ uno::Sequence SwDropDownField::GetItemSequence() const uno::Sequence aSeq( aValues.size() ); OUString* pSeq = aSeq.getArray(); int i = 0; - vector::const_iterator aIt; + vector::const_iterator aIt; for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt) { - pSeq[i] = rtl::OUString(*aIt); - + pSeq[i] = *aIt; i++; } return aSeq; } -const String & SwDropDownField::GetSelectedItem() const +const rtl::OUString & SwDropDownField::GetSelectedItem() const { return aSelectedItem; } -const String & SwDropDownField::GetName() const +const rtl::OUString & SwDropDownField::GetName() const { return aName; } -const String & SwDropDownField::GetHelp() const +const rtl::OUString & SwDropDownField::GetHelp() const { return aHelp; } -const String & SwDropDownField::GetToolTip() const +const rtl::OUString & SwDropDownField::GetToolTip() const { return aToolTip; } -sal_Bool SwDropDownField::SetSelectedItem(const String & rItem) +sal_Bool SwDropDownField::SetSelectedItem(const rtl::OUString & rItem) { - vector::const_iterator aIt = + vector::const_iterator aIt = std::find(aValues.begin(), aValues.end(), rItem); if (aIt != aValues.end()) aSelectedItem = *aIt; else - aSelectedItem = String(); + aSelectedItem = rtl::OUString(); return (aIt != aValues.end()); } -void SwDropDownField::SetName(const String & rName) +void SwDropDownField::SetName(const rtl::OUString & rName) { aName = rName; } -void SwDropDownField::SetHelp(const String & rHelp) +void SwDropDownField::SetHelp(const rtl::OUString & rHelp) { aHelp = rHelp; } -void SwDropDownField::SetToolTip(const String & rToolTip) +void SwDropDownField::SetToolTip(const rtl::OUString & rToolTip) { aToolTip = rToolTip; } @@ -203,16 +202,16 @@ bool SwDropDownField::QueryValue(::uno::Any &rVal, sal_uInt16 nWhich) const switch( nWhich ) { case FIELD_PROP_PAR1: - rVal <<= rtl::OUString(GetSelectedItem()); + rVal <<= GetSelectedItem(); break; case FIELD_PROP_PAR2: - rVal <<= rtl::OUString(GetName()); + rVal <<= GetName(); break; case FIELD_PROP_PAR3: - rVal <<= rtl::OUString(GetHelp()); + rVal <<= GetHelp(); break; case FIELD_PROP_PAR4: - rVal <<= rtl::OUString(GetToolTip()); + rVal <<= GetToolTip(); break; case FIELD_PROP_STRINGS: rVal <<= GetItemSequence(); @@ -232,8 +231,8 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, { case FIELD_PROP_PAR1: { - String aTmpStr; - ::GetString( rVal, aTmpStr ); + rtl::OUString aTmpStr; + rVal >>= aTmpStr; SetSelectedItem(aTmpStr); } @@ -241,8 +240,8 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR2: { - String aTmpStr; - ::GetString( rVal, aTmpStr ); + rtl::OUString aTmpStr; + rVal >>= aTmpStr; SetName(aTmpStr); } @@ -250,8 +249,8 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR3: { - String aTmpStr; - ::GetString( rVal, aTmpStr ); + rtl::OUString aTmpStr; + rVal >>= aTmpStr; SetHelp(aTmpStr); } @@ -259,8 +258,8 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR4: { - String aTmpStr; - ::GetString( rVal, aTmpStr ); + rtl::OUString aTmpStr; + rVal >>= aTmpStr; SetToolTip(aTmpStr); } diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 3a559b719650..d8cd5356ab61 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -93,14 +93,14 @@ String SwMacroField::GetLibName() const return String(); } - if (aMacro.Len()) + if (!aMacro.isEmpty()) { - sal_uInt16 nPos = aMacro.Len(); + sal_Int32 nPos = aMacro.getLength(); - for (sal_uInt16 i = 0; i < 3 && nPos > 0; i++) - while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ; + for (sal_Int32 i = 0; i < 3 && nPos > 0; i++) + while (aMacro[--nPos] != '.' && nPos > 0) ; - return aMacro.Copy(0, nPos ); + return aMacro.copy(0, nPos); } OSL_FAIL("Kein Macroname vorhanden"); @@ -109,20 +109,20 @@ String SwMacroField::GetLibName() const String SwMacroField::GetMacroName() const { - if (aMacro.Len()) + if (!aMacro.isEmpty()) { if (bIsScriptURL) { - return aMacro.Copy( 0 ); + return aMacro; } else { - sal_uInt16 nPos = aMacro.Len(); + sal_Int32 nPos = aMacro.getLength(); - for (sal_uInt16 i = 0; i < 3 && nPos > 0; i++) - while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ; + for (sal_Int32 i = 0; i < 3 && nPos > 0; i++) + while (aMacro[--nPos] != '.' && nPos > 0) ; - return aMacro.Copy( ++nPos ); + return aMacro.copy( ++nPos ); } } @@ -146,13 +146,13 @@ SvxMacro SwMacroField::GetSvxMacro() const Beschreibung: LibName und MacroName --------------------------------------------------------------------*/ -void SwMacroField::SetPar1(const String& rStr) +void SwMacroField::SetPar1(const rtl::OUString& rStr) { aMacro = rStr; bIsScriptURL = isScriptURL(aMacro); } -const String& SwMacroField::GetPar1() const +const rtl::OUString& SwMacroField::GetPar1() const { return aMacro; } @@ -161,12 +161,12 @@ const String& SwMacroField::GetPar1() const Beschreibung: Macrotext --------------------------------------------------------------------*/ -void SwMacroField::SetPar2(const String& rStr) +void SwMacroField::SetPar2(const rtl::OUString& rStr) { aText = rStr; } -String SwMacroField::GetPar2() const +rtl::OUString SwMacroField::GetPar2() const { return aText; } @@ -195,20 +195,22 @@ bool SwMacroField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { - String sTmp; + rtl::OUString sTmp; switch( nWhichId ) { case FIELD_PROP_PAR1: - CreateMacroString( aMacro, ::GetString(rAny, sTmp), GetLibName()); + rAny >>= sTmp; + CreateMacroString( aMacro, sTmp, GetLibName()); break; case FIELD_PROP_PAR2: - ::GetString( rAny, aText ); + rAny >>= aText; break; case FIELD_PROP_PAR3: - CreateMacroString(aMacro, GetMacroName(), ::GetString(rAny, sTmp) ); + rAny >>= sTmp; + CreateMacroString(aMacro, GetMacroName(), sTmp ); break; case FIELD_PROP_PAR4: - ::GetString(rAny, aMacro); + rAny >>= aMacro; bIsScriptURL = isScriptURL(aMacro); break; default: @@ -220,14 +222,14 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) // create an internally used macro name from the library and macro name parts void SwMacroField::CreateMacroString( - String& rMacro, + rtl::OUString& rMacro, const String& rMacroName, const String& rLibraryName ) { // concatenate library and name; use dot only if both strings have content rMacro = rLibraryName; if ( rLibraryName.Len() > 0 && rMacroName.Len() > 0 ) - rMacro += '.'; + rMacro += rtl::OUString('.'); rMacro += rMacroName; } diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index b01471abc4ba..c1104298468b 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -276,7 +276,7 @@ String SwGetRefField::Expand() const String SwGetRefField::GetFieldName() const { - if ( GetTyp()->GetName().Len() > 0 || sSetRefName.Len() > 0 ) + if ( GetTyp()->GetName().getLength() > 0 || sSetRefName.getLength() > 0 ) { String aStr(GetTyp()->GetName()); aStr += ' '; @@ -563,19 +563,19 @@ SwField* SwGetRefField::Copy() const --------------------------------------------------------------------*/ -const String& SwGetRefField::GetPar1() const +const rtl::OUString& SwGetRefField::GetPar1() const { return sSetRefName; } -void SwGetRefField::SetPar1( const String& rName ) +void SwGetRefField::SetPar1( const rtl::OUString& rName ) { sSetRefName = rName; } -String SwGetRefField::GetPar2() const +rtl::OUString SwGetRefField::GetPar2() const { return Expand(); } @@ -1092,11 +1092,13 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) { _RefIdsMap* pMap = 0; for( sal_uInt16 n = aFldMap.Count(); n; ) - if( aFldMap[ --n ]->GetName() == rRefFld.GetSetRefName() ) + { + if( aFldMap[ --n ]->GetName().Equals(rRefFld.GetSetRefName()) ) { pMap = aFldMap[ n ]; break; } + } if( !pMap ) { pMap = new _RefIdsMap( rRefFld.GetSetRefName() ); diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index 1fb757e4b6ee..0124c40debd0 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -79,12 +79,12 @@ SwField* SwScriptField::Copy() const Beschreibung: Type setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar1( const String& rStr ) +void SwScriptField::SetPar1( const rtl::OUString& rStr ) { sType = rStr; } -const String& SwScriptField::GetPar1() const +const rtl::OUString& SwScriptField::GetPar1() const { return sType; } @@ -93,13 +93,13 @@ const String& SwScriptField::GetPar1() const Beschreibung: Code setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar2( const String& rStr ) +void SwScriptField::SetPar2( const rtl::OUString& rStr ) { sCode = rStr; } -String SwScriptField::GetPar2() const +rtl::OUString SwScriptField::GetPar2() const { return sCode; } @@ -128,10 +128,10 @@ bool SwScriptField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) switch( nWhichId ) { case FIELD_PROP_PAR1: - ::GetString( rAny, sType ); + rAny >>= sType; break; case FIELD_PROP_PAR2: - ::GetString( rAny, sCode ); + rAny >>= sCode; break; case FIELD_PROP_BOOL1: bCodeURL = *(sal_Bool*)rAny.getValue(); diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index b5c78f5f847c..e7975c098b8d 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -168,13 +168,13 @@ void SwTblField::SetValue( const double& rVal ) --------------------------------------------------------------------*/ -String SwTblField::GetPar2() const +rtl::OUString SwTblField::GetPar2() const { return SwTableFormula::GetFormula(); } -void SwTblField::SetPar2(const String& rStr) +void SwTblField::SetPar2(const rtl::OUString& rStr) { SetFormula( rStr ); } diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index fb9958bf4930..5495a7a37509 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -95,21 +95,21 @@ void SwUserField::SetValue( const double& rVal ) Beschreibung: Name --------------------------------------------------------------------*/ -const String& SwUserField::GetPar1() const +const rtl::OUString& SwUserField::GetPar1() const { - return ((SwUserFieldType*)GetTyp())->GetName(); + return ((const SwUserFieldType*)GetTyp())->GetName(); } /*-------------------------------------------------------------------- Beschreibung: Content --------------------------------------------------------------------*/ -String SwUserField::GetPar2() const +rtl::OUString SwUserField::GetPar2() const { return ((SwUserFieldType*)GetTyp())->GetContent(GetFormat()); } -void SwUserField::SetPar2(const String& rStr) +void SwUserField::SetPar2(const rtl::OUString& rStr) { ((SwUserFieldType*)GetTyp())->SetContent(rStr, GetFormat()); } @@ -221,7 +221,7 @@ SwFieldType* SwUserFieldType::Copy() const return pTmp; } -const String& SwUserFieldType::GetName() const +const rtl::OUString& SwUserFieldType::GetName() const { return aName; } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index f5302fb17038..a8c34d6ace35 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1961,7 +1961,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R uno::Sequence aRet; if(IsValid()) { - std::vector aStrings; + std::vector aStrings; sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings ); aRet.realloc(nCount); OUString* pNames = aRet.getArray(); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index bb6bef83fa2c..276a336127e8 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1642,7 +1642,7 @@ void SwXTextField::attachToRange( case SW_SERVICE_FIELDTYPE_MACRO: { SwFieldType* pFldType = pDoc->GetSysFldType(RES_MACROFLD); - String aName; + rtl::OUString aName; // support for Scripting Framework macros if (m_pProps->sPar4.Len() != 0) diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index fca7370f4b9f..ed72fccab639 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -444,9 +444,9 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) ) { int bOn = sal_False; - if( pFldTyp->GetName().EqualsAscii("HTML_ON" ) ) + if (pFldTyp->GetName() == "HTML_ON") bOn = sal_True; - else if( !pFldTyp->GetName().EqualsAscii( "HTML_OFF" ) ) + else if (pFldTyp->GetName() != "HTML_OFF") return rWrt; String rTxt( pFld->GetPar2() ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index f466fcc8874c..11422528dd03 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -593,10 +593,10 @@ public: const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const; /// Find the reference. - bool HasRefToObject( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ); + bool HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ); /// Find the bookmark name. - String GetBookmarkName( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ); + String GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ); /// Add a bookmark converted to a Word name. void AppendWordBookmark( const String& rName ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 79deb333a8fc..c8f005b43ad4 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -857,7 +857,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF pOutFmtNode = pOldMod; } -bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ) +bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) { const SwTxtNode* pNd; @@ -893,7 +893,7 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const String* pName, sal return false; } -String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ) +String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) { String sRet; switch ( nTyp ) @@ -2911,7 +2911,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) font size and fill in the defaults as up == half the font size and down == a fifth the font size */ - xub_StrLen nAbove = (pFld->GetPar1().Len()+1)/2; + xub_StrLen nAbove = (pFld->GetPar1().getLength()+1)/2; sStr = FieldString(ww::eEQ); sStr.APPEND_CONST_ASC("\\o (\\s\\up "); sStr += String::CreateFromInt32(nHeight/2); @@ -2922,7 +2922,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) sStr += String::CreateFromInt32(nHeight/5); sStr.Append('('); - sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().Len()-nAbove); + sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().getLength()-nAbove); sStr.APPEND_CONST_ASC("))"); GetExport().OutputField(pFld, ww::eEQ, sStr); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index be321c8bc352..4e57ac632608 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1237,7 +1237,7 @@ bool SwWW8FltRefStack::IsFtnEdnBkmField(const SwFmtFld& rFmtFld, sal_uInt16& rBk sal_uInt16 nSubType; if(pFld && (RES_GETREFFLD == pFld->Which()) && ((REF_FOOTNOTE == (nSubType = pFld->GetSubType())) || (REF_ENDNOTE == nSubType)) - && ((SwGetRefField*)pFld)->GetSetRefName().Len()) + && !((SwGetRefField*)pFld)->GetSetRefName().isEmpty()) { const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark( diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 0c7001c8568a..32cfe035919d 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -551,12 +551,12 @@ enum SwWw8ControlType WW8_CT_DROPDOWN }; -class WW8FormulaControl +class WW8FormulaControl : private ::boost::noncopyable { protected: SwWW8ImplReader &rRdr; public: - WW8FormulaControl(const String& rN, SwWW8ImplReader &rR) + WW8FormulaControl(const rtl::OUString& rN, SwWW8ImplReader &rR) : rRdr(rR), fUnknown(0), fDropdownIndex(0), fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0), fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN ) @@ -576,12 +576,12 @@ public: sal_uInt16 nChecked; sal_uInt16 nDefaultChecked; - String sTitle; - String sDefault; - String sFormatting; - String sHelp; - String sToolTip; - std::vector maListEntries; + rtl::OUString sTitle; + rtl::OUString sDefault; + rtl::OUString sFormatting; + rtl::OUString sHelp; + rtl::OUString sToolTip; + std::vector maListEntries; virtual ~WW8FormulaControl() {} void FormulaRead(SwWw8ControlType nWhich,SvStream *pD); virtual sal_Bool Import(const com::sun::star::uno::Reference < @@ -589,11 +589,7 @@ public: com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, com::sun::star::awt::Size &rSz) = 0; - UniString sName; -private: - //No copying - WW8FormulaControl(const WW8FormulaControl&); - WW8FormulaControl& operator=(const WW8FormulaControl&); + rtl::OUString sName; }; class WW8FormulaCheckBox : public WW8FormulaControl diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index a2c729083e22..e74829b92d10 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2396,15 +2396,15 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < uno::Reference xPropSet(xCreate, uno::UNO_QUERY); uno::Any aTmp; - if (sTitle.Len()) - aTmp <<= rtl::OUString(sTitle); + if (!sTitle.isEmpty()) + aTmp <<= sTitle; else - aTmp <<= rtl::OUString(sName); + aTmp <<= sName; xPropSet->setPropertyValue(C2U("Name"), aTmp ); - if (sToolTip.Len()) + if (!sToolTip.isEmpty()) { - aTmp <<= rtl::OUString(sToolTip); + aTmp <<= sToolTip; xPropSet->setPropertyValue(C2U("HelpText"), aTmp ); } @@ -2492,19 +2492,19 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference < rSz.Height = 16 * hpsCheckBox; uno::Any aTmp; - if (sTitle.Len()) - aTmp <<= rtl::OUString(sTitle); + if (!sTitle.isEmpty()) + aTmp <<= sTitle; else - aTmp <<= rtl::OUString(sName); + aTmp <<= sName; xPropSet->setPropertyValue(C2U("Name"), aTmp ); aTmp <<= (sal_Int16)nChecked; xPropSet->setPropertyValue(C2U("DefaultState"), aTmp); - if( sToolTip.Len() ) + if (!sToolTip.isEmpty()) lcl_AddToPropertyContainer(xPropSet, C2U("HelpText"), sToolTip); - if( sHelp.Len() ) + if (!sHelp.isEmpty()) lcl_AddToPropertyContainer(xPropSet, C2U("HelpF1Text"), sHelp); return sal_True; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 801e6873b3c7..70272616b49c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4155,9 +4155,9 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex) return bFound ? aBookNames[i] : aEmptyStr; } -String WW8PLCFx_Book::GetUniqueBookmarkName(String &suggestedName) +String WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggestedName) { - String aRet=(suggestedName.Len()==0?String::CreateFromAscii("Unnamed"):suggestedName); + String aRet=(rSuggestedName.isEmpty() ? rtl::OUString("Unnamed") : rSuggestedName); unsigned int i=0; while(iGetFldTypeCount(); SwFieldType* pFldType; for ( i = nCount; i; ) - if( ( pFldType = pMgr->GetFldType(USHRT_MAX, --i))->GetName() == - aCategoryBox.GetText() ) + { + pFldType = pMgr->GetFldType(USHRT_MAX, --i); + if (pFldType->GetName().equals(aCategoryBox.GetText())) { nSelFmt = (sal_uInt16)((SwSetExpFieldType*)pFldType)->GetSeqFormat(); break; } + } ::FillCharStyleListBox( aCharStyleLB, pSh->GetView().GetDocShell(), sal_True, sal_True ); } diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index c309595b97ce..1e019e37d018 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -286,7 +286,7 @@ sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) } sal_Bool lcl_GetColumnCnt(SwDSParam* pParam, - const String& rColumnName, long nLanguage, String& rResult, double* pNumber) + const String& rColumnName, long nLanguage, rtl::OUString& rResult, double* pNumber) { uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY ); uno::Reference xCols; @@ -1757,7 +1757,7 @@ sal_Bool SwNewDBMgr::IsDataSourceOpen(const String& rDataSource, sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTableName, const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, - String& rResult, double* pNumber) + rtl::OUString& rResult, double* pNumber) { sal_Bool bRet = sal_False; SwDSParam* pFound = 0; @@ -1822,11 +1822,11 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTabl // reads the column data at the current position sal_Bool SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage, - String &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) + rtl::OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) { if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection ) { - rResult.Erase(); + rResult = rtl::OUString(); return sal_False; } diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 1acb9a3016c9..fa2dc9b82cf3 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -106,7 +106,7 @@ void sw::DropDownFieldDialog::Apply() { if(pDropField) { - String sSelect = aListItemsLB.GetSelectEntry(); + rtl::OUString sSelect = aListItemsLB.GetSelectEntry(); if(pDropField->GetPar1() != sSelect) { rSh.StartAllAction(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index d119fffb3591..e9be1807596d 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -139,7 +139,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32()); } - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); for(size_t i = 0; i < aLst.size(); ++i) { diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 2bce604a1ae0..461ea9d9fc1d 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -215,7 +215,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) if (nTypeId != USHRT_MAX) { - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); if (nTypeId != TYP_AUTHORFLD) @@ -347,7 +347,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) if(SVX_NUM_CHAR_SPECIAL != nTmp) { - sal_Int32 nOff = GetCurField()->GetPar2().ToInt32(); + sal_Int32 nOff = GetCurField()->GetPar2().toInt32(); if( TYP_NEXTPAGEFLD == nTypeId && 1 != nOff ) aValueED.SetText( String::CreateFromInt32(nOff - 1) ); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 03572c2cad30..9914d1626428 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -338,8 +338,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) aNameED.SetDropEnable(sal_True); if (IsFldEdit()) { - aCond1ED.SetText(GetCurField()->GetPar2().GetToken(0, '|')); - aCond2ED.SetText(GetCurField()->GetPar2().GetToken(1, '|')); + aCond1ED.SetText(GetCurField()->GetPar2().getToken(0, '|')); + aCond2ED.SetText(GetCurField()->GetPar2().getToken(1, '|')); } bName = bValue = sal_True; @@ -500,7 +500,7 @@ void SwFldFuncPage::UpdateSubType() aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); size_t nCount = aLst.size(); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 2ebd2cecd0dc..2981723555d5 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -498,7 +498,7 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) Description: localise subtypes of a field --------------------------------------------------------------------*/ -sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector& rToFill) +sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector& rToFill) { sal_Bool bRet = sal_False; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index e3332d088ae3..b4764f2c051f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -629,7 +629,7 @@ void SwFldRefPage::UpdateSubType() } else { - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); for(size_t i = 0; i < aLst.size(); ++i) aSelectionLB.InsertEntry(aLst[i]); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index c0170edddb1e..b73c8dbb9810 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -602,7 +602,7 @@ void SwFldVarPage::UpdateSubType() aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); - std::vector aList; + std::vector aList; GetFldMgr().GetSubTypes(nTypeId, aList); size_t nCount = aList.size(); size_t nPos; @@ -632,7 +632,7 @@ void SwFldVarPage::UpdateSubType() break; case TYP_GETFLD: - if (aList[i] == ((SwFormulaField*)GetCurField())->GetFormula()) + if (aList[i].equals(((const SwFormulaField*)GetCurField())->GetFormula())) bInsert = sal_True; break; diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 94de28a1a639..8661c7ca0911 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -155,7 +155,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType ) void SwFldInputDlg::Apply() { - String aTmp(comphelper::string::remove(aEditED.GetText(), '\r')); + rtl::OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r')); rSh.StartAllAction(); sal_Bool bModified = sal_False; @@ -163,21 +163,21 @@ void SwFldInputDlg::Apply() { if(pUsrType) { - if( aTmp != pUsrType->GetContent() ) + if( !aTmp.equals(pUsrType->GetContent()) ) { pUsrType->SetContent(aTmp); pUsrType->UpdateFlds(); bModified = sal_True; } } - else if( aTmp != pInpFld->GetPar1() ) + else if( !aTmp.equals(pInpFld->GetPar1()) ) { pInpFld->SetPar1(aTmp); rSh.SwEditShell::UpdateFlds(*pInpFld); bModified = sal_True; } } - else if( aTmp != pSetFld->GetPar2() ) + else if( !aTmp.equals(pSetFld->GetPar2()) ) { pSetFld->SetPar2(aTmp); rSh.SwEditShell::UpdateFlds(*pSetFld); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index b7af46e91c1d..60d957a50c1e 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -232,7 +232,7 @@ void SwJavaEditDialog::SetFld() if( bIsUrl ) { aText = aUrlED.GetText(); - if(aText.Len()) + if (!aText.isEmpty()) { SfxMedium* pMedium = pSh->GetView().GetDocShell()->GetMedium(); INetURLObject aAbs; @@ -246,8 +246,8 @@ void SwJavaEditDialog::SetFld() else aText = aEditED.GetText(); - if( !aType.Len() ) - aType = String::CreateFromAscii("JavaScript"); + if( aType.isEmpty() ) + aType = "JavaScript"; } sal_Bool SwJavaEditDialog::IsUpdate() diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 0d7d23b2219a..4b386c43beca 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -233,13 +233,14 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : nCount = pMgr->GetFldTypeCount(); SwFieldType* pFldType; for ( i = nCount; i; ) - if( ( pFldType = pMgr->GetFldType(USHRT_MAX, --i))->GetName() == - aCategoryBox.GetText() ) + { + pFldType = pMgr->GetFldType(USHRT_MAX, --i); + if( pFldType->GetName().equals(aCategoryBox.GetText()) ) { nSelFmt = (sal_uInt16)((SwSetExpFieldType*)pFldType)->GetSeqFormat(); break; } - + } nCount = pMgr->GetFormatCount(TYP_SEQFLD, sal_False); for ( i = 0; i < nCount; ++i ) diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index 0ed199082087..eabe9eb63fc0 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -202,7 +202,7 @@ public: static sal_uInt16 GetPos(sal_uInt16 nTypeId); // subtypes to a type - sal_Bool GetSubTypes(sal_uInt16 nId, std::vector& rToFill); + sal_Bool GetSubTypes(sal_uInt16 nId, std::vector& rToFill); // format to a type sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode = sal_False) const; diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index ad795216c6f9..57d8b9ae3692 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -66,8 +66,8 @@ private: ImageButton aNextBtn; HelpButton aHelpBtn; - String aText; - String aType; + rtl::OUString aText; + rtl::OUString aType; sal_Bool bNew; sal_Bool bIsUrl; @@ -97,9 +97,9 @@ public: SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh); ~SwJavaEditDialog(); - String GetText() { return aText; } + rtl::OUString GetText() { return aText; } - String GetType() { return aType; } + rtl::OUString GetType() { return aType; } sal_Bool IsUrl() { return bIsUrl; } sal_Bool IsNew() { return bNew; } diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 984a77b9b308..b6d674d2e98c 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -496,7 +496,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) case FN_JAVAEDIT: { - String aType, aText; + rtl::OUString aType, aText; sal_Bool bIsUrl=sal_False; sal_Bool bNew=sal_False, bUpdate=sal_False; SwFldMgr* pMgr = new SwFldMgr; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 441ce46a5436..cde36a8df209 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -658,10 +658,10 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) break; case CONTENT_TYPE_REFERENCE: { - std::vector aRefMarks; + std::vector aRefMarks; nMemberCount = pWrtShell->GetRefMarks( &aRefMarks ); - for(std::vector::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) + for(std::vector::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) { //Referenzen nach Alphabet sortiert SwContent* pCnt = new SwContent(this, *i, 0); -- cgit