summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-11-06 19:15:11 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-03-14 15:35:47 -0400
commitea33d30c4782fb7ea2aa4fd798f77be49f362e00 (patch)
tree03c56ed7bc046014c3857e892217ff90907ca6d2
parent7238505762a9198d92b108c794b43452191c5174 (diff)
Let's start using impl class for ScColumn.
No need to migrate the existing data members to it for now, but let's define new members in the impl class from now on. Change-Id: Idee66dae87beb4bb6efc9c7d7ffd658148ed887c
-rw-r--r--sc/inc/column.hxx3
-rw-r--r--sc/source/core/data/column.cxx16
2 files changed, 12 insertions, 7 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8653bfdbaa32..39f9753880b5 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -58,6 +58,7 @@ struct ScMergePatternState;
class ScFlatBoolRowSegments;
struct ScSetStringParam;
struct ScColWidthParam;
+struct ScColumnImpl;
struct ScNeededSizeOptions
{
@@ -79,6 +80,8 @@ struct ColEntry
class ScColumn
{
private:
+ ScColumnImpl* mpImpl;
+
SCCOL nCol;
SCTAB nTab;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d5d73c455b67..5ae9b8a8d487 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -30,16 +30,11 @@
#include "detfunc.hxx" // for Notes in Sort/Swap
#include "postit.hxx"
-#include <svl/poolcach.hxx>
-#include <svl/zforlist.hxx>
-#include <editeng/scripttypeitem.hxx>
-
-#include <cstring>
-#include <map>
-
using ::editeng::SvxBorderLine;
using namespace formula;
+namespace {
+
inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
{
//! move to a header file
@@ -49,12 +44,19 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
nScript != 0 );
}
+}
+
+struct ScColumnImpl
+{
+};
+
ScNeededSizeOptions::ScNeededSizeOptions() :
pPattern(NULL), bFormula(false), bSkipMerged(true), bGetFont(true), bTotalSize(false)
{
}
ScColumn::ScColumn() :
+ mpImpl(new ScColumnImpl),
nCol( 0 ),
pAttrArray( NULL ),
pDocument( NULL )