diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/SvxColorValueSet.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdedtv.hxx | 9 | ||||
-rw-r--r-- | include/svx/svdetc.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdhdl.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdlayer.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdmrkv.hxx | 5 | ||||
-rw-r--r-- | include/svx/svdoashp.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdobj.hxx | 6 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotable.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotext.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdpagv.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdpntv.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdtrans.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdundo.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdxcgv.hxx | 6 | ||||
-rw-r--r-- | include/svx/svxdlg.hxx | 8 | ||||
-rw-r--r-- | include/svx/txencbox.hxx | 6 | ||||
-rw-r--r-- | include/svx/view3d.hxx | 4 | ||||
-rw-r--r-- | include/svx/xcolit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xpoly.hxx | 6 |
22 files changed, 35 insertions, 51 deletions
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 20643128cdae..0b9f53366cb5 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -37,7 +37,7 @@ public: static sal_uInt32 getColumnCount(); void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1); - void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix, sal_uInt32 nStartIndex = 1); + void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix); Size layoutAllVisible(sal_uInt32 nEntryCount); Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 104d9a161622..fa5f749d6714 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -323,10 +323,8 @@ public: // Subsequently mark the new group . If the group spawns multiple // pages a group is created per page. // All groups created are subsequently marked. - // Using pUserGrp an own group object can be set. - // This is not used immediately, but via Clone copied. - // The method creates SdrObjGroup-instancess if NULL is passed, - void GroupMarked(const SdrObject* pUserGrp=nullptr); + // The method creates SdrObjGroup-instances. + void GroupMarked(); // All marked object groups are dissolved (1 level). // Now all previously marked member objects are marked. @@ -348,8 +346,7 @@ public: void ConvertMarkedToPolyObj(bool bLineToArea); // Align all marked objects vertically. Normally the SnapRect of an object is used. - // If bBoundRects=sal_True then BoundRects is used instead of SnapRect. - void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool bBoundRects=false); + void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert); bool IsAlignPossible() const; // move marked objects "up" diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 157bb0f9de19..6f92187dcb53 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -183,7 +183,7 @@ public: unsigned GetLinkCount() const { return (unsigned)aList.size(); } Link<SdrObjFactory*,void>& GetLink(unsigned nNum) { return aList[nNum]; } const Link<SdrObjFactory*,void>& GetLink(unsigned nNum) const { return aList[nNum]; } - void InsertLink(const Link<SdrObjFactory*,void>& rLink, unsigned nPos=0xFFFF); + void InsertLink(const Link<SdrObjFactory*,void>& rLink); void RemoveLink(const Link<SdrObjFactory*,void>& rLink); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index b9df48548676..9afb4c05e3c3 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -465,7 +465,7 @@ public: // AddHdl takes ownership of the handle. It should be on the Heap // as Clear() deletes it. - void AddHdl(SdrHdl* pHdl, bool bAtBegin=false); + void AddHdl(SdrHdl* pHdl); SdrHdl* RemoveHdl(size_t nNum); void RemoveAllByKind(SdrHdlKind eKind); diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 78b98e77983b..1f0b43c8fe02 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -85,7 +85,7 @@ public: // A SdrLayer should be considered the standard Layer. It shall then set the // appropriate country-specific name. SetName() sets the "StandardLayer" flag // and if necessary returns "Userdefined". - void SetStandardLayer(bool bStd = true); + void SetStandardLayer(); }; // When Changing the layer data you currently have to set the Modify flag manually diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index b6ec9bca2bb8..07d7b35933f2 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -404,7 +404,7 @@ public: static void TakeUnitStr(FieldUnit eUnit, OUString& rStr); void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; static void TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar = false); - static void TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar = false); + static void TakePercentStr(const Fraction& rVal, OUString& rStr); // RecalcPageNums is ordinarily only called by the Page. bool IsPagNumsDirty() const { return bPagNumsDirty; }; @@ -444,7 +444,7 @@ public: // For that to work, override the virtual method GetDocumentStream(). // Default=FALSE. Flag is not persistent. bool IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(bool bJa = true); + void SetSwapGraphics(); void SetSwapGraphicsMode(SdrSwapGraphicsMode nMode) { nSwapGraphicsMode = nMode; } SdrSwapGraphicsMode GetSwapGraphicsMode() const { return nSwapGraphicsMode; } diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 39da95499ef0..d72df2944555 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -273,7 +273,7 @@ public: bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD (ni) - SdrHdl* PickHandle(const Point& rPnt, SdrSearchOptions nOptions=SdrSearchOptions::NONE, SdrHdl* pHdl0=nullptr) const; + SdrHdl* PickHandle(const Point& rPnt, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; // Pick: Supported options for nOptions are: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT @@ -380,8 +380,7 @@ public: // (Handlers are just situated at marked gluepoints ) // Attention: With each change of the glue point status the handle list is re-calculated. // All previously saved SdrHdl* became invalid by this, the same with the point IDs! - // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD - bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; + bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const; bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, bool bUnmark=false); void UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { MarkGluePoint(pObj,nId,pPV,true); } bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index c7628fb06c2c..4187119513ff 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -230,7 +230,7 @@ public: void SuggestTextFrameSize(Size aSuggestedTextFrameSize); virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true) override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; virtual void SetVerticalWriting( bool bVertical ) override; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 742a7b45472e..9b0d57da6f10 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -375,12 +375,12 @@ protected: Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // for GetDragComment - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; void ImpForcePlusData(); - OUString GetAngleStr(long nAngle, bool bNoDegChar = false) const; - OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; + OUString GetAngleStr(long nAngle) const; + OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM) const; /// @param bNotMyself = true: set only ObjList to dirty, don't mark this object as dirty. /// diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index d596d22a256e..9e7bf069300c 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -155,7 +155,7 @@ public: const OUString& GetFileName() const { return aFileName;} const OUString& GetFilterName() const { return aFilterName;} - void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); + void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 322c5a8c3627..74f5f3cf65da 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -190,7 +190,7 @@ public: virtual void SetChanged() override; virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true) override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTableObj* Clone() const override; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index a60629e3b076..a794b856df6e 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -292,7 +292,7 @@ private: protected: bool ImpCanConvTextToCurve() const; - SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const; + SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier) const; SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg); @@ -347,7 +347,7 @@ public: virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true); bool IsTextFrame() const { return bTextFrame; } bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } /// returns true if the PPT autofit of text into shape bounds is enabled. implies IsFitToSize()==false! diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index f8ea42c696ab..d6e1c713bc0c 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -227,7 +227,7 @@ public: //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos); void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine); void DeleteHelpLine(sal_uInt16 nNum); - void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF); + void InsertHelpLine(const SdrHelpLine& rHL); /// At least one member must be visible for the Group object and /// it must not be locked diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 06396966e4f0..a3d00a04ea1b 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -355,7 +355,7 @@ public: SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false); // Used when the region passed to BeginDrawLayers needs to be changed - void UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false); + void UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg); void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: @@ -425,7 +425,7 @@ public: const Size& GetGridFine() const { return maGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=false); + void InvalidateAllWin(const Rectangle& rRect); /// If the View should not call Invalidate() on the windows, override /// the following 2 methods and do something else. diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index f9931b04b756..a305fb80702a 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -59,7 +59,7 @@ inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false); +SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact); void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -73,7 +73,7 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false); -SVX_DLLPUBLIC void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false); +SVX_DLLPUBLIC void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn); void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); /** diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 26cb62a2f118..21404446077d 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, bool bRepeat = false); + static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 n=0); }; /** diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 0ad977b16587..5377870b2fd8 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -111,12 +111,6 @@ public: bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE); bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE); - - static bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - - static bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - - static bool Paste( vcl::Window* pWin = nullptr, sal_uIntPtr nFormat = SDR_ANYFORMAT ); }; #endif // INCLUDED_SVX_SVDXCGV_HXX diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index cf39d68d7cb8..02bc055b84b0 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -169,7 +169,7 @@ class AbstractSvxObjectNameDialog :public VclAbstractDialog { public: virtual void GetName(OUString& rName) = 0; - virtual void SetCheckNameHdl(const Link<AbstractSvxObjectNameDialog&,bool>& rLink, bool bCheckImmediately = false) = 0; + virtual void SetCheckNameHdl(const Link<AbstractSvxObjectNameDialog&,bool>& rLink) = 0; }; class AbstractSvxObjectTitleDescDialog :public VclAbstractDialog @@ -277,8 +277,7 @@ public: virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, - SdrView* pView, - SdrModel* pModel=nullptr ) = 0 ; + SdrView* pView ) = 0 ; virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, @@ -286,8 +285,7 @@ public: virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, - SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, - SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; + SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone)= 0; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index edbfc429feb8..41a5c329b56b 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -84,15 +84,13 @@ public: */ void FillWithMimeAndSelectBest(); - void InsertTextEncoding( const rtl_TextEncoding nEnc, - sal_Int32 nPos = LISTBOX_APPEND ); + void InsertTextEncoding( const rtl_TextEncoding nEnc ); void InsertTextEncoding( const rtl_TextEncoding nEnc, const OUString& rEntry, sal_Int32 nPos = LISTBOX_APPEND ); - void SelectTextEncoding( const rtl_TextEncoding nEnc, - bool bSelect = true ); + void SelectTextEncoding( const rtl_TextEncoding nEnc ); rtl_TextEncoding GetSelectTextEncoding() const; }; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 2f2fe088fc04..0a58ab0cfbd7 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -126,8 +126,8 @@ public: bool IsBreak3DObjPossible() const; void Break3DObj(); - SfxItemSet Get3DAttributes(E3dScene* pInScene = nullptr, bool bOnly3DAttr=false) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = nullptr, bool bOnly3DAttr=false); + SfxItemSet Get3DAttributes(E3dScene* pInScene = nullptr) const; + void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = nullptr); }; #endif // INCLUDED_SVX_VIEW3D_HXX diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index bb229b0806f8..3acdf0f00f0c 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -52,7 +52,7 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - const Color& GetColorValue(const XColorList* pTable = nullptr) const; + const Color& GetColorValue() const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } }; diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 6dfb0af507b5..8015ac346e2c 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -132,10 +132,8 @@ public: ~XPolyPolygon(); - void Insert( const XPolygon& rXPoly, - sal_uInt16 nPos = XPOLYPOLY_APPEND ); - void Insert( const XPolyPolygon& rXPoly, - sal_uInt16 nPos=XPOLYPOLY_APPEND ); + void Insert( const XPolygon& rXPoly ); + void Insert( const XPolyPolygon& rXPoly ); XPolygon Remove( sal_uInt16 nPos ); const XPolygon& GetObject( sal_uInt16 nPos ) const; |