mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused enumerators from SymbolType enum

Browse Source 
Change-Id: I63af4ab93dfd021f88f03fad2c065f5a0e9eeed9
This commit is contained in:
Noel Grandin
2017-02-15 15:34:00 +02:00
parent e52b83ec3f
commit 23ea9fb1dd
3 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.py
View File

@@ -130,6 +130,8 @@ for d in definitionSet:
"include/svtools/htmltokn.h",
"include/sfx2/sidebar/Theme.hxx", # ThemeItem
"sc/source/ui/docshell/impex.cxx", # SylkVersion
"include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType
"include/i18nutil/paper.hxx", # Paper
# Windows or OSX only
"include/canvas/rendering/icolorbuffer.hxx",
"include/vcl/commandevent.hxx",

8
include/rsc/rsc-vcl-shared-types.hxx
View File

@@ -94,20 +94,12 @@ enum class SymbolType : sal_uInt16
PAGEUP = 14,
PAGEDOWN = 15,
PLAY = 16,
REVERSEPLAY = 17,
RECORD = 18,
STOP = 19,
PAUSE = 20,
WINDSTART = 21,
WINDEND = 22,
WINDBACKWARD = 23,
WINDFORWARD = 24,
CLOSE = 25,
ROLLUP = 26,
ROLLDOWN = 27,
CHECKMARK = 28,
RADIOCHECKMARK = 29,
SPIN_UPDOWN = 30,
FLOAT = 31,
DOCK = 32,
HIDE = 33,

59
vcl/source/window/decoview.cxx
View File

@@ -145,7 +145,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
case SymbolType::SPIN_LEFT:
case SymbolType::FIRST:
case SymbolType::PREV:
case SymbolType::REVERSEPLAY:
nRect.Left() += n4;
if ( eType==SymbolType::FIRST )
{
@@ -209,7 +208,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
break;
case SymbolType::RADIOCHECKMARK:
case SymbolType::RECORD:
{
// Midpoint circle algorithm
long x = 0;
@@ -245,49 +243,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
pDev->DrawRect( nRect );
break;
case SymbolType::PAUSE:
pDev->DrawRect( Rectangle ( nRect.Left(), nRect.Top(),
aCenter.X()-n8, nRect.Bottom() ) );
pDev->DrawRect( Rectangle ( aCenter.X()+n8, nRect.Top(),
nRect.Right(), nRect.Bottom() ) );
break;
case SymbolType::WINDSTART:
pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-n2+1 ),
Point( nRect.Left(), aCenter.Y()+n2-1 ) );
++nRect.Left();
SAL_FALLTHROUGH;
case SymbolType::WINDBACKWARD:
pDev->DrawPixel( Point( nRect.Left(), aCenter.Y() ) );
pDev->DrawPixel( Point( nRect.Left()+n2, aCenter.Y() ) );
for ( long i=1; i < n2; ++i )
{
++nRect.Left();
pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-i ),
Point( nRect.Left(), aCenter.Y()+i ) );
pDev->DrawLine( Point( nRect.Left()+n2, aCenter.Y()-i ),
Point( nRect.Left()+n2, aCenter.Y()+i ) );
}
break;
case SymbolType::WINDEND:
pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-n2+1 ),
Point( nRect.Right(), aCenter.Y()+n2-1 ) );
--nRect.Right();
SAL_FALLTHROUGH;
case SymbolType::WINDFORWARD:
pDev->DrawPixel( Point( nRect.Right(), aCenter.Y() ) );
pDev->DrawPixel( Point( nRect.Right()-n2, aCenter.Y() ) );
for ( long i=1; i < n2; ++i )
{
--nRect.Right();
pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-i ),
Point( nRect.Right(), aCenter.Y()+i ) );
pDev->DrawLine( Point( nRect.Right()-n2, aCenter.Y()-i ),
Point( nRect.Right()-n2, aCenter.Y()+i ) );
}
break;
case SymbolType::CLOSE:
pDev->DrawLine( Point( nRect.Left(), nRect.Top() ),
Point( nRect.Right(), nRect.Bottom() ) );
@@ -356,20 +311,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
}
break;
case SymbolType::SPIN_UPDOWN:
pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) );
pDev->DrawPixel( Point( aCenter.X(), nRect.Bottom() ) );
for ( long i=1; i < n2; ++i )
{
++nRect.Top();
--nRect.Bottom();
pDev->DrawLine( Point( aCenter.X()-i, nRect.Top() ),
Point( aCenter.X()+i, nRect.Top() ) );
pDev->DrawLine( Point( aCenter.X()-i, nRect.Bottom() ),
Point( aCenter.X()+i, nRect.Bottom() ) );
}
break;
case SymbolType::FLOAT:
nRect.Right() -= n4;
nRect.Top() += n4+1;