[Libreoffice-commits] .: accessibility/source basctl/source cppcanvas/source dbaccess/inc desktop/source editeng/inc editeng/source filter/source idl/inc lotuswordpro/source sc/inc sc/source sd/inc sd/source sfx2/inc slideshow/source svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source toolkit/inc tools/inc tools/source vcl/generic vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 7 05:15:17 PST 2013
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 1
accessibility/source/helper/characterattributeshelper.cxx | 1
basctl/source/basicide/iderdll2.hxx | 1
cppcanvas/source/mtfrenderer/pointaction.cxx | 2 -
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 2 -
cppcanvas/source/mtfrenderer/textaction.hxx | 2 -
dbaccess/inc/ToolBoxHelper.hxx | 1
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx | 1
editeng/inc/editeng/svxfont.hxx | 3 +
editeng/source/items/svxfont.cxx | 1
editeng/source/misc/swafopt.cxx | 1
filter/source/graphicfilter/idxf/dxfvec.cxx | 1
filter/source/graphicfilter/idxf/dxfvec.hxx | 4 +-
idl/inc/bastype.hxx | 2 -
idl/inc/lex.hxx | 2 -
lotuswordpro/source/filter/lwpgrfobj.hxx | 3 +
sc/inc/postit.hxx | 2 -
sc/source/core/data/postit.cxx | 1
sc/source/filter/excel/xechart.cxx | 1
sc/source/filter/inc/imp_op.hxx | 2 -
sc/source/filter/inc/xechart.hxx | 2 -
sc/source/ui/inc/formdata.hxx | 1
sd/inc/sdfilter.hxx | 2 -
sd/source/filter/eppt/eppt.hxx | 2 -
sd/source/filter/ppt/propread.hxx | 2 -
sd/source/ui/inc/undoheaderfooter.hxx | 1
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 1
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 1
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 2 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 1
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 3 +
sfx2/inc/sfx2/imgmgr.hxx | 1
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 3 +
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 3 +
svl/source/items/szitem.cxx | 1
svtools/inc/svtools/fltcall.hxx | 2 -
svtools/inc/svtools/javainteractionhandler.hxx | 2 -
svtools/inc/svtools/scriptedtext.hxx | 3 +
svtools/source/control/scriptedtext.cxx | 1
svx/inc/svx/EnhancedCustomShape2d.hxx | 1
svx/inc/svx/IAccessibleViewForwarderListener.hxx | 1
svx/inc/svx/framelink.hxx | 3 +
svx/inc/svx/msdffdef.hxx | 2 -
svx/inc/svx/sdr/contact/objectcontactofpageview.hxx | 1
svx/inc/svx/sdr/contact/viewcontact.hxx | 1
svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 1
svx/inc/svx/sdr/contact/viewobjectcontact.hxx | 1
svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 1
svx/inc/svx/sdr/overlay/overlayhatchrect.hxx | 1
svx/inc/svx/sdr/overlay/overlayobjectlist.hxx | 4 +-
svx/inc/svx/unoshape.hxx | 4 +-
svx/inc/xpolyimp.hxx | 3 +
svx/source/dialog/framelink.cxx | 1
svx/source/gallery2/codec.hxx | 2 -
svx/source/mnuctrls/clipboardctl.cxx | 1
svx/source/sdr/overlay/overlaycrosshair.cxx | 1
svx/source/sdr/overlay/overlayhelpline.cxx | 1
svx/source/sdr/overlay/overlayline.cxx | 1
svx/source/sdr/overlay/overlayobjectlist.cxx | 1
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 1
svx/source/svdraw/gradtrns.hxx | 1
svx/source/table/tablelayouter.cxx | 2 +
svx/source/table/tablelayouter.hxx | 4 +-
svx/source/table/tablemodel.cxx | 4 +-
svx/source/table/tablemodel.hxx | 4 +-
svx/source/tbxctrls/lboxctrl.cxx | 2 -
svx/source/unodraw/unoshape.cxx | 1
svx/source/xoutdev/_xpoly.cxx | 1
sw/inc/anchoreddrawobject.hxx | 3 +
sw/inc/frmfmt.hxx | 1
sw/inc/node.hxx | 3 +
sw/inc/numrule.hxx | 3 +
sw/inc/pam.hxx | 3 +
sw/source/core/crsr/pam.cxx | 1
sw/source/core/docnode/node.cxx | 1
sw/source/core/fields/postithelper.cxx | 4 +-
sw/source/core/inc/fntcache.hxx | 1
sw/source/core/inc/swfont.hxx | 1
sw/source/core/layout/anchoreddrawobject.cxx | 1
toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx | 3 -
tools/inc/poly.h | 4 +-
tools/inc/tools/svborder.hxx | 16 ++++++++--
tools/source/generic/poly.cxx | 1
tools/source/generic/poly2.cxx | 1
vcl/generic/print/glyphset.cxx | 2 +
vcl/generic/print/glyphset.hxx | 4 +-
vcl/inc/generic/gendisp.hxx | 1
vcl/inc/outfont.hxx | 3 +
vcl/inc/svdata.hxx | 4 +-
vcl/inc/unx/i18n_status.hxx | 1
vcl/inc/unx/salstd.hxx | 1
vcl/inc/vcl/font.hxx | 3 +
vcl/inc/vcl/gradient.hxx | 4 +-
vcl/inc/vcl/lineinfo.hxx | 2 -
vcl/inc/vcl/wall.hxx | 2 -
vcl/source/app/svdata.cxx | 1
vcl/source/gdi/font.cxx | 1
vcl/source/gdi/gradient.cxx | 1
101 files changed, 121 insertions(+), 81 deletions(-)
New commits:
commit a4c7ded1fd2a879e66760a8fc3846af538da4b9d
Author: Matteo Casalin <matteo.casalin at gmx.com>
Date: Tue Dec 25 15:18:26 2012 +0100
Cleanup: #include <tools/gen.hxx>
Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530
Reviewed-on: https://gerrit.libreoffice.org/1484
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 556e53a..a8eaa6b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -21,7 +21,6 @@
#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
#include <svtools/accessibletableprovider.hxx>
#include "accessibility/extended/AccessibleBrowseBox.hxx"
-#include <tools/gen.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index 56fd3f8..8180cd9 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -18,6 +18,7 @@
*/
#include <accessibility/helper/characterattributeshelper.hxx>
+#include <tools/gen.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 2e30dee..98589c8 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -23,7 +23,6 @@
class StarBASIC;
class SvxSearchItem;
-#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <bastypes.hxx>
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 72b2895..43bd43e 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -21,7 +21,7 @@
#include <rtl/logfile.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <vcl/canvastools.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 723dea5..92d7063 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <vcl/canvastools.hxx>
#include <basegfx/range/b2drectangle.hxx>
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index d6f0f33..b3218b0a 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -26,10 +26,10 @@
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/renderer.hxx>
#include <tools/poly.hxx>
-#include <tools/gen.hxx>
class VirtualDevice;
class Point;
+class Size;
class Color;
class String;
diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx
index fedf5a3..298bbc8 100644
--- a/dbaccess/inc/ToolBoxHelper.hxx
+++ b/dbaccess/inc/ToolBoxHelper.hxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <tools/link.hxx>
-#include <tools/gen.hxx>
#include <vcl/image.hxx>
#include "dbaccessdllapi.h"
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 13719ab..571bd28 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -24,7 +24,6 @@
#include <vector>
#include "rtl/ustring.hxx"
-#include "tools/gen.hxx"
#include "tools/resid.hxx"
#include "tools/solar.h"
#include "vcl/dialog.hxx"
diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index c4a5c2d..ec4e77a 100644
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -32,6 +32,9 @@
class SvxDoCapitals;
class OutputDevice;
class Printer;
+class Point;
+class Rectangle;
+class Size;
class EDITENG_DLLPUBLIC SvxFont : public Font
{
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 9bbddf4..3d9d225 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -20,6 +20,7 @@
#include <comphelper/string.hxx>
#include <vcl/outdev.hxx>
#include <vcl/print.hxx>
+#include <tools/gen.hxx>
#include <tools/poly.hxx>
#include <unotools/charclass.hxx>
#include <editeng/unolingu.hxx>
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 33bc56f..a416507 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -19,6 +19,7 @@
#include <vcl/keycodes.hxx>
#include <tools/string.hxx>
+#include <tools/gen.hxx>
#include <editeng/swafopt.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfvec.cxx b/filter/source/graphicfilter/idxf/dxfvec.cxx
index e8ae4af..e18d88f 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.cxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.cxx
@@ -20,6 +20,7 @@
#include <math.h>
#include <dxfvec.hxx>
+#include <tools/gen.hxx>
//---------------------------- DXFVector ---------------------------------------
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 41cfcc0..ac975b5 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -20,9 +20,11 @@
#ifndef _DXFVEC_HXX
#define _DXFVEC_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <vcl/lineinfo.hxx>
+class Point;
+
class DXFLineInfo {
public:
LineStyle eStyle;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 787c3ca..b3efec4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -21,8 +21,8 @@
#define _BASTYPE_HXX
+#include <sal/types.h>
#include <tools/globname.hxx>
-#include <tools/gen.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index c05843e..37d75e0d 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -22,8 +22,8 @@
#include <boost/ptr_container/ptr_vector.hpp>
+#include <sal/types.h>
#include <hash.hxx>
-#include <tools/gen.hxx>
#include <tools/stream.hxx>
enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT,
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 59e912d..b188fa5 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -61,10 +61,11 @@
#ifndef LWPGRFOBJECT_HXX_
#define LWPGRFOBJECT_HXX_
+#include <sal/types.h>
+
#include "lwpoleobject.hxx"
#include "lwpheader.hxx"
#include "xfilter/xfrect.hxx"
-#include <tools/gen.hxx>
struct ImageProcessingData
{
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 69ee67a..88ae564 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -22,7 +22,6 @@
#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
-#include <tools/gen.hxx>
#include "address.hxx"
#include "scdllapi.h"
@@ -34,6 +33,7 @@ class SdrCaptionObj;
class SdrPage;
class SfxItemSet;
class ScDocument;
+class Rectangle;
struct ScCaptionInitData;
// ============================================================================
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index d3e0670..b9bec3f 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -36,6 +36,7 @@
#include <svx/xflclit.hxx>
#include <svx/sdshitm.hxx>
#include <svx/sdsxyitm.hxx>
+#include <tools/gen.hxx>
#include "document.hxx"
#include "docpool.hxx"
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index bc0bcc7..fd99e8b 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -54,6 +54,7 @@
#include <com/sun/star/chart2/StackingDirection.hpp>
#include <com/sun/star/chart2/TickmarkStyle.hpp>
+#include <tools/gen.hxx>
#include <vcl/outdev.hxx>
#include <filter/msfilter/escherex.hxx>
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index d21f0af..8e004f3 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -20,7 +20,7 @@
#ifndef SC_IMP_OP_HXX
#define SC_IMP_OP_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include "xiroot.hxx"
#include "xistream.hxx"
#include "xistyle.hxx"
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 23599b5..10f27f4 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -20,7 +20,6 @@
#ifndef SC_XECHART_HXX
#define SC_XECHART_HXX
-#include <tools/gen.hxx>
#include "xerecord.hxx"
#include "xlchart.hxx"
#include "xlformula.hxx"
@@ -31,6 +30,7 @@
#include <boost/ptr_container/ptr_map.hpp>
class Size;
+class Rectangle;
namespace com { namespace sun { namespace star {
namespace awt
diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx
index 8a35a9a..9fad670 100644
--- a/sc/source/ui/inc/formdata.hxx
+++ b/sc/source/ui/inc/formdata.hxx
@@ -20,7 +20,6 @@
#ifndef SC_FORMDATA_HXX
#define SC_FORMDATA_HXX
-#include <tools/gen.hxx>
#include <formula/formdata.hxx>
class ScInputHandler;
class ScDocShell;
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index d441214..5dc9502 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -20,7 +20,7 @@
#ifndef _SD_SDFILTER_HXX
#define _SD_SDFILTER_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 98cbc88..1513763 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -21,9 +21,9 @@
#define _EPPT_HXX_
#include <vector>
#include "escherex.hxx"
+#include <sal/types.h>
#include <tools/solar.h>
#include <sot/storage.hxx>
-#include <tools/gen.hxx>
#include <vcl/graph.hxx>
#include <unotools/fontcvt.hxx>
#include <tools/string.hxx>
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index c983e62..b05b977 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -23,9 +23,9 @@
#include <map>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <sal/types.h>
#include <tools/solar.h>
#include <sot/storage.hxx>
-#include <tools/gen.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx
index fdf32d5..588e129 100644
--- a/sd/source/ui/inc/undoheaderfooter.hxx
+++ b/sd/source/ui/inc/undoheaderfooter.hxx
@@ -20,7 +20,6 @@
#ifndef _SD_UNDOHEADERFOOTER_HXX
#define _SD_UNDOHEADERFOOTER_HXX
-#include <tools/gen.hxx>
#include "sdundo.hxx"
#include "sdpage.hxx"
#include "sddllapi.h"
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
index 20fb898..9e15502 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
@@ -21,7 +21,6 @@
#define SD_SLIDESORTER_BITMAP_COMPRESSOR_HXX
#include <sal/types.h>
-#include <tools/gen.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 8b238b6a..294ae9f 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -18,6 +18,7 @@
*/
+#include <tools/gen.hxx>
#include "SlsGenericPageCache.hxx"
#include "SlsRequestFactory.hxx"
#include "cache/SlsPageCache.hxx"
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index e416943..23d6187e 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -22,10 +22,10 @@
#include "cache/SlsCacheContext.hxx"
#include <sal/types.h>
-#include <tools/gen.hxx>
#include <boost/scoped_ptr.hpp>
#include <vcl/bitmap.hxx>
+struct Size;
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index b52a0c8..4482865 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -24,7 +24,6 @@
#include <basegfx/point/b2dpoint.hxx>
#include <boost/noncopyable.hpp>
#include <boost/function.hpp>
-#include <tools/gen.hxx>
#include <vector>
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 5b79190..a3d18b2 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -28,8 +28,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
-class Point;
-class Rectangle;
class ScrollBar;
class ScrollBarBox;
class Window;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 8e70d97..51718fa 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -20,7 +20,7 @@
#ifndef SD_SLIDESORTER_CONTROLLER_SELECTION_OBSERVER_HXX
#define SD_SLIDESORTER_CONTROLLER_SELECTION_OBSERVER_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <vector>
#include <boost/shared_ptr.hpp>
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 47efd38..6015259 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -26,6 +26,7 @@
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#include <tools/gen.hxx>
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 4060ff2..6cd755c 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -23,7 +23,6 @@
#include "view/SlsILayerPainter.hxx"
#include "SlideSorter.hxx"
-#include <tools/gen.hxx>
#include <vcl/region.hxx>
#include <vcl/virdev.hxx>
@@ -33,6 +32,8 @@
#include <boost/enable_shared_from_this.hpp>
#include <vector>
+class Rectangle;
+
namespace sd { namespace slidesorter { namespace view {
/** A simple wrapper around an OutputDevice that provides support for
diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index c7357de..7ef2780 100644
--- a/sfx2/inc/sfx2/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.hxx
@@ -24,7 +24,6 @@
#include "sfx2/dllapi.h"
#include <sal/types.h>
-#include <tools/gen.hxx>
#include <vcl/image.hxx>
class ToolBox;
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index 2e3ae05..93c1d13 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -29,6 +29,8 @@
#define GLX_GLXEXT_PROTOTYPES 1
#include "OGLTrans_TransitionImpl.hxx"
+#include <sal/types.h>
+
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
#include <com/sun/star/rendering/ColorComponentTag.hpp>
@@ -54,7 +56,6 @@
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/gen.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/window.hxx>
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 1842dd4..f14af9a 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -42,6 +42,8 @@
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
#include <com/sun/star/geometry/IntegerSize2D.hpp>
+#include <sal/types.h>
+
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/factory.hxx>
@@ -50,7 +52,6 @@
#include <comphelper/servicedecl.hxx>
#include <canvas/canvastools.hxx>
-#include <tools/gen.hxx>
#include <vcl/window.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 4c3f73c..4660a1f 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <tools/stream.hxx>
-#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
#include <svl/memberid.hrc>
diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx
index ded1d84..91e4d28 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.hxx
@@ -19,7 +19,7 @@
#ifndef _FLTCALL_HXX
#define _FLTCALL_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <vcl/field.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx
index 1b0c0c6..fed409f 100644
--- a/svtools/inc/svtools/javainteractionhandler.hxx
+++ b/svtools/inc/svtools/javainteractionhandler.hxx
@@ -22,7 +22,7 @@
#include "svtools/svtdllapi.h"
#include <osl/mutex.hxx>
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <svtools/javacontext.hxx>
diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx
index 1bc5f1c..9d99588 100644
--- a/svtools/inc/svtools/scriptedtext.hxx
+++ b/svtools/inc/svtools/scriptedtext.hxx
@@ -21,7 +21,6 @@
#define _SVTOOLS_SCRIPTEDTEXT_HXX
#include "svtools/svtdllapi.h"
-#include <tools/gen.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -29,6 +28,8 @@ namespace rtl { class OUString; }
class OutputDevice;
class Font;
class SvtScriptedTextHelper_Impl;
+class Size;
+class Point;
//_____________________________________________________________________________
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 68d8e70..146ceeb 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -23,6 +23,7 @@
#include <vcl/outdev.hxx>
#include <vcl/font.hxx>
#include <tools/debug.hxx>
+#include <tools/gen.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index cbe34fb..e2cd4ee 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 6d3a7f2..8a9a061 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 c15c9be..a8a0507 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 e0b1b10..3ff5a3d 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 49a4af3..06371bf 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 a96f144..0a1c439 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 9cccb54..3ad8580 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 66b2bae..96c3918 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 25257e5..e1e24da 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 2ccf60f..7f01c35 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 67c4e51..ea75ace 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 1a17529..36bf13f 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 ea5766b..f3b06ef 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 8635ad2..d1d49ae 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 99363af..b7620a3 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 eb55385..c288020 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 ba6df70..bb126d9 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 8d0f3a9..f0dee82 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 e99ee63..fa9d2d0 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 93560b8..684dd09 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 852e95b8..977c91e 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 25bd4c7..23cf3e9 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 599bf61..eecf16d 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 9bd4872..6d2fd9e 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 46b1c9a..5387babf 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 df0bca4..9aabdfa 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 efc9ebc..15ee615 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 19236eb..8ff4a8b 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 169d1b5..4053c11 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"
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 43ecefa..4c26983 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -20,7 +20,8 @@
#define _ANCHOREDDRAWOBJECT_HXX
#include <anchoredobject.hxx>
-#include <tools/gen.hxx>
+
+class Rectangle;
/** class for the positioning of drawing objects
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a3a347f..bf016ee 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -28,7 +28,6 @@
class SwFlyFrm;
class SwAnchoredObject;
class Graphic;
-class Point;
class ImageMap;
class IMapObject;
class SwRect;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b79401f..7690cf8 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -25,8 +25,8 @@
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
+#include <sal/types.h>
#include <tools/mempool.hxx>
-#include <tools/gen.hxx>
#include "swdllapi.h"
#include <ndarr.hxx>
@@ -75,6 +75,7 @@ class IDocumentFieldsAccess;
class IDocumentContentOperations;
class IDocumentListItems;
class SwOLENodes;
+class Point;
/// Base class of the Writer document model elements.
class SW_DLLPUBLIC SwNode
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 3b468ef..562b7a9 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -19,7 +19,7 @@
#ifndef _NUMRULE_HXX
#define _NUMRULE_HXX
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <tools/string.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/numitem.hxx>
@@ -42,6 +42,7 @@ class SwCharFmt;
class SwDoc;
class SwFmtVertOrient;
class SwTxtNode;
+class Size;
const sal_Unicode cBulletChar = 0x2022; ///< Character for lists.
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index bfe7214..31e1008 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -20,7 +20,7 @@
#define _PAM_HXX
#include <stddef.h> ///< For MemPool.
-#include <tools/gen.hxx>
+#include <sal/types.h>
#include <tools/mempool.hxx>
#include <cshtyp.hxx> ///< For function definitions.
#include <ring.hxx> ///< Super class.
@@ -35,6 +35,7 @@ class SwDoc;
class SwNode;
class SwCntntNode;
class SwPaM;
+class Point;
namespace com { namespace sun { namespace star { namespace util {
struct SearchOptions;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index baf62ad..e9b7802 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <tools/gen.hxx>
#include <hintids.hxx>
#include <editeng/protitem.hxx>
#include <cntfrm.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 132282f..a972611 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -21,6 +21,7 @@
#include <hintids.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/protitem.hxx>
+#include <tools/gen.hxx>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <fmtcntnt.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 326490b..5706319 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -18,8 +18,6 @@
*/
-#include <tools/gen.hxx>
-
#include <postithelper.hxx>
#include <PostItMgr.hxx>
#include <AnnotationWin.hxx>
@@ -39,6 +37,8 @@
#include <editeng/charhiddenitem.hxx>
#include <switerator.hxx>
+class Point;
+
namespace {
struct LayoutInfoOrder
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 2206d28..7d2981b 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -32,6 +32,7 @@ class SwDrawTextInfo;
class ViewShell;
class SwSubFont;
class MapMode;
+class Point;
class SwFntCache : public SwCache
{
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index fd94e33..cb80113 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -22,6 +22,7 @@
#include <i18npool/lang.h>
#include <tools/color.hxx>
#include <tools/stream.hxx>
+#include <tools/gen.hxx>
#include <editeng/svxfont.hxx>
#include <swtypes.hxx>
#include <drawfont.hxx> // SwDrawTextInfo
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 621f5fc..6b3e5b5 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -33,6 +33,7 @@
// --> #i32795#
// template class <std::vector>
#include <vector>
+#include <tools/gen.hxx>
// --> #i28749#
#include <com/sun/star/text/PositionLayoutDir.hpp>
diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
index 002c39b..7d5f10e 100644
--- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -32,8 +32,7 @@
#include <comphelper/accimplaccess.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <tools/gen.hxx> // Size
-#include <tools/link.hxx> // Size
+#include <tools/link.hxx>
class Window;
class VCLXWindow;
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index a925f9b..9f05dcc 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -19,7 +19,9 @@
#ifndef _POLY_H
#define _POLY_H
-#include <tools/gen.hxx>
+#include <sal/types.h>
+
+class Point;
class SAL_WARN_UNUSED ImplPolygonData
{
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index 0aebbfe..de4a866 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.hxx
@@ -29,11 +29,21 @@ class TOOLS_DLLPUBLIC SvBorder
public:
SvBorder()
- { nTop = nRight = nBottom = nLeft = 0; }
+ {
+ nTop = nRight = nBottom = nLeft = 0;
+ }
SvBorder( const Size & rSz )
- { nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); }
+ {
+ nTop = nBottom = rSz.Height();
+ nRight = nLeft = rSz.Width();
+ }
SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP )
- { nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; }
+ {
+ nLeft = nLeftP;
+ nTop = nTopP;
+ nRight = nRightP;
+ nBottom = nBottomP;
+ }
sal_Bool operator == ( const SvBorder & rObj ) const
{
return nTop == rObj.nTop && nRight == rObj.nRight &&
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 9f66f90..dfa931a 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -23,6 +23,7 @@
#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
+#include <tools/gen.hxx>
#include <poly.h>
#include <tools/line.hxx>
#include <tools/vector2d.hxx>
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index a6dff02..869ac0a 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -28,6 +28,7 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
+#include <tools/gen.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 5c90618..d5635e7 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -27,6 +27,8 @@
#include "fontsubset.hxx"
#include "vcl/fontmanager.hxx"
+#include <tools/gen.hxx>
+
#include "osl/thread.h"
#include "sal/alloca.h"
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 4017237..f469d9b 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -26,11 +26,11 @@
#include "rtl/string.hxx"
-#include "tools/gen.hxx"
-
#include <list>
#include <boost/unordered_map.hpp>
+class Point;
+
namespace psp {
class PrinterGfx;
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index d64fc9f..9e603b9 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -25,7 +25,6 @@
#include <osl/conditn.hxx>
#include <salwtype.hxx>
#include <vcl/dllapi.h>
-#include <tools/gen.hxx>
#include <list>
#include <vector>
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 741d6be..53ec909 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -20,9 +20,9 @@
#ifndef _SV_OUTFONT_HXX
#define _SV_OUTFONT_HXX
+#include <sal/types.h>
#include <tools/string.hxx>
#include <i18npool/lang.h>
-#include <tools/gen.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <unotools/fontdefs.hxx>
@@ -42,6 +42,7 @@ class Font;
class ConvertChar;
struct FontMatchStatus;
class OutputDevice;
+class Size;
namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}}
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index f7dcbd6..ff87f29 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -20,10 +20,11 @@
#ifndef _SV_SVDATA_HXX
#define _SV_SVDATA_HXX
+#include "sal/types.h"
+
#include <osl/thread.hxx>
#include <rtl/ref.hxx>
-#include "tools/gen.hxx"
#include "tools/shl.hxx"
#include "tools/link.hxx"
#include "tools/fldunit.hxx"
@@ -50,7 +51,6 @@ class ImplDirectFontSubstitution;
struct ImplHotKey;
struct ImplEventHook;
class Point;
-class Rectangle;
class ResMgr;
class ImplAccelManager;
class ImplDevFontList;
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 03330f2..92310f1 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -21,7 +21,6 @@
#define _SAL_I18N_STATUS_HXX
#include <tools/string.hxx>
-#include <tools/gen.hxx>
#include <rtl/ustring.hxx>
#include <salimestatus.hxx>
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 2417cfe..73a2868 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -20,7 +20,6 @@
#ifndef _SALSTD_HXX
#define _SALSTD_HXX
-#include <tools/gen.hxx>
#include <tools/solar.h>
// -=-= X-Lib forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx
index 077b4f1..f651ba6 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/vcl/inc/vcl/font.hxx
@@ -20,8 +20,8 @@
#ifndef _SV_FONT_HXX
#define _SV_FONT_HXX
+#include <sal/types.h>
#include <vcl/dllapi.h>
-#include <tools/gen.hxx>
#include <tools/string.hxx>
#include <i18npool/lang.h>
#include <tools/color.hxx>
@@ -33,6 +33,7 @@ class SvStream;
class Impl_Font;
class ImplFontAttributes;
+class Size;
// --------
// - Font -
diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 27fc81f..d9bbf7ae 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -20,9 +20,9 @@
#ifndef _SV_GRADIENT_HXX
#define _SV_GRADIENT_HXX
+#include <sal/types.h>
#include <vcl/dllapi.h>
#include <tools/color.hxx>
-#include <tools/gen.hxx>
#include <vcl/vclenum.hxx>
@@ -30,6 +30,8 @@
// - Impl_Gradient -
// ----------------
+class Rectangle;
+class Point;
class SvStream;
class Impl_Gradient
diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 648b060..d5165a6 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.hxx
@@ -20,8 +20,8 @@
#ifndef _SV_LINEINFO_HXX
#define _SV_LINEINFO_HXX
+#include <sal/types.h>
#include <vcl/dllapi.h>
-#include <tools/gen.hxx>
#include <vcl/vclenum.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <com/sun/star/drawing/LineCap.hpp>
diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx
index 84d0084..e18adf7 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/vcl/inc/vcl/wall.hxx
@@ -23,8 +23,8 @@
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <tools/color.hxx>
+#include <tools/gen.hxx>
-class Rectangle;
class Gradient;
class BitmapEx;
class ImplWallpaper;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index e8716cd..657c3ee 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -26,6 +26,7 @@
#include <rtl/process.h>
#include <tools/debug.hxx>
#include <tools/resary.hxx>
+#include <tools/gen.hxx>
#include <unotools/fontcfg.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/string.hxx>
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index bbb74ed..b80e8e0 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -23,6 +23,7 @@
#include "tools/stream.hxx"
#include "tools/vcompat.hxx"
#include "tools/debug.hxx"
+#include <tools/gen.hxx>
#include "vcl/font.hxx"
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 06b3e48..ea8a6bc 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -20,6 +20,7 @@
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
#include <tools/debug.hxx>
+#include <tools/gen.hxx>
#include <vcl/gradient.hxx>
// =======================================================================
More information about the Libreoffice-commits
mailing list