diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-22 02:02:07 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-22 07:53:36 +0200 |
| commit | 2d1fe7fb67ec1ff1b96912c0945d17d54aecb12e (patch) | |
| tree | 6d783d7a89d3613544b6de64245f7e9ae147bc75 /include/filter | |
| parent | tdf#108706 Unify loading document progress bar label (diff) | |
| download | core-2d1fe7fb67ec1ff1b96912c0945d17d54aecb12e.tar.gz core-2d1fe7fb67ec1ff1b96912c0945d17d54aecb12e.zip | |
Fix two issues in ActiveX DOCX import / export code
* Inline anchored VML shape had wrong vertical position
** In MSO inline shapes are positioned to the top of the baseline
* During export all shape ids were the same (shape_0)
** VML shapes used to be exported only as fallback,
I guess that's why it did not cause any issue before.
** Override the shapeid generator with a new one, which
actually generates unique shapeids.
Change-Id: I752f39d092d0b61d91824141655dae662dbeafbc
Reviewed-on: https://gerrit.libreoffice.org/41319
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 14e1d69d5aab..f1468ef7f5df 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1052,7 +1052,7 @@ public: /** Creates and returns a new shape identifier, updates the internal shape counters and registers the identifier in the DGG cluster table. */ - sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } + virtual sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } /** Returns the graphic provider from the global object that has been passed to the constructor. |