diff options
| author | Noel Power <noel.power@novell.com> | 2012-08-09 11:15:43 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-10-03 09:48:29 +0100 |
| commit | 46f9e6ce6b9fc6c21c1d682a35954523ed435647 (patch) | |
| tree | 18544be2e650d33a9914cbc7287b2876ad579609 /sc | |
| parent | ebc8ebaff65ac02d410c8e9e39c2776131955cd7 (diff) | |
misc comment import/export fixes
Cherry pick the rest of the commit ...
a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added
support for shadow element with attributes, shadow color, shadow obscured )
b) use proper fillcolor attribute
c) detect whether note/comment is shown on import
d) export state of note ( shown/hidden )
text position still not perfect, we still are missing some attributes to control
that.
Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea
Conflicts:
oox/source/export/vmlexport.cxx
sc/source/filter/xcl97/xcl97rec.cxx
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 212bb6bc2005..500a332d78d7 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -568,6 +568,19 @@ void VmlCommentExporter::Commit( EscherPropertyContainer& rProps, const Rectangl lcl_FillProps( rProps, mpCaption, mbVisible ); rProps.AddOpt( ESCHER_Prop_fHidden, mbVisible ); // bool field + // shadow property value for comment ( set in lcl_FillProps [*] ) has been + // overwritten by new value ( 0x20000 ) in the generic part of the export + // ( see EscherPropertyContainer::CreateShadowProperties ) + // Safer option here is to just force the needed value here for oox vml + // export alone ( and avoid potential problems with binary export ) + // #TODO investigate value of ESCHER_Prop_fshadowObscured generally + // in binary export ( if indeed this value is good for binary export ) + // we can change the heuristics and/or initialisation path and get + // rid of line below. + // [*] lcl_FillProps seems to be called twice when exporting to xlsx + // once from XclObjComment::ProcessEscherObj #TODO look into that also + rProps.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // force value for comments + VMLExport::Commit( rProps, rRect ); } |