[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/shellio.hxx                   |    6 ++----
 sw/source/filter/basflt/fltini.cxx   |   10 +++++-----
 sw/source/uibase/app/docsh.cxx       |    4 ++--
 sw/source/uibase/app/docsh2.cxx      |    2 +-
 sw/source/uibase/dochdl/swdtflvr.cxx |    2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit ba676e500f39c398248b906e516843f20ecef30e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 4 10:40:24 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 4 12:12:17 2019 +0100

    expand out SwRead typedef
    
    not adding any value
    
    Change-Id: I8e7bc1150b4bf7e9431e522be3807007a52f65c4
    Reviewed-on: https://gerrit.libreoffice.org/68667
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 2e1e8b8af4f9..827326d55b9b 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -102,8 +102,6 @@ public:
 
 // Base class of possible options for a special reader.
 class Reader;
-// SwRead is pointer to the read-options base class.
-typedef Reader *SwRead;
 
 class SwgReaderOption
 {
@@ -356,9 +354,9 @@ public:
 
 // BEGIN source/filter/basflt/fltini.cxx
 
-extern SwRead ReadAscii, /*ReadSwg, ReadSw3, */ReadHTML, ReadXML;
+extern Reader *ReadAscii, *ReadHTML, *ReadXML;
 
-SW_DLLPUBLIC SwRead SwGetReaderXML();
+SW_DLLPUBLIC Reader* SwGetReaderXML();
 
 // END source/filter/basflt/fltini.cxx
 
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 0e7b6622a260..18de2e807c64 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -62,7 +62,7 @@ using namespace utl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
-SwRead ReadAscii = nullptr, ReadHTML = nullptr, ReadXML = nullptr;
+Reader *ReadAscii = nullptr, *ReadHTML = nullptr, *ReadXML = nullptr;
 
 static Reader* GetRTFReader();
 static Reader* GetWW8Reader();
@@ -105,12 +105,12 @@ void SwReaderWriterEntry::GetWriter( const OUString& rNm, const OUString& rBaseU
         xWrt = WriterRef(nullptr);
 }
 
-SwRead SwGetReaderXML() // SW_DLLPUBLIC
+Reader* SwGetReaderXML() // SW_DLLPUBLIC
 {
         return ReadXML;
 }
 
-static void SetFltPtr( sal_uInt16 rPos, SwRead pReader )
+static void SetFltPtr( sal_uInt16 rPos, Reader* pReader )
 {
         aReaderWriter[ rPos ].pReader = pReader;
 }
@@ -184,9 +184,9 @@ void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& x
         }
 }
 
-SwRead GetReader( const OUString& rFltName )
+Reader* GetReader( const OUString& rFltName )
 {
-    SwRead pRead = nullptr;
+    Reader* pRead = nullptr;
     for( int n = 0; n < MAXFILTER; ++n )
     {
         if ( aFilterDetect[n].IsFilter( rFltName ) )
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1fa1004aaf58..13e662feed3b 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -187,7 +187,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr,
         return nullptr;
     }
     OUString aFileName( rMedium.GetName() );
-    SwRead pRead = SwReaderWriter::GetReader( pFlt->GetUserData() );
+    Reader* pRead = SwReaderWriter::GetReader( pFlt->GetUserData() );
     if( !pRead )
         return nullptr;
 
@@ -232,7 +232,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr,
 bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
 {
     SwReaderPtr pRdr;
-    SwRead pRead = StartConvertFrom(rMedium, pRdr);
+    Reader* pRead = StartConvertFrom(rMedium, pRdr);
     if (!pRead)
       return false; // #129881# return if no reader is found
     tools::SvRef<SotStorage> pStg=pRead->getSotStorageRef(); // #i45333# save sot storage ref in case of recursive calls
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 8a1d56fe7dfd..13ebc3e7dbe5 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1614,7 +1614,7 @@ ErrCode SwDocShell::LoadStylesFromFile( const OUString& rURL,
     }
     if ( bImport )
     {
-        SwRead pRead =  ReadXML;
+        Reader* pRead =  ReadXML;
         SwReaderPtr pReader;
         std::unique_ptr<SwPaM> pPam;
         // the SW3IO - Reader need the pam/wrtshell, because only then he
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 247192893a2f..9a66ff8aca75 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1785,7 +1785,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
 
     tools::SvRef<SotStorageStream> xStrm;
     SvStream* pStream = nullptr;
-    SwRead pRead = nullptr;
+    Reader* pRead = nullptr;
     OUString sData;
     switch( nFormat )
     {