summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-04-26 01:59:41 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-04-27 20:53:26 +1000
commit2c027cdc4566e9a19d946fc84826b911ae5130e9 (patch)
treeaa8437ade816155f882065a590fc5116bad5d70f /include
parentfaa47ba99d487436aa19bd8ca6eea0eccf83f4c0 (diff)
VCL: again move text and font functions in outdev.hxx
Change-Id: Id149b071ff69b2eda04c1b10238531378c738867
Diffstat (limited to 'include')
-rw-r--r--include/vcl/outdev.hxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index d609a5b962ba..b2adeef22b15 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -357,6 +357,9 @@ private:
public:
virtual ~OutputDevice();
+private:
+ SAL_DLLPRIVATE OutputDevice& operator =( const OutputDevice& rOutDev );
+
public:
/** Get the graphic context that the output device uses to draw on.
@@ -580,6 +583,12 @@ public:
bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex,
int nLen, int nBase, MetricVector& rVector );
+private:
+ typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
+
+ SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists );
+ SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists );
+ SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists );
///@}
SAL_DLLPRIVATE void ImplInitFillColor();
@@ -656,14 +665,6 @@ protected:
virtual void DrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
private:
- typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
-
- SAL_DLLPRIVATE OutputDevice& operator =( const OutputDevice& rOutDev );
-
- SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists );
- SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists );
- SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists );
-
// not implemented; to detect misuses of DrawOutDev(...OutputDevice&);
void DrawOutDev( const Point&, const Size&, const Point&, const Size&, const Printer&);