diff options
50 files changed, 95 insertions, 95 deletions
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index ca9c9d6877e9..1401abdc10a9 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion bool FindConvText_impl(); ///< former FindSpellError void ConvStart_impl( SwConversionArgs *pConvArgs, SvxSpellArea eSpell ); ///< former SpellStart - void ConvEnd_impl( SwConversionArgs *pConvArgs ); ///< former SpellEnd + void ConvEnd_impl( SwConversionArgs const *pConvArgs ); ///< former SpellEnd bool ConvContinue_impl( SwConversionArgs *pConvArgs ); ///< former SpellContinue void SelectNewUnit_impl( const sal_Int32 nUnitStart, diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 7181997dd24c..c6783bb3c5cb 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -305,7 +305,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // used for spell checking and text conversion SAL_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone, bool bEndDone, SwConversionArgs *pConvArgs ); - SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs ); + SAL_DLLPRIVATE void SpellEnd( SwConversionArgs const *pConvArgs ); SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); SAL_DLLPRIVATE void SpellContext(bool bOn = true) @@ -490,12 +490,12 @@ public: // Handler void Execute(SfxRequest&); void ExecLingu(SfxRequest&); - void ExecDlg(SfxRequest&); - void ExecDlgExt(SfxRequest&); - void ExecColl(SfxRequest&); + void ExecDlg(SfxRequest const &); + void ExecDlgExt(SfxRequest const &); + void ExecColl(SfxRequest const &); void ExecutePrint(SfxRequest&); void ExecDraw(SfxRequest&); - void ExecTabWin(SfxRequest&); + void ExecTabWin(SfxRequest const &); void ExecuteStatusLine(SfxRequest&); DECL_LINK( ExecRulerClick, Ruler *, void ); void ExecSearch(SfxRequest&); @@ -528,8 +528,8 @@ public: bool IsFormMode() const; bool IsBezierEditMode(); bool AreOnlyFormsSelected() const; - bool HasDrwObj(SdrObject *pSdrObj) const; - bool HasOnlyObj(SdrObject *pSdrObj, SdrInventor eObjInventor) const; + bool HasDrwObj(SdrObject const *pSdrObj) const; + bool HasOnlyObj(SdrObject const *pSdrObj, SdrInventor eObjInventor) const; bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=nullptr, vcl::Window* pWin=nullptr, bool bIsNewObj=false, bool bSetSelectionToStart=false ); @@ -592,7 +592,7 @@ public: // Enable mail merge - mail merge field dialog enabled void EnableMailMerge(); //apply Accessiblity options - void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); + void ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAccessibilityOptions); SwView(SfxViewFrame* pFrame, SfxViewShell*); virtual ~SwView() override; @@ -605,11 +605,11 @@ public: // store MailMerge data while "Back to Mail Merge Wizard" FloatingWindow is active // or to support printing - void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rConfigItem); + void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem> const & rConfigItem); std::shared_ptr<SwMailMergeConfigItem> GetMailMergeConfigItem() const; std::shared_ptr<SwMailMergeConfigItem> EnsureMailMergeConfigItem(const SfxItemSet* pArgs = nullptr); - void ExecFormatPaintbrush(SfxRequest &); + void ExecFormatPaintbrush(SfxRequest const &); void StateFormatPaintbrush(SfxItemSet &); //public fuer D&D diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 366094394e11..f430ec9f9763 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -102,15 +102,15 @@ namespace sw sal_uLong MSDateTimeFormatToSwFormat(OUString& rParams, SvNumberFormatter *pFormatter, LanguageType &rLang, bool bHijri, LanguageType nDocLang); /*Used to identify if the previous token is AM time field*/ - bool IsPreviousAM(OUString& rParams, sal_Int32 nPos); + bool IsPreviousAM(OUString const & rParams, sal_Int32 nPos); /*Used to identify if the next token is PM time field*/ - bool IsNextPM(OUString& rParams, sal_Int32 nPos); + bool IsNextPM(OUString const & rParams, sal_Int32 nPos); /** Used by MSDateTimeFormatToSwFormat to identify AM time fields */ - bool IsNotAM(OUString& rParams, sal_Int32 nPos); + bool IsNotAM(OUString const & rParams, sal_Int32 nPos); /** Another function used by MSDateTimeFormatToSwFormat diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index b97d5e5817b7..5e088e5e0dd4 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -42,7 +42,7 @@ namespace ww8 OSL_ENSURE(mn_size == nSize, "short read in WW8Struct::WW8Struct"); } - WW8Struct::WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize) + WW8Struct::WW8Struct(WW8Struct const * pStruct, sal_uInt32 nPos, sal_uInt32 nSize) : m_pData(pStruct->m_pData), mn_offset(pStruct->mn_offset + nPos) , mn_size(nSize) { diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 179ae6acc1d3..b404d4b69820 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -40,7 +40,7 @@ namespace ww8 public: WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize); - WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize); + WW8Struct(WW8Struct const * pStruct, sal_uInt32 nPos, sal_uInt32 nSize); virtual ~WW8Struct() override; sal_uInt8 getU8(sal_uInt32 nOffset); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 4439e5ebcb4b..d4d12e86aeef 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -734,7 +734,7 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, return pNodeInfo; } -void updateFinalEndOfLine(RowEndInners_t &rLastRowEnds, WW8TableNodeInfo* pEndOfCellInfo) +void updateFinalEndOfLine(RowEndInners_t &rLastRowEnds, WW8TableNodeInfo const * pEndOfCellInfo) { sal_Int32 nDepth = pEndOfCellInfo->getDepth(); WW8TableNodeInfoInner::Pointer_t pInner = pEndOfCellInfo->getInnerForDepth(nDepth); @@ -849,7 +849,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, - SwRect * pRect) + SwRect const * pRect) { WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode); @@ -1365,7 +1365,7 @@ std::string WW8TableCellGrid::toString() #endif TableBoxVectorPtr WW8TableCellGrid::getTableBoxesOfRow -(WW8TableNodeInfoInner * pNodeInfoInner) +(WW8TableNodeInfoInner const * pNodeInfoInner) { TableBoxVectorPtr pResult; WW8TableCellGridRow::Pointer_t pRow = @@ -1380,7 +1380,7 @@ TableBoxVectorPtr WW8TableCellGrid::getTableBoxesOfRow } WidthsPtr WW8TableCellGrid::getWidthsOfRow -(WW8TableNodeInfoInner * pNodeInfoInner) +(WW8TableNodeInfoInner const * pNodeInfoInner) { GridColsPtr pResult; @@ -1396,7 +1396,7 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow } RowSpansPtr WW8TableCellGrid::getRowSpansOfRow -(WW8TableNodeInfoInner * pNodeInfoInner) +(WW8TableNodeInfoInner const * pNodeInfoInner) { RowSpansPtr pResult; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 6d2b814f1882..a3b6df799180 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -282,9 +282,9 @@ public: std::string toString(); #endif - TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo); - WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner * pNodeInfo); - RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo); + TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner const * pNodeInfo); + WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner const * pNodeInfo); + RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner const * pNodeInfo); }; class WW8TableInfo final @@ -328,7 +328,7 @@ class WW8TableInfo final sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, - SwRect * pRect = nullptr); + SwRect const * pRect = nullptr); WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable, bool bCreate = true); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7f6f312e5d8b..e09bdaae67b9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1502,7 +1502,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) } } -void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun ) +void DocxAttributeOutput::StartField_Impl( FieldInfos const & rInfos, bool bWriteRun ) { if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN ) { @@ -1587,7 +1587,7 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& rCmd ) } -void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) +void DocxAttributeOutput::CmdField_Impl( FieldInfos const & rInfos ) { m_pSerializer->startElementNS( XML_w, XML_r, FSEND ); sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd, '\t'); @@ -2774,7 +2774,7 @@ static bool boxHasLineLargerThan31(const SvxBoxItem& rBox) ); } -static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, const OutputBorderOptions& rOptions, PageMargins* pageMargins, +static void impl_borders( FSHelperPtr const & pSerializer, const SvxBoxItem& rBox, const OutputBorderOptions& rOptions, PageMargins const * pageMargins, std::map<SvxBoxItemLine, css::table::BorderLine2> &rTableStyleConf ) { static const SvxBoxItemLine aBorders[] = diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 712ae06b9589..49efe1d6c72d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -713,9 +713,9 @@ private: /// Closes a currently open SDT block. void EndSdtBlock(); - void StartField_Impl( FieldInfos& rInfos, bool bWriteRun = false ); + void StartField_Impl( FieldInfos const & rInfos, bool bWriteRun = false ); void DoWriteCmd( const OUString& rCmd ); - void CmdField_Impl( FieldInfos& rInfos ); + void CmdField_Impl( FieldInfos const & rInfos ); void EndField_Impl( FieldInfos& rInfos ); static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue ); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 6ff65f09db50..b5c5e0bba337 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -355,7 +355,7 @@ void DocxExport::DoFormText(const SwInputField* /*pField*/) SAL_INFO("sw.ww8", "TODO DocxExport::ForFormText()" ); } -OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ) +OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & 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(), @@ -419,7 +419,7 @@ OString DocxExport::WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID) return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } -void DocxExport::OutputDML(uno::Reference<drawing::XShape>& xShape) +void DocxExport::OutputDML(uno::Reference<drawing::XShape> const & xShape) { uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW); sal_Int32 nNamespace = XML_wps; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index b3627639eb96..915f50122bfc 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -172,11 +172,11 @@ 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 const & m_pSerializer ); + OString OutputChart( css::uno::Reference< css::frame::XModel > const & xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ); OString WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID); /// Writes the shape using drawingML syntax. - void OutputDML( css::uno::Reference< css::drawing::XShape >& xShape ); + void OutputDML( css::uno::Reference< css::drawing::XShape > const & xShape ); void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index bda4776a8572..23885ec5e83e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -85,7 +85,7 @@ using namespace ::com::sun::star; using namespace sw::util; -static OString OutTBLBorderLine(RtfExport& rExport, const editeng::SvxBorderLine* pLine, const sal_Char* pStr) +static OString OutTBLBorderLine(RtfExport const & rExport, const editeng::SvxBorderLine* pLine, const sal_Char* pStr) { OStringBuffer aRet; if (!pLine->isEmpty()) @@ -165,7 +165,7 @@ static OString OutTBLBorderLine(RtfExport& rExport, const editeng::SvxBorderLine return aRet.makeStringAndClear(); } -static OString OutBorderLine(RtfExport& rExport, const editeng::SvxBorderLine* pLine, +static OString OutBorderLine(RtfExport const & rExport, const editeng::SvxBorderLine* pLine, const sal_Char* pStr, sal_uInt16 nDist, SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE) { OStringBuffer aRet; diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index e184f089c5e4..cd4a10e121c8 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -508,7 +508,7 @@ namespace sw Utility to extract FlyFormats from a document, potentially from a selection. */ - ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM /*, bool bAll*/) + ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM const *pPaM /*, bool bAll*/) { SwPosFlyFrames aFlys(rDoc.GetAllFlyFormats(pPaM, true)); ww8::Frames aRet(SwPosFlyFramesToFrames(aFlys)); diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 380a957ccb70..cf6e379df9ec 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -517,7 +517,7 @@ namespace sw @return A Frames containing the selections Floating elements */ - ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM); + ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM const *pPaM); /** fix up frame positions, must be called after SetRedlineFlags */ void UpdateFramePositions(ww8::Frames & rFrames); diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index dcc9aaaabe75..06f9b870977a 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -1047,15 +1047,15 @@ namespace sw return nKey; } - bool IsPreviousAM(OUString& rParams, sal_Int32 nPos) + bool IsPreviousAM(OUString const & rParams, sal_Int32 nPos) { return nPos>=2 && rParams.matchIgnoreAsciiCase("am", nPos-2); } - bool IsNextPM(OUString& rParams, sal_Int32 nPos) + bool IsNextPM(OUString const & rParams, sal_Int32 nPos) { return nPos+2<rParams.getLength() && rParams.matchIgnoreAsciiCase("pm", nPos+1); } - bool IsNotAM(OUString& rParams, sal_Int32 nPos) + bool IsNotAM(OUString const & rParams, sal_Int32 nPos) { ++nPos; return nPos>=rParams.getLength() || (rParams[nPos]!='M' && rParams[nPos]!='m'); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index ce1e3df8572c..e15b6854f1ee 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -318,7 +318,7 @@ namespace /// @param rWrt The containing WW8Export. /// @param pObj pointer to the drawing object. /// @returns The ordering number. - sal_uLong lcl_getSdrOrderNumber(const WW8Export& rWrt, DrawObj *pObj) + sal_uLong lcl_getSdrOrderNumber(const WW8Export& rWrt, DrawObj const *pObj) { return rWrt.GetSdrOrdNum(pObj->maContent.GetFrameFormat()); }; @@ -936,7 +936,7 @@ DrawObj& DrawObj::operator=(const DrawObj& rOther) return *this; } -bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const ww8::Frame& rFormat, +bool PlcDrawObj::Append( WW8Export const & rWrt, WW8_CP nCp, const ww8::Frame& rFormat, const Point& rNdTopLeft ) { bool bRet = false; @@ -3109,7 +3109,7 @@ sal_uInt32 SwEscherEx::QueryTextID( return nId; } -SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox +SwMSConvertControls::SwMSConvertControls( SfxObjectShell const *pDSh, SwPaM *pP ) : oox ::ole::MSConvertOCXControls( pDSh ? pDSh->GetModel() : nullptr ), pPaM( pP ), mnObjectId(0) { } @@ -3117,7 +3117,7 @@ SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in // filter/source/msocximex.cxx, so.. we need an implementation here -bool SwMSConvertControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, +bool SwMSConvertControls::ReadOCXStream( tools::SvRef<SotStorage> const & rSrc1, css::uno::Reference< css::drawing::XShape > *pShapeRef, bool bFloatingCtrl ) { diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 5218eaacc26c..cb8807c5ecfa 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1776,7 +1776,7 @@ void WW8AttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop m_rWW8Export.pO->clear(); } -sal_Int32 MSWordExportBase::GetNextPos( SwWW8AttrIter* aAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos ) +sal_Int32 MSWordExportBase::GetNextPos( SwWW8AttrIter const * aAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos ) { // Get the bookmarks for the normal run const sal_Int32 nNextPos = aAttrIter->WhereNext(); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index bb371dcdc5b7..83aa12ecb3c8 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -370,7 +370,7 @@ protected: public: PlcDrawObj() {} void WritePlc( WW8Export& rWrt ) const; - bool Append( WW8Export&, WW8_CP nCp, const ww8::Frame& rFormat, + bool Append( WW8Export const &, WW8_CP nCp, const ww8::Frame& rFormat, const Point& rNdTopLeft ); int size() { return maDrawObjs.size(); }; DrawObjVector &GetObjArr() { return maDrawObjs; } @@ -788,7 +788,7 @@ protected: virtual void ExportDocument_Impl() = 0; /// Get the next position in the text node to output - sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos ); + sal_Int32 GetNextPos( SwWW8AttrIter const * pAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos ); /// Update the information for GetNextPos(). void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos ); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 6ad6db3cd749..c038ded95f8c 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -719,13 +719,13 @@ public: class SwMSConvertControls: public oox::ole::MSConvertOCXControls { public: - SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ); + SwMSConvertControls( SfxObjectShell const *pDSh, SwPaM *pP ); void InsertFormula( WW8FormulaControl &rFormula); virtual bool InsertControl(const css::uno::Reference< css::form::XFormComponent >& rFComp, const css::awt::Size& rSize, css::uno::Reference< css::drawing::XShape > *pShape, bool bFloatingCtrl) override; void ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj); - bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, + bool ReadOCXStream( tools::SvRef<SotStorage> const & rSrc1, css::uno::Reference< css::drawing::XShape > *pShapeRef, bool bFloatingCtrl=false ); private: diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 1e11f1f03945..9ee6b468ad99 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -161,7 +161,7 @@ protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - void EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode ); + void EditEntry( SvTreeListEntry const * pEntry, EditEntryMode nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 7e04b535568a..5cd5c7feb60d 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -267,7 +267,7 @@ public: SwDocShell* GetDocShell(); // apply Accessiblity options - void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); + void ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAccessibilityOptions); // Inline method to request values of new members // <mbResetFormDesignMode> and <mbFormDesignModeToReset> diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index ce7632dbf4ce..365fb927dbe2 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -67,7 +67,7 @@ public: /// @return the XModel of the newly inserted chart if successful css::uno::Reference< css::frame::XModel > - InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = nullptr ); + InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > const &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = nullptr ); }; #endif diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index ec02154de2b3..a5ab79c186f4 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwPageFootnoteInfoItem : public SfxPoolItem public: - SwPageFootnoteInfoItem(SwPageFootnoteInfo& rInfo); + SwPageFootnoteInfoItem(SwPageFootnoteInfo const & rInfo); SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem ); virtual ~SwPageFootnoteInfoItem() override; diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index 0ad7d742b4f6..3a1fd7060f97 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -96,14 +96,14 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, boo SW_DLLPUBLIC sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 nOffset); // Get table width and alignment -SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent, +SwTwips GetTableWidth( SwFrameFormat const * pFormat, SwTabCols const & rCols, sal_uInt16 *pPercent, SwWrtShell* pSh ); OUString GetAppLangDateTimeString( const DateTime& ); // search for a command string within the menu structure and execute it // at the dispatcher if there is one, if executed return true -bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId ); +bool ExecuteMenuCommand( PopupMenu const & rMenu, SfxViewFrame const & rViewFrame, sal_uInt16 nId ); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 7ebb1b3428b7..ed2f1912fbf8 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -134,7 +134,7 @@ public: void AddTransferable(SwTransferable& rTransferable); - void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rItem) + void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem> const & rItem) { xConfigItem = rItem; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index bed54a04205f..95d0564668eb 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -290,7 +290,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); int IntelligentCut(SelectionType nSelectionType, bool bCut = true); // edit - void Insert(SwField &); + void Insert(SwField const &); void Insert(const OUString &); // graphic void Insert( const OUString &rPath, const OUString &rFilter, @@ -324,7 +324,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); //OLE void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard const svt::EmbeddedObjectRef&, - SvGlobalName *pName, // != 0 create object accordingly + SvGlobalName const *pName, // != 0 create object accordingly sal_uInt16 nSlotId = 0); // SlotId for dialog bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr ); diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 27cd912a8d57..6293d32c965b 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -685,7 +685,7 @@ void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs ); } -void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs ) +void SwHHCWrapper::ConvEnd_impl( SwConversionArgs const *pConversionArgs ) { m_pView->SpellEnd( pConversionArgs ); } diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index a69861794b30..fac137507c12 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -125,7 +125,7 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName) return pVirtualDev->GetBitmapEx(Point(), aSize); } -BitmapEx CreatePreview(OUString const & aUrl, OUString& aName) +BitmapEx CreatePreview(OUString const & aUrl, OUString const & aName) { SfxMedium aMedium(aUrl, StreamMode::STD_READWRITE); SfxObjectShell* pObjectShell = SfxObjectShell::Current(); diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index cb5318dc19d7..cdb07db50d3a 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -82,7 +82,7 @@ public: maVariable = aVariable; } - Color getColor(svx::ColorSet& rColorSet) + Color getColor(svx::ColorSet const & rColorSet) { Color aColor; if (maVariable.mnIndex > -1) @@ -192,7 +192,7 @@ StyleSet setupThemes() return aSet; } -void changeFont(SwFormat* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet) +void changeFont(SwFormat* pFormat, SwDocStyleSheet const * pStyle, FontSet const & rFontSet) { bool bChanged = false; @@ -244,7 +244,7 @@ void changeFont(SwFormat* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet) } }*/ -void changeColor(SwTextFormatColl* pCollection, svx::ColorSet& rColorSet, StyleRedefinition* pRedefinition) +void changeColor(SwTextFormatColl* pCollection, svx::ColorSet const & rColorSet, StyleRedefinition* pRedefinition) { Color aColor = pRedefinition->getColor(rColorSet); diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index eacb935046e0..6a8a9c28927c 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -189,7 +189,7 @@ void SwTableFUNC::UpdateChart() } uno::Reference< frame::XModel > SwTableFUNC::InsertChart( - uno::Reference< chart2::data::XDataProvider > &rxDataProvider, + uno::Reference< chart2::data::XDataProvider > const &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat ) diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index e1e4d34220cc..844376d872a4 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1854,7 +1854,7 @@ uno::Reference< css::accessibility::XAccessible > return GetAccessible( false ); } -void SwPagePreview::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) +void SwPagePreview::ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAccessibilityOptions) { GetViewShell()->ApplyAccessiblityOptions(rAccessibilityOptions); } diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 97c362de95df..59f90e5eede2 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -121,7 +121,7 @@ view::XSelectionSupplier* SwView::GetUNOObject() return m_pViewImpl->GetUNOObject(); } -void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) +void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAccessibilityOptions) { m_pWrtShell->ApplyAccessiblityOptions(rAccessibilityOptions); //to enable the right state of the selection cursor in readonly documents @@ -130,7 +130,7 @@ void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOpt } -void SwView::SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rConfigItem) +void SwView::SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem> const & rConfigItem) { m_pViewImpl->SetMailMergeConfigItem(rConfigItem); UIFeatureChanged(); diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index f8b949368494..be1a38642f4c 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -131,7 +131,7 @@ void SwView::MarginChanged() GetWrtShell().SetBrowseBorder( GetMargin() ); } -void SwView::ExecFormatPaintbrush(SfxRequest& rReq) +void SwView::ExecFormatPaintbrush(SfxRequest const & rReq) { if(!m_pFormatClipboard) return; diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx index 0269604c6b97..9a74e586753f 100644 --- a/sw/source/uibase/uiview/viewcoll.cxx +++ b/sw/source/uibase/uiview/viewcoll.cxx @@ -30,7 +30,7 @@ #include "wrtsh.hxx" #include "basesh.hxx" -void SwView::ExecColl(SfxRequest &rReq) +void SwView::ExecColl(SfxRequest const &rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = nullptr; diff --git a/sw/source/uibase/uiview/viewdlg.cxx b/sw/source/uibase/uiview/viewdlg.cxx index ef2e8345a143..db3b4be759f2 100644 --- a/sw/source/uibase/uiview/viewdlg.cxx +++ b/sw/source/uibase/uiview/viewdlg.cxx @@ -33,7 +33,7 @@ #include "pagedesc.hxx" -void SwView::ExecDlg(SfxRequest &rReq) +void SwView::ExecDlg(SfxRequest const &rReq) { // Thus, from the basic no dialogues for background views are called: const SfxPoolItem* pItem = nullptr; diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index a219592a61c0..52c5aab20467 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -41,7 +41,7 @@ #include <memory> -void SwView::ExecDlgExt(SfxRequest &rReq) +void SwView::ExecDlgExt(SfxRequest const &rReq) { vcl::Window *pMDI = &GetViewFrame()->GetWindow(); diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index d639a566bd54..8831ced9a45a 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -445,7 +445,7 @@ void SwView::NoRotate() // Enable DrawTextEditMode -static bool lcl_isTextBox(SdrObject* pObject) +static bool lcl_isTextBox(SdrObject const * pObject) { if (SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(pObject->GetUserCall())) { @@ -677,7 +677,7 @@ bool SwView::AreOnlyFormsSelected() const return bForm; } -bool SwView::HasDrwObj(SdrObject *pSdrObj) const +bool SwView::HasDrwObj(SdrObject const *pSdrObj) const { bool bRet = false; @@ -699,7 +699,7 @@ bool SwView::HasDrwObj(SdrObject *pSdrObj) const return bRet; } -bool SwView::HasOnlyObj(SdrObject *pSdrObj, SdrInventor eObjInventor) const +bool SwView::HasOnlyObj(SdrObject const *pSdrObj, SdrInventor eObjInventor) const { bool bRet = false; diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx index c891101e477b..3ee98bc38f0d 100644 --- a/sw/source/uibase/uiview/viewfunc.hxx +++ b/sw/source/uibase/uiview/viewfunc.hxx @@ -32,7 +32,7 @@ class SwViewShell; namespace vcl { class Window; } // The following functions are available in viewprt.cxx -void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb ); +void SetPrinter( IDocumentDeviceAccess*, SfxPrinter const *, bool bWeb ); void SetAppPrintOptions( SwViewShell* pSh, bool bWeb ); // The following functions are available in viewport.cxx diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 91ef3bb2c383..187f81e33fde 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -382,7 +382,7 @@ void SwView::SpellError(LanguageType eLang) // Finish spelling and restore cursor -void SwView::SpellEnd( SwConversionArgs *pConvArgs ) +void SwView::SpellEnd( SwConversionArgs const *pConvArgs ) { m_pWrtShell->SpellEnd( pConvArgs ); if( m_pWrtShell->IsExtMode() ) diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index c909c1dd8835..3a0214dae4aa 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -71,7 +71,7 @@ bool SwView::IsDocumentBorder() SvxZoomType::PAGEWIDTH_NOBORDER == m_pWrtShell->GetViewOptions()->GetZoomType(); } -inline long GetLeftMargin( SwView &rView ) +inline long GetLeftMargin( SwView const &rView ) { SvxZoomType eType = rView.GetWrtShell().GetViewOptions()->GetZoomType(); long lRet = rView.GetWrtShell().GetAnyCurRect(CurRectType::PagePrt).Left(); @@ -80,9 +80,9 @@ inline long GetLeftMargin( SwView &rView ) lRet + DOCUMENTBORDER + nLeftOfst; } -static void lcl_GetPos(SwView* pView, +static void lcl_GetPos(SwView const * pView, Point& rPos, - SwScrollbar* pScrollbar, + SwScrollbar const * pScrollbar, bool bBorder) { SwWrtShell &rSh = pView->GetWrtShell(); diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 7be7a7aae6f4..33d3a00a4067 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -85,7 +85,7 @@ SfxPrinter* SwView::GetPrinter( bool bCreate ) // Propagate printer change -void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, bool bWeb ) +void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter const * pNew, bool bWeb ) { SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb); if( !pOpt) diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index cf6288174c9e..de069eda0ff9 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -80,7 +80,7 @@ struct SwSearchOptions SwDocPositions eStart, eEnd; bool bDontWrap; - SwSearchOptions( SwWrtShell* pSh, bool bBackward ); + SwSearchOptions( SwWrtShell const * pSh, bool bBackward ); }; /// Adds rMatches using rKey as a key to the rTree tree. @@ -100,7 +100,7 @@ static void lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OSt } /// Emits LOK callbacks (count, selection) for search results. -static void lcl_emitSearchResultCallbacks(SvxSearchItem* pSearchItem, SwWrtShell* pWrtShell, bool bHighlightAll) +static void lcl_emitSearchResultCallbacks(SvxSearchItem const * pSearchItem, SwWrtShell const * pWrtShell, bool bHighlightAll) { // Emit a callback also about the selection rectangles, grouped by matches. if (SwPaM* pPaM = pWrtShell->GetCursor()) @@ -761,7 +761,7 @@ void SwView::Replace() m_pWrtShell->EndAllAction(); } -SwSearchOptions::SwSearchOptions( SwWrtShell* pSh, bool bBackward ) +SwSearchOptions::SwSearchOptions( SwWrtShell const * pSh, bool bBackward ) { eStart = SwDocPositions::Curr; if( bBackward ) diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 56575bd251f1..84b1af29a751 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -223,7 +223,7 @@ void ResizeFrameCols(SwFormatCol& rCol, } // Here all changes to the tab bar will be shot again into the model. -void SwView::ExecTabWin( SfxRequest& rReq ) +void SwView::ExecTabWin( SfxRequest const & rReq ) { SwWrtShell &rSh = GetWrtShell(); const FrameTypeFlags nFrameType = rSh.IsObjSelected() ? diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index bf6beddad447..4f8441d770e2 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -93,7 +93,7 @@ enum CloseResult eFailed // failed for some unknown reason }; static CloseResult CloseModelAndDocSh( - Reference< frame::XModel > &rxModel, + Reference< frame::XModel > const &rxModel, SfxObjectShellRef &rxDocSh ) { CloseResult eResult = eSuccess; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 1e2473fdc6f8..29f8582365e4 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -245,7 +245,7 @@ static SwTextFormatColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc return pColl; } -static void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell ) +static void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell const * pDocShell ) { // check if the view frame still exists SfxViewFrame* pFound = SfxViewFrame::GetFirst( pDocShell, false ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 9935095d4127..5e62ef00c3c5 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -128,7 +128,7 @@ namespace return static_cast<const SwTypeNumber*>(pEntry->GetUserData())->GetTypeId() == CTYPE_CTT; } - bool lcl_FindShell(SwWrtShell* pShell) + bool lcl_FindShell(SwWrtShell const * pShell) { bool bFound = false; SwView *pView = SwModule::GetFirstView(); @@ -1109,7 +1109,7 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt ) // Drop will be executed in the navigator -static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent) +static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent const * pContent) { void* key = nullptr; if( pTree && pContent ) @@ -3189,7 +3189,7 @@ OUString SwContentType::RemoveNewline(const OUString& rEntry) return aEntry.makeStringAndClear(); } -void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode) +void SwContentTree::EditEntry(SvTreeListEntry const * pEntry, EditEntryMode nMode) { SwContent* pCnt = static_cast<SwContent*>(pEntry->GetUserData()); GotoContent(pCnt); diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index da7c0e6b61e0..64681613bb91 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo& rInfo) : +SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const & rInfo) : SfxPoolItem( FN_PARAM_FTN_INFO ), aFootnoteInfo(rInfo) { diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 425ac1e75609..d0bd97016ee3 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -754,7 +754,7 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo } }; -SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent, +SwTwips GetTableWidth( SwFrameFormat const * pFormat, SwTabCols const & rCols, sal_uInt16 *pPercent, SwWrtShell* pSh ) { // To get the width is slightly more complicated. @@ -815,7 +815,7 @@ void SetApplyCharUnit(bool bApplyChar, bool bWeb) SW_MOD()->ApplyUserCharUnit(bApplyChar, bWeb); } -bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId ) +bool ExecuteMenuCommand( PopupMenu const & rMenu, SfxViewFrame const & rViewFrame, sal_uInt16 nId ) { bool bRet = false; const sal_uInt16 nItemCount = rMenu.GetItemCount(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index bfe720085d27..639b8eb9e174 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -334,7 +334,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, // Insert an OLE-Object into the CORE. // if no object is transferred, then one will be created. -void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName *pName, +void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName const *pName, sal_uInt16 nSlotId ) { ResetCursorStack(); diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index ca25cce2f77b..fb938549ebbf 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -65,7 +65,7 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> -void SwWrtShell::Insert(SwField &rField) +void SwWrtShell::Insert(SwField const &rField) { ResetCursorStack(); if(!CanInsert()) |