summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/tpsubt.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /sc/source/ui/inc/tpsubt.hxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/source/ui/inc/tpsubt.hxx')
-rw-r--r--sc/source/ui/inc/tpsubt.hxx132
1 files changed, 66 insertions, 66 deletions
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 1a2bd22c4a5b..99efeb57b694 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
//------------------------------------------------------------------------
// +1 because one field is reserved for the "- none -" entry
-#define SC_MAXFIELDS MAXCOLCOUNT+1
+#define SC_MAXFIELDS MAXCOLCOUNT+1
class ScViewData;
class ScDocument;
@@ -54,35 +54,35 @@ protected:
public:
virtual ~ScTpSubTotalGroup();
- static USHORT* GetRanges ();
- BOOL DoReset ( USHORT nGroupNo,
- const SfxItemSet& rArgSet );
- BOOL DoFillItemSet ( USHORT nGroupNo,
- SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ BOOL DoReset ( USHORT nGroupNo,
+ const SfxItemSet& rArgSet );
+ BOOL DoFillItemSet ( USHORT nGroupNo,
+ SfxItemSet& rArgSet );
protected:
- FixedText aFtGroup;
- ListBox aLbGroup;
- FixedText aFtColumns;
- SvxCheckListBox aLbColumns;
- FixedText aFtFunctions;
- ListBox aLbFunctions;
- const String aStrNone;
- const String aStrColumn;
-
- ScViewData* pViewData;
- ScDocument* pDoc;
-
- const USHORT nWhichSubTotals;
- const ScSubTotalParam& rSubTotalData;
- SCCOL nFieldArr[SC_MAXFIELDS];
- const USHORT nFieldCount;
+ FixedText aFtGroup;
+ ListBox aLbGroup;
+ FixedText aFtColumns;
+ SvxCheckListBox aLbColumns;
+ FixedText aFtFunctions;
+ ListBox aLbFunctions;
+ const String aStrNone;
+ const String aStrColumn;
+
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+
+ const USHORT nWhichSubTotals;
+ const ScSubTotalParam& rSubTotalData;
+ SCCOL nFieldArr[SC_MAXFIELDS];
+ const USHORT nFieldCount;
private:
- void Init ();
- void FillListBoxes ();
- ScSubTotalFunc LbPosToFunc ( USHORT nPos );
- USHORT FuncToLbPos ( ScSubTotalFunc eFunc );
- USHORT GetFieldSelPos ( SCCOL nField );
+ void Init ();
+ void FillListBoxes ();
+ ScSubTotalFunc LbPosToFunc ( USHORT nPos );
+ USHORT FuncToLbPos ( ScSubTotalFunc eFunc );
+ USHORT GetFieldSelPos ( SCCOL nField );
// Handler ------------------------
DECL_LINK( SelectHdl, ListBox * );
@@ -94,16 +94,16 @@ private:
class ScTpSubTotalGroup1 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup1( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup1( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup1();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//------------------------------------------------------------------------
@@ -111,16 +111,16 @@ public:
class ScTpSubTotalGroup2 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup2( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup2( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup2();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//------------------------------------------------------------------------
@@ -128,16 +128,16 @@ public:
class ScTpSubTotalGroup3 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup3( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup3( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup3();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//========================================================================
@@ -146,38 +146,38 @@ public:
class ScTpSubTotalOptions : public SfxTabPage
{
protected:
- ScTpSubTotalOptions( Window* pParent,
+ ScTpSubTotalOptions( Window* pParent,
const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalOptions();
- static USHORT* GetRanges ();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
private:
FixedLine aFlGroup;
- CheckBox aBtnPagebreak;
- CheckBox aBtnCase;
- CheckBox aBtnSort;
+ CheckBox aBtnPagebreak;
+ CheckBox aBtnCase;
+ CheckBox aBtnSort;
FixedLine aFlSort;
- RadioButton aBtnAscending;
- RadioButton aBtnDescending;
- CheckBox aBtnFormats;
- CheckBox aBtnUserDef;
- ListBox aLbUserDef;
+ RadioButton aBtnAscending;
+ RadioButton aBtnDescending;
+ CheckBox aBtnFormats;
+ CheckBox aBtnUserDef;
+ ListBox aLbUserDef;
- ScViewData* pViewData;
- ScDocument* pDoc;
- const USHORT nWhichSubTotals;
- const ScSubTotalParam& rSubTotalData;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ const USHORT nWhichSubTotals;
+ const ScSubTotalParam& rSubTotalData;
private:
- void Init ();
- void FillUserSortListBox ();
+ void Init ();
+ void FillUserSortListBox ();
// Handler ------------------------
DECL_LINK( CheckHdl, CheckBox * );