diff options
Diffstat (limited to 'include')
77 files changed, 441 insertions, 434 deletions
diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx index 76dd6c637f62..4548f7013e87 100644 --- a/include/cui/cuicharmap.hxx +++ b/include/cui/cuicharmap.hxx @@ -47,7 +47,7 @@ class CUI_DLLPUBLIC SvxShowText final : public weld::CustomWidgetController private: ScopedVclPtr<VirtualDevice> m_xVirDev; OUString m_sText; - long mnY; + tools::Long mnY; bool mbCenter; vcl::Font m_aFont; diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 6bbc14aa498a..516d715c93d6 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -27,6 +27,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <rtl/ustring.hxx> #include <tools/color.hxx> +#include <tools/long.hxx> #include <basegfx/color/bcolor.hxx> #include <com/sun/star/lang/Locale.hpp> #include <vector> @@ -119,7 +120,7 @@ private: bool mbFilled; // the width to fill - long mnWidthToFill; + tools::Long mnWidthToFill; /// The fill color of the text Color maTextFillColor; @@ -141,7 +142,7 @@ public: const attribute::FontAttribute& rFontAttribute, const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, bool bFilled = false, - long nWidthToFill = 0, + tools::Long nWidthToFill = 0, const Color& rTextFillColor = COL_TRANSPARENT); /** get text outlines as polygons and their according ObjectTransformation. Handles all @@ -161,7 +162,7 @@ public: const basegfx::BColor& getFontColor() const { return maFontColor; } const Color& getTextFillColor() const { return maTextFillColor; } bool isFilled() const { return mbFilled; } - long getWidthToFill() const { return mnWidthToFill; } + tools::Long getWidthToFill() const { return mnWidthToFill; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index d77a7c781eb4..69019ab2451c 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -165,8 +165,8 @@ protected: TemplateViewItem *maSelectedItem; - long mnThumbnailWidth; - long mnThumbnailHeight; + tools::Long mnThumbnailWidth; + tools::Long mnThumbnailHeight; Point maPosition; //store the point of click event diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 14a90c7549bf..f7cdd01c0cfc 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> #include <svx/svxdllapi.h> +#include <tools/long.hxx> namespace com::sun::star { namespace accessibility { class XAccessible; } @@ -110,7 +111,7 @@ public: @return If there are no children a 0 is returned. */ - long GetChildCount() const throw (); + tools::Long GetChildCount() const throw (); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @@ -127,10 +128,10 @@ public: */ css::uno::Reference< css::accessibility::XAccessible> - GetChild (long nIndex); + GetChild (tools::Long nIndex); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::drawing::XShape> GetChildShape (long nIndex); + css::uno::Reference< css::drawing::XShape> GetChildShape (tools::Long nIndex); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index b7820beb5e07..a7f2a7ae3ce2 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -31,7 +31,7 @@ public: virtual std::unique_ptr<sfx2::StylePreviewRenderer> CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, - long nMaxHeight) override; + tools::Long nMaxHeight) override; }; } // end namespace svx diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx index 19284a7d0ce7..50530c0a0f85 100644 --- a/include/svx/IAccessibleParent.hxx +++ b/include/svx/IAccessibleParent.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVX_IACCESSIBLEPARENT_HXX #include <com/sun/star/uno/Reference.hxx> +#include <tools/long.hxx> namespace accessibility { class AccessibleControlShape; } namespace com::sun::star::accessibility { class XAccessible; } @@ -80,7 +81,7 @@ public: virtual bool ReplaceChild ( AccessibleShape* pCurrentChild, const css::uno::Reference< css::drawing::XShape >& _rxShape, - const long _nIndex, + const tools::Long _nIndex, const AccessibleShapeTreeInfo& _rShapeTreeInfo ) = 0; //Add this method to support Form Controls diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 637f7d0e1a40..dbcf789f5cfd 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -38,7 +38,7 @@ class SVXCORE_DLLPUBLIC PaletteManager sal_uInt16 mnNumOfPalettes; sal_uInt16 mnCurrentPalette; - long mnColorCount; + tools::Long mnColorCount; svx::ToolboxButtonColorUpdaterBase* mpBtnUpdater; XColorListRef pColorList; @@ -62,8 +62,8 @@ public: OUString GetPaletteName(); OUString GetSelectedPalettePath(); - long GetColorCount() const; - long GetRecentColorCount() const; + tools::Long GetColorCount() const; + tools::Long GetRecentColorCount() const; void AddRecentColor(const Color& rRecentColor, const OUString& rColorName, bool bFront = true); void SetBtnUpdater(svx::ToolboxButtonColorUpdaterBase* pBtnUpdater); diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index b58463879f55..ccf61121876f 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -24,6 +24,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> +#include <tools/long.hxx> #include <unordered_map> #include <vector> @@ -178,7 +179,7 @@ private: Returns the slot id of the shape with the given service name or 0 when the service name is not known. */ - SVX_DLLPRIVATE long GetSlotId (const OUString& aServiceName) const; + SVX_DLLPRIVATE tools::Long GetSlotId (const OUString& aServiceName) const; /** Determine the slot id of the specified shape type. With this id internal methods can access the associated type descriptor. @@ -188,7 +189,7 @@ private: Returns the slot id of the shape with the given service name or 0 when the service name is not known. */ - SVX_DLLPRIVATE long GetSlotId (const css::uno::Reference< + SVX_DLLPRIVATE tools::Long GetSlotId (const css::uno::Reference< css::drawing::XShape>& rxShape) const; }; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 4b47a785b860..25341d5f8e8c 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -129,10 +129,10 @@ protected: rtl::Reference<svx::SvxShowCharSetAcc> m_xAccessible; uno::Reference< uno::XComponentContext > mxContext; - long nX; - long nY; - long m_nXGap; - long m_nYGap; + tools::Long nX; + tools::Long nY; + tools::Long m_nXGap; + tools::Long m_nYGap; bool bDrag; sal_Int32 nSelectedIndex; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 29c255506c89..3c5435bb9787 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -54,8 +54,8 @@ private: tools::Rectangle maRect; bool mbEnabled; OutputDevice& mrParent; - long mnCenterX; - long mnCenterY; + tools::Long mnCenterX; + tools::Long mnCenterY; }; /** This control allows to input a rotation angle, visualized by a dial. @@ -141,8 +141,8 @@ private: sal_Int32 mnAngle; sal_Int32 mnInitialAngle; sal_Int32 mnOldAngle; - long mnCenterX; - long mnCenterY; + tools::Long mnCenterX; + tools::Long mnCenterY; bool mbNoRot; explicit DialControl_Impl(OutputDevice& rReference); diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 3fd0dc2f8b9e..1aefcd2fff32 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -194,16 +194,16 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } - static long GetSquares() { return nSquares ; } - long GetWidth() const { return aRectSize.getWidth() ; } - long GetHeight() const { return aRectSize.getHeight() ; } + static tools::Long GetSquares() { return nSquares ; } + tools::Long GetWidth() const { return aRectSize.getWidth() ; } + tools::Long GetHeight() const { return aRectSize.getHeight() ; } //Device Pixel . - long ShowPosition( const Point &pt); + tools::Long ShowPosition( const Point &pt); - long PointToIndex(const Point &pt) const; - Point IndexToPoint(long nIndex) const ; - long GetFocusPosIndex() const ; + tools::Long PointToIndex(const Point &pt) const; + Point IndexToPoint(tools::Long nIndex) const ; + tools::Long GetFocusPosIndex() const ; //Keyboard function for key input and focus handling function virtual bool KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 2483a4a5f652..c9007b397ccb 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -149,7 +149,7 @@ protected: virtual void Command(const CommandEvent& rEvt) override; virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) override; - virtual long QueryMinimumRowHeight() override; + virtual tools::Long QueryMinimumRowHeight() override; virtual void RowHeightChanged() override; virtual void ColumnResized(sal_uInt16 nId) override; virtual void ColumnMoved(sal_uInt16 nId) override; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index cca06cc6959b..31d350fa13cc 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -80,10 +80,10 @@ class SAL_WARN_UNUSED SvxFontWorkDialog final : public SfxDockingWindow OString m_sLastAdjustTbxId; OString m_sLastShadowTbxId; - long nSaveShadowX; - long nSaveShadowY; - long nSaveShadowAngle; - long nSaveShadowSize; + tools::Long nSaveShadowX; + tools::Long nSaveShadowY; + tools::Long nSaveShadowAngle; + tools::Long nSaveShadowSize; SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT]; diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 7c40b336108b..7cdfd90d794b 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -207,22 +207,22 @@ public: /** Sets an additional left width for the merged range that contains (nCol,nRow). @descr Useful to handle merged ranges that are not completely part of the array. @precond The merged range must be at the left border of the array. */ - void SetAddMergedLeftSize( size_t nCol, size_t nRow, long nAddSize ); + void SetAddMergedLeftSize( size_t nCol, size_t nRow, tools::Long nAddSize ); /** Sets an additional right width for the merged range that contains (nCol,nRow). @descr Useful to handle merged ranges that are not completely part of the array. @precond The merged range must be at the right border of the array. */ - void SetAddMergedRightSize( size_t nCol, size_t nRow, long nAddSize ); + void SetAddMergedRightSize( size_t nCol, size_t nRow, tools::Long nAddSize ); /** Sets an additional top height for the merged range that contains (nCol,nRow). @descr Useful to handle merged ranges that are not completely part of the array. @precond The merged range must be at the top border of the array. */ - void SetAddMergedTopSize( size_t nCol, size_t nRow, long nAddSize ); + void SetAddMergedTopSize( size_t nCol, size_t nRow, tools::Long nAddSize ); /** Sets an additional bottom height for the merged range that contains (nCol,nRow). @descr Useful to handle merged ranges that are not completely part of the array. @precond The merged range must be at the bottom border of the array. */ - void SetAddMergedBottomSize( size_t nCol, size_t nRow, long nAddSize ); + void SetAddMergedBottomSize( size_t nCol, size_t nRow, tools::Long nAddSize ); /** Returns true, if the cell (nCol,nRow) is part of a merged range. */ bool IsMerged( size_t nCol, size_t nRow ) const; @@ -250,44 +250,44 @@ public: // cell coordinates /** Sets the X output coordinate of the left column. */ - void SetXOffset( long nXOffset ); + void SetXOffset( tools::Long nXOffset ); /** Sets the Y output coordinate of the top row. */ - void SetYOffset( long nYOffset ); + void SetYOffset( tools::Long nYOffset ); /** Sets the output width of the specified column. */ - void SetColWidth( size_t nCol, long nWidth ); + void SetColWidth( size_t nCol, tools::Long nWidth ); /** Sets the output height of the specified row. */ - void SetRowHeight( size_t nRow, long nHeight ); + void SetRowHeight( size_t nRow, tools::Long nHeight ); /** Sets the same output width for all columns. */ - void SetAllColWidths( long nWidth ); + void SetAllColWidths( tools::Long nWidth ); /** Sets the same output height for all rows. */ - void SetAllRowHeights( long nHeight ); + void SetAllRowHeights( tools::Long nHeight ); /** Returns the X output coordinate of the left border of the specified column. @descr The column index <array-width> returns the X output coordinate of the right array border. */ - long GetColPosition( size_t nCol ) const; + tools::Long GetColPosition( size_t nCol ) const; /** Returns the Y output coordinate of the top border of the specified row. @descr The row index <array-height> returns the Y output coordinate of the bottom array border. */ - long GetRowPosition( size_t nRow ) const; + tools::Long GetRowPosition( size_t nRow ) const; /** Returns the output width of the specified range of columns. */ - long GetColWidth( size_t nFirstCol, size_t nLastCol ) const; + tools::Long GetColWidth( size_t nFirstCol, size_t nLastCol ) const; /** Returns the output height of the specified range of rows. */ - long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const; + tools::Long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const; /** Returns the output width of the entire array. */ - long GetWidth() const; + tools::Long GetWidth() const; /** Returns the output height of the entire array. */ - long GetHeight() const; + tools::Long GetHeight() const; /** Returns the output range of the cell (nCol,nRow). Returns total output range of merged ranges, if bExpandMerged is true. */ diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index f9a6195258eb..5c07aa370d8c 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -121,7 +121,7 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, returns the width in the passed parameter. */ - bool GetVisibleWidth( long& rnWidth, SvxBorderLineStyle& rnStyle ) const; + bool GetVisibleWidth( tools::Long& rnWidth, SvxBorderLineStyle& rnStyle ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, returns the color in the passed parameter. */ @@ -149,7 +149,7 @@ public: void SelectAllVisibleBorders(); /** Sets the passed line widths to all selected frame borders (in twips). */ - void SetStyleToSelection( long nWidth, SvxBorderLineStyle nStyle ); + void SetStyleToSelection( tools::Long nWidth, SvxBorderLineStyle nStyle ); /** Sets the passed color to all selected frame borders. */ void SetColorToSelection( const Color& rColor ); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index dfcf5cb151af..f2fa49b7759c 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -295,7 +295,7 @@ private: // (with respect to the data source capabilities) // defaults to (insert | update | delete) sal_uInt16 m_nLastColId; - long m_nLastRowId; + tools::Long m_nLastRowId; bool m_bDesignMode : 1; // default = sal_False bool m_bRecordCountFinal : 1; @@ -312,14 +312,14 @@ protected: bool m_bUpdating : 1; // are any updates being executed right now? protected: - virtual bool SeekRow(long nRow) override; - virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows) override; + virtual bool SeekRow(tools::Long nRow) override; + virtual void VisibleRowsChanged( tools::Long nNewTopRow, sal_uInt16 nNumRows) override; virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override; - virtual RowStatus GetRowStatus(long nRow) const override; - virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) override; + virtual RowStatus GetRowStatus(tools::Long nRow) const override; + virtual bool CursorMoving(tools::Long nNewRow, sal_uInt16 nNewCol) override; virtual void CursorMoved() override; virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) override; - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override; + virtual sal_uInt32 GetTotalCellWidth(tools::Long nRow, sal_uInt16 nColId) override; virtual void Command(const CommandEvent& rEvt) override; virtual bool PreNotify(NotifyEvent& rEvt) override; virtual void KeyInput(const KeyEvent& rEvt) override; @@ -327,7 +327,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Select() override; - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; + virtual ::svt::CellController* GetController(tools::Long nRow, sal_uInt16 nCol) override; virtual void CellModified() override; virtual bool SaveModified() override; @@ -374,7 +374,7 @@ protected: // DragSourceHelper overridables virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; - void executeRowContextMenu( long _nRow, const Point& _rPreferredPos ); + void executeRowContextMenu( tools::Long _nRow, const Point& _rPreferredPos ); public: DbGridControl( @@ -397,7 +397,7 @@ public: @return the text out of the cell */ - virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; + virtual OUString GetCellText(tools::Long _nRow, sal_uInt16 _nColId) const override; void RemoveRows(bool bNewCursor); @@ -437,7 +437,7 @@ public: void SetFilterMode(bool bMode); bool IsFilterMode() const {return m_bFilterMode;} - bool IsFilterRow(long nRow) const {return m_bFilterMode && nRow == 0;} + bool IsFilterRow(tools::Long nRow) const {return m_bFilterMode && nRow == 0;} void EnableNavigationBar(bool bEnable); bool HasNavigationBar() const {return m_bNavigationBar;} @@ -472,9 +472,9 @@ public: // is the current line being updated 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 ); - void RowModified( long nRow ); + void RowRemoved( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true ); + void RowInserted( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true ); + void RowModified( tools::Long nRow ); void resetCurrentRow(); @@ -560,12 +560,12 @@ public: CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; protected: - void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor); - bool SeekCursor(long nRow, bool bAbsolute = false); + void RecalcRows(tools::Long nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor); + bool SeekCursor(tools::Long nRow, bool bAbsolute = false); void RemoveColumns(); // cleaning of own structures void AdjustRows(); sal_Int32 AlignSeekCursor(); - bool SetCurrent(long nNewRow); + bool SetCurrent(tools::Long nNewRow); OUString GetCurrentRowCellText(DbGridColumn const * pCol,const DbGridRowRef& _rRow) const; virtual void DeleteSelectedRows(); @@ -575,7 +575,7 @@ protected: bool IsCurrentAppending() const; // empty row for insertion - bool IsInsertionRow(long nRow) const; + bool IsInsertionRow(tools::Long nRow) const; void SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;} sal_Int32 GetCurrentPos() const {return m_nCurrentPos;} diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index eceb96b8337e..8b89c82549b4 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC NumSettings_Impl SvxNumType nNumberType; short nParentNumbering; SvxNumberFormat::LabelFollowedBy eLabelFollowedBy; - long nTabValue; + tools::Long nTabValue; SvxAdjust eNumAlign; - long nNumAlignAt; - long nNumIndentAt; + tools::Long nNumAlignAt; + tools::Long nNumIndentAt; OUString sPrefix; OUString sSuffix; OUString sBulletChar; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index c986cd68d0ab..5a51cc34c603 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -116,7 +116,7 @@ public: // which is vertical to the screen, plus a shift of the scene. // This means that also the scene (E3dScene) must define this // routine as virtual in its class. - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; // get wireframe polygon for local object. No transform is applied. basegfx::B3DPolyPolygon CreateWireframe() const; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index b5abe5c6aec6..07186afdd838 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -32,24 +32,24 @@ private: Size aWinSize; Size aSize; - long nTop; - long nBottom; - long nLeft; - long nRight; + tools::Long nTop; + tools::Long nBottom; + tools::Long nLeft; + tools::Long nRight; bool bResetBackground; bool bFrameDirection; SvxFrameDirection nFrameDirection; - long nHdLeft; - long nHdRight; - long nHdDist; - long nHdHeight; + tools::Long nHdLeft; + tools::Long nHdRight; + tools::Long nHdDist; + tools::Long nHdHeight; - long nFtLeft; - long nFtRight; - long nFtDist; - long nFtHeight; + tools::Long nFtLeft; + tools::Long nFtRight; + tools::Long nFtDist; + tools::Long nFtHeight; drawinglayer::attribute::SdrAllFillAttributesHelperPtr maHeaderFillAttributes; drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFooterFillAttributes; @@ -103,35 +103,35 @@ public: return aSize; } - void SetTop(long nNew) { nTop = nNew; } - void SetBottom(long nNew) { nBottom = nNew; } - void SetLeft(long nNew) { nLeft = nNew; } - void SetRight(long nNew) { nRight = nNew; } - - long GetTop() const { return nTop; } - long GetBottom() const { return nBottom; } - long GetLeft() const { return nLeft; } - long GetRight() const { return nRight; } - - void SetHdLeft(long nNew) { nHdLeft = nNew; } - void SetHdRight(long nNew) { nHdRight = nNew; } - void SetHdDist(long nNew) { nHdDist = nNew; } - void SetHdHeight(long nNew) { nHdHeight = nNew; } - - long GetHdLeft() const { return nHdLeft; } - long GetHdRight() const { return nHdRight; } - long GetHdDist() const { return nHdDist; } - long GetHdHeight() const { return nHdHeight; } - - void SetFtLeft(long nNew) { nFtLeft = nNew; } - void SetFtRight(long nNew) { nFtRight = nNew; } - void SetFtDist(long nNew) { nFtDist = nNew; } - void SetFtHeight(long nNew) { nFtHeight = nNew; } - - long GetFtLeft() const { return nFtLeft; } - long GetFtRight() const { return nFtRight; } - long GetFtDist() const { return nFtDist; } - long GetFtHeight() const { return nFtHeight; } + void SetTop(tools::Long nNew) { nTop = nNew; } + void SetBottom(tools::Long nNew) { nBottom = nNew; } + void SetLeft(tools::Long nNew) { nLeft = nNew; } + void SetRight(tools::Long nNew) { nRight = nNew; } + + tools::Long GetTop() const { return nTop; } + tools::Long GetBottom() const { return nBottom; } + tools::Long GetLeft() const { return nLeft; } + tools::Long GetRight() const { return nRight; } + + void SetHdLeft(tools::Long nNew) { nHdLeft = nNew; } + void SetHdRight(tools::Long nNew) { nHdRight = nNew; } + void SetHdDist(tools::Long nNew) { nHdDist = nNew; } + void SetHdHeight(tools::Long nNew) { nHdHeight = nNew; } + + tools::Long GetHdLeft() const { return nHdLeft; } + tools::Long GetHdRight() const { return nHdRight; } + tools::Long GetHdDist() const { return nHdDist; } + tools::Long GetHdHeight() const { return nHdHeight; } + + void SetFtLeft(tools::Long nNew) { nFtLeft = nNew; } + void SetFtRight(tools::Long nNew) { nFtRight = nNew; } + void SetFtDist(tools::Long nNew) { nFtDist = nNew; } + void SetFtHeight(tools::Long nNew) { nFtHeight = nNew; } + + tools::Long GetFtLeft() const { return nFtLeft; } + tools::Long GetFtRight() const { return nFtRight; } + tools::Long GetFtDist() const { return nFtDist; } + tools::Long GetFtHeight() const { return nFtHeight; } void SetUsage(SvxPageUsage eU) { eUsage = eU; } SvxPageUsage GetUsage() const { return eUsage; } diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 8eb4001a75d7..bb6607318dc6 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -39,8 +39,8 @@ class SVX_DLLPUBLIC SvxParaPrevWindow final : public weld::CustomWidgetControlle Size aSize; // indentation - long nLeftMargin; - long nRightMargin; + tools::Long nLeftMargin; + tools::Long nRightMargin; short nFirstLineOffset; // distances sal_uInt16 nUpper; @@ -63,11 +63,11 @@ public: { nFirstLineOffset = nNew; } - void SetLeftMargin( long nNew ) + void SetLeftMargin( tools::Long nNew ) { nLeftMargin = nNew; } - void SetRightMargin( long nNew ) + void SetRightMargin( tools::Long nNew ) { nRightMargin = nNew; } diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index b63950292daf..0961f3b5b867 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SvxPosSizeStatusBarControl final : public SfxStatusBarContro { private: std::unique_ptr<SvxPosSizeStatusBarControl_Impl> pImpl; - SVX_DLLPRIVATE OUString GetMetricStr_Impl( long nVal ); + SVX_DLLPRIVATE OUString GetMetricStr_Impl( tools::Long nVal ); public: SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 1df1f51ae5ff..5bdd4c9e66d7 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -57,8 +57,8 @@ class SvxRubyDialog : public SfxModelessDialogController friend class RubyPreview; - long nLastPos; - long nCurrentEdit; + tools::Long nLastPos; + tools::Long nCurrentEdit; bool bModified; SfxBindings* pBindings; rtl::Reference<SvxRubyData_Impl> m_pImpl; @@ -117,8 +117,8 @@ class SvxRubyDialog : public SfxModelessDialogController void Update(); virtual void Close() override; - long GetLastPos() const {return nLastPos;} - void SetLastPos(long nSet) {nLastPos = nSet;} + tools::Long GetLastPos() const {return nLastPos;} + void SetLastPos(tools::Long nSet) {nLastPos = nSet;} bool IsModified() const {return bModified;} void SetModified(bool bSet) {bModified = bSet;} diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index d0dd4e68228e..c0b587cdc583 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -101,16 +101,16 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener bool bAppSetNullOffset :1; bool bHorz :1; - long lLogicNullOffset; // in logic coordinates - long lAppNullOffset; // in logic coordinates - long lInitialDragPos; + tools::Long lLogicNullOffset; // in logic coordinates + tools::Long lAppNullOffset; // in logic coordinates + tools::Long lInitialDragPos; SvxRulerSupportFlags nFlags; SvxRulerDragFlags nDragType; sal_uInt16 nDefTabType; sal_uInt16 nTabCount; sal_uInt16 nTabBufSize; - long lDefTabDist; - long lTabPos; + tools::Long lDefTabDist; + tools::Long lTabPos; std::vector<RulerTab> mpTabs; // tab positions in pixel std::vector<RulerIndent> mpIndents; // paragraph margins in pixel @@ -118,9 +118,9 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener std::vector<RulerBorder> mpObjectBorders; SfxBindings* pBindings; - long nDragOffset; - long nMaxLeft; - long nMaxRight; + tools::Long nDragOffset; + tools::Long nMaxLeft; + tools::Long nMaxRight; bool bValid; bool bListening; bool bActive; @@ -129,8 +129,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener bool mbSnapping; void StartListening_Impl(); - long GetCorrectedDragPos(bool bLeft = true, bool bRight = true ); - void DrawLine_Impl(long &lTabPos, int, bool Horizontal); + tools::Long GetCorrectedDragPos(bool bLeft = true, bool bRight = true ); + void DrawLine_Impl(tools::Long &lTabPos, int, bool Horizontal); sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const; // page borders or surrounding frame @@ -162,44 +162,44 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void UpdateObject(); // Convert position to stick to ruler ticks - long MakePositionSticky(long rValue, long aPointOfReference, bool aSnapToFrameMargin = true) const; + tools::Long MakePositionSticky(tools::Long rValue, tools::Long aPointOfReference, bool aSnapToFrameMargin = true) const; - long PixelHAdjust(long lPos, long lPos2) const; - long PixelVAdjust(long lPos, long lPos2) const; - long PixelAdjust(long lPos, long lPos2) const; + tools::Long PixelHAdjust(tools::Long lPos, tools::Long lPos2) const; + tools::Long PixelVAdjust(tools::Long lPos, tools::Long lPos2) const; + tools::Long PixelAdjust(tools::Long lPos, tools::Long lPos2) const; - long ConvertHPosPixel(long lPos) const; - long ConvertVPosPixel(long lPos) const; - long ConvertHSizePixel(long lSize) const; - long ConvertVSizePixel(long lSize) const; + tools::Long ConvertHPosPixel(tools::Long lPos) const; + tools::Long ConvertVPosPixel(tools::Long lPos) const; + tools::Long ConvertHSizePixel(tools::Long lSize) const; + tools::Long ConvertVSizePixel(tools::Long lSize) const; - long ConvertPosPixel(long lPos) const; - long ConvertSizePixel(long lSize) const; + tools::Long ConvertPosPixel(tools::Long lPos) const; + tools::Long ConvertSizePixel(tools::Long lSize) const; - long ConvertHPosLogic(long lPos) const; - long ConvertVPosLogic(long lPos) const; - long ConvertHSizeLogic(long lSize) const; - long ConvertVSizeLogic(long lSize) const; + tools::Long ConvertHPosLogic(tools::Long lPos) const; + tools::Long ConvertVPosLogic(tools::Long lPos) const; + tools::Long ConvertHSizeLogic(tools::Long lSize) const; + tools::Long ConvertVSizeLogic(tools::Long lSize) const; - long ConvertPosLogic(long lPos) const; - long ConvertSizeLogic(long lSize) const; + tools::Long ConvertPosLogic(tools::Long lPos) const; + tools::Long ConvertSizeLogic(tools::Long lSize) const; - long RoundToCurrentMapMode(long lValue) const; + tools::Long RoundToCurrentMapMode(tools::Long lValue) const; - long GetFirstLineIndent() const; - long GetLeftIndent() const; - long GetRightIndent() const; - long GetLogicRightIndent() const; + tools::Long GetFirstLineIndent() const; + tools::Long GetLeftIndent() const; + tools::Long GetRightIndent() const; + tools::Long GetLogicRightIndent() const; - long GetLeftFrameMargin() const; - long GetRightFrameMargin() const; + tools::Long GetLeftFrameMargin() const; + tools::Long GetRightFrameMargin() const; void CalcMinMax(); void EvalModifier(); void DragMargin1(); //adjust the left margin either after DragMargin1() or after DragBorders() - void AdjustMargin1(long lDiff); + void AdjustMargin1(tools::Long lDiff); void DragMargin2(); void DragIndents(); void DragTabs(); @@ -212,10 +212,10 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void ApplyBorders(); void ApplyObject(); - long GetFrameLeft() const; + tools::Long GetFrameLeft() const; - long GetLeftMin() const; - long GetRightMax() const; + tools::Long GetLeftMin() const; + tools::Long GetRightMax() const; DECL_LINK( TabMenuSelect, Menu *, bool ); DECL_LINK( MenuSelect, Menu *, bool ); @@ -226,7 +226,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener MoveLeft, MoveRight }; - void UpdateParaContents_Impl(long lDiff, UpdateType); + void UpdateParaContents_Impl(tools::Long lDiff, UpdateType); protected: virtual void Command( const CommandEvent& rCEvt ) override; @@ -253,7 +253,7 @@ protected: sal_uInt16 GetActRightColumn ( bool bForceDontConsiderHidden = false, sal_uInt16 nAct=USHRT_MAX ) const; - long CalcPropMaxRight(sal_uInt16 nCol = USHRT_MAX) const; + tools::Long CalcPropMaxRight(sal_uInt16 nCol = USHRT_MAX) const; public: @@ -262,10 +262,10 @@ public: virtual ~SvxRuler() override; virtual void dispose() override; - void SetDefTabDist(long); + void SetDefTabDist(tools::Long); // set/get NullOffset in logic units - void SetNullOffsetLogic(long lOff); + void SetNullOffsetLogic(tools::Long lOff); void SetActive(bool bOn = true); @@ -276,8 +276,8 @@ public: //#i24363# tab stops relative to indent void SetTabsRelativeToIndent( bool bRel ); - void SetValues(RulerChangeType type, long value); - long GetPageWidth() const; + void SetValues(RulerChangeType type, tools::Long value); + tools::Long GetPageWidth() const; }; #endif diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 2f0df198f099..4f5d78083809 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -26,8 +26,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem { - long mlLeft; // nLeft or the negative first-line indentation - long mlRight; // the unproblematic right edge + tools::Long mlLeft; // nLeft or the negative first-line indentation + tools::Long mlRight; // the unproblematic right edge virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -44,19 +44,19 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); - SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); + SvxLongLRSpaceItem(tools::Long lLeft, tools::Long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(); - long GetLeft() const { return mlLeft;} - long GetRight() const { return mlRight;} - void SetLeft(long lArgLeft); - void SetRight(long lArgRight); + tools::Long GetLeft() const { return mlLeft;} + tools::Long GetRight() const { return mlRight;} + void SetLeft(tools::Long lArgLeft); + void SetRight(tools::Long lArgRight); }; class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem { - long mlLeft; // nLeft or the negative first-line indentation - long mlRight; // the unproblematic right edge + tools::Long mlLeft; // nLeft or the negative first-line indentation + tools::Long mlRight; // the unproblematic right edge virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -73,20 +73,20 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); - SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); + SvxLongULSpaceItem(tools::Long lUpper, tools::Long lLower, sal_uInt16 nId); SvxLongULSpaceItem(); - long GetUpper() const { return mlLeft;} - long GetLower() const { return mlRight;} - void SetUpper(long lArgLeft); - void SetLower(long lArgRight); + tools::Long GetUpper() const { return mlLeft;} + tools::Long GetLower() const { return mlRight;} + void SetUpper(tools::Long lArgLeft); + void SetLower(tools::Long lArgRight); }; class SVX_DLLPUBLIC SvxPagePosSizeItem final : public SfxPoolItem { Point aPos; - long lWidth; - long lHeight; + tools::Long lWidth; + tools::Long lHeight; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -103,31 +103,31 @@ private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; public: static SfxPoolItem* CreateDefault(); - SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); + SvxPagePosSizeItem(const Point &rPos, tools::Long lWidth, tools::Long lHeight); SvxPagePosSizeItem(); const Point &GetPos() const { return aPos; } - long GetWidth() const { return lWidth; } - long GetHeight() const { return lHeight; } + tools::Long GetWidth() const { return lWidth; } + tools::Long GetHeight() const { return lHeight; } }; struct SVX_DLLPUBLIC SvxColumnDescription { - long nStart; /* Start of the column */ - long nEnd; /* End of the column */ + tools::Long nStart; /* Start of the column */ + tools::Long nEnd; /* End of the column */ bool bVisible; /* Visibility */ - long nEndMin; //min. possible position of end - long nEndMax; //max. possible position of end + tools::Long nEndMin; //min. possible position of end + tools::Long nEndMax; //max. possible position of end - SvxColumnDescription(long start, long end, bool bVis); + SvxColumnDescription(tools::Long start, tools::Long end, bool bVis); - SvxColumnDescription(long start, long end, - long endMin, long endMax, bool bVis); + SvxColumnDescription(tools::Long start, tools::Long end, + tools::Long endMin, tools::Long endMax, bool bVis); bool operator==(const SvxColumnDescription &rCmp) const; bool operator!=(const SvxColumnDescription &rCmp) const; - long GetWidth() const; + tools::Long GetWidth() const; }; template<typename charT, typename traits> @@ -144,8 +144,8 @@ class SVX_DLLPUBLIC SvxColumnItem final : public SfxPoolItem { std::vector<SvxColumnDescription> aColumns; // Column array - long nLeft; // Left edge for the table - long nRight; // Right edge for the table; for columns always + tools::Long nLeft; // Left edge for the table + tools::Long nRight; // Right edge for the table; for columns always // equal to the surrounding frame sal_uInt16 nActColumn; // the current column bool bTable; // table? @@ -177,13 +177,13 @@ public: sal_uInt16 Count() const; void Append(const SvxColumnDescription& rDesc); - void SetLeft(long aLeft); - void SetRight(long aRight); + void SetLeft(tools::Long aLeft); + void SetRight(tools::Long aRight); sal_uInt16 GetActColumn() const { return nActColumn;} bool IsFirstAct() const; bool IsLastAct() const; - long GetLeft() const { return nLeft;} - long GetRight() const { return nRight;} + tools::Long GetLeft() const { return nLeft;} + tools::Long GetRight() const { return nRight;} bool IsTable() const { return bTable;} bool CalcOrtho() const; void SetOrtho(bool bVal); @@ -192,10 +192,10 @@ public: class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem { - long nStartX; /* Start in x direction */ - long nEndX; /* End in x direction */ - long nStartY; /* Start in y direction */ - long nEndY; /* End in y direction */ + tools::Long nStartX; /* Start in x direction */ + tools::Long nEndX; /* End in x direction */ + tools::Long nStartY; /* Start in y direction */ + tools::Long nEndY; /* End in y direction */ bool bLimits; /* boundary limit control by the application */ virtual bool operator==( const SfxPoolItem& ) const override; @@ -213,18 +213,18 @@ class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); - SvxObjectItem(long nStartX, long nEndX, - long nStartY, long nEndY); - - long GetStartX() const { return nStartX;} - long GetEndX() const { return nEndX;} - long GetStartY() const { return nStartY;} - long GetEndY() const { return nEndY;} - - void SetStartX(long lValue); - void SetEndX(long lValue); - void SetStartY(long lValue); - void SetEndY(long lValue); + SvxObjectItem(tools::Long nStartX, tools::Long nEndX, + tools::Long nStartY, tools::Long nEndY); + + tools::Long GetStartX() const { return nStartX;} + tools::Long GetEndX() const { return nEndX;} + tools::Long GetStartY() const { return nStartY;} + tools::Long GetEndY() const { return nEndY;} + + void SetStartX(tools::Long lValue); + void SetEndX(tools::Long lValue); + void SetStartY(tools::Long lValue); + void SetEndY(tools::Long lValue); }; #endif diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 837c2da43a39..e3fb1b5c779c 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -137,7 +137,7 @@ public: virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) override; virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; void RotateScene(const Point& rRef, double sn, double cs); // TakeObjName...() is for the display in the UI, for example "3 frames selected". diff --git a/include/svx/sderitm.hxx b/include/svx/sderitm.hxx index ad03621c50fb..9a41860f5c83 100644 --- a/include/svx/sderitm.hxx +++ b/include/svx/sderitm.hxx @@ -22,7 +22,7 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrEckenradiusItem(long nRadius) { +inline SdrMetricItem makeSdrEckenradiusItem(tools::Long nRadius) { return SdrMetricItem(SDRATTR_ECKENRADIUS, nRadius); } diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 8abecbad394c..0e7e3a7897b4 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -32,7 +32,7 @@ public: SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {} virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; - virtual void ScaleMetrics(long nMul, long nDiv) override; + virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx index e2686a5689a9..ac270699d22d 100644 --- a/include/svx/sdsxyitm.hxx +++ b/include/svx/sdsxyitm.hxx @@ -22,11 +22,11 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrShadowXDistItem(long nDist) { +inline SdrMetricItem makeSdrShadowXDistItem(tools::Long nDist) { return SdrMetricItem(SDRATTR_SHADOWXDIST, nDist); } -inline SdrMetricItem makeSdrShadowYDistItem(long nDist) { +inline SdrMetricItem makeSdrShadowYDistItem(tools::Long nDist) { return SdrMetricItem(SDRATTR_SHADOWYDIST, nDist); } diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 71764b2962a3..1a4a51c0e07f 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -28,7 +28,7 @@ public: SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; - virtual void ScaleMetrics(long nMul, long nDiv) override; + virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx index 9e363c7627e6..d9b1d3ab3e9b 100644 --- a/include/svx/sdtditm.hxx +++ b/include/svx/sdtditm.hxx @@ -22,19 +22,19 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextLeftDistItem(long mnHeight) { +inline SdrMetricItem makeSdrTextLeftDistItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextRightDistItem(long mnHeight) { +inline SdrMetricItem makeSdrTextRightDistItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextUpperDistItem(long mnHeight) { +inline SdrMetricItem makeSdrTextUpperDistItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, mnHeight); } -inline SdrMetricItem makeSdrTextLowerDistItem(long mnHeight) { +inline SdrMetricItem makeSdrTextLowerDistItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, mnHeight); } diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx index 838d938c3336..25890361accf 100644 --- a/include/svx/sdtmfitm.hxx +++ b/include/svx/sdtmfitm.hxx @@ -22,19 +22,19 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextMinFrameHeightItem(long mnHeight) { +inline SdrMetricItem makeSdrTextMinFrameHeightItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long mnHeight) { +inline SdrMetricItem makeSdrTextMaxFrameHeightItem(tools::Long mnHeight) { return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMinFrameWidthItem(long mnWidth) { +inline SdrMetricItem makeSdrTextMinFrameWidthItem(tools::Long mnWidth) { return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, mnWidth); }; -inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long mnWidth) { +inline SdrMetricItem makeSdrTextMaxFrameWidthItem(tools::Long mnWidth) { return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, mnWidth); } diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 359b822e16b1..0442510d7537 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -49,7 +49,7 @@ public: virtual ~LinePropertyPanelBase() override; virtual void dispose() override; - void SetWidth(long nWidth); + void SetWidth(tools::Long nWidth); void SetWidthIcon(int n); void SetWidthIcon(); diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index c16924d0cec8..718ff68ce24a 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -38,7 +38,7 @@ public: LineWidthPopup(weld::Widget* pParent, LinePropertyPanelBase& rParent); ~LineWidthPopup(); - void SetWidthSelect (long lValue, bool bValuable, MapUnit eMapUnit); + void SetWidthSelect (tools::Long lValue, bool bValuable, MapUnit eMapUnit); weld::Container* getTopLevel() const { return m_xTopLevel.get(); } @@ -49,7 +49,7 @@ private: MapUnit m_eMapUnit; bool m_bVSFocus; bool m_bCustom; - long m_nCustomWidth; + tools::Long m_nCustomWidth; Image m_aIMGCus; Image m_aIMGCusGray; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index 0deef29e4f10..80c2406b9046 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -145,8 +145,8 @@ public: void NextPoint(); void PrevPoint(); bool CheckMinMoved(const Point& rPnt); - long GetDX() const { return GetNow().X()-GetPrev().X(); } - long GetDY() const { return GetNow().Y()-GetPrev().Y(); } + tools::Long GetDX() const { return GetNow().X()-GetPrev().X(); } + tools::Long GetDY() const { return GetNow().Y()-GetPrev().Y(); } Fraction GetXFact() const; Fraction GetYFact() const; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 26e88a7dbcd1..72d8ad3ff154 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -229,8 +229,8 @@ inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const class SVXCORE_DLLPUBLIC SdrDragMove : public SdrDragMethod { private: - long nBestXSnap; - long nBestYSnap; + tools::Long nBestXSnap; + tools::Long nBestYSnap; bool bXSnapped; bool bYSnapped; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 03ca5fc3a022..b215108c24c8 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -212,13 +212,13 @@ public: void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bWdh, const bool bHgt); - long GetMarkedObjRotate() const; - void RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy=false); + tools::Long GetMarkedObjRotate() const; + void RotateMarkedObj(const Point& rRef, tools::Long nAngle, bool bCopy=false); void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); void MirrorMarkedObjHorizontal(); void MirrorMarkedObjVertical(); - long GetMarkedObjShear() const; - void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false); + tools::Long GetMarkedObjShear() const; + void ShearMarkedObj(const Point& rRef, tools::Long nAngle, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bCopy=false); void DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); @@ -227,7 +227,7 @@ public: void SetAllMarkedRect(const tools::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 RotateAllMarked(const Point& rRef, tools::Long nAngle) { RotateMarkedObj(rRef,nAngle); } void MirrorAllMarkedHorizontal() { MirrorMarkedObjHorizontal(); } void MirrorAllMarkedVertical() { MirrorMarkedObjVertical(); } void CopyMarked() { CopyMarkedObj(); } diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 53dbef281786..7469444a743b 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -77,7 +77,7 @@ public: void MoveMarkedGluePoints (const Size& rSiz, bool bCopy); void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy); - void RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy); + void RotateMarkedGluePoints(const Point& rRef, tools::Long nAngle, bool bCopy); }; #endif // INCLUDED_SVX_SVDGLEV_HXX diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index ab6d6760c085..a7eb9b9d76b2 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -104,12 +104,12 @@ public: void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); - long GetAlignAngle() const; - void SetAlignAngle(long nAngle); - static long EscDirToAngle(SdrEscapeDirection nEsc); - static SdrEscapeDirection EscAngleToDir(long nAngle); - void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj); - void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj); + tools::Long GetAlignAngle() const; + void SetAlignAngle(tools::Long nAngle); + static tools::Long EscDirToAngle(SdrEscapeDirection nEsc); + static SdrEscapeDirection EscAngleToDir(tools::Long nAngle); + void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs, const SdrObject* pObj); + void Mirror(const Point& rRef1, const Point& rRef2, tools::Long nAngle, const SdrObject* pObj); void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); }; @@ -137,9 +137,9 @@ public: void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; // temp for transformations on the reference object void SetReallyAbsolute(bool bOn, const SdrObject& rObj); - void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj); + void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); - void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj); + void Mirror(const Point& rRef1, const Point& rRef2, tools::Long nAngle, const SdrObject* pObj); void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 29bb9336838a..e5cc1379ab94 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -143,7 +143,7 @@ protected: SdrHdlKind eKind; - long nRotationAngle; // turn handle or mousepointer + tools::Long nRotationAngle; // turn handle or mousepointer sal_uInt32 nObjHdlNum; // required by MarkView sal_uInt32 nPolyNum; // Polygonpoint sal_uInt32 nPPntNum; // Point number of the polygon @@ -207,7 +207,7 @@ public: void SetSelected(bool bJa=true); void Set1PixMore(bool bJa=true); - void SetRotationAngle(long n); + void SetRotationAngle(tools::Long n); bool IsCornerHdl() const { return eKind==SdrHdlKind::UpperLeft || eKind==SdrHdlKind::UpperRight || eKind==SdrHdlKind::LowerLeft || eKind==SdrHdlKind::LowerRight; } bool IsVertexHdl() const { return eKind==SdrHdlKind::Upper || eKind==SdrHdlKind::Lower || eKind==SdrHdlKind::Left || eKind==SdrHdlKind::Right; } diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index c35b259a51dc..6f4581d1618a 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -232,10 +232,10 @@ public: // including PresObj's in higher derivations virtual void adaptSizeAndBorderForAllPages( const Size& rNewSize, - long nLeft = 0, - long nRight = 0, - long nUpper = 0, - long nLower = 0); + tools::Long nLeft = 0, + tools::Long nRight = 0, + tools::Long nUpper = 0, + tools::Long nLower = 0); protected: virtual css::uno::Reference< css::uno::XInterface > createUnoModel(); @@ -384,8 +384,8 @@ public: void SetUIUnit(FieldUnit eUnit, const Fraction& rScale); static OUString GetUnitString(FieldUnit eUnit); - OUString GetMetricString(long nVal, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; - static OUString GetAngleString(long nAngle); + OUString GetMetricString(tools::Long nVal, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; + static OUString GetAngleString(tools::Long nAngle); static OUString GetPercentString(const Fraction& rVal); // RecalcPageNums is ordinarily only called by the Page. diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index dd1a86d24bca..040302faa4c0 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -168,16 +168,16 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual void Move(const Size& rSiz) override; - virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void SetSnapRect(const tools::Rectangle& rRect) override; virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index cb98d67a2891..bb09c6856d3e 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -589,16 +589,16 @@ public: virtual void NbcMove (const Size& rSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcCrop (const basegfx::B2DPoint& rRef, double fxFact, double fyFact); - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs); + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear); + virtual void NbcShear (const Point& rRef, tools::Long nAngle, double tn, bool bVShear); virtual void Move (const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); virtual void Crop (const basegfx::B2DPoint& rRef, double fxFact, double fyFact); - virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs); + virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear (const Point& rRef, long nAngle, double tn, bool bVShear); + virtual void Shear (const Point& rRef, tools::Long nAngle, double tn, bool bVShear); /// The relative position of a SdrObject is the distance of the upper /// left corner of the logic bounding rectangle (SnapRect) to the anchor. @@ -631,8 +631,8 @@ public: virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ); // rotation and shear angle - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; + virtual tools::Long GetRotateAngle() const; + virtual tools::Long GetShearAngle(bool bVertical = false) const; /// snap to special points of an Object (polygon points, center of circle) virtual sal_uInt32 GetSnapPointCount() const; @@ -729,7 +729,7 @@ public: // to be set temporarily when transforming related object(?) void SetGlueReallyAbsolute(bool bOn); - void NbcRotateGluePoints(const Point& rRef, long nAngle, double sn, double cs); + void NbcRotateGluePoints(const Point& rRef, tools::Long nAngle, double sn, double cs); void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2); void NbcShearGluePoints (const Point& rRef, double tn, bool bVShear); @@ -964,7 +964,7 @@ protected: void ImpForcePlusData(); - OUString GetMetrStr(long nVal) const; + OUString GetMetrStr(tools::Long nVal) const; /// A derived class must override these 3 methods if it has own geometric /// data that must be saved for Undo. diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 105850fa3f84..dc0956388ed1 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -32,8 +32,8 @@ namespace sdr::properties { class SdrCircObjGeoData final : public SdrTextObjGeoData { public: - long nStartAngle; - long nEndAngle; + tools::Long nStartAngle; + tools::Long nEndAngle; }; enum class SdrCircKind { Full, Section, Cut, Arc }; @@ -51,10 +51,10 @@ private: virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; SdrCircKind meCircleKind; - long nStartAngle; - long nEndAngle; + tools::Long nStartAngle; + tools::Long nEndAngle; - SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrCircKind eKind, const tools::Rectangle& rRect1, long nStart, long nEnd) const; + SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrCircKind eKind, const tools::Rectangle& rRect1, tools::Long nStart, tools::Long nEnd) const; SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat); SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool @@ -86,8 +86,8 @@ public: SdrModel& rSdrModel, SdrCircKind eNewKind, const tools::Rectangle& rRect, - long nNewStartAngle, - long nNewEndWink); + tools::Long nNewStartAngle, + tools::Long nNewEndWink); SdrCircKind GetCircleKind() const { return meCircleKind; } @@ -129,7 +129,7 @@ public: virtual void NbcMove(const Size& aSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear (const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override; private: @@ -137,8 +137,8 @@ private: virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; virtual void RestGeoData(const SdrObjGeoData& rGeo) override; public: - long GetStartAngle() const { return nStartAngle; } - long GetEndAngle() const { return nEndAngle; } + tools::Long GetStartAngle() const { return nStartAngle; } + tools::Long GetEndAngle() const { return nEndAngle; } }; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 2320091ab1a1..d1f9558a0648 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -84,8 +84,8 @@ public: Point aMiddleLine; // Following values are set by ImpCalcEdgeTrack - long nAngle1; // exit angle at Obj1 - long nAngle2; // exit angle at Obj2 + tools::Long nAngle1; // exit angle at Obj1 + tools::Long nAngle2; // exit angle at Obj2 sal_uInt16 nObj1Lines; // 1..3 sal_uInt16 nObj2Lines; // 1..3 sal_uInt16 nMiddleLine; // 0xFFFF=none, otherwise point number of the beginning of the line @@ -102,8 +102,8 @@ public: Point& ImpGetLineOffsetPoint(SdrEdgeLineCode eLineCode); sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - void ImpSetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); - long ImpGetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + void ImpSetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP, tools::Long nVal); + tools::Long ImpGetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; @@ -171,11 +171,11 @@ public: protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); + static XPolygon ImpCalcObjToCenter(const Point& rStPt, tools::Long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); void ImpRecalcEdgeTrack(); // recalculation of the connection track XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; - XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, - const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, + XPolygon ImpCalcEdgeTrack(const Point& rPt1, tools::Long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, + const Point& rPt2, tools::Long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); static SdrEscapeDirection ImpCalcEscAngle(SdrObject const * pObj, const Point& aPt2); @@ -242,9 +242,9 @@ public: virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; // #i54102# added rotate, mirror and shear support - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; // #102344# Added missing implementation virtual void NbcSetAnchorPos(const Point& rPnt) override; diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 2f71c59361b3..7c44fa6afb4f 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -79,14 +79,14 @@ public: virtual bool BegCreate(SdrDragStat& rStat) override; - virtual long GetRotateAngle() const override; - virtual long GetShearAngle(bool bVertical = false) const override; + virtual tools::Long GetRotateAngle() const override; + virtual tools::Long GetShearAngle(bool bVertical = false) const override; virtual void Move(const Size& rSiz) override; virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; - virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void Mirror(const Point& rRef1, const Point& rRef2) override; - virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void SetAnchorPos(const Point& rPnt) override; virtual void SetRelativePos(const Point& rPnt) override; virtual void SetSnapRect(const tools::Rectangle& rRect) override; @@ -94,9 +94,9 @@ public: virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void NbcSetAnchorPos(const Point& rPnt) override; virtual void NbcSetRelativePos(const Point& rPnt) override; virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 6384d74882fb..3591a27c0d69 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -113,10 +113,10 @@ public: virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual long GetRotateAngle() const override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; + virtual tools::Long GetRotateAngle() const override; virtual void RecalcSnapRect() override; virtual sal_uInt32 GetSnapPointCount() const override; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 1436eca520ed..6c8de0e5ae0b 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -108,9 +108,9 @@ public: virtual void NbcMove(const Size& aSize) override; virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; - virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos) override; + virtual void NbcRotate(const Point& rRefPnt, tools::Long nAngle, double fSin, double fCos) override; virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2) override; - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear) override; + virtual void NbcShear(const Point& rRefPnt, tools::Long nAngle, double fTan, bool bVShear) override; virtual sal_uInt32 GetSnapPointCount() const override; virtual Point GetSnapPoint(sal_uInt32 i) const override; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 98929002b6d2..92c4e1d665cb 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -50,7 +50,7 @@ protected: std::unique_ptr<XPolygon> mpXPoly; protected: - XPolygon ImpCalcXPoly(const tools::Rectangle& rRect1, long nRad1) const; + XPolygon ImpCalcXPoly(const tools::Rectangle& rRect1, tools::Long nRad1) const; void SetXPolyDirty(); /// Subclasses should override RecalcXPoly() by creating an XPolygon @@ -112,9 +112,9 @@ public: virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index fd69b4a681b7..21a25330e913 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -293,7 +293,7 @@ protected: virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; virtual void RestGeoData(const SdrObjGeoData& rGeo) override; - void NbcSetEckenradius(long nRad); + void NbcSetEckenradius(tools::Long nRad); // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities @@ -399,13 +399,13 @@ public: const GeoStat& GetGeoStat() const { return aGeo; } // get corner radius - long GetEckenradius() const; + tools::Long GetEckenradius() const; virtual bool IsAutoGrowHeight() const; - long GetMinTextFrameHeight() const; - long GetMaxTextFrameHeight() const; + tools::Long GetMinTextFrameHeight() const; + tools::Long GetMaxTextFrameHeight() const; virtual bool IsAutoGrowWidth() const; - long GetMinTextFrameWidth() const; - long GetMaxTextFrameWidth() const; + tools::Long GetMinTextFrameWidth() const; + tools::Long GetMaxTextFrameWidth() const; css::drawing::TextFitToSizeType GetFitToSize() const; const tools::Rectangle &GetGeoRect() const; @@ -426,13 +426,13 @@ public: SdrTextVertAdjust GetTextVerticalAdjust() const; /** Left inner spacing to borders */ - long GetTextLeftDistance() const; + tools::Long GetTextLeftDistance() const; /** Right inner spacing to borders */ - long GetTextRightDistance() const; + tools::Long GetTextRightDistance() const; /** Top inner spacing to borders */ - long GetTextUpperDistance() const; + tools::Long GetTextUpperDistance() const; /** Bottom inner spacing to borders */ - long GetTextLowerDistance() const; + tools::Long GetTextLowerDistance() const; SdrTextAniKind GetTextAniKind() const; SdrTextAniDirection GetTextAniDirection() const; @@ -454,8 +454,8 @@ public: virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual const tools::Rectangle& GetLogicRect() const override; - virtual long GetRotateAngle() const override; - virtual long GetShearAngle(bool bVertical = false) const override; + virtual tools::Long GetRotateAngle() const override; + virtual tools::Long GetShearAngle(bool bVertical = false) const override; virtual sal_uInt32 GetSnapPointCount() const override; virtual Point GetSnapPoint(sal_uInt32 i) const override; @@ -478,9 +478,9 @@ public: virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual bool HasTextEdit() const override; // returns true if TextEditMode started diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 5c6c68d87601..bede9e4356eb 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -100,15 +100,15 @@ public: virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void Move(const Size& rSiz) override; virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; - virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void Mirror(const Point& rRef1, const Point& rRef2) override; - virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void RecalcSnapRect() override; virtual const tools::Rectangle& GetSnapRect() const override; @@ -119,8 +119,8 @@ public: virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; - virtual long GetRotateAngle() const override; - virtual long GetShearAngle(bool bVertical = false) const override; + virtual tools::Long GetRotateAngle() const override; + virtual tools::Long GetShearAngle(bool bVertical = false) const override; virtual sal_uInt32 GetSnapPointCount() const override; virtual Point GetSnapPoint(sal_uInt32 i) const override; diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 171baf536a8f..538e1012bf49 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -66,7 +66,7 @@ public: void MoveMarkedPoints(const Size& rSiz); void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - void RotateMarkedPoints(const Point& rRef, long nAngle); + void RotateMarkedPoints(const Point& rRef, tools::Long nAngle); // This probably creates an arbitrary amount of new objects void RipUpAtMarkedPoints() override; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 89dc40d6a8cc..19305837bcc4 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -104,8 +104,8 @@ protected: Fraction aSnapWdtY; sal_uInt16 nMagnSizPix; - long nSnapAngle; - long nEliminatePolyPointLimitAngle; + tools::Long nSnapAngle; + tools::Long nEliminatePolyPointLimitAngle; SdrCrookMode eCrookMode; @@ -158,7 +158,7 @@ public: // SdrSnap::YSNAPPED or SdrSnap::XYSNAPPED SdrSnap SnapPos(Point& rPnt, const SdrPageView* pPV) const; Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const; - void CheckSnap(const Point& rPt, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; + void CheckSnap(const Point& rPt, tools::Long& nBestXSnap, tools::Long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; // All attitudes to snap are persistent. bool IsSnapEnabled() const { return bSnapEnab; } @@ -220,8 +220,8 @@ public: // persistent. void SetAngleSnapEnabled(bool bOn) { bAngleSnapEnab=bOn; } bool IsAngleSnapEnabled() const { return bAngleSnapEnab; } - void SetSnapAngle(long nAngle) { nSnapAngle=nAngle; } - long GetSnapAngle() const { return nSnapAngle; } + void SetSnapAngle(tools::Long nAngle) { nSnapAngle=nAngle; } + tools::Long GetSnapAngle() const { return nSnapAngle; } // different effects from Ortho (depending on the context): // - Create @@ -280,8 +280,8 @@ public: // if its adjacent lines are almost a solid line. void SetEliminatePolyPoints(bool bOn) { bEliminatePolyPoints=bOn; } bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; } - void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; } - long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } + void SetEliminatePolyPointLimitAngle(tools::Long nAngle) { nEliminatePolyPointLimitAngle=nAngle; } + tools::Long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; #endif // INCLUDED_SVX_SVDSNPV_HXX diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 9e5bca9fdf0e..e510f6bc4140 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -113,8 +113,8 @@ inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract, inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs) { - long dx=rPnt.X()-rRef.X(); - long dy=rPnt.Y()-rRef.Y(); + tools::Long dx=rPnt.X()-rRef.X(); + tools::Long dy=rPnt.Y()-rRef.Y(); rPnt.setX(FRound(rRef.X()+dx*cs+dy*sn)); rPnt.setY(FRound(rRef.Y()+dy*cs-dx*sn)); } @@ -136,11 +136,11 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad { double nAngle; if (bVertical) { - long dy=rPnt.Y()-rCenter.Y(); + tools::Long dy=rPnt.Y()-rCenter.Y(); nAngle=static_cast<double>(dy)/static_cast<double>(rRad.Y()); rPnt.setY(rCenter.Y()); } else { - long dx=rCenter.X()-rPnt.X(); + tools::Long dx=rCenter.X()-rPnt.X(); nAngle=static_cast<double>(dx)/static_cast<double>(rRad.X()); rPnt.setX(rCenter.X()); } @@ -159,19 +159,19 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad * @return the returned value is in the range of -180.00..179.99 deg * and is in 1/100 deg units */ -SVXCORE_DLLPUBLIC long GetAngle(const Point& rPnt); +SVXCORE_DLLPUBLIC tools::Long GetAngle(const Point& rPnt); -long NormAngle18000(long a); /// Normalize angle to -180.00..179.99 +tools::Long NormAngle18000(tools::Long a); /// Normalize angle to -180.00..179.99 -SVXCORE_DLLPUBLIC long NormAngle36000(long a); /// Normalize angle to 0.00..359.99 +SVXCORE_DLLPUBLIC tools::Long NormAngle36000(tools::Long a); /// Normalize angle to 0.00..359.99 -sal_uInt16 GetAngleSector(long nAngle); /// Determine sector within the cartesian coordinate system +sal_uInt16 GetAngleSector(tools::Long nAngle); /// Determine sector within the cartesian coordinate system /** * Calculates the length of (0,0) via a^2 + b^2 = c^2 * In order to avoid overflows, we ignore some decimal places. */ -long GetLen(const Point& rPnt); +tools::Long GetLen(const Point& rPnt); /** * The transformation of a rectangle into a polygon, by @@ -213,8 +213,8 @@ long GetLen(const Point& rPnt); class GeoStat { // Geometric state for a rect public: - long nRotationAngle; - long nShearAngle; + tools::Long nRotationAngle; + tools::Long nShearAngle; double nTan; // tan(nShearAngle) double nSin; // sin(nRotationAngle) double nCos; // cos(nRotationAngle) @@ -232,7 +232,7 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); // Multiplication and subsequent division // Calculation and intermediate values are in BigInt -SVXCORE_DLLPUBLIC long BigMulDiv(long nVal, long nMul, long nDiv); +SVXCORE_DLLPUBLIC tools::Long BigMulDiv(tools::Long nVal, tools::Long nMul, tools::Long nDiv); class FrPair { Fraction aX; @@ -240,8 +240,8 @@ class FrPair { public: FrPair(const Fraction& rBoth) : aX(rBoth),aY(rBoth) {} FrPair(const Fraction& rX, const Fraction& rY) : aX(rX),aY(rY) {} - FrPair(long nMul, long nDiv) : aX(nMul,nDiv),aY(nMul,nDiv) {} - FrPair(long xMul, long xDiv, long yMul, long yDiv): aX(xMul,xDiv),aY(yMul,yDiv) {} + FrPair(tools::Long nMul, tools::Long nDiv) : aX(nMul,nDiv),aY(nMul,nDiv) {} + FrPair(tools::Long xMul, tools::Long xDiv, tools::Long yMul, tools::Long yDiv): aX(xMul,xDiv),aY(yMul,yDiv) {} const Fraction& X() const { return aX; } const Fraction& Y() const { return aY; } Fraction& X() { return aX; } @@ -273,8 +273,8 @@ inline bool IsInch(FieldUnit eU) { } class SVXCORE_DLLPUBLIC SdrFormatter { - long nMul_; - long nDiv_; + tools::Long nMul_; + tools::Long nDiv_; short nComma_; bool bDirty; MapUnit eSrcMU; @@ -291,7 +291,7 @@ public: , eDstMU(eDst) { } - OUString GetStr(long nVal) const; + OUString GetStr(tools::Long nVal) const; static OUString GetUnitStr(MapUnit eUnit); static OUString GetUnitStr(FieldUnit eUnit); }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index df6f6f106c47..9d0b322a4374 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -146,8 +146,8 @@ class AbstractFmInputRecordNoDialog :public VclAbstractDialog protected: virtual ~AbstractFmInputRecordNoDialog() override = default; public: - virtual void SetValue(long dNew) = 0; - virtual long GetValue() const = 0; + virtual void SetValue(tools::Long dNew) = 0; + virtual tools::Long GetValue() const = 0; }; class AbstractSvxNewDictionaryDialog :public VclAbstractDialog @@ -287,7 +287,7 @@ protected: public: virtual bool IsHorizontal() const = 0; virtual bool IsProportional() const = 0; - virtual long GetCount() const = 0; + virtual tools::Long GetCount() const = 0; virtual void SetSplitVerticalByDefault() = 0; }; @@ -440,7 +440,7 @@ public: virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel )=0; - virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) = 0; + virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, tools::Long nMaxVertical) = 0; virtual std::shared_ptr<SvxAbstractNewTableDialog> CreateSvxNewTableDialog(weld::Window* pParent) = 0; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 5f946d2aa14f..cb36eb75d1da 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -67,7 +67,7 @@ public: class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: - SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} + SdrCaptionEscRelItem(tools::Long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; virtual SdrCaptionEscRelItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -86,7 +86,7 @@ public: class SdrCaptionEscAbsItem: public SdrMetricItem { public: - SdrCaptionEscAbsItem(long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} + SdrCaptionEscAbsItem(tools::Long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} virtual SdrCaptionEscAbsItem* Clone(SfxItemPool*) const override { return new SdrCaptionEscAbsItem(*this); diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx index e39fff4446aa..64e7337b36ef 100644 --- a/include/svx/sxcgitm.hxx +++ b/include/svx/sxcgitm.hxx @@ -28,7 +28,7 @@ */ class SdrCaptionGapItem final : public SdrMetricItem { public: - SdrCaptionGapItem(long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} + SdrCaptionGapItem(tools::Long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} virtual SdrCaptionGapItem* Clone(SfxItemPool*) const override { return new SdrCaptionGapItem(*this); diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx index 27bc07a1853f..cde519accd36 100644 --- a/include/svx/sxciaitm.hxx +++ b/include/svx/sxciaitm.hxx @@ -22,11 +22,11 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -inline SdrAngleItem makeSdrCircStartAngleItem(long nAngle) { +inline SdrAngleItem makeSdrCircStartAngleItem(tools::Long nAngle) { return SdrAngleItem(SDRATTR_CIRCSTARTANGLE, nAngle); } -inline SdrAngleItem makeSdrCircEndAngleItem(long nAngle) { +inline SdrAngleItem makeSdrCircEndAngleItem(tools::Long nAngle) { return SdrAngleItem(SDRATTR_CIRCENDANGLE, nAngle); } diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 00b4903bef25..f73838f4eba0 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -30,7 +30,7 @@ */ class SVXCORE_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: - SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} + SdrCaptionLineLenItem(tools::Long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; virtual SdrCaptionLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index a1efd2c9185f..34557d42d850 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -31,15 +31,15 @@ public: } }; -inline SdrMetricItem makeSdrEdgeLine1DeltaItem(long nVal) { +inline SdrMetricItem makeSdrEdgeLine1DeltaItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_EDGELINE1DELTA, nVal); } -inline SdrMetricItem makeSdrEdgeLine2DeltaItem(long nVal) { +inline SdrMetricItem makeSdrEdgeLine2DeltaItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_EDGELINE2DELTA, nVal); } -inline SdrMetricItem makeSdrEdgeLine3DeltaItem(long nVal) { +inline SdrMetricItem makeSdrEdgeLine3DeltaItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_EDGELINE3DELTA, nVal); } diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index c34dfed30887..82ff4b7c348e 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -25,7 +25,7 @@ class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: - SdrEdgeNode1HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} + SdrEdgeNode1HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -33,7 +33,7 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: - SdrEdgeNode1VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} + SdrEdgeNode1VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -41,7 +41,7 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: - SdrEdgeNode2HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} + SdrEdgeNode2HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -49,7 +49,7 @@ public: class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: - SdrEdgeNode2VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} + SdrEdgeNode2VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -57,13 +57,13 @@ public: class SdrEdgeNode1GlueDistItem: public SdrMetricItem { public: - SdrEdgeNode1GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST,nVal) {} + SdrEdgeNode1GlueDistItem(tools::Long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST,nVal) {} virtual SdrEdgeNode1GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode2GlueDistItem: public SdrMetricItem { public: - SdrEdgeNode2GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST,nVal) {} + SdrEdgeNode2GlueDistItem(tools::Long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST,nVal) {} virtual SdrEdgeNode2GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx index b2d45fa50a26..fc18d53e4683 100644 --- a/include/svx/sxmlhitm.hxx +++ b/include/svx/sxmlhitm.hxx @@ -36,27 +36,27 @@ // gab between dimension line and document reference edge (norm=8mm) // can be dragged on the handles of the arrowheads -inline SdrMetricItem makeSdrMeasureLineDistItem(long nVal) { +inline SdrMetricItem makeSdrMeasureLineDistItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_MEASURELINEDIST, nVal); } // overhang of dimension help line to dimension line (norm=2mm) -inline SdrMetricItem makeSdrMeasureHelplineOverhangItem(long nVal) { +inline SdrMetricItem makeSdrMeasureHelplineOverhangItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_MEASUREHELPLINEOVERHANG, nVal); } // gab between dimension line and document reference edge // dimension help lines shell not touch the object -inline SdrMetricItem makeSdrMeasureHelplineDistItem(long nVal) { +inline SdrMetricItem makeSdrMeasureHelplineDistItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_MEASUREHELPLINEDIST, nVal); } // overlength of the help lines can be dragged at the round handles, // which are under the reference points by default -inline SdrMetricItem makeSdrMeasureHelpline1LenItem(long nVal) { +inline SdrMetricItem makeSdrMeasureHelpline1LenItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_MEASUREHELPLINE1LEN, nVal); } -inline SdrMetricItem makeSdrMeasureHelpline2LenItem(long nVal) { +inline SdrMetricItem makeSdrMeasureHelpline2LenItem(tools::Long nVal) { return SdrMetricItem(SDRATTR_MEASUREHELPLINE2LEN, nVal); } diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index 4701c037f518..6591ff2eb40a 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -42,7 +42,7 @@ public: //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.) class SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: - SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} + SdrMeasureTextFixedAngleItem(tools::Long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; virtual SdrMeasureTextFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index d5c9769a3901..76611d3bd56a 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -26,7 +26,7 @@ class SVXCORE_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem { public: - XFillBmpSizeXItem( long nSizeX = 0 ); + XFillBmpSizeXItem( tools::Long nSizeX = 0 ); SVX_DLLPRIVATE virtual XFillBmpSizeXItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -42,7 +42,7 @@ public: class SVXCORE_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem { public: - XFillBmpSizeYItem( long nSizeY = 0 ); + XFillBmpSizeYItem( tools::Long nSizeY = 0 ); SVX_DLLPRIVATE virtual XFillBmpSizeYItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index b3dcb2b04df3..1ef7d4e11d55 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -50,7 +50,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; virtual bool HasMetrics() const override; - virtual void ScaleMetrics(long nMul, long nDiv) override; + virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; const XHatch& GetHatchValue() const { return aHatch;} // GetValue -> GetHatchValue diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 516d219a009a..d77323e78951 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -33,7 +33,7 @@ class SVXCORE_DLLPUBLIC XFormTextDistanceItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); - XFormTextDistanceItem(long nDist = 0); + XFormTextDistanceItem(tools::Long nDist = 0); virtual XFormTextDistanceItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 1a3d7c19b7d6..2e7cbe66350e 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -34,7 +34,7 @@ class SVXCORE_DLLPUBLIC XFormTextShadowXValItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); - XFormTextShadowXValItem(long nVal = 0); + XFormTextShadowXValItem(tools::Long nVal = 0); virtual XFormTextShadowXValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; @@ -48,7 +48,7 @@ class SVXCORE_DLLPUBLIC XFormTextShadowYValItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); - XFormTextShadowYValItem(long nVal = 0); + XFormTextShadowYValItem(tools::Long nVal = 0); virtual XFormTextShadowYValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index 51e03e7905f6..bc9243968295 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -34,7 +34,7 @@ class SVXCORE_DLLPUBLIC XFormTextStartItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); - XFormTextStartItem(long nStart = 0); + XFormTextStartItem(tools::Long nStart = 0); virtual XFormTextStartItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx index 0ef791c64caf..91dea6e6c1e2 100644 --- a/include/svx/xhatch.hxx +++ b/include/svx/xhatch.hxx @@ -22,6 +22,7 @@ #include <tools/color.hxx> #include <tools/degree.hxx> +#include <tools/long.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/drawing/HatchStyle.hpp> @@ -32,24 +33,24 @@ class SVXCORE_DLLPUBLIC XHatch final { css::drawing::HatchStyle eStyle; Color aColor; - long nDistance; + tools::Long nDistance; Degree10 nAngle; public: XHatch() : eStyle(css::drawing::HatchStyle_SINGLE), nDistance(0), nAngle(0) {} XHatch(const Color& rCol, css::drawing::HatchStyle eStyle = css::drawing::HatchStyle_SINGLE, - long nDistance = 20, Degree10 nAngle = Degree10(0)); + tools::Long nDistance = 20, Degree10 nAngle = Degree10(0)); bool operator==(const XHatch& rHatch) const; void SetHatchStyle(css::drawing::HatchStyle eNewStyle) { eStyle = eNewStyle; } void SetColor(const Color& rColor) { aColor = rColor; } - void SetDistance(long nNewDistance) { nDistance = nNewDistance; } + void SetDistance(tools::Long nNewDistance) { nDistance = nNewDistance; } void SetAngle(Degree10 nNewAngle) { nAngle = nNewAngle; } css::drawing::HatchStyle GetHatchStyle() const { return eStyle; } const Color& GetColor() const { return aColor; } - long GetDistance() const { return nDistance; } + tools::Long GetDistance() const { return nDistance; } Degree10 GetAngle() const { return nAngle; } }; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 4998b1f03fc1..c9ec5d711de5 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -52,7 +52,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; virtual bool HasMetrics() const override; - virtual void ScaleMetrics(long nMul, long nDiv) override; + virtual void ScaleMetrics(tools::Long nMul, tools::Long nDiv) override; const XDash& GetDashValue() const { return aDash;} void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 1e9ef4a2e333..a049794f3ba0 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -31,7 +31,7 @@ class SVXCORE_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem { public: - XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); + XLineEndWidthItem(tools::Long nWidth = LINE_END_WIDTH_DEFAULT); virtual XLineEndWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 3094c3297695..c6803e3719a7 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -30,7 +30,7 @@ class SVXCORE_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem { public: - XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); + XLineStartWidthItem(tools::Long nWidth = LINE_START_WIDTH_DEFAULT); virtual XLineStartWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 65cd9ee8ead3..21df71b8a713 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -29,7 +29,7 @@ class SVXCORE_DLLPUBLIC XLineWidthItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); - XLineWidthItem(long nWidth = 0); + XLineWidthItem(tools::Long nWidth = 0); virtual XLineWidthItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index e872b205da85..7f50a4c76281 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -47,8 +47,8 @@ class SVXCORE_DLLPUBLIC XPolygon final // auxiliary functions for Bezier conversion void SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT); - void GenBezArc(const Point& rCenter, long nRx, long nRy, - long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, + void GenBezArc(const Point& rCenter, tools::Long nRx, tools::Long nRy, + tools::Long nXHdl, tools::Long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nQuad, sal_uInt16 nFirst); static bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2); @@ -57,8 +57,8 @@ public: XPolygon( const XPolygon& ); XPolygon( XPolygon&& ); XPolygon( const tools::Polygon& rPoly ); - XPolygon( const tools::Rectangle& rRect, long nRx = 0, long nRy = 0 ); - XPolygon( const Point& rCenter, long nRx, long nRy, + XPolygon( const tools::Rectangle& rRect, tools::Long nRx = 0, tools::Long nRy = 0 ); + XPolygon( const Point& rCenter, tools::Long nRx, tools::Long nRy, sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, bool bClose = true ); @@ -72,7 +72,7 @@ public: void Insert( sal_uInt16 nPos, const Point& rPt, PolyFlags eFlags ); void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); - void Move( long nHorzMove, long nVertMove ); + void Move( tools::Long nHorzMove, tools::Long nVertMove ); tools::Rectangle GetBoundRect() const; const Point& operator[]( sal_uInt16 nPos ) const; diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index db1f1a7e658c..d7a16f4f01ff 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -164,8 +164,8 @@ protected: bool mbEmbedInDocument; XPropertyList(XPropertyListType t, const OUString& rPath, const OUString& rReferer); - bool isValidIdx(long nIndex) const; - virtual BitmapEx CreateBitmapForUI(long nIndex) = 0; + bool isValidIdx(tools::Long nIndex) const; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) = 0; public: XPropertyList(const XPropertyList&) = delete; @@ -173,15 +173,15 @@ public: virtual ~XPropertyList() override; XPropertyListType Type() const { return meType; } - long Count() const; + tools::Long Count() const; - void Insert(std::unique_ptr<XPropertyEntry> pEntry, long nIndex = std::numeric_limits<long>::max()); - void Replace(std::unique_ptr<XPropertyEntry> pEntry, long nIndex); - void Remove(long nIndex); + void Insert(std::unique_ptr<XPropertyEntry> pEntry, tools::Long nIndex = std::numeric_limits<long>::max()); + void Replace(std::unique_ptr<XPropertyEntry> pEntry, tools::Long nIndex); + void Remove(tools::Long nIndex); - XPropertyEntry* Get(long nIndex) const; - long GetIndex(const OUString& rName) const; - BitmapEx GetUiBitmap(long nIndex) const; + XPropertyEntry* Get(tools::Long nIndex) const; + tools::Long GetIndex(const OUString& rName) const; + BitmapEx GetUiBitmap(tools::Long nIndex) const; const OUString& GetName() const { return maName; } void SetName(const OUString& rString); @@ -237,15 +237,15 @@ public: class SVXCORE_DLLPUBLIC XColorList : public XPropertyList { protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XColorList(const OUString& rPath, const OUString& rReferer) : XPropertyList(XPropertyListType::Color, rPath, rReferer) {} - void Replace(long nIndex, std::unique_ptr<XColorEntry> pEntry); - XColorEntry* GetColor(long nIndex) const; - long GetIndexOfColor( const Color& rColor) const; + void Replace(tools::Long nIndex, std::unique_ptr<XColorEntry> pEntry); + XColorEntry* GetColor(tools::Long nIndex) const; + tools::Long GetIndexOfColor( const Color& rColor) const; virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -256,13 +256,13 @@ public: class SVXCORE_DLLPUBLIC XLineEndList : public XPropertyList { protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XLineEndList(const OUString& rPath, const OUString& rReferer); virtual ~XLineEndList() override; - XLineEndEntry* GetLineEnd(long nIndex) const; + XLineEndEntry* GetLineEnd(tools::Long nIndex) const; virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -277,14 +277,14 @@ private: protected: static BitmapEx ImpCreateBitmapForXDash(const XDash* pDash); - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XDashList(const OUString& rPath, const OUString& rReferer); virtual ~XDashList() override; - void Replace(std::unique_ptr<XDashEntry> pEntry, long nIndex); - XDashEntry* GetDash(long nIndex) const; + void Replace(std::unique_ptr<XDashEntry> pEntry, tools::Long nIndex); + XDashEntry* GetDash(tools::Long nIndex) const; virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -303,16 +303,16 @@ public: class SVXCORE_DLLPUBLIC XHatchList : public XPropertyList { private: - BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; + BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const; protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XHatchList(const OUString& rPath, const OUString& rReferer); virtual ~XHatchList() override; - void Replace(std::unique_ptr<XHatchEntry> pEntry, long nIndex); - XHatchEntry* GetHatch(long nIndex) const; - BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); + void Replace(std::unique_ptr<XHatchEntry> pEntry, tools::Long nIndex); + XHatchEntry* GetHatch(tools::Long nIndex) const; + BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -321,18 +321,18 @@ public: class SVXCORE_DLLPUBLIC XGradientList : public XPropertyList { private: - BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; + BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const; protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XGradientList(const OUString& rPath, const OUString& rReferer); virtual ~XGradientList() override; - void Replace(std::unique_ptr<XGradientEntry> pEntry, long nIndex); - XGradientEntry* GetGradient(long nIndex) const; - BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); + void Replace(std::unique_ptr<XGradientEntry> pEntry, tools::Long nIndex); + XGradientEntry* GetGradient(tools::Long nIndex) const; + BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -341,17 +341,17 @@ public: class SVXCORE_DLLPUBLIC XBitmapList : public XPropertyList { private: - BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; + BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const; protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XBitmapList(const OUString& rPath, const OUString& rReferer) : XPropertyList(XPropertyListType::Bitmap, rPath, rReferer) {} - XBitmapEntry* GetBitmap(long nIndex) const; - BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); + XBitmapEntry* GetBitmap(tools::Long nIndex) const; + BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -360,17 +360,17 @@ public: class SVXCORE_DLLPUBLIC XPatternList : public XPropertyList { private: - BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; + BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const; protected: - virtual BitmapEx CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XPatternList(const OUString& rPath, const OUString& rReferer) : XPropertyList(XPropertyListType::Pattern, rPath, rReferer) {} - XBitmapEntry* GetBitmap(long nIndex) const; - BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); + XBitmapEntry* GetBitmap(tools::Long nIndex) const; + BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx index 41e9e5abdc5f..dd13029a548a 100644 --- a/include/svx/zoomsliderctrl.hxx +++ b/include/svx/zoomsliderctrl.hxx @@ -31,8 +31,8 @@ private: struct SvxZoomSliderControl_Impl; std::unique_ptr<SvxZoomSliderControl_Impl> mxImpl; - sal_uInt16 Offset2Zoom( long nOffset ) const; - long Zoom2Offset( sal_uInt16 nZoom ) const; + sal_uInt16 Offset2Zoom( tools::Long nOffset ) const; + tools::Long Zoom2Offset( sal_uInt16 nZoom ) const; void repaintAndExecute(); void forceRepaint() const; diff --git a/include/test/sheet/xsheetannotations.hxx b/include/test/sheet/xsheetannotations.hxx index d1cd65ea4b09..f9b92968ffae 100644 --- a/include/test/sheet/xsheetannotations.hxx +++ b/include/test/sheet/xsheetannotations.hxx @@ -16,6 +16,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> +#include <tools/long.hxx> namespace apitest { @@ -23,7 +24,7 @@ class OOO_DLLPUBLIC_TEST XSheetAnnotations { public: virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations(long nIndex) = 0; + virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations(tools::Long nIndex) = 0; // XSheetAnnotations void testIndex(); diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index a406a22bc5e8..ff6c74608614 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <osl/mutex.hxx> #include <toolkit/helper/listenermultiplexer.hxx> +#include <tools/long.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase9.hxx> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> @@ -42,7 +43,7 @@ struct UnoControlComponentInfos { bool bVisible; bool bEnable; - long nX, nY, nWidth, nHeight; + tools::Long nX, nY, nWidth, nHeight; sal_uInt16 nFlags; float nZoomX, nZoomY; |