strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unused border styles

Browse source 
Change-Id: I4b01bdaf4fc20a55f2b4e9ebd039220031c03f11
This commit is contained in:
Ivan Timofeev 2012-07-26 19:30:47 +04:00
parent 97e3a9a3a6
commit 9b5a4f3791
4 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rsc/inc/vclrsc.hxx
View file

@ -96,8 +96,6 @@ typedef sal_uInt16 WindowBorderStyle;
#define WINDOW_BORDER_NORMAL ((WindowBorderStyle)0x0001) #define WINDOW_BORDER_NORMAL ((WindowBorderStyle)0x0001)
#define WINDOW_BORDER_MONO ((WindowBorderStyle)0x0002) #define WINDOW_BORDER_MONO ((WindowBorderStyle)0x0002)
#define WINDOW_BORDER_ACTIVE ((WindowBorderStyle)0x0004)
#define WINDOW_BORDER_DOUBLEOUT ((WindowBorderStyle)0x0008)
#define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010) #define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010)
#define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000) #define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000)

2
rsc/source/parser/rscicpx.cxx
View file

@ -314,8 +314,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
// Konstanten in Tabelle stellen // Konstanten in Tabelle stellen
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WINDOW_BORDER_NORMAL ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WINDOW_BORDER_NORMAL );
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WINDOW_BORDER_MONO ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WINDOW_BORDER_MONO );
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_ACTIVE" ), WINDOW_BORDER_ACTIVE );
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_DOUBLEOUT" ), WINDOW_BORDER_DOUBLEOUT );
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WINDOW_BORDER_MENU ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WINDOW_BORDER_MENU );
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WINDOW_BORDER_NOBORDER ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WINDOW_BORDER_NOBORDER );

2
vcl/inc/vcl/window.hxx
View file

@ -289,8 +289,6 @@ typedef sal_uInt16 StateChangedType;
// Border-Styles fuer SetBorder() // Border-Styles fuer SetBorder()
#define WINDOW_BORDER_NORMAL ((sal_uInt16)0x0001) #define WINDOW_BORDER_NORMAL ((sal_uInt16)0x0001)
#define WINDOW_BORDER_MONO ((sal_uInt16)0x0002) #define WINDOW_BORDER_MONO ((sal_uInt16)0x0002)
#define WINDOW_BORDER_ACTIVE ((sal_uInt16)0x0004)
#define WINDOW_BORDER_DOUBLEOUT ((sal_uInt16)0x0008)
#define WINDOW_BORDER_MENU ((sal_uInt16)0x0010) #define WINDOW_BORDER_MENU ((sal_uInt16)0x0010)
#define WINDOW_BORDER_TOPBOTTOM ((sal_uInt16)0x0020) #define WINDOW_BORDER_TOPBOTTOM ((sal_uInt16)0x0020)
#define WINDOW_BORDER_NWF ((sal_uInt16)0x0040) #define WINDOW_BORDER_NWF ((sal_uInt16)0x0040)

57
vcl/source/window/brdwin.cxx
View file

@ -1198,7 +1198,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
sal_uInt16 nStyle = FRAME_DRAW_NODRAW; sal_uInt16 nStyle = FRAME_DRAW_NODRAW;
// Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
// ist, dann Border nach aussen // ist, dann Border nach aussen
if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) if ( mpBorderWindow->mbSmallOutBorder )
nStyle |= FRAME_DRAW_DOUBLEOUT; nStyle |= FRAME_DRAW_DOUBLEOUT;
else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
nStyle |= FRAME_DRAW_TOPBOTTOM; nStyle |= FRAME_DRAW_TOPBOTTOM;
@ -1377,42 +1377,29 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME ) if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME )
{ {
if ( nBorderStyle & WINDOW_BORDER_ACTIVE ) sal_uInt16 nStyle = 0;
{ // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
Color aColor = mpOutDev->GetSettings().GetStyleSettings().GetHighlightColor(); // ist, dann Border nach aussen
mpOutDev->SetLineColor(); if ( mpBorderWindow->mbSmallOutBorder )
mpOutDev->SetFillColor( aColor ); nStyle |= FRAME_DRAW_DOUBLEOUT;
mpOutDev->DrawRect( Rectangle( 0, 0, mnWidth-1, mnTopBorder ) ); else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM )
mpOutDev->DrawRect( Rectangle( 0, mnHeight-mnBottomBorder, mnWidth-1, mnHeight-1 ) ); nStyle |= FRAME_DRAW_TOPBOTTOM;
mpOutDev->DrawRect( Rectangle( 0, 0, mnLeftBorder, mnHeight-1 ) ); else if ( nBorderStyle & WINDOW_BORDER_NWF )
mpOutDev->DrawRect( Rectangle( mnWidth-mnRightBorder, 0, mnWidth-1, mnHeight-1 ) ); nStyle |= FRAME_DRAW_NWF;
}
else else
{ nStyle |= FRAME_DRAW_DOUBLEIN;
sal_uInt16 nStyle = 0; if ( nBorderStyle & WINDOW_BORDER_MONO )
// Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster nStyle |= FRAME_DRAW_MONO;
// ist, dann Border nach aussen if ( nBorderStyle & WINDOW_BORDER_MENU )
if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_MENU;
nStyle |= FRAME_DRAW_DOUBLEOUT; // tell DrawFrame that we're drawing a window border of a frame window to avoid round corners
else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) if( pWin && pWin == pWin->ImplGetFrameWindow() )
nStyle |= FRAME_DRAW_TOPBOTTOM; nStyle |= FRAME_DRAW_WINDOWBORDER;
else if ( nBorderStyle & WINDOW_BORDER_NWF )
nStyle |= FRAME_DRAW_NWF;
else
nStyle |= FRAME_DRAW_DOUBLEIN;
if ( nBorderStyle & WINDOW_BORDER_MONO )
nStyle |= FRAME_DRAW_MONO;
if ( nBorderStyle & WINDOW_BORDER_MENU )
nStyle |= FRAME_DRAW_MENU;
// tell DrawFrame that we're drawing a window border of a frame window to avoid round corners
if( pWin && pWin == pWin->ImplGetFrameWindow() )
nStyle |= FRAME_DRAW_WINDOWBORDER;
DecorationView aDecoView( mpOutDev ); DecorationView aDecoView( mpOutDev );
Point aTmpPoint; Point aTmpPoint;
Rectangle aInRect( aTmpPoint, Size( mnWidth, mnHeight ) ); Rectangle aInRect( aTmpPoint, Size( mnWidth, mnHeight ) );
aDecoView.DrawFrame( aInRect, nStyle ); aDecoView.DrawFrame( aInRect, nStyle );
}
} }
} }