diff options
57 files changed, 108 insertions, 100 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index a57165437b5b..1391bd57c205 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -375,7 +375,7 @@ namespace svx m_aValueSet.SetLineCount( LINE_CNT ); m_aValueSet.SetStyle( m_aValueSet.GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL ); - m_aValueSet.SetBorderStyle( WINDOW_BORDER_MONO ); + m_aValueSet.SetBorderStyle( WindowBorderStyle::MONO ); OUString aOneCharacter("AU"); long nItemWidth = 2*GetTextWidth( aOneCharacter ); m_aValueSet.SetItemWidth( nItemWidth ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index cf749f635df4..f7ca32156f85 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -403,7 +403,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance( // text (and optionally checkbox) m_pText->SetBackground(aTextWall); // preview - m_pPreview->SetBorderStyle(WINDOW_BORDER_MONO); + m_pPreview->SetBorderStyle(WindowBorderStyle::MONO); // color list m_pColorList->CopyEntries(aSampleList); m_pColorList->InsertAutomaticEntryColor(m_aDefaultColor); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 9929334ee452..90401f5b2d55 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -210,7 +210,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) , aDrawRect(Point(0,0), GetOutputSizePixel()) , nTransparency(0) { - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); Paint(aDrawRect); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index b4269d3e8145..d5e5bd12ae39 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -128,7 +128,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI } // disable 3D border - m_pCtlPreview->SetBorderStyle(WINDOW_BORDER_MONO); + m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO); Link aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) ); m_pMtrFldHorz1->SetModifyHdl( aLink ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 2121a05dd41b..30e02587382c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -757,7 +757,7 @@ SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle ) , aTopLeft(0,0) , aBottomRight(0,0) { - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } Size SvxCropExample::GetOptimalSize() const diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index dfeb8fef7cc0..5a3ee30df491 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -133,7 +133,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs // set background and border of iconchoicectrl const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); m_pCtlPreview->SetBackground ( rStyles.GetWindowColor() ); - m_pCtlPreview->SetBorderStyle(WINDOW_BORDER_MONO); + m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO); Link aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) ); m_pMtrFldLineDist->SetModifyHdl( aLink ); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index ed1599155ae1..a4af465f4334 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -86,7 +86,7 @@ SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle) aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() ); SetFont( aFont ); InitSettings( true, true ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberPreview(vcl::Window *pParent, VclBuilder::stringmap &) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 5828d67bead2..ba36db566151 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2281,7 +2281,7 @@ SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) , bPosition(false) , nActLevel(SAL_MAX_UINT16) { - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d437754e24f9..75c51d117676 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -197,7 +197,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo ,m_ePreviewMode(_ePreviewMode) { - m_aBorder.SetBorderStyle(WINDOW_BORDER_MONO); + m_aBorder.SetBorderStyle(WindowBorderStyle::MONO); m_aMenu.reset(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) )); diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 4276a553122b..f4108f9db23b 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -37,7 +37,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n { setTitle(_nTitleId); - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); ImplInitSettings( true, true, true ); vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle }; diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index a3375b651fb0..3cc43f889c21 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -66,10 +66,10 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev ,m_pView(_pParent) { - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL, false); - m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO); + m_pPanel->SetBorderStyle(WindowBorderStyle::MONO); OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this ); pSwap->Show(); pSwap->SetUniqueId(UID_APP_SWAP_VIEW); diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 31335632c9da..7e78b7fb997b 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -654,7 +654,7 @@ namespace frm SetSpinSize( 1 ); SetDecimalDigits( 0 ); SetStrictFormat( true ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 1da829d46c15..66c12919ada9 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -118,14 +118,20 @@ enum class SymbolType : sal_uInt16 // Border-Styles fuer SetBorder() -typedef sal_uInt16 WindowBorderStyle; - -#define WINDOW_BORDER_NORMAL ((WindowBorderStyle)0x0001) -#define WINDOW_BORDER_MONO ((WindowBorderStyle)0x0002) -#define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010) -#define WINDOW_BORDER_NWF ((WindowBorderStyle)0x0020) -#define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000) -#define WINDOW_BORDER_REMOVEBORDER ((WindowBorderStyle)0x2000) +enum class WindowBorderStyle : sal_uInt16 +{ + NONE = 0x0000, + NORMAL = 0x0001, + MONO = 0x0002, + MENU = 0x0010, + NWF = 0x0020, + NOBORDER = 0x1000, + REMOVEBORDER = 0x2000 +}; +namespace o3tl +{ + template<> struct typed_flags<WindowBorderStyle> : is_typed_flags<WindowBorderStyle, 0x3033> {}; +} #define KEY_CODE ((sal_uInt16)0x0FFF) diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 3928a4cb1be6..2da1f1b1e2c8 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -155,7 +155,7 @@ public: void EnableUserDraw( bool bUserDraw ); void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); - void SetBorderStyle( sal_uInt16 nBorderStyle ); + void SetBorderStyle( WindowBorderStyle nBorderStyle ); void SetSeparatorPos( sal_Int32 n = COMBOBOX_ENTRY_NOTFOUND ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index cb7dbdefa17d..da012ca13673 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -743,8 +743,8 @@ public: void EnableAllResize( bool bEnable = true ); - void SetBorderStyle( sal_uInt16 nBorderStyle ); - sal_uInt16 GetBorderStyle() const; + void SetBorderStyle( WindowBorderStyle nBorderStyle ); + WindowBorderStyle GetBorderStyle() const; void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; Size CalcWindowSize( const Size& rOutSz ) const; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 851ecc375def..121a944a982a 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -176,7 +176,7 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD ,m_pParent(_pParentDialog) ,m_bIgnoreEvent(false) { - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); } diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index a200f1ff188d..a3d4befb45db 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -141,6 +141,7 @@ class RscTypCont void SETCONST( RscConst *, const char *, sal_uInt32 ); inline void SETCONST( RscConst *p1, const char * p2, SymbolType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } + inline void SETCONST( RscConst *p1, Atom p2, WindowBorderStyle p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } void SETCONST( RscConst *, Atom, sal_uInt32 ); RscEnum * InitLangType(); RscEnum * InitFieldUnitsType(); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 661aef93ea04..e71c01450a40 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -289,10 +289,10 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, aBaseLst.push_back( pBorderStyleEnum ); // Konstanten in Tabelle stellen - 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_MENU" ), WINDOW_BORDER_MENU ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WINDOW_BORDER_NOBORDER ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WindowBorderStyle::NORMAL ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WindowBorderStyle::MONO ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WindowBorderStyle::MENU ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WindowBorderStyle::NOBORDER ); // Variable einfuegen nId = aNmTb.Put( "BorderStyle", VARNAME ); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 02478a23adf2..96b4080cef52 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -110,7 +110,7 @@ ScTextWndBase::ScTextWndBase( vcl::Window* pParent, WinBits nStyle ) if ( IsNativeControlSupported( CTRL_EDITBOX, PART_ENTIRE_CONTROL ) ) { SetType( WINDOW_CALCINPUTLINE ); - SetBorderStyle( WINDOW_BORDER_NWF ); + SetBorderStyle( WindowBorderStyle::NWF ); } } diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 30711b99f4d9..5c42f6644f44 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -404,7 +404,7 @@ void ScAutoFmtPreview::PaintCells() void ScAutoFmtPreview::Init() { - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); maArray.Initialize( 5, 5 ); maArray.SetUseDiagDoubleClipping( false ); CalcCellArray( false ); diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 9fc3a5145c58..b366587e3f0d 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -128,7 +128,7 @@ void ScColRowNameRangesDlg::Init() pEdAssign2->SetText( EMPTY_OUSTRING ); } - pLbRange->SetBorderStyle( WINDOW_BORDER_MONO ); + pLbRange->SetBorderStyle( WindowBorderStyle::MONO ); pBtnColHead->Enable(); pBtnRowHead->Enable(); pEdAssign->Enable(); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6007a359774e..5ddeb2ffe412 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -419,14 +419,14 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) pPage1_DelDesign->SetClickHdl(LINK(this,SdPublishingDlg,DesignDeleteHdl)); pPage2_Standard->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); - pPage2_Standard_FB->SetBorderStyle(WINDOW_BORDER_MONO); + pPage2_Standard_FB->SetBorderStyle(WindowBorderStyle::MONO); pPage2_Frames->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); - pPage2_Frames_FB->SetBorderStyle(WINDOW_BORDER_MONO); + pPage2_Frames_FB->SetBorderStyle(WindowBorderStyle::MONO); pPage2_SingleDocument->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); pPage2_Kiosk->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); - pPage2_Kiosk_FB->SetBorderStyle(WINDOW_BORDER_MONO); + pPage2_Kiosk_FB->SetBorderStyle(WindowBorderStyle::MONO); pPage2_WebCast->SetClickHdl(LINK(this,SdPublishingDlg,BaseHdl)); - pPage2_WebCast_FB->SetBorderStyle(WINDOW_BORDER_MONO); + pPage2_WebCast_FB->SetBorderStyle(WindowBorderStyle::MONO); pPage2_Content->SetClickHdl(LINK(this,SdPublishingDlg,ContentHdl)); @@ -472,7 +472,7 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) for( it = m_aDesignList.begin(); it != m_aDesignList.end(); ++it ) pPage1_Designs->InsertEntry(it->m_aDesignName); - pPage6_Preview->SetBorderStyle(WINDOW_BORDER_MONO); + pPage6_Preview->SetBorderStyle(WindowBorderStyle::MONO); SetDefaults(); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 79f71a72228a..8937789e456a 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -190,7 +190,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aTimeField.SetModifyHdl( LINK( this, AnimationWindow, ModifyTimeHdl ) ); // disable 3D border - aCtlDisplay.SetBorderStyle(WINDOW_BORDER_MONO); + aCtlDisplay.SetBorderStyle(WindowBorderStyle::MONO); aDisplaySize = aCtlDisplay.GetOutputSize(); aSize = GetOutputSizePixel(); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 91877806858d..190973929882 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -75,7 +75,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdDocPreviewWin(vcl::W SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) : Control(pParent, nStyle), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0) { - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); svtools::ColorConfig aColorConfig; Wallpaper aEmpty; SetBackground( aEmpty ); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index b4dd8f59ae7f..b3f9fd8ac940 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -63,8 +63,8 @@ SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::D m_pCbFillHoles->SetToggleHdl( LINK( this, SdVectorizeDlg, ToggleHdl ) ); // disable 3D border - m_pBmpWin->SetBorderStyle(WINDOW_BORDER_MONO); - m_pMtfWin->SetBorderStyle(WINDOW_BORDER_MONO); + m_pBmpWin->SetBorderStyle(WindowBorderStyle::MONO); + m_pMtfWin->SetBorderStyle(WindowBorderStyle::MONO); LoadSettings(); InitPreviewBmp(); diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 13a9af05759d..15d39127335c 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -63,7 +63,7 @@ FullScreenPane::FullScreenPane ( mpWorkWindow->ShowFullScreenMode(true, nScreenNumber); // For debugging (non-fullscreen) use mpWorkWindow->SetScreenNumber(nScreenNumber); mpWorkWindow->SetMenuBarMode(MENUBAR_MODE_HIDE); - mpWorkWindow->SetBorderStyle(WINDOW_BORDER_REMOVEBORDER); + mpWorkWindow->SetBorderStyle(WindowBorderStyle::REMOVEBORDER); mpWorkWindow->SetBackground(Wallpaper()); // Don't show the window right now in order to allow the setting of an // accessibility object: accessibility objects are typically diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index f8d60b1b03d7..d6a2a6e9776c 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1232,7 +1232,7 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent, FreeResource(); Wallpaper aWall( Color( COL_TRANSPARENT ) ); SetBackground( aWall ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); CheckNo(); m_aYesButton.SetBackground( aWall ); m_aNoButton.SetBackground( aWall ); diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index f2650dcd9096..01d0022c33aa 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -119,9 +119,9 @@ IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, Win : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) { if ( !bHasBorder ) - SetBorderStyle( WINDOW_BORDER_NOBORDER ); + SetBorderStyle( WindowBorderStyle::NOBORDER ); else - SetBorderStyle( WINDOW_BORDER_NORMAL ); + SetBorderStyle( WindowBorderStyle::NORMAL ); } #define PROPERTY_UNBOUND 0 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 743f42792b94..13a36c8d7e07 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -4325,8 +4325,8 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( false ); rFrame.GetWorkWindow_Impl()->Lock_Impl( true ); - rFrame.GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); - pViewFrame->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); + rFrame.GetWindow().SetBorderStyle( WindowBorderStyle::NOBORDER ); + pViewFrame->GetWindow().SetBorderStyle( WindowBorderStyle::NOBORDER ); } // tell the guard we were successful diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 4e64860c7d06..ef4c3ca0decf 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -782,7 +782,7 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder ) if ( GetParentFrame() ) { bool bHasTools = rBorder.Left() != rBorder.Right() || rBorder.Top() != rBorder.Bottom(); - pF->GetWindow().SetBorderStyle( bHasTools ? WINDOW_BORDER_NORMAL : WINDOW_BORDER_NOBORDER ); + pF->GetWindow().SetBorderStyle( bHasTools ? WindowBorderStyle::NORMAL : WindowBorderStyle::NOBORDER ); } pF->GetWindow().SetPosSizePixel( aPos, aSize ); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 7be4839992fc..c3d21c7bb713 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -320,7 +320,7 @@ SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow, bool i_bHidden ) void SfxFrame::SetPresentationMode( bool bSet ) { if ( GetCurrentViewFrame() ) - GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WINDOW_BORDER_NOBORDER : WINDOW_BORDER_NORMAL ); + GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WindowBorderStyle::NOBORDER : WindowBorderStyle::NORMAL ); Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index a1debee4f458..129d03c5e8ce 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -88,7 +88,7 @@ public: Window( &rParent, nBits | WB_CLIPCHILDREN ), pFrame( p ) { - p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); + p->GetFrame().GetWindow().SetBorderStyle( WindowBorderStyle::NOBORDER ); } virtual void Resize() SAL_OVERRIDE; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index f39570567a80..829a04a55462 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -620,7 +620,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf maElementsControl (this, SmResId(1)), maElementListBox (this, SmResId(1)) { - maElementsControl.SetBorderStyle( WINDOW_BORDER_MONO ); + maElementsControl.SetBorderStyle( WindowBorderStyle::MONO ); maElementListBox.SetDropDownLineCount( SAL_N_ELEMENTS(aCategories) ); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 50aa25ef53c8..356cc9c7e53c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -348,7 +348,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, InitColor_Impl(); // preview like controls should have a 2D look - m_pShowFont->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pShowFont->SetBorderStyle( WindowBorderStyle::MONO ); } m_pFontBox->SetSelectHdl(LINK(this, SmFontDialog, FontSelectHdl)); @@ -876,7 +876,7 @@ SmDistanceDialog::SmDistanceDialog(vcl::Window *pParent) bScaleAllBrackets = false; // preview like controls should have a 2D look - m_pBitmap->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pBitmap->SetBorderStyle( WindowBorderStyle::MONO ); m_pMetricField1->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl)); m_pMetricField2->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl)); @@ -1475,7 +1475,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic InitColor_Impl(); // preview like controls should have a 2D look - m_pSymbolDisplay->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pSymbolDisplay->SetBorderStyle( WindowBorderStyle::MONO ); m_pSymbolSets->SetSelectHdl(LINK(this, SmSymbolDialog, SymbolSetChangeHdl)); m_pSymbolSetDisplay->SetSelectHdl(LINK(this, SmSymbolDialog, SymbolChangeHdl)); @@ -2028,8 +2028,8 @@ SmSymDefineDialog::SmSymDefineDialog(vcl::Window * pParent, pCharsetDisplay ->SetHighlightHdl( LINK( this, SmSymDefineDialog, CharHighlightHdl ) ); // preview like controls should have a 2D look - pOldSymbolDisplay->SetBorderStyle( WINDOW_BORDER_MONO ); - pSymbolDisplay ->SetBorderStyle( WINDOW_BORDER_MONO ); + pOldSymbolDisplay->SetBorderStyle( WindowBorderStyle::MONO ); + pSymbolDisplay ->SetBorderStyle( WindowBorderStyle::MONO ); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index cca9ef81781e..1ff3a680553d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1830,7 +1830,7 @@ SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent) , mpBufferDevice(new VirtualDevice(*this)) { // Draw the control's border as a flat thin black line. - SetBorderStyle(WINDOW_BORDER_MONO); + SetBorderStyle(WindowBorderStyle::MONO); SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); SetMapMode(MAP_100TH_MM); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 9cb0a1ce0b8f..5188cd086c69 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -475,7 +475,7 @@ void SvxFontPrevWindow::Init() initFont(pImpl->aCJKFont); initFont(pImpl->aCTLFont); InitSettings( true, true ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } SvxFontPrevWindow::SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ) : diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index c8b1624075b9..f80d08e39d3a 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -42,7 +42,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) : aSize = Size( 11905, 16837 ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxParaPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 8bc89cf2631b..fc8bd10dbd3c 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -757,7 +757,7 @@ RubyPreview::RubyPreview(vcl::Window *pParent) , m_pParentDlg(NULL) { SetMapMode(MAP_TWIP); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Window *pParent, VclBuilder::stringmap &) diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 49b421fb473d..2744547cbec3 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -124,7 +124,7 @@ void Popup::CreateContainerAndControl (void) mpContainer.reset(new PopupContainer(mpParent)); mpContainer->SetAccessibleName(msAccessibleName); mpContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler)); - mpContainer->SetBorderStyle(mpContainer->GetBorderStyle() | WINDOW_BORDER_MENU); + mpContainer->SetBorderStyle(mpContainer->GetBorderStyle() | WindowBorderStyle::MENU); mpControl.reset(maControlCreator(mpContainer.get())); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 0c93c9c4e5a4..7b16e6b44f13 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -384,7 +384,7 @@ void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& { SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); SetHighlightRange(); if (m_xDictionary.is()) diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 6d9fac261019..b6cf98bc8bdd 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -548,7 +548,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) // Metrics SetMetric( *m_pDistanceField, GetDfltMetric(bHtmlMode) ); - m_pPict->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pPict->SetBorderStyle( WindowBorderStyle::MONO ); // Install handler Link aLk = LINK(this, SwDropCapsPage, ModifyHdl); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index b8fbe5713467..bac7393fa6c9 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -381,7 +381,7 @@ void SwCaptionPreview::Init() SetBackground( aBack ); SetFillColor( aBack.GetColor() ); SetLineColor( aBack.GetColor() ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); vcl::Font aFont(GetFont()); aFont.SetHeight(aFont.GetHeight() * 120 / 100 ); SetFont(aFont); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 1c56f3ad5166..17623df8e60f 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -168,7 +168,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pAddrEditButton->SetSelectHdl( aLk ); m_pSendEditButton->SetSelectHdl( aLk ); - m_pPreview->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pPreview->SetBorderStyle( WindowBorderStyle::MONO ); m_pSizeFormatBox->SetSelectHdl(LINK(this, SwEnvFmtPage, FormatHdl)); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 934f8bd63644..eea3de755bb4 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -221,7 +221,7 @@ SwEnvPage::SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pTableLB->SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); m_pInsertBT->SetClickHdl (LINK(this, SwEnvPage, FieldHdl )); m_pSenderBox->SetClickHdl (LINK(this, SwEnvPage, SenderHdl )); - m_pPreview->SetBorderStyle( WINDOW_BORDER_MONO ); + m_pPreview->SetBorderStyle( WindowBorderStyle::MONO ); SwDBData aData = pSh->GetDBData(); sActDBName = aData.sDataSource + OUString(DB_DELIM) + aData.sCommand; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index d8c9c47bcbf3..fc85c65822b4 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -783,7 +783,7 @@ void AutoFmtPreview::PaintCells() void AutoFmtPreview::Init() { - SetBorderStyle( GetBorderStyle() | WINDOW_BORDER_MONO ); + SetBorderStyle( GetBorderStyle() | WindowBorderStyle::MONO ); maArray.Initialize( 5, 5 ); maArray.SetUseDiagDoubleClipping( false ); CalcCellArray( false ); diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index cb458c53ff1c..ab3a27ce7eab 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -330,7 +330,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent) m_aWinSize = PixelToLogic( m_aWinSize ); - SetBorderStyle( WINDOW_BORDER_MONO ); + SetBorderStyle( WindowBorderStyle::MONO ); m_aFrmSize = SvxPaperInfo::GetPaperSize(PAPER_A4);// DIN A4 ::FitToActualSize(m_aCols, (sal_uInt16)m_aFrmSize.Width()); diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 8971e360f979..2b5c7f637d62 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1697,9 +1697,10 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st case BASEPROPERTY_BORDER: { WinBits nStyle = pWindow->GetStyle(); - sal_uInt16 nBorder = 0; - Value >>= nBorder; - if ( !nBorder ) + sal_uInt16 nTmp = 0; + Value >>= nTmp; + WindowBorderStyle nBorder = static_cast<WindowBorderStyle>(nTmp); + if ( !bool(nBorder) ) { pWindow->SetStyle( nStyle & ~WB_BORDER ); } @@ -2029,10 +2030,10 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st break; case BASEPROPERTY_BORDER: { - sal_Int16 nBorder = 0; + WindowBorderStyle nBorder = WindowBorderStyle::NONE; if ( GetWindow()->GetStyle() & WB_BORDER ) nBorder = GetWindow()->GetBorderStyle(); - aProp <<= nBorder; + aProp <<= static_cast<sal_uInt16>(nBorder); } break; case BASEPROPERTY_TABSTOP: diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a55844f104f8..d9714a98c173 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4395,7 +4395,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: { sal_uInt16 nBorder = sal_uInt16(); if ( (Value >>= nBorder) && nBorder != 0 ) - pComboBox->SetBorderStyle( nBorder ); + pComboBox->SetBorderStyle( static_cast<WindowBorderStyle>(nBorder) ); } } } diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index f3d0c0f9bc31..119f24c9e48a 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -91,7 +91,7 @@ private: long mnRollHeight; long mnOrgMenuHeight; sal_uInt16 mnTitleType; - sal_uInt16 mnBorderStyle; + WindowBorderStyle mnBorderStyle; bool mbFloatWindow; bool mbSmallOutBorder; bool mbFrameBorder; @@ -145,8 +145,8 @@ public: void SetDisplayActive( bool bActive ); bool IsDisplayActive() const { return mbDisplayActive; } void SetTitleType( sal_uInt16 nTitleType, const Size& rSize ); - void SetBorderStyle( sal_uInt16 nStyle ); - sal_uInt16 GetBorderStyle() const { return mnBorderStyle; } + void SetBorderStyle( WindowBorderStyle nStyle ); + WindowBorderStyle GetBorderStyle() const { return mnBorderStyle; } void SetPin( bool bPin ); void SetRollUp( bool bRollUp, const Size& rSize ); void SetCloseButton(); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index d03b32184b6f..b69e9fd5c8a9 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1362,7 +1362,7 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const return aRect; } -void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) +void ComboBox::SetBorderStyle( WindowBorderStyle nBorderStyle ) { Window::SetBorderStyle( nBorderStyle ); if ( !IsDropDownBox() ) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index d7a0f8d82bc3..a0d3da11eccd 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -467,7 +467,7 @@ SelectableFixedText::SelectableFixedText(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { // no border - SetBorderStyle( WINDOW_BORDER_NOBORDER ); + SetBorderStyle( WindowBorderStyle::NOBORDER ); // read-only SetReadOnly(); // make it transparent diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 6a8082fb5de2..efd64c825d68 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -139,7 +139,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) { vcl::Window *pWin = GetWindow( WINDOW_BORDER ); - bool bFlat = (GetBorderStyle() == 2); + bool bFlat = (GetBorderStyle() == WindowBorderStyle::MONO); Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() ); Color oldLineCol = pWin->GetLineColor(); Color oldFillCol = pWin->GetFillColor(); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 1536f9336b09..4dc523c8aafb 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -82,7 +82,7 @@ void ProgressBar::ImplInitSettings( bool bFont, IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) ) { if( (GetStyle() & WB_BORDER) ) - SetBorderStyle( WINDOW_BORDER_REMOVEBORDER ); + SetBorderStyle( WindowBorderStyle::REMOVEBORDER ); EnableChildTransparentMode( true ); SetPaintTransparent( true ); SetBackground(); diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 579c2ee44045..182302dd6679 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1023,8 +1023,8 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei long nOrigRightBorder = mnRightBorder; long nOrigBottomBorder = mnBottomBorder; - sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle(); - if ( nBorderStyle & WINDOW_BORDER_NOBORDER ) + WindowBorderStyle nBorderStyle = mpBorderWindow->GetBorderStyle(); + if ( nBorderStyle & WindowBorderStyle::NOBORDER ) { mnLeftBorder = 0; mnTopBorder = 0; @@ -1035,7 +1035,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei { // FIXME: this is currently only on OS X, check with other // platforms - if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & WINDOW_BORDER_NWF ) ) + if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & WindowBorderStyle::NWF ) ) { // for native widget drawing we must find out what // control this border belongs to @@ -1132,11 +1132,11 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei // move border outside if border was converted or if the BorderWindow is a frame window, if ( mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_DOUBLEOUT; - else if ( nBorderStyle & WINDOW_BORDER_NWF ) + else if ( nBorderStyle & WindowBorderStyle::NWF ) nStyle |= FRAME_DRAW_NWF; else nStyle |= FRAME_DRAW_DOUBLEIN; - if ( nBorderStyle & WINDOW_BORDER_MONO ) + if ( nBorderStyle & WindowBorderStyle::MONO ) nStyle |= FRAME_DRAW_MONO; DecorationView aDecoView( mpOutDev ); @@ -1179,8 +1179,8 @@ long ImplSmallBorderWindowView::CalcTitleWidth() const void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* ) { - sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle(); - if ( nBorderStyle & WINDOW_BORDER_NOBORDER ) + WindowBorderStyle nBorderStyle = mpBorderWindow->GetBorderStyle(); + if ( nBorderStyle & WindowBorderStyle::NOBORDER ) return; bool bNativeOK = false; @@ -1318,13 +1318,13 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* // move border outside if border was converted or if the border window is a frame window, if ( mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_DOUBLEOUT; - else if ( nBorderStyle & WINDOW_BORDER_NWF ) + else if ( nBorderStyle & WindowBorderStyle::NWF ) nStyle |= FRAME_DRAW_NWF; else nStyle |= FRAME_DRAW_DOUBLEIN; - if ( nBorderStyle & WINDOW_BORDER_MONO ) + if ( nBorderStyle & WindowBorderStyle::MONO ) nStyle |= FRAME_DRAW_MONO; - if ( nBorderStyle & WINDOW_BORDER_MENU ) + if ( nBorderStyle & WindowBorderStyle::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() ) @@ -1825,7 +1825,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, mnTitleType = BORDERWINDOW_TITLE_SMALL; else mnTitleType = BORDERWINDOW_TITLE_NORMAL; - mnBorderStyle = WINDOW_BORDER_NORMAL; + mnBorderStyle = WindowBorderStyle::NORMAL; InitView(); } @@ -2104,7 +2104,7 @@ void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) UpdateView( false, rSize ); } -void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) +void ImplBorderWindow::SetBorderStyle( WindowBorderStyle nStyle ) { if ( !mbFrameBorder && (mnBorderStyle != nStyle) ) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index f9517694daa4..0f15f99e5e85 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2880,9 +2880,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_ MenuFloatingWindow* pWin = new MenuFloatingWindow( this, pW, nStyle | WB_SYSTEMWINDOW ); if( pSVData->maNWFData.mbFlatMenu ) - pWin->SetBorderStyle( WINDOW_BORDER_NOBORDER ); + pWin->SetBorderStyle( WindowBorderStyle::NOBORDER ); else - pWin->SetBorderStyle( pWin->GetBorderStyle() | WINDOW_BORDER_MENU ); + pWin->SetBorderStyle( pWin->GetBorderStyle() | WindowBorderStyle::MENU ); pWindow = pWin; Size aSz = ImplCalcSize( pWin ); diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx index 1bd7da5fc4cf..abcc150b7cb4 100644 --- a/vcl/source/window/resource.cxx +++ b/vcl/source/window/resource.cxx @@ -153,7 +153,7 @@ void Window::ImplLoadRes( const ResId& rResId ) if ( nObjMask & WINDOW_BORDER_STYLE ) { sal_uInt16 nBorderStyle = (sal_uInt16)ReadLongRes(); - SetBorderStyle( nBorderStyle ); + SetBorderStyle( static_cast<WindowBorderStyle>(nBorderStyle) ); } } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 57b7a4b51c07..f773bc2a5f05 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2053,12 +2053,12 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) } } -void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) +void Window::SetBorderStyle( WindowBorderStyle nBorderStyle ) { if ( mpWindowImpl->mpBorderWindow ) { - if( nBorderStyle == WINDOW_BORDER_REMOVEBORDER && + if( nBorderStyle == WindowBorderStyle::REMOVEBORDER && ! mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame && mpWindowImpl->mpBorderWindow->mpWindowImpl->mpParent ) @@ -2093,7 +2093,7 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) } } -sal_uInt16 Window::GetBorderStyle() const +WindowBorderStyle Window::GetBorderStyle() const { if ( mpWindowImpl->mpBorderWindow ) @@ -2104,7 +2104,7 @@ sal_uInt16 Window::GetBorderStyle() const return mpWindowImpl->mpBorderWindow->GetBorderStyle(); } - return 0; + return WindowBorderStyle::NONE; } long Window::CalcTitleWidth() const |