diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-20 12:17:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-20 12:55:51 +0200 |
| commit | b2764a9b66d1bab85256e5f9c3577b994448ce4a (patch) | |
| tree | 5e55c3ae1d7e3aa48897fb37b35c77880cfd3b3a /sfx2 | |
| parent | 2373babc6888e840d44ed2db80567acccb9ba993 (diff) | |
convert EDynamicMenuType to scoped enum
and drop unused E_HELPBOOKMARKS
Change-Id: I5756ea326bdc1a99f7d6f1ba43baf6aca9f7f2fc
Reviewed-on: https://gerrit.libreoffice.org/36728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconaqua.mm | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index cd69b46a70fe..2b082b6457dd 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -408,7 +408,7 @@ void aqua_init_systray() SvtModuleOptions aModuleOptions; std::set< rtl::OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; - css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); + css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); const css::uno::Sequence< css::beans::PropertyValue >* pNewMenu = aNewMenu.getConstArray(); const css::uno::Sequence< css::beans::PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 9b5e53f5d544..fd5aa1d069f2 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -155,7 +155,7 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, sal_uInt16 nResId, GCallback pFnCallback ) { SvtDynamicMenuOptions aOpt; - Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU ); + Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); for ( sal_Int32 n=0; n<aMenu.getLength(); n++ ) { OUString aURL; diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index cf8d1255d808..4c80752aaad8 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -149,7 +149,7 @@ static HMENU createSystrayMenu( ) // collect the URLs of the entries in the File/New menu ::std::set< OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; - Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); + Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); const OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 966bab0ef268..142a571b6e45 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -221,7 +221,7 @@ void BackingWindow::initControls() SvtModuleOptions aModuleOptions; std::set< OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; - Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); + Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu ); const OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); |