diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-07 18:18:43 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-19 10:26:29 +0200 |
| commit | 4e98ba4ba5c17ab8ae1170662af645b9d2bfde84 (patch) | |
| tree | 645ebd6f8d5daf918190e8fe7d71a456ddfd0d90 /include/xmloff/prstylei.hxx | |
| parent | bd03dc39f6f02a875590413378355daa4893a988 (diff) | |
tdf#103602 xmloff,sw: ODF 1.3 import: PageStyle with drawing-page style
Associate a style of family "drawing-page" with a style:master-page.
This fixes the small part of the draw:fill attribute problem that is
covered by OFFICE-3937 in ODF 1.3.
This is the import part.
Change-Id: I4c86fa24c36407b64ce33f0890e5da8c26c5292a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93670
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include/xmloff/prstylei.hxx')
| -rw-r--r-- | include/xmloff/prstylei.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index f1bf99e6e859..8aa109ff702e 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -47,13 +47,15 @@ private: XMLPropStyleContext(XMLPropStyleContext const &) = delete; XMLPropStyleContext& operator =(XMLPropStyleContext const &) = delete; -protected: +public: // Helper to check if the local maProperties contains the given // FillStyle tag and if the FillStyle there is different from FillStyle_NONE bool doNewDrawingLayerFillStyleDefinitionsExist( const OUString& rFillStyleTag) const; +protected: + // Helper which will deactivate all old fill definitions (identified by // the given OldFillStyleDefinitionSet) in the local maProperties. Deactivation // is done setting theindex to -1. It returns true when actually old fill |