summaryrefslogtreecommitdiff
path: root/canvas/source/vcl
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2018-10-24 00:04:56 +0800
committerMark Hung <marklh9@gmail.com>2018-11-01 14:27:31 +0100
commit17cd7dd708631f7af9e66860b403627416e4545e (patch)
treec505e43d7cabe4373e7a6f2675b06ce9b5c48cfe /canvas/source/vcl
parent56d799764d394c906936f7a042dfd3e4219d7063 (diff)
tdf#43671 set emphasis mark of vcl::Font (windows).
Process extra font properties of the canvas font to set emphasis mark when creating vcl::Font. Change-Id: I18ea1aecdde92ed3c777b0db27fcee7976e88476 Reviewed-on: https://gerrit.libreoffice.org/62245 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'canvas/source/vcl')
-rw-r--r--canvas/source/vcl/canvasfont.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 5eb27f9cf0c4..d3ca032d6563 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star;
namespace vclcanvas
{
CanvasFont::CanvasFont( const rendering::FontRequest& rFontRequest,
- const uno::Sequence< beans::PropertyValue >& ,
+ const uno::Sequence< beans::PropertyValue >& rExtraFontProperties,
const geometry::Matrix2D& rFontMatrix,
rendering::XGraphicDevice& rDevice,
const OutDevProviderSharedPtr& rOutDevProvider ) :
@@ -82,6 +82,13 @@ namespace vclcanvas
rOutDev.EnableMapMode(bOldMapState);
}
+
+ sal_uInt32 nEmphasisMark = 0;
+
+ ::canvas::tools::extractExtraFontProperties(rExtraFontProperties, nEmphasisMark);
+
+ if (nEmphasisMark)
+ maFont->SetEmphasisMark(FontEmphasisMark(nEmphasisMark));
}
void SAL_CALL CanvasFont::disposing()