Kaydet (Commit) c1780b4c authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Noel Grandin

Avoid uncommon C++ style of forward declaration combined with its use

Change-Id: I870821ec64653391caf516cbd3aa890637d7dd24
Reviewed-on: https://gerrit.libreoffice.org/17367Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 506be190
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <unordered_map> #include <unordered_map>
class FreetypeManager;
class FtFontInfo; class FtFontInfo;
class GlyphCachePeer; class GlyphCachePeer;
class GlyphData; class GlyphData;
...@@ -99,7 +100,7 @@ private: ...@@ -99,7 +100,7 @@ private:
mutable int mnGlyphCount; mutable int mnGlyphCount;
ServerFont* mpCurrentGCFont; ServerFont* mpCurrentGCFont;
class FreetypeManager* mpFtManager; FreetypeManager* mpFtManager;
}; };
class GlyphMetric class GlyphMetric
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
class AquaSalFrame; class AquaSalFrame;
class ImplDevFontAttributes; class ImplDevFontAttributes;
class CoreTextStyle; class CoreTextStyle;
class XorEmulation;
typedef sal_uInt32 sal_GlyphId; typedef sal_uInt32 sal_GlyphId;
typedef std::vector<unsigned char> ByteVector; typedef std::vector<unsigned char> ByteVector;
...@@ -146,7 +147,7 @@ protected: ...@@ -146,7 +147,7 @@ protected:
CGLayerRef mxLayer; // Quartz graphics layer CGLayerRef mxLayer; // Quartz graphics layer
CGContextRef mrContext; // Quartz drawing context CGContextRef mrContext; // Quartz drawing context
int mnContextStackDepth; int mnContextStackDepth;
class XorEmulation* mpXorEmulation; XorEmulation* mpXorEmulation;
int mnXorMode; // 0: off 1: on 2: invert only int mnXorMode; // 0: off 1: on 2: invert only
int mnWidth; int mnWidth;
int mnHeight; int mnHeight;
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
namespace x11 { namespace x11 {
class PixmapHolder; // in bmp.hxx class PixmapHolder; // in bmp.hxx
class SelectionManager;
rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType );
...@@ -76,7 +77,7 @@ namespace x11 { ...@@ -76,7 +77,7 @@ namespace x11 {
bool m_bActive; bool m_bActive;
sal_Int8 m_nDefaultActions; sal_Int8 m_nDefaultActions;
::Window m_aTargetWindow; ::Window m_aTargetWindow;
class SelectionManager* m_pSelectionManager; SelectionManager* m_pSelectionManager;
css::uno::Reference< css::datatransfer::dnd::XDragSource > css::uno::Reference< css::datatransfer::dnd::XDragSource >
m_xSelectionManager; m_xSelectionManager;
::std::list< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > > ::std::list< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment