From 7eddd48a30204932d8b1907982319e9ff01fa64a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 28 Nov 2015 13:39:50 +0100
Subject: fixup rebase

Change-Id: Id297935af8d3a4027026802d4719102d3b8d11f1
---
 sw/source/core/unocore/unostyle.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit