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

1 files changed, 12 insertions, 6 deletions

diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index de8c69237d74..0676f51e0610 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 );