summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-28 13:39:50 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-28 23:59:29 +0100
commit7eddd48a30204932d8b1907982319e9ff01fa64a (patch)
tree8721b4ddf2694d55b035a73d77d4e0b784400265
parentddf213b88776cd38e1eb6ba8123d82a3ac151feb (diff)
fixup rebase
Change-Id: Id297935af8d3a4027026802d4719102d3b8d11f1
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8b0fc96e4e6e..849f4f1e1167 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -97,7 +97,7 @@ namespace
SfxStyleFamily m_eFamily;
SwGetPoolIdFromName m_aPoolId;
OUString m_sName;
- sal_uInt32 m_nRedId;
+ sal_uInt32 m_nResId;
StyleFamilyEntry(SfxStyleFamily eFamily, SwGetPoolIdFromName aPoolId, OUString const& sName, sal_uInt32 nResId)
: m_eFamily(eFamily)
, m_aPoolId(aPoolId)