summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-10-23 17:30:09 +0200
committerJan Holesovsky <kendy@collabora.com>2014-10-23 18:34:37 +0200
commit81819527318c583ead77a15e700ebf81e9e41e6e (patch)
tree01a7258260916be46ded0599b3fd7c2c8d06faf9
parentdc90c5a3955a33e1ae5216640021866be392f2d3 (diff)
Fraction: Revert "do not forward-declare templates"
-rw-r--r--include/sfx2/ipclient.hxx5
-rw-r--r--include/sfx2/viewfrm.hxx3
-rw-r--r--include/sfx2/viewsh.hxx2
-rw-r--r--include/svtools/imap.hxx2
-rw-r--r--include/svtools/imapcirc.hxx4
-rw-r--r--include/svtools/imappoly.hxx4
-rw-r--r--include/svtools/imaprect.hxx4
-rw-r--r--include/svx/sdr/properties/properties.hxx3
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/patattr.hxx3
-rw-r--r--sc/source/ui/inc/drawutil.hxx3
-rw-r--r--svx/inc/sdr/properties/itemsettools.hxx7
-rw-r--r--sw/inc/pagepreviewlayout.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx2
14 files changed, 22 insertions, 24 deletions
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 573d899b3b39..350c7ac14944 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_IPCLIENT_HXX
#define INCLUDED_SFX2_IPCLIENT_HXX
-#include <boost/rational.hpp>
-
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
@@ -36,6 +34,9 @@ class SfxInPlaceClient_Impl;
class SfxViewShell;
class SfxObjectShell;
namespace vcl { class Window; }
+namespace boost { template<typename T> class rational; }
+
+
class SFX2_DLLPUBLIC SfxInPlaceClient
{
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 426a9fd9a9df..9acc0e23fd85 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_VIEWFRM_HXX
#define INCLUDED_SFX2_VIEWFRM_HXX
-#include <boost/rational.hpp>
-
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
@@ -45,6 +43,7 @@ class SfxProgress;
class SvData;
class SfxViewShell;
class SystemWindow;
+namespace boost { template<typename T> class rational; }
class Point;
class Size;
class SfxChildWindow;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 39e5f2c2dee3..827bdfd8a615 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -35,11 +35,11 @@
#include <tools/gen.hxx>
#include <tools/errcode.hxx>
#include <vcl/jobset.hxx>
-#include <boost/rational.hpp>
#include <vector>
class SfxBaseController;
class Size;
+namespace boost { template<typename T> class rational; }
namespace vcl { class Window; }
class KeyEvent;
class WorkWindow;
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 29b5de5cfb24..37a513352778 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -22,12 +22,12 @@
#include <svtools/svtdllapi.h>
#include <tools/stream.hxx>
-#include <boost/rational.hpp>
#include <vector>
class Point;
class Rectangle;
class Size;
+namespace boost { template<typename T> class rational; }
class IMapObject;
typedef ::std::vector< IMapObject* > IMapObjectList_impl;
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 003a2e1b78b4..fd6c164c439a 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SVTOOLS_IMAPCIRC_HXX
#define INCLUDED_SVTOOLS_IMAPCIRC_HXX
-#include <boost/rational.hpp>
-
#include <svtools/svtdllapi.h>
#include <tools/gen.hxx>
#include <svtools/imapobj.hxx>
+namespace boost { template<typename T> class rational; }
+
class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
{
Point aCenter;
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index 40fff04898ed..e01b3114205b 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_SVTOOLS_IMAPPOLY_HXX
#define INCLUDED_SVTOOLS_IMAPPOLY_HXX
-#include <boost/rational.hpp>
-
#include <svtools/svtdllapi.h>
#include <svtools/imapobj.hxx>
#include <tools/poly.hxx>
+namespace boost { template<typename T> class rational; }
+
class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
{
Polygon aPoly;
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index 48dff3cd95cf..6855fb36926c 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SVTOOLS_IMAPRECT_HXX
#define INCLUDED_SVTOOLS_IMAPRECT_HXX
-#include <boost/rational.hpp>
-
#include <svtools/svtdllapi.h>
#include <svtools/imapobj.hxx>
#include <tools/gen.hxx>
+namespace boost { template<typename T> class rational; }
+
class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
{
Rectangle aRect;
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 6ce22f6a8ba9..2bb32dfae246 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
#define INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
-#include <boost/rational.hpp>
-
#include <sal/types.h>
#include <svx/svxdllapi.h>
@@ -32,6 +30,7 @@ class SdrObject;
class SfxItemSet;
class SfxPoolItem;
class SfxStyleSheet;
+namespace boost { template<typename T> class rational; }
class SfxItemPool;
class SdrModel;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 70482322c617..7386409c4cd2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -34,7 +34,6 @@
#include <vector>
#include <boost/intrusive_ptr.hpp>
-#include <boost/rational.hpp>
#include <mdds/flat_segment_tree.hpp>
namespace editeng { class SvxBorderLine; }
@@ -70,6 +69,7 @@ class RefMovedHint;
}
+namespace boost { template<typename T> class rational; }
class OutputDevice;
class SfxItemPoolCache;
class SvtListener;
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 66bdc7e50edb..67b07f5eaf01 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SC_INC_PATATTR_HXX
#define INCLUDED_SC_INC_PATATTR_HXX
-#include <boost/rational.hpp>
-
#include <svl/poolitem.hxx>
#include <svl/itemset.hxx>
#include <unotools/fontcvt.hxx>
@@ -30,6 +28,7 @@
namespace vcl { class Font; }
class OutputDevice;
+namespace boost { template<class T> class rational; }
class ScStyleSheet;
class SvNumberFormatter;
class ScDocument;
diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx
index 15ef550ee0db..740ee0380ada 100644
--- a/sc/source/ui/inc/drawutil.hxx
+++ b/sc/source/ui/inc/drawutil.hxx
@@ -20,10 +20,9 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_DRAWUTIL_HXX
#define INCLUDED_SC_SOURCE_UI_INC_DRAWUTIL_HXX
-#include <boost/rational.hpp>
-
#include "address.hxx"
+namespace boost { template<typename T> class rational; }
class OutputDevice;
class ScDocument;
diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index ff745bf48024..ef365727b087 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /*
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +20,6 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
-#include <boost/rational.hpp>
-
#include <sal/types.h>
@@ -29,6 +28,8 @@
class SdrObject;
class SfxItemSet;
class Rectangle;
+namespace boost { template<class T> class rational; }
+
// class to remember broadcast start positions
namespace sdr
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 60a55430de1d..90488a1354f7 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -22,7 +22,6 @@
// template class <std::vector>
#include <vector>
-#include <boost/rational.hpp>
// datatypes sal_xyz
#include <sal/types.h>
// classes <Point>, <Size> and <Rectangle>
@@ -33,6 +32,7 @@
class SwViewShell;
class SwRootFrm;
class SwPageFrm;
+namespace boost { template<typename T> class rational; }
struct PreviewPage;
/** page preview functionality in the writer
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index a1969879ff91..ae86642f8d73 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -25,7 +25,6 @@
#include <vcl/timer.hxx>
#include <swrect.hxx>
#include <swtypes.hxx>
-#include <boost/rational.hpp>
#include <vector>
class SwViewShell;
@@ -41,6 +40,7 @@ class SwPageFrm;
class SwRegionRects;
class SwAccessibleMap;
class SdrObject;
+namespace boost { template<typename T> class rational; }
class SwPrintData;
class SwPagePreviewLayout;
struct PreviewPage;