[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - filter/source

[Julien Nabet]

 filter/source/svg/svgfilter.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d38f716970027cceb3f28c35a2f6dbe36554ae08
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 29 11:05:06 2015 +0100

    tdf#63324: Fix convert for svg filter
    
    If no currentFrame, it means we are in headless case
    
    Change-Id: I840a9085417451fa1d4c0bd8311408357a8f60e9
    Reviewed-on: https://gerrit.libreoffice.org/20268
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 8f7fe77b9ffeb45f5765d9d8f45710956a3e73d3)
    Reviewed-on: https://gerrit.libreoffice.org/20322
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 9303b8f..7fd4798 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());