include/vcl/metaact.hxx | 51 -------- include/vcl/settings.hxx | 2 include/vcl/toolkit/MenuButton.hxx | 2 include/vcl/toolkit/button.hxx | 1 sc/source/ui/inc/colrowba.hxx | 1 sc/source/ui/inc/hdrcont.hxx | 1 sc/source/ui/view/colrowba.cxx | 6 sc/source/ui/view/hdrcont.cxx | 5 vcl/inc/menutogglebutton.hxx | 3 vcl/source/app/settings.cxx | 6 vcl/source/control/MenuButton.cxx | 21 --- vcl/source/control/button.cxx | 14 -- vcl/source/gdi/metaact.cxx | 235 ------------------------------------- 13 files changed, 1 insertion(+), 347 deletions(-)
New commits: commit f61bfec15da4780ef528efe6b3af3b6bdcd2e1d7 Author: Noel Grandin <[email protected]> AuthorDate: Thu Sep 11 09:53:50 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Sep 11 11:53:07 2025 +0200 loplugin:unusedmethods Change-Id: Iffab96d7383925d706bfb92495c6340698d8aa62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190793 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 0ca9b1fe87ca..62655d770b49 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -104,7 +104,6 @@ private: Color maColor; public: - SAL_DLLPRIVATE MetaPixelAction(); MetaPixelAction(MetaPixelAction const &) = default; MetaPixelAction(MetaPixelAction &&) = default; MetaPixelAction & operator =(MetaPixelAction const &) = delete; // due to MetaAction @@ -130,7 +129,6 @@ private: Point maPt; public: - SAL_DLLPRIVATE MetaPointAction(); MetaPointAction(MetaPointAction const &) = default; MetaPointAction(MetaPointAction &&) = default; MetaPointAction & operator =(MetaPointAction const &) = delete; // due to MetaAction @@ -158,7 +156,6 @@ private: Point maEndPt; public: - SAL_DLLPRIVATE MetaLineAction(); MetaLineAction(MetaLineAction const &) = default; MetaLineAction(MetaLineAction &&) = default; MetaLineAction & operator =(MetaLineAction const &) = delete; // due to MetaAction @@ -188,7 +185,6 @@ private: tools::Rectangle maRect; public: - SAL_DLLPRIVATE MetaRectAction(); MetaRectAction(MetaRectAction const &) = default; MetaRectAction(MetaRectAction &&) = default; MetaRectAction & operator =(MetaRectAction const &) = delete; // due to MetaAction @@ -216,7 +212,6 @@ private: sal_uInt32 mnVertRound; public: - SAL_DLLPRIVATE MetaRoundRectAction(); MetaRoundRectAction(MetaRoundRectAction const &) = default; MetaRoundRectAction(MetaRoundRectAction &&) = default; MetaRoundRectAction & operator =(MetaRoundRectAction const &) = delete; // due to MetaAction @@ -245,7 +240,6 @@ private: tools::Rectangle maRect; public: - SAL_DLLPRIVATE MetaEllipseAction(); MetaEllipseAction(MetaEllipseAction const &) = default; MetaEllipseAction(MetaEllipseAction &&) = default; MetaEllipseAction & operator =(MetaEllipseAction const &) = delete; // due to MetaAction @@ -273,7 +267,6 @@ private: Point maEndPt; public: - SAL_DLLPRIVATE MetaArcAction(); MetaArcAction(MetaArcAction const &) = default; MetaArcAction(MetaArcAction &&) = default; MetaArcAction & operator =(MetaArcAction const &) = delete; // due to MetaAction @@ -304,7 +297,6 @@ private: Point maEndPt; public: - SAL_DLLPRIVATE MetaPieAction(); MetaPieAction(MetaPieAction const &) = default; MetaPieAction(MetaPieAction &&) = default; MetaPieAction & operator =(MetaPieAction const &) = delete; // due to MetaAction @@ -335,7 +327,6 @@ private: Point maEndPt; public: - SAL_DLLPRIVATE MetaChordAction(); MetaChordAction(MetaChordAction const &) = default; MetaChordAction(MetaChordAction &&) = default; MetaChordAction & operator =(MetaChordAction const &) = delete; // due to MetaAction @@ -365,7 +356,6 @@ private: tools::Polygon maPoly; public: - SAL_DLLPRIVATE MetaPolyLineAction(); MetaPolyLineAction(MetaPolyLineAction const &) = default; MetaPolyLineAction(MetaPolyLineAction &&) = default; MetaPolyLineAction & operator =(MetaPolyLineAction const &) = delete; // due to MetaAction @@ -393,7 +383,6 @@ private: tools::Polygon maPoly; public: - SAL_DLLPRIVATE MetaPolygonAction(); MetaPolygonAction(MetaPolygonAction const &) = default; MetaPolygonAction(MetaPolygonAction &&) = default; MetaPolygonAction & operator =(MetaPolygonAction const &) = delete; // due to MetaAction @@ -419,7 +408,6 @@ private: tools::PolyPolygon maPolyPoly; public: - SAL_DLLPRIVATE MetaPolyPolygonAction(); MetaPolyPolygonAction(MetaPolyPolygonAction const &) = default; MetaPolyPolygonAction(MetaPolyPolygonAction &&) = default; MetaPolyPolygonAction & operator =(MetaPolyPolygonAction const &) = delete; // due to MetaAction @@ -448,7 +436,6 @@ private: sal_Int32 mnLen; public: - MetaTextAction(); MetaTextAction(MetaTextAction const &) = default; MetaTextAction(MetaTextAction &&) = default; MetaTextAction & operator =(MetaTextAction const &) = delete; // due to MetaAction @@ -487,7 +474,6 @@ private: SAL_DLLPRIVATE virtual ~MetaTextArrayAction() override; public: - SAL_DLLPRIVATE MetaTextArrayAction(); SAL_DLLPRIVATE MetaTextArrayAction( const MetaTextArrayAction& rAction ); SAL_DLLPRIVATE MetaTextArrayAction( const Point& rStartPt, OUString aStr, KernArray rDXAry, @@ -531,7 +517,6 @@ private: sal_Int32 mnLen; public: - MetaStretchTextAction(); MetaStretchTextAction(MetaStretchTextAction const &) = default; MetaStretchTextAction(MetaStretchTextAction &&) = default; MetaStretchTextAction & operator =(MetaStretchTextAction const &) = delete; // due to MetaAction @@ -565,7 +550,6 @@ private: DrawTextFlags mnStyle; public: - MetaTextRectAction(); MetaTextRectAction(MetaTextRectAction const &) = default; MetaTextRectAction(MetaTextRectAction &&) = default; MetaTextRectAction & operator =(MetaTextRectAction const &) = delete; // due to MetaAction @@ -598,7 +582,6 @@ private: FontLineStyle meOverline; public: - MetaTextLineAction(); MetaTextLineAction(MetaTextLineAction const &) = default; MetaTextLineAction(MetaTextLineAction &&) = default; MetaTextLineAction & operator =(MetaTextLineAction const &) = delete; // due to MetaAction @@ -631,7 +614,6 @@ private: Point maPt; public: - SAL_DLLPRIVATE MetaBmpAction(); MetaBmpAction(MetaBmpAction const &) = default; MetaBmpAction(MetaBmpAction &&) = default; MetaBmpAction & operator =(MetaBmpAction const &) = delete; // due to MetaAction @@ -660,7 +642,6 @@ private: Size maSz; public: - SAL_DLLPRIVATE MetaBmpScaleAction(); MetaBmpScaleAction(MetaBmpScaleAction const &) = default; MetaBmpScaleAction(MetaBmpScaleAction &&) = default; MetaBmpScaleAction & operator =(MetaBmpScaleAction const &) = delete; // due to MetaAction @@ -693,7 +674,6 @@ private: Size maSrcSz; public: - SAL_DLLPRIVATE MetaBmpScalePartAction(); MetaBmpScalePartAction(MetaBmpScalePartAction const &) = default; MetaBmpScalePartAction(MetaBmpScalePartAction &&) = default; MetaBmpScalePartAction & operator =(MetaBmpScalePartAction const &) = delete; // due to MetaAction @@ -726,7 +706,6 @@ private: Point maPt; public: - SAL_DLLPRIVATE MetaBmpExAction(); MetaBmpExAction(MetaBmpExAction const &) = default; MetaBmpExAction(MetaBmpExAction &&) = default; MetaBmpExAction & operator =(MetaBmpExAction const &) = delete; // due to MetaAction @@ -756,7 +735,6 @@ private: Size maSz; public: - SAL_DLLPRIVATE MetaBmpExScaleAction(); MetaBmpExScaleAction(MetaBmpExScaleAction const &) = default; MetaBmpExScaleAction(MetaBmpExScaleAction &&) = default; MetaBmpExScaleAction & operator =(MetaBmpExScaleAction const &) = delete; // due to MetaAction @@ -790,7 +768,6 @@ private: Size maSrcSz; public: - SAL_DLLPRIVATE MetaBmpExScalePartAction(); MetaBmpExScalePartAction(MetaBmpExScalePartAction const &) = default; MetaBmpExScalePartAction(MetaBmpExScalePartAction &&) = default; MetaBmpExScalePartAction & operator =(MetaBmpExScalePartAction const &) = delete; // due to MetaAction @@ -825,7 +802,6 @@ private: Point maPt; public: - MetaMaskAction(); MetaMaskAction(MetaMaskAction const &) = default; MetaMaskAction(MetaMaskAction &&) = default; MetaMaskAction & operator =(MetaMaskAction const &) = delete; // due to MetaAction @@ -858,7 +834,6 @@ private: Size maSz; public: - MetaMaskScaleAction(); MetaMaskScaleAction(MetaMaskScaleAction const &) = default; MetaMaskScaleAction(MetaMaskScaleAction &&) = default; MetaMaskScaleAction & operator =(MetaMaskScaleAction const &) = delete; // due to MetaAction @@ -894,7 +869,6 @@ private: Size maSrcSz; public: - MetaMaskScalePartAction(); MetaMaskScalePartAction(MetaMaskScalePartAction const &) = default; MetaMaskScalePartAction(MetaMaskScalePartAction &&) = default; MetaMaskScalePartAction & operator =(MetaMaskScalePartAction const &) = delete; // due to MetaAction @@ -929,7 +903,6 @@ private: Gradient maGradient; public: - MetaGradientAction(); MetaGradientAction(MetaGradientAction const &) = default; MetaGradientAction(MetaGradientAction &&) = default; MetaGradientAction & operator =(MetaGradientAction const &) = delete; // due to MetaAction @@ -957,7 +930,6 @@ private: Gradient maGradient; public: - SAL_DLLPRIVATE MetaGradientExAction(); MetaGradientExAction(MetaGradientExAction const &) = default; MetaGradientExAction(MetaGradientExAction &&) = default; MetaGradientExAction & operator =(MetaGradientExAction const &) = delete; // due to MetaAction @@ -985,7 +957,6 @@ private: Hatch maHatch; public: - MetaHatchAction(); MetaHatchAction(MetaHatchAction const &) = default; MetaHatchAction(MetaHatchAction &&) = default; MetaHatchAction & operator =(MetaHatchAction const &) = delete; // due to MetaAction @@ -1013,7 +984,6 @@ private: Wallpaper maWallpaper; public: - SAL_DLLPRIVATE MetaWallpaperAction(); MetaWallpaperAction(MetaWallpaperAction const &) = default; MetaWallpaperAction(MetaWallpaperAction &&) = default; MetaWallpaperAction & operator =(MetaWallpaperAction const &) = delete; // due to MetaAction @@ -1042,7 +1012,6 @@ private: bool mbClip; public: - SAL_DLLPRIVATE MetaClipRegionAction(); MetaClipRegionAction(MetaClipRegionAction const &) = default; MetaClipRegionAction(MetaClipRegionAction &&) = default; MetaClipRegionAction & operator =(MetaClipRegionAction const &) = delete; // due to MetaAction @@ -1069,7 +1038,6 @@ private: tools::Rectangle maRect; public: - SAL_DLLPRIVATE MetaISectRectClipRegionAction(); MetaISectRectClipRegionAction(MetaISectRectClipRegionAction const &) = default; MetaISectRectClipRegionAction(MetaISectRectClipRegionAction &&) = default; MetaISectRectClipRegionAction & operator =(MetaISectRectClipRegionAction const &) = delete; // due to MetaAction @@ -1095,7 +1063,6 @@ private: vcl::Region maRegion; public: - SAL_DLLPRIVATE MetaISectRegionClipRegionAction(); MetaISectRegionClipRegionAction(MetaISectRegionClipRegionAction const &) = default; MetaISectRegionClipRegionAction(MetaISectRegionClipRegionAction &&) = default; MetaISectRegionClipRegionAction & operator =(MetaISectRegionClipRegionAction const &) = delete; // due to MetaAction @@ -1122,7 +1089,6 @@ private: tools::Long mnVertMove; public: - SAL_DLLPRIVATE MetaMoveClipRegionAction(); MetaMoveClipRegionAction(MetaMoveClipRegionAction const &) = default; MetaMoveClipRegionAction(MetaMoveClipRegionAction &&) = default; MetaMoveClipRegionAction & operator =(MetaMoveClipRegionAction const &) = delete; // due to MetaAction @@ -1149,7 +1115,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaLineColorAction(); MetaLineColorAction(MetaLineColorAction const &) = default; MetaLineColorAction(MetaLineColorAction &&) = default; MetaLineColorAction & operator =(MetaLineColorAction const &) = delete; // due to MetaAction @@ -1174,7 +1139,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaFillColorAction(); MetaFillColorAction(MetaFillColorAction const &) = default; MetaFillColorAction(MetaFillColorAction &&) = default; MetaFillColorAction & operator =(MetaFillColorAction const &) = delete; // due to MetaAction @@ -1199,7 +1163,6 @@ private: Color maColor; public: - SAL_DLLPRIVATE MetaTextColorAction(); MetaTextColorAction(MetaTextColorAction const &) = default; MetaTextColorAction(MetaTextColorAction &&) = default; MetaTextColorAction & operator =(MetaTextColorAction const &) = delete; // due to MetaAction @@ -1223,7 +1186,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaTextFillColorAction(); MetaTextFillColorAction(MetaTextFillColorAction const &) = default; MetaTextFillColorAction(MetaTextFillColorAction &&) = default; MetaTextFillColorAction & operator =(MetaTextFillColorAction const &) = delete; // due to MetaAction @@ -1249,7 +1211,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaTextLineColorAction(); MetaTextLineColorAction(MetaTextLineColorAction const &) = default; MetaTextLineColorAction(MetaTextLineColorAction &&) = default; MetaTextLineColorAction & operator =(MetaTextLineColorAction const &) = delete; // due to MetaAction @@ -1274,7 +1235,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaOverlineColorAction(); MetaOverlineColorAction(MetaOverlineColorAction const &) = default; MetaOverlineColorAction(MetaOverlineColorAction &&) = default; MetaOverlineColorAction & operator =(MetaOverlineColorAction const &) = delete; // due to MetaAction @@ -1298,7 +1258,6 @@ private: TextAlign maAlign; public: - SAL_DLLPRIVATE MetaTextAlignAction(); MetaTextAlignAction(MetaTextAlignAction const &) = default; MetaTextAlignAction(MetaTextAlignAction &&) = default; MetaTextAlignAction & operator =(MetaTextAlignAction const &) = delete; // due to MetaAction @@ -1354,7 +1313,6 @@ private: void correctFontScale(tools::Long nNewFontScale) { maFont.SetAverageFontWidth(nNewFontScale); } public: - SAL_DLLPRIVATE MetaFontAction(); MetaFontAction(MetaFontAction const &) = default; MetaFontAction(MetaFontAction &&) = default; MetaFontAction & operator =(MetaFontAction const &) = delete; // due to MetaAction @@ -1380,7 +1338,6 @@ private: vcl::PushFlags mnFlags; public: - SAL_DLLPRIVATE MetaPushAction(); MetaPushAction(MetaPushAction const &) = default; MetaPushAction(MetaPushAction &&) = default; MetaPushAction & operator =(MetaPushAction const &) = delete; // due to MetaAction @@ -1419,7 +1376,6 @@ private: RasterOp meRasterOp; public: - SAL_DLLPRIVATE MetaRasterOpAction(); MetaRasterOpAction(MetaRasterOpAction const &) = default; MetaRasterOpAction(MetaRasterOpAction &&) = default; MetaRasterOpAction & operator =(MetaRasterOpAction const &) = delete; // due to MetaAction @@ -1443,7 +1399,6 @@ private: sal_uInt16 mnTransPercent; public: - MetaTransparentAction(); MetaTransparentAction(MetaTransparentAction const &) = default; MetaTransparentAction(MetaTransparentAction &&) = default; MetaTransparentAction & operator =(MetaTransparentAction const &) = delete; // due to MetaAction @@ -1478,7 +1433,6 @@ private: std::optional<basegfx::BColorStops> maSVGTransparencyColorStops; public: - MetaFloatTransparentAction(); MetaFloatTransparentAction(MetaFloatTransparentAction const &) = default; MetaFloatTransparentAction(MetaFloatTransparentAction &&) = default; MetaFloatTransparentAction & operator =(MetaFloatTransparentAction const &) = delete; // due to MetaAction @@ -1517,7 +1471,6 @@ private: Size maSize; public: - MetaEPSAction(); MetaEPSAction(MetaEPSAction const &) = default; MetaEPSAction(MetaEPSAction &&) = default; MetaEPSAction & operator =(MetaEPSAction const &) = delete; // due to MetaAction @@ -1548,7 +1501,6 @@ private: bool mbSet; public: - SAL_DLLPRIVATE MetaRefPointAction(); MetaRefPointAction(MetaRefPointAction const &) = default; MetaRefPointAction(MetaRefPointAction &&) = default; MetaRefPointAction & operator =(MetaRefPointAction const &) = delete; // due to MetaAction @@ -1581,7 +1533,6 @@ private: SAL_DLLPRIVATE virtual ~MetaCommentAction() override; public: - SAL_DLLPRIVATE explicit MetaCommentAction(); SAL_DLLPRIVATE explicit MetaCommentAction( const MetaCommentAction& rAct ); explicit MetaCommentAction( OString aComment, sal_Int32 nValue = 0, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0 ); @@ -1604,7 +1555,6 @@ private: vcl::text::ComplexTextLayoutFlags mnLayoutMode; public: - SAL_DLLPRIVATE MetaLayoutModeAction(); MetaLayoutModeAction(MetaLayoutModeAction const &) = default; MetaLayoutModeAction(MetaLayoutModeAction &&) = default; MetaLayoutModeAction & operator =(MetaLayoutModeAction const &) = delete; // due to MetaAction @@ -1627,7 +1577,6 @@ private: LanguageType meTextLanguage; public: - SAL_DLLPRIVATE MetaTextLanguageAction(); MetaTextLanguageAction(MetaTextLanguageAction const &) = default; MetaTextLanguageAction(MetaTextLanguageAction &&) = default; MetaTextLanguageAction & operator =(MetaTextLanguageAction const &) = delete; // due to MetaAction diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index b50bcc67293a..5c57fe8d9eba 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -123,8 +123,6 @@ public: void SetButtonRepeat( sal_Int32 nRepeat ); sal_Int32 GetButtonRepeat() const; - SAL_DLLPRIVATE static sal_Int32 GetActionDelay(); - void SetMenuDelay( sal_Int32 nDelay ); sal_Int32 GetMenuDelay() const; diff --git a/include/vcl/toolkit/MenuButton.hxx b/include/vcl/toolkit/MenuButton.hxx index 79f0edd9d71a..29b2ff53a556 100644 --- a/include/vcl/toolkit/MenuButton.hxx +++ b/include/vcl/toolkit/MenuButton.hxx @@ -47,8 +47,6 @@ private: Link<MenuButton*,void> maActivateHdl; Link<MenuButton*,void> maSelectHdl; - DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void ); - MenuButton( const MenuButton & ) = delete; MenuButton& operator=( const MenuButton & ) = delete; diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index e1f10eb67242..4d8e6fdc8571 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -57,7 +57,6 @@ public: SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const; SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign ); /// The x-coordinate of the vertical separator line, use in MenuButton subclass only. - SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const; SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX ); protected: diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 536a78dd1d71..57c6204e88dc 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -71,7 +71,6 @@ public: virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const override; virtual OUString GetEntryText( SCCOLROW nEntryNo ) const override; - virtual bool IsMirrored() const override; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ) const override; virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) override; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 149db145e2be..86682f78f2e2 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -97,7 +97,6 @@ protected: virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ) const; virtual bool IsLayoutRTL() const; - virtual bool IsMirrored() const; virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewWidth ) = 0; virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 9da02f3f4756..b6653cdb86e5 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -372,10 +372,4 @@ SCCOLROW ScRowBar::GetHiddenCount( SCCOLROW nEntryNo ) const // override only fo return rDoc.GetHiddenRowCount( nEntryNo, nTab ); } -bool ScRowBar::IsMirrored() const // override only for rows -{ - const ScViewData& rViewData = pTabView->GetViewData(); - return rViewData.GetDocument().IsLayoutRTL( rViewData.CurrentTabForData() ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 31585c2a8ccd..3aecfb9cc814 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -1073,11 +1073,6 @@ bool ScHeaderControl::IsLayoutRTL() const return false; } -bool ScHeaderControl::IsMirrored() const -{ - return false; -} - bool ScHeaderControl::IsDisabled() const { return false; diff --git a/vcl/inc/menutogglebutton.hxx b/vcl/inc/menutogglebutton.hxx index d15fbd474fec..ce8e14e9f7ee 100644 --- a/vcl/inc/menutogglebutton.hxx +++ b/vcl/inc/menutogglebutton.hxx @@ -26,9 +26,6 @@ class MenuToggleButton final : public MenuButton public: explicit MenuToggleButton(vcl::Window* pParent, WinBits nStyle); virtual ~MenuToggleButton() override; - - void SetActive(bool bSel); - bool GetActive() const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b809187d3f3a..bb3f25fa8851 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -404,12 +404,6 @@ MouseSettings::GetButtonRepeat() const return mxData->mnButtonRepeat; } -sal_Int32 -MouseSettings::GetActionDelay() -{ - return 250; -} - void MouseSettings::SetMenuDelay( sal_Int32 nDelay ) { diff --git a/vcl/source/control/MenuButton.cxx b/vcl/source/control/MenuButton.cxx index d7b80ded0702..c1fdfd6b57b5 100644 --- a/vcl/source/control/MenuButton.cxx +++ b/vcl/source/control/MenuButton.cxx @@ -171,17 +171,6 @@ void MenuButton::dispose() PushButton::dispose(); } -IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl, Timer *, void) -{ - // See if Button Tracking is still active, as it could've been cancelled earlier - if ( IsTracking() ) - { - if ( !(GetStyle() & WB_NOPOINTERFOCUS) ) - GrabFocus(); - ExecuteMenu(); - } -} - void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ( PushButton::ImplHitTestPushButton( this, rMEvt.GetPosPixel() ) ) @@ -278,14 +267,4 @@ MenuToggleButton::~MenuToggleButton() disposeOnce(); } -void MenuToggleButton::SetActive( bool bSel ) -{ - mbIsActive = bSel; -} - -bool MenuToggleButton::GetActive() const -{ - return mbIsActive; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index c7e1ddf708fa..14f65c850142 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -81,7 +81,6 @@ public: ImplCommonButtonData(); tools::Rectangle maFocusRect; - tools::Long mnSeparatorX; DrawButtonFlags mnButtonState; bool mbSmallSymbol; bool mbGeneratedTooltip; @@ -96,7 +95,7 @@ public: rtl::Reference<VclStatusListener<Button>> mpStatusListener; }; -ImplCommonButtonData::ImplCommonButtonData() : mnSeparatorX(0), mnButtonState(DrawButtonFlags::NONE), +ImplCommonButtonData::ImplCommonButtonData() : mnButtonState(DrawButtonFlags::NONE), mbSmallSymbol(false), mbGeneratedTooltip(false), meImageAlign(ImageAlign::Top), meSymbolAlign(SymbolAlign::LEFT) { } @@ -181,16 +180,6 @@ Image const & Button::GetCustomButtonImage() const return mpButtonData->maCustomContentImage; } -tools::Long Button::ImplGetSeparatorX() const -{ - return mpButtonData->mnSeparatorX; -} - -void Button::ImplSetSeparatorX( tools::Long nX ) -{ - mpButtonData->mnSeparatorX = nX; -} - DrawTextFlags Button::ImplGetTextStyle( WinBits nWinStyle, SystemTextColorFlags nSystemTextColorFlags ) const { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -963,7 +952,6 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, SystemTextColorFl Point aEndPt( nSeparatorX, aSymbolRect.Bottom()-nDistance ); aDecoView.DrawSeparator( aStartPt, aEndPt ); } - ImplSetSeparatorX( nSeparatorX ); aDecoView.DrawSymbol( aSymbolRect, SymbolType::SPIN_DOWN, aColor, nStyle ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 20406866e658..570083705f4b 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -113,10 +113,6 @@ void MetaAction::Scale( double, double ) { } -MetaPixelAction::MetaPixelAction() : - MetaAction(MetaActionType::PIXEL) -{} - MetaPixelAction::~MetaPixelAction() {} @@ -146,10 +142,6 @@ void MetaPixelAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaPointAction::MetaPointAction() : - MetaAction(MetaActionType::POINT) -{} - MetaPointAction::~MetaPointAction() {} @@ -178,10 +170,6 @@ void MetaPointAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaLineAction::MetaLineAction() : - MetaAction(MetaActionType::LINE) -{} - MetaLineAction::~MetaLineAction() {} @@ -225,10 +213,6 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -MetaRectAction::MetaRectAction() : - MetaAction(MetaActionType::RECT) -{} - MetaRectAction::~MetaRectAction() {} @@ -284,12 +268,6 @@ void MetaRectAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaRoundRectAction::MetaRoundRectAction() : - MetaAction ( MetaActionType::ROUNDRECT ), - mnHorzRound ( 0 ), - mnVertRound ( 0 ) -{} - MetaRoundRectAction::~MetaRoundRectAction() {} @@ -323,10 +301,6 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = basegfx::fround<sal_uInt32>(mnVertRound * fabs(fScaleY)); } -MetaEllipseAction::MetaEllipseAction() : - MetaAction(MetaActionType::ELLIPSE) -{} - MetaEllipseAction::~MetaEllipseAction() {} @@ -355,10 +329,6 @@ void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaArcAction::MetaArcAction() : - MetaAction(MetaActionType::ARC) -{} - MetaArcAction::~MetaArcAction() {} @@ -397,10 +367,6 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -MetaPieAction::MetaPieAction() : - MetaAction(MetaActionType::PIE) -{} - MetaPieAction::~MetaPieAction() {} @@ -439,10 +405,6 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -MetaChordAction::MetaChordAction() : - MetaAction(MetaActionType::CHORD) -{} - MetaChordAction::~MetaChordAction() {} @@ -478,10 +440,6 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -MetaPolyLineAction::MetaPolyLineAction() : - MetaAction(MetaActionType::POLYLINE) -{} - MetaPolyLineAction::~MetaPolyLineAction() {} @@ -523,10 +481,6 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -MetaPolygonAction::MetaPolygonAction() : - MetaAction(MetaActionType::POLYGON) -{} - MetaPolygonAction::~MetaPolygonAction() {} @@ -555,10 +509,6 @@ void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPoly, fScaleX, fScaleY ); } -MetaPolyPolygonAction::MetaPolyPolygonAction() : - MetaAction(MetaActionType::POLYPOLYGON) -{} - MetaPolyPolygonAction::~MetaPolyPolygonAction() {} @@ -588,12 +538,6 @@ void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -MetaTextAction::MetaTextAction() : - MetaAction ( MetaActionType::TEXT ), - mnIndex ( 0 ), - mnLen ( 0 ) -{} - MetaTextAction::~MetaTextAction() {} @@ -629,12 +573,6 @@ void MetaTextAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaTextArrayAction::MetaTextArrayAction() : - MetaAction ( MetaActionType::TEXTARRAY ), - mnIndex ( 0 ), - mnLen ( 0 ) -{} - MetaTextArrayAction::MetaTextArrayAction(const MetaTextArrayAction& rAction) : MetaAction(MetaActionType::TEXTARRAY) , maStartPt(rAction.maStartPt) @@ -737,13 +675,6 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } -MetaStretchTextAction::MetaStretchTextAction() : - MetaAction ( MetaActionType::STRETCHTEXT ), - mnWidth ( 0 ), - mnIndex ( 0 ), - mnLen ( 0 ) -{} - MetaStretchTextAction::~MetaStretchTextAction() {} @@ -798,10 +729,6 @@ void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); mnWidth = basegfx::fround<sal_uInt32>(mnWidth * fabs(fScaleX)); } -MetaTextRectAction::MetaTextRectAction() : - MetaAction ( MetaActionType::TEXTRECT ), - mnStyle ( DrawTextFlags::NONE ) -{} MetaTextRectAction::~MetaTextRectAction() {} @@ -837,14 +764,6 @@ void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaTextLineAction::MetaTextLineAction() : - MetaAction ( MetaActionType::TEXTLINE ), - mnWidth ( 0 ), - meStrikeout ( STRIKEOUT_NONE ), - meUnderline ( LINESTYLE_NONE ), - meOverline ( LINESTYLE_NONE ) -{} - MetaTextLineAction::~MetaTextLineAction() {} @@ -889,10 +808,6 @@ void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) mnWidth = basegfx::fround<tools::Long>(mnWidth * fabs(fScaleX)); } -MetaBmpAction::MetaBmpAction() : - MetaAction(MetaActionType::BMP) -{} - MetaBmpAction::~MetaBmpAction() {} @@ -925,10 +840,6 @@ void MetaBmpAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaBmpScaleAction::MetaBmpScaleAction() : - MetaAction(MetaActionType::BMPSCALE) -{} - MetaBmpScaleAction::~MetaBmpScaleAction() {} @@ -1012,10 +923,6 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -MetaBmpScalePartAction::MetaBmpScalePartAction() : - MetaAction(MetaActionType::BMPSCALEPART) -{} - MetaBmpScalePartAction::~MetaBmpScalePartAction() {} @@ -1059,10 +966,6 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -MetaBmpExAction::MetaBmpExAction() : - MetaAction(MetaActionType::BMPEX) -{} - MetaBmpExAction::~MetaBmpExAction() {} @@ -1092,10 +995,6 @@ void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaBmpExScaleAction::MetaBmpExScaleAction() : - MetaAction(MetaActionType::BMPEXSCALE) -{} - MetaBmpExScaleAction::~MetaBmpExScaleAction() {} @@ -1135,10 +1034,6 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -MetaBmpExScalePartAction::MetaBmpExScalePartAction() : - MetaAction(MetaActionType::BMPEXSCALEPART) -{} - MetaBmpExScalePartAction::~MetaBmpExScalePartAction() {} @@ -1179,10 +1074,6 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -MetaMaskAction::MetaMaskAction() : - MetaAction(MetaActionType::MASK) -{} - MetaMaskAction::~MetaMaskAction() {} @@ -1217,10 +1108,6 @@ void MetaMaskAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -MetaMaskScaleAction::MetaMaskScaleAction() : - MetaAction(MetaActionType::MASKSCALE) -{} - MetaMaskScaleAction::~MetaMaskScaleAction() {} @@ -1259,10 +1146,6 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -MetaMaskScalePartAction::MetaMaskScalePartAction() : - MetaAction(MetaActionType::MASKSCALEPART) -{} - MetaMaskScalePartAction::~MetaMaskScalePartAction() {} @@ -1305,10 +1188,6 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -MetaGradientAction::MetaGradientAction() : - MetaAction(MetaActionType::GRADIENT) -{} - MetaGradientAction::~MetaGradientAction() {} @@ -1338,10 +1217,6 @@ void MetaGradientAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaGradientExAction::MetaGradientExAction() : - MetaAction ( MetaActionType::GRADIENTEX ) -{} - MetaGradientExAction::MetaGradientExAction( tools::PolyPolygon aPolyPoly, Gradient aGradient ) : MetaAction ( MetaActionType::GRADIENTEX ), maPolyPoly (std::move( aPolyPoly )), @@ -1375,10 +1250,6 @@ void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -MetaHatchAction::MetaHatchAction() : - MetaAction(MetaActionType::HATCH) -{} - MetaHatchAction::~MetaHatchAction() {} @@ -1414,10 +1285,6 @@ void MetaHatchAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -MetaWallpaperAction::MetaWallpaperAction() : - MetaAction(MetaActionType::WALLPAPER) -{} - MetaWallpaperAction::~MetaWallpaperAction() {} @@ -1448,11 +1315,6 @@ void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaClipRegionAction::MetaClipRegionAction() : - MetaAction ( MetaActionType::CLIPREGION ), - mbClip ( false ) -{} - MetaClipRegionAction::~MetaClipRegionAction() {} @@ -1485,10 +1347,6 @@ void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) maRegion.Scale( fScaleX, fScaleY ); } -MetaISectRectClipRegionAction::MetaISectRectClipRegionAction() : - MetaAction(MetaActionType::ISECTRECTCLIPREGION) -{} - MetaISectRectClipRegionAction::~MetaISectRectClipRegionAction() {} @@ -1517,10 +1375,6 @@ void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction() : - MetaAction(MetaActionType::ISECTREGIONCLIPREGION) -{} - MetaISectRegionClipRegionAction::~MetaISectRegionClipRegionAction() {} @@ -1553,12 +1407,6 @@ void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) maRegion.Scale( fScaleX, fScaleY ); } -MetaMoveClipRegionAction::MetaMoveClipRegionAction() : - MetaAction ( MetaActionType::MOVECLIPREGION ), - mnHorzMove ( 0 ), - mnVertMove ( 0 ) -{} - MetaMoveClipRegionAction::~MetaMoveClipRegionAction() {} @@ -1586,11 +1434,6 @@ void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) mnVertMove = basegfx::fround<tools::Long>(mnVertMove * fScaleY); } -MetaLineColorAction::MetaLineColorAction() : - MetaAction ( MetaActionType::LINECOLOR ), - mbSet ( false ) -{} - MetaLineColorAction::~MetaLineColorAction() {} @@ -1613,11 +1456,6 @@ rtl::Reference<MetaAction> MetaLineColorAction::Clone() const return new MetaLineColorAction( *this ); } -MetaFillColorAction::MetaFillColorAction() : - MetaAction ( MetaActionType::FILLCOLOR ), - mbSet ( false ) -{} - MetaFillColorAction::~MetaFillColorAction() {} @@ -1640,10 +1478,6 @@ rtl::Reference<MetaAction> MetaFillColorAction::Clone() const return new MetaFillColorAction( *this ); } -MetaTextColorAction::MetaTextColorAction() : - MetaAction(MetaActionType::TEXTCOLOR) -{} - MetaTextColorAction::~MetaTextColorAction() {} @@ -1662,11 +1496,6 @@ rtl::Reference<MetaAction> MetaTextColorAction::Clone() const return new MetaTextColorAction( *this ); } -MetaTextFillColorAction::MetaTextFillColorAction() : - MetaAction ( MetaActionType::TEXTFILLCOLOR ), - mbSet ( false ) -{} - MetaTextFillColorAction::~MetaTextFillColorAction() {} @@ -1689,11 +1518,6 @@ rtl::Reference<MetaAction> MetaTextFillColorAction::Clone() const return new MetaTextFillColorAction( *this ); } -MetaTextLineColorAction::MetaTextLineColorAction() : - MetaAction ( MetaActionType::TEXTLINECOLOR ), - mbSet ( false ) -{} - MetaTextLineColorAction::~MetaTextLineColorAction() {} @@ -1716,11 +1540,6 @@ rtl::Reference<MetaAction> MetaTextLineColorAction::Clone() const return new MetaTextLineColorAction( *this ); } -MetaOverlineColorAction::MetaOverlineColorAction() : - MetaAction ( MetaActionType::OVERLINECOLOR ), - mbSet ( false ) -{} - MetaOverlineColorAction::~MetaOverlineColorAction() {} @@ -1743,11 +1562,6 @@ rtl::Reference<MetaAction> MetaOverlineColorAction::Clone() const return new MetaOverlineColorAction( *this ); } -MetaTextAlignAction::MetaTextAlignAction() : - MetaAction ( MetaActionType::TEXTALIGN ), - maAlign ( ALIGN_TOP ) -{} - MetaTextAlignAction::~MetaTextAlignAction() {} @@ -1796,10 +1610,6 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } -MetaFontAction::MetaFontAction() : - MetaAction(MetaActionType::FONT) -{} - MetaFontAction::~MetaFontAction() {} @@ -1837,11 +1647,6 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetFontSize( aSize ); } -MetaPushAction::MetaPushAction() : - MetaAction ( MetaActionType::PUSH ), - mnFlags ( vcl::PushFlags::NONE ) -{} - MetaPushAction::~MetaPushAction() {} @@ -1877,11 +1682,6 @@ rtl::Reference<MetaAction> MetaPopAction::Clone() const return new MetaPopAction( *this ); } -MetaRasterOpAction::MetaRasterOpAction() : - MetaAction ( MetaActionType::RASTEROP ), - meRasterOp ( RasterOp::OverPaint ) -{} - MetaRasterOpAction::~MetaRasterOpAction() {} @@ -1901,11 +1701,6 @@ rtl::Reference<MetaAction> MetaRasterOpAction::Clone() const return new MetaRasterOpAction( *this ); } -MetaTransparentAction::MetaTransparentAction() : - MetaAction ( MetaActionType::Transparent ), - mnTransPercent ( 0 ) -{} - MetaTransparentAction::~MetaTransparentAction() {} @@ -1936,10 +1731,6 @@ void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -MetaFloatTransparentAction::MetaFloatTransparentAction() : - MetaAction(MetaActionType::FLOATTRANSPARENT) -{} - MetaFloatTransparentAction::~MetaFloatTransparentAction() {} @@ -1977,10 +1768,6 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -MetaEPSAction::MetaEPSAction() : - MetaAction(MetaActionType::EPS) -{} - MetaEPSAction::~MetaEPSAction() {} @@ -2016,11 +1803,6 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -MetaRefPointAction::MetaRefPointAction() : - MetaAction ( MetaActionType::REFPOINT ), - mbSet ( false ) -{} - MetaRefPointAction::~MetaRefPointAction() {} @@ -2043,13 +1825,6 @@ rtl::Reference<MetaAction> MetaRefPointAction::Clone() const return new MetaRefPointAction( *this ); } -MetaCommentAction::MetaCommentAction() : - MetaAction ( MetaActionType::COMMENT ), - mnValue ( 0 ) -{ - ImplInitDynamicData( nullptr, 0UL ); -} - MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : MetaAction ( MetaActionType::COMMENT ), maComment ( rAct.maComment ), @@ -2215,11 +1990,6 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } -MetaLayoutModeAction::MetaLayoutModeAction() : - MetaAction ( MetaActionType::LAYOUTMODE ), - mnLayoutMode( vcl::text::ComplexTextLayoutFlags::Default ) -{} - MetaLayoutModeAction::~MetaLayoutModeAction() {} @@ -2238,11 +2008,6 @@ rtl::Reference<MetaAction> MetaLayoutModeAction::Clone() const return new MetaLayoutModeAction( *this ); } -MetaTextLanguageAction::MetaTextLanguageAction() : - MetaAction ( MetaActionType::TEXTLANGUAGE ), - meTextLanguage( LANGUAGE_DONTKNOW ) -{} - MetaTextLanguageAction::~MetaTextLanguageAction() {}
