diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-05 22:39:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-05 22:39:16 +0100 |
| commit | 9e8564afbdb922460b245beff8f41bf2e3ac9d30 (patch) | |
| tree | 1818ba9f0dd54c23f1ea3cbca41e49febbdf6d48 /canvas | |
| parent | f965b10819fb32d6c6d66f00fb129068749a50ac (diff) | |
Simplify o3tl::LazyUpdate
Change-Id: I7569a20877411a5ceb4a7475d82cb634eb6cb114
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/simplecanvas/simplecanvasimpl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 07c8717121e6..79578d4c37c0 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -46,7 +46,7 @@ using namespace canvas; namespace { - inline uno::Sequence< double > color2Sequence( sal_Int32 const& nColor ) + inline uno::Sequence< double > color2Sequence( sal_Int32 nColor ) { // TODO(F3): Color management uno::Sequence< double > aRes( 4 ); @@ -84,13 +84,13 @@ namespace { o3tl::LazyUpdate<sal_Int32, uno::Sequence<double>, - o3tl::LAZYUPDATE_FUNCTION_TAG > m_aPenColor; + decltype(&color2Sequence)> m_aPenColor; o3tl::LazyUpdate<sal_Int32, uno::Sequence<double>, - o3tl::LAZYUPDATE_FUNCTION_TAG > m_aFillColor; + decltype(&color2Sequence)> m_aFillColor; o3tl::LazyUpdate<geometry::RealRectangle2D, uno::Reference< rendering::XPolyPolygon2D >, - o3tl::LAZYUPDATE_FUNCTOR_TAG > m_aRectClip; + boost::function1<uno::Reference<rendering::XPolyPolygon2D>, geometry::RealRectangle2D> > m_aRectClip; geometry::AffineMatrix2D m_aTransformation; explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) : @@ -367,7 +367,7 @@ namespace typedef o3tl::LazyUpdate< rendering::FontRequest, uno::Reference< rendering::XCanvasFont >, - o3tl::LAZYUPDATE_FUNCTOR_TAG > SimpleFont; + boost::function1<uno::Reference<rendering::XCanvasFont>, rendering::FontRequest> > SimpleFont; uno::Reference<rendering::XCanvas> mxCanvas; SimpleFont maFont; |