[Libreoffice-commits] .: 2 commits - sw/source

[Lubos Lunak]

 sw/source/filter/ww8/docxattributeoutput.cxx |    1 +
 sw/source/filter/ww8/wrtww8.hxx              |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit d83df118986914fd4be0b7f1a290f5e71201a29f
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 3 14:34:06 2011 +0100

    ensure fonts used by bullet chars are in fontTable.xml (fdo#34814)

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 307c2ea..4d3aba5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2750,6 +2750,7 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
 
         if ( pFont )
         {
+            GetExport().GetId( *pFont ); // ensure font info is written to fontTable.xml
             OString aFamilyName( OUStringToOString( OUString( pFont->GetFamilyName() ), RTL_TEXTENCODING_UTF8 ) );
             m_pSerializer->singleElementNS( XML_w, XML_rFonts,
                     FSNS( XML_w, XML_ascii ), aFamilyName.getStr(),
commit 19ac33a3d4c9122c89a73f3d78c96c38bd7cff9c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 3 13:11:32 2011 +0100

    move all GetId(whatever type for font) to the base class

diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 8a2235e..7077c0b 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -584,6 +584,18 @@ public:
 
     USHORT GetId( const SwTOXType& rTOXType );
 
+    /// Return the numeric id of the font (and add it to the font list if needed)
+    USHORT GetId( const SvxFontItem& rFont)
+    {
+        return maFontHelper.GetId(rFont);
+    }
+    /// @overload
+    USHORT GetId( const wwFont& rFont)
+    {
+        return maFontHelper.GetId(rFont);
+    }
+
+
     const SfxPoolItem& GetItem( USHORT nWhich ) const;
 
     /// Find the reference.
@@ -974,12 +986,6 @@ public:
     WW8OleMaps& GetOLEMap()                 { return *pOleMap; }
     void ExportDopTypography(WW8DopTypography &rTypo);
 
-    using MSWordExportBase::GetId;
-    USHORT GetId( const SvxFontItem& rFont)
-    {
-        return maFontHelper.GetId(rFont);
-    }
-
     USHORT AddRedlineAuthor( USHORT nId );
 
     void WriteFtnBegin( const SwFmtFtn& rFtn, WW8Bytes* pO = 0 );