[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Caolán McNamara]

 sw/source/uibase/fldui/fldmgr.cxx              |    2 +-
 sw/source/uibase/misc/numberingtypelistbox.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e63729710b58f34827aebc55b79ceaf2044b763a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 1 15:56:43 2017 +0100

    wrong resource manager for RID_SVXSTRARY_NUMBERINGTYPE
    
    Change-Id: I4c348ee56ae3e90513c8ebd19e0f506bbf0d70f0
    (cherry picked from commit 088ef5dd64dfa653d6a0f6e5f73f1b6078910bca)

diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 98657f7b69d6..49ed1f7a7395 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -594,7 +594,7 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     {
         if(xNumberingInfo.is())
         {
-            ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, *pSwResMgr));
+            ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
 
             Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
             const sal_Int16* pTypes = aTypes.getConstArray();
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 6f87678ab0a9..7d5c066cbf73 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -90,7 +90,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
             pTypes = aTypes.getConstArray();
         }
     }
-    ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, *pSwResMgr));
+    ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
     for(size_t i = 0; i < aNames.Count(); i++)
     {
         sal_IntPtr nValue = aNames.GetValue(i);