summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-18 15:19:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-18 18:43:48 +0200
commit6cccaa9a7859d6a8523c03ca0fe6468635653afa (patch)
treee6646ea24fa4662c1f2294f509ba6c7076f36e71
parente5dbc6e02b96887772e1f305f4cd97b6d4b96734 (diff)
WB_ANIMATION is dead
ever since commit 5bb93690aad419ceafbd14a61da1a86f674fdfea INTEGRATION: CWS hedaburemove01 (1.1.2); FILE ADDED Change-Id: Iad592e268644d10944e46bf80eae30042beab6da Reviewed-on: https://gerrit.libreoffice.org/41298 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svx/graphctl.hxx2
-rw-r--r--svx/source/dialog/graphctl.cxx4
2 files changed, 1 insertions, 5 deletions
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index ff89fd40b468..385d63d7e6d1 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -30,7 +30,6 @@ class GraphCtrlUserCall;
class SvxGraphCtrlAccessibleContext;
#define WB_SDRMODE ((WinBits)0x0080)
-#define WB_ANIMATION ((WinBits)0x0100)
class SVX_DLLPUBLIC GraphCtrl : public Control
{
@@ -51,7 +50,6 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
sal_uInt16 nPolyEdit;
bool bEditMode;
bool bSdrMode;
- bool bAnim;
bool mbInIdleUpdate;
DECL_LINK( UpdateHdl, Timer*, void );
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index e11691242284..68d6134378a9 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -63,7 +63,6 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) :
nPolyEdit ( 0 ),
bEditMode ( false ),
bSdrMode ( false ),
- bAnim ( false ),
mbInIdleUpdate ( false ),
pModel ( nullptr ),
pView ( nullptr )
@@ -103,7 +102,6 @@ void GraphCtrl::dispose()
void GraphCtrl::SetWinStyle( WinBits nWinBits )
{
nWinStyle = nWinBits;
- bAnim = ( nWinStyle & WB_ANIMATION ) == WB_ANIMATION;
bSdrMode = ( nWinStyle & WB_SDRMODE ) == WB_SDRMODE;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -168,7 +166,7 @@ void GraphCtrl::InitSdrModel()
void GraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel )
{
// If possible we dither bitmaps for the display
- if ( !bAnim && ( rGraphic.GetType() == GraphicType::Bitmap ) )
+ if ( rGraphic.GetType() == GraphicType::Bitmap )
{
if ( rGraphic.IsTransparent() )
{