diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-04 13:52:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-05 07:32:33 +0100 |
commit | eaf89e477af94bd3977aca17d72dd442c7604e63 (patch) | |
tree | 4fdbf97b398bbac50b40ceff3f607460846c6c6f | |
parent | remove some unused defines (diff) | |
download | core-eaf89e477af94bd3977aca17d72dd442c7604e63.tar.gz core-eaf89e477af94bd3977aca17d72dd442c7604e63.zip |
loplugin:countusersofdefaultparams in editeng..package
Change-Id: I4c20235a04d9ab5ea5edbb6b1b2413677b18a305
Reviewed-on: https://gerrit.libreoffice.org/45795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | editeng/inc/editdoc.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editobj2.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 | ||||
-rw-r--r-- | include/editeng/boxitem.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 10 | ||||
-rw-r--r-- | package/inc/ZipOutputEntry.hxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8graf2.cxx | 2 |
12 files changed, 20 insertions, 20 deletions
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 45cd7f0bf907..760d9a079cc3 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -772,7 +772,7 @@ public: void SetDefTab( sal_uInt16 nTab ) { nDefTab = nTab ? nTab : DEFTAB; } sal_uInt16 GetDefTab() const { return nDefTab; } - void SetVertical( bool bVertical, bool bTopToBottom = true ) + void SetVertical( bool bVertical, bool bTopToBottom ) { bIsVertical = bVertical; bIsTopToBottomVert = bVertical && bTopToBottom; } bool IsVertical() const { return bIsVertical; } bool IsTopToBottom() const { return bIsTopToBottomVert; } diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index f7c853668bac..f8645a5e93c4 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -215,7 +215,7 @@ public: bool IsVertical() const; bool IsTopToBottom() const; - void SetVertical( bool bVert, bool bTopToBottom = true); + void SetVertical( bool bVert, bool bTopToBottom); SvtScriptType GetScriptType() const { return nScriptType;} void SetScriptType( SvtScriptType nType ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index d9ec9a17136a..06fec2bc7e6a 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -740,7 +740,7 @@ public: const Size& GetPaperSize() const { return aPaperSize; } void SetPaperSize( const Size& rSz ) { aPaperSize = rSz; } - void SetVertical( bool bVertical, bool bTopToBottom = true); + void SetVertical( bool bVertical, bool bTopToBottom); bool IsVertical() const { return GetEditDoc().IsVertical(); } bool IsTopToBottom() const { return GetEditDoc().IsTopToBottom(); } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 38d7e5ed9e8d..75ee77299717 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6266,7 +6266,7 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape, if (!bSeeked || rStCtrl.GetError()) rStCtrl.ResetError(); else - rpShape = ImportObj( rStCtrl, &rData, rData.aParentRect, rData.aParentRect ); + rpShape = ImportObj( rStCtrl, &rData, rData.aParentRect, rData.aParentRect, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); // restore old FilePos of the stream(s) rStCtrl.Seek( nOldPosCtrl ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index aedba3aad7b9..cf0527555ea8 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2819,7 +2819,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* // do not follow master colorscheme? sal_uInt32 nPos = rStCtrl.Tell(); rStCtrl.Seek( pE->nBackgroundOffset ); - rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize ); + rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); rStCtrl.Seek( nPos ); } } @@ -2835,7 +2835,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* if ( ShapeFlag(nSpFlags) & ShapeFlag::Background ) { aEscherObjListHd.SeekToBegOfRecord( rStCtrl ); - rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize ); + rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); } } } diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index d0d2143c576f..d2c155e822b3 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -112,7 +112,7 @@ public: // bEvenIfNoLine = TRUE -> Also return distance, when no Line is set sal_uInt16 CalcLineWidth( SvxBoxItemLine nLine ) const; sal_uInt16 CalcLineSpace( SvxBoxItemLine nLine, bool bEvenIfNoLine = false ) const; - bool HasBorder( bool bTreatPaddingAsBorder = false ) const; + bool HasBorder( bool bTreatPaddingAsBorder ) const; static css::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, bool bConvert ); static bool LineToSvxLine(const css::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, bool bConvert); static bool LineToSvxLine(const css::table::BorderLine2& rLine, editeng::SvxBorderLine& rSvxLine, bool bConvert); diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 9e5e814016ba..ed0954111fa7 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -580,7 +580,7 @@ public: sal_uInt32 nOffsDgg, SvStream* pStData, SdrModel* pSdrModel_, - long nApplicationScale = 0, + long nApplicationScale, ColorData mnDefaultColor_ = COL_DEFAULT, SvStream* pStData2_ = nullptr, bool bSkipImages = false ); @@ -644,22 +644,22 @@ public: void* pData, tools::Rectangle& rClientRect, const tools::Rectangle& rGlobalChildRect, - int nCalledByGroup = 0, - sal_Int32* pShapeId = nullptr); + int nCalledByGroup, + sal_Int32* pShapeId); SdrObject* ImportGroup( const DffRecordHeader& rHd, SvStream& rSt, void* pData, tools::Rectangle& rClientRect, const tools::Rectangle& rGlobalChildRect, int nCalledByGroup, - sal_Int32* pShapeId = nullptr ); + sal_Int32* pShapeId ); SdrObject* ImportShape( const DffRecordHeader& rHd, SvStream& rSt, void* pData, tools::Rectangle& rClientRect, const tools::Rectangle& rGlobalChildRect, int nCalledByGroup, - sal_Int32* pShapeId = nullptr); + sal_Int32* pShapeId); tools::Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd, SvStream& rSt, diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index 016e220fa06e..2e6c11dfa129 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -60,7 +60,7 @@ public: ZipOutputEntry( const css::uno::Reference< css::io::XOutputStream >& rxOutStream, const css::uno::Reference< css::uno::XComponentContext >& rxContext, - ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false); + ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt); ~ZipOutputEntry(); @@ -68,7 +68,7 @@ public: data is retrieved via getData */ ZipOutputEntry( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false); + ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt); void createBufferFile(); void setParallelDeflateException(const ::css::uno::Any &rAny) { m_aParallelDeflateException = rAny; } css::uno::Reference< css::io::XInputStream > getData() const; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 021ad2ad6792..7eef97c5341f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1019,7 +1019,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq // the manifest.xml is never encrypted - so pass an empty reference ZipOutputStream::setEntry(pEntry); aZipOut.writeLOC(pEntry); - ZipOutputEntry aZipEntry(aZipOut.getStream(), m_xContext, *pEntry, nullptr); + ZipOutputEntry aZipEntry(aZipOut.getStream(), m_xContext, *pEntry, nullptr, /*bEncrypt*/false); aZipEntry.write(pBuffer->getSequence()); aZipEntry.closeEntry(); aZipOut.rawCloseEntry(); @@ -1072,7 +1072,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: // there is no encryption in this format currently ZipOutputStream::setEntry(pEntry); aZipOut.writeLOC(pEntry); - ZipOutputEntry aZipEntry(aZipOut.getStream(), m_xContext, *pEntry, nullptr); + ZipOutputEntry aZipEntry(aZipOut.getStream(), m_xContext, *pEntry, nullptr, /*bEncrypt*/false); aZipEntry.write(pBuffer->getSequence()); aZipEntry.closeEntry(); aZipOut.rawCloseEntry(); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 36205c5867e9..e883101f20e2 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3755,7 +3755,7 @@ bool XclImpDffConverter::ProcessShContainer( SvStream& rDffStrm, const DffRecord and the returned group object contains them all. ImportObj() calls the virtual functions ProcessClientAnchor2() and ProcessObj() and writes the pointer to the related draw object data (OBJ record) into pDrawObj. */ - SdrObjectPtr xSdrObj( ImportObj( rDffStrm, &pDrawObj, aDummy, aDummy ) ); + SdrObjectPtr xSdrObj( ImportObj( rDffStrm, &pDrawObj, aDummy, aDummy, /*nCalledByGroup*/0, /*pShapeId*/nullptr ) ); if( pDrawObj && xSdrObj ) InsertSdrObject( GetConvData().mrSdrPage, *pDrawObj, xSdrObj.release() ); return rShHeader.SeekToEndOfRecord( rDffStrm ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 87928bb4655f..1852f0bfe8b9 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -810,7 +810,7 @@ bool ImplSdPPTImport::Import() ::tools::Rectangle aEmpty; if (!aHd2.SeekToBegOfRecord(rStCtrl)) break; - SdrObject* pImpObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty ); + SdrObject* pImpObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty, /*nCalledByGroup*/0, /*pShapeId*/ nullptr ); if ( pImpObj ) { pImpObj->SetLayer( mnBackgroundObjectsLayerID ); @@ -1442,7 +1442,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide bVisible = false; rStCtrl.Seek( nPosition ); ProcessData aProcessData( rSlidePersist, SdPageCapsule(pPage) ); - SdrObject* pObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty ); + SdrObject* pObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); if ( pObj ) pPage->NbcInsertObject( pObj, 0 ); } diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index a2eb61857d7f..04f5d1b33626 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -556,7 +556,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj, tools::Rectangle aChildRect; tools::Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight); SvxMSDffImportData aData( aClientRect ); - pObject = m_xMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, aChildRect ); + pObject = m_xMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, aChildRect, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); if (pObject) { // for the frame |