summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-10-27 13:15:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-10-27 13:18:35 +0100
commit9c8d3789466d636b9fdedbabf1460aee29963a28 (patch)
tree9089e61d78038a0d4bc1fa4a9969e7684a6a071a /vcl
parent3b74ade04788adbe5a86005e875895c5f84d5ae5 (diff)
remove ItalicMatrix into delivered header
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/outfont.hxx16
-rw-r--r--vcl/inc/vcl/fontmanager.hxx1
-rw-r--r--vcl/inc/vcl/vclenum.hxx16
3 files changed, 16 insertions, 17 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 857d94416925..8dda453c7492 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -156,22 +156,6 @@ friend class ImplDevFontListData;
// - ImplFontSelectData -
// ----------------------
-struct ItalicMatrix
-{
- double xx, xy, yx, yy;
- ItalicMatrix() : xx(1), xy(0), yx(0), yy(1) {}
-};
-
-inline bool operator ==(const ItalicMatrix& a, const ItalicMatrix& b)
-{
- return a.xx == b.xx && a.xy == b.xy && a.yx == b.yx && a.yy == b.yy;
-}
-
-inline bool operator !=(const ItalicMatrix& a, const ItalicMatrix& b)
-{
- return a.xx != b.xx || a.xy != b.xy || a.yx != b.yx || a.yy != b.yy;
-}
-
class ImplFontSelectData : public ImplFontAttributes
{
public:
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 4a110ad83c80..0ae9b957a481 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -37,7 +37,6 @@
#include "vcl/dllapi.h"
#include "vcl/helper.hxx"
#include "vcl/vclenum.hxx"
-#include "outfont.hxx"
#include "com/sun/star/lang/Locale.hpp"
#include <vector>
diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx
index a833d0594f07..dbc18302ce41 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/vcl/inc/vcl/vclenum.hxx
@@ -190,6 +190,22 @@ enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, O
#endif
+struct ItalicMatrix
+{
+ double xx, xy, yx, yy;
+ ItalicMatrix() : xx(1), xy(0), yx(0), yy(1) {}
+};
+
+inline bool operator ==(const ItalicMatrix& a, const ItalicMatrix& b)
+{
+ return a.xx == b.xx && a.xy == b.xy && a.yx == b.yx && a.yy == b.yy;
+}
+
+inline bool operator !=(const ItalicMatrix& a, const ItalicMatrix& b)
+{
+ return a.xx != b.xx || a.xy != b.xy || a.yx != b.yx || a.yy != b.yy;
+}
+
#endif // _VCL_VCLENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */