compilerplugins/clang/unusedmethods.cxx | 1
compilerplugins/clang/unusedmethods.py | 1
include/vcl/builder.hxx | 10 ---------
include/vcl/ctrl.hxx | 1
include/vcl/field.hxx | 8 -------
include/vcl/fixedhyper.hxx | 7 ------
include/vcl/i18nhelp.hxx | 1
include/vcl/image.hxx | 5 ----
include/vcl/menu.hxx | 1
include/vcl/menubtn.hxx | 3 --
include/vcl/msgbox.hxx | 4 ---
include/vcl/print.hxx | 22 +--------------------
include/vcl/rendersettings.hxx | 2 -
include/vcl/scrbar.hxx | 1
include/vcl/seleng.hxx | 1
include/vcl/slider.hxx | 9 --------
include/vcl/spinfld.hxx | 3 --
include/vcl/split.hxx | 7 ------
include/vcl/splitwin.hxx | 33 +++++---------------------------
include/vcl/status.hxx | 12 -----------
include/vcl/tabctrl.hxx | 4 ---
include/vcl/toolbox.hxx | 1
vcl/inc/displayconnectiondispatch.hxx | 2 -
vcl/inc/printdlg.hxx | 2 -
vcl/inc/xconnection.hxx | 1
vcl/source/control/ctrl.cxx | 5 ----
vcl/source/gdi/print.cxx | 5 ----
vcl/source/helper/xconnection.cxx | 19 ------------------
vcl/source/outdev/rendersettings.cxx | 12 -----------
vcl/source/window/scrwnd.hxx | 1
30 files changed, 14 insertions(+), 170 deletions(-)
New commits:
commit a6fed7a19befa5673403ec5fe3ab69a91475da3a
Author: Noel Grandin <n...@peralex.com>
Date: Mon Jul 13 09:55:03 2015 +0200
loplugin:unusedmethods vcl
Change-Id: I53c66b7898f4e0a66e6172d22c6f782dadaf6589
Reviewed-on: https://gerrit.libreoffice.org/16975
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.cxx
b/compilerplugins/clang/unusedmethods.cxx
index 2868334..655dfe2 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -40,6 +40,7 @@ TODO need to handle places where the code takes the address
of a method, that ne
as a use-site.
TODO deal with free functions and static methods
TODO track instantiations of template class constructor methods
+TODO track instantiation of overridden methods when a template class is
instantiated
*/
namespace {
diff --git a/compilerplugins/clang/unusedmethods.py
b/compilerplugins/clang/unusedmethods.py
index 05e38b6..ef2beb9 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -29,6 +29,7 @@ exclusionSet = set([
"void comphelper::IEventProcessor::release()",
"void SotMutexHolder::acquire()",
"void SotMutexHolder::release()",
+ "class Rectangle ComboBox::GetDropDownPosSizePixel() const"
# only used by Windows build
"_Bool basegfx::B2ITuple::equalZero() const",
"class basegfx::B2DPolyPolygon
basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const",
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index baf523d..26b5d8c 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -70,8 +70,6 @@ public:
vcl::Window* get_widget_root();
- PopupMenu* get_menu(PopupMenu*& ret, const OString& sID);
-
//sID may not exist
PopupMenu* get_menu(const OString& sID);
@@ -432,13 +430,7 @@ inline T* VclBuilder::get(const OString& sID)
return static_cast<T*>(w);
}
-inline PopupMenu* VclBuilder::get_menu(PopupMenu*& ret, const OString& sID)
-{
- ret = get_menu(sID);
- SAL_WARN_IF(!ret, "vcl.layout", "menu \"" << sID.getStr() << "\" not found
in .ui");
- assert(ret);
- return ret;
-}
+
//helper baseclass to ease retro fitting dialogs/tabpages that load a resource
//to load a .ui file instead
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 038d445..d33982b 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -185,7 +185,6 @@ public:
vcl::Font GetUnzoomedControlPointFont() const;
void SetShowAccelerator (bool val);
- bool GetShowAccelerator (void) const;
};
#endif // INCLUDED_VCL_CTRL_HXX
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index dc461b7..fdb09f1 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -83,7 +83,6 @@ public:
const AllSettings& GetFieldSettings() const;
- void SetErrorHdl( const Link<>& rLink ) { maErrorLink
= rLink; }
const Link<>& GetErrorHdl() const { return
maErrorLink; }
void SetEmptyFieldValue();
@@ -127,12 +126,10 @@ public:
const OString& GetEditMask() const { return m_aEditMask; }
const OUString& GetLiteralMask() const { return maLiteralMask; }
- void SetFormatFlags( sal_uInt16 nFlags ) {
mnFormatFlags = nFlags; }
sal_uInt16 GetFormatFlags() const { return mnFormatFlags; }
void SetString( const OUString& rStr );
OUString GetString() const;
- bool IsStringModified() const { return !(GetString() ==
maFieldString ); }
};
@@ -209,7 +206,6 @@ public:
virtual sal_Int64 GetValue() const;
virtual OUString CreateFieldText( sal_Int64 nValue ) const;
bool IsValueModified() const;
- sal_Int64 GetCorrectedValue() const { return
mnCorrectedValue; }
sal_Int64 Normalize( sal_Int64 nValue ) const;
sal_Int64 Denormalize( sal_Int64 nValue ) const;
@@ -267,11 +263,9 @@ public:
virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const;
virtual sal_Int64 GetValue() const SAL_OVERRIDE;
virtual OUString CreateFieldText( sal_Int64 nValue ) const
SAL_OVERRIDE;
- using NumericFormatter::GetCorrectedValue;
sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const;
void SetCustomConvertHdl( const Link<>& rLink ) {
maCustomConvertLink = rLink; }
- const Link<>& GetCustomConvertHdl() const { return
maCustomConvertLink; }
};
@@ -371,7 +365,6 @@ public:
Date GetDate() const;
void SetEmptyDate();
bool IsEmptyDate() const;
- Date GetCorrectedDate() const { return maCorrectedDate;
}
void ResetLastDate() { maLastDate = Date( 0, 0, 0 ); }
@@ -456,7 +449,6 @@ public:
tools::Time GetTime() const;
void SetEmptyTime() {
FormatterBase::SetEmptyFieldValue(); }
bool IsEmptyTime() const { return
FormatterBase::IsEmptyFieldValue(); }
- tools::Time GetCorrectedTime() const { return maCorrectedTime;
}
static tools::Time GetInvalidTime() { return tools::Time( 99, 99, 99
); }
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index 8af5860..9accb28 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -93,13 +93,6 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
*/
inline void SetClickHdl( const Link<>& rLink ) { m_aClickHdl =
rLink; }
- /** returns m_aClickHdl.
-
- @return
- m_aClickHdl
- */
- inline const Link<>& GetClickHdl() const { return m_aClickHdl; }
-
// ::FixedHyperbaseLink
/** sets the URL of the hyperlink and uses it as tooltip. */
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 71ca315..8ca39f0 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -60,7 +60,6 @@ private:
SAL_DLLPRIVATE void ImplDestroyWrappers();
protected:
- ::osl::Mutex& GetMutex() { return maMutex; }
SAL_DLLPRIVATE utl::TransliterationWrapper&
ImplGetTransliterationWrapper() const;
SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper()
const;
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 67f0b91..ab1cd2c 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -129,11 +129,6 @@ private:
sal_uInt16 mnInitSize;
sal_uInt16 mnGrowSize;
- SAL_DLLPRIVATE void ImplInitBitmapEx( const OUString& rUserImageName,
- const ::std::vector< OUString >&
rImageNames,
- const OUString& rSymbolsStyle,
- BitmapEx& rBmpEx,
- const Color* pMaskColor ) const;
SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize );
SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const OUString& rImageName )
const;
};
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 25714b3..9daae73 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -216,7 +216,6 @@ protected:
public:
SAL_DLLPRIVATE void ImplKillLayoutData() const;
- SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; }
SAL_DLLPRIVATE vcl::Window* ImplGetWindow() const { return pWindow; }
#if defined(MACOSX)
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index b89db35..d164ed8 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -68,17 +68,14 @@ public:
void ExecuteMenu();
void SetMenuMode( sal_uInt16 nMode );
- sal_uInt16 GetMenuMode() const { return mnMenuMode; }
void SetPopupMenu( PopupMenu* pNewMenu );
PopupMenu* GetPopupMenu() const { return mpMenu; }
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
OString GetCurItemIdent() const;
- void SetCurItemId( sal_uInt16 nItemId ) { mnCurItemId =
nItemId; }
void SetActivateHdl( const Link<>& rLink ) { maActivateHdl =
rLink; }
- const Link<>& GetActivateHdl() const { return
maActivateHdl; }
void SetSelectHdl( const Link<MenuButton *, void>& rLink ) {
maSelectHdl = rLink; }
};
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 8147821..63eae26 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -57,12 +57,10 @@ public:
const OUString& GetMessText() const { return maMessText; }
void SetImage( const Image& rImage ) { maImage = rImage; }
- const Image& GetImage() const { return maImage; }
void SetCheckBoxText( const OUString& rText ) {
maCheckBoxText = rText;}
- const OUString& GetCheckBoxText() const { return maCheckBoxText;}
void SetCheckBoxState( bool bCheck );
- bool GetCheckBoxState() const;
+ bool GetCheckBoxState() const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index ce9dbba..c4cf315 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -62,18 +62,14 @@ class VCL_DLLPUBLIC PrinterPage
{
GDIMetaFile* mpMtf;
JobSetup maJobSetup;
- bool mbNewJobSetup;
public:
PrinterPage() : mpMtf( new GDIMetaFile() ) {}
- PrinterPage( GDIMetaFile* pMtf, bool bNewJobSetup, const JobSetup& rSetup
) :
- mpMtf( pMtf ), maJobSetup( rSetup ), mbNewJobSetup( bNewJobSetup )
{}
+ PrinterPage( GDIMetaFile* pMtf, const JobSetup& rSetup ) :
+ mpMtf( pMtf ), maJobSetup( rSetup ) {}
~PrinterPage() { delete mpMtf; }
- GDIMetaFile* GetGDIMetaFile() const { return mpMtf; }
- const JobSetup& GetJobSetup() const { return maJobSetup; }
- bool IsNewJobSetup() const { return mbNewJobSetup; }
};
@@ -267,9 +263,6 @@ public:
virtual Bitmap GetBitmap( const Point& rSrcPt, const Size&
rSize ) const SAL_OVERRIDE;
protected:
-
- void SetSelfAsQueuePrinter( bool bQueuePrinter ) {
mbIsQueuePrinter = bQueuePrinter; }
- bool IsQueuePrinter() const { return
mbIsQueuePrinter; }
virtual void DrawDeviceMask ( const Bitmap& rMask, const
Color& rMaskColor,
const Point& rDestPt, const Size&
rDestSize,
const Point& rSrcPtPixel, const
Size& rSrcSizePixel ) SAL_OVERRIDE;
@@ -305,12 +298,9 @@ public:
static const QueueInfo* GetQueueInfo( const OUString& rPrinterName,
bool bStatusUpdate );
static OUString GetDefaultPrinterName();
- void Error();
-
const OUString& GetName() const { return
maPrinterName; }
const OUString& GetDriverName() const { return maDriver;
}
bool IsDefPrinter() const { return
mbDefPrinter; }
- void SetDefPrinter(bool bDef) { mbDefPrinter =
bDef; }
bool IsDisplayPrinter() const { return
mpDisplayDev != nullptr; }
bool IsValid() const { return
!IsDisplayPrinter(); }
@@ -366,16 +356,8 @@ public:
bool IsPrinting() const { return mbPrinting; }
- const OUString& GetCurJobName() const { return maJobName; }
- sal_uInt16 GetCurPage() const { return mnCurPage; }
bool IsJobActive() const { return mbJobActive; }
- sal_uLong GetError() const { return
ERRCODE_TOERROR(mnError); }
- sal_uLong GetErrorCode() const { return mnError; }
-
- void SetErrorHdl( const Link<>& rLink ) {
maErrorHdl = rLink; }
- const Link<>& GetErrorHdl() const { return maErrorHdl; }
-
/** checks the printer list and updates it necessary
*
* sends a DataChanged event of type DataChangedEventType::PRINTER
diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx
index 41a2775..47e588f 100644
--- a/include/vcl/rendersettings.hxx
+++ b/include/vcl/rendersettings.hxx
@@ -28,8 +28,6 @@ public:
virtual ~RenderSettings()
{}
-
- void Apply(vcl::RenderContext& rRenderContext);
};
}
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 5de297f..b83bfbb 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -85,7 +85,6 @@ private:
SAL_DLLPRIVATE bool ImplDrawNative(vcl::RenderContext&
rRenderContext, sal_uInt16 nDrawFlags);
SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos );
SAL_DLLPRIVATE Size getCurrentCalcSize() const;
- DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void );
public:
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index d5b9ef5..33442be 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -121,7 +121,6 @@ public:
// when the mouse is outside the area
void SetVisibleArea( const Rectangle& rNewArea )
{ aArea = rNewArea; }
- const Rectangle& GetVisibleArea() const { return aArea; }
void SetAddMode( bool);
bool IsAddMode() const;
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 8e609cd..10c7e9b 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -96,16 +96,11 @@ public:
void Slide();
void EndSlide();
- void EnableDrag( bool bEnable = true )
- { mbFullDrag = bEnable; }
- bool IsDragEnabled() const { return mbFullDrag; }
-
void SetRangeMin(long nNewRange);
long GetRangeMin() const { return mnMinRange; }
void SetRangeMax(long nNewRange);
long GetRangeMax() const { return mnMaxRange; }
void SetRange( const Range& rRange );
- Range GetRange() const { return Range( GetRangeMin(),
GetRangeMax() ); }
void SetThumbPos( long nThumbPos );
long GetThumbPos() const { return mnThumbPos; }
void SetLineSize( long nNewSize ) { mnLineSize = nNewSize; }
@@ -113,16 +108,12 @@ public:
void SetPageSize( long nNewSize ) { mnPageSize = nNewSize; }
long GetPageSize() const { return mnPageSize; }
- long GetDelta() const { return mnDelta; }
-
Size CalcWindowSizePixel();
void SetLinkedField(VclPtr<NumericField> pField);
void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; }
- const Link<>& GetSlideHdl() const { return maSlideHdl; }
void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl =
rLink; }
- const Link<>& GetEndSlideHdl() const { return maEndSlideHdl; }
};
#endif // INCLUDED_VCL_SLIDER_HXX
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 9c2efcb..d3787ec 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -90,13 +90,10 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; }
- const Link<>& GetUpHdl() const { return maUpHdlLink; }
void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink;
}
const Link<>& GetDownHdl() const { return maDownHdlLink; }
void SetFirstHdl( const Link<>& rLink ) { maFirstHdlLink =
rLink; }
- const Link<>& GetFirstHdl() const { return maFirstHdlLink; }
void SetLastHdl( const Link<>& rLink ) { maLastHdlLink = rLink;
}
- const Link<>& GetLastHdl() const { return maLastHdlLink; }
virtual Size CalcMinimumSize() const SAL_OVERRIDE;
virtual Size CalcMinimumSizeForText(const OUString &rString) const
SAL_OVERRIDE;
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index a9a185b..b12abdd 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -86,13 +86,11 @@ public:
void SetDragRectPixel( const Rectangle& rDragRect,
vcl::Window* pRefWin = NULL );
- const Rectangle& GetDragRectPixel() const { return maDragRect; }
- vcl::Window* GetDragWindow() const { return mpRefWin; }
void SetSplitPosPixel( long nPos );
long GetSplitPosPixel() const { return mnSplitPos; }
- bool IsHorizontal() const { return mbHorzSplit; }
+ bool IsHorizontal() const { return mbHorzSplit; }
void SetHorizontal(bool bNew);
// set the stepsize of the splitter for cursor movement
@@ -100,11 +98,8 @@ public:
void SetKeyboardStepSize( long nStepSize );
void SetStartSplitHdl( const Link<>& rLink ) {
maStartSplitHdl = rLink; }
- const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; }
void SetSplitHdl( const Link<>& rLink ) { maSplitHdl =
rLink; }
void SetEndSplitHdl( const Link<>& rLink ) { maEndSplitHdl
= rLink; }
- const Link<>& GetEndSplitHdl() const { return maEndSplitHdl; }
- const Link<>& GetSplitHdl() const { return maSplitHdl; }
};
#endif // INCLUDED_VCL_SPLIT_HXX
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 24a5812..8918d42 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -109,7 +109,6 @@ private:
SAL_DLLPRIVATE void ImplDrawFadeOut(vcl::RenderContext& rRenderContext,
bool bInPaint);
SAL_DLLPRIVATE void ImplNewAlign();
SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext, const
Rectangle& rRect, bool bHorz, bool bLeft);
- SAL_DLLPRIVATE void ImplDrawFadeArrow(vcl::RenderContext& rRenderContext,
const Point& rPt, bool bHorz, bool bLeft);
SAL_DLLPRIVATE void ImplStartSplit( const MouseEvent& rMEvt );
SAL_DLLPRIVATE void ImplDrawBorder(vcl::RenderContext& rRenderContext);
@@ -177,51 +176,31 @@ public:
/** Return the current size limits for the specified item.
*/
long GetItemSize( sal_uInt16 nId, SplitWindowItemFlags
nBits ) const;
- sal_uInt16 GetSet( sal_uInt16 nId ) const;
- sal_uInt16 GetItemId( vcl::Window* pWindow ) const;
- sal_uInt16 GetItemId( const Point& rPos ) const;
- sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0
) const;
- sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0
) const;
- sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const;
+ sal_uInt16 GetSet( sal_uInt16 nId ) const;
+ sal_uInt16 GetItemId( vcl::Window* pWindow ) const;
+ sal_uInt16 GetItemId( const Point& rPos ) const;
+ sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 )
const;
+ sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 )
const;
+ sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const;
bool IsItemValid( sal_uInt16 nId ) const;
- bool IsNoAlign() const { return mbNoAlign; }
void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP );
WindowAlign GetAlign() const { return meAlign; }
bool IsHorizontal() const { return mbHorz; }
- bool IsSplitting() const { return IsTracking(); }
-
void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize =
nNewMaxSize; }
- long GetMaxSizePixel() const { return mnMaxSize; }
Size CalcLayoutSizePixel( const Size& aNewSize );
void ShowAutoHideButton( bool bShow = true );
bool IsAutoHideButtonVisible() const { return mbAutoHide; }
void ShowFadeInHideButton( bool bShow = true );
- void ShowFadeInButton( bool bShow = true ) {
ShowFadeInHideButton( bShow ); }
- bool IsFadeInButtonVisible() const { return mbFadeIn; }
void ShowFadeOutButton( bool bShow = true );
- bool IsFadeOutButtonVisible() const { return mbFadeOut; }
long GetFadeInSize() const;
bool IsFadeNoButtonMode() const { return
mbFadeNoButtonMode; }
void SetAutoHideState( bool bAutoHide );
- bool GetAutoHideState() const { return mbAutoHideIn; }
-
- void SetStartSplitHdl( const Link<>& rLink ) {
maStartSplitHdl = rLink; }
- const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; }
void SetSplitHdl( const Link<>& rLink ) { maSplitHdl =
rLink; }
- const Link<>& GetSplitHdl() const { return maSplitHdl; }
- void SetSplitResizeHdl( const Link<>& rLink ) {
maSplitResizeHdl = rLink; }
- const Link<>& GetSplitResizeHdl() const { return maSplitResizeHdl; }
- void SetAutoHideHdl( const Link<>& rLink ) { maAutoHideHdl
= rLink; }
- const Link<>& GetAutoHideHdl() const { return maAutoHideHdl; }
- void SetFadeInHdl( const Link<>& rLink ) { maFadeInHdl =
rLink; }
- const Link<>& GetFadeInHdl() const { return maFadeInHdl; }
- void SetFadeOutHdl( const Link<>& rLink ) { maFadeOutHdl =
rLink; }
- const Link<>& GetFadeOutHdl() const { return maFadeOutHdl; }
};
#endif // INCLUDED_VCL_SPLITWIN_HXX
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index fd79dd1..fda3c31 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -189,22 +189,10 @@ public:
void SetText( const OUString& rText ) SAL_OVERRIDE;
- void SetHelpText( const OUString& rText )
- { Window::SetHelpText( rText ); }
- const OUString& GetHelpText() const
- { return Window::GetHelpText(); }
-
- void SetHelpId( const OString& rId )
- { Window::SetHelpId( rId ); }
- const OString& GetHelpId() const
- { return Window::GetHelpId(); }
-
Size CalcWindowSizePixel() const;
void SetClickHdl( const Link<>& rLink ) { maClickHdl =
rLink; }
- const Link<>& GetClickHdl() const { return maClickHdl; }
void SetDoubleClickHdl( const Link<>& rLink ) {
maDoubleClickHdl = rLink; }
- const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
using Window::SetAccessibleName;
void SetAccessibleName( sal_uInt16 nItemId, const OUString&
rName );
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 3d4ab05..cf6135e 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -135,12 +135,10 @@ public:
sal_uInt16 GetPageId( const OString& rName ) const;
void SetCurPageId( sal_uInt16 nPageId );
- sal_uInt16 GetCurPageId() const;
+ sal_uInt16 GetCurPageId() const;
void SelectTabPage( sal_uInt16 nPageId );
- void SetMaxPageWidth( long nMaxWidth ) { mnMaxPageWidth =
nMaxWidth; }
-
void SetTabPage( sal_uInt16 nPageId, TabPage* pPage );
TabPage* GetTabPage( sal_uInt16 nPageId ) const;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 73cb937..f0541cd 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -226,7 +226,6 @@ private:
DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void* );
DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void );
- DECL_DLLPRIVATE_LINK( ImplResetAutoSizeTriesHdl, void* );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* );
DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void );
diff --git a/vcl/inc/displayconnectiondispatch.hxx
b/vcl/inc/displayconnectiondispatch.hxx
index bff039e..564111e 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -33,8 +33,6 @@ class DisplayConnectionDispatch:
public:
virtual bool dispatchEvent(void * pData, int nBytes) = 0;
- virtual bool dispatchErrorEvent(void * pData, int nBytes) = 0;
-
protected:
virtual ~DisplayConnectionDispatch() {}
};
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 770d177..a82dcdc 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -132,8 +132,6 @@ namespace vcl
/// border around each page
VclPtr<CheckBox> mpBorderCB;
- void setupLayout();
-
NUpTabPage( VclBuilder* );
void initFromMultiPageSetup( const
vcl::PrinterController::MultiPageSetup& );
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx
index 34c7758..d45aa6e 100644
--- a/vcl/inc/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
@@ -47,7 +47,6 @@ namespace vcl {
void terminate();
virtual bool dispatchEvent( void* pData, int nBytes ) SAL_OVERRIDE;
- virtual bool dispatchErrorEvent( void* pData, int nBytes )
SAL_OVERRIDE;
// XDisplayConnection
virtual void SAL_CALL addEventHandler( const
::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask )
throw(std::exception) SAL_OVERRIDE;
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 59d3389..61a1ad7 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -385,11 +385,6 @@ void Control::SetShowAccelerator(bool bVal)
mbShowAccelerator = bVal;
};
-bool Control::GetShowAccelerator() const
-{
- return mbShowAccelerator;
-}
-
ControlLayoutData::~ControlLayoutData()
{
if( m_pParent )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2a686ca..88c4a62 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1683,11 +1683,6 @@ bool Printer::SetCopyCount( sal_uInt16 nCopy, bool
bCollate )
return true;
}
-void Printer::Error()
-{
- maErrorHdl.Call( this );
-}
-
sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError )
{
sal_uLong nVCLError;
diff --git a/vcl/source/helper/xconnection.cxx
b/vcl/source/helper/xconnection.cxx
index 5b64d86..1d77410 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -124,23 +124,4 @@ bool DisplayConnection::dispatchEvent( void* pData, int
nBytes )
return false;
}
-bool DisplayConnection::dispatchErrorEvent( void* pData, int nBytes )
-{
- SolarMutexReleaser aRel;
-
- Sequence< sal_Int8 > aSeq( static_cast<sal_Int8*>(pData), nBytes );
- Any aEvent;
- aEvent <<= aSeq;
- ::std::list< css::uno::Reference< XEventHandler > > handlers;
- {
- MutexGuard aGuard( m_aMutex );
- handlers = m_aErrorHandlers;
- }
- for( ::std::list< css::uno::Reference< XEventHandler > >::const_iterator
it = handlers.begin(); it != handlers.end(); ++it )
- if( (*it)->handleEvent( aEvent ) )
- return true;
-
- return false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/rendersettings.cxx
b/vcl/source/outdev/rendersettings.cxx
index 2d7b871..ab9d10d 100644
--- a/vcl/source/outdev/rendersettings.cxx
+++ b/vcl/source/outdev/rendersettings.cxx
@@ -13,18 +13,6 @@
namespace vcl
{
-void RenderSettings::Apply(vcl::RenderContext& rRenderContext)
-{
- if (maOutDevState.mnFlags & PushFlags::LINECOLOR)
- rRenderContext.SetLineColor(*maOutDevState.mpLineColor);
- if (maOutDevState.mnFlags & PushFlags::FILLCOLOR)
- rRenderContext.SetFillColor(*maOutDevState.mpFillColor);
- if (maOutDevState.mnFlags & PushFlags::FONT)
- rRenderContext.SetFont(*maOutDevState.mpFont);
- if (mpBackground)
- rRenderContext.SetBackground(Wallpaper(*mpBackground.get()));
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index 8ce1c6b..c096509 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -75,7 +75,6 @@ public:
void ImplStop();
void ImplSetWheelMode( sal_uLong nWheelMode );
- sal_uLong ImplGetWheelMode() const { return mnWheelMode; }
};
#endif // INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
