summaryrefslogtreecommitdiff
path: root/sc/inc/consoli.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:32 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:32 +0200
commitc9ac7489ec5fd4652f0cff09722561ba5a27bcda (patch)
treee9fb41b01f699d5a4202e719d5dc7e087fa701c1 /sc/inc/consoli.hxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:15 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 2df81fdef39f29be15dc0a6e12031916de963f08 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 9ce94f52e8c404a5e19154d38c18a44281d961f0 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 1e03f54cc4f8939867869a3570f56d0645b515f5 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:36 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'sc/inc/consoli.hxx')
-rw-r--r--sc/inc/consoli.hxx112
1 files changed, 56 insertions, 56 deletions
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 70de0f8f3dd8..a9edc481d27c 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.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
@@ -36,97 +36,97 @@ class ScDocument;
// -----------------------------------------------------------------------
-struct ScReferenceEntry // ohne Constructor !
+struct ScReferenceEntry // ohne Constructor !
{
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
};
-//! Delta-Wert fuer Daten benutzen?
+//! Delta-Wert fuer Daten benutzen?
-class ScReferenceList // ohne Constructor !
+class ScReferenceList // ohne Constructor !
{
private:
- SCSIZE nCount;
- SCSIZE nFullSize; // inkl. Fuell-Eintraege
- ScReferenceEntry* pData;
+ SCSIZE nCount;
+ SCSIZE nFullSize; // inkl. Fuell-Eintraege
+ ScReferenceEntry* pData;
public:
- void Init() { nCount=0; nFullSize=0; pData=NULL; }
- void Clear() { delete[] pData; }
+ void Init() { nCount=0; nFullSize=0; pData=NULL; }
+ void Clear() { delete[] pData; }
- SCSIZE GetCount() { return nCount; }
- const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; }
- void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; }
+ SCSIZE GetCount() { return nCount; }
+ const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; }
+ void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; }
- void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab );
+ void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab );
};
// -----------------------------------------------------------------------
//
-// Reihenfolge:
-// 1) ScConsData anlegen
-// 2) Parameter (Size/Flags)
-// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName)
-// 4) DoneFields ( " " )
-// 5) AddData fuer alle Bereiche
-// evtl. AddName nach jedem Bereich
-// 6) OutputToDocument
+// Reihenfolge:
+// 1) ScConsData anlegen
+// 2) Parameter (Size/Flags)
+// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName)
+// 4) DoneFields ( " " )
+// 5) AddData fuer alle Bereiche
+// evtl. AddName nach jedem Bereich
+// 6) OutputToDocument
//
-//! ab bestimmter Groesse ScDocument Struktur benutzen?
+//! ab bestimmter Groesse ScDocument Struktur benutzen?
class ScConsData
{
private:
- ScSubTotalFunc eFunction;
- BOOL bReference;
- BOOL bColByName;
- BOOL bRowByName;
- BOOL bSubTitles;
- SCSIZE nColCount;
- SCSIZE nRowCount;
- BOOL** ppUsed;
- double** ppSum;
- double** ppCount;
- double** ppSumSqr;
- ScReferenceList** ppRefs;
- String** ppColHeaders;
- String** ppRowHeaders;
- SCSIZE nDataCount;
- SCSIZE nTitleCount;
- String** ppTitles;
- SCSIZE** ppTitlePos;
- BOOL bCornerUsed;
- String aCornerText; // nur bei bColByName && bRowByName
+ ScSubTotalFunc eFunction;
+ BOOL bReference;
+ BOOL bColByName;
+ BOOL bRowByName;
+ BOOL bSubTitles;
+ SCSIZE nColCount;
+ SCSIZE nRowCount;
+ BOOL** ppUsed;
+ double** ppSum;
+ double** ppCount;
+ double** ppSumSqr;
+ ScReferenceList** ppRefs;
+ String** ppColHeaders;
+ String** ppRowHeaders;
+ SCSIZE nDataCount;
+ SCSIZE nTitleCount;
+ String** ppTitles;
+ SCSIZE** ppTitlePos;
+ BOOL bCornerUsed;
+ String aCornerText; // nur bei bColByName && bRowByName
public:
ScConsData();
~ScConsData();
- void SetSize( SCCOL nCols, SCROW nRows );
- void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef );
+ void SetSize( SCCOL nCols, SCROW nRows );
+ void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef );
- void InitData(BOOL bDelete=TRUE);
- void DeleteData();
+ void InitData(BOOL bDelete=TRUE);
+ void DeleteData();
- void AddFields( ScDocument* pSrcDoc, SCTAB nTab,
+ void AddFields( ScDocument* pSrcDoc, SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
- void DoneFields();
+ void DoneFields();
- void AddData( ScDocument* pSrcDoc, SCTAB nTab,
+ void AddData( ScDocument* pSrcDoc, SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
- void AddName( const String& rName );
+ void AddName( const String& rName );
- void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab );
+ void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab );
- void GetSize( SCCOL& rCols, SCROW& rRows ) const;
- SCROW GetInsertCount() const;
+ void GetSize( SCCOL& rCols, SCROW& rRows ) const;
+ SCROW GetInsertCount() const;
};