diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-29 15:04:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-01 08:30:28 +0200 |
commit | 5e913234da65484778d53179ee2005aec01d0f0e (patch) | |
tree | 7532854c855220fd110f6340f5c9c8e53af117b9 | |
parent | 595f46344e18fd6275ff7b862269e4c131449591 (diff) |
loplugin:unuseddefaultparam in svx (part2)
Change-Id: I99e3d6137ec17e3fc782253c85e5fa4f1da4cec4
44 files changed, 150 insertions, 206 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 1574d1856783..5de50c73b30f 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -46,7 +46,7 @@ public: void RecalculateFont(vcl::RenderContext& rRenderContext); - void SelectCharacter( sal_uInt32 cNew, bool bFocus = false ); + void SelectCharacter( sal_uInt32 cNew ); sal_UCS4 GetSelectCharacter() const; void SetDoubleClickHdl( const Link<SvxShowCharSet*,void>& rLink ) { aDoubleClkHdl = rLink; } diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 4a868e0515e0..526fe1914bdc 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -53,8 +53,7 @@ public: // newly created charts using this method static void AdaptDefaultsForChart( const css::uno::Reference < css::embed::XEmbeddedObject > & xEmbObj, - bool bNoFillStyle = true, - bool bNoLineStyle = true); + bool bNoFillStyle = true); }; #endif // INCLUDED_SVX_CHARTHELPER_HXX diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index f633d50b1cc1..0e0e87201160 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -55,7 +55,7 @@ public: SvLBoxButtonKind_enabledCheckbox ); void RemoveEntry ( sal_uLong nPos ); - void SelectEntryPos ( sal_uLong nPos, bool bSelect = true ); + void SelectEntryPos ( sal_uLong nPos ); sal_uLong GetSelectEntryPos () const; void* GetSelectEntryData () const { return GetEntryData(GetSelectEntryPos()); } diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index c3f6186fb31d..e66b337af757 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -43,7 +43,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - void AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos = USHRT_MAX ); + void AddClipbrdFormat( SotClipboardFormatId nId ); void AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName, sal_uInt16 nPos = USHRT_MAX ); sal_uInt16 Count() const; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 60110b1119ab..caad6c390646 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -132,7 +132,7 @@ public: void UpdateFilterTest(); // } For FilterPage only - void SetCalcView(bool bFlag=true); + void SetCalcView(); bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime, const OUString &rComment); bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime); @@ -230,7 +230,7 @@ public: SvxRedlinDateMode GetDateMode(); void ClearAuthors(); - void InsertAuthor( const OUString& rString, sal_Int32 nPos = LISTBOX_APPEND ); + void InsertAuthor( const OUString& rString ); OUString GetSelectedAuthor()const; void SelectedAuthorPos(sal_Int32 nPos); sal_Int32 SelectAuthor(const OUString& aString); @@ -267,7 +267,7 @@ public: void SetRefHdl( const Link<SvxTPFilter*,void>& rLink ) { aRefLink = rLink; } void Enable( bool bEnable = true, bool bChild = true ); - void Disable( bool bChild = true ); + void Disable(); // } Methods for Calc }; @@ -312,7 +312,7 @@ public: void EnableRejectAll(bool bFlag=true); void EnableUndo(bool bFlag=true); void DisableUndo() {EnableUndo(false);} - void ShowUndo(bool bFlag=true); + void ShowUndo(); void SetAcceptClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptClickLk = rLink; } diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index 8cef557f2878..3204a8634f06 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -87,12 +87,11 @@ namespace svx createPropertyValueSequence(); /** initialized the descriptor from the property values given - <p>If <arg>_bClear</arg> is <TRUE/>, the descriptor will clear all its current settings before - initializing with the new ones.</p> + The descriptor will clear all its current settings before + initializing with the new ones. */ void initializeFrom( - const css::uno::Sequence< css::beans::PropertyValue >& _rValues, - bool _bClear = true); + const css::uno::Sequence< css::beans::PropertyValue >& _rValues); /// checks whether or not a given property is present in the descriptor bool has(DataAccessDescriptorProperty _eWhich) const; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 596222cb9c99..7ee7e5346aff 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -99,7 +99,7 @@ protected: RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const; Point GetPointFromRP( RECT_POINT ) const; - void SetFocusRect( const Rectangle* pRect = nullptr ); // pRect == NULL -> calculate rectangle in method + void SetFocusRect(); Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); // returns the last point virtual void GetFocus() override; @@ -272,7 +272,7 @@ public: void Append( const XGradientEntry& rEntry, const Bitmap& rBitmap ); void Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); void SelectEntryByList( const XGradientListRef &pList, const OUString& rStr, - const XGradient& rXGradient, sal_uInt16 nDist = 0 ); + const XGradient& rXGradient ); }; /************************************************************************/ @@ -351,8 +351,8 @@ public: void Fill( const XLineEndListRef &pList, bool bStart = true ); - void Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart = true ); - void Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart = true ); + void Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ); + void Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); }; diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 6e9069407f41..4aa1fd612d70 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -79,7 +79,7 @@ namespace vcl { class Window; } // display info about a simple css::sdbc::SQLException void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = nullptr); SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = nullptr); -void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = nullptr); +void displayException(const css::sdb::SQLErrorEvent&); void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 536eedd89e20..dff8ce80cb68 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -111,10 +111,8 @@ public: virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) override; /** grab the focus to the first form control on the view - @param _bForceSync - <TRUE/> if the handling should be done synchronously. */ - SVX_DLLPRIVATE void GrabFirstControlFocus( bool _bForceSync = false ); + SVX_DLLPRIVATE void GrabFirstControlFocus(); /** returns the form controller for a given form and a given device */ diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 44b776fa5f2a..d75bf3504db6 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -64,7 +64,7 @@ public: void SetColor( const Color& rColor ); void ResetColor(); void SetBackColor( const Color& rColor ); - void UseResourceText( bool bUse = true ); + void UseResourceText(); void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; bool IsTwoLines() const; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index eec5eafbc5e2..be1983330dab 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -74,8 +74,8 @@ public: void InsertFontEntry( const OUString& rString, const vcl::Font& rFont, const Color* pColor = nullptr ); - /** Selects/deselects an entry specified by its position in the list box. */ - void SelectEntryPos( sal_uLong nPos, bool bSelect = true ); + /** Selects an entry specified by its position in the list box. */ + void SelectEntryPos( sal_uLong nPos ); /** Removes a selection. */ void SetNoSelection(); diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index c87073857965..e83b9db99c3e 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -120,40 +120,32 @@ public: void SetRowStyleBottom( size_t nRow, const Style& rStyle ); /** Returns the left frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges and neighbor cells; - false = Returns thicker of own left style or right style of the cell to the left. - Returns the style only if visible (i.e. at left border of a merged range). + Returns thicker of own left style or right style of the cell to the left. + Returns the style only if visible (i.e. at left border of a merged range). @return The left frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleLeft( size_t nCol, size_t nRow, bool bSimple = false ) const; + const Style& GetCellStyleLeft( size_t nCol, size_t nRow ) const; /** Returns the right frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges and neighbor cells; - false = Returns thicker of own right style or left style of the cell to the right. - Returns the style only if visible (i.e. at right border of a merged range). + Returns thicker of own right style or left style of the cell to the right. + Returns the style only if visible (i.e. at right border of a merged range). @return The left frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleRight( size_t nCol, size_t nRow, bool bSimple = false ) const; + const Style& GetCellStyleRight( size_t nCol, size_t nRow ) const; /** Returns the top frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges and neighbor cells; - false = Returns thicker of own top style or bottom style of the cell above. - Returns the style only if visible (i.e. at top border of a merged range). + Returns thicker of own top style or bottom style of the cell above. + Returns the style only if visible (i.e. at top border of a merged range). @return The top frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleTop( size_t nCol, size_t nRow, bool bSimple = false ) const; + const Style& GetCellStyleTop( size_t nCol, size_t nRow ) const; /** Returns the top frame style of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges and neighbor cells; - false = Returns thicker of own top style or bottom style of the cell above. - Returns the style only if visible (i.e. at top border of a merged range). + Returns thicker of own top style or bottom style of the cell above. + Returns the style only if visible (i.e. at top border of a merged range). @return The top frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleBottom( size_t nCol, size_t nRow, bool bSimple = false ) const; + 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 @@ -316,24 +308,18 @@ public: Size GetCellSize( size_t nCol, size_t nRow, bool bSimple = false ) const; /** Returns the output rectangle of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns total output rectangle of merged ranges. */ - Rectangle GetCellRect( size_t nCol, size_t nRow, bool bSimple = false ) const; + Returns total output rectangle of merged ranges. */ + Rectangle GetCellRect( size_t nCol, size_t nRow ) const; // diagonal frame borders ------------------------------------------------- /** Returns the angle between horizontal and diagonal border of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns the horizontal angle of merged ranges. */ - double GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const; + Returns the horizontal angle of merged ranges. */ + double GetHorDiagAngle( size_t nCol, size_t nRow ) const; /** Returns the angle between vertical and diagonal border of the cell (nCol,nRow). - @param bSimple - true = Ignores merged ranges; - false = Returns the vertical angle of merged ranges. */ - double GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const; + Returns the vertical angle of merged ranges. */ + double GetVerDiagAngle( size_t nCol, size_t nRow ) const; /** Specifies whether to use polygon clipping to draw diagonal frame borders. @descr @@ -370,10 +356,8 @@ public: size_t nLastCol, size_t nLastRow, const Color* pForceColor = nullptr ) const; - /** Draws the part of the array, that is inside the clipping range. - @param pForceColor - If not NULL, only this color will be used to draw all frame borders. */ - void DrawArray( OutputDevice& rDev, const Color* pForceColor = nullptr ) const; + /** Draws the part of the array, that is inside the clipping range. */ + void DrawArray( OutputDevice& rDev ) const; private: diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 36eef98be745..8fec54cc2571 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -43,8 +43,7 @@ public: /** Inserts a string with corresponding direction enum into the listbox. */ void InsertEntryValue( const OUString& rString, - SvxFrameDirection eDirection, - sal_Int32 nPos = LISTBOX_APPEND ); + SvxFrameDirection eDirection ); /** Removes the entry, that represents the specified frame direction. */ void RemoveEntryValue( SvxFrameDirection eDirection ); diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 5ab775fb47dc..605d87f48801 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -136,7 +136,7 @@ public: /** Returns true, if the specified frame border is selected. */ bool IsBorderSelected( FrameBorderType eBorder ) const; /** Selects or deselects the specified frame border. */ - void SelectBorder( FrameBorderType eBorder, bool bSelect = true ); + void SelectBorder( FrameBorderType eBorder ); /** Returns true, if any of the enabled frame borders is selected. */ bool IsAnyBorderSelected() const; /** Selects or deselects all frame borders. */ @@ -145,7 +145,7 @@ public: inline void DeselectAllBorders() { SelectAllBorders( false ); } /** Selects or deselects all visible frame borders (ignores hidden and "don't care" borders). */ - void SelectAllVisibleBorders( bool bSelect = true ); + void SelectAllVisibleBorders(); /** Sets the passed line widths to all selected frame borders (in twips). */ void SetStyleToSelection( long nWidth, editeng::SvxBorderStyle nStyle ); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index ec3c9017606f..da32313f1cfb 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -183,8 +183,7 @@ protected: void CopyToClipboard( vcl::Window* pWindow ); void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - sal_Int32 nDragPointer = DND_POINTER_NONE, - sal_Int32 nDragImage = DND_IMAGE_NONE ); + sal_Int32 nDragPointer = DND_POINTER_NONE ); }; enum class GalleryHintType diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index c9e91ae32042..6102248b0660 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -150,7 +150,7 @@ public: SAL_DLLPRIVATE bool UnlockTheme(); SAL_DLLPRIVATE void LockBroadcaster() { mnBroadcasterLockCount++; } - void UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 ); + void UnlockBroadcaster(); SAL_DLLPRIVATE bool IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } SAL_DLLPRIVATE void SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; } @@ -191,10 +191,10 @@ public: bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false ); bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); - SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rModelStreamRef, bool bProgress = false ); + SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rModelStreamRef ); SAL_DLLPRIVATE bool InsertModelStream( const tools::SvRef<SotStorageStream>& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); - SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool bProgress = false ); + SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL ); bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); SAL_DLLPRIVATE bool InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index f88ca532d7b3..22a74992b884 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -68,13 +68,13 @@ public: bool bHasLangNone, bool bLangNoneIsLangAll = false, bool bCheckSpellAvail = false ); - sal_Int32 InsertLanguage( const LanguageType eLangType, sal_Int32 nPos = LISTBOX_APPEND ); - void InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos = LISTBOX_APPEND ); - void InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND ); + sal_Int32 InsertLanguage( const LanguageType eLangType ); + void InsertDefaultLanguage( sal_Int16 nType ); + void InsertSystemLanguage(); void InsertLanguage( const LanguageType eLangType, - bool bCheckEntry, sal_Int32 nPos = LISTBOX_APPEND ); + bool bCheckEntry ); void RemoveLanguage( const LanguageType eLangType ); - void SelectLanguage( const LanguageType eLangType, bool bSelect = true ); + void SelectLanguage( const LanguageType eLangType ); LanguageType GetSelectLanguage() const; bool IsLanguageSelected( const LanguageType eLangType ) const; @@ -82,7 +82,7 @@ public: void HideLBB(); void DisableLBB(); void SaveValueLBB(); - sal_Int32 GetSelectEntryPosLBB( sal_Int32 nSelIndex = 0 ) const; + sal_Int32 GetSelectEntryPosLBB() const; void* GetEntryDataLBB( sal_Int32 nPos ) const; sal_Int32 GetSavedValueLBB() const; diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 218d741eacf8..504b0877426a 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -143,7 +143,7 @@ public: bool IsTmpCurrencyFormat( const OUString& rFmtString ); bool FindEntry( const OUString& rFmtString, sal_uInt32* pAt = nullptr ); - void ValidateNewEntries( bool bValidate = true ) { bUndoAddList = !bValidate; } + void ValidateNewEntries() { bUndoAddList = false; } size_t GetUpdateDataCount() const; void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index 4fdba83ae798..5cba917bea03 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -58,8 +58,8 @@ namespace sdr // Hittest with logical coordinates bool isHitLogic(const basegfx::B2DPoint& rLogicPosition, double fLogicTolerance = 0.0) const; - // Hittest with pixel coordinates and pixel tolerance - bool isHitPixel(const Point& rDiscretePosition, sal_uInt32 fDiscreteTolerance = DEFAULT_VALUE_FOR_HITTEST_PIXEL) const; + // Hittest with pixel coordinates + bool isHitPixel(const Point& rDiscretePosition) const; // calculate BaseRange of all included OverlayObjects and return basegfx::B2DRange getBaseRange() const; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index cd08fc8c577a..400d370e8da9 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -72,7 +72,7 @@ public: void Insert( const SearchAttrItem& rItem ) { SrchAttrItemList::push_back( rItem ); } // deletes the pointer to the items - void Remove(size_t nPos, size_t nLen = 1); + void Remove(size_t nPos); }; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index ab285bd6e587..0160f8040235 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -141,7 +141,7 @@ public: static Point KorregPos(const Point& rNow, const Point& rPrev); void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(bool bSaveReal=false); + void NextPoint(); void PrevPoint(); bool CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 408e35c04bd5..6ce00e5f6303 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -151,7 +151,7 @@ protected: void createSdrDragEntries_GlueDrag(); // old call forwarders to the SdrDragView - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; SdrHdl* GetDragHdl() const { return getSdrDragView().mpDragHdl; } SdrHdlKind GetDragHdlKind() const { return getSdrDragView().meDragHdl; } SdrDragStat& DragStat() { return getSdrDragView().maDragStat; } diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index fa5f749d6714..2beb9164c3ea 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -225,12 +225,12 @@ public: // copy marked objects and mark them instead of the old ones void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect, bool bCopy=false) { SetMarkedObjRect(rRect,bCopy); } - void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); } - void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } - void RotateAllMarked(const Point& rRef, long nAngle, bool bCopy=false) { RotateMarkedObj(rRef,nAngle,bCopy); } - void MirrorAllMarkedHorizontal(bool bCopy=false) { MirrorMarkedObjHorizontal(bCopy); } - void MirrorAllMarkedVertical(bool bCopy=false) { MirrorMarkedObjVertical(bCopy); } + void SetAllMarkedRect(const Rectangle& rRect) { SetMarkedObjRect(rRect); } + void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj(rSiz,bCopy); } + void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { ResizeMarkedObj(rRef,xFact,yFact); } + void RotateAllMarked(const Point& rRef, long nAngle) { RotateMarkedObj(rRef,nAngle); } + void MirrorAllMarkedHorizontal() { MirrorMarkedObjHorizontal(); } + void MirrorAllMarkedVertical() { MirrorMarkedObjVertical(); } void CopyMarked() { CopyMarkedObj(); } bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } bool IsResizeAllowed(bool bProp=false) const; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 61519208f610..6855141fcdb0 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -653,7 +653,7 @@ void SvxShowCharSet::OutputIndex( int nNewIndex ) } -void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) +void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew ) { if (mxFontCharMap == nullptr) RecalculateFont(*this); @@ -662,13 +662,10 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) sal_UCS4 cNext = mxFontCharMap->GetNextChar( (cNew > 0) ? cNew - 1 : cNew ); int nMapIndex = mxFontCharMap->GetIndexFromChar( cNext ); - SelectIndex( nMapIndex, bFocus ); - if( !bFocus ) - { - // move selected item to top row if not in focus - aVscrollSB->SetThumbPos( nMapIndex / COLUMN_COUNT ); - Invalidate(); - } + SelectIndex( nMapIndex ); + // move selected item to top row if not in focus + aVscrollSB->SetThumbPos( nMapIndex / COLUMN_COUNT ); + Invalidate(); } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index ae321b006820..653d8f207fbb 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -78,10 +78,10 @@ void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) } -void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) +void SvxCheckListBox::SelectEntryPos( sal_uLong nPos ) { if ( nPos < GetEntryCount() ) - Select( GetEntry( nPos ), bSelect ); + Select( GetEntry( nPos ) ); } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index c94d9450df35..ba71974d236a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -161,17 +161,10 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRi return nCompare; } -void SvxRedlinTable::SetCalcView(bool bFlag) +void SvxRedlinTable::SetCalcView() { - bIsCalc=bFlag; - if(bFlag) - { - nDatePos=CALC_DATE; - } - else - { - nDatePos=WRITER_DATE; - } + bIsCalc=true; + nDatePos=CALC_DATE; } void SvxRedlinTable::UpdateFilterTest() @@ -497,9 +490,9 @@ void SvxTPView::EnableRejectAll(bool bFlag) m_pRejectAll->Enable(bFlag); } -void SvxTPView::ShowUndo(bool bFlag) +void SvxTPView::ShowUndo() { - m_pUndo->Show(bFlag); + m_pUndo->Show(); } void SvxTPView::EnableUndo(bool bFlag) @@ -768,9 +761,9 @@ void SvxTPFilter::ClearAuthors() m_pLbAuthor->Clear(); } -void SvxTPFilter::InsertAuthor( const OUString& rString, sal_Int32 nPos) +void SvxTPFilter::InsertAuthor( const OUString& rString) { - m_pLbAuthor->InsertEntry(rString,nPos); + m_pLbAuthor->InsertEntry(rString); } OUString SvxTPFilter::GetSelectedAuthor() const @@ -1016,9 +1009,9 @@ void SvxTPFilter::Enable( bool bEnable, bool bChild) RowEnableHdl(m_pCbComment); } } -void SvxTPFilter::Disable( bool bChild) +void SvxTPFilter::Disable() { - Enable( false, bChild ); + Enable( false ); } IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2916f4c1382e..90f2ef54f356 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -533,14 +533,11 @@ Point SvxRectCtl::GetPointFromRP( RECT_POINT _eRP) const } -void SvxRectCtl::SetFocusRect( const Rectangle* pRect ) +void SvxRectCtl::SetFocusRect() { HideFocus(); - if( pRect ) - ShowFocus( *pRect ); - else - ShowFocus( CalculateFocusRectangle() ); + ShowFocus( CalculateFocusRectangle() ); } Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT eNewRP ) @@ -1347,7 +1344,7 @@ void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bit } void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr, - const XGradient& rGradient, sal_uInt16 nDist ) + const XGradient& rGradient ) { long nCount = pList.get() ? pList->Count() : 0; XGradientEntry* pEntry; @@ -1365,7 +1362,7 @@ void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUStrin bFound = true; } if( bFound ) - SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } // Fills the listbox (provisional) with strings @@ -1712,7 +1709,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) SetUpdateMode( true ); } -void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart ) +void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ) { if(!rBitmap.IsEmpty()) { @@ -1724,7 +1721,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool InsertEntry( rEntry.GetName(), Image(pVD->GetBitmap( - (bStart) ? Point() : Point(aBmpSize.Width() / 2, 0), + Point(), Size(aBmpSize.Width() / 2, aBmpSize.Height())))); } else @@ -1735,7 +1732,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool AdaptDropDownLineCountToMaximum(); } -void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart ) +void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) { RemoveEntry( nPos ); @@ -1749,7 +1746,7 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitma InsertEntry( rEntry.GetName(), Image(pVD->GetBitmap( - (bStart) ? Point() : Point(aBmpSize.Width() / 2, 0), + Point(), Size(aBmpSize.Width() / 2, aBmpSize.Height()))), nPos); } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 141bbf9d809a..3a451f40169b 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -623,9 +623,9 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor) Invalidate(); } -void SvxFontPrevWindow::UseResourceText(bool bUse) +void SvxFontPrevWindow::UseResourceText() { - pImpl->mbUseResText = bUse; + pImpl->mbUseResText = true; } void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 30a521a5afeb..87a482de4568 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -105,12 +105,12 @@ void SvxFontListBox::InsertFontEntry( const OUString& rString, const vcl::Font& mbUseFont = false; } -void SvxFontListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) +void SvxFontListBox::SelectEntryPos( sal_uLong nPos ) { SvTreeListEntry* pEntry = GetEntry( nPos ); if( pEntry ) { - Select( pEntry, bSelect ); + Select( pEntry ); ShowEntry( pEntry ); } } diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 548ba97c5df9..e2d91902ff14 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -496,11 +496,8 @@ void Array::SetRowStyleBottom( size_t nRow, const Style& rStyle ) SetCellStyleBottom( nCol, nRow, rStyle ); } -const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow ) const { - // simple: always return own left style - if( bSimple ) - return CELL( nCol, nRow ).maLeft; // outside clipping rows or overlapped in merged cells: invisible if( !mxImpl->IsRowInClipRange( nRow ) || mxImpl->IsMergedOverlappedLeft( nCol, nRow ) ) return OBJ_STYLE_NONE; @@ -517,11 +514,8 @@ const Style& Array::GetCellStyleLeft( size_t nCol, size_t nRow, bool bSimple ) c return std::max( ORIGCELL( nCol, nRow ).maLeft, ORIGCELL( nCol - 1, nRow ).maRight ); } -const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow ) const { - // simple: always return own right style - if( bSimple ) - return CELL( nCol, nRow ).maRight; // outside clipping rows or overlapped in merged cells: invisible if( !mxImpl->IsRowInClipRange( nRow ) || mxImpl->IsMergedOverlappedRight( nCol, nRow ) ) return OBJ_STYLE_NONE; @@ -538,11 +532,8 @@ const Style& Array::GetCellStyleRight( size_t nCol, size_t nRow, bool bSimple ) return std::max( ORIGCELL( nCol, nRow ).maRight, ORIGCELL( nCol + 1, nRow ).maLeft ); } -const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow ) const { - // simple: always return own top style - if( bSimple ) - return CELL( nCol, nRow ).maTop; // outside clipping columns or overlapped in merged cells: invisible if( !mxImpl->IsColInClipRange( nCol ) || mxImpl->IsMergedOverlappedTop( nCol, nRow ) ) return OBJ_STYLE_NONE; @@ -559,11 +550,8 @@ const Style& Array::GetCellStyleTop( size_t nCol, size_t nRow, bool bSimple ) co return std::max( ORIGCELL( nCol, nRow ).maTop, ORIGCELL( nCol, nRow - 1 ).maBottom ); } -const Style& Array::GetCellStyleBottom( size_t nCol, size_t nRow, bool bSimple ) const +const Style& Array::GetCellStyleBottom( size_t nCol, size_t nRow ) const { - // simple: always return own bottom style - if( bSimple ) - return CELL( nCol, nRow ).maBottom; // outside clipping columns or overlapped in merged cells: invisible if( !mxImpl->IsColInClipRange( nCol ) || mxImpl->IsMergedOverlappedBottom( nCol, nRow ) ) return OBJ_STYLE_NONE; @@ -834,13 +822,13 @@ Size Array::GetCellSize( size_t nCol, size_t nRow, bool bSimple ) const return Size( GetColWidth( nFirstCol, nLastCol ) + 1, GetRowHeight( nFirstRow, nLastRow ) + 1 ); } -Rectangle Array::GetCellRect( size_t nCol, size_t nRow, bool bSimple ) const +Rectangle Array::GetCellRect( size_t nCol, size_t nRow ) const { - Rectangle aRect( GetCellPosition( nCol, nRow, bSimple ), GetCellSize( nCol, nRow, bSimple ) ); + Rectangle aRect( GetCellPosition( nCol, nRow ), GetCellSize( nCol, nRow ) ); // adjust rectangle for partly visible merged cells const Cell& rCell = CELL( nCol, nRow ); - if( !bSimple && rCell.IsMerged() ) + if( rCell.IsMerged() ) { aRect.Left() -= rCell.mnAddLeft; aRect.Right() += rCell.mnAddRight; @@ -851,16 +839,16 @@ Rectangle Array::GetCellRect( size_t nCol, size_t nRow, bool bSimple ) const } // diagonal frame borders -double Array::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const +double Array::GetHorDiagAngle( size_t nCol, size_t nRow ) const { DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetHorDiagAngle" ); - return mxImpl->GetHorDiagAngle( nCol, nRow, bSimple ); + return mxImpl->GetHorDiagAngle( nCol, nRow ); } -double Array::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const +double Array::GetVerDiagAngle( size_t nCol, size_t nRow ) const { DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetVerDiagAngle" ); - return mxImpl->GetVerDiagAngle( nCol, nRow, bSimple ); + return mxImpl->GetVerDiagAngle( nCol, nRow ); } void Array::SetUseDiagDoubleClipping( bool bSet ) @@ -1312,10 +1300,10 @@ void Array::DrawRange( OutputDevice& rDev, } } -void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const +void Array::DrawArray( OutputDevice& rDev ) const { if( mxImpl->mnWidth && mxImpl->mnHeight ) - DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1, pForceColor ); + DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1 ); } diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 49093a93d391..5d259f42d70c 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -50,9 +50,9 @@ VCL_BUILDER_DECL_FACTORY(FrameDirectionListBox) rRet = pListBox; } -void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_Int32 nPos ) +void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection ) { - sal_Int32 nRealPos = InsertEntry( rString, nPos ); + sal_Int32 nRealPos = InsertEntry( rString ); SetEntryData( nRealPos, lclEnumToVoid( eDirection ) ); } diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 3268bb502523..ecd0ebf47626 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -936,9 +936,9 @@ bool FrameSelector::IsBorderSelected( FrameBorderType eBorder ) const return mxImpl->GetBorder( eBorder ).IsSelected(); } -void FrameSelector::SelectBorder( FrameBorderType eBorder, bool bSelect /*, bool bFocus */ ) +void FrameSelector::SelectBorder( FrameBorderType eBorder ) { - mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), bSelect ); + mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), true/*bSelect*/ ); // MT: bFireFox as API parameter is ugly... // if (bFocus) { @@ -965,10 +965,10 @@ void FrameSelector::SelectAllBorders( bool bSelect ) mxImpl->SelectBorder( **aIt, bSelect ); } -void FrameSelector::SelectAllVisibleBorders( bool bSelect ) +void FrameSelector::SelectAllVisibleBorders() { for( VisFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt ) - mxImpl->SelectBorder( **aIt, bSelect ); + mxImpl->SelectBorder( **aIt, true/*bSelect*/ ); } void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle ) diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index caeead2d34af..6f2a77c662c0 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -297,9 +297,9 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, } -sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, sal_Int32 nPos ) +sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType ) { - return ImplInsertLanguage( nLangType, nPos, css::i18n::ScriptType::WEAK ); + return ImplInsertLanguage( nLangType, LISTBOX_APPEND, css::i18n::ScriptType::WEAK ); } @@ -358,20 +358,20 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType, } -void SvxLanguageBoxBase::InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos ) +void SvxLanguageBoxBase::InsertDefaultLanguage( sal_Int16 nType ) { - ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType ); + ImplInsertLanguage( LANGUAGE_SYSTEM, LISTBOX_APPEND, nType ); } -void SvxLanguageBoxBase::InsertSystemLanguage( sal_Int32 nPos ) +void SvxLanguageBoxBase::InsertSystemLanguage() { - ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, css::i18n::ScriptType::WEAK ); + ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, LISTBOX_APPEND, css::i18n::ScriptType::WEAK ); } void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, - bool bCheckEntry, sal_Int32 nPos ) + bool bCheckEntry ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -388,7 +388,7 @@ void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; - sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry ); + sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, LISTBOX_APPEND, bCheckEntry ); ImplSetEntryData( nAt, reinterpret_cast<void*>(nLang) ); } @@ -413,7 +413,7 @@ LanguageType SvxLanguageBoxBase::GetSelectLanguage() const } -void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType, bool bSelect ) +void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType ) { // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. @@ -425,7 +425,7 @@ void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType, bool bSel nAt = InsertLanguage( nLang ); // on-the-fly-ID if ( nAt != LISTBOX_ENTRY_NOTFOUND ) - ImplSelectEntryPos( nAt, bSelect ); + ImplSelectEntryPos( nAt, true/*bSelect*/ ); } @@ -469,9 +469,9 @@ void SvxLanguageBoxBase::SaveValueLBB() ImplSaveValue(); } -sal_Int32 SvxLanguageBoxBase::GetSelectEntryPosLBB( sal_Int32 nSelIndex ) const +sal_Int32 SvxLanguageBoxBase::GetSelectEntryPosLBB() const { - return ImplGetSelectEntryPos( nSelIndex); + return ImplGetSelectEntryPos(); } void* SvxLanguageBoxBase::GetEntryDataLBB( sal_Int32 nPos ) const diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d54cce84ef47..a53e915361b6 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -230,8 +230,9 @@ void SearchAttrItemList::Clear() // Deletes the pointer to the items -void SearchAttrItemList::Remove(size_t nPos, size_t nLen) +void SearchAttrItemList::Remove(size_t nPos) { + size_t nLen = 1; if ( nPos + nLen > size() ) nLen = size() - nPos; diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 3f67bc63f832..2a2c11554946 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -362,10 +362,9 @@ namespace svx } - void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, bool _bClear) + void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues) { - if (_bClear) - clear(); + clear(); m_pImpl->buildFrom(_rValues); } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 40c90dcf5882..f32bfb5e8ff8 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -154,9 +154,9 @@ void displayException(const css::sdb::SQLContext& _rExcept, vcl::Window* _pParen } -void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) +void displayException(const css::sdb::SQLErrorEvent& _rEvent) { - displayException(_rEvent.Reason, _pParent); + displayException(_rEvent.Reason); } diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 5c84e2ac1303..ae7047872aa1 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -307,10 +307,10 @@ void FmFormView::ChangeDesignMode(bool bDesign) } -void FmFormView::GrabFirstControlFocus( bool _bForceSync ) +void FmFormView::GrabFirstControlFocus() { if ( !IsDesignMode() ) - pImpl->AutoFocus( _bForceSync ); + pImpl->AutoFocus(); } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 025b1019f5c5..85bad9efefa1 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -587,7 +587,7 @@ void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) } void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - sal_Int32 nDragPointer, sal_Int32 nDragImage ) + sal_Int32 nDragPointer ) { INetURLObject aURL; @@ -595,7 +595,7 @@ void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceA { mpTheme->SetDragging( true ); mpTheme->SetDragPos( mnObjectPos ); - TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer, nDragImage ); + TransferableHelper::StartDrag( pWindow, nDragSourceActions, nDragPointer ); } } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 6aebc63df639..0b90af5b9e88 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -355,12 +355,12 @@ bool GalleryTheme::UnlockTheme() return bRet; } -void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos ) +void GalleryTheme::UnlockBroadcaster() { DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" ); if( mnBroadcasterLockCount && !--mnBroadcasterLockCount ) - ImplBroadcast( nUpdatePos ); + ImplBroadcast( 0 ); } bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) @@ -998,7 +998,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo return bRet; } -bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rxModelStream, bool ) +bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rxModelStream ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); bool bRet = false; @@ -1083,7 +1083,7 @@ bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>& rxMo return bRet; } -bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool ) +bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); bool bRet = false; diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 63a2a1b94090..9b1c2c061f2f 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -119,13 +119,12 @@ SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const return new SvxClipboardFormatItem( *this ); } -void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos ) +void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId ) { - if( nPos > pImpl->aFmtNms.size() ) - nPos = pImpl->aFmtNms.size(); + sal_uInt16 nPos = pImpl->aFmtNms.size(); - pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, OUString()); - pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); + pImpl->aFmtNms.insert( pImpl->aFmtNms.begin() + nPos, OUString()); + pImpl->aFmtIds.insert( pImpl->aFmtIds.begin() + nPos, nId ); } void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName, diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 2e9132012607..c744f2923793 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -119,8 +119,9 @@ namespace sdr return false; } - bool OverlayObjectList::isHitPixel(const Point& rDiscretePosition, sal_uInt32 nDiscreteTolerance) const + bool OverlayObjectList::isHitPixel(const Point& rDiscretePosition) const { + sal_uInt32 nDiscreteTolerance = DEFAULT_VALUE_FOR_HITTEST_PIXEL; if(!maVector.empty()) { OverlayObjectVector::const_iterator aStart(maVector.begin()); @@ -132,15 +133,8 @@ namespace sdr const Point aPosLogic(pManager->getOutputDevice().PixelToLogic(rDiscretePosition)); const basegfx::B2DPoint aPosition(aPosLogic.X(), aPosLogic.Y()); - if(nDiscreteTolerance) - { - const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(Size(nDiscreteTolerance, nDiscreteTolerance))); - return isHitLogic(aPosition, (double)aSizeLogic.Width()); - } - else - { - return isHitLogic(aPosition); - } + const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(Size(nDiscreteTolerance, nDiscreteTolerance))); + return isHitLogic(aPosition, (double)aSizeLogic.Width()); } } diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index bba7151c2ffe..0fc62bb4b7e4 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -151,8 +151,7 @@ drawinglayer::primitive2d::Primitive2DContainer ChartHelper::tryToGetChartConten void ChartHelper::AdaptDefaultsForChart( const uno::Reference < embed::XEmbeddedObject > & xEmbObj, - bool /* bNoFillStyle */, - bool /* bNoLineStyle */) + bool /* bNoFillStyle */) { if( xEmbObj.is()) { diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index 411cc9127cf6..8eb54cbef3d8 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -71,10 +71,9 @@ void SdrDragStat::NextMove(const Point& rPnt) Now()=aBla; } -void SdrDragStat::NextPoint(bool bSaveReal) +void SdrDragStat::NextPoint() { Point aPnt(GetNow()); - if (bSaveReal) aPnt=aRealNow; aPnts.push_back(new Point(KorregPos(GetRealNow(),aPnt))); Prev()=aPnt; } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index db4f68822412..c5e2bfd3657a 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -553,7 +553,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag() } } -void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const +void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const { ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE; if (IsDraggingPoints()) { @@ -561,7 +561,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr } else if (IsDraggingGluePoints()) { nOpt=ImpTakeDescriptionOptions::GLUEPOINTS; } - getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nVal,nOpt); + getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,0,nOpt); } SdrObject* SdrDragMethod::GetDragObj() const |