[Libreoffice-commits] core.git: basic/source cui/source forms/source writerfilter/inc writerfilter/source

[Alexandre Vicenzi]

 basic/source/inc/buffer.hxx                       |    2 +-
 basic/source/inc/filefmt.hxx                      |    2 --
 cui/source/inc/scriptdlg.hxx                      |    7 ++-----
 forms/source/richtext/rtattributes.hxx            |   16 ----------------
 writerfilter/inc/pch/precompiled_writerfilter.hxx |    1 -
 writerfilter/source/filter/RtfFilter.cxx          |    1 -
 6 files changed, 3 insertions(+), 26 deletions(-)

New commits:
commit 25d089e09d94a86c615bf641d59846a65323e495
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date:   Wed Jan 29 20:12:12 2014 -0200

    fdo#63154 Removed unused solar.h ref. in basic, cui, forms and writerfilter.
    
    Change-Id: I09cca73d8d77af259965e74e1b29a88aa5c315ab
    Reviewed-on: https://gerrit.libreoffice.org/7731
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index d210361..839af85 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 2c3b287..9b294a8 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 394462f..89db028 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 d0c96af..4ad754f 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 651506d..8a05443 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 6fdd827..6c0242b 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>