[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/cell.hxx                  |    1 -
 sc/inc/column.hxx                |    3 +++
 sc/inc/globalnames.hxx           |    2 ++
 sc/source/core/data/cell.cxx     |    1 +
 sc/source/core/data/column.cxx   |    1 +
 sc/source/core/data/column3.cxx  |    1 +
 sc/source/core/data/documen8.cxx |    1 +
 sc/source/core/data/table1.cxx   |    1 +
 sc/source/core/data/table5.cxx   |    1 +
 9 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit c8583e606c551fc8755cb4c7aea1d6855a5d7231
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Mar 13 23:55:48 2013 -0400

    Move TEXTWIDTH_DIRTH to globalnames.hxx.
    
    Change-Id: I648da6f2c43a10137c0834659022296883368dc9

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 5fbfb0b..214fa2d 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -38,7 +38,6 @@
 #include "scdllapi.h"
 
 #define USE_MEMPOOL
-#define TEXTWIDTH_DIRTY     0xffff
 
 // in addition to SCRIPTTYPE_... flags from scripttypeitem.hxx:
 // set (in nScriptType) if type has not been determined yet
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0a699d3..93ae44f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -84,6 +84,9 @@ class ScColumn
 {
     typedef mdds::multi_type_vector<mdds::mtv::element_block_func> TextWidthType;
 
+    // Only stores empty or unsigned short values.  Empty values correspond
+    // with empty cells. All non-empty cell positions must have unsigned short
+    // values; either the reall text widths or TEXTWIDTH_DIRTY.
     TextWidthType maTextWidths;
 
     SCCOL           nCol;
diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index 33ac520..4fee471 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -34,6 +34,8 @@
 
 #define STR_GLOBAL_RANGE_NAME "__Global_Range_Name__"
 
+#define TEXTWIDTH_DIRTY 0xffff
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index bc6367c..0b990a8 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -40,6 +40,7 @@
 #include "externalrefmgr.hxx"
 #include "macromgr.hxx"
 #include "dbdata.hxx"
+#include "globalnames.hxx"
 
 #include <editeng/editobj.hxx>
 #include <svl/intitem.hxx>
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 6082ed6..682afc6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -29,6 +29,7 @@
 #include "markdata.hxx"
 #include "detfunc.hxx"          // for Notes in Sort/Swap
 #include "postit.hxx"
+#include "globalnames.hxx"
 
 #include <svl/poolcach.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5054a81..57b5370 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -44,6 +44,7 @@
 #include "postit.hxx"
 #include "stringutil.hxx"
 #include "docpool.hxx"
+#include "globalnames.hxx"
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 9b9fecc..7c782f3 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -86,6 +86,7 @@
 #include "docuno.hxx"
 #include "scresid.hxx"
 #include "columniterator.hxx"
+#include "globalnames.hxx"
 
 #include <memory>
 #include <boost/scoped_ptr.hpp>
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index be34e51..b50380a 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -44,6 +44,7 @@
 #include "dbdata.hxx"
 #include "colorscale.hxx"
 #include "conditio.hxx"
+#include "globalnames.hxx"
 
 #include <vector>
 
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 355d2f1..1525371 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -37,6 +37,7 @@
 #include "globstr.hrc"
 #include "segmenttree.hxx"
 #include "columniterator.hxx"
+#include "globalnames.hxx"
 
 #include <com/sun/star/sheet/TablePageBreakData.hpp>