diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-04 15:35:18 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-19 15:32:23 +0000 |
| commit | dc46c86f56e0573d13d6b8140ef1aaf6f0db7895 (patch) | |
| tree | b129e87a87554dd43b26553a074d4940d4fd08a0 /include | |
| parent | 195ac805ee3350adb5971c90edee3ee8481f41a9 (diff) | |
Resolves: fdo#68431 style:font-name unknown in non autostyles in impress/draw
Reviewed-on: https://gerrit.libreoffice.org/5810
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>
Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d87cb77b42b591b1333aacd60e107514d6e20864)
Conflicts:
xmloff/source/style/xmlexppr.cxx
Change-Id: Ib904af4fac5659821ba3b5dbbf62370df8243001
Reviewed-on: https://gerrit.libreoffice.org/5988
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmlexppr.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 7e7bb7658903..66e83d3df28b 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -59,10 +59,11 @@ protected: ::std::vector< XMLPropertyState > _Filter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet, - const sal_Bool bDefault ) const; + bool bDefault, bool bDisableFoFontFamily) const; /** Application-specific filter. By default do nothing. */ virtual void ContextFilter( + bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet ) const; @@ -111,8 +112,8 @@ public: filter-processes. */ ::std::vector< XMLPropertyState > Filter( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const - { return _Filter(rPropSet, sal_False); } + ::com::sun::star::beans::XPropertySet > rPropSet, bool bEnableFoFontFamily = false) const + { return _Filter(rPropSet, false, bEnableFoFontFamily); } /** Like Filter(), except that: * - only properties that have the map flag MID_FLAG_DEFAULT_ITEM_EXPORT @@ -121,8 +122,8 @@ public: */ ::std::vector< XMLPropertyState > FilterDefaults( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const - { return _Filter(rPropSet, sal_True); } + ::com::sun::star::beans::XPropertySet > rPropSet, bool bEnableFoFontFamily = false) const + { return _Filter(rPropSet, true, bEnableFoFontFamily); } /** Compare to arrays of XMLPropertyState */ sal_Bool Equals( const ::std::vector< XMLPropertyState >& aProperties1, |