summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-20 09:10:45 +0200
committerNoel Grandin <noel@peralex.com>2014-10-21 09:06:40 +0200
commit182fc4f184b77330fdbb32096b64f5fbc5b5f874 (patch)
tree1ba73fb9188796ed43976fe32f291f9c64fb1d5b /sd
parent43327878920f424f8bac1114bee51c54609796c5 (diff)
fdo#84938: replace WINDOW_BORDER constants with enum
Change-Id: I91ca8e09971aee26f16257a4fd01125cfb2ebcdb
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/html/pubdlg.cxx10
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/docprev.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx4
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx2
5 files changed, 10 insertions, 10 deletions
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