[Libreoffice-commits] .: 2 commits - sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Nov 23 18:32:31 PST 2011
sc/inc/markdata.hxx | 40 +++++++-------
sc/inc/scmod.hxx | 2
sc/source/core/data/markdata.cxx | 54 +++++++++----------
sc/source/core/tool/chgtrack.cxx | 1
sc/source/ui/Accessibility/AccessibleCell.cxx | 1
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 1
sc/source/ui/app/inputhdl.cxx | 1
sc/source/ui/app/inputwin.cxx | 1
sc/source/ui/app/scmod.cxx | 1
sc/source/ui/app/seltrans.cxx | 1
sc/source/ui/docshell/dbdocfun.cxx | 1
sc/source/ui/docshell/docsh.cxx | 1
sc/source/ui/docshell/docsh3.cxx | 1
sc/source/ui/docshell/editable.cxx | 1
sc/source/ui/drawfunc/fuins2.cxx | 1
sc/source/ui/drawfunc/fumark.cxx | 1
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 1
sc/source/ui/inc/undodat.hxx | 7 +-
sc/source/ui/inc/undotab.hxx | 6 +-
sc/source/ui/inc/viewdata.hxx | 10 +--
sc/source/ui/navipi/content.cxx | 1
sc/source/ui/navipi/navipi.cxx | 1
sc/source/ui/pagedlg/areasdlg.cxx | 1
sc/source/ui/undo/undodat.cxx | 9 +--
sc/source/ui/undo/undotab.cxx | 7 +-
sc/source/ui/undo/undoutil.cxx | 1
sc/source/ui/unoobj/viewuno.cxx | 1
sc/source/ui/vba/vbarange.cxx | 1
sc/source/ui/vba/vbawindow.cxx | 1
sc/source/ui/vba/vbaworksheet.cxx | 1
sc/source/ui/vba/vbaworksheets.cxx | 1
sc/source/ui/view/cellsh.cxx | 1
sc/source/ui/view/cellsh1.cxx | 1
sc/source/ui/view/cellsh2.cxx | 1
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/cliputil.cxx | 1
sc/source/ui/view/colrowba.cxx | 1
sc/source/ui/view/dbfunc.cxx | 1
sc/source/ui/view/dbfunc3.cxx | 1
sc/source/ui/view/formatsh.cxx | 1
sc/source/ui/view/gridwin.cxx | 1
sc/source/ui/view/gridwin4.cxx | 1
sc/source/ui/view/hdrcont.cxx | 1
sc/source/ui/view/preview.cxx | 1
sc/source/ui/view/select.cxx | 1
sc/source/ui/view/selectionstate.cxx | 1
sc/source/ui/view/spelleng.cxx | 2
sc/source/ui/view/tabcont.cxx | 1
sc/source/ui/view/tabview2.cxx | 1
sc/source/ui/view/tabview3.cxx | 1
sc/source/ui/view/tabvwsh3.cxx | 1
sc/source/ui/view/tabvwsha.cxx | 1
sc/source/ui/view/tabvwshc.cxx | 1
sc/source/ui/view/tabvwshf.cxx | 1
sc/source/ui/view/viewdata.cxx | 38 ++++++++-----
sc/source/ui/view/viewfun5.cxx | 1
sc/source/ui/view/viewfun6.cxx | 1
58 files changed, 145 insertions(+), 80 deletions(-)
New commits:
commit c4a3e29626126658cfb9e8755e9f98cfc4500abd
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Wed Nov 23 21:32:01 2011 -0500
Reducing header dependency on markdata.hxx.
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index e90936b..5a51b08 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -34,7 +34,6 @@
#include <vcl/timer.hxx>
#include <svl/lstner.hxx>
#include "global.hxx" // ScInputMode
-#include "markdata.hxx" // ScMarkData
#include "shellids.hxx"
#include <unotools/options.hxx>
#include <tools/shl.hxx>
@@ -79,6 +78,7 @@ class ScTransferObj;
class ScDrawTransferObj;
class ScSelectionTransferObj;
class ScFormEditData;
+class ScMarkData;
struct ScDragData;
struct ScClipData;
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index dc5b097..3a4fcf7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -51,6 +51,7 @@
#include "inputopt.hxx" // GetExpandRefs
#include "patattr.hxx"
#include "hints.hxx"
+#include "markdata.hxx"
#include "globstr.hrc"
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 881a895..6ca5585 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -44,6 +44,7 @@
#include "editsrc.hxx"
#include "dociter.hxx"
#include "cell.hxx"
+#include "markdata.hxx"
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 03c4011..0fc5c56 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -44,6 +44,8 @@
#include "userdat.hxx"
#include "scresid.hxx"
#include "sc.hrc"
+#include "markdata.hxx"
+
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index fcbb2a5..e17a8ee 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -38,6 +38,7 @@
#include "document.hxx"
#include "hints.hxx"
#include "scmod.hxx"
+#include "markdata.hxx"
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2f3f7e8..aec0cdd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -89,6 +89,7 @@
#include "compiler.hxx" // fuer Formel-Preview
#include "editable.hxx"
#include "funcdesc.hxx"
+#include "markdata.hxx"
#define _INPUTHDL_CXX
#include "inputhdl.hxx"
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 4818785..c379199 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -73,6 +73,7 @@
#include "rangeutl.hxx"
#include "docfunc.hxx"
#include "funcdesc.hxx"
+#include "markdata.hxx"
#include <editeng/fontitem.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include "AccessibleEditObject.hxx"
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index fe71636..fc0c35f 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -106,6 +106,7 @@
#include "preview.hxx"
#include "dragdata.hxx"
#include "clipdata.hxx"
+#include "markdata.hxx"
#include <svx/xmlsecctrl.hxx>
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 5eb2942..e71ba79 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -51,6 +51,7 @@
#include "docsh.hxx"
#include "drawview.hxx"
#include "drwlayer.hxx"
+#include "markdata.hxx"
using namespace com::sun::star;
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index e786a78..52546fb 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -60,6 +60,7 @@
#include "dpshttab.hxx"
#include "hints.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
// -----------------------------------------------------------------
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d6c8f6f..a035c18 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -138,6 +138,7 @@
#include "uiitems.hxx"
#include "cellsuno.hxx"
#include "dpobject.hxx"
+#include "markdata.hxx"
#include <vector>
#include <boost/shared_ptr.hpp>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index b7a139f..084dad2 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -80,6 +80,7 @@
#include "inputhdl.hxx"
#include "conflictsdlg.hxx"
#include "globstr.hrc"
+#include "markdata.hxx"
//------------------------------------------------------------------
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index b34cdab..7942995 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -35,6 +35,7 @@
#include "document.hxx"
#include "viewfunc.hxx"
#include "globstr.hrc"
+#include "markdata.hxx"
//------------------------------------------------------------------
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 2a85eef..050ceea 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -93,6 +93,7 @@ using namespace ::com::sun::star;
#include "uiitems.hxx"
#include "globstr.hrc"
#include "drawview.hxx"
+#include "markdata.hxx"
extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht zeichnen
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index b46e43d..d9c1c4a 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -40,6 +40,7 @@
#include "document.hxx"
#include "scresid.hxx"
#include "drawview.hxx"
+#include "markdata.hxx"
//------------------------------------------------------------------
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 428e174..b0d3074 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -54,6 +54,7 @@ public:
class ScTabViewShell;
class ScAccessibleDocument;
class ScAccessibleCell;
+class ScRangeList;
/** @descr
This base class provides an implementation of the
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 3dee48f..9c47c40 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -32,12 +32,13 @@
#include "undobase.hxx"
#include "rangeutl.hxx" // ScArea
#include "rangelst.hxx" // ScRangeListRef
-#include "markdata.hxx"
#include "sortparam.hxx"
#include "queryparam.hxx"
#include "subtotalparam.hxx"
#include "pivot.hxx"
+#include <boost/scoped_ptr.hpp>
+
class ScDocShell;
class ScDocument;
class ScOutlineTable;
@@ -46,6 +47,7 @@ class ScDBData;
class ScDBCollection;
class ScDPObject;
class SdrUndoAction;
+class ScMarkData;
//----------------------------------------------------------------------------
@@ -497,7 +499,6 @@ private:
void Init();
};
-// amelia
class ScUndoDataForm: public ScBlockUndo
{
public:
@@ -521,7 +522,7 @@ public:
virtual String GetComment() const;
private:
- ScMarkData aMarkData;
+ boost::scoped_ptr<ScMarkData> mpMarkData;
ScDocument* pUndoDoc;
ScDocument* pRedoDoc;
sal_uInt16 nFlags;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index fece9f9..c6b7409 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -30,7 +30,6 @@
#define SC_UNDOTAB_HXX
#include "undobase.hxx"
-#include "markdata.hxx"
#include "formula/grammar.hxx"
#include <tools/color.hxx>
#include "tabbgcolor.hxx"
@@ -45,6 +44,8 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
+
#include <memory>
#include <vector>
@@ -55,6 +56,7 @@ class ScPrintRangeSaver;
class SdrObject;
class ScDocProtection;
class ScTableProtection;
+class ScMarkData;
//----------------------------------------------------------------------------
@@ -277,13 +279,13 @@ public:
virtual String GetComment() const;
private:
+ boost::scoped_ptr<ScMarkData> mpMarkData;
SCTAB nSrcTab;
SCTAB nDestTab;
String aName;
String aComment;
Color aColor;
sal_uInt16 nFlags;
- ScMarkData aMarkData;
SdrUndoAction* pDrawUndo;
};
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index c7c8453..e812840 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -31,8 +31,8 @@
#include <svx/zoomitem.hxx>
#include "scdllapi.h"
#include "viewopti.hxx"
-#include "markdata.hxx"
+#include <boost/scoped_ptr.hpp>
// ---------------------------------------------------------------------------
@@ -111,6 +111,7 @@ class ScPatternAttr;
class ScRangeListRef;
class ScExtDocOptions;
class ScViewData;
+class ScMarkData;
//--------------------------------------------------------------------------
@@ -171,6 +172,7 @@ private:
double nPPTX, nPPTY; // Scaling-Faktoren
::std::vector<ScViewDataTable*> maTabData;
+ boost::scoped_ptr<ScMarkData> mpMarkData;
ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle
ScDocShell* pDocShell;
ScDocument* pDoc;
@@ -180,8 +182,6 @@ private:
ScViewOptions* pOptions;
EditView* pSpellingView;
- ScMarkData aMarkData;
-
long nEditMargin;
Size aScenButSize; // Groesse eines Szenario-Buttons
@@ -253,8 +253,8 @@ public:
SfxBindings& GetBindings(); // from ViewShell's ViewFrame
SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame
- ScMarkData& GetMarkData() { return aMarkData; }
- const ScMarkData& GetMarkData() const { return aMarkData; }
+ ScMarkData& GetMarkData();
+ const ScMarkData& GetMarkData() const;
Window* GetDialogParent(); // von tabvwsh weitergeleitet
Window* GetActiveWin(); // von View
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index bc9280a..0090402 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -70,6 +70,7 @@
#include "navsett.hxx"
#include "postit.hxx"
#include "clipparam.hxx"
+#include "markdata.hxx"
using namespace com::sun::star;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index afe56af..5b8d8e9 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -59,6 +59,7 @@
#include "navipi.hrc"
#include "navipi.hxx"
#include "navsett.hxx"
+#include "markdata.hxx"
// Timeout, um Notizen zu suchen
#define SC_CONTENT_TIMEOUT 1000
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index fab711f..b239d52 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -52,6 +52,7 @@
#include "globstr.hrc"
#include "pagedlg.hrc"
#include "compiler.hxx"
+#include "markdata.hxx"
// STATIC DATA ---------------------------------------------------------------
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 2f3edf7..da3617b 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -56,6 +56,7 @@
#include "sc.hrc"
#include "chgtrack.hxx" // Amelia Wang
#include "refundo.hxx" // Amelia Wang
+#include "markdata.hxx"
// -----------------------------------------------------------------------
@@ -2030,7 +2031,7 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/,
sal_Bool bRedoIsFilled ) :
ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
- aMarkData( rMark ),
+ mpMarkData(new ScMarkData(rMark)),
pUndoDoc( pNewUndoDoc ),
pRedoDoc( pNewRedoDoc ),
nFlags( nNewFlags ),
@@ -2042,8 +2043,8 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
// don't have to be changed and branched for 641.
// They can be removed later.
- if ( !aMarkData.IsMarked() ) // no cell marked:
- aMarkData.SetMarkArea( aBlockRange ); // mark paste block
+ if (!mpMarkData->IsMarked()) // no cell marked:
+ mpMarkData->SetMarkArea(aBlockRange); // mark paste block
if ( pRefUndoData )
pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
@@ -2136,7 +2137,7 @@ void ScUndoDataForm::DoChange( const sal_Bool bUndo )
sal_Bool bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
- pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
+ pRedoDoc->InitUndoSelected( pDoc, *mpMarkData, bColInfo, bRowInfo );
}
// read "redo" data from the document in the first undo
// all sheets - CopyToDocument skips those that don't exist in pRedoDoc
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 0dc6c48..ae60b01 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -50,6 +50,7 @@
#include "tabprotection.hxx"
#include "viewdata.hxx"
#include "progress.hxx"
+#include "markdata.hxx"
// for ScUndoRenameObject - might me moved to another file later
#include <svx/svditer.hxx>
@@ -857,13 +858,13 @@ ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
const Color& rCol, sal_uInt16 nF,
const ScMarkData& rMark ) :
ScSimpleUndo( pNewDocShell ),
+ mpMarkData(new ScMarkData(rMark)),
nSrcTab( nSrc ),
nDestTab( nDest ),
aName( rN ),
aComment( rC ),
aColor( rCol ),
nFlags( nF ),
- aMarkData( rMark ),
pDrawUndo( NULL )
{
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
@@ -906,14 +907,14 @@ void ScUndoMakeScenario::Undo()
void ScUndoMakeScenario::Redo()
{
- SetViewMarkData( aMarkData );
+ SetViewMarkData(*mpMarkData);
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
pDocShell->SetInUndo( sal_True );
bDrawIsInUndo = sal_True;
- pDocShell->MakeScenario( nSrcTab, aName, aComment, aColor, nFlags, aMarkData, false );
+ pDocShell->MakeScenario( nSrcTab, aName, aComment, aColor, nFlags, *mpMarkData, false );
bDrawIsInUndo = false;
pDocShell->SetInUndo( false );
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index e453c0a..a1fcc23 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -44,6 +44,7 @@
#include "globstr.hrc"
#include "globalnames.hxx"
#include "global.hxx"
+#include "markdata.hxx"
void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index f52b73a..ba70948 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -72,6 +72,7 @@
#include "appoptio.hxx"
#include "gridwin.hxx"
#include "sheetevents.hxx"
+#include "markdata.hxx"
#include "AccessibilityHints.hxx"
#include <svx/sdrhittesthelper.hxx>
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 35df42a..f84f5b4 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -178,6 +178,7 @@
#include "olinetab.hxx"
#include "transobj.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
#include <comphelper/anytostring.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index e728474..4e03d96 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -51,6 +51,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include "unonames.hxx"
+#include "markdata.hxx"
using namespace ::com::sun::star;
using namespace ::ooo::vba;
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 9fbb174..cea1ee5 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -108,6 +108,7 @@
#include "vbahyperlinks.hxx"
#include "vbasheetobjects.hxx"
#include "viewuno.hxx"
+#include "markdata.hxx"
#include "attrib.hxx"
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index b0e19cc..02828ef 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -54,6 +54,7 @@
#include "vbaworksheet.hxx"
#include "vbaworkbook.hxx"
#include "unonames.hxx"
+#include "markdata.hxx"
#include <vector>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index e781ffa..f06e449 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -67,6 +67,7 @@
#include "postit.hxx"
#include "cliputil.hxx"
#include "clipparam.hxx"
+#include "markdata.hxx"
//------------------------------------------------------------------
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 0aab1e5..fd86dbe 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -101,6 +101,7 @@
#include "dbdata.hxx"
#include "docsh.hxx"
#include "cliputil.hxx"
+#include "markdata.hxx"
#include "globstr.hrc"
#include "scui_def.hxx"
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 8a565bc..a437bfe 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -76,6 +76,7 @@
#include "impex.hxx"
#include "asciiopt.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
using namespace com::sun::star;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 0999a3c..3914d6f 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -56,7 +56,7 @@
#include "attrdlg.hrc" // TP_ALIGNMENT
#include "inputhdl.hxx"
#include "editable.hxx"
-
+#include "markdata.hxx"
#include "scabstdlg.hxx"
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index bd8be80..74ac721 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -36,6 +36,7 @@
#include "clipparam.hxx"
#include "rangelst.hxx"
#include "viewutil.hxx"
+#include "markdata.hxx"
#include "vcl/waitobj.hxx"
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 83c5ab9..27ce6d6 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -43,6 +43,7 @@
#include "docsh.hxx"
#include "appoptio.hxx"
#include "globstr.hrc"
+#include "markdata.hxx"
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index d1aff8c..1565aca 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -51,6 +51,7 @@
#include "dbdocfun.hxx"
#include "editable.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
//==================================================================
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index e4c4f9e..78253f8 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -81,6 +81,7 @@
#include "cell.hxx"
#include "userlist.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
#include <boost/unordered_set.hpp>
#include <boost/unordered_map.hpp>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 092a619..14ed517 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -100,6 +100,7 @@
#include "scresid.hxx"
#include "tabvwsh.hxx"
#include "undostyl.hxx"
+#include "markdata.hxx"
#define ScFormatShell
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b533a82..23e1692 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -133,6 +133,7 @@
#include "dragdata.hxx"
#include "cliputil.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
#include <svx/sdrpagewindow.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 1ee84cf..e1d582c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -70,6 +70,7 @@
#include "dpcontrol.hxx"
#include "queryparam.hxx"
#include "queryentry.hxx"
+#include "markdata.hxx"
#include "sc.hrc"
#include <vcl/virdev.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 407dfee..254d24c 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -46,6 +46,7 @@
#include "inputopt.hxx" // Optionen
#include "gridmerg.hxx"
#include "document.hxx"
+#include "markdata.hxx"
// -----------------------------------------------------------------------
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 1e39c3b..db4b2c0 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -60,6 +60,7 @@
#include "undostyl.hxx"
#include "drwlayer.hxx"
#include "scmod.hxx"
+#include "markdata.hxx"
#include "globstr.hrc"
#include "sc.hrc" // fuer ShellInvalidate
#include "AccessibleDocumentPagePreview.hxx"
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index dfc38ab..eee115e 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -46,6 +46,7 @@
#include "transobj.hxx"
#include "docsh.hxx"
#include "tabprotection.hxx"
+#include "markdata.hxx"
#define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index 93bcb4c..bc54119 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -32,6 +32,7 @@
#include <editeng/editview.hxx>
#include "viewdata.hxx"
+#include "markdata.hxx"
// ============================================================================
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 10d517b..e6ca322 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -51,7 +51,7 @@
#include "patattr.hxx"
#include "waitoff.hxx"
#include "globstr.hrc"
-
+#include "markdata.hxx"
using namespace ::com::sun::star;
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index db140e7..37f6914 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -49,6 +49,7 @@
#include "transobj.hxx"
#include "clipparam.hxx"
#include "dragdata.hxx"
+#include "markdata.hxx"
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 1dcb4e1..c65ae91 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -55,6 +55,7 @@
#include "globstr.hrc"
#include "scmod.hxx"
#include "tabprotection.hxx"
+#include "markdata.hxx"
namespace {
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index b7f7ef8..9284d5e 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -78,6 +78,7 @@
#include "rangeutl.hxx"
#include "client.hxx"
#include "tabprotection.hxx"
+#include "markdata.hxx"
#include "formula/FormulaCompiler.hxx"
#include <com/sun/star/chart2/data/HighlightedRange.hpp>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 34bd426..b23f8c3 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -71,6 +71,7 @@
#include "shtabdlg.hxx"
#include "tabprotection.hxx"
#include "protectiondlg.hxx"
+#include "markdata.hxx"
#include <svl/ilstitem.hxx>
#include <vector>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 9de8b21..53318b4 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -66,6 +66,7 @@
#include "dwfunctr.hxx"
#include "scabstdlg.hxx"
#include "compiler.hxx"
+#include "markdata.hxx"
sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 0c1f007..25167ea 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -70,6 +70,7 @@
#include "simpref.hxx"
#include "funcdesc.hxx"
#include "dpobject.hxx"
+#include "markdata.hxx"
#include <iostream>
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index a9a2cc3..201fc84 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -59,6 +59,7 @@
#include "tabbgcolor.hxx"
#include "tabbgcolordlg.hxx"
#include "sccommands.h"
+#include "markdata.hxx"
#include <vector>
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 75e404f..0e3d6bd 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -66,6 +66,7 @@
#include "unonames.hxx"
#include "inputopt.hxx"
#include "viewutil.hxx"
+#include "markdata.hxx"
#include "stlalgorithm.hxx"
#include "ViewSettingsSequenceDefines.hxx"
#include <rtl/ustrbuf.hxx>
@@ -298,6 +299,7 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
}
ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
+ mpMarkData(new ScMarkData),
pDocShell ( pDocSh ),
pDoc ( NULL ),
pView ( pViewSh ),
@@ -462,7 +464,7 @@ void ScViewData::InsertTab( SCTAB nTab )
CreateTabData( nTab );
UpdateCurrentTab();
- aMarkData.InsertTab( nTab );
+ mpMarkData->InsertTab( nTab );
}
void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
@@ -476,7 +478,7 @@ void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
for (SCTAB i = nTab; i < nTab + nNewSheets; ++i)
{
CreateTabData( i );
- aMarkData.InsertTab( i );
+ mpMarkData->InsertTab( i );
}
UpdateCurrentTab();
}
@@ -487,14 +489,14 @@ void ScViewData::DeleteTab( SCTAB nTab )
maTabData.erase(maTabData.begin() + nTab);
UpdateCurrentTab();
- aMarkData.DeleteTab( nTab );
+ mpMarkData->DeleteTab( nTab );
}
void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
{
for (SCTAB i = 0; i < nSheets; ++i)
{
- aMarkData.DeleteTab( nTab + i );
+ mpMarkData->DeleteTab( nTab + i );
delete maTabData.at(nTab + i);
}
@@ -524,7 +526,7 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
maTabData.insert(maTabData.begin() + nDestTab, NULL);
UpdateCurrentTab();
- aMarkData.InsertTab( nDestTab );
+ mpMarkData->InsertTab( nDestTab );
}
void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
@@ -547,8 +549,8 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
}
UpdateCurrentTab();
- aMarkData.DeleteTab( nSrcTab );
- aMarkData.InsertTab( nDestTab ); // ggf. angepasst
+ mpMarkData->DeleteTab( nSrcTab );
+ mpMarkData->InsertTab( nDestTab ); // ggf. angepasst
}
void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
@@ -592,7 +594,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, sal_Bool bAll )
std::vector< SCTAB > vTabs; // Empty for all tabs
if ( !bAll ) // get selected tabs
{
- ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+ ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
vTabs.insert(vTabs.begin(), itr, itrEnd);
}
SetZoomType( eNew, vTabs );
@@ -677,7 +679,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool
std::vector< SCTAB > vTabs;
if ( !bAll ) // get selected tabs
{
- ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+ ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
vTabs.insert(vTabs.begin(), itr, itrEnd);
}
SetZoom( rNewX, rNewY, vTabs );
@@ -747,7 +749,7 @@ ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB&
// handling itself)
ScRange aRange;
- ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
+ ScMarkData aNewMark(*mpMarkData); // use a local copy for MarkToSimple
ScMarkType eMarkType = GetSimpleArea( aRange, aNewMark);
aRange.GetVars( rStartCol, rStartRow, rStartTab, rEndCol, rEndRow, rEndTab);
return eMarkType;
@@ -757,7 +759,7 @@ ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const
{
// parameter bMergeMark is no longer needed, see above
- ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
+ ScMarkData aNewMark(*mpMarkData); // use a local copy for MarkToSimple
return GetSimpleArea( rRange, aNewMark);
}
@@ -765,7 +767,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
{
// parameter bMergeMark is no longer needed, see GetSimpleArea
- ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
+ ScMarkData aNewMark(*mpMarkData); // use a local copy for MarkToSimple
sal_Bool bMulti = aNewMark.IsMultiMarked();
if (bMulti)
@@ -1427,7 +1429,7 @@ void ScViewData::CreateTabData( SCTAB nNewTab )
void ScViewData::CreateSelectedTabData()
{
- ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+ ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
for (; itr != itrEnd; ++itr)
CreateTabData(*itr);
}
@@ -2076,6 +2078,16 @@ SfxDispatcher& ScViewData::GetDispatcher()
return *pViewShell->GetViewFrame()->GetDispatcher();
}
+ScMarkData& ScViewData::GetMarkData()
+{
+ return *mpMarkData;
+}
+
+const ScMarkData& ScViewData::GetMarkData() const
+{
+ return *mpMarkData;
+}
+
Window* ScViewData::GetDialogParent()
{
OSL_ENSURE( pViewShell, "GetDialogParent() ohne ViewShell" );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 68ae392..f5571ab 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -78,6 +78,7 @@
#include "asciiopt.hxx"
#include "scabstdlg.hxx"
#include "clipparam.hxx"
+#include "markdata.hxx"
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/dbaexchange.hxx>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 47a87a1..b86fbf2 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -53,6 +53,7 @@
#include "reftokenhelper.hxx"
#include "externalrefmgr.hxx"
#include "cell.hxx"
+#include "markdata.hxx"
#include <vector>
commit 71fc346874fb5482a355a9beed691187cea86a1f
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Wed Nov 23 20:17:51 2011 -0500
sal_Bool to bool.
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 784c613..05157a2 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -50,11 +50,11 @@ private:
ScRange aMultiRange; // maximum area altogether
ScMarkArray* pMultiSel; // multi selection
::std::set<SCTAB> maTabMarked;
- sal_Bool bMarked; // rectangle marked
- sal_Bool bMultiMarked;
+ bool bMarked:1; // rectangle marked
+ bool bMultiMarked:1;
- sal_Bool bMarking; // area is being marked -> no MarkToMulti
- sal_Bool bMarkIsNeg; // cancel if multi selection
+ bool bMarking:1; // area is being marked -> no MarkToMulti
+ bool bMarkIsNeg:1; // cancel if multi selection
public:
ScMarkData();
@@ -66,13 +66,13 @@ public:
void ResetMark();
void SetMarkArea( const ScRange& rRange );
- void SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark = sal_True );
+ void SetMultiMarkArea( const ScRange& rRange, bool bMark = true );
void MarkToMulti();
void MarkToSimple();
- sal_Bool IsMarked() const { return bMarked; }
- sal_Bool IsMultiMarked() const { return bMultiMarked; }
+ bool IsMarked() const { return bMarked; }
+ bool IsMultiMarked() const { return bMultiMarked; }
void GetMarkArea( ScRange& rRange ) const;
void GetMultiMarkArea( ScRange& rRange ) const;
@@ -87,31 +87,31 @@ public:
SCTAB GetFirstSelected() const;
SCTAB GetLastSelected() const;
- void SetMarkNegative( sal_Bool bFlag ) { bMarkIsNeg = bFlag; }
- sal_Bool IsMarkNegative() const { return bMarkIsNeg; }
- void SetMarking( sal_Bool bFlag ) { bMarking = bFlag; }
- sal_Bool GetMarkingFlag() const { return bMarking; }
+ void SetMarkNegative( bool bFlag ) { bMarkIsNeg = bFlag; }
+ bool IsMarkNegative() const { return bMarkIsNeg; }
+ void SetMarking( bool bFlag ) { bMarking = bFlag; }
+ bool GetMarkingFlag() const { return bMarking; }
// for FillInfo / Document etc.
const ScMarkArray* GetArray() const { return pMultiSel; }
- sal_Bool IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple = false ) const;
- void FillRangeListWithMarks( ScRangeList* pList, sal_Bool bClear ) const;
+ bool IsCellMarked( SCCOL nCol, SCROW nRow, bool bNoSimple = false ) const;
+ void FillRangeListWithMarks( ScRangeList* pList, bool bClear ) const;
void ExtendRangeListTables( ScRangeList* pList ) const;
- void MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset );
+ void MarkFromRangeList( const ScRangeList& rList, bool bReset );
SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges );
SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges );
- sal_Bool IsColumnMarked( SCCOL nCol ) const;
- sal_Bool IsRowMarked( SCROW nRow ) const;
- sal_Bool IsAllMarked( const ScRange& rRange ) const; // Multi
+ bool IsColumnMarked( SCCOL nCol ) const;
+ bool IsRowMarked( SCROW nRow ) const;
+ bool IsAllMarked( const ScRange& rRange ) const; // Multi
/// May return -1
- SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const;
- sal_Bool HasMultiMarks( SCCOL nCol ) const;
- sal_Bool HasAnyMultiMarks() const;
+ SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const;
+ bool HasMultiMarks( SCCOL nCol ) const;
+ bool HasAnyMultiMarks() const;
// adjust table marking:
void InsertTab( SCTAB nTab );
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 29d0470..46b4cbf 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -119,7 +119,7 @@ void ScMarkData::SetMarkArea( const ScRange& rRange )
// => mark that one.
if ( !GetSelectCount() )
maTabMarked.insert( aMarkRange.aStart.Tab() );
- bMarked = sal_True;
+ bMarked = true;
}
}
@@ -133,7 +133,7 @@ void ScMarkData::GetMultiMarkArea( ScRange& rRange ) const
rRange = aMultiRange;
}
-void ScMarkData::SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark )
+void ScMarkData::SetMultiMarkArea( const ScRange& rRange, bool bMark )
{
if (!pMultiSel)
{
@@ -143,7 +143,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark )
if ( bMarked && !bMarkIsNeg )
{
bMarked = false;
- SetMultiMarkArea( aMarkRange, sal_True );
+ SetMultiMarkArea( aMarkRange, true );
}
}
@@ -172,7 +172,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark )
else
{
aMultiRange = rRange; // neu
- bMultiMarked = sal_True;
+ bMultiMarked = true;
}
}
@@ -257,7 +257,7 @@ void ScMarkData::MarkToSimple()
ScRange aNew = aMultiRange;
- sal_Bool bOk = false;
+ bool bOk = false;
SCCOL nStartCol = aNew.aStart.Col();
SCCOL nEndCol = aNew.aEnd.Col();
@@ -270,7 +270,7 @@ void ScMarkData::MarkToSimple()
SCROW nStartRow, nEndRow;
if ( pMultiSel[nStartCol].HasOneMark( nStartRow, nEndRow ) )
{
- bOk = sal_True;
+ bOk = true;
SCROW nCmpStart, nCmpEnd;
for (SCCOL nCol=nStartCol+1; nCol<=nEndCol && bOk; nCol++)
if ( !pMultiSel[nCol].HasOneMark( nCmpStart, nCmpEnd )
@@ -287,18 +287,18 @@ void ScMarkData::MarkToSimple()
ResetMark();
aMarkRange = aNew;
- bMarked = sal_True;
+ bMarked = true;
bMarkIsNeg = false;
}
}
}
-sal_Bool ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple ) const
+bool ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, bool bNoSimple ) const
{
if ( bMarked && !bNoSimple && !bMarkIsNeg )
if ( aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol &&
aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow )
- return sal_True;
+ return true;
if (bMultiMarked)
{
@@ -311,7 +311,7 @@ sal_Bool ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple )
return false;
}
-sal_Bool ScMarkData::IsColumnMarked( SCCOL nCol ) const
+bool ScMarkData::IsColumnMarked( SCCOL nCol ) const
{
// bMarkIsNeg inzwischen auch fuer Spaltenkoepfe
//! GetMarkColumnRanges fuer komplett markierte Spalten
@@ -319,15 +319,15 @@ sal_Bool ScMarkData::IsColumnMarked( SCCOL nCol ) const
if ( bMarked && !bMarkIsNeg &&
aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol &&
aMarkRange.aStart.Row() == 0 && aMarkRange.aEnd.Row() == MAXROW )
- return sal_True;
+ return true;
if ( bMultiMarked && pMultiSel[nCol].IsAllMarked(0,MAXROW) )
- return sal_True;
+ return true;
return false;
}
-sal_Bool ScMarkData::IsRowMarked( SCROW nRow ) const
+bool ScMarkData::IsRowMarked( SCROW nRow ) const
{
// bMarkIsNeg inzwischen auch fuer Zeilenkoepfe
//! GetMarkRowRanges fuer komplett markierte Zeilen
@@ -335,7 +335,7 @@ sal_Bool ScMarkData::IsRowMarked( SCROW nRow ) const
if ( bMarked && !bMarkIsNeg &&
aMarkRange.aStart.Col() == 0 && aMarkRange.aEnd.Col() == MAXCOL &&
aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow )
- return sal_True;
+ return true;
if ( bMultiMarked )
{
@@ -343,13 +343,13 @@ sal_Bool ScMarkData::IsRowMarked( SCROW nRow ) const
for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
if (!pMultiSel[nCol].GetMark(nRow))
return false;
- return sal_True;
+ return true;
}
return false;
}
-void ScMarkData::MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset )
+void ScMarkData::MarkFromRangeList( const ScRangeList& rList, bool bReset )
{
if (bReset)
{
@@ -362,7 +362,7 @@ void ScMarkData::MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset )
{
ScRange aRange = *rList[ 0 ];
SetMarkArea( aRange );
- SelectTable( aRange.aStart.Tab(), sal_True );
+ SelectTable( aRange.aStart.Tab(), true );
}
else
{
@@ -375,7 +375,7 @@ void ScMarkData::MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset )
}
}
-void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, sal_Bool bClear ) const
+void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, bool bClear ) const
{
if (!pList)
return;
@@ -493,8 +493,8 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
const SCCOLROW nMultiStart = aMultiRange.aStart.Row();
const SCCOLROW nMultiEnd = aMultiRange.aEnd.Row();
- sal_Bool* bRowMarked = new sal_Bool[MAXROWCOUNT];
- memset( bRowMarked, 0, sizeof(sal_Bool) * MAXROWCOUNT);
+ bool* bRowMarked = new bool[MAXROWCOUNT];
+ memset( bRowMarked, 0, sizeof(bool) * MAXROWCOUNT);
SCROW nRow;
SCCOL nCol;
@@ -504,7 +504,7 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
ScMarkArrayIter aMarkIter( &pMultiSel[nCol] );
while (aMarkIter.Next( nTop, nBottom ))
for (nRow=nTop; nRow<=nBottom; nRow++)
- bRowMarked[nRow] = sal_True;
+ bRowMarked[nRow] = true;
if (nTop == nMultiStart && nBottom == nMultiEnd)
break; // for, all relevant rows marked
}
@@ -545,7 +545,7 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
return nRangeCnt;
}
-sal_Bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
+bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
{
if ( !bMultiMarked )
return false;
@@ -556,7 +556,7 @@ sal_Bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
SCROW nStartRow = rRange.aStart.Row();
SCCOL nEndCol = rRange.aEnd.Col();
SCROW nEndRow = rRange.aEnd.Row();
- sal_Bool bOk = sal_True;
+ bool bOk = true;
for (SCCOL nCol=nStartCol; nCol<=nEndCol && bOk; nCol++)
if ( !pMultiSel[nCol].IsAllMarked( nStartRow, nEndRow ) )
bOk = false;
@@ -564,7 +564,7 @@ sal_Bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
return bOk;
}
-SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const
+SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const
{
if ( !bMultiMarked )
return nRow;
@@ -574,7 +574,7 @@ SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const
return pMultiSel[nCol].GetNextMarked( nRow, bUp );
}
-sal_Bool ScMarkData::HasMultiMarks( SCCOL nCol ) const
+bool ScMarkData::HasMultiMarks( SCCOL nCol ) const
{
if ( !bMultiMarked )
return false;
@@ -584,7 +584,7 @@ sal_Bool ScMarkData::HasMultiMarks( SCCOL nCol ) const
return pMultiSel[nCol].HasMarks();
}
-sal_Bool ScMarkData::HasAnyMultiMarks() const
+bool ScMarkData::HasAnyMultiMarks() const
{
if ( !bMultiMarked )
return false;
@@ -593,7 +593,7 @@ sal_Bool ScMarkData::HasAnyMultiMarks() const
for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
if ( pMultiSel[nCol].HasMarks() )
- return sal_True;
+ return true;
return false; // nix
}
More information about the Libreoffice-commits
mailing list