[Libreoffice-commits] .: vcl/inc

[Caolán McNamara]

 vcl/inc/outfont.hxx         |   16 ----------------
 vcl/inc/vcl/fontmanager.hxx |    1 -
 vcl/inc/vcl/vclenum.hxx     |   16 ++++++++++++++++
 3 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 9c8d3789466d636b9fdedbabf1460aee29963a28
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 27 13:15:31 2011 +0100

    remove ItalicMatrix into delivered header

diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 857d944..8dda453 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 4a110ad..0ae9b95 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 a833d05..dbc1830 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: */