summaryrefslogtreecommitdiffstats
path: root/filter/source/svg/svgfilter.cxx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-12-14 22:06:35 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2018-12-15 00:20:21 +0100
commit870d30c62bb5f579dfa4e6fb2e32dd796159f3b3 (patch)
tree73cd5304c6292dbe3074ecbd7d822f3946766402 /filter/source/svg/svgfilter.cxx
parentRelated: tdf#118705 Fix Column/Bar Chart data label placement (diff)
downloadcore-870d30c62bb5f579dfa4e6fb2e32dd796159f3b3.tar.gz
core-870d30c62bb5f579dfa4e6fb2e32dd796159f3b3.zip
lok: Implement SVG export for Calc (SelectionOnly mode)
Change-Id: Ic305e5305890fd1efa3a3130e5216f9c672870e5 Reviewed-on: https://gerrit.libreoffice.org/65175 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'filter/source/svg/svgfilter.cxx')
-rw-r--r--filter/source/svg/svgfilter.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 539891c8b5ae..3f3b0d2b8e00 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -88,7 +88,7 @@ SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
mbExportShapeSelection(false),
maFilterData(),
mxDefaultPage(),
- mbWriterFilter(false),
+ mbWriterOrCalcFilter(false),
mpDefaultSdrPage( nullptr ),
mpSdrModel( nullptr ),
mbPresentation( false ),
@@ -107,10 +107,10 @@ SVGFilter::~SVGFilter()
sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
{
- mbWriterFilter = false;
+ mbWriterOrCalcFilter = false;
if(mxDstDoc.is()) // Import works for Impress / draw only
- return filterImpressDraw(rDescriptor);
+ return filterImpressOrDraw(rDescriptor);
if(mxSrcDoc.is())
{
@@ -120,20 +120,20 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
{
OUString sFilterName;
rDescriptor[nInd].Value >>= sFilterName;
- if(sFilterName == "writer_svg_Export")
+ if(sFilterName != "impress_svg_Export")
{
- mbWriterFilter = true;
- return filterWriter(rDescriptor);
+ mbWriterOrCalcFilter = true;
+ return filterWriterOrCalc(rDescriptor);
}
break;
}
}
- return filterImpressDraw(rDescriptor);
+ return filterImpressOrDraw(rDescriptor);
}
return false;
}
-bool SVGFilter::filterImpressDraw( const Sequence< PropertyValue >& rDescriptor )
+bool SVGFilter::filterImpressOrDraw( const Sequence< PropertyValue >& rDescriptor )
{
SolarMutexGuard aGuard;
vcl::Window* pFocusWindow(Application::GetFocusWindow());
@@ -536,7 +536,7 @@ bool SVGFilter::filterImpressDraw( const Sequence< PropertyValue >& rDescriptor
return bRet;
}
-bool SVGFilter::filterWriter( const Sequence< PropertyValue >& rDescriptor )
+bool SVGFilter::filterWriterOrCalc( const Sequence< PropertyValue >& rDescriptor )
{
bool bSelectionOnly = false;