loplugin:singlevalfields in sw(part2)

Change-Id: Ic1b186c82a6b37ae0cd8028a60e2ad09233d8e5d
Reviewed-on: https://gerrit.libreoffice.org/26665
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

13 files changed, 6 insertions, 46 deletions

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0556c6ff0d40..0f8c49a312a3 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -299,11 +299,9 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
     m_pTempViewFrame(nullptr)
 {
     m_nEventId = nullptr;
-    m_bUpperSpace = m_bViewCreated = m_bChkJumpMark =
-    m_bSetCursor = false;
+    m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false;
 
     m_eScriptLang = HTML_SL_UNKNOWN;
-    m_bAnyStarBasic = true;
 
     rCursor.DeleteMark();
     m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert
@@ -2583,17 +2581,6 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr )
     if( !m_pActionViewShell || (bChkAction && !m_pActionViewShell->ActionPend()) )
         return m_pActionViewShell;
 
-    if( m_bSetCursor )
-    {
-        // set the cursor to the doc begin in all CursorEditShells
-        for(SwViewShell& rSh : m_pActionViewShell->GetRingContainer())
-        {
-            if( dynamic_cast<const SwCursorShell *>(&rSh) != nullptr )
-                static_cast<SwCursorShell*>(&rSh)->SttEndDoc(true);
-        }
-
-        m_bSetCursor = false;
-    }
     if( dynamic_cast< const SwEditShell *>( m_pActionViewShell ) !=  nullptr )
     {
         //Schon gescrollt?, dann dafuer sorgen, dass die View sich nicht bewegt!
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index c82ba953fa39..0ad3007db686 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -436,7 +436,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
                                 // Flag um doppeltes init durch Rekursion
                                 // zu verhindern.
     bool m_bViewCreated : 1;      // die View wurde schon erzeugt (asynchron)
-    bool m_bSetCursor : 1;          // Cursor wieder auf den Anfang setzen
     bool m_bSetModEnabled : 1;
 
     bool m_bInFloatingFrame : 1;  // Wir sind in einen Floating Frame
@@ -453,7 +452,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     bool m_bNoParSpace : 1;
     // 16
 
-    bool m_bAnyStarBasic : 1;     // gibt es ueberhaupt ein StarBasic-Modul
     bool m_bInNoEmbed : 1;        // Wir sind in einem NOEMBED-Bereich
 
     bool m_bInTitle : 1;          // Wir sind im Titel
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 4e87ecbf6fe7..e74fbcf28e7c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2206,10 +2206,7 @@ void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut)
     switch (rCrossedOut.GetStrikeout())
     {
     case STRIKEOUT_NONE:
-        if (!m_bStrikeDouble)
-            m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE);
-        else
-            m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKED);
+        m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE);
         m_aStyles.append((sal_Int32)0);
         break;
     case STRIKEOUT_DOUBLE:
@@ -3484,7 +3481,6 @@ RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport)
     : m_rExport(rExport),
       m_nStyleId(0),
       m_nListId(0),
-      m_bStrikeDouble(false),
       m_nNextAnnotationMarkId(0),
       m_nCurrentAnnotationMarkId(-1),
       m_bTableCellOpen(false),
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index baa3ccec2781..303e333b39c8 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -507,11 +507,6 @@ private:
      */
     OStringBuffer m_aStylesEnd;
 
-    /*
-     * We just get a "end of strike" mark at the end of strike, store here what to finish: single or double strike.
-     */
-    bool m_bStrikeDouble;
-
     sal_Int32 m_nNextAnnotationMarkId;
     sal_Int32 m_nCurrentAnnotationMarkId;
     /// Maps annotation mark names to ID's.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b7501a5b049c..7e6f92e9f493 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3280,7 +3280,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
 
         int nLclIdctHint = 0xFF;
         if (nScript == i18n::ScriptType::WEAK)
-            nLclIdctHint = m_nIdctHint;
+            nLclIdctHint = 0;
         else if (nScript == MSASCII) // Force weak chars in ascii range to use LATIN font
             nLclIdctHint = 0;
 
@@ -4233,8 +4233,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_nSwNumLevel(0xff)
     , m_nWwNumType(0xff)
     , m_nListLevel(WW8ListManager::nMaxLevel)
-    , m_nPgChpDelim(0)
-    , m_nPgChpLevel(0)
     , m_bNewDoc(bNewDoc)
     , m_bSkipImages(bSkipImages)
     , m_bReadNoTable(false)
@@ -4273,7 +4271,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_bParaAutoAfter(false)
     , m_bDropCap(false)
     , m_nDropCap(0)
-    , m_nIdctHint(0)
     , m_bBidi(false)
     , m_bReadTable(false)
     , m_bLoadingTOXCache(false)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index aa45c909be29..2c31960d8c43 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -783,7 +783,6 @@ public:
     SwSection *mpSection;
     SwPageDesc *mpPage;
     SvxFrameDirection meDir;
-    short mLinkId;
 
     sal_uInt32 nPgWidth;
     sal_uInt32 nPgLeft;
@@ -1291,9 +1290,6 @@ private:
     sal_uInt8 m_nWwNumType;            // outline / number / enumeration
     sal_uInt8 m_nListLevel;
 
-    sal_uInt8 m_nPgChpDelim;           // ChapterDelim from PageNum
-    sal_uInt8 m_nPgChpLevel;           // ChapterLevel of Heading from PageNum
-
     bool m_bNewDoc;          // new document?
     bool m_bSkipImages;      // skip images for text extraction/indexing
     bool m_bReadNoTable;        // no tables
@@ -1348,7 +1344,6 @@ private:
     bool m_bDropCap;
     sal_Int32 m_nDropCap;
 
-    int m_nIdctHint;
     bool m_bBidi;
     bool m_bReadTable;
     std::shared_ptr<SwPaM> m_pTableEndPaM;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0f6328798d2b..699f8ca9ab01 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -758,7 +758,6 @@ wwSection::wwSection(const SwPosition &rPos) : maStart(rPos.nNode)
     , mpSection(nullptr)
     , mpPage(nullptr)
     , meDir(FRMDIR_HORI_LEFT_TOP)
-    , mLinkId(0)
     , nPgWidth(SvxPaperInfo::GetPaperSize(PAPER_A4).Width())
     , nPgLeft(MM_250)
     , nPgRight(MM_250)
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 5c8a71cfe78f..c2b947431860 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -409,7 +409,6 @@ SwXMLImport::SwXMLImport(
     m_bLoadDoc( true ),
     m_bInsert( false ),
     m_bBlock( false ),
-    m_bShowProgress( true ),
     m_bOrganizerMode( false ),
     m_bInititedXForms( false ),
     m_bPreserveRedlineMode( true ),
@@ -978,7 +977,7 @@ XMLTextImportHelper* SwXMLImport::CreateTextImport()
 {
     return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(),
                                       IsInsertMode(),
-                                      IsStylesOnlyMode(), m_bShowProgress,
+                                      IsStylesOnlyMode(), true/*bShowProgress*/,
                                       IsBlockMode(), IsOrganizerMode(),
                                       m_bPreserveRedlineMode );
 }
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index a3d335f84a95..59814de87cbb 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -85,7 +85,6 @@ class SwXMLImport: public SvXMLImport
                                             // existing styles will be
                                             // overwritten.
     bool                m_bBlock : 1;     // Load text block
-    bool                m_bShowProgress : 1;
     bool                m_bOrganizerMode : 1;
     bool                m_bInititedXForms : 1;
     bool                m_bPreserveRedlineMode;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index d7d67aa0da57..70ac152f280f 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -235,7 +235,6 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)
         "modules/swriter/ui/cardmediumpage.ui", &rSet)
     , pDBManager(nullptr)
     , aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL)))
-    , m_bLabel(false)
 {
     WaitObject aWait( pParent );
 
@@ -321,7 +320,6 @@ void SwLabPage::SetToBusinessCard()
     m_pSheetButton->SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET);
     m_pMakeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND);
     m_pTypeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE);
-    m_bLabel = false;
     m_pAddressFrame->Hide();
 };
 
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 14f817a0880f..d0ee7f443719 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -45,8 +45,6 @@ class SwLabPage : public SfxTabPage
     VclPtr<ListBox>          m_pHiddenSortTypeBox;
     VclPtr<FixedText>        m_pFormatInfo;
 
-    bool        m_bLabel;
-
     DECL_LINK_TYPED(AddrHdl, Button*, void);
     DECL_LINK_TYPED(DatabaseHdl, ListBox&, void );
     DECL_LINK_TYPED(FieldHdl, Button *, void);
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 9125317f6a0b..d225416100cf 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -26,7 +26,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( uno::RuntimeException ) :
-    SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( true ), mbInstalled( true )
+    SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbInstalled( true )
 {
 }
 
@@ -57,7 +57,7 @@ OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException, std::excep
 
 sal_Bool SAL_CALL SwVbaAddin::getAutoload() throw (uno::RuntimeException, std::exception)
 {
-    return mbAutoload;
+    return true;
 }
 
 sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException, std::exception)
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index 5eec826895c0..5823079347d4 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -28,7 +28,6 @@ class SwVbaAddin : public SwVbaAddin_BASE
 {
 private:
     OUString msFileURL;
-    bool mbAutoload;
     bool mbInstalled;
 
 public: