diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 09:29:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 11:21:03 +0000 |
commit | 2b12a5b87b1de9ae95d9562ba21201890b1100c5 (patch) | |
tree | ae0c1b5064c4d92e65db301e4d8acd87e891b159 /sfx2/source | |
parent | a95b58060b01046a8881e97e0c5016e44200dd32 (diff) |
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 20 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 40 |
3 files changed, 0 insertions, 66 deletions
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 35890f71886e..9a916e96b893 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -32,12 +32,6 @@ using namespace ::com::sun::star::frame; static void lcl_updateThumbnails (TemplateContainerItem *pItem); -TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren) - : TemplateAbstractView(pParent,rResId,bDisableTransientChildren), - mpDocTemplates(new SfxDocumentTemplates) -{ -} - TemplateLocalView::TemplateLocalView ( Window* pParent) : TemplateAbstractView(pParent), mpDocTemplates(new SfxDocumentTemplates) diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index eedd2d963f54..609f81af92b6 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -164,26 +164,6 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri // ----------------------------------------------------------------------- -SfxModalDialog::SfxModalDialog(Window* pParent, - sal_uInt32 nUniqueId, - WinBits nWinStyle) : -/* [Description] - - Constructor of the general base class for modal Dialoge; - The ID for the ini-file wird explicilty handed over. - The saved position from there is set. -*/ - - ModalDialog(pParent, nWinStyle), - nUniqId(nUniqueId), - pInputSet(0), - pOutputSet(0) -{ - init(); -} - -// ----------------------------------------------------------------------- - SfxModalDialog::~SfxModalDialog() /* [Description] diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f0ac157d2eed..d7e90524e32b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -388,16 +388,6 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const return dynamic_cast<SfxTabDialog*>(GetParentDialog()); } -#define INI_LIST(ItemSetPtr) \ - pSet(ItemSetPtr) \ - , pOutSet(0) \ - , pRanges(0) \ - , nResId(rResId.GetId()) \ - , nAppPageId(USHRT_MAX) \ - , bItemsReset(sal_False) \ - , bFmt(bEditFmt)\ - , pExampleSet(0) - // ----------------------------------------------------------------------- SfxTabDialog::SfxTabDialog @@ -435,31 +425,6 @@ SfxTabDialog::SfxTabDialog ( Window* pParent, // Parent Window - const ResId& rResId, // ResourceId - const SfxItemSet* pItemSet, // Itemset with the data; - // can be NULL, when Pages are onDemand - sal_Bool bEditFmt, // Flag: templates are processed - // when yes -> additional Button for standard - const OUString* pUserButtonText // Text for UserButton; - // if != 0, the UserButton is created -) - : TabDialog(pParent, rResId) - , pFrame(0) - , INI_LIST(pItemSet) -{ - Init_Impl( bFmt, pUserButtonText, &rResId ); - DBG_WARNING( "Please use the Construtor with the ViewFrame" ); -} - -SfxTabDialog::SfxTabDialog - -/* [Description] - - Constructor, temporary without Frame -*/ - -( - Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand @@ -747,11 +712,6 @@ void SfxTabDialog::Start_Impl() ActivatePageHdl( m_pTabCtrl ); } -void SfxTabDialog::AddTabPage( sal_uInt16 nId, sal_Bool bItemsOnDemand ) -{ - AddTabPage( nId, 0, 0, bItemsOnDemand ); -} - void SfxTabDialog::AddTabPage( sal_uInt16 nId, const OUString &rRiderText, sal_Bool bItemsOnDemand, sal_uInt16 nPos ) { AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos ); |