diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-09 11:45:24 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-09 13:57:16 +0000 |
commit | 87ec1f8857e77c0b8d559fa92416f44b68dd1e63 (patch) | |
tree | c6aca1bbfe5bbf8749a870c1a1cbc05399aa4a2e /sfx2 | |
parent | 17d5cdfff9a2f8a311428b981a3998b8e33b4d82 (diff) |
callcatcher: remove unused code post automation removal
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/basedlgs.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/filedlghelper.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 104 |
3 files changed, 0 insertions, 111 deletions
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 14f4f17bcf66..64d26b1991dd 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -188,17 +188,14 @@ class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog public: SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId ); SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 ); - SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL ); virtual ~SfxSingleTabDialog(); - void SetPage( TabPage* pNewPage ); void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 ); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } OKButton* GetOKButton() const { return pOKBtn; } CancelButton* GetCancelButton() const { return pCancelBtn; } - void SetInfoLink( const Link& rLink ); private: GetTabPageRanges fnGetRanges; diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index a96f54055b0a..3b3835b6ac41 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -226,10 +226,6 @@ public: // XDialogClosedListener methods virtual void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); - // retrieves the top-most file picker - i.e. the instance which is currently beeing executed - static ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePicker > - GetTopMostFilePicker( ); - /** sets help ids for the controls in the dialog @param _pControlId Pointer to a 0-terminated array of control ids. They must be recruited from the diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index cf7f89f050cb..49429e40a4a4 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -778,31 +778,6 @@ SfxSingleTabDialog::SfxSingleTabDialog // ----------------------------------------------------------------------- -SfxSingleTabDialog::SfxSingleTabDialog -( - Window* pParent, - sal_uInt16 nUniqueId, - const String& rInfoURL -) - -/* [Description] - - Constructor of the general base class for SingleTab-Dialoge; - ID for the ini-file is handed over. -*/ - -: SfxModalDialog( pParent, nUniqueId, WinBits( WB_STDMODAL | WB_3DLOOK ) ), - - pOKBtn ( NULL ), - pCancelBtn ( NULL ), - pHelpBtn ( NULL ), - pImpl ( new SingleTabDlgImpl ) -{ - pImpl->m_sInfoURL = rInfoURL; -} - -// ----------------------------------------------------------------------- - SfxSingleTabDialog::~SfxSingleTabDialog() { delete pOKBtn; @@ -817,78 +792,6 @@ SfxSingleTabDialog::~SfxSingleTabDialog() // ----------------------------------------------------------------------- -void SfxSingleTabDialog::SetPage( TabPage* pNewPage ) -{ - if ( !pImpl->m_pLine ) - pImpl->m_pLine = new FixedLine( this ); - - if ( !pOKBtn ) - { - pOKBtn = new OKButton( this, WB_DEFBUTTON ); - pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) ); - } - - if ( pImpl->m_sInfoURL.Len() > 0 && !pImpl->m_pInfoImage ) - { - pImpl->m_pInfoImage = new ::svt::FixedHyperlinkImage( this ); - Image aInfoImage = Image( SfxResId( IMG_INFO ) ); - Size aImageSize = aInfoImage.GetSizePixel(); - aImageSize.Width() += 4; - aImageSize.Height() += 4; - pImpl->m_pInfoImage->SetSizePixel( aImageSize ); - pImpl->m_pInfoImage->SetImage( aInfoImage ); - pImpl->m_pInfoImage->SetURL( pImpl->m_sInfoURL ); - pImpl->m_pInfoImage->SetClickHdl( pImpl->m_aInfoLink ); - } - - if ( pImpl->m_pTabPage ) - delete pImpl->m_pTabPage; - if ( pImpl->m_pSfxPage ) - delete pImpl->m_pSfxPage; - pImpl->m_pTabPage = pNewPage; - - if ( pImpl->m_pTabPage ) - { - // Adjust size and position. - pImpl->m_pTabPage->SetPosPixel( Point() ); - Size aOutSz( pImpl->m_pTabPage->GetSizePixel() ); - Size aOffSz = LogicToPixel( Size( RSC_SP_CTRL_X, RSC_SP_CTRL_Y ), MAP_APPFONT ); - Size aFLSz = LogicToPixel( Size( aOutSz.Width(), RSC_CD_FIXEDLINE_HEIGHT ) ); - Size aBtnSz = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ), MAP_APPFONT ); - - Point aPnt( 0, aOutSz.Height() ); - pImpl->m_pLine->SetPosSizePixel( aPnt, aFLSz ); - aPnt.X() = aOutSz.Width() - aOffSz.Width() - aBtnSz.Width(); - aPnt.Y() += aFLSz.Height() + ( aOffSz.Height() / 2 ); - pOKBtn->SetPosSizePixel( aPnt, aBtnSz ); - - if ( pImpl->m_pInfoImage ) - { - aPnt.X() = aOffSz.Width(); - long nDelta = ( pImpl->m_pInfoImage->GetSizePixel().Height() - aBtnSz.Height() ) / 2; - aPnt.Y() -= nDelta; - pImpl->m_pInfoImage->SetPosPixel( aPnt ); - pImpl->m_pInfoImage->Show(); - } - - aOutSz.Height() += aFLSz.Height() + ( aOffSz.Height() / 2 ) + aBtnSz.Height() + aOffSz.Height(); - SetOutputSizePixel( aOutSz ); - - pImpl->m_pLine->Show(); - pOKBtn->Show(); - pImpl->m_pTabPage->Show(); - - // Set TabPage text in the Dialog - SetText( pImpl->m_pTabPage->GetText() ); - - // Dialog recieves the HelpId of TabPage - SetHelpId( pImpl->m_pTabPage->GetHelpId() ); - SetUniqueId( pImpl->m_pTabPage->GetUniqueId() ); - } -} - -// ----------------------------------------------------------------------- - void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc ) /* [Description] @@ -956,11 +859,4 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage, } } -// ----------------------------------------------------------------------- - -void SfxSingleTabDialog::SetInfoLink( const Link& rLink ) -{ - pImpl->m_aInfoLink = rLink; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |