sw: remove the SwField::ExpandCitation disaster

Change-Id: I3adf4182ad77bfd1af3737f640e9d3fe6db5dfc9

5 files changed, 6 insertions, 11 deletions

diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 11ce33e0c581..73e1d09fc95e 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -155,7 +155,7 @@ public:
     OUString ConditionalExpand(ToxAuthorityField eField) const;
 
     //To handle Citation
-    OUString ExpandCitation(ToxAuthorityField eField) const;
+    SW_DLLPUBLIC OUString ExpandCitation(ToxAuthorityField eField) const;
 
     SwAuthorityField(SwAuthorityFieldType* pType, const OUString& rFieldContents);
     SwAuthorityField(SwAuthorityFieldType* pType, sal_IntPtr nHandle);
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 7447fdb86096..6406fae27b71 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -319,8 +319,6 @@ public:
       */
     OUString            ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const;
 
-    OUString            ExpandCitation(ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const;
-
     /// @return name or content.
     virtual OUString    GetFieldName() const;
 
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 7f02e0a23bb8..40b96c2e4307 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -435,12 +435,6 @@ OUString SwField::ExpandField(bool const bCached, ToxAuthorityField eField) cons
     return Expand();
 }
 
-OUString SwField::ExpandCitation(ToxAuthorityField eField) const
-{
-    const SwAuthorityField* pAuthorityField = static_cast<const SwAuthorityField*>(this);
-        return (pAuthorityField ? pAuthorityField->ExpandCitation(eField) : OUString());
-}
-
 SwField * SwField::CopyField() const
 {
     SwField *const pNew = Copy();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 577fb3fa3988..5211c1be3ba0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -91,6 +91,7 @@
 #include <svl/whiter.hxx>
 
 #include <docufld.hxx>
+#include <authfld.hxx>
 #include <flddropdown.hxx>
 #include <fmtclds.hxx>
 #include <fmtinfmt.hxx>
@@ -1564,7 +1565,8 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
         OUString sExpand;
         if(rInfos.eType == ww::eCITATION)
         {
-            sExpand = rInfos.pField->ExpandCitation(AUTH_FIELD_TITLE);
+            sExpand = static_cast<SwAuthorityField const*>(rInfos.pField.get())
+                        ->ExpandCitation(AUTH_FIELD_TITLE);
         }
         else
         {
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 37f2a106c23d..616de7bf790d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2902,7 +2902,8 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
         break;
     case RES_AUTHORITY:
     {
-        OUString sRet(pField->ExpandCitation(AUTH_FIELD_IDENTIFIER));
+        OUString const sRet(static_cast<SwAuthorityField const*>(pField)
+                        ->ExpandCitation(AUTH_FIELD_IDENTIFIER));
         GetExport().OutputField( pField, ww::eCITATION, sRet );
     }
     break;