diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-03 09:27:49 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-03 11:04:48 +0000 |
commit | b105ad5bafa847f5dd53aee8107a7c77cebcfdfc (patch) | |
tree | 39a55a5706856e3b4d43e3a7697b50694fa9cb11 /sfx2 | |
parent | d52ac7508ca87f5acb16dc0539d1814915847925 (diff) |
callcatcher: shave off some more
Change-Id: I8ed7028f865bd4a6425859ab3b57ed8e928a78e4
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 18 | ||||
-rw-r--r-- | sfx2/source/doc/objitem.cxx | 21 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 7 |
5 files changed, 0 insertions, 54 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4684c2ade5c5..439ce0822334 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2112,8 +2112,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox return 0; } - - IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) { if( pMenu ) @@ -2135,20 +2133,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) return sal_True; } - - -void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ) -{ - // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this! - OSL_FAIL( "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" ); - - PopupMenu* pMenu = CreateContextMenu(); - pMenu->Execute( pWin, rPos ); - delete pMenu; -} - - - SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const { const SfxStyleFamilyItem *pFamilyItem = GetFamilyItem_Impl(); @@ -2158,8 +2142,6 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const return pFamilyItem->GetFamily(); } - - void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnable) { if( nId == SID_STYLE_NEW_BY_EXAMPLE ) diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 86b9d48030fc..e7c6b45de192 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -22,34 +22,19 @@ #include <sfx2/objitem.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> - - TYPEINIT1_AUTOFACTORY(SfxObjectShellItem,SfxPoolItem) TYPEINIT1_AUTOFACTORY(SfxObjectItem,SfxPoolItem) - - bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const { return PTR_CAST(SfxObjectShellItem, &rItem)->pObjSh == pObjSh; } - - -OUString SfxObjectShellItem::GetValueText() const -{ - return OUString(); -} - - - SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const { return new SfxObjectShellItem( Which(), pObjSh ); } - - bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { if ( pObjSh ) @@ -65,8 +50,6 @@ bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 / return true; } - - bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This item MUST have a model. Please don't change this, there are UNO-based @@ -98,15 +81,11 @@ bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uIn return true; } - - SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh ) : SfxPoolItem( nWhichId ), _pSh( pSh ) {} - - bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const { const SfxObjectItem *pOther = PTR_CAST(SfxObjectItem, &rItem); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 5af3fd7a7e4b..828955ec9f48 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -275,7 +275,6 @@ public: vcl::Window* GetWindow() { return pWindow; } void EnableTreeDrag( bool b = true ); - void ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ); void EnableExample_Impl( sal_uInt16 nId, bool bEnable ); SfxStyleFamily GetActualFamily() const; OUString GetSelectedEntry() const; diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 4c9744af5dd0..7d6fe2de6daa 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -549,13 +549,6 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const static_cast<const SfxFrameItem&>(rItem).wFrame == wFrame; } - - -OUString SfxFrameItem::GetValueText() const -{ - return OUString(); -} - SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const { SfxFrameItem* pNew = new SfxFrameItem( wFrame); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index de07b92a20b3..48aae16c67f5 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1631,18 +1631,11 @@ bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const return dynamic_cast<const SfxViewFrameItem&>(rItem).pFrame == pFrame; } -OUString SfxViewFrameItem::GetValueText() const -{ - return OUString(); -} - - SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const { return new SfxViewFrameItem( pFrame); } - void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) /* [Description] |