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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.hxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 6b4d8a1a154f..3a5fe2bb5629 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -186,6 +186,7 @@ ScXMLCellExportPropertyMapper::~ScXMLCellExportPropertyMapper() } void ScXMLCellExportPropertyMapper::ContextFilter( + bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, uno::Reference< beans::XPropertySet > rPropSet ) const { @@ -503,7 +504,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter( pDiagonalBLTRWidthState->maValue.clear(); } - SvXMLExportPropertyMapper::ContextFilter(rProperties, rPropSet); + SvXMLExportPropertyMapper::ContextFilter(bEnableFoFontFamily, rProperties, rPropSet); } /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ @@ -553,6 +554,7 @@ ScXMLRowExportPropertyMapper::~ScXMLRowExportPropertyMapper() } void ScXMLRowExportPropertyMapper::ContextFilter( + bool /* bEnableFoFontFamily */, ::std::vector< XMLPropertyState >& /* rProperties */, uno::Reference< beans::XPropertySet > /* rPropSet */ ) const { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index e879ddf6e069..888a093ef81d 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -106,6 +106,7 @@ class ScXMLCellExportPropertyMapper : public SvXMLExportPropertyMapper protected: /** 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; @@ -135,6 +136,7 @@ class ScXMLRowExportPropertyMapper : public SvXMLExportPropertyMapper protected: /** 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; |