[Libreoffice-commits] .: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx                  |   17 +----------------
 sc/source/core/data/dpglobal.cxx     |    1 +
 sc/source/core/data/dptablecache.cxx |    1 +
 sc/source/ui/docshell/docsh.cxx      |    2 +-
 4 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit ff722e6a4bd04f0646fec0b09c50f40ed267806e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Nov 15 22:45:06 2010 -0500

    Reduced unnecessary header includes in the document.hxx.
    
    document.hxx is included in lots and lots of source files, so we
    shouldn't add #include <header.hxx> in this file unless it's
    really, really, necessary.  IOW, don't do it.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cc12f27..5298a07 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -46,13 +46,7 @@
 #include <memory>
 #include <map>
 #include <set>
-
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include <list>
-#include "dpobject.hxx"
-#include "dptabdat.hxx"
-// End Comments
 
 class KeyEvent;
 class OutputDevice;
@@ -152,6 +146,7 @@ class ScRowBreakIterator;
 struct ScSetStringParam;
 class ScDocRowHeightUpdater;
 struct ScColWidthParam;
+class ScDPTableDataCache;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -215,15 +210,6 @@ struct ScCopyBlockFromClipParams
     BOOL		bSkipAttrForEmpty;
 };
 
-
-// for loading of binary file format symbol string cells which need font conversion
-struct ScSymbolStringCellEntry
-{
-    ScStringCell*   pCell;
-    SCROW           nRow;
-};
-
-
 // -----------------------------------------------------------------------
 
 // DDE link modes
@@ -232,7 +218,6 @@ const BYTE SC_DDE_ENGLISH       = 1;
 const BYTE SC_DDE_TEXT          = 2;
 const BYTE SC_DDE_IGNOREMODE    = 255;       /// For usage in FindDdeLink() only!
 
-
 // -----------------------------------------------------------------------
 
 class ScDocument
diff --git a/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx
index 65039b4..f4a41de 100644
--- a/sc/source/core/data/dpglobal.cxx
+++ b/sc/source/core/data/dpglobal.cxx
@@ -35,6 +35,7 @@
 
 #include "dpglobal.hxx"
 #include "document.hxx"
+#include "dpobject.hxx"
 
 #include <stdio.h>
 
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 028b8ea..b9cdbe8 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -41,6 +41,7 @@
 #include <rtl/math.hxx>
 #include "queryparam.hxx"
 #include "dpglobal.hxx"
+#include "dptabdat.hxx"
 
 #include "docoptio.hxx"
 #include <unotools/textsearch.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index adefdb9..18019b6 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -137,7 +137,7 @@
 #include <comphelper/processfactory.hxx>
 #include "uiitems.hxx"
 #include "cellsuno.hxx"
-
+#include "dpobject.hxx"
 
 #include <vector>
 #include <boost/shared_ptr.hpp>