summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-04-20 11:47:58 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-04-20 12:17:50 +1000
commit588bb542bebdee5a67bd4695253c70646fb8a303 (patch)
tree1c91b0e9dc31f745a7b00d874df27525065fa789 /include
parent7f62b44458fb27f8aca652436aeafb5e033264bd (diff)
fdo#74702 Only VirtualDevice should handle the Word ext lead bug
In #i60945# it was discovered that Unix's leading external font spacing causes problems with the display of documents. Therefore, the reference device implemented a workaround, which was to set the spacing to zero. However, the reference device is a VirtualDevice, so it should really be handled there, not in OutputDevice. I have added a new protected function to OutputDevice, GetFontExtLead() that handles this. Change-Id: I1b84ee7d9f7ae96841b441b52705e67c8115ae5c
Diffstat (limited to 'include')
-rw-r--r--include/vcl/outdev.hxx2
-rw-r--r--include/vcl/virdev.hxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 480e1a8d705f..cd7e5a553f11 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -390,10 +390,10 @@ private:
mutable bool mbRefPoint : 1;
mutable bool mbEnableRTL : 1;
-
protected:
virtual void ImplReleaseFonts();
virtual void SetFontOrientation( ImplFontEntry* const pFontEntry ) const;
+ virtual long GetFontExtLeading() const;
public:
/** @name Initialization and accessor functions
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index b2a29be735bb..072b94d55352 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -141,7 +141,9 @@ private:
SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );
protected:
- virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
+ virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
+
+ virtual long GetFontExtLeading() const SAL_OVERRIDE;
};