sw34bf04: #i46648#: define class for NfKeywordTable

* * *
#i46648#: Use specific NfKeywordTabl

3 files changed, 40 insertions, 15 deletions

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b4724b68fb40..ad568bc3c0f8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3385,7 +3385,7 @@ sal_uLong SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed,
 
 MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam )
     : aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0),
-    pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
+    pBmpPal(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
     mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0),
     mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
     pStyles( NULL ),
@@ -3400,8 +3400,6 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
 MSWordExportBase::~MSWordExportBase()
 {
     delete pBmpPal;
-    if (pKeyMap)
-        delete[] (NfKeywordTable*)pKeyMap;
     delete pOLEExp;
     delete pOCXExp;
     delete pOleMap;
@@ -3885,4 +3883,35 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode )
 #endif
 }
 
+const NfKeywordTable & MSWordExportBase::GetNfKeywordTable()
+{
+    if (pKeyMap.get() == NULL)
+    {
+        pKeyMap.reset(new NfKeywordTable);
+        NfKeywordTable & rKeywordTable = *pKeyMap;
+        rKeywordTable[NF_KEY_D] = ::rtl::OUString::createFromAscii("d");
+        rKeywordTable[NF_KEY_DD] = ::rtl::OUString::createFromAscii("dd");
+        rKeywordTable[NF_KEY_DDD] = ::rtl::OUString::createFromAscii("ddd");
+        rKeywordTable[NF_KEY_DDDD] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_M] = ::rtl::OUString::createFromAscii("M");
+        rKeywordTable[NF_KEY_MM] = ::rtl::OUString::createFromAscii("MM");
+        rKeywordTable[NF_KEY_MMM] = ::rtl::OUString::createFromAscii("MMM");
+        rKeywordTable[NF_KEY_MMMM] = ::rtl::OUString::createFromAscii("MMMM");
+        rKeywordTable[NF_KEY_NN] = ::rtl::OUString::createFromAscii("ddd");
+        rKeywordTable[NF_KEY_NNN] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_NNNN] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_YY] = ::rtl::OUString::createFromAscii("yy");
+        rKeywordTable[NF_KEY_YYYY] = ::rtl::OUString::createFromAscii("yyyy");
+        rKeywordTable[NF_KEY_H] = ::rtl::OUString::createFromAscii("H");
+        rKeywordTable[NF_KEY_HH] = ::rtl::OUString::createFromAscii("HH");
+        rKeywordTable[NF_KEY_MI] = ::rtl::OUString::createFromAscii("m");
+        rKeywordTable[NF_KEY_MMI] = ::rtl::OUString::createFromAscii("mm");
+        rKeywordTable[NF_KEY_S] = ::rtl::OUString::createFromAscii("s");
+        rKeywordTable[NF_KEY_SS] = ::rtl::OUString::createFromAscii("ss");
+        rKeywordTable[NF_KEY_AMPM] = ::rtl::OUString::createFromAscii("AM/PM");
+    }
+
+    return *pKeyMap;
+}
+
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a6b2eef0f079..ed8fcf644302 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -472,7 +472,7 @@ public:
     WW8_WrtBookmarks* pBkmks;
     WW8_WrtRedlineAuthor* pRedlAuthors;
     BitmapPalette* pBmpPal;
-    void* pKeyMap;
+    boost::shared_ptr<NfKeywordTable> pKeyMap;
     SvxMSExportOLEObjects* pOLEExp;
     SwMSConvertControls* pOCXExp;
     WW8OleMaps* pOleMap;
@@ -816,6 +816,8 @@ protected:
     bool GetBookmarks( const SwTxtNode& rNd, xub_StrLen nStt, xub_StrLen nEnd,
             IMarkVector& rArr );
 
+    const NfKeywordTable & GetNfKeywordTable();
+
 public:
     MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam );
     virtual ~MSWordExportBase();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4a8fab5d0f79..cf281f6992cf 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2430,19 +2430,13 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr)
     const SvNumberformat* pNumFmt = pNFmtr->GetEntry( nFmtIdx );
     if( pNumFmt )
     {
-        //sal_uInt16 nLng = rFld.GetLanguage();
-        LocaleDataWrapper aLocDat( pNFmtr->GetServiceManager(),
-            MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) );
+        sal_uInt16 nLng = rFld.GetLanguage();
+        LocaleDataWrapper aLocDat(pNFmtr->GetServiceManager(),
+                                  MsLangId::convertLanguageToLocale(nLng));
 
-        if( !pKeyMap )
-        {
-            pKeyMap = new NfKeywordTable;
-            NfKeywordTable& rKeyMap = *(NfKeywordTable*)pKeyMap;
-            pNFmtr->FillKeywordTable( rKeyMap, LANGUAGE_ENGLISH_US );
-        }
-
-        String sFmt(pNumFmt->GetMappedFormatstring(*(NfKeywordTable*)pKeyMap,
+        String sFmt(pNumFmt->GetMappedFormatstring(GetNfKeywordTable(),
             aLocDat));
+
         if (sFmt.Len())
         {
             sw::ms::SwapQuotesInField(sFmt);