summaryrefslogtreecommitdiffstats
path: root/cui/source
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 /cui/source
parentoverline state missing from find/replace by properties dialog (diff)
downloadcore-5f2d57fb32bc47dad8ec38287db6627ea6273527.tar.gz
core-5f2d57fb32bc47dad8ec38287db6627ea6273527.zip
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 'cui/source')
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/iconcdlg.cxx4
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/treeopt.cxx4
5 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b950632a60b2..3754d5c12645 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -161,7 +161,7 @@ SvxHpLinkDlg::~SvxHpLinkDlg ()
void SvxHpLinkDlg::dispose()
{
// delete config item, so the base class (IconChoiceDialog) can not load it on the next start
- SvtViewOptions aViewOpt( E_TABDIALOG, OUString::number(SID_HYPERLINK_DIALOG) );
+ SvtViewOptions aViewOpt( EViewType::TabDialog, OUString::number(SID_HYPERLINK_DIALOG) );
aViewOpt.Delete();
delete mpItemSet;
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index ce43046d61e9..ce7009ec76b2 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -257,7 +257,7 @@ void SvxHlinkDlgMarkWnd::RestoreLastSelection()
OUString sLastSelectedMark;
std::deque<OUString> aLastSelectedPath;
- SvtViewOptions aViewSettings( E_DIALOG, TG_SETTING_MANAGER );
+ SvtViewOptions aViewSettings( EViewType::Dialog, TG_SETTING_MANAGER );
if (aViewSettings.Exists())
{
//Maybe we might want to have some sort of mru list and keep a mapping
@@ -611,7 +611,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void)
};
// write
- SvtViewOptions aViewSettings( E_DIALOG, TG_SETTING_MANAGER );
+ SvtViewOptions aViewSettings( EViewType::Dialog, TG_SETTING_MANAGER );
aViewSettings.SetUserData( aSettings );
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 169c34ec571c..9379ccee067f 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -212,7 +212,7 @@ void IconChoiceDialog::dispose()
{
// save configuration at INI-Manager
// and remove pages
- //SvtViewOptions aTabDlgOpt( E_TABDIALOG, rId );
+ //SvtViewOptions aTabDlgOpt( EViewType::TabDialog, rId );
//aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WindowStateMask::X | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized)), RTL_TEXTENCODING_ASCII_US));
//aTabDlgOpt.SetPageID( mnCurrentPageId );
@@ -223,7 +223,7 @@ void IconChoiceDialog::dispose()
OUString aPageData(pData->pPage->GetUserData());
if ( !aPageData.isEmpty() )
{
- //SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number(pData->nId) );
+ //SvtViewOptions aTabPageOpt( EViewType::TabPage, OUString::number(pData->nId) );
//SetViewOptUserItem( aTabPageOpt, aPageData );
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 558e760017eb..34ac217eb4f9 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -518,7 +518,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
{
// Remove view options entry so the new work path
// will be used for the next open dialog.
- SvtViewOptions aDlgOpt( E_DIALOG, IODLG_CONFIGNAME );
+ SvtViewOptions aDlgOpt( EViewType::Dialog, IODLG_CONFIGNAME );
aDlgOpt.Delete();
// Reset also last used dir in the sfx application instance
SfxApplication *pSfxApp = SfxGetpApp();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7d7b2611a971..36ffea87f555 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -558,7 +558,7 @@ void OfaTreeOptionsDialog::dispose()
OUString aPageData(pPageInfo->m_pPage->GetUserData());
if ( !aPageData.isEmpty() )
{
- SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
+ SvtViewOptions aTabPageOpt( EViewType::TabPage, OUString::number( pPageInfo->m_nPageId) );
SetViewOptUserItem( aTabPageOpt, aPageData );
}
pPageInfo->m_pPage.disposeAndClear();
@@ -1021,7 +1021,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created");
if ( pPageInfo->m_pPage )
{
- SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
+ SvtViewOptions aTabPageOpt( EViewType::TabPage, OUString::number( pPageInfo->m_nPageId) );
pPageInfo->m_pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) );
pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet );
}