diff options
author | Eike Rathke <erack@redhat.com> | 2017-09-19 18:48:44 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-09-19 18:52:29 +0200 |
commit | d915987bfcd99deb9446781408d475ff96b1df55 (patch) | |
tree | 0db1282890f56e186ae1f58deceed8ff3cf574c2 /svtools | |
parent | 9c90cf14cc200778e3689371e62fa4c19466f75c (diff) |
'a'CurrentPage gets on my nerves
Change-Id: Ifb6137048d7206c1f3a718331ed8b42f746052bb
Reviewed-on: https://gerrit.libreoffice.org/42487
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/filter/DocumentToGraphicRenderer.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx index c5e390700189..d3f78afa575d 100644 --- a/svtools/source/filter/DocumentToGraphicRenderer.cxx +++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx @@ -52,9 +52,9 @@ DocumentToGraphicRenderer::~DocumentToGraphicRenderer() { } -Size DocumentToGraphicRenderer::getDocumentSizeInPixels(sal_Int32 aCurrentPage) +Size DocumentToGraphicRenderer::getDocumentSizeInPixels(sal_Int32 nCurrentPage) { - Size aSize100mm = getDocumentSizeIn100mm(aCurrentPage); + Size aSize100mm = getDocumentSizeIn100mm(nCurrentPage); return Application::GetDefaultDevice()->LogicToPixel( aSize100mm, MapUnit::Map100thMM ); } @@ -81,7 +81,7 @@ uno::Any DocumentToGraphicRenderer::getSelection() const return aSelection; } -Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 aCurrentPage) +Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage) { Reference< awt::XDevice > xDevice(mxToolkit->createScreenCompatibleDevice( 32, 32 ) ); @@ -104,13 +104,13 @@ Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 aCurrentPage) /* TODO: the whole absolute "current page" number concept is useless when * it comes to selections, rework that. */ sal_Int32 nPages = mxRenderable->getRendererCount( selection, renderProperties ); - if (nPages >= aCurrentPage || (mbSelectionOnly && nPages > 0)) + if (nPages >= nCurrentPage || (mbSelectionOnly && nPages > 0)) { - if (nPages < aCurrentPage) + if (nPages < nCurrentPage) // In case of mbSelectionOnly hit. - aCurrentPage = 1; + nCurrentPage = 1; - Sequence< beans::PropertyValue > aResult = mxRenderable->getRenderer(aCurrentPage - 1, selection, renderProperties ); + Sequence< beans::PropertyValue > aResult = mxRenderable->getRenderer(nCurrentPage - 1, selection, renderProperties ); for( sal_Int32 nProperty = 0, nPropertyCount = aResult.getLength(); nProperty < nPropertyCount; ++nProperty ) { if ( aResult[ nProperty ].Name == "PageSize" ) @@ -124,7 +124,7 @@ Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 aCurrentPage) } Graphic DocumentToGraphicRenderer::renderToGraphic( - sal_Int32 aCurrentPage, + sal_Int32 nCurrentPage, Size aDocumentSizePixel, Size aTargetSizePixel, Color aPageColor) @@ -172,7 +172,7 @@ Graphic DocumentToGraphicRenderer::renderToGraphic( } uno::Any aSelection( getSelection()); - mxRenderable->render(aCurrentPage - 1, aSelection, renderProps ); + mxRenderable->render(nCurrentPage - 1, aSelection, renderProps ); aMtf.Stop(); aMtf.WindStart(); |