diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-28 12:39:43 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-28 23:59:27 +0100 |
| commit | ddf213b88776cd38e1eb6ba8123d82a3ac151feb (patch) | |
| tree | b58cd3f6448044ccf7a2051671bdb150f80e1aa8 | |
| parent | typo: m_nRedId => m_nResId (diff) | |
| download | core-ddf213b88776cd38e1eb6ba8123d82a3ac151feb.tar.gz core-ddf213b88776cd38e1eb6ba8123d82a3ac151feb.zip | |
use Families instead of the generic 'Container'
Change-Id: I009002621a5481b91e14a215237278d56d742579
| -rw-r--r-- | sw/inc/unostyle.hxx | 2 | ||||
| -rw-r--r-- | 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<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 f271fd072eb1..8b0fc96e4e6e 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() |