From 9f030d0898e2b5c91160d4228392797dc1b77ca5 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 28 Nov 2015 12:39:43 +0100 Subject: use Families instead of the generic 'Container' Change-Id: I009002621a5481b91e14a215237278d56d742579 --- sw/inc/unostyle.hxx | 2 +- sw/source/core/unocore/unostyle.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 0d2deb75adff..90807ba82c86 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -66,7 +66,7 @@ class SwXStyleFamilies : public cppu::WeakImplHelper { SwDocShell* m_pDocShell; - std::map> m_vContainers; + std::map> m_vFamilies; protected: virtual ~SwXStyleFamilies(); public: diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 11e2451f1c12..849f4f1e1167 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -303,10 +303,10 @@ uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex) throw uno::RuntimeException(); auto eFamily = our_vStyleFamilyEntries[nIndex].m_eFamily; assert(eFamily != SFX_STYLE_FAMILY_ALL); - auto& rxContainer = m_vContainers[eFamily]; - if(!rxContainer.is()) - rxContainer = new XStyleFamily(m_pDocShell, eFamily); - return uno::makeAny(rxContainer); + auto& rxFamily = m_vFamilies[eFamily]; + if(!rxFamily.is()) + rxFamily = new XStyleFamily(m_pDocShell, eFamily); + return uno::makeAny(rxFamily); } uno::Type SwXStyleFamilies::getElementType() -- cgit v1.2.3