diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-05 16:25:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-07 20:00:16 +0000 |
| commit | 009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch) | |
| tree | a8ab339589ea23b98513d394eabc4f135e69ccae /sc | |
| parent | 35b42a9d1282a92dbc9a7fbc51d279812070688c (diff) | |
module svl: all String and some bool and related clean-up
Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
Reviewed-on: https://gerrit.libreoffice.org/4733
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sc')
48 files changed, 404 insertions, 396 deletions
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 6b5fbf6f5fdf..d0e6741ce308 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -51,11 +51,11 @@ enum ScAutoFontColorMode class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem { - String* pName; + OUString* pName; ScStyleSheet* pStyle; public: static ScDocument* pDoc; - ScPatternAttr(SfxItemSet* pItemSet, const String& rStyleName); + ScPatternAttr(SfxItemSet* pItemSet, const OUString& rStyleName); ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = NULL); ScPatternAttr(SfxItemPool* pItemPool); ScPatternAttr(const ScPatternAttr& rPatternAttr); @@ -115,7 +115,7 @@ public: void SetStyleSheet(ScStyleSheet* pNewStyle, bool bClearDirectFormat = true); const ScStyleSheet* GetStyleSheet() const { return pStyle; } - const String* GetStyleName() const; + const OUString* GetStyleName() const; void UpdateStyleSheet(); void StyleToName(); diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index f2a025536835..f3abe11b0924 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -47,13 +47,13 @@ public: void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); void CopyStyleFrom( ScStyleSheetPool* pSrcPool, - const String& rName, SfxStyleFamily eFamily ); + const OUString& rName, SfxStyleFamily eFamily ); - ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); + ScStyleSheet* FindCaseIns( const OUString& rName, SfxStyleFamily eFam ); - const String* GetForceStdName() const { return pForceStdName; } + const OUString* GetForceStdName() const { return pForceStdName; } - virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, + virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam, sal_uInt16 nMask = SFXSTYLEBIT_ALL, sal_uInt16 nPos = 0xffff ); protected: @@ -61,15 +61,15 @@ protected: using SfxStyleSheetPool::Create; // calcwarnings: Create(const SfxStyleSheet&) - ever used? - virtual SfxStyleSheetBase* Create( const String& rName, + virtual SfxStyleSheetBase* Create( const OUString& rName, SfxStyleFamily eFamily, - sal_uInt16 nMask); + sal_uInt16 nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ); private: SfxStyleSheetBase* pActualStyleSheet; ScDocument* pDoc; - const String* pForceStdName; + const OUString* pForceStdName; }; #endif // SC_STLPOOL_HXX diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index c66d53642b4e..28e4a9d04d01 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -51,17 +51,17 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual bool SetParent ( const String& rParentName ); + virtual bool SetParent ( const OUString& rParentName ); virtual SfxItemSet& GetItemSet (); virtual bool IsUsed () const; virtual bool HasFollowSupport () const; virtual bool HasParentSupport () const; - virtual const String& GetName() const; - virtual const String& GetParent() const; - virtual const String& GetFollow() const; + virtual const OUString& GetName() const; + virtual const OUString& GetParent() const; + virtual const OUString& GetFollow() const; - virtual bool SetName( const String& ); + virtual bool SetName( const OUString& ); void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } @@ -71,10 +71,10 @@ public: protected: virtual ~ScStyleSheet(); - ScStyleSheet( const String& rName, + ScStyleSheet( const OUString& rName, ScStyleSheetPool& rPool, SfxStyleFamily eFamily, - sal_uInt16 nMask ); + sal_uInt16 nMask ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index 33fd541c348e..50357f109e2d 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -31,7 +31,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; private: @@ -53,7 +53,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; private: diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 1dbb74e3bb4c..c132a8af4410 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -30,7 +30,7 @@ class SvNumberFormatter; class ScNumFormatAbbrev { - String sFormatstring; + OUString sFormatstring; LanguageType eLnge; LanguageType eSysLnge; public: diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 4954ac0e4412..684c32a691b9 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -679,7 +679,7 @@ void ScDocumentPool::CellStyleCreated( const String& rName ) static_cast<ScPatternAttr const*>(GetItem2(ATTR_PATTERN, i))); if ( pPattern && pPattern->GetStyleSheet() == NULL ) { - const String* pStyleName = pPattern->GetStyleName(); + const OUString* pStyleName = pPattern->GetStyleName(); if ( pStyleName && *pStyleName == rName ) pPattern->UpdateStyleSheet(); // find and store style pointer } diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index bff62bd964ac..abaf08882abf 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -963,7 +963,7 @@ OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) con if (pFormatter) { Color* pColor = NULL; - String aStr; + OUString aStr; pFormatter->GetOutputString(rItem.GetValue(), nNumFormat, aStr, &pColor); return aStr; } diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index d7bf56fee780..e4240ba60769 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -110,7 +110,7 @@ OUString ScDPUtil::getDateGroupName( sal_uLong nFormat = pFormatter->GetFormatIndex(NF_DATE_SYS_DDMMM, ScGlobal::eLnge); Color* pColor; - String aStr; + OUString aStr; pFormatter->GetOutputString(nDays, nFormat, aStr, &pColor); return aStr; } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index af1d5c9e6f8d..3e18fa4630c2 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -72,9 +72,9 @@ using sc::TwipsToHMM; // ----------------------------------------------------------------------- -ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const String& rStyleName ) +ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName ) : SfxSetItem ( ATTR_PATTERN, pItemSet ), - pName ( new String( rStyleName ) ), + pName ( new OUString( rStyleName ) ), pStyle ( NULL ) { } @@ -100,7 +100,7 @@ ScPatternAttr::ScPatternAttr( const ScPatternAttr& rPatternAttr ) pStyle ( rPatternAttr.pStyle ) { if (rPatternAttr.pName) - pName = new String(*rPatternAttr.pName); + pName = new OUString(*rPatternAttr.pName); else pName = NULL; } @@ -115,12 +115,12 @@ SfxPoolItem* ScPatternAttr::Clone( SfxItemPool *pPool ) const ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(true, pPool) ); pPattern->pStyle = pStyle; - pPattern->pName = pName ? new String(*pName) : NULL; + pPattern->pName = pName ? new OUString(*pName) : NULL; return pPattern; } -inline int StrCmp( const String* pStr1, const String* pStr2 ) +inline int StrCmp( const OUString* pStr1, const OUString* pStr2 ) { return ( pStr1 ? ( pStr2 ? ( *pStr1 == *pStr2 ) : false ) : ( pStr2 ? false : true ) ); } @@ -150,7 +150,7 @@ int ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ ) const { - String* pStr; + OUString* pStr; sal_Bool bHasStyle; rStream >> bHasStyle; @@ -158,12 +158,12 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ if ( bHasStyle ) { short eFamDummy; - pStr = new String; + pStr = new OUString; *pStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() ); rStream >> eFamDummy; // wg. altem Dateiformat } else - pStr = new String( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); + pStr = new OUString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); SfxItemSet *pNewSet = new SfxItemSet( *GetItemSet().GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); @@ -1117,7 +1117,7 @@ bool ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const //! auch hier nur wirklich sichtbare Werte testen !!! } -const String* ScPatternAttr::GetStyleName() const +const OUString* ScPatternAttr::GetStyleName() const { return pName ? pName : ( pStyle ? &pStyle->GetName() : NULL ); } @@ -1184,7 +1184,7 @@ void ScPatternAttr::StyleToName() if ( pName ) *pName = pStyle->GetName(); else - pName = new String( pStyle->GetName() ); + pName = new OUString( pStyle->GetName() ); pStyle = NULL; GetItemSet().SetParent( NULL ); diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index c008123990e7..da1ddb364d19 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -80,8 +80,8 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument ) //------------------------------------------------------------------------ -SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, - SfxStyleFamily eFam, sal_uInt16 mask, sal_uInt16 nPos ) +SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, + SfxStyleFamily eFam, sal_uInt16 mask, sal_uInt16 nPos ) { // When updating styles from a template, Office 5.1 sometimes created // files with multiple default styles. @@ -89,13 +89,13 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, //! only when loading? - if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL ) + if ( rName == STRING_STANDARD && Find( rName, eFam ) != NULL ) { OSL_FAIL("renaming additional default style"); sal_uInt32 nCount = aStyles.size(); for ( sal_uInt32 nAdd = 1; nAdd <= nCount; nAdd++ ) { - String aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); + OUString aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); aNewName += OUString::number( nAdd ); if ( Find( aNewName, eFam ) == NULL ) return SfxStyleSheetPool::Make( aNewName, eFam, mask, nPos ); @@ -107,10 +107,9 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, //------------------------------------------------------------------------ -SfxStyleSheetBase* ScStyleSheetPool::Create( - const String& rName, - SfxStyleFamily eFamily, - sal_uInt16 nMaskP ) +SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, + SfxStyleFamily eFamily, + sal_uInt16 nMaskP ) { ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMaskP ); if ( eFamily == SFX_STYLE_FAMILY_PARA && ScGlobal::GetRscString(STR_STYLENAME_STANDARD) != rName ) @@ -144,7 +143,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) //------------------------------------------------------------------------ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, - const String& rName, SfxStyleFamily eFamily ) + const OUString& rName, SfxStyleFamily eFamily ) { // this ist Dest-Pool @@ -483,9 +482,9 @@ void ScStyleSheetPool::CreateStandardStyles() //------------------------------------------------------------------------ -ScStyleSheet* ScStyleSheetPool::FindCaseIns( const String& rName, SfxStyleFamily eFam ) +ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFamily eFam ) { - String aUpSearch = ScGlobal::pCharClass->uppercase(rName); + OUString aUpSearch = ScGlobal::pCharClass->uppercase(rName); sal_uInt32 nCount = aStyles.size(); for (sal_uInt32 n=0; n<nCount; n++) diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index eaa692a798cc..c7c4fd168c8c 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -50,12 +50,12 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet); //======================================================================== -ScStyleSheet::ScStyleSheet( const String& rName, +ScStyleSheet::ScStyleSheet( const OUString& rName, ScStyleSheetPool& rPoolP, SfxStyleFamily eFamily, - sal_uInt16 nMaskP ) + sal_uInt16 nMaskP ) - : SfxStyleSheet ( rName, rPoolP, eFamily, nMaskP ) + : SfxStyleSheet ( rName, rPoolP, eFamily, nMaskP ) , eUsage( UNKNOWN ) { } @@ -89,9 +89,9 @@ bool ScStyleSheet::HasParentSupport () const switch ( GetFamily() ) { - case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true; break; - case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false; break; - default: + case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true; break; + case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false; break; + default: { // added to avoid warnings } @@ -102,10 +102,10 @@ bool ScStyleSheet::HasParentSupport () const //------------------------------------------------------------------------ -bool ScStyleSheet::SetParent( const String& rParentName ) +bool ScStyleSheet::SetParent( const OUString& rParentName ) { bool bResult = false; - String aEffName = rParentName; + OUString aEffName = rParentName; SfxStyleSheetBase* pStyle = pPool->Find( aEffName, nFamily ); if (!pStyle) { @@ -285,30 +285,30 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) // schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern, // obwohl der fuer den Benutzer sichtbare Name uebersetzt ist: -const String& ScStyleSheet::GetName() const +const OUString& ScStyleSheet::GetName() const { - const String& rBase = SfxStyleSheet::GetName(); - const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString& rBase = SfxStyleSheet::GetName(); + const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else return rBase; } -const String& ScStyleSheet::GetParent() const +const OUString& ScStyleSheet::GetParent() const { - const String& rBase = SfxStyleSheet::GetParent(); - const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString& rBase = SfxStyleSheet::GetParent(); + const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else return rBase; } -const String& ScStyleSheet::GetFollow() const +const OUString& ScStyleSheet::GetFollow() const { - const String& rBase = SfxStyleSheet::GetFollow(); - const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString& rBase = SfxStyleSheet::GetFollow(); + const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else @@ -323,9 +323,9 @@ const String& ScStyleSheet::GetFollow() const //! Flag gesetzt und abgefragt werden. //! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt. -bool ScStyleSheet::SetName( const String& rNew ) +bool ScStyleSheet::SetName( const OUString& rNew ) { - String aFileStdName = OUString(STRING_STANDARD); + OUString aFileStdName = OUString(STRING_STANDARD); if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return false; else diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index c605a972736a..5df625709dbd 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -1068,8 +1068,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n Color* pColor; sal_uLong nNumFmt = GetNumberFormat( nSrcX, nSrcY ); - pDocument->GetFormatTable()-> - GetOutputString( nVal, nNumFmt, aValue, &pColor ); + OUString sTmp(aValue); + pDocument->GetFormatTable()->GetOutputString( nVal, nNumFmt, sTmp, &pColor ); + aValue = sTmp; } break; // not for formulas @@ -1153,8 +1154,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n //! Zahlformat je nach Index holen? Color* pColor; sal_uLong nNumFmt = GetNumberFormat( nCol1, nRow1 ); - pDocument->GetFormatTable()-> - GetOutputString( nStart, nNumFmt, aValue, &pColor ); + OUString sTmp(aValue); + pDocument->GetFormatTable()->GetOutputString( nStart, nNumFmt, sTmp, &pColor ); + aValue = sTmp; } } } diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 9f6ae6202447..540eb55dc17b 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -824,7 +824,7 @@ bool lcl_maybeReplaceCellString( rCol = nCol; rRow = nRow; if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE && - rSearchItem.GetReplaceString().Len()) + !rSearchItem.GetReplaceString().isEmpty()) { rColObj.SetRawString(nRow, rSearchItem.GetReplaceString()); rUndoStr = OUString(); @@ -952,7 +952,7 @@ bool ScTable::SearchRangeForAllEmptyCells( { bool bFound = false; bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) && - (rSearchItem.GetReplaceString().Len() > 0); + !rSearchItem.GetReplaceString().isEmpty(); bool bSkipFiltered = rSearchItem.IsSearchFiltered(); for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 175c3dbd822b..4d72c9837ad5 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -450,9 +450,9 @@ bool ScValidationData::IsDataValid( // determine length, otherwise a once accepted value maybe could // not be edited again, for example abbreviated dates or leading // zeros or trailing zeros after decimal separator change length. - String aStr; + OUString aStr; pFormatter->GetInputLineString( nVal, nFormat, aStr); - nLenVal = static_cast<double>( aStr.Len() ); + nLenVal = static_cast<double>( aStr.getLength() ); } ScRefCellValue aTmpCell(nLenVal); bRet = IsCellValid(aTmpCell, rPos); @@ -758,7 +758,11 @@ bool ScValidationData::GetSelectionFromFormula( (SCROW)(nRow+aRange.aStart.Row()), aRange.aStart.Tab() , aValStr); } else - pFormatter->GetInputLineString( nMatVal.fVal, 0, aValStr ); + { + OUString sTmp(aValStr); + pFormatter->GetInputLineString( nMatVal.fVal, 0, sTmp ); + aValStr = sTmp; + } } if (!rCell.isEmpty() && rMatch < 0) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index a892eb408373..11743c723ba0 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -221,7 +221,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa OUString* pColAry = aColSeq.getArray(); for (SCSIZE nCol = 0; nCol < nColCount; nCol++) { - String aStr; + OUString aStr; if ( pMatrix->IsString( nCol, nRow ) ) { if ( !pMatrix->IsEmpty( nCol, nRow ) ) @@ -233,7 +233,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa Color* pColor; pFormatter->GetOutputString( fVal, 0, aStr, &pColor ); } - pColAry[nCol] = OUString( aStr ); + pColAry[nCol] = aStr; } pRowAry[nRow] = aColSeq; diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 6c75a59b4ebd..3611c71fd466 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -25,12 +25,10 @@ #include "zforauto.hxx" #include "global.hxx" -static const sal_Char pStandardName[] = "Standard"; - //------------------------------------------------------------------------ ScNumFormatAbbrev::ScNumFormatAbbrev() : - sFormatstring ( pStandardName ), + sFormatstring ( "Standard" ), eLnge (LANGUAGE_SYSTEM), eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht { @@ -81,7 +79,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat, OSL_FAIL("SCNumFormatAbbrev:: unknown number format"); eLnge = LANGUAGE_SYSTEM; eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht - sFormatstring.AssignAscii( RTL_CONSTASCII_STRINGPARAM( pStandardName ) ); + sFormatstring = "Standard"; } } @@ -89,9 +87,9 @@ sal_uLong ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter) { short nType; bool bNewInserted; - xub_StrLen nCheckPos; + sal_Int32 nCheckPos; return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge, - eSysLnge, nType, bNewInserted, nCheckPos); + eSysLnge, nType, bNewInserted, nCheckPos); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index c3ab137eddc3..39769276e45a 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2722,7 +2722,7 @@ sal_uInt32 XclExpXFBuffer::InsertStyleXF( const SfxStyleSheetBase& rStyleSheet ) { maXFList.AppendNewRecord( new XclExpXF( GetRoot(), rStyleSheet ) ); // create the STYLE record - if( rStyleSheet.GetName().Len() ) + if( !rStyleSheet.GetName().isEmpty() ) maStyleList.AppendNewRecord( new XclExpStyle( nXFId, rStyleSheet.GetName() ) ); } else diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index cad6188aa7ad..fd97da61f100 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -372,7 +372,9 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu pFormatter->GetFormatForLanguageIfBuiltIn( nIndex, LANGUAGE_SYSTEM); OSL_ENSURE( nNewIndex != nIndex, "ScEEImport::WriteToDocument: NumbersEnglishUS not a built-in format?"); - pFormatter->GetInputLineString( fEnVal, nNewIndex, aStr); + OUString sTemp(aStr); + pFormatter->GetInputLineString( fEnVal, nNewIndex, sTemp); + aStr = sTemp; } else bTextFormat = true; diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index d585686c08a8..d37f2d41f8b6 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -64,7 +64,7 @@ const ScCellValue& ScMyCellInfo::CreateCell( ScDocument* pDoc ) maCell.mpFormula->SetMatColsRows(static_cast<SCCOL>(nMatrixCols), static_cast<SCROW>(nMatrixRows)); } - if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME) && sInputString.Len() == 0) + if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME) && sInputString.isEmpty()) { sal_uInt32 nFormat(0); if (nType == NUMBERFORMAT_DATE) diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index ea565c5a96f0..b08be6178991 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -39,7 +39,7 @@ struct ScMyCellInfo ScCellValue maCell; OUString sFormulaAddress; OUString sFormula; - String sInputString; + OUString sInputString; double fValue; sal_Int32 nMatrixCols; sal_Int32 nMatrixRows; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 445766e04343..5b1c58fa69a8 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -900,7 +900,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) rXMLImport.GetMM100UnitConverter().convertDateTime( fDate, mxAnnotationData->maCreateDate ); SvNumberFormatter* pNumForm = pDoc->GetFormatTable(); sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM ); - String aDate; + OUString aDate; Color* pColor = 0; Color** ppColor = &pColor; pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 48ed4c6e3385..8d9e1814f7ff 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2064,13 +2064,13 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, rbFooter = ((const SfxBoolItem&)pSet->Get(ATTR_PAGE_ON)).GetValue(); } -long ScDocShell::DdeGetData( const String& rItem, - const String& rMimeType, - ::com::sun::star::uno::Any & rValue ) +long ScDocShell::DdeGetData( const OUString& rItem, + const OUString& rMimeType, + ::com::sun::star::uno::Any & rValue ) { if( FORMAT_STRING == SotExchange::GetFormatIdFromMimeType( rMimeType ) ) { - if( rItem.EqualsIgnoreCaseAscii( "Format" ) ) + if( rItem.equalsIgnoreAsciiCase( "Format" ) ) { OString aFmtByte(OUStringToOString(aDdeTextFmt, osl_getThreadTextEncoding())); @@ -2114,13 +2114,13 @@ long ScDocShell::DdeGetData( const String& rItem, return 0; } -long ScDocShell::DdeSetData( const String& rItem, - const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ) +long ScDocShell::DdeSetData( const OUString& rItem, + const OUString& rMimeType, + const ::com::sun::star::uno::Any & rValue ) { if( FORMAT_STRING == SotExchange::GetFormatIdFromMimeType( rMimeType )) { - if( rItem.EqualsIgnoreCaseAscii( "Format" ) ) + if( rItem.equalsIgnoreAsciiCase( "Format" ) ) { if ( ScByteSequenceToString::GetString( aDdeTextFmt, rValue, osl_getThreadTextEncoding() ) ) { @@ -2153,7 +2153,7 @@ long ScDocShell::DdeSetData( const String& rItem, return 0; } -::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const String& rItem ) +::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const OUString& rItem ) { // only check for valid item string - range is parsed again in ScServerObject ctor diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 522a277bf875..37ee0e2a0bd9 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -341,10 +341,13 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) if ( pFCell->IsValue() ) { double n = pFCell->GetValue(); + OUString sTempOut(rStrResult); sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0, pFCell->GetFormatType(), ScGlobal::eLnge ); + aFormatter.GetOutputString( n, nFormat, - rStrResult, &pColor ); + sTempOut, &pColor ); + rStrResult = sTempOut; } else { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index d761f7f46fba..ec2201f65c98 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -373,11 +373,11 @@ public: bool& rbHeader, bool& rbFooter ); - virtual long DdeGetData( const String& rItem, const String& rMimeType, + virtual long DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); - virtual long DdeSetData( const String& rItem, const String& rMimeType, + virtual long DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem ); + virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); const String& GetDdeTextFmt() const { return aDdeTextFmt; } diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 694340850dc7..e57e3081da34 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -42,7 +42,7 @@ public: ScSimpleUndo( ScDocShell* pDocSh ); virtual ~ScSimpleUndo(); - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ); protected: ScDocShell* pDocShell; @@ -180,8 +180,8 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool Merge( SfxUndoAction *pNextAction ); virtual OUString GetComment() const; virtual OUString GetRepeatComment(SfxRepeatTarget&) const; virtual sal_uInt16 GetId() const; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 470e7d3bdf4a..def653f2cd54 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -54,11 +54,11 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; virtual OUString GetComment() const; - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ); private: ScRange aEffRange; @@ -87,7 +87,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -118,7 +118,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -150,7 +150,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -199,7 +199,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -233,7 +233,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -266,7 +266,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -300,7 +300,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -339,7 +339,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -362,24 +362,24 @@ private: class ScUndoWidthOrHeight: public ScSimpleUndo { public: - TYPEINFO(); - ScUndoWidthOrHeight( ScDocShell* pNewDocShell, - const ScMarkData& rMark, - SCCOLROW nNewStart, SCTAB nNewStartTab, - SCCOLROW nNewEnd, SCTAB nNewEndTab, - ScDocument* pNewUndoDoc, - SCCOLROW nNewCnt, SCCOLROW* pNewRanges, - ScOutlineTable* pNewUndoTab, - ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, - sal_Bool bNewWidth ); - virtual ~ScUndoWidthOrHeight(); + TYPEINFO(); + ScUndoWidthOrHeight( ScDocShell* pNewDocShell, + const ScMarkData& rMark, + SCCOLROW nNewStart, SCTAB nNewStartTab, + SCCOLROW nNewEnd, SCTAB nNewEndTab, + ScDocument* pNewUndoDoc, + SCCOLROW nNewCnt, SCCOLROW* pNewRanges, + ScOutlineTable* pNewUndoTab, + ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, + sal_Bool bNewWidth ); + virtual ~ScUndoWidthOrHeight(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -413,7 +413,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -445,7 +445,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -472,7 +472,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -498,7 +498,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -533,7 +533,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -551,49 +551,48 @@ private: class ScUndoConversion : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO(); - ScUndoConversion( - ScDocShell* pNewDocShell, const ScMarkData& rMark, - SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc, - SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocument* pNewRedoDoc, - const ScConversionParam& rConvParam ); - virtual ~ScUndoConversion(); + ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark, + SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc, + SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocument* pNewRedoDoc, + const ScConversionParam& rConvParam ); + virtual ~ScUndoConversion(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual OUString GetComment() const; + virtual OUString GetComment() const; private: - ScMarkData aMarkData; - ScAddress aCursorPos; - ScDocument* pUndoDoc; // Block mark and deleted data - ScAddress aNewCursorPos; - ScDocument* pRedoDoc; // Block mark and new data - sal_uLong nStartChangeAction; - sal_uLong nEndChangeAction; - ScConversionParam maConvParam; /// Conversion type and parameters. + ScMarkData aMarkData; + ScAddress aCursorPos; + ScDocument* pUndoDoc; // Block mark and deleted data + ScAddress aNewCursorPos; + ScDocument* pRedoDoc; // Block mark and new data + sal_uLong nStartChangeAction; + sal_uLong nEndChangeAction; + ScConversionParam maConvParam; /// Conversion type and parameters. - void DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos ); - void SetChangeTrack(); + void DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos ); + void SetChangeTrack(); }; class ScUndoRefConversion: public ScSimpleUndo { public: - TYPEINFO(); - ScUndoRefConversion( ScDocShell* pNewDocShell, - const ScRange& aMarkRange, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag); - virtual ~ScUndoRefConversion(); + TYPEINFO(); + ScUndoRefConversion( ScDocShell* pNewDocShell, + const ScRange& aMarkRange, const ScMarkData& rMark, + ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag); + virtual ~ScUndoRefConversion(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -623,7 +622,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -638,19 +637,19 @@ private: class ScUndoUseScenario: public ScSimpleUndo { public: - TYPEINFO(); - ScUndoUseScenario( ScDocShell* pNewDocShell, - const ScMarkData& rMark, - const ScArea& rDestArea, ScDocument* pNewUndoDoc, - const String& rNewName ); - virtual ~ScUndoUseScenario(); + TYPEINFO(); + ScUndoUseScenario( ScDocShell* pNewDocShell, + const ScMarkData& rMark, + const ScArea& rDestArea, ScDocument* pNewUndoDoc, + const String& rNewName ); + virtual ~ScUndoUseScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -674,7 +673,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; virtual sal_uInt16 GetId() const; @@ -700,7 +699,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -723,7 +722,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -751,7 +750,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -779,7 +778,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -813,7 +812,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -849,7 +848,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -871,7 +870,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -893,7 +892,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -915,7 +914,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -937,7 +936,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -963,7 +962,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 38651c863f1d..aacc8d91a4f4 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -49,7 +49,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -99,7 +99,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -129,7 +129,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -154,7 +154,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; virtual OUString GetComment() const; private: @@ -180,7 +180,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -205,7 +205,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -232,7 +232,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -280,7 +280,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; virtual OUString GetComment() const; @@ -308,7 +308,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; virtual OUString GetComment() const; @@ -331,7 +331,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -356,7 +356,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index e4d28396717b..2ab4158b21cb 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -55,7 +55,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -85,7 +85,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -111,7 +111,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -140,7 +140,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -166,7 +166,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -191,7 +191,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -217,7 +217,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -246,7 +246,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -273,7 +273,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -308,7 +308,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; }; @@ -325,7 +325,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -349,7 +349,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -382,7 +382,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -414,7 +414,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -441,7 +441,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -471,7 +471,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -507,7 +507,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 97c1c00a723f..4a1fab00c867 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -44,8 +44,8 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool Merge( SfxUndoAction *pNextAction ); virtual OUString GetComment() const; virtual OUString GetRepeatComment(SfxRepeatTarget&) const; virtual sal_uInt16 GetId() const; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 59bc7c8197d7..e50ae2dc9014 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -70,7 +70,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; }; @@ -87,7 +87,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index a1fa0f59d263..96d6a3f25b30 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -58,7 +58,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -85,7 +85,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -115,7 +115,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -142,7 +142,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -171,7 +171,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -200,7 +200,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -230,7 +230,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -255,7 +255,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -283,7 +283,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -309,7 +309,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -340,7 +340,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -366,7 +366,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -394,7 +394,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -419,7 +419,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -448,7 +448,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -478,7 +478,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; @@ -501,7 +501,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); - virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; virtual OUString GetComment() const; diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index d0548dbcc151..425014f378a5 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -188,7 +188,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) // Ausgabe des Zelltextes: //------------------------ - String cellString; + OUString cellString; sal_Bool bNumFormat = pCurData->GetIncludeValueFormat(); sal_uLong nNum; double nVal; @@ -241,7 +241,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) break; } - if ( cellString.Len() > 0 ) + if ( !cellString.isEmpty()) { Size aStrSize; sal_uInt16 nFmtIndex = GetFormatIndex( nCol, nRow ); @@ -283,12 +283,12 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) aStrSize = aScriptedText.GetTextSize(); } while ( ( theMaxStrSize.Width() <= aStrSize.Width() ) - && ( cellString.Len() > 1 ) ) + && ( cellString.getLength() > 1 ) ) { if( eJustification == SVX_HOR_JUSTIFY_RIGHT ) - cellString.Erase( 0, 1 ); + cellString = cellString.copy(1); else - cellString.Erase( cellString.Len() - 1 ); + cellString = cellString.copy(0, cellString.getLength() - 1 ); aScriptedText.SetText( cellString, xBreakIter ); aStrSize = aScriptedText.GetTextSize(); diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 339cb03cf024..f174afdea142 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -198,11 +198,11 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) aEdStartVal.SetText( aStartStrVal); - String aIncrTxt; + OUString aIncrTxt; rDoc.GetFormatTable()->GetInputLineString( fIncrement, 0, aIncrTxt ); aEdIncrement.SetText( aIncrTxt ); - String aEndTxt; + OUString aEndTxt; if ( fEndVal != MAXDOUBLE ) rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt ); aEdEndVal.SetText( aEndTxt ); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 4acff4960114..955d2ba4be51 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -64,7 +64,7 @@ bool ScSimpleUndo::SetViewMarkData( const ScMarkData& rMarkData ) return true; } -sal_Bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) +bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) { // A SdrUndoGroup for updating detective arrows can belong // to each Undo-Action. @@ -569,7 +569,7 @@ void ScUndoWrapper::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAc SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction); } -sal_Bool ScUndoWrapper::Merge( SfxUndoAction* pNextAction ) +bool ScUndoWrapper::Merge( SfxUndoAction* pNextAction ) { if (pWrappedUndo) return pWrappedUndo->Merge(pNextAction); @@ -595,7 +595,7 @@ void ScUndoWrapper::Repeat(SfxRepeatTarget& rTarget) pWrappedUndo->Repeat(rTarget); } -sal_Bool ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const { if (pWrappedUndo) return pWrappedUndo->CanRepeat(rTarget); diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index a6049f1dba78..ce78a8f7ae57 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -115,7 +115,7 @@ OUString ScUndoInsertCells::GetComment() const return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS ); } -sal_Bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) +bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) { // If a paste undo action has already been added, append (detective) action there. if ( pPasteUndo ) @@ -132,7 +132,7 @@ sal_Bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) pPasteUndo = pWrappedAction; pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager - return sal_True; + return true; } } @@ -312,9 +312,9 @@ void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } @@ -547,9 +547,9 @@ void ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, sal_True ); } -sal_Bool ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } // delete cells in multiselection @@ -730,9 +730,9 @@ void ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, sal_True ); } -sal_Bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } @@ -830,9 +830,9 @@ void ScUndoCut::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, sal_True ); } -sal_Bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges, @@ -1098,9 +1098,9 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, @@ -1340,7 +1340,7 @@ void ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // not possible } @@ -1399,9 +1399,9 @@ void ScUndoListNames::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->InsertNameList(); } -sal_Bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, @@ -1514,7 +1514,7 @@ void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const { if (rTarget.ISA(ScTabViewTarget)) { @@ -1624,9 +1624,9 @@ void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } sal_uInt16 ScUndoSelectionStyle::GetId() const @@ -1714,9 +1714,9 @@ void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark ) @@ -1780,9 +1780,9 @@ void ScUndoIndent::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->ChangeIndent( bIsIncrement ); } -sal_Bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1836,9 +1836,9 @@ void ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->TransliterateText( nTransliterationType ); } -sal_Bool ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1900,9 +1900,9 @@ void ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } // remove all line breaks of a table @@ -1964,9 +1964,9 @@ void ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell, @@ -2072,9 +2072,9 @@ void ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveMerge(); } -sal_Bool ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } void ScUndoRemoveMerge::SetCurTab() @@ -2170,7 +2170,7 @@ void ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */) //TODO later (when the function has moved from cellsuno to docfunc) } -sal_Bool ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // See above } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 384c8bce7a53..4a2547a92b3a 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -168,9 +168,9 @@ void ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, sal_True ); } -sal_Bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 124251f07097..6a527f3e79aa 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -214,9 +214,9 @@ void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, sal_True ); } -sal_Bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell, @@ -347,9 +347,9 @@ void ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->FillTab( nFlags, nFunction, bSkipEmpty, bAsLink ); } -sal_Bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell, @@ -487,9 +487,9 @@ void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell, @@ -635,9 +635,9 @@ void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, @@ -760,9 +760,9 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell, @@ -908,9 +908,9 @@ void ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, sal_True ); } -sal_Bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1087,9 +1087,9 @@ void ScUndoReplace::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, sal_True, false ); } -sal_Bool ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } // multi-operation (only simple blocks) @@ -1164,7 +1164,7 @@ void ScUndoTabOp::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1271,7 +1271,7 @@ void ScUndoConversion::Repeat( SfxRepeatTarget& rTarget ) ((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, sal_True ); } -sal_Bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const { return rTarget.ISA( ScTabViewTarget ); } @@ -1357,9 +1357,9 @@ void ScUndoRefConversion::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->DoRefConversion(); } -sal_Bool ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell, @@ -1465,7 +1465,7 @@ void ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1546,7 +1546,7 @@ void ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1608,7 +1608,7 @@ void ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1745,7 +1745,7 @@ void ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 01873318e58a..f577e72f7168 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -158,9 +158,9 @@ void ScUndoCursorAttr::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->ApplySelectionPattern( *pApplyPattern ); } -sal_Bool ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoEnterData::Value::Value() : mnTab(-1), mbHasFormat(false), mnFormat(0) {} @@ -319,9 +319,9 @@ void ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } @@ -396,7 +396,7 @@ void ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -443,7 +443,7 @@ void ScUndoSetCell::Repeat( SfxRepeatTarget& /*rTarget*/ ) // Makes no sense. } -sal_Bool ScUndoSetCell::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const +bool ScUndoSetCell::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const { return false; } @@ -576,9 +576,9 @@ void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell, @@ -646,9 +646,9 @@ void ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell, @@ -777,9 +777,9 @@ void ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( sal_True ); } -sal_Bool ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoReplaceNote::ScUndoReplaceNote( ScDocShell& rDocShell, const ScAddress& rPos, @@ -839,7 +839,7 @@ void ScUndoReplaceNote::Repeat( SfxRepeatTarget& /*rTarget*/ ) { } -sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const +bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const { return false; } @@ -909,7 +909,7 @@ void ScUndoShowHideNote::Repeat( SfxRepeatTarget& /*rTarget*/ ) { } -sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const +bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const { return false; } @@ -1019,7 +1019,7 @@ void ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1088,7 +1088,7 @@ void ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 83b06d55f437..7d2bb68ec486 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -152,7 +152,7 @@ void ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // is not possible } @@ -235,9 +235,9 @@ void ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell, @@ -321,9 +321,9 @@ void ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, sal_True ); } -sal_Bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } /** show/hide outline over block marks */ @@ -424,9 +424,9 @@ void ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell, @@ -509,9 +509,9 @@ void ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( sal_True ); } -sal_Bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell, @@ -612,9 +612,9 @@ void ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( sal_True ); } -sal_Bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, @@ -735,7 +735,7 @@ void ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // is not possible due to column numbers } @@ -851,7 +851,7 @@ void ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // does not work due to column numbers } @@ -1021,7 +1021,7 @@ void ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // does not work due to column numbers } @@ -1100,7 +1100,7 @@ void ScUndoAutoFilter::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1165,7 +1165,7 @@ void ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // is not possible } @@ -1372,12 +1372,12 @@ void ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const { // Repeat only for import using a database range, then pUndoDBData is set if (pUndoDBData) - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); else return false; // Address book } @@ -1541,9 +1541,9 @@ void ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget) ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( sal_True ); } -sal_Bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, @@ -1699,7 +1699,7 @@ void ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */) //! allow deletion } -sal_Bool ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const { //! allow deletion return false; @@ -1839,7 +1839,7 @@ void ScUndoConsolidate::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1913,7 +1913,7 @@ void ScUndoChartData::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1996,7 +1996,7 @@ void ScUndoDataForm::Repeat(SfxRepeatTarget& /*rTarget*/) { } -sal_Bool ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const { return (rTarget.ISA(ScTabViewTarget)); } diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index 2f42a798dc41..b46825de8bdc 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.cxx @@ -71,7 +71,7 @@ void ScUndoDraw::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoActio SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction); } -sal_Bool ScUndoDraw::Merge( SfxUndoAction* pNextAction ) +bool ScUndoDraw::Merge( SfxUndoAction* pNextAction ) { if (pDrawUndo) return pDrawUndo->Merge(pNextAction); @@ -113,7 +113,7 @@ void ScUndoDraw::Repeat(SfxRepeatTarget& rTarget) pDrawUndo->Repeat(rTarget); } -sal_Bool ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const { if (pDrawUndo) return pDrawUndo->CanRepeat(rTarget); diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index f7edac94045d..40f288915d02 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -66,9 +66,9 @@ void ScUndoAllRangeNames::Repeat(SfxRepeatTarget& /*rTarget*/) { } -sal_Bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const +bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const { - return sal_False; + return false; } OUString ScUndoAllRangeNames::GetComment() const @@ -139,9 +139,9 @@ void ScUndoAddRangeData::Repeat(SfxRepeatTarget& /*rTarget*/) { } -sal_Bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const +bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const { - return sal_False; + return false; } OUString ScUndoAddRangeData::GetComment() const diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 5125bbaf4a83..2d847c23d986 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -225,7 +225,7 @@ void ScUndoModifyStyle::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // no repeat possible } @@ -287,7 +287,7 @@ void ScUndoApplyPageStyle::Repeat(SfxRepeatTarget& /* rTarget */) //! set same page style to current tab } -sal_Bool ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index db101dd62273..804e2e02a129 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -162,9 +162,9 @@ void ScUndoInsertTab::Repeat(SfxRepeatTarget& rTarget) Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } -sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, @@ -257,9 +257,9 @@ void ScUndoInsertTables::Repeat(SfxRepeatTarget& rTarget) Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } -sal_Bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell, const vector<SCTAB> &aTab, @@ -417,9 +417,9 @@ void ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell, @@ -474,7 +474,7 @@ void ScUndoRenameTab::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -579,7 +579,7 @@ void ScUndoMoveTab::Repeat(SfxRepeatTarget& /* rTarget */) // No Repeat ! ? ! } -sal_Bool ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -719,7 +719,7 @@ void ScUndoCopyTab::Repeat(SfxRepeatTarget& /* rTarget */) // no Repeat ! ? ! } -sal_Bool ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -788,7 +788,7 @@ void ScUndoTabColor::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -875,9 +875,9 @@ void ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget) } } -sal_Bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell, @@ -1031,9 +1031,9 @@ void ScUndoImportTab::Repeat(SfxRepeatTarget& rTarget) Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } -sal_Bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : @@ -1112,7 +1112,7 @@ void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1165,9 +1165,9 @@ void ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget) SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } -sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } OUString ScUndoShowHideTab::GetComment() const @@ -1245,7 +1245,7 @@ void ScUndoDocProtect::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // makes no sense } @@ -1317,7 +1317,7 @@ void ScUndoTabProtect::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // makes no sense } @@ -1379,7 +1379,7 @@ void ScUndoPrintRange::Repeat(SfxRepeatTarget& /* rTarget */) // makes no sense } -sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; // makes no sense } @@ -1453,7 +1453,7 @@ void ScUndoScenarioFlags::Repeat(SfxRepeatTarget& /* rTarget */) // Repeat makes no sense } -sal_Bool ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1530,7 +1530,7 @@ void ScUndoRenameObject::Repeat(SfxRepeatTarget& /* rTarget */) { } -sal_Bool ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const +bool ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return false; } @@ -1579,9 +1579,9 @@ void ScUndoLayoutRTL::Repeat(SfxRepeatTarget& rTarget) Execute( FID_TAB_RTL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } -sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const +bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return rTarget.ISA(ScTabViewTarget); } OUString ScUndoLayoutRTL::GetComment() const diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 6ec562d2a548..975953318373 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2707,7 +2707,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke SvNumberFormatter* pFormatter = m_pDocument->GetFormatTable(); if (pFormatter) { - String aStr; + OUString aStr; const double fVal = rItem.mfValue; Color* pColor = NULL; sal_uInt32 nFmt = 0; diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 390d4fb749dd..6107e503fac7 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/string.hxx> #include "pageuno.hxx" #include "shapeuno.hxx" diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6073baf1abce..23bbec0b5501 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -742,37 +742,37 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aPara; + OUString aPara; Color* pColor=0; switch( eFillDir ) { - case FILL_TO_BOTTOM: aPara = 'B'; break; - case FILL_TO_RIGHT: aPara = 'R'; break; - case FILL_TO_TOP: aPara = 'T'; break; - case FILL_TO_LEFT: aPara = 'L'; break; - default: aPara.Erase(); break; + case FILL_TO_BOTTOM: aPara = "B"; break; + case FILL_TO_RIGHT: aPara = "R"; break; + case FILL_TO_TOP: aPara = "T"; break; + case FILL_TO_LEFT: aPara = "L"; break; + default: break; } rReq.AppendItem( SfxStringItem( FID_FILL_SERIES, aPara ) ); switch( eFillCmd ) { - case FILL_SIMPLE: aPara = 'S'; break; - case FILL_LINEAR: aPara = 'L'; break; - case FILL_GROWTH: aPara = 'G'; break; - case FILL_DATE: aPara = 'D'; break; - case FILL_AUTO: aPara = 'A'; break; - default: aPara.Erase(); break; + case FILL_SIMPLE: aPara = "S"; break; + case FILL_LINEAR: aPara = "L"; break; + case FILL_GROWTH: aPara = "G"; break; + case FILL_DATE: aPara = "D"; break; + case FILL_AUTO: aPara = "A"; break; + default: break; } rReq.AppendItem( SfxStringItem( FN_PARAM_1, aPara ) ); switch( eFillDateCmd ) { - case FILL_DAY: aPara = 'D'; break; - case FILL_WEEKDAY: aPara = 'W'; break; - case FILL_MONTH: aPara = 'M'; break; - case FILL_YEAR: aPara = 'Y'; break; - default: aPara.Erase(); break; + case FILL_DAY: aPara = "D"; break; + case FILL_WEEKDAY: aPara = "W"; break; + case FILL_MONTH: aPara = "M"; break; + case FILL_YEAR: aPara = "Y"; break; + default: break; } rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) ); diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 4e2d64517473..022f9ddc6469 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -114,7 +114,7 @@ sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt ); } - String aValStr; + OUString aValStr; Color* pDummy; pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy ); aStr += aValStr; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index a042d0df07dd..9ce1c27e5d72 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1830,8 +1830,8 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) if ( rParam.pStrTargetVal != NULL ) aTargetValStr = *(rParam.pStrTargetVal); - String aMsgStr; - String aResStr; + OUString aMsgStr; + OUString aResStr; double nSolveResult; GetFrameWin()->EnterWait(); @@ -1858,14 +1858,14 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) if ( bExact ) { aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_0 ); - aMsgStr += String( aResStr ); + aMsgStr += aResStr; aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_1 ); } else { aMsgStr = ScGlobal::GetRscString( STR_MSSG_SOLVE_2 ); aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_3 ); - aMsgStr += String( aResStr ); + aMsgStr += aResStr ; aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 ); } |