summaryrefslogtreecommitdiff
path: root/sc/inc/dptabdat.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/inc/dptabdat.hxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 737b6a92adca9a8285370918671b93b56a028537 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:21 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 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. commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e Author: Jani Monoses <jani.monoses@canonical.com> Date: Thu Jan 27 15:33:06 2011 +0200 Remove unused declaration Signed-off-by: Michael Meeks <michael.meeks@novell.com> sc/source/core/tool/token.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 96bee1507119ca0525845022019d90f0694996aa Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 20 23:44:52 2011 -0500 Fixed incorrect page number in page preview mode. (fdo#33155) When the window is large enough to show several 'Page X' strings, the page number was not properly incremented. This commit fixes it. sc/source/ui/view/gridwin4.cxx | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83 Author: Kohei Yoshida <kyoshida@novell.com> Date: Wed Jan 19 00:24:24 2011 -0500 Fixed incorrect import of cell attributes from Excel documents. When a cell with non-default formatting attribute starts with non-first row in a column, the filter would incorrectly apply the same format to all the cells above it if they didn't have any formats. This commit fixes it. sc/source/filter/excel/xistyle.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit af63319fcdeea3f9b5018eab83ef5a9e64905446 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 5ada5635cff38af87830b091b36159cf80e4cf5d 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 c900e3db767518b7a60eaf24bdf298c94315f685 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 15d298ba7c4e89b043b3077e17747ba027a62c43 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 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.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/inc/dptabdat.hxx')
-rw-r--r--sc/inc/dptabdat.hxx88
1 files changed, 44 insertions, 44 deletions
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 89a9deb8efd3..a8324a3490fb 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.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
@@ -50,40 +50,40 @@ namespace com { namespace sun { namespace star { namespace sheet {
// -----------------------------------------------------------------------
-#define SC_DAPI_DATE_HIERARCHIES 3
+#define SC_DAPI_DATE_HIERARCHIES 3
-#define SC_DAPI_HIERARCHY_FLAT 0
-#define SC_DAPI_HIERARCHY_QUARTER 1
-#define SC_DAPI_HIERARCHY_WEEK 2
+#define SC_DAPI_HIERARCHY_FLAT 0
+#define SC_DAPI_HIERARCHY_QUARTER 1
+#define SC_DAPI_HIERARCHY_WEEK 2
-#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates
-#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy
-#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy
+#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates
+#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy
+#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy
-#define SC_DAPI_LEVEL_YEAR 0
-#define SC_DAPI_LEVEL_QUARTER 1
-#define SC_DAPI_LEVEL_MONTH 2
-#define SC_DAPI_LEVEL_DAY 3
-#define SC_DAPI_LEVEL_WEEK 1
-#define SC_DAPI_LEVEL_WEEKDAY 2
+#define SC_DAPI_LEVEL_YEAR 0
+#define SC_DAPI_LEVEL_QUARTER 1
+#define SC_DAPI_LEVEL_MONTH 2
+#define SC_DAPI_LEVEL_DAY 3
+#define SC_DAPI_LEVEL_WEEK 1
+#define SC_DAPI_LEVEL_WEEKDAY 2
// --------------------------------------------------------------------
//
-// base class ScDPTableData to allow implementation with tabular data
-// by deriving only of this
+// base class ScDPTableData to allow implementation with tabular data
+// by deriving only of this
//
-#define SC_VALTYPE_EMPTY 0
-#define SC_VALTYPE_VALUE 1
-#define SC_VALTYPE_STRING 2
-#define SC_VALTYPE_ERROR 3
+#define SC_VALTYPE_EMPTY 0
+#define SC_VALTYPE_VALUE 1
+#define SC_VALTYPE_STRING 2
+#define SC_VALTYPE_ERROR 3
struct ScDPValueData
{
- double fValue;
- BYTE nType;
+ double fValue;
+ BYTE nType;
- void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; }
+ void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; }
};
class ScDPResultMember;
@@ -95,11 +95,11 @@ class ScDocument;
class SC_DLLPUBLIC ScDPTableData
{
- // cached data for GetDatePart
- long nLastDateVal;
- long nLastHier;
- long nLastLevel;
- long nLastRet;
+ // cached data for GetDatePart
+ long nLastDateVal;
+ long nLastHier;
+ long nLastLevel;
+ long nLastRet;
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
long mnCacheId;
@@ -134,26 +134,26 @@ public:
// DataPilot Migration - Cache&&Performance
ScDPTableData(ScDocument* pDoc, long nCacheId );
// End Comments
- virtual ~ScDPTableData();
+ virtual ~ScDPTableData();
- long GetDatePart( long nDateVal, long nHierarchy, long nLevel );
+ long GetDatePart( long nDateVal, long nHierarchy, long nLevel );
- //! use (new) typed collection instead of ScStrCollection
- //! or separate Str and ValueCollection
+ //! use (new) typed collection instead of ScStrCollection
+ //! or separate Str and ValueCollection
- virtual long GetColumnCount() = 0;
+ virtual long GetColumnCount() = 0;
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
long GetCacheId() const;
// End Comments
- virtual String getDimensionName(long nColumn) = 0;
- virtual BOOL getIsDataLayoutDimension(long nColumn) = 0;
- virtual BOOL IsDateDimension(long nDim) = 0;
- virtual ULONG GetNumberFormat(long nDim);
- virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset );
- virtual void DisposeData() = 0;
- virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0;
+ virtual String getDimensionName(long nColumn) = 0;
+ virtual BOOL getIsDataLayoutDimension(long nColumn) = 0;
+ virtual BOOL IsDateDimension(long nDim) = 0;
+ virtual ULONG GetNumberFormat(long nDim);
+ virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset );
+ virtual void DisposeData() = 0;
+ virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0;
virtual bool IsRepeatIfEmpty();
@@ -180,8 +180,8 @@ public:
virtual const ScDPItemData* GetMemberByIndex( long nDim, long nIndex );
virtual const ScDPItemData* GetMemberById( long nDim, long nId);
virtual SCROW GetIdOfItemData( long nDim, const ScDPItemData& rData );
- virtual long GetSourceDim( long nDim );
- virtual long Compare( long nDim, long nDataId1, long nDataId2);
+ virtual long GetSourceDim( long nDim );
+ virtual long Compare( long nDim, long nDataId1, long nDataId2);
// End Comments
protected:
/** This structure stores vector arrays that hold intermediate data for
@@ -193,7 +193,7 @@ protected:
::std::vector< SCROW > aColData;
::std::vector< SCROW > aRowData;
::std::vector< SCROW > aPageData;
- // End Comments
+ // End Comments
::std::vector<ScDPValueData> aValues;
};
@@ -204,7 +204,7 @@ protected:
private:
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
- void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow,
+ void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow,
const ::std::vector<long>& rDims, ::std::vector< SCROW >& rItemData);
// End Comments
};