[Libreoffice-commits] core.git: 2 commits - include/svtools include/svx svtools/source svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Aug 18 16:45:34 UTC 2017
include/svtools/valueset.hxx | 1
include/svx/graphctl.hxx | 2 -
svtools/source/control/valueset.cxx | 46 ------------------------------------
svx/source/dialog/graphctl.cxx | 4 ---
4 files changed, 1 insertion(+), 52 deletions(-)
New commits:
commit 6cccaa9a7859d6a8523c03ca0fe6468635653afa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Aug 18 15:19:23 2017 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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() )
{
commit e5dbc6e02b96887772e1f305f4cd97b6d4b96734
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Aug 18 15:13:17 2017 +0200
WB_RADIOSEL is dead
since
commit 37229126c0a821a925839bbca4b6ec7245f861e9
Make WB_RADIOSEL style behaviour as default.
Change-Id: I606a01f4c8a84780af96265493372bb0df3fc40d
Reviewed-on: https://gerrit.libreoffice.org/41297
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index cea3251174bf..0f70c177ee1b 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -179,7 +179,6 @@ to be set (before Show) with SetStyle().
typedef std::vector<ValueSetItem*> ValueItemList;
-#define WB_RADIOSEL ((WinBits)0x00008000)
#define WB_ITEMBORDER ((WinBits)0x00010000)
#define WB_DOUBLEBORDER ((WinBits)0x00020000)
#define WB_NAMEFIELD ((WinBits)0x00040000)
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 269ad084b042..04d94b4c06d4 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -243,11 +243,6 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe
maVirDev->DrawRect(aRect);
Point aTxtPos(aRect.Left() + 2, aRect.Top());
long nTxtWidth = rRenderContext.GetTextWidth(pItem->maText);
- if (nStyle & WB_RADIOSEL)
- {
- aTxtPos.X() += 4;
- aTxtPos.Y() += 4;
- }
if ((aTxtPos.X() + nTxtWidth) > aRect.Right())
{
maVirDev->SetClipRegion(vcl::Region(aRect));
@@ -398,8 +393,6 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext)
{
nNoneHeight = nTxtHeight + nOff;
nNoneSpace = mnSpacing;
- if (nStyle & WB_RADIOSEL)
- nNoneHeight += 8;
}
else
{
@@ -802,43 +795,6 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt
rRenderContext.DrawRect(aRect);
}
}
- else if (nStyle & WB_RADIOSEL)
- {
- aRect.Left() += 3;
- aRect.Top() += 3;
- aRect.Right() -= 3;
- aRect.Bottom() -= 3;
- if (nStyle & WB_DOUBLEBORDER)
- {
- aRect.Left()++;
- aRect.Top()++;
- aRect.Right()--;
- aRect.Bottom()--;
- }
-
- if (bFocus)
- ShowFocus(aRect);
-
- aRect.Left()++;
- aRect.Top()++;
- aRect.Right()--;
- aRect.Bottom()--;
-
- if (bDrawSel)
- {
- rRenderContext.SetLineColor(aDoubleColor);
- aRect.Left()++;
- aRect.Top()++;
- aRect.Right()--;
- aRect.Bottom()--;
- rRenderContext.DrawRect(aRect);
- aRect.Left()++;
- aRect.Top()++;
- aRect.Right()--;
- aRect.Bottom()--;
- rRenderContext.DrawRect(aRect);
- }
- }
else
{
if (bDrawSel)
@@ -2217,8 +2173,6 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol
if ( nStyle & WB_NONEFIELD )
{
aSize.Height() += nTxtHeight + n + mnSpacing;
- if ( nStyle & WB_RADIOSEL )
- aSize.Height() += 8;
}
// sum possible ScrollBar width
More information about the Libreoffice-commits
mailing list