ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#166779: use model first to obtain selection

Browse Source 
The current frame can be Basic, so only use it as a fallback to obtain selection.
Also, failure to get the selection is not fatal here.

The throwing behavior was since commit aa1927dc25
(Make svg export use slidesorter selection in most cases., 2012-10-10).

Change-Id: I06f80151b4184f353d1d5387c11837f1e883a068
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185983
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski
2025-05-29 10:24:24 +02:00
parent 7885ec2c55
commit 58ba249df5
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/source/svg/svgfilter.cxx
+23 -15
View File
@@ -149,15 +149,28 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
return filterImpressOrDraw(rDescriptor);
}
css::uno::Reference<css::frame::XController> SVGFilter::getSourceController() const
{
uno::Reference<frame::XController> xController;
// Current frame may be e.g. Basic. Try to get a controller from the source model first.
if (auto xModel = mxSrcDoc.query<frame::XModel>())
xController = xModel->getCurrentController();
// Try current frame as a fallback.
if (!xController)
{
uno::Reference<frame::XDesktop2> xDesktop(frame::Desktop::create(mxContext));
if (auto xFrame = xDesktop->getCurrentFrame()) // Manage headless case
xController = xFrame->getController();
}
return xController;
}
css::uno::Reference<css::frame::XController> SVGFilter::fillDrawImpressSelectedPages()
{
uno::Reference<frame::XDesktop2> xDesktop(frame::Desktop::create(mxContext));
uno::Reference<frame::XFrame> xFrame = xDesktop->getCurrentFrame(); // Manage headless case
if (!xFrame)
uno::Reference<frame::XController> xController = getSourceController();
uno::Reference<drawing::framework::XControllerManager> xManager(xController, uno::UNO_QUERY);
if (!xManager)
return {};
uno::Reference<frame::XController> xController(xFrame->getController(), uno::UNO_SET_THROW);
uno::Reference<drawing::framework::XControllerManager> xManager(xController,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::framework::XConfigurationController> xConfigController(
xManager->getConfigurationController());
@@ -210,9 +223,9 @@ css::uno::Reference<css::frame::XController> SVGFilter::fillDrawImpressSelectedP
if (mSelectedPages.empty())
{
// apparently failed to clean selection - fallback to current page
uno::Reference<drawing::XDrawView> xDrawView(xController, uno::UNO_QUERY_THROW);
mSelectedPages.push_back(xDrawView->getCurrentPage());
// apparently failed to get a selection - fallback to current page
if (auto xDrawView = xController.query<drawing::XDrawView>())
mSelectedPages.push_back(xDrawView->getCurrentPage());
}
return xController;
}
@@ -580,12 +593,7 @@ bool SVGFilter::filterWriterOrCalc( const Sequence< PropertyValue >& rDescriptor
if(!bSelectionOnly) // For Writer only the selection-only mode is supported
return false;
uno::Reference<frame::XDesktop2> xDesktop(frame::Desktop::create(mxContext));
uno::Reference<frame::XController > xController;
if (uno::Reference<frame::XFrame> xFrame = xDesktop->getCurrentFrame())
xController.set(xFrame->getController(), uno::UNO_SET_THROW);
Reference< view::XSelectionSupplier > xSelection (xController, UNO_QUERY);
Reference<view::XSelectionSupplier> xSelection(getSourceController(), UNO_QUERY);
if (!xSelection.is())
return false;
filter/source/svg/svgfilter.hxx
+1
View File
@@ -284,6 +284,7 @@ private:
bool filterImpressOrDraw( const Sequence< PropertyValue >& rDescriptor );
bool filterWriterOrCalc( const Sequence< PropertyValue >& rDescriptor );
css::uno::Reference<css::frame::XController> getSourceController() const;
css::uno::Reference<css::frame::XController> fillDrawImpressSelectedPages();
protected: