summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-28 12:39:43 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-29 10:38:28 +0100
commit9f030d0898e2b5c91160d4228392797dc1b77ca5 (patch)
tree38255f88cc7a27aab554a217e7f46bc21cbbd224 /sw
parent2056e3123f83a957290098a495d8759c9033eb26 (diff)
use Families instead of the generic 'Container'
Change-Id: I009002621a5481b91e14a215237278d56d742579
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/unostyle.hxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx8
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<SfxStyleFamily, css::uno::Reference<css::container::XNameContainer>> m_vContainers;
+ std::map<SfxStyleFamily, css::uno::Reference<css::container::XNameContainer>> 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()