sc/inc/document.hxx | 14 ++++--- sc/source/core/data/column.cxx | 4 +- sc/source/core/data/documen5.cxx | 1 sc/source/core/data/table2.cxx | 1 sc/source/filter/excel/excdoc.cxx | 1 sc/source/ui/docshell/dbdocimp.cxx | 1 sc/source/ui/docshell/docsh.cxx | 2 + sc/source/ui/docshell/docsh8.cxx | 1 sc/source/ui/docshell/impex.cxx | 1 sc/source/ui/unoobj/cellsuno.cxx | 1 sc/source/ui/unoobj/docuno.cxx | 1 sc/source/ui/view/formatsh.cxx | 67 ++++++++++++++++++------------------- 12 files changed, 55 insertions(+), 40 deletions(-)
New commits: commit 26ea23b6b5f1d80df688e4c7e325971709c3c4a6 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Mar 2 03:46:50 2012 +0100 some sal_Bool to bool diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 1ab4940..bc72117 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -181,11 +181,11 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); - sal_Bool bProtected = false; + bool bProtected = false; SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt? - bProtected = sal_True; + bProtected = true; SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -240,7 +240,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { ISfxTemplateCommon* pDesigner = SFX_APP()-> GetCurrentTemplateCommon(pTabViewShell->GetViewFrame()->GetBindings()); - sal_Bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily(); + bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily(); if ( bProtected || bPage ) rSet.DisableItem( nSlotId ); @@ -252,7 +252,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { ISfxTemplateCommon* pDesigner = SFX_APP()-> GetCurrentTemplateCommon(pTabViewShell->GetViewFrame()->GetBindings()); - sal_Bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily(); + bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily(); if ( bProtected && !bPage ) rSet.DisableItem( nSlotId ); @@ -289,7 +289,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) ScMarkData& rMark = GetViewData()->GetMarkData(); ScModule* pScMod = SC_MOD(); String aRefName; - sal_Bool bUndo = pDoc->IsUndoEnabled(); + bool bUndo = pDoc->IsUndoEnabled(); if ( (nSlotId == SID_STYLE_NEW) || (nSlotId == SID_STYLE_EDIT) @@ -303,9 +303,9 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; - sal_Bool bStyleToMarked = false; - sal_Bool bListAction = false; - sal_Bool bAddUndo = false; // add ScUndoModifyStyle (style modified) + bool bStyleToMarked = false; + bool bListAction = false; + bool bAddUndo = false; // add ScUndoModifyStyle (style modified) ScStyleSaveData aOldData; // for undo/redo ScStyleSaveData aNewData; @@ -391,7 +391,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) case SID_STYLE_WATERCAN: { - sal_Bool bWaterCan = pScMod->GetIsWaterCan(); + bool bWaterCan = pScMod->GetIsWaterCan(); if( !bWaterCan ) { @@ -418,7 +418,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( !bWaterCan && pStyleSheet ) { - pScMod->SetWaterCan( sal_True ); + pScMod->SetWaterCan( true ); pTabViewShell->SetActivePointer( Pointer(POINTER_FILL) ); rReq.Done(); } @@ -452,8 +452,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pTabViewShell->RemoveStyleSheetInUse( pStyleSheet ); pStylePool->Remove( pStyleSheet ); pTabViewShell->InvalidateAttribs(); - nRetMask = sal_True; - bAddUndo = sal_True; + nRetMask = true; + bAddUndo = true; rReq.Done(); } else @@ -508,10 +508,10 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { String aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); - bListAction = sal_True; + bListAction = true; } - sal_Bool bConvertBack = false; + bool bConvertBack = false; SfxStyleSheet* pSheetInUse = (SfxStyleSheet*) pTabViewShell->GetStyleSheetFromMarked(); @@ -531,7 +531,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) //!!! bei Gelenheit mal eine Methode, die // das fuer einen bestimmten Style macht pDoc->StylesToNames(); - bConvertBack = sal_True; + bConvertBack = true; pStylePool->Remove(pStyleSheet); } @@ -556,7 +556,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // call SetStyleSheetToMarked after adding the ScUndoModifyStyle // (pStyleSheet pointer is used!) - bStyleToMarked = sal_True; + bStyleToMarked = true; } else // ( nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE ) { @@ -570,7 +570,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { String aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); - bListAction = sal_True; + bListAction = true; } pStyleSheet->GetItemSet().Put( aAttrSet ); @@ -578,12 +578,12 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // call SetStyleSheetToMarked after adding the ScUndoModifyStyle // (pStyleSheet pointer is used!) - bStyleToMarked = sal_True; + bStyleToMarked = true; } } aNewData.InitFromStyle( pStyleSheet ); - bAddUndo = sal_True; + bAddUndo = true; rReq.Done(); } break; @@ -605,14 +605,14 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { if ( pDoc->RemovePageStyleInUse( pStyleSheet->GetName() ) ) { - ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), nCurTab ).UpdatePages(); + ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(true), nCurTab ).UpdatePages(); rBindings.Invalidate( SID_STATUS_PAGESTYLE ); rBindings.Invalidate( FID_RESET_PRINTZOOM ); } pStylePool->Remove( pStyleSheet ); rBindings.Invalidate( SID_STYLE_FAMILY4 ); pDocSh->SetDocumentModified(); - bAddUndo = sal_True; + bAddUndo = true; rReq.Done(); } } @@ -632,7 +632,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( aOldName != aStyleName ) { pDoc->SetPageStyle( *itr, aStyleName ); - ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), *itr ).UpdatePages(); + ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(true), *itr ).UpdatePages(); if( !pUndoAction ) pUndoAction = new ScUndoApplyPageStyle( pDocSh, aStyleName ); pUndoAction->AddSheetAction( *itr, aOldName ); @@ -660,7 +660,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily ); SfxItemSet aAttrSet = pCurStyle->GetItemSet(); SCTAB nInTab; - sal_Bool bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); + bool bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); // wenn bereits vorhanden, erstmal entfernen... if ( pStyleSheet ) @@ -676,12 +676,12 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // wenn in Verwendung -> Update if ( bUsed ) - ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), nInTab ).UpdatePages(); + ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(true), nInTab ).UpdatePages(); aNewData.InitFromStyle( pStyleSheet ); - bAddUndo = sal_True; + bAddUndo = true; rReq.Done(); - nRetMask = sal_True; + nRetMask = true; } } break; @@ -757,7 +757,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER ); aBoxInfoItem.SetTable(false); // keine inneren Linien - aBoxInfoItem.SetDist(sal_True); + aBoxInfoItem.SetDist(true); aBoxInfoItem.SetMinDist(false); rSet.Put( aBoxInfoItem ); } @@ -783,7 +783,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pParent = pTabViewShell->GetDialogParent(); } - pTabViewShell->SetInFormatDialog(sal_True); + pTabViewShell->SetInFormatDialog(true); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -862,7 +862,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } aNewData.InitFromStyle( pStyleSheet ); - bAddUndo = sal_True; + bAddUndo = true; } } else @@ -1001,7 +1001,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) rReq.Done(); break; case SID_NUMBER_INCDEC: - pTabViewShell->ChangeNumFmtDecimals( sal_True ); + pTabViewShell->ChangeNumFmtDecimals( true ); rReq.Done(); break; case SID_NUMBER_DECDEC: @@ -1438,7 +1438,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle { const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); - sal_Bool bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue(); + bool bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue(); SfxBoolItem aBreakItem( ATTR_LINEBREAK, !bOld ); pTabViewShell->ApplyAttr( aBreakItem ); @@ -1773,7 +1773,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) const SvxVerJustifyItem* pVerJustify = NULL; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; sal_uInt16 nWhich = 0; - sal_Bool bJustifyStd = false; + bool bJustifyStd = false; SfxBoolItem aBoolItem ( 0, sal_True ); eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, sal_True, @@ -2152,7 +2152,7 @@ void ScFormatShell::ExecFormatPaintbrush( SfxRequest& rReq ) pView->Unmark(); ScDocument* pBrushDoc = new ScDocument( SCDOCMODE_CLIP ); - pView->CopyToClip( pBrushDoc, false, sal_True ); + pView->CopyToClip( pBrushDoc, false, true ); pView->SetBrushDocument( pBrushDoc, bLock ); } } commit d59b9c07c86c1dca84f5aa6e71f587dc321e8ddd Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Mar 2 03:39:26 2012 +0100 remove table.hxx from document.hxx diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 0a98818..0d63e3b 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -37,19 +37,21 @@ #include "scdllapi.h" #include "rangelst.hxx" #include "rangenam.hxx" -#include "table.hxx" #include "brdcst.hxx" #include "tabopparams.hxx" +#include "sortparam.hxx" #include "types.hxx" #include "formula/grammar.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> #include "scdllapi.h" #include "typedstrdata.hxx" +#include "compressedarray.hxx" +#include <tools/fract.hxx> +#include <tools/gen.hxx> #include <memory> #include <map> #include <set> -#include <list> #include <vector> #include <boost/ptr_container/ptr_vector.hpp> @@ -150,6 +152,11 @@ struct ScSetStringParam; class ScDocRowHeightUpdater; struct ScColWidthParam; struct ScCopyBlockFromClipParams; +class ScSheetEvents; +class ScProgress; +class SvtListener; +class ScNotes; +class ScEditDataArray; namespace com { namespace sun { namespace star { namespace lang { @@ -206,9 +213,6 @@ const sal_uInt8 SC_DDE_ENGLISH = 1; const sal_uInt8 SC_DDE_TEXT = 2; const sal_uInt8 SC_DDE_IGNOREMODE = 255; /// For usage in FindDdeLink() only! -typedef std::pair<SCCOL, SCROW> ScAddress2D; -typedef std::map<ScAddress2D, ScPostIt*> ScNoteMap; - class ScDocument { friend class ScDocumentIterator; diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 10c3e5d..9ae787b 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1302,8 +1302,8 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bM // empty cell. if (pNew->GetCellType() == CELLTYPE_STRING) { - String aStr = static_cast<ScStringCell*>(pNew)->GetString(); - if (aStr.Len() == 0) + rtl::OUString aStr = static_cast<ScStringCell*>(pNew)->GetString(); + if (aStr.isEmpty()) // A string cell with empty string. Delete the cell itself. rColumn.Delete(maItems[i].nRow); else diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index bfb379f..3cdade0 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -48,6 +48,7 @@ #include <svx/svdpage.hxx> #include "document.hxx" +#include "table.hxx" #include "drwlayer.hxx" #include "chartarr.hxx" #include "chartlis.hxx" diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 19fa547..f058d07 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -37,6 +37,7 @@ #include <svl/PasswordHelper.hxx> #include <unotools/transliterationwrapper.hxx> +#include "table.hxx" #include "patattr.hxx" #include "docpool.hxx" #include "cell.hxx" diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index f77f4e7..9b11a18 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -64,6 +64,7 @@ #include "patattr.hxx" #include "docoptio.hxx" #include "tabprotection.hxx" +#include "postit.hxx" #include "excdoc.hxx" #include "namebuff.hxx" diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index d3bd84b..39b2b80 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -66,6 +66,7 @@ #include "hints.hxx" #include "miscuno.hxx" #include "chgtrack.hxx" +#include "column.hxx" using namespace com::sun::star; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 62c8633..88bad72 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -84,6 +84,8 @@ // INCLUDE --------------------------------------------------------------- #include "cell.hxx" +#include "column.hxx" +#include "postit.hxx" #include "global.hxx" #include "filter.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d0e5890..a6bb916 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -69,6 +69,7 @@ #include "filter.hxx" #include "progress.hxx" #include "cell.hxx" +#include "column.hxx" #include "editutil.hxx" #include "cellform.hxx" #include "dbdocutl.hxx" diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index dd1ed03..6dc095b 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -63,6 +63,7 @@ class StarBASIC; #include "filter.hxx" #include "asciiopt.hxx" #include "cell.hxx" +#include "column.hxx" #include "docoptio.hxx" #include "progress.hxx" #include "scitems.hxx" diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 3ab1978..39926f4 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -96,6 +96,7 @@ #include "olinefun.hxx" #include "hints.hxx" #include "cell.hxx" +#include "column.hxx" #include "undocell.hxx" #include "undotab.hxx" #include "undoblk.hxx" // fuer lcl_ApplyBorder - nach docfunc verschieben! diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 147c10d..823974a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -83,6 +83,7 @@ #include "docsh.hxx" #include "hints.hxx" #include "docfunc.hxx" +#include "postit.hxx" #include "dociter.hxx" #include "cell.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 5ef7d4f..1ab4940 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -98,6 +98,7 @@ #include "tabvwsh.hxx" #include "undostyl.hxx" #include "markdata.hxx" +#include "markarr.hxx" #define ScFormatShell _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits