diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 10:36:48 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 10:36:48 +0000 |
commit | 08b5ed50476473a95a45f6dde72d32eee73bc92c (patch) | |
tree | 10f720f7785da4faedd90f1198289ff1021ae4c4 /sc/source/ui/inc | |
parent | 7931d0286ad4cf82da0c48551c33debe456307bd (diff) |
INTEGRATION: CWS filteredrows (1.22.72); FILE MERGED
2008/03/28 14:20:07 er 1.22.72.2: some compilers do not like extraneous separators
2008/03/19 18:31:52 er 1.22.72.1: #i33851# first wave: treat filtered simple area selection as if it was a multi-selection, effectively disabling all operations that are not supported for a multi-selection
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 97f396cc6f70..b9e46aa658ec 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewdata.hxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.24 $ * * This file is part of OpenOffice.org. * @@ -67,6 +67,28 @@ enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUM enum ScRefType { SC_REFTYPE_NONE, SC_REFTYPE_REF, SC_REFTYPE_FILL, SC_REFTYPE_EMBED_LT, SC_REFTYPE_EMBED_RB }; +/** States GetSimpleArea() returns for the underlying selection marks, so the + caller can react if the result is not of type SC_MARK_SIMPLE. */ +enum ScMarkType +{ + SC_MARK_NONE = 0, // Not returned by GetSimpleArea(), used internally. + // Nothing marked always results in the + // current cursor position being selected and a simple mark. + SC_MARK_SIMPLE = 1, // Simple rectangular area marked, no filtered rows. + SC_MARK_FILTERED = 2, // At least one mark contains filtered rows. + SC_MARK_SIMPLE_FILTERED = // Simple rectangular area marked containing filtered rows. + SC_MARK_SIMPLE | + SC_MARK_FILTERED, // 3 + SC_MARK_MULTI = 4 // Multiple selection marks. + /* TODO: if filtered multi-selection was implemented, this would be the value to use. */ +#if 0 + , + SC_MARK_MULTI_FILTERED = // Multiple selection marks containing filtered rows. + SC_MARK_MULTI | + SC_MARK_FILTERED // 6 +#endif +}; + class ScDocShell; class ScDocument; class ScDBFunc; @@ -307,10 +329,12 @@ public: double GetPPTX() const { return nPPTX; } double GetPPTY() const { return nPPTY; } - BOOL GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, - SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ); - BOOL GetSimpleArea( ScRange& rRange ); - void GetMultiArea( ScRangeListRef& rRange ); + ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, + SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const; + ScMarkType GetSimpleArea( ScRange& rRange ) const; + /// May modify rNewMark using MarkToSimple(). + ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const; + void GetMultiArea( ScRangeListRef& rRange ) const; BOOL SimpleColMarked(); BOOL SimpleRowMarked(); |