[Libreoffice-commits] .: chart2/source sc/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Jan 29 06:43:24 PST 2011
chart2/source/view/inc/VDataSeries.hxx | 11 --
sc/source/filter/inc/xlconst.hxx | 19 ----
sc/source/filter/inc/xlpivot.hxx | 32 ------
sc/source/filter/inc/xltable.hxx | 24 -----
sc/source/ui/dbgui/tpsubt.cxx | 15 ---
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 4
sc/source/ui/miscdlgs/acredlin.cxx | 135 ++---------------------------
7 files changed, 12 insertions(+), 228 deletions(-)
New commits:
commit aa31794794b6d65c79a7d4f8cabfe2646a6db1df
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 20:55:03 2011 +0100
Remove double line spacing, unused code and some unnecessary brackets.
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index b1922f8..162ad70 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -45,14 +45,9 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <cppuhelper/weakref.hxx>
-//.............................................................................
namespace chart
{
-//.............................................................................
-//-----------------------------------------------------------------------------
-/**
-*/
class VDataSequence
{
public:
@@ -149,10 +144,9 @@ public:
sal_Int32 m_nPolygonIndex;
double m_fLogicMinX;
double m_fLogicMaxX;
- //
+
//this is here for deep stacking:
double m_fLogicZPos;//from 0 to series count -1
- //
rtl::OUString getCID() const;
rtl::OUString getSeriesParticle() const;
@@ -253,15 +247,12 @@ private: //member
m_apSymbolProperties_InvisibleSymbolForSelection;
mutable sal_Int32 m_nCurrentAttributedPoint;
::com::sun::star::awt::Size m_aReferenceSize;
- //
sal_Int32 m_nMissingValueTreatment;
bool m_bAllowPercentValueInDataLabel;
};
-//.............................................................................
} //namespace chart
-//.............................................................................
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index 117d173..9794eb1 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -174,27 +174,21 @@ const sal_uInt16 EXC_BOF_WORKSPACE = 0x0100; /// Workspace.
const sal_uInt16 EXC_BOF_UNKNOWN = 0xFFFF; /// Internal use only.
// (0x000A) EOF ---------------------------------------------------------------
-
const sal_uInt16 EXC_ID_EOF = 0x000A;
// (0x0012) PROTECT -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_PROTECT = 0x0012;
// (0x0013) PASSWORD ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_PASSWORD = 0x0013;
// (0x0019) WINDOWPROTECT -----------------------------------------------------
-
const sal_uInt16 EXC_ID_WINDOWPROTECT = 0x0019;
// (0x0042) CODEPAGE ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_CODEPAGE = 0x0042;
// (0x0081) WSBOOL ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_WSBOOL = 0x0081;
const sal_uInt16 EXC_WSBOOL_ROWBELOW = 0x0040;
@@ -204,59 +198,46 @@ const sal_uInt16 EXC_WSBOOL_FITTOPAGE = 0x0100;
const sal_uInt16 EXC_WSBOOL_DEFAULTFLAGS = 0x04C1;
// (0x0086) WRITEPROT ---------------------------------------------------------
-
const sal_uInt16 EXC_ID_WRITEPROT = 0x0086;
// (0x008C) COUNTRY -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_COUNTRY = 0x008C;
// (0x009B) FILTERMODE --------------------------------------------------------
-
const sal_uInt16 EXC_ID_FILTERMODE = 0x009B;
// (0x009C) FNGROUPCOUNT ------------------------------------------------------
-
const sal_uInt16 EXC_ID_FNGROUPCOUNT = 0x009C;
// (0x009D) AUTOFILTERINFO ----------------------------------------------------
-
const sal_uInt16 EXC_ID_AUTOFILTERINFO = 0x009D;
// (0x009E) AUTOFILTER --------------------------------------------------------
-
const sal_uInt16 EXC_ID_AUTOFILTER = 0x009E;
// (0x00BF, 0x00C0, 0x00C1) TOOLBARHDR, TOOLBAREND, MMS -----------------------
-
const sal_uInt16 EXC_ID_TOOLBARHDR = 0x00BF;
const sal_uInt16 EXC_ID_TOOLBAREND = 0x00C0;
const sal_uInt16 EXC_ID_MMS = 0x00C1;
// (0x00E1, 0x00E2) INTERFACEHDR, INTERFACEEND --------------------------------
-
const sal_uInt16 EXC_ID_INTERFACEHDR = 0x00E1;
const sal_uInt16 EXC_ID_INTERFACEEND = 0x00E2;
// (0x0160) USESELFS ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_USESELFS = 0x0160;
// (0x0161) DSF ---------------------------------------------------------------
-
const sal_uInt16 EXC_ID_DSF = 0x0161;
// (0x01AA,0x01AB) USERSVIEWBEGIN, USERSVIEWEND -------------------------------
-
const sal_uInt16 EXC_ID_USERSVIEWBEGIN = 0x01AA;
const sal_uInt16 EXC_ID_USERSVIEWEND = 0x01AB;
// (0x01BA) CODENAME ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_CODENAME = 0x01BA;
// (0x01C0) XL9FILE -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_XL9FILE = 0x01C0;
// (0x8xx) Future records -----------------------------------------------------
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 2468b93..44743ce 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -120,7 +120,6 @@ const sal_uInt16 EXC_SXVIEW_DATALAST = 0xFFFF;
const sal_uInt16 EXC_SXVIEW_AUTOFMT = 0x0001;
// (0x00B1) SXVD --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXVD = 0x00B1;
const sal_uInt16 EXC_SXVD_AXIS_NONE = 0x0000;
@@ -148,7 +147,6 @@ const sal_uInt16 EXC_SXVD_SUBT_VARP = 0x0800;
const sal_uInt16 EXC_SXVD_DEFAULT_CACHE = EXC_PC_NOFIELD;
// (0x00B2) SXVI --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXVI = 0x00B2;
const sal_uInt16 EXC_SXVI_TYPE_PAGE = 0x00FE;
@@ -177,22 +175,18 @@ const sal_uInt16 EXC_SXVI_MISSING = 0x0008;
const sal_uInt16 EXC_SXVI_DEFAULT_CACHE = EXC_PC_NOFIELD;
// (0x00B4) SXIVD -------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXIVD = 0x00B4;
const sal_uInt16 EXC_SXIVD_DATA = 0xFFFE;
// (0x00B5) SXLI --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXLI = 0x00B5;
const sal_uInt16 EXC_SXLI_DEFAULTFLAGS = 0x0000;
// (0x00B6) SXPI --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXPI = 0x00B6;
const sal_uInt16 EXC_SXPI_ALLITEMS = 0x7FFD;
// (0x00C5) SXDI --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXDI = 0x00C5;
const sal_uInt16 EXC_SXDI_FUNC_SUM = 0x0000;
@@ -221,7 +215,6 @@ const sal_uInt16 EXC_SXDI_PREVITEM = 0x7FFB;
const sal_uInt16 EXC_SXDI_NEXTITEM = 0x7FFC;
// (0x00C6) SXDB --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXDB = 0x00C6;
const sal_uInt16 EXC_SXDB_SAVEDATA = 0x0001;
@@ -240,7 +233,6 @@ const sal_uInt16 EXC_SXDB_SRC_CONSOLID = 0x0004;
const sal_uInt16 EXC_SXDB_SRC_SCENARIO = 0x0008;
// (0x00C7) SXFIELD -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXFIELD = 0x00C7;
const sal_uInt16 EXC_SXFIELD_HASITEMS = 0x0001;
@@ -268,43 +260,33 @@ const sal_uInt16 EXC_SXFIELD_INDEX_MAX = 1; /// List index for maxim
const sal_uInt16 EXC_SXFIELD_INDEX_STEP = 2; /// List index for step item in groupings.
// (0x00C8) SXINDEXLIST -------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXINDEXLIST = 0x00C8;
// (0x00C9) SXDOUBLE ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXDOUBLE = 0x00C9;
// (0x00CA) SXBOOLEAN ---------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXBOOLEAN = 0x00CA;
// (0x00CB) SXERROR -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXERROR = 0x00CB;
// (0x00CC) SXINTEGER ---------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXINTEGER = 0x00CC;
// (0x00CD) SXSTRING ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXSTRING = 0x00CD;
// (0x00CE) SXDATETIME --------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXDATETIME = 0x00CE;
// (0x00CF) SXEMPTY -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXEMPTY = 0x00CF;
// (0x00D5) SXIDSTM -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXIDSTM = 0x00D5;
// (0x00D8) SXNUMGROUP --------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXNUMGROUP = 0x00D8;
const sal_uInt16 EXC_SXNUMGROUP_AUTOMIN = 0x0001;
@@ -320,15 +302,12 @@ const sal_uInt16 EXC_SXNUMGROUP_TYPE_YEAR = 7;
const sal_uInt16 EXC_SXNUMGROUP_TYPE_NUM = 8;
// (0x00D9) SXGROUPINFO -------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXGROUPINFO = 0x00D9;
// (0x00DC) SXEXT -------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXEXT = 0x00DC;
// (0x00E3) SXVS --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXVS = 0x00E3;
const sal_uInt16 EXC_SXVS_UNKNOWN = 0x0000;
@@ -339,38 +318,30 @@ const sal_uInt16 EXC_SXVS_PIVOTTAB = 0x0008;
const sal_uInt16 EXC_SXVS_SCENARIO = 0x0010;
// (0x00F0) SXRULE ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXRULE = 0x00F0;
// (0x00F1) SXEX --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXEX = 0x00F1;
const sal_uInt32 EXC_SXEX_DRILLDOWN = 0x00020000;
const sal_uInt32 EXC_SXEX_DEFAULTFLAGS = 0x004F0200;
// (0x00F2) SXFILT ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXFILT = 0x00F2;
// (0x00F5) -------------------------------------------------------------------
-
const sal_uInt16 EXC_ID_00F5 = 0x00F5; /// Unknown record
// (0x00F6) SXNAME ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXNAME = 0x00F6;
// (0x00F8) SXPAIR ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXPAIR = 0x00F8;
// (0x00F9) SXFMLA ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXFMLA = 0x00F9;
// (0x0100) SXVDEX ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXVDEX = 0x0100;
const sal_uInt32 EXC_SXVDEX_SHOWALL = 0x00000001;
@@ -388,16 +359,13 @@ const sal_uInt16 EXC_SXVDEX_SHOW_NONE = 0xFFFF;
const sal_uInt16 EXC_SXVDEX_FORMAT_NONE = 0x0000;
// (0x0103) SXFORMULA ---------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXFORMULA = 0x0103;
// (0x0122) SXDBEX ------------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXDBEX = 0x0122;
const double EXC_SXDBEX_CREATION_DATE = 51901.029652778;
// (0x01BB) SXFDBTYPE ---------------------------------------------------------
-
const sal_uInt16 EXC_ID_SXFDBTYPE = 0x01BB;
const sal_uInt16 EXC_SXFDBTYPE_DEFAULT = 0x0000;
diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx
index 76aaa85..8a44fb9 100644
--- a/sc/source/filter/inc/xltable.hxx
+++ b/sc/source/filter/inc/xltable.hxx
@@ -39,33 +39,27 @@ const sal_uInt8 EXC_OUTLINE_MAX = 7;
const sal_uInt8 EXC_OUTLINE_COUNT = EXC_OUTLINE_MAX + 1;
// (0x0000, 0x0200) DIMENSIONS ------------------------------------------------
-
const sal_uInt16 EXC_ID2_DIMENSIONS = 0x0000;
const sal_uInt16 EXC_ID3_DIMENSIONS = 0x0200;
// (0x0001, 0x0201) BLANK -----------------------------------------------------
-
const sal_uInt16 EXC_ID2_BLANK = 0x0001;
const sal_uInt16 EXC_ID3_BLANK = 0x0201;
// (0x0002) INTEGER -----------------------------------------------------------
-
const sal_uInt16 EXC_ID2_INTEGER = 0x0002;
// (0x0003, 0x0203) NUMBER ----------------------------------------------------
-
const sal_uInt16 EXC_ID2_NUMBER = 0x0003;
const sal_uInt16 EXC_ID3_NUMBER = 0x0203;
// (0x0004, 0x0204) LABEL -----------------------------------------------------
-
const sal_uInt16 EXC_ID2_LABEL = 0x0004;
const sal_uInt16 EXC_ID3_LABEL = 0x0204;
const sal_uInt8 EXC_LABEL_MAXLEN = 0xFF;
// (0x0005, 0x0205) BOOLERR ---------------------------------------------------
-
const sal_uInt16 EXC_ID2_BOOLERR = 0x0005;
const sal_uInt16 EXC_ID3_BOOLERR = 0x0205;
@@ -73,7 +67,6 @@ const sal_uInt8 EXC_BOOLERR_BOOL = 0x00;
const sal_uInt8 EXC_BOOLERR_ERROR = 0x01;
// (0x0006, 0x0206, 0x0406) FORMULA -------------------------------------------
-
const sal_uInt16 EXC_ID2_FORMULA = 0x0006;
const sal_uInt16 EXC_ID3_FORMULA = 0x0206;
const sal_uInt16 EXC_ID4_FORMULA = 0x0406;
@@ -89,12 +82,10 @@ const sal_uInt8 EXC_FORMULA_RES_ERROR = 0x02; /// Result is error code
const sal_uInt8 EXC_FORMULA_RES_EMPTY = 0x03; /// Result is empty cell (BIFF8 only).
// (0x0007, 0x0207) STRING ----------------------------------------------------
-
const sal_uInt16 EXC_ID2_STRING = 0x0007;
const sal_uInt16 EXC_ID3_STRING = 0x0207;
// (0x0008, 0x0208) ROW -------------------------------------------------------
-
const sal_uInt16 EXC_ID2_ROW = 0x0008;
const sal_uInt16 EXC_ID3_ROW = 0x0208;
@@ -113,11 +104,9 @@ const sal_uInt16 EXC_ROW_HEIGHTMASK = 0x7FFF;
const sal_uInt16 EXC_ROW_ROWBLOCKSIZE = 32; /// Number of rows in a row block.
// (0x0020) COLUMNDEFAULT -----------------------------------------------------
-
const sal_uInt16 EXC_ID_COLUMNDEFAULT = 0x0020;
// (0x0021, 0x0221) ARRAY -----------------------------------------------------
-
const sal_uInt16 EXC_ID2_ARRAY = 0x0021;
const sal_uInt16 EXC_ID3_ARRAY = 0x0221;
@@ -126,11 +115,9 @@ const sal_uInt16 EXC_ARRAY_RECALC_ONLOAD = 0x0002;
const sal_uInt16 EXC_ARRAY_DEFAULTFLAGS = EXC_ARRAY_RECALC_ONLOAD;
// (0x0024) COLWIDTH ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_COLWIDTH = 0x0024;
// (0x0025, 0x0225) DEFAULTROWHEIGHT ------------------------------------------
-
const sal_uInt16 EXC_ID2_DEFROWHEIGHT = 0x0025;
const sal_uInt16 EXC_ID3_DEFROWHEIGHT = 0x0225;
@@ -143,7 +130,6 @@ const sal_uInt16 EXC_DEFROW_DEFAULTFLAGS = 0x0000;
const sal_uInt16 EXC_DEFROW_DEFAULTHEIGHT = 255;
// (0x0036, 0x0236) TABLEOP ---------------------------------------------------
-
const sal_uInt16 EXC_ID2_TABLEOP = 0x0036;
const sal_uInt16 EXC_ID3_TABLEOP = 0x0236;
@@ -154,47 +140,37 @@ const sal_uInt16 EXC_TABLEOP_BOTH = 0x0008;
const sal_uInt16 EXC_TABLEOP_DEFAULTFLAGS = EXC_TABLEOP_RECALC_ONLOAD;
// (0x0037) TABLEOP2 ----------------------------------------------------------
-
const sal_uInt16 EXC_ID2_TABLEOP2 = 0x0037;
// (0x0055) DEFCOLWIDTH -------------------------------------------------------
-
const sal_uInt16 EXC_ID_DEFCOLWIDTH = 0x0055;
const sal_uInt16 EXC_DEFCOLWIDTH_DEF = 10;
// (0x007D) COLINFO -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_COLINFO = 0x007D;
const sal_uInt16 EXC_COLINFO_HIDDEN = 0x0001;
const sal_uInt16 EXC_COLINFO_COLLAPSED = 0x1000;
// (0x0080) GUTS --------------------------------------------------------------
-
const sal_uInt16 EXC_ID_GUTS = 0x0080;
// (0x00BD) MULRK -------------------------------------------------------------
-
const sal_uInt16 EXC_ID_MULRK = 0x00BD;
// (0x00BE) MULBLANK ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_MULBLANK = 0x00BE;
// (0x00D6) RSTRING -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_RSTRING = 0x00D6;
// (0x00FD) LABELSST ----------------------------------------------------------
-
const sal_uInt16 EXC_ID_LABELSST = 0x00FD;
// (0x027E) RK ----------------------------------------------------------------
-
const sal_uInt16 EXC_ID_RK = 0x027E;
// (0x04BC) SHRFMLA -----------------------------------------------------------
-
const sal_uInt16 EXC_ID_SHRFMLA = 0x04BC;
// ============================================================================
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index c919741..57fe717 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -31,8 +31,6 @@
#undef SC_DLLIMPLEMENTATION
-
-
#include "scitems.hxx"
#include "uiitems.hxx"
#include "global.hxx"
@@ -63,7 +61,6 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
: SfxTabPage ( pParent,
ScResId( nResId ),
rArgSet ),
- //
aFtGroup ( this, ScResId( FT_GROUP ) ),
aLbGroup ( this, ScResId( LB_GROUP ) ),
aFtColumns ( this, ScResId( FT_COLUMNS ) ),
@@ -72,7 +69,6 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ),
aStrNone ( ScResId( SCSTR_NONE ) ),
aStrColumn ( ScResId( SCSTR_COLUMN ) ),
- //
pViewData ( NULL ),
pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
@@ -412,7 +408,6 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
else if ( pLb == &aLbFunctions )
{
*pFunction = nFunction;
-// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX
aLbColumns.CheckEntryPos( nColumn, TRUE );
}
}
@@ -473,25 +468,17 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS
#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet ))
-
void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); }
-
void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
-
void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
-
#undef RESET
// -----------------------------------------------------------------------
#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet ))
-
BOOL ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
-
BOOL ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); }
-
BOOL ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); }
-
#undef FILL
//========================================================================
@@ -503,7 +490,6 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
: SfxTabPage ( pParent,
ScResId( RID_SCPAGE_SUBT_OPTIONS ),
rArgSet ),
- //
aFlGroup ( this, ScResId( FL_GROUP ) ),
aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ),
aBtnCase ( this, ScResId( BTN_CASE ) ),
@@ -514,7 +500,6 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
aBtnUserDef ( this, ScResId( BTN_USERDEF ) ),
aLbUserDef ( this, ScResId( LB_USERDEF ) ),
- //
pViewData ( NULL ),
pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 307d9b2..3097c1a 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -93,15 +93,12 @@ public:
void CompleteSelectionChanged(sal_Bool bNewState);
virtual void LostFocus();
-
virtual void GotFocus();
void BoundingBoxChanged();
-
void VisAreaChanged();
///===== SfxListener =====================================================
-
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
///===== XAccessibleTable ================================================
@@ -286,7 +283,6 @@ private:
Rectangle GetVisCells(const Rectangle& rVisArea);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index b06afe0..ceba5b4 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -29,10 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-// System - Includes ---------------------------------------------------------
-
-
-
#include <svl/undo.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/localedatawrapper.hxx>
@@ -41,8 +37,6 @@
#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
-// INCLUDE -------------------------------------------------------------------
-
#include "acredlin.hxx"
#include "global.hxx"
#include "reffact.hxx"
@@ -65,8 +59,6 @@
#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
-
-
#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
inline void EnableDisable( Window& rWin, BOOL bEnable )
@@ -84,7 +76,6 @@ inline void EnableDisable( Window& rWin, BOOL bEnable )
//============================================================================
// class ScRedlinData
//----------------------------------------------------------------------------
-
ScRedlinData::ScRedlinData()
:RedlinData()
{
@@ -109,7 +100,6 @@ ScRedlinData::~ScRedlinData()
bIsAcceptable=FALSE;
}
-
//============================================================================
// class ScAcceptChgDlg
//----------------------------------------------------------------------------
@@ -117,13 +107,10 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
ScViewData* ptrViewData)
: SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ),
- //
aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ),
- //
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
- //
aStrInsertCols ( ScResId( STR_INSERT_COLS)),
aStrInsertRows ( ScResId( STR_INSERT_ROWS)),
aStrInsertTabs ( ScResId( STR_INSERT_TABS)),
@@ -156,7 +143,6 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
// dialog is now only hidden, not deleted, on switching views,
// so there's no need to restore settings when reopening
-
MinSize=aAcceptChgCtr.GetMinSizePixel();
MinSize.Height()+=2;
MinSize.Width()+=2;
@@ -215,13 +201,9 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData)
{
pViewData=ptrViewData;
if(pViewData!=NULL)
- {
pDoc=ptrViewData->GetDocument();
- }
else
- {
pDoc=NULL;
- }
bNoSelection=FALSE;
bNeedsUpdate=FALSE;
@@ -290,9 +272,7 @@ void ScAcceptChgDlg::Init()
}
}
else
- {
pTPFilter->SelectedAuthorPos(0);
- }
pTPFilter->CheckRange(aChangeViewSet.HasRange());
@@ -331,23 +311,14 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType)
{
case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break;
-
case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break;
-
case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break;
-
case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break;
-
case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break;
-
case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break;
-
case SC_CAT_MOVE: pStr=&aStrMove;break;
-
case SC_CAT_CONTENT: pStr=&aStrContent;break;
-
case SC_CAT_REJECT: pStr=&aStrReject;break;
-
default: pStr=&aUnknown;break;
}
return pStr;
@@ -372,16 +343,10 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
aComment.EraseAllChars('\n');
if(eType==SC_CAT_CONTENT)
- {
if(!pScChangeAction->IsDialogParent())
- {
pScChangeAction->GetDescription( aDesc, pDoc, TRUE);
- }
- }
else
- {
pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete());
- }
if(aDesc.Len()>0)
{
@@ -404,9 +369,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
}
}
else
- {
bFlag=TRUE;
- }
}
return bFlag;
@@ -554,9 +517,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
}
}
else
- {
pEntry=pTheView->InsertEntry(aString,pNewData,pParent,nPos);
- }
return pEntry;
}
@@ -595,9 +556,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
}
}
else if(pScChangeAction->GetState()==eState && !bIsGenerated)
- {
bFlag=TRUE;
- }
}
if(bFlag)
@@ -847,9 +806,7 @@ void ScAcceptChgDlg::UpdateView()
{
pChanges=pDoc->GetChangeTrack();
if(pChanges!=NULL)
- {
pScChangeAction=pChanges->GetFirst();
- }
}
ScChangeActionTable ActionTable;
BOOL bTheFlag=FALSE;
@@ -888,9 +845,7 @@ void ScAcceptChgDlg::UpdateView()
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
- {
pParent->EnableChildsOnDemand(TRUE);
- }
else
{
BOOL bTestFlag=bHasFilterEntry;
@@ -929,9 +884,7 @@ void ScAcceptChgDlg::UpdateView()
SetPointer(Pointer(POINTER_ARROW));
SvLBoxEntry* pEntry=pTheView->First();
if(pEntry!=NULL)
- {
pTheView->Select(pEntry);
- }
}
//----------------------------------------------------------------------------
@@ -950,10 +903,8 @@ void ScAcceptChgDlg::Resize()
IMPL_LINK( ScAcceptChgDlg, MinSizeHandle, SvxAcceptChgCtr*, pCtr )
{
if(pCtr==&aAcceptChgCtr)
- {
if(!IsRollUp())
SetOutputSizePixel(MinSize);
- }
return 0;
}
@@ -1049,9 +1000,8 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
(ScChangeAction*) pEntryData->pData;
if(pScChangeAction->GetType()==SC_CAT_INSERT_TABS)
- {
pViewData->SetTabNo(0);
- }
+
pChanges->Reject(pScChangeAction);
}
pEntry = pTheView->NextSelected(pEntry);
@@ -1088,13 +1038,9 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
if(pScChangeAction->GetType()==SC_CAT_CONTENT)
{
if(pEntryData->nInfo==RD_SPECIAL_CONTENT)
- {
pChanges->SelectContent(pScChangeAction,TRUE);
- }
else
- {
pChanges->SelectContent(pScChangeAction);
- }
}
else
pChanges->Accept(pScChangeAction);
@@ -1127,12 +1073,9 @@ void ScAcceptChgDlg::RejectFiltered()
while(pScChangeAction!=NULL)
{
if(pScChangeAction->IsDialogRoot())
- {
if(IsValidAction(pScChangeAction))
- {
pChanges->Reject((ScChangeAction*)pScChangeAction);
- }
- }
+
pScChangeAction=pScChangeAction->GetPrev();
}
}
@@ -1143,19 +1086,14 @@ void ScAcceptChgDlg::AcceptFiltered()
const ScChangeAction* pScChangeAction=NULL;
if(pChanges!=NULL)
- {
pScChangeAction=pChanges->GetLast();
- }
while(pScChangeAction!=NULL)
{
if(pScChangeAction->IsDialogRoot())
- {
if(IsValidAction(pScChangeAction))
- {
pChanges->Accept((ScChangeAction*)pScChangeAction);
- }
- }
+
pScChangeAction=pScChangeAction->GetPrev();
}
}
@@ -1168,13 +1106,10 @@ IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG )
if(pChanges!=NULL)
{
if(pTPFilter->IsDate()||pTPFilter->IsAuthor()||pTPFilter->IsRange()||pTPFilter->IsComment())
- {
RejectFiltered();
- }
else
- {
pChanges->RejectAll();
- }
+
pViewData->SetTabNo(0);
ScDocShell* pDocSh=pViewData->GetDocShell();
@@ -1201,13 +1136,10 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG )
if(pChanges!=NULL)
{
if(pTPFilter->IsDate()||pTPFilter->IsAuthor()||pTPFilter->IsRange()||pTPFilter->IsComment())
- {
AcceptFiltered();
- }
else
- {
pChanges->AcceptAll();
- }
+
ScDocShell* pDocSh=pViewData->GetDocShell();
pDocSh->PostPaintExtras();
pDocSh->PostPaintGridAll();
@@ -1224,9 +1156,8 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG )
IMPL_LINK( ScAcceptChgDlg, SelectHandle, SvxRedlinTable*, EMPTYARG )
{
if(!bNoSelection)
- {
aSelectionTimer.Start();
- }
+
bNoSelection=FALSE;
return 0;
}
@@ -1242,22 +1173,17 @@ void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction,
{
ScRedlinData *pParentData=(ScRedlinData *)(pParent->GetUserData());
ScChangeAction* pParentAction=(ScChangeAction*) pParentData->pData;
+
if(pParentAction!=pScChangeAction)
- {
pChanges->GetDependents((ScChangeAction*) pScChangeAction,
aActionTable,pScChangeAction->IsMasterDelete());
- }
else
- {
pChanges->GetDependents((ScChangeAction*) pScChangeAction,
aActionTable);
- }
}
else
- {
pChanges->GetDependents((ScChangeAction*) pScChangeAction,
aActionTable,pScChangeAction->IsMasterDelete());
- }
}
BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
@@ -1343,16 +1269,12 @@ BOOL ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
String aString=pTheView->GetEntryText( pParent);
String a2String=aString.Copy(0,aStrAllAccepted.Len());
if(a2String==aStrAllAccepted)
- {
eState=SC_CAS_ACCEPTED;
- }
else
{
a2String=aString.Copy(0,aStrAllRejected.Len());
if(a2String==aStrAllRejected)
- {
eState=SC_CAS_REJECTED;
- }
}
ScChangeAction* pScChangeAction=pChanges->GetFirst();
@@ -1386,11 +1308,7 @@ BOOL ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry*
pEntryData->bDisabled=TRUE;
if(pChild->IsDialogParent())
- {
-
- //pEntry->EnableChildsOnDemand(TRUE);
Expand(pChanges,pChild,pEntry);
- }
}
pChild=pActionTable->Next();
}
@@ -1421,18 +1339,9 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
pEntryData->bDisabled=TRUE;
bTheTestFlag=FALSE;
+
if ( pChild->IsDialogParent() )
- {
Expand(pChanges,pChild,pEntry);
- /*
- pChanges->GetDependents((ScChangeAction*) pChild,aDelActionTable);
- if(aDelActionTable.First()!=NULL)
- {
- pEntry->EnableChildsOnDemand(TRUE);
- }
- aDelActionTable.Clear();
- */
- }
}
pChild=pActionTable->Next();
}
@@ -1491,9 +1400,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
{
ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
if(pEntryData!=NULL)
- {
pScChangeAction=(ScChangeAction*) pEntryData->pData;
- }
if(pEntry->HasChildsOnDemand())
{
@@ -1602,9 +1509,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction,
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
- {
pParent->EnableChildsOnDemand(TRUE);
- }
else
{
BOOL bTestFlag=bHasFilterEntry;
@@ -1644,14 +1549,10 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
ULONG nAction=0;
if(pEntryData!=NULL)
- {
nAction=pEntryData->nActionNo;
- }
if(nAction>=nStartAction && nAction<=nEndAction)
- {
pTheView->SetCurEntry(pTheView->GetModel()->GetEntry(0));
- }
BOOL bRemove=FALSE;
@@ -1672,10 +1573,8 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
SvLBoxEntry* pPrevEntry = pTheView->Prev(pEntry);
if(bRemove)
- {
- //delete pEntryData;
pTheView->RemoveEntry(pEntry);
- }
+
pEntry=pPrevEntry;
}
pTheView->SetUpdateMode(TRUE);
@@ -1872,10 +1771,9 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG )
aPopup.CheckItem(nItemId);
PopupMenu *pSubMenu = aPopup.GetPopupMenu(SC_SUB_SORT);
+
if (pSubMenu)
- {
pSubMenu->CheckItem(nItemId);
- }
}
aPopup.EnableItem(SC_CHANGES_COMMENT,FALSE);
@@ -2045,13 +1943,10 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
if(pLeftData!=NULL && pRightData!=NULL)
{
if(pLeftData->aDateTime < pRightData->aDateTime)
- {
eCompare=COMPARE_LESS;
- }
else if(pLeftData->aDateTime > pRightData->aDateTime)
- {
eCompare=COMPARE_GREATER;
- }
+
return eCompare;
}
}
@@ -2065,25 +1960,17 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
eCompare=COMPARE_GREATER;
if(pLeftData->nTable < pRightData->nTable)
- {
eCompare=COMPARE_LESS;
- }
else if(pLeftData->nTable == pRightData->nTable)
{
if(pLeftData->nRow < pRightData->nRow)
- {
eCompare=COMPARE_LESS;
- }
else if(pLeftData->nRow == pRightData->nRow)
{
if(pLeftData->nCol < pRightData->nCol)
- {
eCompare=COMPARE_LESS;
- }
else if(pLeftData->nCol == pRightData->nCol)
- {
eCompare=COMPARE_EQUAL;
- }
}
}
More information about the Libreoffice-commits
mailing list