From d38f716970027cceb3f28c35a2f6dbe36554ae08 Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Sun, 29 Nov 2015 11:05:06 +0100
Subject: tdf#63324: Fix convert for svg filter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If no currentFrame, it means we are in headless case

Change-Id: I840a9085417451fa1d4c0bd8311408357a8f60e9
Reviewed-on: https://gerrit.libreoffice.org/20268
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 8f7fe77b9ffeb45f5765d9d8f45710956a3e73d3)
Reviewed-on: https://gerrit.libreoffice.org/20322
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
---
 filter/source/svg/svgfilter.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 9303b8fcd657..7fd47989c9ba 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -129,11 +129,11 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
         }
 
         uno::Reference<frame::XDesktop2> xDesktop(frame::Desktop::create(mxContext));
-        uno::Reference<frame::XFrame> xFrame(xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW);
-        uno::Reference<frame::XController > xController(xFrame->getController(), uno::UNO_QUERY_THROW);
-
-        if (!bPageProvided)
+        uno::Reference<frame::XController > xController;
+        if (xDesktop->getCurrentFrame().is() && !bPageProvided) // Manage headless case
         {
+            uno::Reference<frame::XFrame> xFrame(xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW);
+            xController.set(xFrame->getController(), uno::UNO_QUERY_THROW);
             uno::Reference<drawing::XDrawView> xDrawView(xController, uno::UNO_QUERY_THROW);
             uno::Reference<drawing::framework::XControllerManager> xManager(xController, uno::UNO_QUERY_THROW);
             uno::Reference<drawing::framework::XConfigurationController> xConfigController(xManager->getConfigurationController());
-- 
cgit v1.2.3