[Libreoffice-commits] core.git: writerfilter/source writerperfect/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 6 07:06:50 UTC 2021


 writerfilter/source/dmapper/DomainMapperTableManager.cxx |    4 ----
 writerfilter/source/dmapper/DomainMapper_Impl.cxx        |    8 --------
 writerfilter/source/dmapper/NumberingManager.cxx         |    2 +-
 writerfilter/source/dmapper/SettingsTable.cxx            |    1 -
 writerfilter/source/dmapper/StyleSheetTable.cxx          |   12 +++---------
 writerfilter/source/dmapper/ThemeTable.cxx               |    1 -
 writerfilter/source/ooxml/Handler.cxx                    |    4 ++--
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx          |    2 --
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx    |    3 +--
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx   |    1 -
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx    |    4 +---
 writerperfect/source/common/WPXSvInputStream.cxx         |   14 +++-----------
 12 files changed, 11 insertions(+), 45 deletions(-)

New commits:
commit a49242a7e8747a61904525bcf53d129f2f279e62
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Sep 5 15:54:02 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 6 09:06:18 2021 +0200

    clang-tidy:readability-redundant-member-init
    
    Change-Id: Ib41556edafb03c770938c91cff89bfaefa23d7cd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121691
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 6689a36091ad..f0b692783a44 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -40,17 +40,13 @@ using namespace ::std;
 
 DomainMapperTableManager::DomainMapperTableManager() :
     m_nRow(0),
-    m_nCell(),
     m_nGridSpan(1),
     m_nHeaderRepeat(0),
     m_nTableWidth(0),
     m_bIsInShape(false),
-    m_aTmpPosition(),
-    m_aTmpTableProperties(),
     m_bPushCurrentWidth(false),
     m_bTableSizeTypeInserted(false),
     m_nLayoutType(0),
-    m_aParagraphsToEndTable(),
     m_pTablePropsHandler(new TablePropertiesHandler())
 {
     m_pTablePropsHandler->SetTableManager( this );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c21c9a282bf5..77c040fb9f3d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -296,10 +296,6 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_bTextInserted(false),
         m_sCurrentPermId(0),
         m_bFrameDirectionSet(false),
-        m_pLastSectionContext( ),
-        m_pLastCharacterContext(),
-        m_sCurrentParaStyleName(),
-        m_sDefaultParaStyleName(),
         m_bInDocDefaultsImport(false),
         m_bInStyleSheetImport( false ),
         m_bInNumberingImport(false),
@@ -332,9 +328,7 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_bSdt(false),
         m_bIsFirstRun(false),
         m_bIsOutsideAParagraph(true),
-        m_xAnnotationField(),
         m_nAnnotationId( -1 ),
-        m_aAnnotationPositions(),
         m_aSmartTagHandler(m_xComponentContext, m_xTextDocument),
         m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>())),
         m_xAltChunkStartingRange(rMediaDesc.getUnpackedValueOrDefault("AltChunkStartingRange", uno::Reference<text::XTextRange>())),
@@ -350,7 +344,6 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_bIgnoreNextTab(false),
         m_bIsSplitPara(false),
         m_bIsActualParagraphFramed( false ),
-        m_vTextFramesForChaining(),
         m_bParaHadField(false),
         m_bSaveParaHadField(false),
         m_bParaAutoBefore(false),
@@ -358,7 +351,6 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_bSaveFirstParagraphInCell(false),
         m_bParaWithInlineObject(false),
         m_bSaxError(false)
-
 {
     m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault(
         utl::MediaDescriptor::PROP_DOCUMENTBASEURL(), OUString());
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 9e2072bc6ee6..f003dba2abe7 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -402,7 +402,7 @@ const OUString& AbstractListDef::MapListId(OUString const& rId)
 
 //----------------------------------------------  ListDef implementation
 
-ListDef::ListDef( ) : AbstractListDef( )
+ListDef::ListDef( )
 {
 }
 
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 47a2d7269efd..a780635b5997 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -303,7 +303,6 @@ struct SettingsTable_Impl
     , m_bDoNotExpandShiftReturn(false)
     , m_bProtectForm(false)
     , m_bRedlineProtection(false)
-    , m_sRedlineProtectionKey()
     , m_bReadOnly(false)
     , m_bDisplayBackgroundShape(false)
     , m_sDecimalSymbol(".")
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 11f0fddcd80c..f1f14ee493e9 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -53,14 +53,11 @@ namespace writerfilter::dmapper
 {
 
 StyleSheetEntry::StyleSheetEntry() :
-        sStyleIdentifierD()
-        ,bIsDefaultStyle(false)
+        bIsDefaultStyle(false)
         ,bAssignedAsChapterNumbering(false)
         ,bInvalidHeight(false)
         ,bHasUPE(false)
         ,nStyleTypeCode(STYLE_TYPE_UNKNOWN)
-        ,sBaseStyleIdentifier()
-        ,sNextStyleIdentifier()
         ,pProperties(new StyleSheetPropertyMap)
         ,bAutoRedefine(false)
 {
@@ -70,8 +67,7 @@ StyleSheetEntry::~StyleSheetEntry()
 {
 }
 
-TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry const & rEntry ):
-    StyleSheetEntry( )
+TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry const & rEntry )
 {
     bIsDefaultStyle = rEntry.bIsDefaultStyle;
     bInvalidHeight = rEntry.bInvalidHeight;
@@ -293,10 +289,8 @@ struct StyleSheetTable_Impl
 StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper,
         uno::Reference< text::XTextDocument> const& xTextDocument,
         bool const bIsNewDoc)
-    :
-            m_rDMapper( rDMapper ),
+    :       m_rDMapper( rDMapper ),
             m_xTextDocument( xTextDocument ),
-            m_pCurrentEntry(),
             m_pDefaultParaProps(new PropertyMap),
             m_pDefaultCharProps(new PropertyMap),
             m_sDefaultParaStyleName("Normal"),
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index ffa2262cdecc..4d6ed2b3bc0f 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -33,7 +33,6 @@ struct ThemeTable_Impl
 {
     ThemeTable_Impl() :
         m_currentThemeFontId(0),
-        m_currentFontThemeEntry(),
         m_supplementalFontId(0)
         {}
     std::map<sal_uInt32, std::map<sal_uInt32, OUString> > m_themeFontMap;
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 3b49b5218148..d58453c8ee32 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -173,7 +173,7 @@ void OOXMLEmbeddedFontHandler::sprm(Sprm & /*sprm*/)
   class OOXMLFooterHandler
  */
 OOXMLFooterHandler::OOXMLFooterHandler(OOXMLFastContextHandler * pContext)
-    : mpFastContext(pContext), msStreamId(), mnType(0)
+    : mpFastContext(pContext), mnType(0)
 {
 }
 
@@ -205,7 +205,7 @@ void OOXMLFooterHandler::sprm(Sprm & /*sprm*/)
   class OOXMLHeaderHandler
  */
 OOXMLHeaderHandler::OOXMLHeaderHandler(OOXMLFastContextHandler * pContext)
-    : mpFastContext(pContext), msStreamId(), mnType(0)
+    : mpFastContext(pContext), mnType(0)
 {
 }
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 00228fb37a46..4e5f1474e9b3 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -53,8 +53,6 @@ namespace writerfilter::ooxml
 OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t const & pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator, bool bSkipImages, const uno::Sequence<beans::PropertyValue>& rDescriptor)
     : mpStream(pStream)
     , mxStatusIndicator(xStatusIndicator)
-    , mpXFootnoteStream()
-    , mpXEndnoteStream()
     , mnXNoteId(0)
     , mbIsSubstream(false)
     , mbSkipImages(bSkipImages)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index ed4787f148f7..60c3c03b8d51 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -84,8 +84,7 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
 }
 
 OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pContext)
-: cppu::WeakImplHelper<xml::sax::XFastContextHandler>(),
-  mpParent(pContext),
+: mpParent(pContext),
   mId(0),
   mnDefine(0),
   mnToken(oox::XML_TOKEN_COUNT),
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 0542f77175df..aba5ec0acb92 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -37,7 +37,6 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
     , mpStream( pStream )
     , mpDocument( pDocument )
     , mnXNoteId( nXNoteId )
-    , mxContextHandler()
 {
 }
 
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index c43be95bc7bf..40ada02ccfdf 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -72,9 +72,7 @@ class FolderStream : public librevenge::RVNGInputStream
 public:
     //! constructor
     explicit FolderStream(const css::uno::Reference<css::ucb::XContent>& xContent)
-        : librevenge::RVNGInputStream()
-        , m_xContent(xContent)
-        , m_nameToPathMap()
+        : m_xContent(xContent)
     {
     }
 
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 22d7dc8d3950..3364b0509d7e 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -156,18 +156,13 @@ public:
 };
 
 OLEStreamData::OLEStreamData(const OString& rName, const OString& rvngName)
-    : stream()
-    , name(rName)
+    : name(rName)
     , RVNGname(rvngName)
 {
 }
 
 OLEStorageImpl::OLEStorageImpl()
-    : mxRootStorage()
-    , maStorageMap()
-    , maStreams()
-    , maNameMap()
-    , mbInitialized(false)
+    : mbInitialized(false)
 {
 }
 
@@ -315,15 +310,12 @@ public:
 };
 
 ZipStreamData::ZipStreamData(const OString& rName)
-    : xStream()
-    , aName(rName)
+    : aName(rName)
 {
 }
 
 ZipStorageImpl::ZipStorageImpl(const Reference<container::XNameAccess>& rxContainer)
     : mxContainer(rxContainer)
-    , maStreams()
-    , maNameMap()
     , mbInitialized(false)
 {
     assert(mxContainer.is());


More information about the Libreoffice-commits mailing list