diff options
Diffstat (limited to 'include/toolkit')
-rw-r--r-- | include/toolkit/awt/scrollabledialog.hxx | 8 | ||||
-rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxregion.hxx | 1 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtopwindow.hxx | 3 | ||||
-rw-r--r-- | include/toolkit/controls/controlmodelcontainerbase.hxx | 1 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 2 |
6 files changed, 1 insertions, 16 deletions
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index a085e652b3f9..42b70fe9b20c 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -31,13 +31,9 @@ namespace toolkit public: virtual ~ScrollableInterface() {} virtual void SetScrollWidth( long nWidth ) = 0; - virtual long GetScrollWidth() = 0; virtual void SetScrollHeight( long nHeight ) = 0; - virtual long GetScrollHeight() = 0; virtual void SetScrollLeft( long nLeft ) = 0; - virtual long GetScrollLeft() = 0; virtual void SetScrollTop( long Top ) = 0; - virtual long GetScrollTop() = 0; }; template < class T > @@ -61,13 +57,9 @@ namespace toolkit virtual ~ScrollableWrapper(); virtual void dispose() SAL_OVERRIDE; virtual void SetScrollWidth( long nWidth ) SAL_OVERRIDE; - virtual long GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); } virtual void SetScrollHeight( long nHeight ) SAL_OVERRIDE; - virtual long GetScrollHeight() SAL_OVERRIDE { return maScrollArea.Height(); } virtual void SetScrollLeft( long nLeft ) SAL_OVERRIDE; - virtual long GetScrollLeft() SAL_OVERRIDE { return mnScrollPos.X(); } virtual void SetScrollTop( long Top ) SAL_OVERRIDE; - virtual long GetScrollTop() SAL_OVERRIDE { return mnScrollPos.Y() ; } void setScrollVisibility( ScrollBarVisibility rState ); DECL_LINK( ScrollBarHdl, ScrollBar* ); diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index fdd3d406a52d..547e096b6b5d 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -84,8 +84,6 @@ public: void SetOutputDevice( OutputDevice* pOutDev ); OutputDevice* GetOutputDevice() const { return mpOutputDevice; } - const vcl::Font& GetFont() const { return maFont; } - // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 1206a4f6b9c5..599b9b717864 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -49,7 +49,6 @@ public: VCLXRegion(); virtual ~VCLXRegion(); - void SetRegion( const vcl::Region& rRegion ) { maRegion = rRegion; } const vcl::Region& GetRegion() const { return maRegion; } // ::com::sun::star::uno::XInterface diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index a8b5e2b0b472..890d7315ea5a 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -42,9 +42,8 @@ private: const bool m_bWHWND; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar> mxMenuBar; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar> mxMenuBar; - bool isSystemDependentWindowPeer() const { return m_bWHWND; } virtual vcl::Window* GetWindowImpl() = 0; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 0d44bc33188d..091a7e237075 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -216,7 +216,6 @@ typedef ::cppu::AggImplInheritanceHelper3 < UnoControlContainer class ControlContainerBase : public ContainerControl_IBase { - ::Size ImplGetSizePixel( const ::Size& inSize ); protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; bool mbSizeModified; diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 01611a3c7bee..ac295165190b 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -1055,8 +1055,6 @@ public: protected: virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; virtual void updateFromModel() SAL_OVERRIDE; - ActionListenerMultiplexer& getActionListeners(); - ItemListenerMultiplexer& getItemListeners(); }; |