diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-09-03 17:53:47 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-09-03 17:53:47 +0200 |
commit | b70082313bbfa2293df70cc3a17436456e180e1c (patch) | |
tree | e4907d0130c237b79ea1e0950fc4d4970ea26a7a /sd | |
parent | 83151a6fce3891b1b10e38fc8bb549bedef644b5 (diff) |
dba34a: removed SvLBox'es (and friends) Set/GetWindowBits. They were used in parallel to Window's
Set/GetStyle, with WB_* values which overlapped with existing (generic) WB_* bits. Since this
overlapping has been removed, there's no need to have both Style and WindowBits at those classes.
Should remove some source of confusion and error (and, well, perhaps introduce some new errors :) ).
Diffstat (limited to 'sd')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
-rwxr-xr-x | sd/source/ui/dlg/dlgassim.cxx | 4 | ||||
-rwxr-xr-x | sd/source/ui/dlg/sdtreelb.cxx | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 7c07ec76127a..8dbb9fd95c41 100644..100755 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -477,7 +477,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId , mpController( pController ) , mpLastParentEntry(0) { - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) ); + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ); EnableContextMenuHandling(); SetSelectionMode( MULTIPLE_SELECTION ); diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f9dcf5046189..aa2e234b0868 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -49,10 +49,10 @@ SdPageListControl::SdPageListControl( : SvTreeListBox(pParent, rResId) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASLINESATROOT | WB_HSCROLL | // #31562# - WB_HASBUTTONSATROOT ) ); + WB_HASBUTTONSATROOT ); SetNodeDefaultImages (); m_pCheckButton = new SvLBoxButtonData(this); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 275d39af4ea5..201f6eb8197a 100755 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -258,10 +258,10 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | - WB_HASBUTTONS | // WB_HASLINESATROOT | - WB_HSCROLL | // #31562# - WB_HASBUTTONSATROOT ) ); + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | + WB_HASBUTTONS | // WB_HASLINESATROOT | + WB_HSCROLL | // #31562# + WB_HASBUTTONSATROOT ); SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ), Bitmap( SdResId( BMP_COLLAPSE ) ) ); |