diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-08 09:23:17 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-09-08 09:23:40 +0200 |
commit | 579426f798580093214fa8a7cc648318642c7e12 (patch) | |
tree | 1e4b543a9010134e384d43d2bbbd1a97e3f3725b /sw/source/filter | |
parent | 847e004e65ec3c35acff607588d15cd75a84f121 (diff) |
loplugin:constantparam in sw
Change-Id: Ic49d1c3c7b57fb213964ddc21b0f774c762aad94
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/html/SwAppletImpl.cxx | 5 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 5 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 7d6d9c8f6499..bfeb6e888a01 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -27,6 +27,7 @@ #include <comphelper/classids.hxx> #include <com/sun/star/uno/Any.hxx> #include <svtools/embedhlp.hxx> +#include <hintids.hxx> using namespace com::sun::star; @@ -105,8 +106,8 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet return nType; } -SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) : - aItemSet( rPool, nWhich1, nWhich2 ) +SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool ) : + aItemSet( rPool, RES_FRMATR_BEGIN, RES_FRMATR_END-1 ) { } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index f5bde4e01325..d00f20c457af 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -500,8 +500,7 @@ void SwHTMLParser::NewObject() bDeclare = false; // Eine neue Command-List anlegen delete m_pAppletImpl; - m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool(), - RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); + m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool() ); const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) @@ -671,7 +670,7 @@ void SwHTMLParser::InsertApplet() // Eine neue Command-List anlegen delete m_pAppletImpl; - m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); + m_pAppletImpl = new SwApplet_Impl( m_pDoc->GetAttrPool() ); const HTMLOptions& rHTMLOptions = GetOptions(); for (size_t i = rHTMLOptions.size(); i; ) diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 4b68065876c6..cbecacd75432 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -235,7 +235,7 @@ SwFlyFrameFormat* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject, if (bSuccess) { const SfxItemSet *pFlySet = pMathFlySet ? pMathFlySet : &rFlySet; - pRet = m_rDoc.getIDocumentContentOperations().InsertOLE(*m_pPaM, sNewName, rObject.GetAspect(), pFlySet, rGrfSet, nullptr); + pRet = m_rDoc.getIDocumentContentOperations().InsertOLE(*m_pPaM, sNewName, rObject.GetAspect(), pFlySet, rGrfSet); } delete pMathFlySet; return pRet; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index e24fe060632a..1e35bf7d9b27 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -715,8 +715,7 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( SwRedlineData* pData = new SwRedlineData(pRedlineInfo->eType, nAuthorId, aDT, pRedlineInfo->sComment, - pNext, // next data (if available) - nullptr); // no extra data + pNext); // next data (if available) return pData; } diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 1fc18b2b599e..b83ef45d8da7 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -347,7 +347,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( // TODO/LATER: Actually it should be set here if( pTextCursor ) { - pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCursor->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr, nullptr ); + pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCursor->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, nullptr ); pOLENd = lcl_GetOLENode( pFrameFormat ); } aObjName = aName; |