diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
commit | e71dd58cbb6cbcf4d032db73982239badeeabf22 (patch) | |
tree | b21dfedc3f13ef0ba966efd13da05ff38523e698 /cppcanvas/source/wrapper/implspritecanvas.hxx | |
parent | 510e316a6f128161e6454fe35053231bd24b5a03 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 0fce58acaa20c2e3cd99690e41da991380a0a1a9 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:20 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Jan 18 16:25:52 2011 +0200
Avoid GetHelpText() call which can be quite heavy
GetHelpText() can cause a quite heavy sequence of file and directory
lookups. See fdo#33088. As its return value here was just passed on to
ShowHelpStatusText() which doesn't do anything at all, it was
completely unnecessary. The GetHelpText() calls here caused the
noticeable slowdown in highlighting menu items on Windows with lots of
localised help files for some bundled extensions.
Signed-off-by: Caolan McNamara <caolanm@redhat.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
Signed-off-by: fstrba@novell.com
vcl/source/window/menu.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 3c2e3b6efc81c5e34c56f0f11723ed848801be35
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Tue Jan 18 13:11:00 2011 +0100
do not mix unrelated X11 Visuals (fdo#33108)
Do not assume that there is just one generic Visual, as today's XServers are
ARGB-capable and cases of both the default depth and 32bit visuals can happen.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
Signed-off-by: Radek Doulik <rodo@novell.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
vcl/unx/inc/salgdi.h | 2 +-
vcl/unx/source/gdi/salgdi.cxx | 17 ++++++++---------
vcl/unx/source/gdi/salgdi3.cxx | 8 --------
3 files changed, 9 insertions(+), 18 deletions(-)
commit 1c9c9180b4105626e9242e5499b67180abf4a53c
Author: Andre Fischer <andre.f.fischer@oracle.com>
Date: Tue Jan 18 10:41:22 2011 +0100
calc65: #i116318# Fixed the painting of axial gradients.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
(cherry picked from commit ea29f32bd5bc1a937a747bd5a1f5b37f570ed25f)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Radek Doulik <rodo@novell.com>
cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
commit 94ba0c5b10f8089dc549e9fc4f3085622cff65c4
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Wed Nov 3 15:17:33 2010 +0100
use sane scrollbar sizes when drawing
bnc#619772 leads to a crash because maximum = minimum = 0, and this
strange (but for whatever reason needed) '- mnVisibleSize' hack
makes maximum be -1, eventually leading to a crash
vcl/unx/kde4/KDESalGraphics.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 4831d49751fd5aa81901cfc0402311ff2d700056
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: libs-gui_libreoffice-3.3.0.4
Diffstat (limited to 'cppcanvas/source/wrapper/implspritecanvas.hxx')
-rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index d308b313b7dd..a6844431e456 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,29 +48,29 @@ namespace cppcanvas class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas { public: - ImplSpriteCanvas( const ::com::sun::star::uno::Reference< + ImplSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& rCanvas ); ImplSpriteCanvas(const ImplSpriteCanvas&); virtual ~ImplSpriteCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - - virtual bool updateScreen( bool bUpdateAll ) const; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const; + virtual bool updateScreen( bool bUpdateAll ) const; + + virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const; + virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const; - SpriteSharedPtr createSpriteFromBitmaps( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > >& animationBitmaps, - sal_Int8 interpolationMode ); + SpriteSharedPtr createSpriteFromBitmaps( + const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > >& animationBitmaps, + sal_Int8 interpolationMode ); - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const; /** This class passes the view transformation to child sprites @@ -80,16 +80,16 @@ namespace cppcanvas itself, but has somehow pass an object to child sprites those can query for the canvas' view transform. */ - class TransformationArbiter + class TransformationArbiter { public: TransformationArbiter(); - void setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform ); - ::basegfx::B2DHomMatrix getTransformation() const; + void setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform ); + ::basegfx::B2DHomMatrix getTransformation() const; private: - ::basegfx::B2DHomMatrix maTransformation; + ::basegfx::B2DHomMatrix maTransformation; }; typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; @@ -98,8 +98,8 @@ namespace cppcanvas // default: disabled assignment ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ); - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; - TransformationArbiterSharedPtr mpTransformArbiter; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; + TransformationArbiterSharedPtr mpTransformArbiter; }; } } |