[Libreoffice-commits] .: sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Dec 7 01:14:20 PST 2012


 sw/source/filter/rtf/swparrtf.cxx |   48 --------------------------------------
 sw/source/filter/rtf/swparrtf.hxx |    7 -----
 2 files changed, 55 deletions(-)

New commits:
commit 8dd1581a4f65eacc2a0f62b79873b533e8237a43
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Dec 7 10:13:06 2012 +0100

    sw: unused RtfReader

diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 13216ca..75f0a45 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -225,54 +225,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
     return new SwRTFReader();
 }
 
-// Aufruf fuer die allg. Reader-Schnittstelle
-sal_uLong RtfReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const String &)
-{
-    if( !pStrm )
-    {
-        OSL_FAIL( "RTF-Read ohne Stream" );
-        return ERR_SWG_READ_ERROR;
-    }
-
-    if( !bInsertMode )
-    {
-        // MIB 27.09.96: Umrandung uns Abstaende aus Frm-Vorlagen entf.
-        Reader::ResetFrmFmts( rDoc );
-    }
-
-    sal_uLong nRet = 0;
-    SwDocShell *pDocShell(rDoc.GetDocShell());
-    OSL_ENSURE(pDocShell, "no SwDocShell");
-    uno::Reference<document::XDocumentProperties> xDocProps;
-    if (pDocShell) {
-        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
-            pDocShell->GetModel(), uno::UNO_QUERY_THROW);
-        xDocProps.set(xDPS->getDocumentProperties());
-    }
-
-    SvParserRef xParser = new SwRTFParser( &rDoc, xDocProps,
-                                rPam, *pStrm, rBaseURL, !bInsertMode );
-    SvParserState eState = xParser->CallParser();
-    if( SVPAR_PENDING != eState && SVPAR_ACCEPTED != eState )
-    {
-        String sErr( String::CreateFromInt32( xParser->GetLineNr() ));
-        sErr += ',';
-        sErr += String::CreateFromInt32( xParser->GetLinePos() );
-
-        nRet = *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr,
-                                    ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
-    }
-
-
-    return nRet;
-}
-
-sal_uLong RtfReader::Read(SvStream* pStream, SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam)
-{
-    pStrm = pStream;
-    return Read(rDoc, rBaseURL, rPam, rBaseURL);
-}
-
 SwRTFParser::SwRTFParser(SwDoc* pD,
         uno::Reference<document::XDocumentProperties> i_xDocProps,
         const SwPaM& rCrsr, SvStream& rIn, const String& rBaseURL,
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index b60dc50..1ff1cbf 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -57,13 +57,6 @@ class SwNodeNum;
 class SwTxtNode;
 struct SvxRTFPictureType;
 
-class RtfReader: public Reader
-{
-    virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-public:
-    virtual sal_uLong Read( SvStream* pStrm, SwDoc &, const String& rBaseURL, SwPaM &);
-};
-
 class SwNodeIdx : public SvxNodeIdx
 {
     SwNodeIndex aIdx;


More information about the Libreoffice-commits mailing list