cui/source/inc/cuisrchdlg.hxx | 6 ++----
cui/source/inc/measure.hxx | 8 +++-----
cui/source/options/cuisrchdlg.cxx | 11 ++---------
cui/source/tabpages/measure.cxx | 10 ----------
4 files changed, 7 insertions(+), 28 deletions(-)
New commits:
commit c6d1938f7559aa6293338b4d756ec7fc0bd79f63
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 27 14:00:28 2013 +0000
it's a SfxSingleTabDialog not SfxNoLayoutSingleTabDialog
Change-Id: I0c86753fab551a18a9f0c62adc03a3d967947dbf
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index eaa2a14..1ab46e0 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -44,10 +44,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & );
public:
- SvxJSearchOptionsDialog( Window *pParent,
- const SfxItemSet& rOptionsSet,
- sal_Int32 nInitialFlags );
- virtual ~SvxJSearchOptionsDialog();
+ SvxJSearchOptionsDialog(Window *pParent,
+ const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags);
// Window
virtual void Activate();
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index b4b7f2e..02273fa 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -81,17 +81,15 @@ public:
};
-/* Derived from SfxNoLayoutSingleTabDialog, in order to be able to be
+/* Derived from SfxSingleTabDialog, in order to be able to be
informed about virtual methods by the control. */
class SvxMeasureDialog : public SfxSingleTabDialog
{
public:
- SvxMeasureDialog( Window* pParent, const SfxItemSet& rAttr,
- const SdrView* pView );
- ~SvxMeasureDialog();
+ SvxMeasureDialog(Window* pParent, const SfxItemSet& rAttr,
+ const SdrView* pView);
};
-
#endif // INCLUDED_CUI_SOURCE_INC_MEASURE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/cuisrchdlg.cxx
b/cui/source/options/cuisrchdlg.cxx
index 5511875..08ff0bf 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -52,26 +52,19 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window
*pParent,
: SfxSingleTabDialog(pParent, rOptionsSet)
, nInitialTlFlags( nInitialFlags )
{
+ // pPage will be implicitly destroyed by the
+ // SfxSingleTabDialog destructor
pPage = (SvxJSearchOptionsPage *)
SvxJSearchOptionsPage::Create(get_content_area(), rOptionsSet );
setTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
pPage->EnableSaveOptions(false);
}
-
-SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
-{
- // pPage will be implicitly destroyed by the
- // SfxNoLayoutSingleTabDialog destructor
-}
-
-
void SvxJSearchOptionsDialog::Activate()
{
pPage->SetTransliterationFlags( nInitialTlFlags );
}
-
sal_Int32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
{
return pPage->GetTransliterationFlags();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9f1c1af..245b1f6 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -75,16 +75,6 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const
SfxItemSet& rInAttrs,
/*************************************************************************
|*
-|* Dtor
-|*
-\************************************************************************/
-
-SvxMeasureDialog::~SvxMeasureDialog()
-{
-}
-
-/*************************************************************************
-|*
|* Tabpage for changing measure-attributes
|*
\************************************************************************/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
