diff options
74 files changed, 216 insertions, 277 deletions
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 6cc2a9dd4bf8..f787a4906084 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -51,7 +51,7 @@ namespace chart { DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) - : SdrModel( SvtPathOptions().GetPalettePath(), nullptr, nullptr, false, false ) + : SdrModel( SvtPathOptions().GetPalettePath(), nullptr, nullptr, false ) , m_pChartItemPool(nullptr) , m_xMainDrawPage(nullptr) , m_xHiddenDrawPage(nullptr) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 0335cc3b04d4..67cdd98128f8 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1265,17 +1265,16 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmo } AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert) + const Graphic& rGraphic, sal_uInt8 nGreyThreshold) { - VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, nGreyThreshold, bInvert ); + VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, nGreyThreshold, false/*bInvert*/ ); return new AbstractGraphicFilterDialog_Impl( pDlg ); } AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, - bool bEnhanceEdges) + const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight) { - VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, nTileWidth, nTileHeight, bEnhanceEdges); + VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, nTileWidth, nTileHeight, false/*bEnhanceEdges*/); return new AbstractGraphicFilterDialog_Impl( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 6f8bc05635e4..873ef11963ea 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -602,11 +602,9 @@ public: virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt8 nGreyThreshold, - bool bInvert) override; + const Graphic& rGraphic, sal_uInt8 nGreyThreshold) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, - bool bEnhanceEdges) override; + const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight) override; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 07e5c120ec0a..85955a447979 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7111,7 +7111,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( aObj.SetGraphic( rGrf, OUString() ); // TODO/MBA: check setting of PersistName - pRet = new SdrOle2Obj( aObj, OUString(), rBoundRect, false); + pRet = new SdrOle2Obj( aObj, OUString(), rBoundRect); // we have the Object, don't create another bValidStorage = false; } @@ -7203,7 +7203,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( // TODO/LATER: need MediaType aObj.SetGraphic( rGrf, OUString() ); - pRet = new SdrOle2Obj( aObj, aDstStgName, rBoundRect, false); + pRet = new SdrOle2Obj( aObj, aDstStgName, rBoundRect); } } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c778a0abfe46..ebea1c297280 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1880,7 +1880,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, // TODO/LATER: need MediaType for Graphic aObj.SetGraphic( rGraf, OUString() ); - pRet = new SdrOle2Obj( aObj, aNm, rBoundRect, false ); + pRet = new SdrOle2Obj( aObj, aNm, rBoundRect ); } } if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) ) @@ -1939,7 +1939,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, // TODO/LATER: need MediaType for Graphic aObj.SetGraphic( aGraphic, OUString() ); - pRet = new SdrOle2Obj( aObj, aNm, rBoundRect, false ); + pRet = new SdrOle2Obj( aObj, aNm, rBoundRect ); } } } diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index cdc0e7f57b95..ea77ff38486e 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -83,7 +83,7 @@ public: FmXUndoEnvironment& GetUndoEnv(); private: - void implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce ); + void implSetOpenInDesignMode( bool _bOpenDesignMode ); }; #endif // _FM_FMMODEL_HXX diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 426ad58acb05..68a335d9503d 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -148,20 +148,16 @@ public: const Style& GetCellStyleBottom( size_t nCol, size_t nRow ) const; /** Returns the top-left to bottom-right frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns the visible style (i.e. from top-left corner of a merged range). + Ignores merged ranges; @return The top-left to bottom-right frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleTLBR( size_t nCol, size_t nRow, bool bSimple = false ) const; + const Style& GetCellStyleTLBR( size_t nCol, size_t nRow ) const; /** Returns the bottom-left to top-right frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns the visible style (i.e. from top-left corner of a merged range). + Ignores merged ranges; @return The bottom-left to top-right frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleBLTR( size_t nCol, size_t nRow, bool bSimple = false ) const; + const Style& GetCellStyleBLTR( size_t nCol, size_t nRow ) const; /** Returns the top-left to bottom-right frame style of the cell (nCol,nRow). @return diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 0f53cc4fc8d5..13fb9da90c9b 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -459,7 +459,7 @@ public: bool IsUpdating() const {return m_bUpdating;} void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true ); - void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false ); + void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true ); void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX ); void resetCurrentRow(); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 5366f81f88a8..1f418f735708 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -122,7 +122,7 @@ protected: class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase { public: - SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageBox( vcl::Window* pParent, WinBits nBits ); private: SVX_DLLPRIVATE virtual sal_Int32 ImplInsertImgEntry( const OUString& rEntry, sal_Int32 nPos, bool bChecked ) override; @@ -147,7 +147,7 @@ private: class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public SvxLanguageBoxBase { public: - SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits ); enum EditedAndValid { diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 0353f18b27e0..65af55602416 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -61,7 +61,7 @@ protected: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual Size GetOptimalSize() const override; - void DrawParagraph(vcl::RenderContext& rRenderContext, bool bAll); + void DrawParagraph(vcl::RenderContext& rRenderContext); public: SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits); diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index e94931389711..388dfdea350d 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -46,8 +46,7 @@ public: E3dPolygonObj( E3dDefaultAttributes& rDefault, - const basegfx::B3DPolyPolygon& rPolyPoly3D, - bool bLinOnly=false); + const basegfx::B3DPolyPolygon& rPolyPoly3D); E3dPolygonObj(); virtual ~E3dPolygonObj(); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 70dade511030..8fbe96cd2ad0 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -239,8 +239,7 @@ private: public: static SfxPoolItem* CreateDefault(); SvxObjectItem(long nStartX, long nEndX, - long nStartY, long nEndY, - bool bLimits = false); + long nStartY, long nEndY); SvxObjectItem(const SvxObjectItem& rCopy); bool HasLimits() const { return bLimits;} diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 1738ca5d1576..243d252a8c24 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -41,7 +41,7 @@ namespace sdr public: // constructor/destructor - SAL_DLLPRIVATE explicit Event(sal_uInt32 nTime); + SAL_DLLPRIVATE explicit Event(); virtual ~Event(); // access to mpNext diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 6ce00e5f6303..cebb80a38293 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -90,8 +90,7 @@ private: public: SdrDragEntryPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DContainer& rSequence, - bool bAddToTransparent); + const drawinglayer::primitive2d::Primitive2DContainer& rSequence); virtual ~SdrDragEntryPrimitive2DSequence(); virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; @@ -129,7 +128,7 @@ protected: void clearSdrDragEntries(); void addSdrDragEntry(SdrDragEntry* pNew); virtual void createSdrDragEntries(); - virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify); + virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact); // access for derivated classes to maOverlayObjectList void clearOverlayObjectList() { maOverlayObjectList.clear(); } @@ -229,7 +228,7 @@ private: void ImpCheckSnap(const Point& rPt); protected: - virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) override; + virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact) override; public: SdrDragMove(SdrDragView& rNewView); diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index d73ed7ee9af2..bb91f9bc8cde 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -137,7 +137,7 @@ public: SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; - sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; // temp for transformations on the reference object void SetReallyAbsolute(bool bOn, const SdrObject& rObj); diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx index f533ba6675d9..cfbec5fe920b 100644 --- a/include/svx/svditer.hxx +++ b/include/svx/svditer.hxx @@ -54,14 +54,14 @@ public: Otherwise the navigation position as returned by SdrObject::GetNavigationPosition() is used. */ - SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS); /* SJ: the following function can now be used with every SdrObject and is no longer limited to group objects */ - explicit SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS); /** Iterates over a list of marked objects received from the SdrMarkView. */ - explicit SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS); void Reset() { mnIndex = (mbReverse ? maObjList.size() : 0L); } bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.size())); } diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 07d7b35933f2..3e58f113c843 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -141,11 +141,6 @@ public: }; -// Flag for cleaning up after the loading of the pools, meaning the -// recalculate the RefCounts and dispose unused items) -// sal_False == active -#define LOADREFCOUNTS (false) - struct SdrModelImpl; class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase< SdrModel >, public OutlinerSearchable @@ -288,8 +283,8 @@ public: // If, however, you use objects inheriting from SdrObject you are free // to chose a pool of your liking. explicit SdrModel(); - explicit SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts); - explicit SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts); + explicit SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable); + explicit SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable); virtual ~SdrModel(); void ClearModel(bool bCalledFromDestructor); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 68a3d8553886..a73485a9b881 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -708,7 +708,7 @@ public: void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems = false); // NotPersistAttr for Layer, ObjName, geometrical transformations etc. - void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const; + void TakeNotPersistAttr(SfxItemSet& rAttr) const; void ApplyNotPersistAttr(const SfxItemSet& rAttr); void NbcApplyNotPersistAttr(const SfxItemSet& rAttr); diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index e14c5874a3b2..adb093e1f3a1 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -65,7 +65,7 @@ public: SVX_DLLPUBLIC ~SdrObjConnection(); void ResetVars(); - bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const; + bool TakeGluePoint(SdrGluePoint& rGP) const; inline void SetBestConnection( bool rB ) { bBestConn = rB; }; inline void SetBestVertex( bool rB ) { bBestVertex = rB; }; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 0db25636b7ca..00525e60bc9b 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -67,7 +67,7 @@ public: OUString GetStyleString(); SdrOle2Obj( bool bFrame_ = false ); - SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false ); + SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect ); virtual ~SdrOle2Obj(); const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index b1af6fb3f013..2d0340b68f5c 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -124,7 +124,7 @@ public: virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum) override; // insert point - sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim); + sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj); sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj, bool bHideHim); // rip at given point diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index f3162ed258ef..de68ed7589bf 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -126,7 +126,7 @@ public: const sdr::table::TableStyleSettings& getTableStyleSettings() const; void setTableStyleSettings( const sdr::table::TableStyleSettings& rStyle ); - TableHitKind CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const; + TableHitKind CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY ) const; void uno_lock(); void uno_unlock(); diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 21404446077d..23e65c69fd2f 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -550,7 +550,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 n=0); + static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr); }; /** diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 56870623826f..f6f30a54f4a0 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -81,8 +81,8 @@ private: SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView* pPV) const; public: - SdrViewIter(const SdrPage* pPage, bool bNoMasterPage = false); - SdrViewIter(const SdrObject* pObject, bool bNoMasterPage = false); + SdrViewIter(const SdrPage* pPage); + SdrViewIter(const SdrObject* pObject); SdrView* FirstView(); SdrView* NextView(); diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index e5f9aef610eb..cc51715258c0 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -373,10 +373,10 @@ public: double nRadius)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, - sal_uInt8 nGreyThreshold, bool bInvert)=0; + sal_uInt8 nGreyThreshold)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)=0; + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight)=0; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index aaf95753b715..1f8f483306e3 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -75,8 +75,7 @@ public: <TRUE/> whenever the box is used in import dialogs. */ void FillFromDbTextEncodingMap( bool bExcludeImportSubsets = false, - sal_uInt32 nExcludeInfoFlags = 0, - sal_uInt32 nButIncludeInfoFlags = 0 + sal_uInt32 nExcludeInfoFlags = 0 ); /** Fill with all known MIME encodings and select the best according to diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index f6a969000ca1..f71549a8237b 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -71,8 +71,7 @@ private: ImplGetGraphicStorage( const OUString& rPictureStorageName ); SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const OUString& rPictureStorageName, - const OUString& rPictureStreamName, - bool bTruncate ); + const OUString& rPictureStreamName ); SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const OUString& rFileName ) const; SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName, const OUString& rPictureStreamName ); diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 9de5227d1c8b..f4d66d113386 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) : - SdrModel(SvtPathOptions().GetPalettePath(),nullptr,_pReportDefinition, false, false) + SdrModel(SvtPathOptions().GetPalettePath(),nullptr,_pReportDefinition, false) ,m_pController(nullptr) ,m_pReportDefinition(_pReportDefinition) { diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 2af819f9094f..5980b991f1f6 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -77,7 +77,7 @@ IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void) { SvtPathOptions aPathOpt; OUString aPath = aPathOpt.GetPalettePath(); - pModel = new SdrModel(aPath, nullptr, nullptr, false, false); + pModel = new SdrModel(aPath, nullptr, nullptr, false); pModel->SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = pModel->GetItemPool(); rPool.SetDefaultMetric(SFX_MAPUNIT_100TH_MM); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index da3b0bfe3a06..7ba090ed5365 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -463,7 +463,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) bool bClosed0(mpPathObj->IsClosedObj()); - sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj, true); + sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj); if(bClosed0 != mpPathObj->IsClosedObj()) { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index ccd9063ab755..726f13271794 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -600,8 +600,7 @@ void SdPageObjsTLB::AddShapeList ( SdrObjListIter aIter( rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, - IM_FLAT, - false /*not reverse*/); + IM_FLAT); bool bMarked=false; if(bisInSdNavigatorWin) diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index bfca32a055cb..ddba20861e2a 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -61,8 +61,7 @@ namespace drawinglayer const Primitive2DContainer& rSubPrimitives, const basegfx::B2DHomMatrix& rTextBox, bool bWordWrap, - bool b3DShape, - bool bForceTextClipToTextRange); + bool b3DShape); // data access const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index b44c07861015..76d63f42a7b2 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -310,8 +310,7 @@ void Svx3DLightControl::Construct2() // create object for it mpLampBottomObject = new E3dPolygonObj( mp3DView->Get3DDefaultAttributes(), - basegfx::B3DPolyPolygon(a3DCircle), - true); + basegfx::B3DPolyPolygon(a3DCircle)); mpScene->Insert3DObj( mpLampBottomObject ); // half circle with stand @@ -325,8 +324,7 @@ void Svx3DLightControl::Construct2() // create object for it mpLampShaftObject = new E3dPolygonObj( mp3DView->Get3DDefaultAttributes(), - basegfx::B3DPolyPolygon(a3DHalfCircle), - true); + basegfx::B3DPolyPolygon(a3DHalfCircle)); mpScene->Insert3DObj( mpLampShaftObject ); // initially invisible diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index c47375073b61..00744c62dcff 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -47,7 +47,7 @@ struct Cell inline bool IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; } - void MirrorSelfX( bool bSwapDiag ); + void MirrorSelfX(); }; typedef std::vector< long > LongVec; @@ -64,18 +64,12 @@ Cell::Cell() : { } -void Cell::MirrorSelfX( bool bSwapDiag ) +void Cell::MirrorSelfX() { std::swap( maLeft, maRight ); std::swap( mnAddLeft, mnAddRight ); maLeft.MirrorSelf(); maRight.MirrorSelf(); - if( bSwapDiag ) - { - std::swap( maTLBR, maBLTR ); - maTLBR.MirrorSelf(); - maBLTR.MirrorSelf(); - } } @@ -562,16 +556,14 @@ const Style& Array::GetCellStyleBottom( size_t nCol, size_t nRow ) const return std::max( ORIGCELL( nCol, nRow ).maBottom, ORIGCELL( nCol, nRow + 1 ).maTop ); } -const Style& Array::GetCellStyleTLBR( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleTLBR( size_t nCol, size_t nRow ) const { - return bSimple ? CELL( nCol, nRow ).maTLBR : - (mxImpl->IsInClipRange( nCol, nRow ) ? ORIGCELL( nCol, nRow ).maTLBR : OBJ_STYLE_NONE); + return CELL( nCol, nRow ).maTLBR; } -const Style& Array::GetCellStyleBLTR( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleBLTR( size_t nCol, size_t nRow ) const { - return bSimple ? CELL( nCol, nRow ).maBLTR : - (mxImpl->IsInClipRange( nCol, nRow ) ? ORIGCELL( nCol, nRow ).maBLTR : OBJ_STYLE_NONE); + return CELL( nCol, nRow ).maBLTR; } const Style& Array::GetCellStyleTL( size_t nCol, size_t nRow ) const @@ -862,7 +854,7 @@ void Array::MirrorSelfX() for( nCol = 0; nCol < mxImpl->mnWidth; ++nCol ) { aNewCells.push_back( CELL( mxImpl->GetMirrorCol( nCol ), nRow ) ); - aNewCells.back().MirrorSelfX( false/*bSwapDiag*/ ); + aNewCells.back().MirrorSelfX(); } } for( nRow = 0; nRow < mxImpl->mnHeight; ++nRow ) @@ -914,13 +906,13 @@ void Array::DrawRange( drawinglayer::processor2d::BaseProcessor2D* pProcessor, size_t _nFirstCol = mxImpl->GetMergedFirstCol( nCol, nRow ); size_t _nFirstRow = mxImpl->GetMergedFirstRow( nCol, nRow ); - const Style aTlbrStyle = GetCellStyleTLBR( _nFirstCol, _nFirstRow, true ); + const Style aTlbrStyle = GetCellStyleTLBR( _nFirstCol, _nFirstRow ); if ( aTlbrStyle.GetWidth( ) ) pProcessor->process( CreateClippedBorderPrimitives( aRect.TopLeft(), aRect.BottomRight(), aTlbrStyle, aRect ) ); - const Style aBltrStyle = GetCellStyleBLTR( _nFirstCol, _nFirstRow, true ); + const Style aBltrStyle = GetCellStyleBLTR( _nFirstCol, _nFirstRow ); if ( aBltrStyle.GetWidth( ) ) pProcessor->process( CreateClippedBorderPrimitives( aRect.BottomLeft(), aRect.TopRight(), @@ -1122,7 +1114,7 @@ void Array::DrawRange( OutputDevice& rDev, size_t _nLastRow = mxImpl->GetMergedLastRow( nCol, nRow ); DrawDiagFrameBorders( rDev, aRect, - GetCellStyleTLBR( _nFirstCol, _nFirstRow, true ), GetCellStyleBLTR( _nFirstCol, _nFirstRow, true ), + GetCellStyleTLBR( _nFirstCol, _nFirstRow ), GetCellStyleBLTR( _nFirstCol, _nFirstRow ), GetCellStyleLeft( _nFirstCol, _nFirstRow ), GetCellStyleTop( _nFirstCol, _nFirstRow ), GetCellStyleRight( _nLastCol, _nLastRow ), GetCellStyleBottom( _nLastCol, _nLastRow ), GetCellStyleLeft( _nFirstCol, _nLastRow ), GetCellStyleBottom( _nFirstCol, _nLastRow ), diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index eb492a9b4345..7451f079df82 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -162,7 +162,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false)); + std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4)); DBG_ASSERT(aDlg, "Dialog creation failed!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); @@ -239,7 +239,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false)); + std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128)); DBG_ASSERT(aDlg, "Dialog creation failed!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 42e2fd42ec38..2c034e4e52a3 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -89,10 +89,10 @@ Size IMapWindow::GetOptimalSize() const void IMapWindow::SetImageMap( const ImageMap& rImageMap ) { - ReplaceImageMap( rImageMap, false ); + ReplaceImageMap( rImageMap ); } -void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, bool /*bScaleToGraphic*/ ) +void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap ) { SdrPage* pPage = nullptr; aIMap = rImageMap; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 9ab5114dd8ec..a82775b98e78 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -109,7 +109,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - void ReplaceImageMap( const ImageMap& rNewImageMap, bool bScaleToGraphic ); + void ReplaceImageMap( const ImageMap& rNewImageMap ); SdrObject* CreateObj( const IMapObject* pIMapObj ); static IMapObject* GetIMapObj( const SdrObject* pSdrObj ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index cf4dca6a5301..38321e683fb5 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -485,9 +485,9 @@ sal_Int32 SvxLanguageBoxBase::GetSavedValueLBB() const } -SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits ) : ListBox( pParent, nBits ) - , SvxLanguageBoxBase( bCheck ) + , SvxLanguageBoxBase( false ) { // display entries sorted SetStyle( GetStyle() | WB_SORT ); @@ -495,9 +495,9 @@ SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck ImplLanguageBoxBaseInit(); } -SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits ) : ComboBox( pParent, nBits ) - , SvxLanguageBoxBase( bCheck ) + , SvxLanguageBoxBase( false ) , mnSavedValuePos( COMBOBOX_ENTRY_NOTFOUND ) , meEditedAndValid( EDITED_NO ) { diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index a8e2b56ce0bb..b43470352f9c 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -52,12 +52,12 @@ Size SvxParaPrevWindow::GetOptimalSize() const void SvxParaPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - DrawParagraph(rRenderContext, true); + DrawParagraph(rRenderContext); } #define DEF_MARGIN 120 -void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext, bool bAll) +void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) { Size aWinSize(GetOutputSizePixel()); aWinSize = rRenderContext.PixelToLogic(aWinSize); @@ -71,8 +71,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext, bool b Color aGrayColor(COL_LIGHTGRAY); rRenderContext.SetFillColor(Color(rWinColor)); - if (bAll) - rRenderContext.DrawRect(Rectangle(Point(), aWinSize)); + rRenderContext.DrawRect(Rectangle(Point(), aWinSize)); rRenderContext.SetLineColor(); @@ -195,18 +194,8 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext, bool b Rectangle aRect(aPnt, aSiz); - if (Lines[i] != aRect || bAll) - { - if (!bAll) - { - Color aFillCol = rRenderContext.GetFillColor(); - rRenderContext.SetFillColor(rWinColor); - rRenderContext.DrawRect(Lines[i]); - rRenderContext.SetFillColor(aFillCol); - } - rRenderContext.DrawRect( aRect ); - Lines[i] = aRect; - } + rRenderContext.DrawRect( aRect ); + Lines[i] = aRect; if (5 == i) { diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index c5f8987dce60..6942da2b543e 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -708,13 +708,13 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const } SvxObjectItem::SvxObjectItem( long nSX, long nEX, - long nSY, long nEY, bool limits ) : + long nSY, long nEY ) : SfxPoolItem (SID_RULER_OBJECT), nStartX (nSX), nEndX (nEX), nStartY (nSY), nEndY (nEY), - bLimits (limits) + bLimits (false) {} SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) : diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 71868ecfe3a8..b67749e68986 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -127,8 +127,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( void SvxTextEncodingBox::FillFromDbTextEncodingMap( - bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, - sal_uInt32 nButIncludeInfoFlags ) + bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags ) { #if !HAVE_FEATURE_DBCONNECTIVITY (void)bExcludeImportSubsets; @@ -156,7 +155,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( nEnc == RTL_TEXTENCODING_UCS4) ) bInsert = false; // InfoFlags don't work for Unicode :-( } - else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) + else bInsert = false; } } diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 1a39932674bc..cd9b6c33d7a5 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -35,10 +35,9 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, - const basegfx::B3DPolyPolygon& rPolyPoly3D, - bool bLinOnly) + const basegfx::B3DPolyPolygon& rPolyPoly3D) : E3dCompoundObject(rDefault), - bLineOnly(bLinOnly) + bLineOnly(true) { // Set geometry SetPolyPolygon3D(rPolyPoly3D); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 4288321bcd41..cc14e9de9e99 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -527,7 +527,7 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _ //= cell controls -DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) +DbCellControl::DbCellControl( DbGridColumn& _rColumn ) :OPropertyChangeListener(m_aMutex) ,m_pModelChangeBroadcaster(nullptr) ,m_pFieldChangeBroadcaster(nullptr) @@ -1597,7 +1597,7 @@ bool DbFormattedField::commitControl() } DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) - :DbCellControl( _rColumn, true ) + :DbCellControl( _rColumn ) { setAlignedController( false ); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 40d2e2a69b75..b0770273cd87 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -200,13 +200,13 @@ class DisposeListenerGridBridge : public FmXDisposeListener FmXDisposeMultiplexer* m_pRealListener; public: - DisposeListenerGridBridge( DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId = -1); + DisposeListenerGridBridge( DbGridControl& _rParent, const Reference< XComponent >& _rxObject); virtual ~DisposeListenerGridBridge(); virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) override { m_rParent.disposing(_nId, _rEvent); } }; -DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId) +DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject) :FmXDisposeListener(m_aMutex) ,m_rParent(_rParent) ,m_pRealListener(nullptr) @@ -214,7 +214,7 @@ DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, co if (_rxObject.is()) { - m_pRealListener = new FmXDisposeMultiplexer(this, _rxObject, _rId); + m_pRealListener = new FmXDisposeMultiplexer(this, _rxObject, 0); m_pRealListener->acquire(); } } @@ -1657,7 +1657,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // start listening on the seek cursor if (m_pSeekCursor) - m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, Reference< XComponent > (Reference< XInterface >(*m_pSeekCursor), UNO_QUERY), 0); + m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, Reference< XComponent > (Reference< XInterface >(*m_pSeekCursor), UNO_QUERY)); } void DbGridControl::RemoveColumns() @@ -1922,7 +1922,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, bool EnablePaint(true); } -void DbGridControl::RowInserted(long nRow, long nNumRows, bool bDoPaint, bool bKeepSelection) +void DbGridControl::RowInserted(long nRow, long nNumRows, bool bDoPaint) { if (nNumRows) { @@ -1937,7 +1937,7 @@ void DbGridControl::RowInserted(long nRow, long nNumRows, bool bDoPaint, bool bK else if (m_nTotalCount >= 0) m_nTotalCount += nNumRows; - DbGridControl_Base::RowInserted(nRow, nNumRows, bDoPaint, bKeepSelection); + DbGridControl_Base::RowInserted(nRow, nNumRows, bDoPaint); m_aBar->InvalidateState(NavigationBar::RECORD_COUNT); } } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 0e06a4e803ff..db205700c694 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -984,8 +984,8 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) class FmFilterItemsString : public SvLBoxString { public: - FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr ) - :SvLBoxString(pEntry,nFlags,rStr){} + FmFilterItemsString( SvTreeListEntry* pEntry, const OUString& rStr ) + :SvLBoxString(pEntry,0,rStr){} virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; @@ -1041,8 +1041,8 @@ class FmFilterString : public SvLBoxString OUString m_aName; public: - FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr, const OUString& aName) - : SvLBoxString(pEntry,nFlags,rStr) + FmFilterString( SvTreeListEntry* pEntry, const OUString& rStr, const OUString& aName) + : SvLBoxString(pEntry,0,rStr) , m_aName(aName) { m_aName += ": "; @@ -1386,10 +1386,10 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, std::unique_ptr<SvLBoxString> pString; if (dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr) - pString.reset(new FmFilterString(pEntry, 0, rStr, + pString.reset(new FmFilterString(pEntry, rStr, static_cast<FmFilterItem*>(pEntry->GetUserData())->GetFieldName())); else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr) - pString.reset(new FmFilterItemsString(pEntry, 0, rStr)); + pString.reset(new FmFilterItemsString(pEntry, rStr)); if (pString) pEntry->ReplaceItem(std::move(pString), 1 ); diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 149e757c0bdb..f7eaa03f86d6 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -53,7 +53,7 @@ struct FmFormModelImplData }; FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) - : SdrModel(pPool, pPers, false, LOADREFCOUNTS) + : SdrModel(pPool, pPers, false) , m_pImpl(nullptr) , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) @@ -65,7 +65,7 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) } FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) - : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS) + : SdrModel(rPath, pPool, pPers, false) , m_pImpl(nullptr) , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) @@ -78,7 +78,7 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable) - : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) + : SdrModel(rPath, pPool, pPers, bUseExtColorTable) , m_pImpl(nullptr) , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) @@ -168,9 +168,9 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) } -void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce ) +void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode ) { - if( ( _bOpenDesignMode != m_bOpenInDesignMode ) || _bForce ) + if( _bOpenDesignMode != m_bOpenInDesignMode ) { m_bOpenInDesignMode = _bOpenDesignMode; @@ -184,7 +184,7 @@ void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce ) void FmFormModel::SetOpenInDesignMode( bool bOpenDesignMode ) { - implSetOpenInDesignMode( bOpenDesignMode, false ); + implSetOpenInDesignMode( bOpenDesignMode ); } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index e7a628b715cf..7dd87ee081b3 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1719,7 +1719,7 @@ namespace svxform // but normally only direct controls, no indirect ones, are marked in a marked form, // I have to do it later if (bIsForm) - MarkViewObj(static_cast<FmFormData*>(pCurrent), true, true); // second sal_True means "deep" + MarkViewObj(static_cast<FmFormData*>(pCurrent), true/*deep*/); // a hidden control ? bool bIsHidden = IsHiddenControl(pCurrent); @@ -1971,7 +1971,7 @@ namespace svxform SvTreeListEntry* pSelectionLoop = *it; // When form selection, mark all controls of form if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry)) - MarkViewObj(static_cast<FmFormData*>(pSelectionLoop->GetUserData()), true); + MarkViewObj(static_cast<FmFormData*>(pSelectionLoop->GetUserData()), false/*deep*/); // When control selection, mark Control-SdrObjects else if (IsFormComponentEntry(pSelectionLoop)) @@ -1990,7 +1990,7 @@ namespace svxform sal_uInt16 nClassId = ::comphelper::getINT16(xSet->getPropertyValue(FM_PROP_CLASSID)); if (nClassId != FormComponentType::HIDDENCONTROL) - MarkViewObj(pControlData, true, true); + MarkViewObj(pControlData); } } } @@ -2052,7 +2052,7 @@ namespace svxform pFormView->UnMarkAll(); } - void NavigatorTree::MarkViewObj(FmFormData* pFormData, bool bMark, bool bDeep ) + void NavigatorTree::MarkViewObj(FmFormData* pFormData, bool bDeep ) { FmFormShell* pFormShell = GetNavModel()->GetFormShell(); if( !pFormShell ) @@ -2078,26 +2078,23 @@ namespace svxform continue; Reference< XFormComponent > xControlModel( pFormObject->GetUnoControlModel(),UNO_QUERY ); - if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != pFormView->IsObjMarked( pSdrObject ) ) + if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && !pFormView->IsObjMarked( pSdrObject ) ) { // unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first - pFormView->MarkObj( pSdrObject, pPageView, !bMark ); + pFormView->MarkObj( pSdrObject, pPageView ); } } // while ( aIter.IsMore() ) - if ( bMark ) + // make the mark visible + ::Rectangle aMarkRect( pFormView->GetAllMarkedRect()); + for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) { - // make the mark visible - ::Rectangle aMarkRect( pFormView->GetAllMarkedRect()); - for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) + SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i ); + OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); + if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() ) { - SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i ); - OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() ) - { - pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) ); - } - } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) - } + pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) ); + } + } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } void NavigatorTree::CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects) @@ -2117,7 +2114,7 @@ namespace svxform } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ ) } - void NavigatorTree::MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark) + void NavigatorTree::MarkViewObj( FmControlData* pControlData) { if( !pControlData ) return; @@ -2146,12 +2143,9 @@ namespace svxform continue; // mark the object - if ( bMark != pFormView->IsObjMarked( pSdrObject ) ) + if ( !pFormView->IsObjMarked( pSdrObject ) ) // unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first - pFormView->MarkObj( pSdrObject, pPageView, !bMark ); - - if ( !bMarkHandles || !bMark ) - continue; + pFormView->MarkObj( pSdrObject, pPageView ); bPaint = true; diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx index 30d41d1f89b7..a0ca8219ced2 100644 --- a/svx/source/inc/eventhandler.hxx +++ b/svx/source/inc/eventhandler.hxx @@ -96,7 +96,7 @@ namespace sdr class TimerEventHandler : public EventHandler, public Idle { public: - TimerEventHandler(SchedulerPriority ePriority = SchedulerPriority::HIGH); + TimerEventHandler(); virtual ~TimerEventHandler(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index f09df36bafb9..d3b606aecb98 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -490,8 +490,8 @@ namespace svxform void Clear(); void UpdateContent( FmFormShell* pFormShell ); - void MarkViewObj( FmFormData* pFormData, bool bMark, bool bDeep = false ); - void MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark ); + void MarkViewObj( FmFormData* pFormData, bool bDeep ); + void MarkViewObj( FmControlData* pControlData ); void UnmarkAllViewObj(); static bool IsFormEntry( SvTreeListEntry* pEntry ); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 4bf1706cf737..9b0efa82a2da 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -261,7 +261,7 @@ protected: public: - DbCellControl(DbGridColumn& _rColumn, bool _bText = true); + DbCellControl(DbGridColumn& _rColumn); virtual ~DbCellControl(); diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index e0868ea5cb46..85b94a664000 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -107,7 +107,7 @@ namespace sdr } PrimitiveAnimation::PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives) - : Event(0L), + : Event(), mrVOContact(rVOContact), maAnimatedPrimitives(rAnimatedPrimitives) { diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 012f0a0c3fc4..6b0e4d1ec32c 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -28,8 +28,8 @@ namespace sdr { namespace animation { - Event::Event(sal_uInt32 nTime) - : mnTime(nTime), + Event::Event() + : mnTime(0), mpNext(nullptr) { } diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index edc84c09a5f3..783d0f00fc54 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -225,8 +225,7 @@ namespace sdr xGroup, aTextBoxMatrix, bWordWrap, - b3DShape, - false)); // #SJ# New parameter to force to clipped BlockText for SC + b3DShape)); xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index ebc36b8e4f0b..908a7b4b5946 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -119,9 +119,9 @@ namespace sdr { namespace event { - TimerEventHandler::TimerEventHandler(SchedulerPriority ePriority) + TimerEventHandler::TimerEventHandler() { - SetPriority(ePriority); + SetPriority(SchedulerPriority::HIGH); Stop(); } diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index c4d8f07555b6..1eda46d241d2 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -89,7 +89,7 @@ namespace sdr } OverlayObject::OverlayObject(Color aBaseColor) - : Event(0), + : Event(), mpOverlayManager(nullptr), maBaseColor(aBaseColor), mbIsVisible(true), diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 22ce86064292..47a6afe312d7 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -80,15 +80,14 @@ namespace drawinglayer const Primitive2DContainer& rSubPrimitives, const basegfx::B2DHomMatrix& rTextBox, bool bWordWrap, - bool b3DShape, - bool bForceTextClipToTextRange) + bool b3DShape) : BufferedDecompositionPrimitive2D(), maSdrSTAttribute(rSdrSTAttribute), maSubPrimitives(rSubPrimitives), maTextBox(rTextBox), mbWordWrap(bWordWrap), mb3DShape(b3DShape), - mbForceTextClipToTextRange(bForceTextClipToTextRange) + mbForceTextClipToTextRange(false) { } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index c5e2bfd3657a..56fa3eadcf3e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -203,13 +203,12 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntrySdrObject::createPri SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DContainer& rSequence, - bool bAddToTransparent) + const drawinglayer::primitive2d::Primitive2DContainer& rSequence) : SdrDragEntry(), maPrimitive2DSequence(rSequence) { // add parts to transparent overlay stuff if necessary - setAddToTransparent(bAddToTransparent); + setAddToTransparent(true); } SdrDragEntryPrimitive2DSequence::~SdrDragEntryPrimitive2DSequence() @@ -351,11 +350,11 @@ void SdrDragMethod::createSdrDragEntries() } } -void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) +void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact) { // add full object drag; Clone() at the object has to work // for this - addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact, bModify)); + addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact, true/*bModify*/)); } void SdrDragMethod::createSdrDragEntries_SolidDrag() @@ -399,7 +398,7 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag() { // add full object drag; Clone() at the object has to work // for this - createSdrDragEntryForSdrObject(*pCandidate, rOC, true); + createSdrDragEntryForSdrObject(*pCandidate, rOC); } if(bAddWireframe) @@ -1472,7 +1471,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const } -void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) +void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact) { // for SdrDragMove, use current Primitive2DContainer of SdrObject visualization // in given ObjectContact directly @@ -1484,7 +1483,7 @@ void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr // here we want the complete primitive sequence without visible clippings rObjectContact.resetViewPort(); - addSdrDragEntry(new SdrDragEntryPrimitive2DSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo), true)); + addSdrDragEntry(new SdrDragEntryPrimitive2DSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo))); } void SdrDragMove::applyCurrentTransformationToSdrObject(SdrObject& rTarget) diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index acc28ac97c0c..950b0cc2426a 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -661,7 +661,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point } else { - mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, true); + mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj); } if(bClosed0 != pMarkedPath->IsClosedObj()) diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 946b26dd7966..27f9f68afa25 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -350,20 +350,16 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const return nRet; } -sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const { - sal_uInt16 nCount=GetCount(); - sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; - sal_uInt16 nNum=bBack ? 0 : nCount; - while ((bBack ? nNum<nCount : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { - if (!bBack) nNum--; - const SdrGluePoint* pGP=GetObject(nNum); - if (bNext) { - if (pGP->GetId()==nId0) bNext=false; - } else { - if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum; - } - if (bBack) nNum++; + sal_uInt16 nCount = GetCount(); + sal_uInt16 nRet = SDRGLUEPOINT_NOTFOUND; + sal_uInt16 nNum = nCount; + while ((nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { + nNum--; + const SdrGluePoint* pGP = GetObject(nNum); + if (pGP->IsHit(rPnt,rOut,pObj)) + nRet = nNum; } return nRet; } diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index e26465dcc13c..3ed440278c17 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -32,17 +32,17 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, bo Reset(); } -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode, bool bReverse) +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { ImpProcessObjectList(rObjList, eMode, bUseZOrder); Reset(); } -SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, bool bReverse ) +SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode ) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { if ( dynamic_cast<const SdrObjGroup*>(&rObj) != nullptr ) ImpProcessObjectList(*rObj.GetSubList(), eMode, true); @@ -51,9 +51,9 @@ SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, bool b Reset(); } -SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, bool bReverse ) +SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode ) : mnIndex(0L), - mbReverse(bReverse) + mbReverse(false) { ImpProcessMarkList(rMarkList, eMode); Reset(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d899f81943e8..06988245b3cb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -236,22 +236,22 @@ SdrModel::SdrModel(): maMaPag(), maPages() { - ImpCtor(nullptr, nullptr, false, LOADREFCOUNTS); + ImpCtor(nullptr, nullptr, false, false); } -SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): maMaPag(), maPages() { - ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); } -SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): +SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): maMaPag(), maPages(), aTablePath(rPath) { - ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); } SdrModel::~SdrModel() diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 68201cc02e78..5b1239a92c70 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -468,7 +468,6 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const { - sal_uInt16 nId0=rnId; rpObj=nullptr; rpPV=nullptr; rnId=0; if (!IsGluePointEditMode()) return false; OutputDevice* pOut=mpActualOutDev.get(); @@ -484,7 +483,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=nullptr) { - sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,false/*bBack*/,false/*bNext*/,nId0); + sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj); if (nNum!=SDRGLUEPOINT_NOTFOUND) { // #i38892# diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index e8ee5c3c1d16..6ae45eb021b7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2162,47 +2162,47 @@ static void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem else rAttr.Put(rItem); } -void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const +void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) const { const Rectangle& rSnap=GetSnapRect(); const Rectangle& rLogic=GetLogicRect(); - lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect())); - lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect())); - lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable())); - lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible())); - lcl_SetItem(rAttr,bMerge,makeSdrRotateAngleItem(GetRotateAngle())); - lcl_SetItem(rAttr,bMerge,SdrShearAngleItem(GetShearAngle())); - lcl_SetItem(rAttr,bMerge,SdrOneSizeWidthItem(rSnap.GetWidth()-1)); - lcl_SetItem(rAttr,bMerge,SdrOneSizeHeightItem(rSnap.GetHeight()-1)); - lcl_SetItem(rAttr,bMerge,SdrOnePositionXItem(rSnap.Left())); - lcl_SetItem(rAttr,bMerge,SdrOnePositionYItem(rSnap.Top())); + lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect())); + lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect())); + lcl_SetItem(rAttr,false,SdrObjPrintableItem(IsPrintable())); + lcl_SetItem(rAttr,false,SdrObjVisibleItem(IsVisible())); + lcl_SetItem(rAttr,false,makeSdrRotateAngleItem(GetRotateAngle())); + lcl_SetItem(rAttr,false,SdrShearAngleItem(GetShearAngle())); + lcl_SetItem(rAttr,false,SdrOneSizeWidthItem(rSnap.GetWidth()-1)); + lcl_SetItem(rAttr,false,SdrOneSizeHeightItem(rSnap.GetHeight()-1)); + lcl_SetItem(rAttr,false,SdrOnePositionXItem(rSnap.Left())); + lcl_SetItem(rAttr,false,SdrOnePositionYItem(rSnap.Top())); if (rLogic.GetWidth()!=rSnap.GetWidth()) { - lcl_SetItem(rAttr,bMerge,SdrLogicSizeWidthItem(rLogic.GetWidth()-1)); + lcl_SetItem(rAttr,false,SdrLogicSizeWidthItem(rLogic.GetWidth()-1)); } if (rLogic.GetHeight()!=rSnap.GetHeight()) { - lcl_SetItem(rAttr,bMerge,SdrLogicSizeHeightItem(rLogic.GetHeight()-1)); + lcl_SetItem(rAttr,false,SdrLogicSizeHeightItem(rLogic.GetHeight()-1)); } OUString aName(GetName()); if (!aName.isEmpty()) { - lcl_SetItem(rAttr, bMerge, makeSdrObjectNameItem(aName)); + lcl_SetItem(rAttr, false, makeSdrObjectNameItem(aName)); } - lcl_SetItem(rAttr,bMerge,SdrLayerIdItem(GetLayer())); + lcl_SetItem(rAttr,false,SdrLayerIdItem(GetLayer())); const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr; if (pLayAd!=nullptr) { const SdrLayer* pLayer=pLayAd->GetLayerPerID(GetLayer()); if (pLayer!=nullptr) { - lcl_SetItem(rAttr,bMerge,SdrLayerNameItem(pLayer->GetName())); + lcl_SetItem(rAttr,false,SdrLayerNameItem(pLayer->GetName())); } } Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; - lcl_SetItem(rAttr,bMerge,SdrTransformRef1XItem(aRef1.X())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef1YItem(aRef1.Y())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef2XItem(aRef2.X())); - lcl_SetItem(rAttr,bMerge,SdrTransformRef2YItem(aRef2.Y())); + lcl_SetItem(rAttr,false,SdrTransformRef1XItem(aRef1.X())); + lcl_SetItem(rAttr,false,SdrTransformRef1YItem(aRef1.Y())); + lcl_SetItem(rAttr,false,SdrTransformRef2XItem(aRef2.X())); + lcl_SetItem(rAttr,false,SdrTransformRef2YItem(aRef2.Y())); } SfxStyleSheet* SdrObject::GetStyleSheet() const diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 1b768d3921e9..0eb55d639978 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -67,7 +67,7 @@ void SdrObjConnection::ResetVars() bAutoCorner=false; } -bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const +bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP) const { bool bRet = false; if (pObj!=nullptr) { // one object has to be docked already! @@ -88,7 +88,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const } } } - if (bRet && bSetAbsPos) { + if (bRet) { Point aPt(rGP.GetAbsolutePos(*pObj)); aPt+=aObjOfs; rGP.SetPos(aPt); @@ -777,14 +777,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& sal_uInt16 nCount2=bAuto2 ? 4 : 1; for (sal_uInt16 nNum1=0; nNum1<nCount1; nNum1++) { if (bAuto1) rCon1.nConId=nNum1; - if (bCon1 && rCon1.TakeGluePoint(aGP1,true)) { + if (bCon1 && rCon1.TakeGluePoint(aGP1)) { aPt1=aGP1.GetPos(); nEsc1=aGP1.GetEscDir(); if (nEsc1==SdrEscapeDirection::SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs); } for (sal_uInt16 nNum2=0; nNum2<nCount2; nNum2++) { if (bAuto2) rCon2.nConId=nNum2; - if (bCon2 && rCon2.TakeGluePoint(aGP2,true)) { + if (bCon2 && rCon2.TakeGluePoint(aGP2)) { aPt2=aGP2.GetPos(); nEsc2=aGP2.GetEscDir(); if (nEsc2==SdrEscapeDirection::SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 6d4ab3dd650f..7bf0ffe0991e 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -779,9 +779,9 @@ SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : { } -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ ) : +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect) : SdrRectObj(rNewRect), - mpImpl(new SdrOle2ObjImpl(bFrame_, rNewObjRef)) + mpImpl(new SdrOle2ObjImpl(false/*bFrame_*/, rNewObjRef)) { mpImpl->aPersistName = rNewObjName; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index e18b68b0c77d..789c51f44de7 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2534,13 +2534,13 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum) } } -sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim) +sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj) { sal_uInt32 nNewHdl; if(bNewObj) { - nNewHdl = NbcInsPoint(0L, rPos, true, bHideHim); + nNewHdl = NbcInsPoint(0L, rPos, true, true/*bHideHim*/); } else { @@ -2559,7 +2559,7 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHid nPolyIndex += GetPathPoly().getB2DPolygon(a).count(); } - nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, bHideHim); + nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, true/*bHideHim*/); } ImpForceKind(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 38a30208286f..37e81e7cdffe 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1413,7 +1413,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/) +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) { rStr = ImpGetResStr(nStrCacheID); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 66816b426960..24c633939c9b 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -360,7 +360,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTableObj ) { sal_Int32 nX = 0, nY = 0; - switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, 0 ) ) + switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) ) { case sdr::table::SDRTABLEHIT_CELL: eHit = SDRHIT_CELL; @@ -381,7 +381,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTableObj ) { sal_Int32 nX = 0, nY = 0; - switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, 0 ) ) + switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) ) { case sdr::table::SDRTABLEHIT_CELL: eHit = SDRHIT_CELL; diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index a34a9e510689..3a11f869bcba 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -37,22 +37,22 @@ void SdrViewIter::ImpInitVars() } -SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrPage* pPage) { mpPage = pPage; mpModel = (pPage) ? pPage->GetModel() : nullptr; mpObject = nullptr; - mbNoMasterPage = bNoMasterPage; + mbNoMasterPage = false; ImpInitVars(); } -SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrObject* pObject) { mpObject = pObject; mpModel = (pObject) ? pObject->GetModel() : nullptr; mpPage = (pObject) ? pObject->GetPage() : nullptr; - mbNoMasterPage = bNoMasterPage; + mbNoMasterPage = false; if(!mpModel || !mpPage) { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 08d4e7237ea3..5ffef2103bb6 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1024,7 +1024,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) } -TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const +TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY ) const { if( !mpImpl || !mpImpl->mxTable.is() ) return SDRTABLEHIT_NONE; @@ -1035,10 +1035,10 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ const sal_Int32 nColCount = mpImpl->getColumnCount(); const sal_Int32 nRowCount = mpImpl->getRowCount(); - sal_Int32 nX = rPos.X() + nTol - maRect.Left(); - sal_Int32 nY = rPos.Y() + nTol - maRect.Top(); + sal_Int32 nX = rPos.X() - maRect.Left(); + sal_Int32 nY = rPos.Y() - maRect.Top(); - if( (nX < 0) || (nX > (maRect.GetWidth() + nTol)) || (nY < 0) || (nY > (maRect.GetHeight() + nTol) ) ) + if( (nX < 0) || (nX > maRect.GetWidth()) || (nY < 0) || (nY > maRect.GetHeight() ) ) return SDRTABLEHIT_NONE; // get vertical edge number and check for a hit @@ -1050,7 +1050,7 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ { while( rnX <= nColCount ) { - if( nX <= (2*nTol) ) + if( nX <= 0 ) { bVrtHit = true; break; @@ -1070,7 +1070,7 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ rnX = nColCount; while( rnX >= 0 ) { - if( nX <= (2*nTol) ) + if( nX <= 0 ) { bVrtHit = true; break; @@ -1095,7 +1095,7 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ { while( rnY <= nRowCount ) { - if( nY <= (2*nTol) ) + if( nY <= 0 ) { bHrzHit = true; break; @@ -1244,7 +1244,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const if( mpImpl && mpImpl->mxTable.is() ) { CellPos aPos; - if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow, 0 ) == SDRTABLEHIT_CELLTEXTAREA ) + if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == SDRTABLEHIT_CELLTEXTAREA ) return aPos.mnRow * mpImpl->mxTable->getColumnCount() + aPos.mnCol; } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index afb42293b41d..e361133db0d1 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -274,7 +274,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* if( !rMEvt.IsRight() && mpView->PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN, aVEvt) == SDRHIT_HANDLE ) return false; - TableHitKind eHit = static_cast< SdrTableObj* >(mxTableObj.get())->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0); + TableHitKind eHit = static_cast< SdrTableObj* >(mxTableObj.get())->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), maMouseDownPos.mnCol, maMouseDownPos.mnRow); mbLeftButtonDown = (rMEvt.GetClicks() == 1) && rMEvt.IsLeft(); @@ -356,7 +356,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWind SdrTableObj* pTableObj = dynamic_cast< SdrTableObj* >( mxTableObj.get() ); CellPos aPos; - if (mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), aPos.mnCol, aPos.mnRow, 0 ) != SDRTABLEHIT_NONE) + if (mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), aPos.mnCol, aPos.mnRow ) != SDRTABLEHIT_NONE) { if(aPos != maMouseDownPos) { @@ -3125,7 +3125,7 @@ bool SvxTableController::setCursorLogicPosition(const Point& rPosition, bool bPo SdrTableObj* pTableObj = static_cast<SdrTableObj*>(mxTableObj.get()); CellPos aCellPos; - if (pTableObj->CheckTableHit(rPosition, aCellPos.mnCol, aCellPos.mnRow, 0) != SDRTABLEHIT_NONE) + if (pTableObj->CheckTableHit(rPosition, aCellPos.mnCol, aCellPos.mnRow) != SDRTABLEHIT_NONE) { // Position is a table cell. if (mbCellSelectionMode) diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index fe39ec3b2e9c..dd8ad87fdc3c 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -198,8 +198,7 @@ namespace drawinglayer bool bLeftIsOutside, bool bBottomIsOutside, bool bRightIsOutside, - bool bTopIsOutside, - bool bInTwips) + bool bTopIsOutside) : BufferedDecompositionPrimitive2D(), maTransform(rTransform), maLeftLine(rLeftLine), @@ -218,7 +217,7 @@ namespace drawinglayer mbBottomIsOutside(bBottomIsOutside), mbRightIsOutside(bRightIsOutside), mbTopIsOutside(bTopIsOutside), - mbInTwips(bInTwips) + mbInTwips(true) { } @@ -665,8 +664,7 @@ namespace sdr bIsRTL ? nX == nColCount : 0 == nX, nRowCount == nYBottom, bIsRTL ? 0 == nXRight : nXRight == nColCount, - 0 == nY, - true)); + 0 == nY)); } } } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 88782dbebeee..386eeda8b1cc 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1685,7 +1685,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if(bIsNotPersist) { // not-persistent attribute, get those extra - mpObj->TakeNotPersistAttr(*pSet, false); + mpObj->TakeNotPersistAttr(*pSet); } } @@ -1761,7 +1761,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST) { // not-persistent attribute, get those extra - mpObj->TakeNotPersistAttr(aSet, false); + mpObj->TakeNotPersistAttr(aSet); } } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 86b2d2f0c5ba..fc6e86ce9802 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -432,8 +432,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co } SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUString& rPictureStorageName, - const OUString& rPictureStreamName, - bool bTruncate ) + const OUString& rPictureStreamName ) { SvxGraphicHelperStream_Impl aRet; aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName ); @@ -444,8 +443,6 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt if ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) { nMode = embed::ElementModes::READWRITE; - if ( bTruncate ) - nMode |= embed::ElementModes::TRUNCATE; } aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode ); @@ -500,7 +497,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName const OUString& rPictureStreamName ) { Graphic aGraphic; - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName ) ); if( aStream.xStream.is() ) { std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aStream.xStream )); @@ -520,7 +517,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, if( aGrfObject.GetType() != GRAPHIC_NONE ) { - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName ) ); if( aStream.xStream.is() ) { Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() ); |