summaryrefslogtreecommitdiff
path: root/sc/source/core
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-02 03:39:26 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-02 03:39:26 +0100
commitd59b9c07c86c1dca84f5aa6e71f587dc321e8ddd (patch)
tree03d978c7182b004998acb81c0bb5b041659b25ee /sc/source/core
parent921fb226d2836673c1d3ef0f254708a5c5c0b313 (diff)
remove table.hxx from document.hxx
Diffstat (limited to 'sc/source/core')
-rw-r--r--sc/source/core/data/column.cxx4
-rw-r--r--sc/source/core/data/documen5.cxx1
-rw-r--r--sc/source/core/data/table2.cxx1
3 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10c3e5d427fa..9ae787b33986 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1302,8 +1302,8 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bM
// empty cell.
if (pNew->GetCellType() == CELLTYPE_STRING)
{
- String aStr = static_cast<ScStringCell*>(pNew)->GetString();
- if (aStr.Len() == 0)
+ rtl::OUString aStr = static_cast<ScStringCell*>(pNew)->GetString();
+ if (aStr.isEmpty())
// A string cell with empty string. Delete the cell itself.
rColumn.Delete(maItems[i].nRow);
else
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index bfb379f6f149..3cdade0807b2 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -48,6 +48,7 @@
#include <svx/svdpage.hxx>
#include "document.hxx"
+#include "table.hxx"
#include "drwlayer.hxx"
#include "chartarr.hxx"
#include "chartlis.hxx"
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 19fa5477885f..f058d0792a91 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -37,6 +37,7 @@
#include <svl/PasswordHelper.hxx>
#include <unotools/transliterationwrapper.hxx>
+#include "table.hxx"
#include "patattr.hxx"
#include "docpool.hxx"
#include "cell.hxx"