diff options
| -rw-r--r-- | basic/source/inc/buffer.hxx | 2 | ||||
| -rw-r--r-- | basic/source/inc/filefmt.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 7 | ||||
| -rw-r--r-- | forms/source/richtext/rtattributes.hxx | 16 | ||||
| -rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 1 |
6 files changed, 3 insertions, 26 deletions
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx index d210361d2a4d..839af8543821 100644 --- a/basic/source/inc/buffer.hxx +++ b/basic/source/inc/buffer.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX #define INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX + #include <rtl/ustring.hxx> -#include <tools/solar.h> class SbiParser; diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx index 2c3b2874ffe5..9b294a8c2028 100644 --- a/basic/source/inc/filefmt.hxx +++ b/basic/source/inc/filefmt.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX #define INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX -#include <tools/solar.h> - class SvStream; // Version 2: data type of the return value for publics diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 394462f4e4d9..89db028fed58 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -21,9 +21,6 @@ #define INCLUDED_CUI_SOURCE_INC_SCRIPTDLG_HXX #include <memory> - -#include "tools/solar.h" - #include <svtools/treelistbox.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> @@ -39,8 +36,8 @@ #define OBJTYPE_BASICMANAGER 1L #define OBJTYPE_METHOD 2L -#define OBJTYPE_SCRIPTCONTAINER 3L -#define OBJTYPE_SFROOT 4L +#define OBJTYPE_SCRIPTCONTAINER 3L +#define OBJTYPE_SFROOT 4L #define INPUTMODE_NEWLIB 1 #define INPUTMODE_NEWMACRO 2 diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index d0c96af82ad3..4ad754f18344 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -20,16 +20,12 @@ #ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX #define INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX -#include <tools/solar.h> #include <sal/types.h> #include <svl/poolitem.hxx> namespace frm { - //==================================================================== - //= misc - //==================================================================== /// the id of an attribute typedef sal_Int32 AttributeId; /// the "which id" of an item in an SfxItemSet @@ -39,9 +35,6 @@ namespace frm /// a script type typedef sal_uInt16 ScriptType; - //==================================================================== - //= AttributeCheckState - //==================================================================== enum AttributeCheckState { eChecked, @@ -49,9 +42,6 @@ namespace frm eIndetermined }; - //==================================================================== - //= AttributeState - //==================================================================== struct AttributeState { private: @@ -73,9 +63,6 @@ namespace frm inline void setItem( const SfxPoolItem* _pItem ); }; - //==================================================================== - //= AttributeState (inline implementation) - //==================================================================== inline AttributeState::AttributeState( ) :pItemHandle( NULL ) ,eSimpleState( eIndetermined ) @@ -142,9 +129,6 @@ namespace frm return ( pItemHandle->GetItem() == _rRHS.pItemHandle->GetItem() ); } - //==================================================================== - //= IMultiAttributeDispatcher - //==================================================================== class IMultiAttributeDispatcher { public: diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 651506da1059..8a05443823c8 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -213,7 +213,6 @@ #include <tools/color.hxx> #include <tools/globname.hxx> #include <tools/resmgr.hxx> -#include <tools/solar.h> #include <tools/stream.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localfilehelper.hxx> diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 6fdd827b9c4b..6c0242ba0bcc 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -20,7 +20,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implementationentry.hxx> #include <osl/module.hxx> -#include <tools/solar.h> #include <RtfFilter.hxx> #include <unotools/mediadescriptor.hxx> #include <cppuhelper/supportsservice.hxx> |