mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63154 Remove unused solar.h reference in sd.

Browse Source 
Change-Id: I3dca2ffe3f94bedfea954bd83e84c724fb564ec9
Reviewed-on: https://gerrit.libreoffice.org/8063
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
This commit is contained in:
Alexandre Vicenzi 2014-02-14 22:36:19 -02:00 committed by Marcos Souza
parent 9a5ce676ed
commit d024fe60dc
10 changed files with 17 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sd/inc/glob.hxx
View File

@ -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

29
sd/inc/sdmod.hxx
View File

@ -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
{

5
sd/source/filter/eppt/eppt.hxx
View File

@ -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
{

2
sd/source/filter/eppt/epptdef.hxx
View File

@ -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

8
sd/source/filter/ppt/propread.hxx
View File

@ -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: */

9
sd/source/ui/app/sdresid.cxx
View File

@ -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())
{

2
sd/source/ui/inc/AnimationChildWindow.hxx
View File

@ -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;

2
sd/source/ui/inc/ViewClipboard.hxx
View File

@ -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;

1
sd/source/ui/inc/assclass.hxx
View File

@ -23,7 +23,6 @@
#include <vector>
#include <boost/scoped_array.hpp>
#include <tools/solar.h>
#include "sddllapi.h"
#define MAX_PAGES 10

1
sd/source/ui/sidebar/DocumentHelper.hxx
View File

@ -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>