More re-basing compile-time fixes; now we compile.
Change-Id: Id66f1009b6ec604548c325a036dae7e83cb78d9b
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 4590b9e..3cd5893 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -339,7 +339,6 @@ protected:
virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE;
public:
CustomPropertiesDurationField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine);
virtual ~CustomPropertiesDurationField();
void SetDuration( const com::sun::star::util::Duration& rDuration );
const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
@@ -351,7 +350,6 @@ class CustomPropertiesEditButton : public PushButton
public:
CustomPropertiesEditButton(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine);
virtual ~CustomPropertiesEditButton();
DECL_LINK(ClickHdl, void *);
};
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 621e54d..92d88f6 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -116,8 +116,6 @@ ScCalcOptionsDialog::~ScCalcOptionsDialog()
void ScCalcOptionsDialog::dispose()
{
mpLbOptionEdit.clear();
mpUseOpenCL.clear();
mpSpinButton.clear();
mpEditField.clear();
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 7a961db..196675e 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -72,8 +72,10 @@ BreakDlg::~BreakDlg()
void BreakDlg::dispose()
{
mpProgress.disposeAndClear();
pProgrInfo.disposeAndClear();
delete mpProgress;
mpProgress = NULL;
delete pProgrInfo;
pProgrInfo = NULL;
m_pFiObjInfo.clear();
m_pFiActInfo.clear();
m_pFiInsInfo.clear();
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 4ead686..47e3afc 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -244,7 +244,7 @@ SmElementsControl::~SmElementsControl()
void SmElementsControl::dispose()
{
mpDocShell->DoClose();
mpScroll.disposeAndClear();
mxScroll.disposeAndClear();
Control::dispose();
}
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 03789e0..bb7bcd0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -413,7 +413,6 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl)
IMPL_LINK( SwSortDlg, CheckHdl, void *, pControl )
{
if( pControl == m_pRowRB.get())
r
{
m_pColLbl->SetText(aColTxt);
m_pColEdt1->SetMax(nY);
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f8ef22b..f5fd204 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -943,7 +943,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
bool bPageStylesWithHeaderFooter = false;
vcl::Window *pSourceWindow = 0;
VclPtr<CancelableModelessDialog> pProgressDlg;
VclPtr<CancelableDialog> pProgressDlg;
if (!IsMergeSilent()) {
pSourceWindow = &pSourceShell->GetView().GetEditWin();
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index c4112ee..8e44685 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -53,7 +53,8 @@ void PrintMonitor::dispose()
m_pPrinting.clear();
m_pPrinter.clear();
m_pPrintInfo.clear();
CancelableModelessDialog::dispose();
CancelableDialog::dispose();
}
// Progress Indicator for Creation of personalized Mail Merge documents:
@@ -80,7 +81,8 @@ void CreateMonitor::dispose()
{
m_pCancelButton.clear();
m_pCounting.clear();
CancelableModelessDialog::dispose();
CancelableDialog::dispose();
}
void CreateMonitor::UpdateCountingText()
@@ -121,7 +123,8 @@ void CancelableDialog::dispose()
{
EndDialog( 0 );
m_pCancelButton.clear();
ModelessDialog::dispose();
Dialog::dispose();
}
void CancelableDialog::SetCancelHdl( const Link& rLink )
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 00f1320..879da63 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -39,7 +39,7 @@ protected:
using Dialog::StartExecuteModal;
public:
virtual ~CancelableModelessDialog();
virtual ~CancelableDialog();
virtual void dispose() SAL_OVERRIDE;
void SetCancelHdl( const Link& rLink );
