Kaydet (Commit) c6d1938f authored tarafından Caolán McNamara's avatar Caolán McNamara

it's a SfxSingleTabDialog not SfxNoLayoutSingleTabDialog

Change-Id: I0c86753fab551a18a9f0c62adc03a3d967947dbf
üst aabee4ca
......@@ -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();
......
......@@ -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: */
......@@ -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();
......
......@@ -73,16 +73,6 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
SetText(CUI_RESSTR(RID_SVXSTR_DIMENSION_LINE));
}
/*************************************************************************
|*
|* Dtor
|*
\************************************************************************/
SvxMeasureDialog::~SvxMeasureDialog()
{
}
/*************************************************************************
|*
|* Tabpage for changing measure-attributes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment