diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 10:11:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 14:15:20 +0100 |
| commit | d3de12fcfc85feb36eda3b0495807ef11d8fe772 (patch) | |
| tree | d1e966530c2e306d608becd3462b156931a483c4 /sw/inc | |
| parent | bf7ddfdeb7a81c112c5c9c25c4819bc576e87859 (diff) | |
Resolves: fdo#81277 missing table cell background color in doc/html import
a regression from one of the DrawingLayer FillAttributes
changes of...
commit 7d9bb549d498d6beed2c4050c402d09643febdfa
Author: Armin Le Grand <alg@apache.org>
Date: Mon Jun 2 15:00:50 2014 +0000
Related: #i124638# Second step of DrawingLayer FillAttributes...
for Writer objects, now added support for Paragraph and PageStyle (including
Header and Footer) for direct attributes and style attributes
commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c
Author: Armin Le Grand <alg@apache.org>
Date: Thu Apr 17 16:44:58 2014 +0000
i#124638 support for DrawingLayre FillStyle for GraphicFrames and ...
... EmbeddedObjectFrames in Writer
commit 6e61ecd09679a66060f932835622821d39e92f01
Author: Armin Le Grand <alg@apache.org>
Date: Wed Mar 19 16:17:02 2014 +0000
Merge back branch alg_writerframes to trunk
all of which set all RES_FLYFRMFMT and RES_FRMFMT SwFmts
to use the new fill attributes, but
a) didn't change the aTableBoxSetRange for SwTableBoxFmt to include the XFILL
attributes, so importing cell bgs from .doc got dropped
b) didn't make any effort in the uno api for XCells to do the same sort
of mapping that was done for XFrames
its unclear to me if SwDrawFrmFmt is actually adapted or not, I've
assumed that it is here
Change-Id: I8d71def2aef6163099a16591f9e53ba2b430bd06
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/format.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/frmfmt.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/swtblfmt.hxx | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 9a52566a5769..1b6056981966 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -334,6 +334,7 @@ public: //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const; + virtual bool IsAdaptedToNewFillProperties() const; }; inline void SwFmt::SetName( const sal_Char* pNewName, diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 0a2a2caa35ed..715f92a481ca 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -138,6 +138,7 @@ public: //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE; + virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE; }; // The FlyFrame-Format diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 914e8c6c7838..142959e3cdf8 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -41,6 +41,8 @@ public: TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt) + + virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE; }; class SwTableLineFmt : public SwFrmFmt @@ -61,6 +63,8 @@ public: TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt) + + virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt @@ -84,6 +88,8 @@ public: TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt) + + virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE; }; #endif |