Cleanup: #include <tools/gen.hxx>

Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530
Reviewed-on: https://gerrit.libreoffice.org/1484
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

29 files changed, 29 insertions, 23 deletions

diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index cbe34fbdd8e0..e2cd4eef637c 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <svx/EnhancedCustomShapeFunctionParser.hxx>
+#include <tools/gen.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index 6d3a7f246e5d..8a9a061bfb5e 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
@@ -21,7 +21,6 @@
 #define _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_LISTENER_HXX
 
 #include <sal/types.h>
-#include <tools/gen.hxx>
 
 
 namespace accessibility {
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index c15c9be28958..a8a05076f471 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include "svx/svxdllapi.h"
 #include <vcl/outdev.hxx>
@@ -30,6 +29,8 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
+class Point;
+class Rectangle;
 class OutputDevice;
 
 namespace svx {
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index e0b1b10aeede..3ff5a3dbebe8 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -20,9 +20,9 @@
 #ifndef _MSDFFDEF_HXX
 #define _MSDFFDEF_HXX
 
+#include <sal/types.h>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 
 #define DFF_COMMON_RECORD_HEADER_SIZE           8
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
index 49a4af3b34bb..06371bf35b81 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
@@ -21,7 +21,6 @@
 #define _SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
 
 #include <svx/sdr/contact/objectcontact.hxx>
-#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index a96f14424031..0a1c43905609 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
@@ -21,7 +21,6 @@
 #define _SDR_CONTACT_VIEWCONTACT_HXX
 
 #include <sal/types.h>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 9cccb542a11d..3ad8580cf12e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -22,6 +22,7 @@
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include "svx/svxdllapi.h"
+#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index 66b2baeda6c3..96c3918a4c42 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -23,7 +23,6 @@
 #include <sal/types.h>
 
 #include <vector>
-#include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 25257e582520..e1e24dab8442 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -22,6 +22,7 @@
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
+#include <tools/gen.hxx>
 
 namespace avmedia { class MediaItem; }
 class Window;
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 2ccf60fc0cbe..7f01c3537e42 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/hatch.hxx>
-#include <tools/gen.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 67c4e510f17e..ea75ace1e94a 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -21,7 +21,7 @@
 #define _SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include "svx/svxdllapi.h"
 
 //////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,8 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+class Point;
+
 namespace sdr
 {
     namespace overlay
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 1a1752900c2a..36bf13f81a30 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <tools/gen.hxx>
+#include <sal/types.h>
 #include <tools/weakbase.hxx>
 #include <svl/lstner.hxx>
 #include <editeng/unoipset.hxx>
@@ -62,6 +62,8 @@ class SfxItemSet;
 class SdrModel;
 class SvxDrawPage;
 class SvGlobalName;
+class Pair;
+
 // Dimension arrows change size/position on save/reload (#i59051#)
 namespace basegfx
     {
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index ea5766b9cbea..f3b06ef77fe4 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -20,10 +20,11 @@
 #ifndef _XPOLYIMP_HXX
 #define _XPOLYIMP_HXX
 
-#include <tools/gen.hxx>
 #include <svx/xpoly.hxx>
 #include <vector>
 
+class Point;
+
 class ImpXPolygon
 {
 public:
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 8635ad2391b0..d1d49ae265cd 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -21,6 +21,7 @@
 
 #include <math.h>
 #include <vcl/outdev.hxx>
+#include <tools/gen.hxx>
 #include <editeng/borderline.hxx>
 #include <svtools/borderhelper.hxx>
 
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 99363af0fb79..b7620a3e3799 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/gen.hxx>
+#include <sal/types.h>
 
 // ----------------
 // - GalleryCodec -
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index eb5538534559..c288020bf695 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <tools/gen.hxx>
 #include <svl/intitem.hxx>
 #include <sot/exchange.hxx>
 #include <svl/eitem.hxx>
diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index ba6df7084035..bb126d9c7818 100644
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/sdr/overlay/overlaycrosshair.hxx>
-#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <svx/sdr/overlay/overlaytools.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index 8d0f3a9c682f..f0dee820a8d8 100644
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/sdr/overlay/overlayhelpline.hxx>
-#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <svx/sdr/overlay/overlaytools.hxx>
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index e99ee63ce4e3..fa9d2d0c8cc1 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/sdr/overlay/overlayline.hxx>
-#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 93560b880930..684dd09caf4d 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -21,6 +21,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <vcl/outdev.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <tools/gen.hxx>
 
 // for SOLARIS compiler include of algorithm part of _STL is necesary to
 // get access to basic algos like ::std::find
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index 852e95b8c2c2..977c91e2275f 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
-#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/overlay/overlaytools.hxx>
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index 25bd4c778663..23cf3e9ea56e 100644
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
@@ -21,7 +21,6 @@
 #define _GRADTRANS_HXX
 
 #include <svx/xgrad.hxx>
-#include <tools/gen.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
 class SdrObject;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 599bf61a134f..eecf16d80bf3 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -21,6 +21,8 @@
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 
+#include <tools/gen.hxx>
+
 #include "cell.hxx"
 #include "cellrange.hxx"
 #include "tablemodel.hxx"
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 9bd48726ed54..6d2fd9e19af2 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -23,15 +23,17 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/table/XTable.hpp>
+#include <sal/types.h>
 #include <basegfx/range/b2irectangle.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
-#include <tools/gen.hxx>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <map>
 
 #include "svx/svdotable.hxx"
 
+class Rectangle;
+
 // -----------------------------------------------------------------------------
 
 namespace editeng {
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 46b1c9a6f462..5387babf17eb 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -311,11 +311,11 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep
 
 // -----------------------------------------------------------------------------
 
-Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& Range ) throw (IllegalArgumentException, RuntimeException)
+Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
-    ICellRange* pRange = dynamic_cast< ICellRange* >( Range.get() );
+    ICellRange* pRange = dynamic_cast< ICellRange* >( rRange.get() );
     if( (pRange == 0) || (pRange->getTable().get() != this) )
         throw IllegalArgumentException();
 
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index df0bca41317e..9aabdfa8bffa 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -20,6 +20,7 @@
 #ifndef _SVX_TABLE_TABLEMODEL_HXX_
 #define _SVX_TABLE_TABLEMODEL_HXX_
 
+#include <sal/types.h>
 #include <com/sun/star/util/XBroadcaster.hpp>
 #include <com/sun/star/table/XTable.hpp>
 #include <basegfx/range/b2irectangle.hxx>
@@ -27,7 +28,6 @@
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/listenernotification.hxx>
-#include <tools/gen.hxx>
 #include "celltypes.hxx"
 
 // -----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ public:
 
     // XTable
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursor(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& Range ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& rRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getRowCount() throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index efc9ebcf6928..15ee615c1d1f 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -21,6 +21,7 @@
 #ifdef   _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
+#include <sal/types.h>
 #include <vcl/lstbox.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/event.hxx>
@@ -29,7 +30,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
-#include <tools/gen.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/stdctrl.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 19236eb83341..8ff4a8bc0446 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -62,6 +62,7 @@
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
+#include <tools/gen.hxx>
 #include <tools/shl.hxx>    //
 #include "svx/dialmgr.hxx"      // not nice, we need our own resources some day
 #include "svx/dialogs.hrc"      //
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 169d1b56ade1..4053c11158c6 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -22,6 +22,7 @@
 #include <tools/debug.hxx>
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
+#include <tools/gen.hxx>
 
 #include <svx/xpoly.hxx>
 #include "xpolyimp.hxx"