[Libreoffice-commits] core.git: filter/source

[Marco Cecchetti]

 filter/source/svg/svgexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab794090190e12daa4dab209889c084cd8e8b6f9
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Mon Dec 7 18:24:50 2015 +0100

    svg-export: fix wrong conflict resolution
    
    Change-Id: Ibf3d054558c1fbf208b6d1a4683d52837b2bc183
    Reviewed-on: https://gerrit.libreoffice.org/20447
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6824d95..4a64b7b 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 );