From 24ca187b6370ca56c8acd92bc405028dd9deb5f2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 23 Jun 2016 15:43:34 +0200 Subject: loplugin:singlevalfields in svtools Change-Id: I80fe1d4646af2b8d8e6362a25f6cda4b7ac29eab Reviewed-on: https://gerrit.libreoffice.org/26603 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/source/svrtf/parrtf.cxx | 2 -- svtools/source/svrtf/svparser.cxx | 6 ------ 2 files changed, 8 deletions(-) (limited to 'svtools/source/svrtf') diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 7edaafa4481c..987051bb53a4 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -39,7 +39,6 @@ SvRTFParser::SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize ) : SvParser( rIn, nStackSize ) , nOpenBrakets(0) , eCodeSet(RTL_TEXTENCODING_MS_1252) - , eUNICodeSet(RTL_TEXTENCODING_MS_1252) // default ist ANSI-CodeSet , nUCharOverread(1) { // default ist ANSI-CodeSet @@ -566,7 +565,6 @@ SvParserState SvRTFParser::CallParser() eState = SVPAR_WORKING; nOpenBrakets = 0; SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); - eUNICodeSet = RTL_TEXTENCODING_MS_1252; // default is ANSI-CodeSet // the first two tokens should be '{' and \\rtf !! if( '{' == GetNextToken() && RTF_RTF == GetNextToken() ) diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index b01e9c1c06c6..cb754802f351 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -71,7 +71,6 @@ SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize ) , eSrcEnc( RTL_TEXTENCODING_DONTKNOW ) , nNextChPos(0) , nNextCh(0) - , bDownloadingFile(false) , bUCS2BSrcEnc(false) , bSwitchToUCS2(false) , bRTF_InTextRead(false) @@ -621,11 +620,6 @@ IMPL_LINK_NOARG_TYPED( SvParser, NewDataRead, LinkParamNone*, void ) switch( eState ) { case SVPAR_PENDING: - // if file is loaded we are not allowed to continue - // instead should ignore the call. - if( IsDownloadingFile() ) - break; - eState = SVPAR_WORKING; RestoreState(); -- cgit