diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-18 12:26:37 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-01 10:35:18 +0200 |
| commit | 1717b2b15a2d90906c20874d6da25a7e5722fb06 (patch) | |
| tree | 4883454e3a95d310235fed9613df1d0bef794bb4 /.gitreview | |
| parent | d3895c7d031557fa51ce718bc5748e17784e825c (diff) | |
tdf#117614 svx: make drawing.GraphicExportFilter work with sw images
A Writer image has an underlying SdrObject, but GetSdrObjectFromXShape()
won't work for it, also we can't an sw SdrObject into an XShape because
SvxDrawPage::CreateShape() has no idea how to handle sw's
SdrInventor::Swg inventor.
Fix the problem by just getting the Graphic of the Writer image and
improve GraphicExportFilter to be able to work with just a Graphic as
well.
(cherry picked from commit aca5e1ba7f33c8913304b5f90ef478f316e64263)
Conflicts:
svx/CppunitTest_svx_unit.mk
svx/source/unodraw/UnoGraphicExporter.cxx
Change-Id: I3c9b3005366fcc87815597a27df3cb8a99a8876c
Reviewed-on: https://gerrit.libreoffice.org/54688
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to '.gitreview')
| -rw-r--r-- | .gitreview | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview index ec9d1f3cd807..46c9ae9716d3 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-6-0 +defaultbranch=distro/collabora/cp-6.0 |