summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-01-24 13:18:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-01-24 14:29:46 +0000
commitbd272cd3daf873fcc69c2cc794ffda821be7fedf (patch)
tree935347b14b26859b2cd9f66d21c3843dfd409a2b /cui/source
parent5f1e50030cdb3a4eacc3b78b2e197a7f57219bcb (diff)
rename SfxSingleTabDialog to SfxNoLayoutSingleTabDialog
Change-Id: I4922b719bf819879909e9949bf7946f20914d1e5
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/dialogs/SpellDialog.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx2
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/inc/connect.hxx4
-rw-r--r--cui/source/inc/cuisrchdlg.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx2
-rw-r--r--cui/source/inc/dstribut.hxx2
-rw-r--r--cui/source/inc/macroass.hxx2
-rw-r--r--cui/source/inc/measure.hxx4
-rw-r--r--cui/source/options/cuisrchdlg.cxx4
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/dstribut.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx2
18 files changed, 23 insertions, 23 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d9125aff8927..bf433d9d2d97 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1541,7 +1541,7 @@ css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlr
}
SvxShortcutAssignDlg::SvxShortcutAssignDlg( Window* pParent, const uno::Reference< frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
- : SfxSingleTabDialog( pParent, rSet, 0 )
+ : SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
{
SfxTabPage* pPage = SfxAcceleratorConfigPage::Create( this, rSet );
pPage->SetFrame( rxDocumentFrame );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 691c4e764759..53703752566d 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -950,7 +950,7 @@ SvxMacroAssignSingleTabDialog::~SvxMacroAssignSingleTabDialog()
// -----------------------------------------------------------------------
-// According to SfxSingleTabDialog
+// According to SfxNoLayoutSingleTabDialog
void SvxMacroAssignSingleTabDialog::SetTabPage( SfxTabPage* pTabPage )
{
pFixedLine = new FixedLine( this );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 135f33d54758..c397738adbeb 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -497,8 +497,8 @@ void SpellDialog::StartSpellOptDlg_Impl()
};
SfxItemSet aSet( SFX_APP()->GetPool(), aSpellInfos);
aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
- SfxSingleTabDialog* pDlg =
- new SfxSingleTabDialog( this, aSet, RID_SFXPAGE_LINGU );
+ SfxNoLayoutSingleTabDialog* pDlg =
+ new SfxNoLayoutSingleTabDialog( this, aSet, RID_SFXPAGE_LINGU );
SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg, aSet );
( (SvxLinguTabPage*)pPage )->HideGroups( GROUP_MODULES );
pDlg->SetTabPage( pPage );
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 09005d39a502..4ada5e309250 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1653,7 +1653,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
sal_uInt32 nResId
)
{
- SfxSingleTabDialog* pDlg=NULL;
+ SfxNoLayoutSingleTabDialog* pDlg=NULL;
switch ( nResId )
{
case RID_SVXPAGE_MEASURE :
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index e3b64316e372..87427302a84a 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -197,7 +197,7 @@ public:
void ExpandEntry ( sal_uInt16 nPos, const String &rStr );
};
-class SvxShortcutAssignDlg : public SfxSingleTabDialog
+class SvxShortcutAssignDlg : public SfxNoLayoutSingleTabDialog
{
public:
SvxShortcutAssignDlg(
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 99495f0481eb..78638efda788 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -83,9 +83,9 @@ public:
virtual void PageCreated (SfxAllItemSet aSet);
};
-/* Derived from SfxSingleTabDialog, in order to be informed about
+/* Derived from SfxNoLayoutSingleTabDialog, in order to be informed about
virtual methods by the control. */
-class SvxConnectionDialog : public SfxSingleTabDialog
+class SvxConnectionDialog : public SfxNoLayoutSingleTabDialog
{
public:
SvxConnectionDialog( Window* pParent, const SfxItemSet& rAttr,
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 450dff43f14c..3ee10831e742 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -34,7 +34,7 @@
class SvxJSearchOptionsPage;
-class SvxJSearchOptionsDialog : public SfxSingleTabDialog
+class SvxJSearchOptionsDialog : public SfxNoLayoutSingleTabDialog
{
sal_Int32 nInitialTlFlags;
SvxJSearchOptionsPage *pPage;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 224b393bb493..8621fe4cafe0 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -126,7 +126,7 @@ namespace svx
//= DatabaseRegistrationDialog
//====================================================================
class DatabaseRegistrationDialog :public RegistrationItemSetHolder
- ,public SfxSingleTabDialog
+ ,public SfxNoLayoutSingleTabDialog
{
public:
DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr );
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 22b9d3a8290a..24b16fee255f 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -67,7 +67,7 @@ public:
SvxDistributeVertical GetDistributeVer() const { return meDistributeVer; }
};
-class SvxDistributeDialog : public SfxSingleTabDialog
+class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog
{
SvxDistributePage* mpPage;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index b7477422687d..133d88fc1d84 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -106,7 +106,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-class SfxMacroAssignDlg : public SfxSingleTabDialog
+class SfxMacroAssignDlg : public SfxNoLayoutSingleTabDialog
{
public:
SfxMacroAssignDlg(
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index be0c0dbc5974..6606a2e6a418 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -92,9 +92,9 @@ public:
virtual void PageCreated (SfxAllItemSet aSet);
};
-/* Derived from SfxSingleTabDialog, in order to be able to be
+/* Derived from SfxNoLayoutSingleTabDialog, in order to be able to be
informed about virtual methods by the control. */
-class SvxMeasureDialog : public SfxSingleTabDialog
+class SvxMeasureDialog : public SfxNoLayoutSingleTabDialog
{
public:
SvxMeasureDialog( Window* pParent, const SfxItemSet& rAttr,
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index fdc01a936287..cfc5b98b179b 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -50,7 +50,7 @@
SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
Window *pParent,
const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags ) :
- SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
+ SfxNoLayoutSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
nInitialTlFlags( nInitialFlags )
{
pPage = (SvxJSearchOptionsPage *)
@@ -63,7 +63,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
{
// pPage will be implicitly destroyed by the
- // SfxSingleTabDialog destructor
+ // SfxNoLayoutSingleTabDialog destructor
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d6ccf4f36e04..e6917f239670 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -76,7 +76,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rInAttrs )
:RegistrationItemSetHolder( rInAttrs )
- ,SfxSingleTabDialog( pParent, getRegistrationItems(), RID_SFXPAGE_DBREGISTER )
+ ,SfxNoLayoutSingleTabDialog( pParent, getRegistrationItems(), RID_SFXPAGE_DBREGISTER )
{
SfxTabPage* page = DbRegistrationOptionsPage::Create( this, getRegistrationItems() );
@@ -90,7 +90,7 @@ DatabaseRegistrationDialog::~DatabaseRegistrationDialog()
short DatabaseRegistrationDialog::Execute()
{
- short result = SfxSingleTabDialog::Execute();
+ short result = SfxNoLayoutSingleTabDialog::Execute();
if ( result == RET_OK )
{
DBG_ASSERT( GetOutputItemSet(), "DatabaseRegistrationDialog::Execute: no output items!" );
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 1b2eb4779d87..782f63a31496 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -55,7 +55,7 @@ static sal_uInt16 pRanges[] =
SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rInAttrs,
const SdrView* pSdrView ) :
- SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_CONNECTION )
+ SfxNoLayoutSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_CONNECTION )
{
SvxConnectionPage* _pPage = new SvxConnectionPage( this, rInAttrs );
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index cb09e449851b..bde1590e88a4 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -44,7 +44,7 @@ SvxDistributeDialog::SvxDistributeDialog(
const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
-: SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
+: SfxNoLayoutSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
mpPage(0L)
{
mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e91d3fbde5ec..cfa9c8b66fac 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -487,7 +487,7 @@ SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
}
SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
- : SfxSingleTabDialog( pParent, rSet, 0 )
+ : SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
{
SfxTabPage* pPage = SfxMacroTabPage::Create( this, rSet );
pPage->SetFrame( rxDocumentFrame );
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index edf5eda7159d..084986ffa24c 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -55,7 +55,7 @@ static sal_uInt16 pRanges[] =
SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
const SdrView* pSdrView ) :
- SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_MEASURE )
+ SfxNoLayoutSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_MEASURE )
{
SvxMeasurePage* _pPage = new SvxMeasurePage( this, rInAttrs );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a4b2b6fb7aa8..9e2cb5ec0833 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1135,7 +1135,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
}
else
{
- SfxSingleTabDialog* pParent = dynamic_cast< SfxSingleTabDialog* >( GetParent() );
+ SfxNoLayoutSingleTabDialog* pParent = dynamic_cast< SfxNoLayoutSingleTabDialog* >( GetParent() );
OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL;
if ( pOKButton )
pOKButton->Click();