summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-29 08:43:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-29 10:21:35 +0000
commit5f2d57fb32bc47dad8ec38287db6627ea6273527 (patch)
treec99f6d8f7effb91c62821e2ddaa06d928e9117e8 /svx
parentfd68b73042ac59d610e1f0edb53444a3444c5c64 (diff)
convert EViewType to scoped enum
Change-Id: I5b10aada64408897a56a5932aa28486d7562d617 Reviewed-on: https://gerrit.libreoffice.org/35822 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/datanavi.cxx4
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e467b712710a..2bedc2332605 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1375,7 +1375,7 @@ namespace svxform
// init tabcontrol
m_pTabCtrl->Show();
sal_Int32 nPageId = m_pTabCtrl->GetPageId("instance");
- SvtViewOptions aViewOpt( E_TABDIALOG, CFGNAME_DATANAVIGATOR );
+ SvtViewOptions aViewOpt( EViewType::TabDialog, CFGNAME_DATANAVIGATOR );
if ( aViewOpt.Exists() )
{
nPageId = aViewOpt.GetPageID();
@@ -1412,7 +1412,7 @@ namespace svxform
void DataNavigatorWindow::dispose()
{
- SvtViewOptions aViewOpt( E_TABDIALOG, CFGNAME_DATANAVIGATOR );
+ SvtViewOptions aViewOpt( EViewType::TabDialog, CFGNAME_DATANAVIGATOR );
aViewOpt.SetPageID( static_cast< sal_Int32 >( m_pTabCtrl->GetCurPageId() ) );
aViewOpt.SetUserItem(CFGNAME_SHOWDETAILS, Any(m_bShowDetails));
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index cce33f314726..5dee2ed4aada 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -180,7 +180,7 @@ void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit eMapUni
m_xVSWidth->SetSelItem(0);
m_bCloseByEdit = false;
m_eMapUnit = eMapUnit;
- SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE );
+ SvtViewOptions aWinOpt( EViewType::Window, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE );
if (aWinOpt.Exists())
{
css::uno::Sequence <css::beans::NamedValue> aSeq = aWinOpt.GetUserData();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index a9346e88b0a0..46982bab7442 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -409,7 +409,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, Button*, void )
}
// mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
- SvtViewOptions aPageOpt(E_TABPAGE, "cui/ui/possizetabpage/PositionAndSize");
+ SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) );
}
@@ -811,7 +811,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
DisableControls();
// mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
- SvtViewOptions aPageOpt(E_TABPAGE, "cui/ui/possizetabpage/PositionAndSize");
+ SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
OUString sUserData;
css::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
::rtl::OUString aTemp;
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 7bbd9a0129d3..3cce2b308a21 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -76,7 +76,7 @@ void TextCharacterSpacingControl::dispose()
{
if (mnLastCus == SPACING_CLOSE_BY_CUS_EDIT)
{
- SvtViewOptions aWinOpt(E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE);
+ SvtViewOptions aWinOpt(EViewType::Window, SIDEBAR_SPACING_GLOBAL_VALUE);
css::uno::Sequence<css::beans::NamedValue> aSeq
{ { "Spacing", css::uno::makeAny(OUString::number(GetLastCustomValue())) } };
aWinOpt.SetUserData(aSeq);
@@ -105,7 +105,7 @@ void TextCharacterSpacingControl::Initialize()
if(pKerningItem)
nKerning = pKerningItem->GetValue();
- SvtViewOptions aWinOpt(E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE);
+ SvtViewOptions aWinOpt(EViewType::Window, SIDEBAR_SPACING_GLOBAL_VALUE);
if(aWinOpt.Exists())
{
css::uno::Sequence<css::beans::NamedValue> aSeq = aWinOpt.GetUserData();