sd/inc/glob.hxx | 7 +------
sd/inc/sdmod.hxx | 29 ++++++++++++-----------------
sd/source/filter/eppt/eppt.hxx | 5 -----
sd/source/filter/eppt/epptdef.hxx | 2 --
sd/source/filter/ppt/propread.hxx | 8 --------
sd/source/ui/app/sdresid.cxx | 9 ++-------
sd/source/ui/inc/AnimationChildWindow.hxx | 2 +-
sd/source/ui/inc/ViewClipboard.hxx | 2 +-
sd/source/ui/inc/assclass.hxx | 1 -
sd/source/ui/sidebar/DocumentHelper.hxx | 1 -
10 files changed, 17 insertions(+), 49 deletions(-)
New commits:
commit d024fe60dcb402e7ed8c8fa0ef623176f03c62c0
Author: Alexandre Vicenzi <vicenzi.alexan...@gmail.com>
Date: Fri Feb 14 22:36:19 2014 -0200
fdo#63154 Remove unused solar.h reference in sd.
Change-Id: I3dca2ffe3f94bedfea954bd83e84c724fb564ec9
Reviewed-on: https://gerrit.libreoffice.org/8063
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza....@gmail.com>
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 4261774..7f19f42 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -20,11 +20,8 @@
#ifndef INCLUDED_SD_INC_GLOB_HXX
#define INCLUDED_SD_INC_GLOB_HXX
-#include <tools/solar.h>
-
#include <rsc/rscsfx.hxx>
-
-//------------------------------------------------------------------
+#include <sal/types.h>
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1
@@ -83,8 +80,6 @@ const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+
#define SD_OPTION_MORPHING "Morph"
#define SD_OPTION_VECTORIZE "Vectorize"
-//------------------------------------------------------------------
-
#endif // _ INCLUDED_SD_INC_GLOB_HXX
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 4b37b4a..518f086 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/text/WritingMode.hpp>
#include <sfx2/module.hxx>
#include <vcl/vclevent.hxx>
-
+#include <sal/types.h>
#include <memory>
class SdOptions;
@@ -52,28 +52,23 @@ namespace com { namespace sun { namespace star { namespace
frame {
class XFrame;
} } } }
-
-// ----------------------
-// - SdOptionStreamMode -
-// ----------------------
-
enum SdOptionStreamMode
{
SD_OPTION_LOAD = 0,
SD_OPTION_STORE = 1
};
-/*************************************************************************
-|*
-|* This subclass of <SfxModule> (which is a subclass of <SfxShell>) is
-|* linked to the DLL. One instance of this class exists while the DLL is
-|* loaded.
-|*
-|* SdModule is like to be compared with the <SfxApplication>-subclass.
-|*
-|* Remember: Don`t export this class! It uses DLL-internal symbols.
-|*
-\************************************************************************/
+/*
+
+ This subclass of <SfxModule> (which is a subclass of <SfxShell>) is
+ linked to the DLL. One instance of this class exists while the DLL is
+ loaded.
+
+ SdModule is like to be compared with the <SfxApplication>-subclass.
+
+ Remember: Don`t export this class! It uses DLL-internal symbols.
+
+*/
class SdModule : public SfxModule, public SfxListener
{
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 8f9054b..d36957d 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include "escherex.hxx"
#include <sal/types.h>
-#include <tools/solar.h>
#include <sot/storage.hxx>
#include <vcl/graph.hxx>
#include <unotools/fontcvt.hxx>
@@ -31,8 +30,6 @@
#include "text.hxx"
-// ------------------------------------------------------------------------
-
#include <vcl/mapmod.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/frame/XModel.hpp>
@@ -156,8 +153,6 @@ public:
void WriteTextSpecInfo( SvStream* pStrm );
};
-// ------------------------------------------------------------------------
-
struct CellBorder;
class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
{
diff --git a/sd/source/filter/eppt/epptdef.hxx
b/sd/source/filter/eppt/epptdef.hxx
index 73cebe4..fbe824c 100644
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
#define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
-#include <tools/solar.h>
-
#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record
// header takes on this value, the
// record header marks the start of
diff --git a/sd/source/filter/ppt/propread.hxx
b/sd/source/filter/ppt/propread.hxx
index 0325a8f..c5f6512 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -24,7 +24,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <sal/types.h>
-#include <tools/solar.h>
#include <sot/storage.hxx>
#include <tools/stream.hxx>
@@ -96,8 +95,6 @@
#define VT_BYREF 0x4000
#define VT_TYPEMASK 0xFFF
-// ------------------------------------------------------------------------
-
typedef std::map<OUString,sal_uInt32> Dictionary;
struct PropEntry
@@ -129,8 +126,6 @@ class PropItem : public SvMemoryStream
using SvStream::Read;
};
-// ------------------------------------------------------------------------
-
class Section
{
sal_uInt16 mnTextEnc;
@@ -153,8 +148,6 @@ class Section
void Read( SvStorageStream* pStrm );
};
-// ------------------------------------------------------------------------
-
class PropRead
{
sal_Bool mbStatus;
@@ -178,7 +171,6 @@ class PropRead
void Read();
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx
index 84cd125..f8df3db 100644
--- a/sd/source/ui/app/sdresid.cxx
+++ b/sd/source/ui/app/sdresid.cxx
@@ -20,14 +20,9 @@
#include "sdmod.hxx"
#include "sdresid.hxx"
+#include <sal/types.h>
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
+// Ctor
SdResId::SdResId(sal_uInt16 nId) :
ResId(nId, *SD_MOD()->GetResMgr())
{
diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx
b/sd/source/ui/inc/AnimationChildWindow.hxx
index 9951a4f..0d215fd 100644
--- a/sd/source/ui/inc/AnimationChildWindow.hxx
+++ b/sd/source/ui/inc/AnimationChildWindow.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_ANIMATIONCHILDWINDOW_HXX
#define INCLUDED_SD_SOURCE_UI_INC_ANIMATIONCHILDWINDOW_HXX
-#include <tools/solar.h>
#include <sfx2/childwin.hxx>
+#include <sal/types.h>
class Window;
class SfxBindings;
diff --git a/sd/source/ui/inc/ViewClipboard.hxx
b/sd/source/ui/inc/ViewClipboard.hxx
index 6c82609..90a6938 100644
--- a/sd/source/ui/inc/ViewClipboard.hxx
+++ b/sd/source/ui/inc/ViewClipboard.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_VIEWCLIPBOARD_HXX
#define INCLUDED_SD_SOURCE_UI_INC_VIEWCLIPBOARD_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
class SdPage;
class SdTransferable;
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index 66b984e..c8bd309 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -23,7 +23,6 @@
#include <vector>
#include <boost/scoped_array.hpp>
-#include <tools/solar.h>
#include "sddllapi.h"
#define MAX_PAGES 10
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx
b/sd/source/ui/sidebar/DocumentHelper.hxx
index 53c2b10..c243127 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_DOCUMENTHELPER_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_DOCUMENTHELPER_HXX
-#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <boost/shared_ptr.hpp>
#include <vector>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
