diff options
Diffstat (limited to 'filter/source/graphic')
-rw-r--r-- | filter/source/graphic/GraphicExportFilter.cxx | 15 | ||||
-rw-r--r-- | filter/source/graphic/GraphicExportFilter.hxx | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index b498e71dd4e3..abf137710490 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -25,14 +25,15 @@ #include <com/sun/star/frame/XModel.hpp> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include <vcl/graphicfilter.hxx> #include <svl/outstrm.hxx> #include <svtools/DocumentToGraphicRenderer.hxx> using namespace css; -GraphicExportFilter::GraphicExportFilter( const uno::Reference< uno::XComponentContext > & rxContext ) - : mxContext(rxContext) +GraphicExportFilter::GraphicExportFilter( uno::Reference< uno::XComponentContext > xContext ) + : mxContext(std::move(xContext)) , mnTargetWidth(0) , mnTargetHeight(0) , mbSelectionOnly(false) @@ -48,11 +49,11 @@ sal_Bool GraphicExportFilter::supportsService(const OUString& sServiceName) } OUString GraphicExportFilter::getImplementationName() { - return "com.sun.star.comp.GraphicExportFilter"; + return u"com.sun.star.comp.GraphicExportFilter"_ustr; } css::uno::Sequence< OUString > GraphicExportFilter::getSupportedServiceNames() { - return { "com.sun.star.document.ExportFilter" }; + return { u"com.sun.star.document.ExportFilter"_ustr }; } void GraphicExportFilter::gatherProperties( const uno::Sequence< beans::PropertyValue > & rProperties ) @@ -89,7 +90,7 @@ void GraphicExportFilter::gatherProperties( const uno::Sequence< beans::Property } } - for ( const beans::PropertyValue& rProp : std::as_const(maFilterDataSequence) ) + for (const beans::PropertyValue& rProp : maFilterDataSequence) { if ( rProp.Name == "PixelWidth" ) { @@ -163,7 +164,7 @@ bool GraphicExportFilter::filterRenderDocument() const SvMemoryStream aMemStream; const GraphicConversionParameters aParameters(aTargetSizePixel, true, true); - const ErrCode nResult = rFilter.ExportGraphic( aGraphic.GetBitmapEx(aParameters), OUString(), aMemStream, + const ErrCode nResult = rFilter.ExportGraphic( aGraphic.GetBitmapEx(aParameters), u"", aMemStream, nFilterFormat, &maFilterDataSequence ); if ( nResult == ERRCODE_NONE ) @@ -203,7 +204,7 @@ bool GraphicExportFilter::filterExportShape( { if (aDescriptor[i].Name == "FilterName") { - aDescriptor[i].Value <<= maFilterExtension; + aDescriptor.getArray()[i].Value <<= maFilterExtension; break; } } diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index d9d4c5a898ac..c78b25d70a89 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTFILTER_HXX -#define INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTFILTER_HXX +#pragma once #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XExporter.hpp> @@ -58,7 +57,7 @@ class GraphicExportFilter : const css::uno::Reference< css::drawing::XShape > & rxShape ) const; public: - explicit GraphicExportFilter( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); + explicit GraphicExportFilter( css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~GraphicExportFilter() override; // XServiceInfo @@ -77,6 +76,4 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > & rArguments ) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |