summaryrefslogtreecommitdiff
path: root/canvas/source/directx/dx_spritecanvashelper.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:17:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:17:16 +0200
commite71dd58cbb6cbcf4d032db73982239badeeabf22 (patch)
treeb21dfedc3f13ef0ba966efd13da05ff38523e698 /canvas/source/directx/dx_spritecanvashelper.cxx
parent510e316a6f128161e6454fe35053231bd24b5a03 (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 'canvas/source/directx/dx_spritecanvashelper.cxx')
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.cxx62
1 files changed, 31 insertions, 31 deletions
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index 30bf9040634c..708f98e2933c 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -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
@@ -34,7 +34,7 @@
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
-#include <comphelper/scopeguard.hxx>
+#include <comphelper/scopeguard.hxx>
#include <basegfx/range/b2drectangle.hxx>
#include <basegfx/tools/canvastools.hxx>
@@ -44,7 +44,7 @@
#include "dx_spritecanvashelper.hxx"
#include "dx_canvascustomsprite.hxx"
-#if defined(DX_DEBUG_IMAGES)
+#if defined(DX_DEBUG_IMAGES)
# if OSL_DEBUG_LEVEL > 0
# include <imdebug.h>
# undef min
@@ -58,9 +58,9 @@ namespace dxcanvas
{
namespace
{
- void repaintBackground( const ::basegfx::B2DRange& rUpdateArea,
- const ::basegfx::B2IRange& rOutputArea,
- const DXSurfaceBitmapSharedPtr& rBackBuffer )
+ void repaintBackground( const ::basegfx::B2DRange& rUpdateArea,
+ const ::basegfx::B2IRange& rOutputArea,
+ const DXSurfaceBitmapSharedPtr& rBackBuffer )
{
// TODO(E1): Use numeric_cast to catch overflow here
::basegfx::B2IRange aActualArea( 0, 0,
@@ -120,11 +120,11 @@ namespace dxcanvas
}
void SpriteCanvasHelper::init( SpriteCanvas& rParent,
- ::canvas::SpriteRedrawManager& rManager,
- const IDXRenderModuleSharedPtr& rRenderModule,
- const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy,
- const DXSurfaceBitmapSharedPtr& rBackBuffer,
- const ::basegfx::B2ISize& rOutputOffset )
+ ::canvas::SpriteRedrawManager& rManager,
+ const IDXRenderModuleSharedPtr& rRenderModule,
+ const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy,
+ const DXSurfaceBitmapSharedPtr& rBackBuffer,
+ const ::basegfx::B2ISize& rOutputOffset )
{
// init base
setDevice( rParent );
@@ -136,7 +136,7 @@ namespace dxcanvas
mpSurfaceProxy = rSurfaceProxy;
mpBackBuffer = rBackBuffer;
}
-
+
void SpriteCanvasHelper::disposing()
{
if(mpRenderModule)
@@ -148,17 +148,17 @@ namespace dxcanvas
mpSpriteSurface = NULL;
// forward to base
- CanvasHelper::disposing();
+ CanvasHelper::disposing();
}
- uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
+ uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
const uno::Reference< rendering::XAnimation >& /*animation*/ )
{
return uno::Reference< rendering::XAnimatedSprite >();
}
- uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
- const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
+ uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
+ const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
sal_Int8 /*interpolationMode*/ )
{
return uno::Reference< rendering::XAnimatedSprite >();
@@ -169,8 +169,8 @@ namespace dxcanvas
if( !mpRedrawManager )
return uno::Reference< rendering::XCustomSprite >(); // we're disposed
- return uno::Reference< rendering::XCustomSprite >(
- new CanvasCustomSprite( spriteSize,
+ return uno::Reference< rendering::XCustomSprite >(
+ new CanvasCustomSprite( spriteSize,
mpSpriteSurface,
mpRenderModule,
mpSurfaceProxy,
@@ -186,7 +186,7 @@ namespace dxcanvas
sal_Bool bUpdateAll,
bool& io_bSurfaceDirty )
{
- if( !mpRedrawManager ||
+ if( !mpRedrawManager ||
!mpRenderModule ||
!mpBackBuffer )
{
@@ -197,7 +197,7 @@ namespace dxcanvas
# if OSL_DEBUG_LEVEL > 0
mpBackBuffer->imageDebugger();
# endif
-#endif
+#endif
// store current output area (need to tunnel that to the
// background, scroll, opaque and general sprite repaint
@@ -208,8 +208,8 @@ namespace dxcanvas
maUpdateRect.reset();
// TODO(P1): Might be worthwile to track areas of background
- // changes, too.
-
+ // changes, too.
+
// TODO(P2): Might be worthwhile to use page-flipping only if
// a certain percentage of screen area has changed - and
// compose directly to the front buffer otherwise.
@@ -259,7 +259,7 @@ namespace dxcanvas
// change record vector must be cleared, for the next turn of
// rendering and sprite changing
mpRedrawManager->clearChangeRecords();
-
+
io_bSurfaceDirty = false;
return sal_True;
@@ -276,8 +276,8 @@ namespace dxcanvas
mpBackBuffer );
}
- void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& /*rMoveStart*/,
- const ::basegfx::B2DRange& rMoveEnd,
+ void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& /*rMoveStart*/,
+ const ::basegfx::B2DRange& rMoveEnd,
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea )
{
ENSURE_OR_THROW( mpRenderModule &&
@@ -322,11 +322,11 @@ namespace dxcanvas
static_cast<sal_Int32>(maScrapRect.getWidth()),
static_cast<sal_Int32>(maScrapRect.getHeight()) );
aActualArea.intersect( fround( rUpdateArea.maTotalBounds ) );
-
+
// add given update area to the 'blit to foreground' rect
maUpdateRect.expand( aActualArea );
}
-
+
void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
@@ -345,12 +345,12 @@ namespace dxcanvas
::basegfx::B2IRange aActualArea( 0, 0,
static_cast<sal_Int32>(maScrapRect.getWidth()),
static_cast<sal_Int32>(maScrapRect.getHeight()) );
- aActualArea.intersect( fround( rTotalArea ) );
-
+ aActualArea.intersect( fround( rTotalArea ) );
+
// add given update area to the 'blit to foreground' rect
maUpdateRect.expand( aActualArea );
}
-
+
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rTotalArea,
const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
@@ -376,7 +376,7 @@ namespace dxcanvas
::std::for_each( rSortedUpdateSprites.begin(),
rSortedUpdateSprites.end(),
::std::ptr_fun( &spriteRedrawStub ) );
-
+
// add given update area to the 'blit to foreground' rect
maUpdateRect.expand( aActualArea );
}