diff options
Diffstat (limited to 'cppcanvas/source/inc/implrenderer.hxx')
| -rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 6c260c3f3ecd..1f367280598f 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -23,6 +23,7 @@ #include <sal/types.h> #include <tools/stream.hxx> +#include <utility> #include <vcl/metaactiontypes.hxx> #include <cppcanvas/renderer.hxx> #include <cppcanvas/canvas.hxx> @@ -34,6 +35,7 @@ #include <osl/diagnose.h> #include <memory> +#include <span> #include <vector> class GDIMetaFile; @@ -50,10 +52,7 @@ namespace basegfx { class B2DPolygon; } -namespace cppcanvas -{ - - namespace internal +namespace cppcanvas::internal { struct OutDevState; struct ActionFactoryParameters; @@ -66,7 +65,7 @@ namespace cppcanvas public: OutDevState& getState(); const OutDevState& getState() const; - void pushState(PushFlags nFlags); + void pushState(vcl::PushFlags nFlags); void popState(); void clearStateStack(); private: @@ -139,9 +138,9 @@ namespace cppcanvas // public, since some functors need it, too. struct MtfAction { - MtfAction( const std::shared_ptr<Action>& rAction, + MtfAction( std::shared_ptr<Action> xAction, sal_Int32 nOrigIndex ) : - mpAction( rAction ), + mpAction(std::move( xAction )), mnOrigIndex( nOrigIndex ) { } @@ -195,7 +194,8 @@ namespace cppcanvas const OUString& rString, int nIndex, int nLength, - const long* pCharWidths, + KernArraySpan pCharWidths, + std::span<const sal_Bool> pKashidaArray, const ActionFactoryParameters& rParms, bool bSubsettable ); @@ -241,7 +241,7 @@ namespace cppcanvas const Renderer::Parameters& mrParms; sal_Int32& mrCurrActionIndex; }; - } + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |