mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce DocumentToGraphicRenderer::hasSelection() and maSelection

Browse Source 
Change-Id: Ib7a9df04eb1b8646e20f58c3f9af3ee2dbbb13db
Reviewed-on: https://gerrit.libreoffice.org/42489
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Eike Rathke
2017-09-19 19:08:14 +02:00
parent 179da6befe
commit cb6cbbd5ca
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svtools/DocumentToGraphicRenderer.hxx
View File

@@ -38,8 +38,14 @@ class SVT_DLLPUBLIC DocumentToGraphicRenderer
css::uno::Reference<css::frame::XController> mxController; css::uno::Reference<css::frame::XController> mxController;
css::uno::Reference<css::view::XRenderable> mxRenderable; css::uno::Reference<css::view::XRenderable> mxRenderable;
css::uno::Reference<css::awt::XToolkit> mxToolkit; css::uno::Reference<css::awt::XToolkit> mxToolkit;
css::uno::Any maSelection;
bool mbSelectionOnly; bool mbSelectionOnly;
bool hasSelection() const;
/** Always something even if hasSelection() is false (in which case the
selection is mxDocument).
*/
css::uno::Any getSelection() const; css::uno::Any getSelection() const;
sal_Int32 getCurrentPageWriter(); sal_Int32 getCurrentPageWriter();

42
svtools/source/filter/DocumentToGraphicRenderer.cxx
View File

@@ -46,6 +46,22 @@ DocumentToGraphicRenderer::DocumentToGraphicRenderer( const Reference<XComponent
mxToolkit( VCLUnoHelper::CreateToolkit() ), mxToolkit( VCLUnoHelper::CreateToolkit() ),
mbSelectionOnly( bSelectionOnly ) mbSelectionOnly( bSelectionOnly )
{ {
if (mbSelectionOnly && mxController.is())
{
try
{
uno::Reference< view::XSelectionSupplier > xSelSup( mxController, uno::UNO_QUERY);
if (xSelSup.is())
{
uno::Any aViewSelection( xSelSup->getSelection());
if (aViewSelection.hasValue())
maSelection = aViewSelection;
}
}
catch (const uno::Exception&)
{
}
}
} }
DocumentToGraphicRenderer::~DocumentToGraphicRenderer() DocumentToGraphicRenderer::~DocumentToGraphicRenderer()
@@ -58,26 +74,18 @@ Size DocumentToGraphicRenderer::getDocumentSizeInPixels(sal_Int32 nCurrentPage)
return Application::GetDefaultDevice()->LogicToPixel( aSize100mm, MapUnit::Map100thMM ); return Application::GetDefaultDevice()->LogicToPixel( aSize100mm, MapUnit::Map100thMM );
} }
bool DocumentToGraphicRenderer::hasSelection() const
{
return maSelection.hasValue();
}
uno::Any DocumentToGraphicRenderer::getSelection() const uno::Any DocumentToGraphicRenderer::getSelection() const
{ {
uno::Any aSelection; uno::Any aSelection;
aSelection <<= mxDocument; // default: render whole document if (hasSelection())
if (mbSelectionOnly && mxController.is()) aSelection <<= maSelection;
{ else
try aSelection <<= mxDocument; // default: render whole document
{
uno::Reference< view::XSelectionSupplier > xSelSup( mxController, uno::UNO_QUERY);
if (xSelSup.is())
{
uno::Any aViewSelection( xSelSup->getSelection());
if (aViewSelection.hasValue())
aSelection = aViewSelection;
}
}
catch (const uno::Exception&)
{
}
}
return aSelection; return aSelection;
} }