diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 16:36:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 17:08:09 +0000 |
commit | 200cc2d20a21ceb5d176604f9c384f15c6a87570 (patch) | |
tree | 18302432f432942ea3ba5416d71bdcf732bb6bc8 /cui/source/factory | |
parent | 5918277a128307ad04704c0ac0898256e0bbffa1 (diff) |
SvxMultiFileDialog is never created
because the single caller of it is a hidden button
in the old mail merge dialog which was never completed
to allow attachments to emails (because it never was
able to send emails, the new one can FWIW)
all of which has logical knock on effects to shrink
things down substantially
Change-Id: I831cac8f670eaafc96b2ea4d78516f67b662fa7d
Diffstat (limited to 'cui/source/factory')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 52 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 21 |
2 files changed, 3 insertions, 70 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index d5bc424f3711..90728017a3ee 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -48,7 +48,6 @@ #include "optdict.hxx" #include "dlgname.hxx" #include "multipat.hxx" -#include "multifil.hxx" #include "cuihyperdlg.hxx" #include "cuifmsearch.hxx" #include "cuigrfflt.hxx" @@ -136,7 +135,6 @@ IMPL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl); IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl); @@ -808,46 +806,6 @@ void AbstractSvxMultiPathDialog_Impl::SetTitle( const OUString& rNewTitle ) pDlg->SetText( rNewTitle ); } -OUString AbstractSvxMultiFileDialog_Impl::GetPath() const -{ - return pDlg->GetPath(); -} - -void AbstractSvxMultiFileDialog_Impl::SetPath( const OUString& rPath ) -{ - pDlg->SetPath( rPath ); -} - -OUString AbstractSvxMultiFileDialog_Impl::GetFiles() const -{ - return pDlg->GetFiles(); -} - -void AbstractSvxMultiFileDialog_Impl::SetFiles( const OUString& rPath ) -{ - pDlg->SetFiles( rPath ); -} - -void AbstractSvxMultiFileDialog_Impl::SetClassPathMode() -{ - pDlg->SetClassPathMode(); -} - -void AbstractSvxMultiFileDialog_Impl::EnableRadioButtonMode() -{ - pDlg->EnableRadioButtonMode(); -} - -void AbstractSvxMultiFileDialog_Impl::SetTitle( const OUString& rNewTitle ) -{ - pDlg->SetText( rNewTitle ); -} - -void AbstractSvxMultiFileDialog_Impl::SetHelpId( const OString& aHelpId ) -{ - pDlg->SetHelpId( aHelpId ); -} - Window * AbstractSvxHpLinkDlg_Impl::GetWindow() { return (Window *)pDlg; @@ -1454,18 +1412,12 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* return new AbstractSvxMessDialog_Impl( pDlg ); } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, bool bEmptyAllowed ) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(Window* pParent) { - SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed ); + SvxMultiPathDialog* pDlg = new SvxMultiPathDialog(pParent); return new AbstractSvxMultiPathDialog_Impl( pDlg ); } -AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, bool bEmptyAllowed ) -{ - SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed ); - return new AbstractSvxMultiFileDialog_Impl( pDlg ); -} - AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 2804ecbc3099..28622add604c 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -42,7 +42,6 @@ class SvxObjectTitleDescDialog; class SvxMessDialog; class SvxMultiPathDialog; -class SvxMultiFileDialog; class SvxHpLinkDlg; class FmSearchDialog; class Graphic; @@ -402,23 +401,6 @@ class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog virtual void SetTitle( const OUString& rNewTitle ); }; -class SvxMultiFileDialog; -class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog -{ - DECL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl,SvxMultiFileDialog) - virtual OUString GetFiles() const ; - virtual void SetFiles( const OUString& rPath ) ; - //from SvxMultiPathDialog - virtual OUString GetPath() const; - virtual void SetPath( const OUString& rPath ); - virtual void SetClassPathMode(); - virtual void EnableRadioButtonMode(); - virtual void SetTitle( const OUString& rNewTitle ); - //From Class Window - virtual void SetHelpId( const OString& ) ; - -}; - class SvxHpLinkDlg; class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg { @@ -643,8 +625,7 @@ public: virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, bool bEmptyAllowed = false ); - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, bool bEmptyAllowed = false ); + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent); virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId); |