summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2015-12-07 18:24:50 +0100
committerAndras Timar <andras.timar@collabora.com>2015-12-07 19:42:57 +0000
commitab794090190e12daa4dab209889c084cd8e8b6f9 (patch)
tree0ab6402a7a60f23d1407ea2e015793d8bb2325d4 /filter
parentda150e5e30cd1c56e5dc6de7201af58bf98b291a (diff)
svg-export: fix wrong conflict resolution
Change-Id: Ibf3d054558c1fbf208b6d1a4683d52837b2bc183 Reviewed-on: https://gerrit.libreoffice.org/20447 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/svgexport.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6824d959d8e1..4a64b7bbed09 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -893,7 +893,7 @@ bool SVGFilter::implExportDocument()
}
// #i124608# export a given object selection, so no MasterPage export at all
- if (!mbExportSelection)
+ if (!mbExportShapeSelection)
implExportMasterPages( mMasterPageTargets, 0, mMasterPageTargets.size() - 1 );
implExportDrawPages( mSelectedPages, 0, nLastPage );