diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-08 11:32:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-09 10:42:56 +0200 |
commit | ea8c12b8cc03ed259389ac267edd459844634767 (patch) | |
tree | c935ac790e826e790133c3b22aeaca32edb52298 /sw/source/filter/xml | |
parent | 013e34d875aeb75d9660af7c18967c2d468cbd74 (diff) |
loplugin:checkunusedparams in sw(part4)
Change-Id: Ia264c192ac02a07bba67a66196899d13b19f83f0
Reviewed-on: https://gerrit.libreoffice.org/37386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.hxx | 10 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 17 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlexpit.hxx | 9 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 7 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 5 |
7 files changed, 10 insertions, 45 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index b7e89103214d..0b4059161d82 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -528,9 +528,7 @@ void XMLRedlineImportHelper::SetCursor( } void XMLRedlineImportHelper::AdjustStartNodeCursor( - const OUString& rId, /// ID used in RedlineAdd() call - bool /*bStart*/, - Reference<XTextRange> & /*rRange*/) + const OUString& rId) /// ID used in RedlineAdd() call { // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index 4a30e46b3b55..1010af2a847e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -98,15 +98,9 @@ public: * Adjust the start (end) position for a redline that begins in a * start node. It takes the cursor positions _inside_ the redlined * element (e.g. section or table). - * - * We will do sanity checking of the given text range: It will - * only be considered valid if it points to the next text node - * after the position given in a previous SetCursor */ + */ void AdjustStartNodeCursor( - const OUString& rId, // ID used in RedlineAdd() call - bool bStart, - // XTextRange _inside_ a table/section - css::uno::Reference<css::text::XTextRange> & rRange); + const OUString& rId); // ID used in RedlineAdd() call // set redline mode: show changes void SetShowChanges( bool bShowChanges ); diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index acd99833b6b1..b4a4ec33c02d 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -93,14 +93,13 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, else { exportXML( rExport, rAttrList, *pItem, rEntry, rUnitConverter, - rNamespaceMap, nFlags, &rSet ); + rNamespaceMap, &rSet ); } } } else { - handleNoItem( rAttrList, rEntry, rUnitConverter, rNamespaceMap, - rSet ); + OSL_FAIL( "no item not handled in xml export" ); } nIndex++; } @@ -112,7 +111,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - SvXmlExportFlags /*nFlags*/, const SfxItemSet *pSet ) const { if( 0 != (rEntry.nMemberId & MID_SW_FLAG_SPECIAL_ITEM_EXPORT) ) @@ -327,17 +325,6 @@ void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& /*rAttrList*/ } /** this method is called for every item that has the - MID_SW_FLAG_NO_ITEM_EXPORT flag set */ -void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& /*rAttrList*/, - const SvXMLItemMapEntry& /*rEntry*/, - const SvXMLUnitConverter& /*rUnitConverter*/, - const SvXMLNamespaceMap& /*rNamespaceMap*/, - const SfxItemSet& /*rSet*/ ) -{ - OSL_FAIL( "no item not handled in xml export" ); -} - -/** this method is called for every item that has the MID_SW_FLAG_ELEMENT_EXPORT flag set */ void SvXMLExportItemMapper::handleElementItem( SvXMLExport& /*rExport*/, diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index df68321a3cb8..21be616c0145 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -52,7 +52,6 @@ protected: const SvXMLItemMapEntry &rEntry, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - SvXmlExportFlags nFlags, const SfxItemSet *pSet ) const; void exportElementItems( SvXMLExport& rExport, @@ -84,14 +83,6 @@ public: const SfxItemSet *pSet ) const; /** this method is called for every item that has the - MID_SW_FLAG_NO_ITEM_EXPORT flag set */ - static void handleNoItem( SvXMLAttributeList& rAttrList, - const SvXMLItemMapEntry& rEntry, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet& rSet ); - - /** this method is called for every item that has the MID_SW_FLAG_ELEMENT_EXPORT flag set */ virtual void handleElementItem( SvXMLExport& rExport, const SvXMLItemMapEntry& rEntry, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 6ca6d37eb38d..e7c70c98162d 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1952,8 +1952,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, const SwXMLTableCell_Impl *pCell, - sal_uInt32 /*nTopRow*/, sal_uInt32 nLeftCol, sal_uInt32 /*nBottomRow*/, - sal_uInt32 nRightCol ) + sal_uInt32 nLeftCol, sal_uInt32 nRightCol ) { //FIXME: here would be a great place to handle XmlId for cell SwTableBox *pBox; @@ -2267,9 +2266,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // is a content box nSplitCol = nCol + 1UL; - pBox = MakeTableBox( pLine, pCell, - nTopRow, nStartCol, - nBottomRow, nSplitCol ); + pBox = MakeTableBox( pLine, pCell, nStartCol, nSplitCol ); if ( 1 != nBoxRowSpan ) pBox->setRowSpan( nBoxRowSpan ); diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index f5dc04e26737..e81cd2b84688 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -95,8 +95,7 @@ class SwXMLTableContext : public XMLTextTableContext SwTableLine *pUpper ); SwTableBox *MakeTableBox( SwTableLine *pUpper, const SwXMLTableCell_Impl *pStartNode, - sal_uInt32 nTopRow, sal_uInt32 nLeftCol, - sal_uInt32 nBottomRow, sal_uInt32 nRightCol ); + sal_uInt32 nLeftCol, sal_uInt32 nRightCol ); SwTableBox *MakeTableBox( SwTableLine *pUpper, sal_uInt32 nTopRow, sal_uInt32 nLeftCol, sal_uInt32 nBottomRow, sal_uInt32 nRightCol ); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index f49d42a0d4a5..b33e5aec5c8f 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -1001,13 +1001,12 @@ void SwXMLTextImportHelper::RedlineSetCursor( } void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor( - bool bStart) + bool /*bStart*/) { OUString rId = GetOpenRedlineId(); if ((nullptr != pRedlineHelper) && !rId.isEmpty()) { - uno::Reference<XTextRange> xTextRange( GetCursor()->getStart() ); - pRedlineHelper->AdjustStartNodeCursor(rId, bStart, xTextRange ); + pRedlineHelper->AdjustStartNodeCursor(rId); ResetOpenRedlineId(); } // else: ignore redline (wasn't added before, or no open redline ID |