filter/source/graphic/GraphicExportFilter.cxx | 44 +++++++++++++-------------
filter/source/graphic/GraphicExportFilter.hxx | 16 ++++-----
2 files changed, 29 insertions(+), 31 deletions(-)
New commits:
commit 4abe446536e13eb5860e67e4b0f0b3b5b1661782
Author: Eike Rathke <er...@redhat.com>
Date: Fri Sep 22 16:59:09 2017 +0200
Group member variables and functions and fix naming nitpicks
Change-Id: Ie0b13c0ed4657200b6c92ae66ea25093e35a6c8f
Reviewed-on: https://gerrit.libreoffice.org/42666
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/filter/source/graphic/GraphicExportFilter.cxx
b/filter/source/graphic/GraphicExportFilter.cxx
index c25bda1b84c5..ab7fb6d1ad97 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -29,8 +29,8 @@ using namespace css;
GraphicExportFilter::GraphicExportFilter( const uno::Reference<
uno::XComponentContext > & rxContext )
: mxContext(rxContext)
- , mTargetWidth(0)
- , mTargetHeight(0)
+ , mnTargetWidth(0)
+ , mnTargetHeight(0)
, mbSelectionOnly(false)
{}
@@ -56,7 +56,7 @@ void GraphicExportFilter::gatherProperties( const
uno::Sequence< beans::Property
}
else if ( aProperty.Name == "FilterData" )
{
- aProperty.Value >>= mFilterDataSequence;
+ aProperty.Value >>= maFilterDataSequence;
}
else if ( aProperty.Name == "OutputStream" )
{
@@ -68,31 +68,31 @@ void GraphicExportFilter::gatherProperties( const
uno::Sequence< beans::Property
}
}
- for ( sal_Int32 i = 0; i < mFilterDataSequence.getLength(); i++ )
+ for ( sal_Int32 i = 0; i < maFilterDataSequence.getLength(); i++ )
{
- if ( mFilterDataSequence[i].Name == "PixelWidth" )
+ if ( maFilterDataSequence[i].Name == "PixelWidth" )
{
- mFilterDataSequence[i].Value >>= mTargetWidth;
+ maFilterDataSequence[i].Value >>= mnTargetWidth;
}
- else if ( mFilterDataSequence[i].Name == "PixelHeight" )
+ else if ( maFilterDataSequence[i].Name == "PixelHeight" )
{
- mFilterDataSequence[i].Value >>= mTargetHeight;
+ maFilterDataSequence[i].Value >>= mnTargetHeight;
}
- else if ( mFilterDataSequence[i].Name == "Compression" )
+ else if ( maFilterDataSequence[i].Name == "Compression" )
{
- maCompression = mFilterDataSequence[i].Value;
+ maCompression = maFilterDataSequence[i].Value;
}
- else if ( mFilterDataSequence[i].Name == "Interlaced" )
+ else if ( maFilterDataSequence[i].Name == "Interlaced" )
{
- maInterlaced = mFilterDataSequence[i].Value;
+ maInterlaced = maFilterDataSequence[i].Value;
}
- else if ( mFilterDataSequence[i].Name == "Translucent" )
+ else if ( maFilterDataSequence[i].Name == "Translucent" )
{
- maTranslucent = mFilterDataSequence[i].Value;
+ maTranslucent = maFilterDataSequence[i].Value;
}
- else if ( mFilterDataSequence[i].Name == "Quality" )
+ else if ( maFilterDataSequence[i].Name == "Quality" )
{
- maQuality = mFilterDataSequence[i].Value;
+ maQuality = maFilterDataSequence[i].Value;
}
}
@@ -110,7 +110,7 @@ void GraphicExportFilter::gatherProperties( const
uno::Sequence< beans::Property
}
if ( nFormat < nFilterCount )
{
- mFilterExtension = aGraphicFilter.GetExportFormatShortName(
nFormat );
+ maFilterExtension = aGraphicFilter.GetExportFormatShortName(
nFormat );
}
}
}
@@ -144,16 +144,16 @@ bool GraphicExportFilter::filterRenderDocument() const
sal_Int32 nCurrentPage = aRenderer.getCurrentPage();
Size aDocumentSizePixel = aRenderer.getDocumentSizeInPixels(nCurrentPage);
- Size aTargetSizePixel(mTargetWidth, mTargetHeight);
+ Size aTargetSizePixel(mnTargetWidth, mnTargetHeight);
- if (mTargetWidth == 0 || mTargetHeight == 0)
+ if (mnTargetWidth == 0 || mnTargetHeight == 0)
aTargetSizePixel = aDocumentSizePixel;
Graphic aGraphic = aRenderer.renderToGraphic(nCurrentPage,
aDocumentSizePixel, aTargetSizePixel, COL_WHITE);
GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
- uno::Sequence< beans::PropertyValue > aFilterData( mFilterDataSequence );
+ uno::Sequence< beans::PropertyValue > aFilterData( maFilterDataSequence );
sal_Int32 nAdd = 0;
if (!maCompression.hasValue())
++nAdd;
@@ -194,7 +194,7 @@ bool GraphicExportFilter::filterRenderDocument() const
assert( nLen == aFilterData.getLength());
}
- sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName(
mFilterExtension );
+ sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName(
maFilterExtension );
SvMemoryStream aMemStream;
const GraphicConversionParameters aParameters(aTargetSizePixel, true,
true);
@@ -238,7 +238,7 @@ bool GraphicExportFilter::filterExportShape(
{
if (aDescriptor[i].Name == "FilterName")
{
- aDescriptor[i].Value <<= mFilterExtension;
+ aDescriptor[i].Value <<= maFilterExtension;
break;
}
}
diff --git a/filter/source/graphic/GraphicExportFilter.hxx
b/filter/source/graphic/GraphicExportFilter.hxx
index 707f7c30b07b..09dc646b52eb 100644
--- a/filter/source/graphic/GraphicExportFilter.hxx
+++ b/filter/source/graphic/GraphicExportFilter.hxx
@@ -42,21 +42,19 @@ class GraphicExportFilter :
css::uno::Reference< css::lang::XComponent > mxDocument;
css::uno::Reference< css::io::XOutputStream > mxOutputStream;
- void gatherProperties( const css::uno::Sequence< css::beans::PropertyValue
> & rDescriptor );
-
- OUString mFilterExtension;
-
- css::uno::Sequence< css::beans::PropertyValue > mFilterDataSequence;
-
- sal_Int32 mTargetWidth;
- sal_Int32 mTargetHeight;
- bool mbSelectionOnly;
+ css::uno::Sequence< css::beans::PropertyValue > maFilterDataSequence;
css::uno::Any maCompression;
css::uno::Any maInterlaced;
css::uno::Any maTranslucent;
css::uno::Any maQuality;
+ OUString maFilterExtension;
+ sal_Int32 mnTargetWidth;
+ sal_Int32 mnTargetHeight;
+ bool mbSelectionOnly;
+
+ void gatherProperties( const css::uno::Sequence< css::beans::PropertyValue
> & rDescriptor );
bool filterRenderDocument() const;
bool filterExportShape(
const css::uno::Sequence< css::beans::PropertyValue > &
rDescriptor,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
