diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/iframe.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/impviewframe.hxx | 2 |
6 files changed, 8 insertions, 8 deletions
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; |