vcl/inc/generic/glyphcache.hxx | 3 ++-
vcl/inc/quartz/salgdi.h | 3 ++-
vcl/unx/generic/dtrans/X11_selection.hxx | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c1780b4c9217b3b5374907b7e537f481ed2c680e
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jul 27 12:59:03 2015 +0300
Avoid uncommon C++ style of forward declaration combined with its use
Change-Id: I870821ec64653391caf516cbd3aa890637d7dd24
Reviewed-on: https://gerrit.libreoffice.org/17367
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 0a352a1..98baaaa 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -37,6 +37,7 @@
#include <unordered_map>
+class FreetypeManager;
class FtFontInfo;
class GlyphCachePeer;
class GlyphData;
@@ -99,7 +100,7 @@ private:
mutable int mnGlyphCount;
ServerFont* mpCurrentGCFont;
- class FreetypeManager* mpFtManager;
+ FreetypeManager* mpFtManager;
};
class GlyphMetric
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index c378f20..557d1496 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -48,6 +48,7 @@
class AquaSalFrame;
class ImplDevFontAttributes;
class CoreTextStyle;
+class XorEmulation;
typedef sal_uInt32 sal_GlyphId;
typedef std::vector<unsigned char> ByteVector;
@@ -146,7 +147,7 @@ protected:
CGLayerRef mxLayer; // Quartz graphics
layer
CGContextRef mrContext; // Quartz drawing
context
int mnContextStackDepth;
- class XorEmulation* mpXorEmulation;
+ XorEmulation* mpXorEmulation;
int mnXorMode; // 0: off 1: on 2:
invert only
int mnWidth;
int mnHeight;
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx
b/vcl/unx/generic/dtrans/X11_selection.hxx
index 616b17f..f91d0fd 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -47,6 +47,7 @@
namespace x11 {
class PixmapHolder; // in bmp.hxx
+ class SelectionManager;
rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType );
@@ -76,7 +77,7 @@ namespace x11 {
bool m_bActive;
sal_Int8 m_nDefaultActions;
::Window m_aTargetWindow;
- class SelectionManager* m_pSelectionManager;
+ SelectionManager* m_pSelectionManager;
css::uno::Reference< css::datatransfer::dnd::XDragSource >
m_xSelectionManager;
::std::list< css::uno::Reference<
css::datatransfer::dnd::XDropTargetListener > >
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
