Simplify autocorrect loading - removing redundant parameter.

Change-Id: Idc1ebba8d859ec79b6744228cfe3ef1f0992e41d

5 files changed, 10 insertions, 11 deletions

diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index fcc47f12f093..80e5d029535f 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -129,7 +129,7 @@ SvXMLWordContext::SvXMLWordContext(
     if( !bOnlyTxt )
     {
         const OUString sLongSave( sRight );
-        if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, OUString(), sWrong, sRight ) &&
+        if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, sWrong, sRight ) &&
             !sLongSave.isEmpty() )
         {
             sRight = sLongSave;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5816b9473051..5fb94248aeff 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1620,18 +1620,17 @@ bool SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntr
 
 }
 
-
-    //  - return the replacement text (only for SWG-Format, all other
-    //      can be taken from the word list!)
+//  - return the replacement text (only for SWG-Format, all other
+//    can be taken from the word list!)
 bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
-                                      const OUString&, const OUString&, OUString& )
+                                  const OUString&, OUString& )
 {
     return false;
 }
 
-    // Text with attribution (only the SWG - SWG format!)
+// Text with attribution (only the SWG - SWG format!)
 bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
-                                  const OUString&, const OUString&, SfxObjectShell&, OUString& )
+                              const OUString&, const OUString&, SfxObjectShell&, OUString& )
 {
     return false;
 }
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index f2d066558cbf..9564de3b6ef3 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -276,7 +276,7 @@ public:
     sal_Unicode GetQuote( sal_Unicode cInsChar, bool bSttQuote,
                             LanguageType eLang ) const;
     virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg,
-                                  const OUString& rFileName, const OUString& rShort, OUString& rLong );
+                              const OUString& rShort, OUString& rLong );
 
     TYPEINFO();
 
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index b22deecd8a97..5bb3c93474fc 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -32,7 +32,7 @@ protected:
     // Return replacement text (only for SWG-format, all others can be obtained from wordlist!).
     // rShort is stream-name - encrypted!
     virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
-                                  const OUString& rFileName, const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
+                              const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
 
     // Text with attributes (only SWG-format!).
     // rShort is stream-name - encrypted!
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 8bae7020bc3c..be4d6d51a353 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -34,13 +34,13 @@ TYPEINIT1( SwAutoCorrect, SvxAutoCorrect );
     //      rShort ist der Stream-Name - gecryptet!
 
 bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg,
-                                     const OUString& rFileName, const OUString& rShort, OUString& rLong )
+                                 const OUString& rShort, OUString& rLong )
 {
     sal_uLong nRet = 0;
     if (rStg.is())
     {
         // mba: relative URLs don't make sense here
-        SwXMLTextBlocks aBlk( rStg, rFileName );
+        SwXMLTextBlocks aBlk( rStg, OUString() );
         nRet = aBlk.GetText( rShort, rLong );
     }
     else {