summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-10-14 14:38:33 +0200
committerDavid Tardon <dtardon@redhat.com>2014-10-14 17:56:23 +0200
commit091742e86aeb5287f7236f666fee48946ab4c67b (patch)
tree34e1f082e973807c012773856d7f572a27504da0
parent92f66c5813c34ed470cc00f0d83ed4d80ab39f5c (diff)
do not forward-declare templates
Change-Id: I3b0a145f70406f0c8a12b6c4b7876c4148f76e93
-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, 24 insertions, 22 deletions
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 350c7ac14944..573d899b3b39 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -19,6 +19,8 @@
#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>
@@ -34,9 +36,6 @@ 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 9acc0e23fd85..426a9fd9a9df 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -19,6 +19,8 @@
#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>
@@ -43,7 +45,6 @@ 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 827bdfd8a615..39e5f2c2dee3 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 37a513352778..29b5de5cfb24 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 fd6c164c439a..003a2e1b78b4 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 e01b3114205b..40fff04898ed 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 6855fb36926c..48dff3cd95cf 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 2bb32dfae246..6ce22f6a8ba9 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -20,6 +20,8 @@
#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>
@@ -30,7 +32,6 @@ 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 6c33f74bed8d..50204b310c99 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -34,6 +34,7 @@
#include <vector>
#include <boost/intrusive_ptr.hpp>
+#include <boost/rational.hpp>
#include <mdds/flat_segment_tree.hpp>
namespace editeng { class SvxBorderLine; }
@@ -69,7 +70,6 @@ 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 67b07f5eaf01..66bdc7e50edb 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -20,6 +20,8 @@
#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>
@@ -28,7 +30,6 @@
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 740ee0380ada..15ef550ee0db 100644
--- a/sc/source/ui/inc/drawutil.hxx
+++ b/sc/source/ui/inc/drawutil.hxx
@@ -20,9 +20,10 @@
#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 ef365727b087..ff745bf48024 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -1,5 +1,4 @@
-/* -*- 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
@@ -20,6 +19,8 @@
#ifndef INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
#define INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#include <boost/rational.hpp>
+
#include <sal/types.h>
@@ -28,8 +29,6 @@
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 90488a1354f7..60a55430de1d 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -22,6 +22,7 @@
// template class <std::vector>
#include <vector>
+#include <boost/rational.hpp>
// datatypes sal_xyz
#include <sal/types.h>
// classes <Point>, <Size> and <Rectangle>
@@ -32,7 +33,6 @@
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 ae86642f8d73..a1969879ff91 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -25,6 +25,7 @@
#include <vcl/timer.hxx>
#include <swrect.hxx>
#include <swtypes.hxx>
+#include <boost/rational.hpp>
#include <vector>
class SwViewShell;
@@ -40,7 +41,6 @@ class SwPageFrm;
class SwRegionRects;
class SwAccessibleMap;
class SdrObject;
-namespace boost { template<typename T> class rational; }
class SwPrintData;
class SwPagePreviewLayout;
struct PreviewPage;