diff options
22 files changed, 63 insertions, 63 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 3f9ddc991617..0c10f29b80bb 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -114,7 +114,7 @@ public: void clear() { maMap.clear(); } iterator find(const key_type& key) { return maMap.find(key); } std::pair<iterator,bool> insert(const value_type& value ) { return maMap.insert(value); } - iterator erase(const_iterator pos) { return maMap.erase(pos); } + iterator erase(const_iterator const & pos) { return maMap.erase(pos); } }; class SwDrawModellListener_Impl : public SfxListener, @@ -261,7 +261,7 @@ public: bool empty() const { return maMap.empty(); } iterator find(const key_type& key) { return maMap.find(key); } std::pair<iterator,bool> insert(const value_type& value ) { return maMap.insert(value); } - iterator erase(const_iterator pos) { return maMap.erase(pos); } + iterator erase(const_iterator const & pos) { return maMap.erase(pos); } }; SwAccessibleShapeMap_Impl::~SwAccessibleShapeMap_Impl() @@ -598,7 +598,7 @@ public: iterator end() { return maMap.end(); } iterator find(const key_type& key) { return maMap.find(key); } std::pair<iterator,bool> insert(const value_type& value ) { return maMap.insert(value); } - iterator erase(const_iterator pos) { return maMap.erase(pos); } + iterator erase(const_iterator const & pos) { return maMap.erase(pos); } }; struct SwAccessibleParaSelection @@ -638,7 +638,7 @@ public: iterator end() { return maMap.end(); } iterator find(const key_type& key) { return maMap.find(key); } std::pair<iterator,bool> insert(const value_type& value ) { return maMap.insert(value); } - iterator erase(const_iterator pos) { return maMap.erase(pos); } + iterator erase(const_iterator const & pos) { return maMap.erase(pos); } }; // helper class that stores preview data diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx index dbc72dfd3d5e..479eb2c3feed 100644 --- a/sw/source/core/docnode/observablethread.cxx +++ b/sw/source/core/docnode/observablethread.cxx @@ -34,7 +34,7 @@ ObservableThread::~ObservableThread() { } -void ObservableThread::SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener, +void ObservableThread::SetListener( std::weak_ptr< IFinishedThreadListener > const & pThreadListener, const oslInterlockedCount nThreadID ) { mpThreadListener = pThreadListener; diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index f1ddb87e1c96..9a46dc993539 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -39,7 +39,7 @@ SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager } SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::ReserveData( - std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer ) + std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > const & pThreadConsumer ) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 408b256b8738..7a1f461cbbe1 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -43,7 +43,7 @@ class ObservableThread : public osl::Thread, virtual ~ObservableThread(); - void SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener, + void SetListener( std::weak_ptr< IFinishedThreadListener > const & pThreadListener, const oslInterlockedCount nThreadID ); static inline void * operator new(std::size_t size) diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index 16042640e26d..a8f2a0244e8c 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -65,7 +65,7 @@ class SwRetrievedInputStreamDataManager static SwRetrievedInputStreamDataManager& GetManager(); - tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer ); + tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > const & pThreadConsumer ); void PushData( const tDataKey nDataKey, css::uno::Reference<css::io::XInputStream> const & xInputStream, diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 6e3f80ea15d5..375de4f6586e 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -187,7 +187,7 @@ class SwWrongList { if( rPos > nStart ) rPos = rPos > nEnd ? rPos - nEnd + nStart : nStart; } void Invalidate_( sal_Int32 nBegin, sal_Int32 nEnd ); - void Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator endPos); + void Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator const & endPos); void Remove( sal_uInt16 nIdx, sal_uInt16 nLen ); SwWrongList& operator= (const SwWrongList &) = delete; diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx index 45a18007c056..34b12ad6a8b9 100644 --- a/sw/source/core/text/wrong.cxx +++ b/sw/source/core/text/wrong.cxx @@ -540,7 +540,7 @@ void SwWrongList::InsertSubList( sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt1 } // New functions: Necessary because SwWrongList has been changed to use std::vector -void SwWrongList::Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator endPos) +void SwWrongList::Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator const & endPos) { std::vector<SwWrongArea>::iterator i = maList.begin(); if ( nWhere >= maList.size() ) diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 327d1cf555a6..cc1be4c35f68 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -1443,19 +1443,19 @@ CellInfoMultiSet::const_iterator WW8TableCellGridRow::end() const return m_pCellInfos->end(); } -void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr pTableBoxVector) +void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr const & pTableBoxVector) { if (pTableBoxVector->size() > MAXTABLECELLS) pTableBoxVector->resize(MAXTABLECELLS); m_pTableBoxVector = pTableBoxVector; } -void WW8TableCellGridRow::setWidths(WidthsPtr pWidths) +void WW8TableCellGridRow::setWidths(WidthsPtr const & pWidths) { m_pWidths = pWidths; } -void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) +void WW8TableCellGridRow::setRowSpans(RowSpansPtr const & pRowSpans) { m_pRowSpans = pRowSpans; } diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 10378cc3837c..77e27e8efd96 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -246,9 +246,9 @@ public: CellInfoMultiSet::const_iterator begin() const; CellInfoMultiSet::const_iterator end() const; - void setTableBoxVector(TableBoxVectorPtr pTableBoxVector); - void setWidths(WidthsPtr pGridCols); - void setRowSpans(RowSpansPtr pRowSpans); + void setTableBoxVector(TableBoxVectorPtr const & pTableBoxVector); + void setWidths(WidthsPtr const & pGridCols); + void setRowSpans(RowSpansPtr const & pRowSpans); const TableBoxVectorPtr& getTableBoxVector() const { return m_pTableBoxVector;} const WidthsPtr& getWidths() const { return m_pWidths;} diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index d09988f179df..046ca8d81118 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -623,8 +623,8 @@ protected: virtual bool AnalyzeURL( const OUString& rUrl, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ); - ww8::GridColsPtr GetGridCols( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - ww8::WidthsPtr GetColumnWidths( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + ww8::GridColsPtr GetGridCols( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); + ww8::WidthsPtr GetColumnWidths( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); public: AttributeOutputBase() {} diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 84b6c74c5f39..e77e164ad8a9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -712,7 +712,7 @@ void DocxAttributeOutput::EndSdtBlock() #define MAX_CELL_IN_WORD 62 -void DocxAttributeOutput::SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t pInner, sal_Int32 nCell, sal_uInt32 nRow) +void DocxAttributeOutput::SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t const & pInner, sal_Int32 nCell, sal_uInt32 nRow) { sal_Int32 nOpenCell = lastOpenCell.back(); if (nOpenCell != -1 && nOpenCell != nCell && nOpenCell < MAX_CELL_IN_WORD) @@ -733,7 +733,7 @@ void DocxAttributeOutput::SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_ } } -void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph ) +void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pInner, bool bForceEmptyParagraph ) { if ( pInner.get() ) { @@ -1921,7 +1921,7 @@ boost::optional<sal_Int32> lclGetElementIdForName(const OUString& rName) return boost::optional<sal_Int32>(); } -void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<css::beans::PropertyValue>& rElements, sax_fastparser::FSHelperPtr pSerializer) +void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<css::beans::PropertyValue>& rElements, sax_fastparser::FSHelperPtr const & pSerializer) { css::uno::Sequence<css::beans::PropertyValue> aAttributes; FastAttributeList* pAttributes = FastSerializerHelper::createAttrList(); @@ -2122,7 +2122,7 @@ void DocxAttributeOutput::FootnoteEndnoteRefTag() 1, meaning that it skips one character after the text. This is to make the switch in DocxAttributeOutput::RunText() nicer ;-) */ -static bool impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken, +static bool impl_WriteRunText( FSHelperPtr const & pSerializer, sal_Int32 nTextToken, const sal_Unicode* &rBegin, const sal_Unicode* pEnd, bool bMove = true ) { const sal_Unicode *pBegin = rBegin; @@ -2604,7 +2604,7 @@ void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle ) m_pSerializer->singleElementNS( XML_w, XML_pStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND ); } -static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, const SvxBorderLine* pBorderLine, sal_uInt16 nDist, +static void impl_borderLine( FSHelperPtr const & pSerializer, sal_Int32 elementToken, const SvxBorderLine* pBorderLine, sal_uInt16 nDist, bool bWriteShadow = false, const table::BorderLine2* rStyleProps = nullptr ) { // Compute val attribute value @@ -2777,7 +2777,7 @@ static bool boxHasLineLargerThan31(const SvxBoxItem& rBox) ); } -static void impl_borders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, const OutputBorderOptions& rOptions, PageMargins* pageMargins, +static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, const OutputBorderOptions& rOptions, PageMargins* pageMargins, std::map<SvxBoxItemLine, css::table::BorderLine2> &rTableStyleConf ) { static const SvxBoxItemLine aBorders[] = @@ -2901,7 +2901,7 @@ static void impl_borders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, const } } -static void impl_cellMargins( FSHelperPtr pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd = false, const SvxBoxItem* pDefaultMargins = nullptr) +static void impl_cellMargins( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd = false, const SvxBoxItem* pDefaultMargins = nullptr) { static const SvxBoxItemLine aBorders[] = { @@ -2951,7 +2951,7 @@ static void impl_cellMargins( FSHelperPtr pSerializer, const SvxBoxItem& rBox, s } } -void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ) +void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ) { m_pSerializer->startElementNS( XML_w, XML_tcPr, FSEND ); @@ -3032,7 +3032,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point m_pSerializer->endElementNS( XML_w, XML_tcPr ); } -void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { const SwTable* pTable = pTableTextNodeInfoInner->getTable(); if (m_xTableWrt && pTable == m_xTableWrt->GetTable()) @@ -3054,7 +3054,7 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t m_xTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTableSz, false)); } -void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { // In case any paragraph SDT's are open, close them here. EndParaSdtBlock(); @@ -3092,7 +3092,7 @@ void DocxAttributeOutput::EndTable() m_aTableStyleConf.clear(); } -void DocxAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +void DocxAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { m_pSerializer->startElementNS( XML_w, XML_tr, FSEND ); @@ -3134,7 +3134,7 @@ void DocxAttributeOutput::EndTableRow( ) lastClosedCell.back() = -1; } -void DocxAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ) +void DocxAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ) { lastOpenCell.back() = nCell; @@ -3148,7 +3148,7 @@ void DocxAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t m_tableReference->m_bTableCellOpen = true; } -void DocxAttributeOutput::EndTableCell(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/, sal_uInt32 nCell, sal_uInt32 /*nRow*/) +void DocxAttributeOutput::EndTableCell(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ const &, sal_uInt32 nCell, sal_uInt32 /*nRow*/) { lastClosedCell.back() = nCell; lastOpenCell.back() = -1; @@ -3479,7 +3479,7 @@ void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Point } } -void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); const SwFrameFormat * pFrameFormat = pTabBox->GetFrameFormat(); @@ -5363,7 +5363,7 @@ void DocxAttributeOutput::EndStyleProperties( bool bParProp ) namespace { -void lcl_OutlineLevel(sax_fastparser::FSHelperPtr pSerializer, sal_uInt16 nLevel) +void lcl_OutlineLevel(sax_fastparser::FSHelperPtr const & pSerializer, sal_uInt16 nLevel) { if (nLevel >= WW8ListManager::nMaxLevel) nLevel = WW8ListManager::nMaxLevel - 1; @@ -6927,7 +6927,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes ) } -void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr fs, int tag, +void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr const & fs, int tag, const SwEndNoteInfo& info, int listtag ) { fs->startElementNS( XML_w, tag, FSEND ); @@ -7081,7 +7081,7 @@ void DocxAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows ) m_pSerializer->singleElementNS( XML_w, XML_widowControl, FSNS( XML_w, XML_val ), "false", FSEND ); } -static void impl_WriteTabElement( FSHelperPtr pSerializer, +static void impl_WriteTabElement( FSHelperPtr const & pSerializer, const SvxTabStop& rTab, long /* nCurrentLeft */ ) { FastAttributeList *pTabElementAttrList = FastSerializerHelper::createAttrList(); @@ -8508,7 +8508,7 @@ DocxExport& DocxAttributeOutput::GetExport() return m_rExport; } -void DocxAttributeOutput::SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ) +void DocxAttributeOutput::SetSerializer( ::sax_fastparser::FSHelperPtr const & pSerializer ) { m_pSerializer = pSerializer; m_pTableStyleExport->SetSerializer(pSerializer); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 6c17e76c5038..392f3316738e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -230,7 +230,7 @@ public: virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; - void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; @@ -419,19 +419,19 @@ private: /// checks whether the current component is a diagram static bool IsDiagram (const SdrObject* sdrObject); - void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); - void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); - void EndTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); + void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); + void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); + void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); + void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); + void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); + void EndTableCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow ); void EndTableRow( ); void EndTable(); - void SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t pInner, sal_Int32 nCell, sal_uInt32 nRow); + void SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t const & pInner, sal_Int32 nCell, sal_uInt32 nRow); void PopulateFrameProperties(const SwFrameFormat* pFrameFormat, const Size& rSize); static bool TextBoxIsFramePr(const SwFrameFormat& rFrameFormat); /// End cell, row, and even the entire table if necessary. - void FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false ); + void FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pInner, bool bForceEmptyParagraph = false ); void WriteFFData( const FieldInfos& rInfos ); void WritePendingPlaceholder(); @@ -950,7 +950,7 @@ public: const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); } /// For e.g. the output of the styles, we need to switch the serializer to another one. - void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ); + void SetSerializer( ::sax_fastparser::FSHelperPtr const & pSerializer ); /// Occasionally need to use this serializer from the outside const ::sax_fastparser::FSHelperPtr& GetSerializer( ) { return m_pSerializer; } @@ -965,7 +965,7 @@ public: void FootnotesEndnotes( bool bFootnotes ); /// writes the footnotePr/endnotePr (depending on tag) section - static void WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr fs, int tag, const SwEndNoteInfo& info, int listtag ); + static void WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr const & fs, int tag, const SwEndNoteInfo& info, int listtag ); bool HasPostitFields() const; void WritePostitFields(); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 408cb6203b4e..89deee4b1909 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -351,7 +351,7 @@ void DocxExport::DoFormText(const SwInputField* /*pField*/) OSL_TRACE( "TODO DocxExport::ForFormText()" ); } -OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ) +OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ) { OUString aFileName = "charts/chart" + OUString::number(nCount) + ".xml"; OUString sId = m_pFilter->addRelation( m_pSerializer->getOutputStream(), @@ -1428,7 +1428,7 @@ void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTy } } -void DocxExport::SetFS( ::sax_fastparser::FSHelperPtr pFS ) +void DocxExport::SetFS( ::sax_fastparser::FSHelperPtr const & pFS ) { mpFS = pFS; } diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 047b497dcce5..5ae1b39fa0e0 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -169,7 +169,7 @@ public: virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override; /// Returns the relationd id - OString OutputChart( css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); + OString OutputChart( css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ); OString WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID); /// Writes the shape using drawingML syntax. @@ -270,7 +270,7 @@ public: const ::sax_fastparser::FSHelperPtr& GetFS() { return mpFS; } - void SetFS(::sax_fastparser::FSHelperPtr mpFS); + void SetFS(::sax_fastparser::FSHelperPtr const & mpFS); private: DocxExport( const DocxExport& ) = delete; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e7753fd4e83d..5f098b2d875b 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2379,12 +2379,12 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t } } -ww8::GridColsPtr AttributeOutputBase::GetGridCols( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +ww8::GridColsPtr AttributeOutputBase::GetGridCols( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { return pTableTextNodeInfoInner->getGridColsOfRow(*this); } -ww8::WidthsPtr AttributeOutputBase::GetColumnWidths( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) +ww8::WidthsPtr AttributeOutputBase::GetColumnWidths( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { // Get the column widths based on ALL the rows, not just the current row return pTableTextNodeInfoInner->getGridColsOfRow(*this, true); @@ -2494,7 +2494,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe } void WW8AttributeOutput::TableCellBorders( - ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) + ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); const SwTableLine * pTabLine = pTabBox->GetUpper(); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 6ddbad9a831f..c67721700aeb 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1028,7 +1028,7 @@ public: void StartCommentOutput( const OUString& rName ); void EndCommentOutput( const OUString& rName ); void OutGrf(const ww8::Frame &rFrame); - bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> xOleStg, + bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> const & xOleStg, tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd); virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index e8b9aa0dce40..e43e09947f96 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -90,7 +90,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ ) } bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, - tools::SvRef<SotStorage> xOleStg, tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, + tools::SvRef<SotStorage> const & xOleStg, tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd) { bool bGraphicNeeded = false; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 68216d26bfa6..9404b6ff1183 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -482,7 +482,7 @@ protected: void OutputWW8AttributeCTL( sal_uInt8 nId, bool bVal ); void TableCellBorders( - ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner ); }; diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx index 27812adf6cec..dd572c76aef0 100644 --- a/sw/source/uibase/inc/langhelper.hxx +++ b/sw/source/uibase/inc/langhelper.hxx @@ -48,10 +48,10 @@ namespace SwLangHelper extern OUString GetTextForLanguageGuessing(EditEngine* rEditEngine, const ESelection& rDocSelection); extern OUString GetTextForLanguageGuessing(SwWrtShell &rSh); - extern LanguageType GetLanguage( SfxItemSet aSet, sal_uInt16 nLangWhichId ); + extern LanguageType GetLanguage( SfxItemSet const & aSet, sal_uInt16 nLangWhichId ); extern LanguageType GetLanguage( SwWrtShell &rSh, sal_uInt16 nLangWhichId ); - extern LanguageType GetCurrentLanguage( SfxItemSet aSet, SvtScriptType nScriptType ); + extern LanguageType GetCurrentLanguage( SfxItemSet const & aSet, SvtScriptType nScriptType ); extern LanguageType GetCurrentLanguage( SwWrtShell &rSh ); } diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 2a328ab9f4ca..a8a7f8f976cc 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -411,7 +411,7 @@ namespace SwLangHelper return GetLanguage(aSet,nLangWhichId); } - LanguageType GetLanguage( SfxItemSet aSet, sal_uInt16 nLangWhichId ) + LanguageType GetLanguage( SfxItemSet const & aSet, sal_uInt16 nLangWhichId ) { LanguageType nLang = LANGUAGE_SYSTEM; @@ -490,7 +490,7 @@ namespace SwLangHelper /// 'In use' means the language(s) matching the script type(s) of the /// selected text. Or in other words, the language a spell checker would use. /// If there is more than one language LANGUAGE_DONTKNOW will be returned. - LanguageType GetCurrentLanguage( SfxItemSet aSet, SvtScriptType nScriptType ) + LanguageType GetCurrentLanguage( SfxItemSet const & aSet, SvtScriptType nScriptType ) { //set language attribute to use according to the script type sal_uInt16 nLangWhichId = 0; diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 32a0f60973cb..7b63c822b976 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -115,7 +115,7 @@ public: : maStyles() {} - void add(StyleRedefinition aRedefinition) + void add(StyleRedefinition const & aRedefinition) { maStyles.push_back(aRedefinition); } diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx index 875970582f6f..bf630740654b 100644 --- a/sw/source/uibase/uitest/uiobject.cxx +++ b/sw/source/uibase/uitest/uiobject.cxx @@ -20,7 +20,7 @@ SwEditWinUIObject::SwEditWinUIObject(VclPtr<SwEditWin> xEditWin): namespace { -SwWrtShell& getWrtShell(VclPtr<SwEditWin> xEditWin) +SwWrtShell& getWrtShell(VclPtr<SwEditWin> const & xEditWin) { return xEditWin->GetView().GetWrtShell(); } |