summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-18 14:24:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-19 11:57:57 +0100
commita5be07d6b627a18f104e2feed063ff9020e8c610 (patch)
tree389ea7a3c163bcafca743373b94cda4fba937552 /cui
parentb0cecbfb03dba67f01d1411a1e8b7402c2ca90ce (diff)
inline use-once typedefs
Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157 Reviewed-on: https://gerrit.libreoffice.org/46764 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.cxx3
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx4
2 files changed, 3 insertions, 4 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index bb3769bd540b..5e4e6dffc7fb 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -768,8 +768,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
{
if ( !m_pRootEntry )
{
- typedef std::unordered_map< OUString, bool > MenuInfo;
- MenuInfo aMenuInfo;
+ std::unordered_map< OUString, bool > aMenuInfo;
m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true, /*bParentData*/false ) );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aElementsInfo;
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 576e2d23aeda..c2f74ed949db 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -124,7 +124,6 @@ private:
};
typedef std::vector< ControlDataEntry > ControlDataCollection;
-typedef std::set< ControlDataEntry* > ControlDataSet;
class ScreenshotAnnotationDlg_Impl // : public ModalDialog
{
@@ -173,7 +172,8 @@ private:
// hilighted/selected children
ControlDataEntry* mpHilighted;
- ControlDataSet maSelected;
+ std::set< ControlDataEntry* >
+ maSelected;
// list of detected controls
VclPtr<FixedImage> mpPicture;