summaryrefslogtreecommitdiff
path: root/svx
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 /svx
parent43327878920f424f8bac1114bee51c54609796c5 (diff)
fdo#84938: replace WINDOW_BORDER constants with enum
Change-Id: I91ca8e09971aee26f16257a4fd01125cfb2ebcdb
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/dlgctrl.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/paraprev.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/sidebar/tools/Popup.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx2
6 files changed, 6 insertions, 6 deletions
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())