diff options
| author | Justin Luth <justin.luth@collabora.com> | 2019-10-03 15:42:47 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-09 13:53:17 +0200 |
| commit | 5e97d1a57717f8dbf69b987d2bda8616972eec52 (patch) | |
| tree | 90870bf4d77394acb4259056aec4b12a2ce09ab4 /writerfilter/source/dmapper/DomainMapper_Impl.hxx | |
| parent | 2fdfd6fcf6da5f11846c8c99943e24d85baf92c5 (diff) | |
NFC writerfilter: preparation for adding CharProps to GetAnyProperty
...for tdf#99602 specifically, but I've intended to do this for a
long time.
Currently GetAnyProperty doesn't look in Character Styles for the
requested property. But it should. GetPropertyFromCharStySheet
can re-use a lot of the code for GetPropertyFromStyleSheet,
so split that up and explicitly identify the existing function
as ParaStyle.
Change-Id: I9843153a6c09a10d63a575cb1f35a56c21c9cb9c
Reviewed-on: https://gerrit.libreoffice.org/80180
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.hxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 1a1be8dc32bd..40ac9db86fdd 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -712,8 +712,11 @@ public: OUString GetCurrentParaStyleName(); OUString GetDefaultParaStyleName(); - css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId); - // get property first from the given context, or secondly from its stylesheet + // specified style - including inherited properties. Indicate whether paragraph defaults should be checked. + css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId, StyleSheetEntryPtr pEntry, const bool bPara); + // current paragraph style - including inherited properties + css::uno::Any GetPropertyFromParaStyleSheet(PropertyIds eId); + // get property first from the given context, or secondly via inheritance from styles/docDefaults css::uno::Any GetAnyProperty(PropertyIds eId, const PropertyMapPtr& rContext); void SetStyleSheetImport( bool bSet ) { m_bInStyleSheetImport = bSet;} bool IsStyleSheetImport()const { return m_bInStyleSheetImport;} |