[Libreoffice-commits] core.git: editeng/source include/svl include/svx

[Stephan Bergmann]

 editeng/source/editeng/editattr.hxx   |    1 
 include/svl/poolitem.hxx              |   45 ++++++----------------------------
 include/svx/EnhancedCustomShape2d.hxx |    1 
 3 files changed, 11 insertions(+), 36 deletions(-)

New commits:
commit 5041d1548a9875da5c594e459a12fb3949312636
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 11 09:39:51 2015 +0200

    minor clean up
    
    Change-Id: Ib4fb12e187eb4bad7da04425328d1f5cdf851654

diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index fb210c6..d34d3c2 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -25,6 +25,7 @@
 
 #include <boost/noncopyable.hpp>
 
+class Color;
 class SvxFont;
 class SvxFontItem;
 class SvxWeightItem;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 156ea48..428c669 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -16,26 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_SVL_POOLITEM_HXX
 #define INCLUDED_SVL_POOLITEM_HXX
 
-#include <svl/svldllapi.h>
-#include <com/sun/star/uno/Any.hxx>
-
 #include <sal/config.h>
-#include <tools/rtti.hxx>
-#include <limits.h>
-#include <tools/solar.h>
-#include <tools/debug.hxx>
+
+#include <com/sun/star/uno/Any.hxx>
 #include <svl/hint.hxx>
+#include <svl/svldllapi.h>
+#include <tools/debug.hxx>
+#include <tools/rtti.hxx>
 
-class SbxVariable;
-class SbxObject;
-class SvStream;
-class Color;
 class IntlWrapper;
-
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+class SvStream;
 
 enum SfxItemKind {
    SFX_ITEMS_NONE,
@@ -50,10 +44,6 @@ enum SfxItemKind {
 
 #define CONVERT_TWIPS                       0x80    // Uno conversion for measurement (for MemberId)
 
-
-
-// UNO3 shortcuts
-
 // warning, if there is no boolean inside the any this will always return the value false
 inline bool Any2Bool( const ::com::sun::star::uno::Any&rValue )
 {
@@ -94,15 +84,12 @@ enum SfxMapUnit
     SFX_MAPUNIT_ABSOLUTE
 };
 
-
-
-enum SfxItemPresentation
-
 /*
  * The values of this enum describe the degree of textual
  * representation of an item after calling the virtual
  * method <SfxPoolItem::GetPresentation()const>.
  */
+enum SfxItemPresentation
 {
     SFX_ITEM_PRESENTATION_NAMELESS,
     SFX_ITEM_PRESENTATION_COMPLETE
@@ -147,9 +134,6 @@ class SvXMLUnitConverter;
 class SfxItemPool;
 class SfxItemSet;
 
-
-
-
 class SVL_DLLPUBLIC SfxPoolItem
 {
 friend class SfxItemPool;
@@ -212,8 +196,6 @@ private:
     SfxPoolItem&             operator=( const SfxPoolItem& ) SAL_DELETED_FUNCTION;
 };
 
-
-
 inline void SfxPoolItem::SetRefCount( sal_uLong n )
 {
     m_nRefCount = n;
@@ -241,8 +223,6 @@ inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const
     return m_nRefCount;
 }
 
-
-
 inline bool IsPoolDefaultItem(const SfxPoolItem *pItem )
 {
     return pItem && pItem->GetKind() == SFX_ITEMS_POOLDEFAULT;
@@ -268,8 +248,6 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem)
     return pItem == reinterpret_cast<SfxPoolItem *>(-1);
 }
 
-
-
 class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
 {
     SfxVoidItem & operator=( const SfxVoidItem& ) SAL_DELETED_FUNCTION;
@@ -293,8 +271,6 @@ public:
             void            SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; }
 };
 
-
-
 class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
 {
     SfxItemSet              *pSet;
@@ -327,7 +303,6 @@ public:
                             { return *pSet; }
 };
 
-
 class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint
 {
     SfxPoolItem* pObj;
@@ -337,8 +312,6 @@ public:
     SfxPoolItem* GetObject() const { return pObj; }
 };
 
-
-
-#endif // INCLUDED_SVL_POOLITEM_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index b9ed6f2..09cac8a 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -39,6 +39,7 @@
 #include <memory>
 #include <vector>
 
+class Color;
 class SdrModel;
 class SdrObject;
 class SfxItemSet;