summaryrefslogtreecommitdiff
path: root/binaryurp/Module_binaryurp.mk
blob: fcfd303f093e5f3dcec4895dce3bd96e86099ff2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#

$(eval $(call gb_Module_Module,binaryurp))

$(eval $(call gb_Module_add_targets,binaryurp,\
	Library_binaryurp \
))

$(eval $(call gb_Module_add_check_targets,binaryurp,\
	CppunitTest_binaryurp_test-cache \
	CppunitTest_binaryurp_test-unmarshal \
))

# vim: set noet sw=4 ts=4:
ff/?h=libreoffice-5-1-2&id=bd272cd3daf873fcc69c2cc794ffda821be7fedf&id2=5f1e50030cdb3a4eacc3b78b2e197a7f57219bcb'>diff)
rename SfxSingleTabDialog to SfxNoLayoutSingleTabDialog
Change-Id: I4922b719bf819879909e9949bf7946f20914d1e5
Diffstat
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.hxx2
-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
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx4
-rw-r--r--dbaccess/source/ui/inc/TablesSingleDlg.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx10
-rw-r--r--sfx2/inc/sfx2/macropg.hxx2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx14
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx4
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx2
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx2
-rw-r--r--sw/source/ui/inc/addrdlg.hxx2
-rw-r--r--sw/source/ui/inc/drpcps.hxx2
-rw-r--r--sw/source/ui/inc/fldedt.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx2
-rw-r--r--sw/source/ui/inc/optload.hxx2
-rw-r--r--sw/source/ui/inc/pattern.hxx2
-rw-r--r--sw/source/ui/inc/tblnumfm.hxx2
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/wrap.hxx2
50 files changed, 68 insertions, 68 deletions
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 06443fa375f2..7639b4b38172 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -41,7 +41,7 @@ namespace chart
using namespace ::com::sun::star;
NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet)
- : SfxSingleTabDialog( pParent, rSet, 0 )
+ : SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
index c57460891348..31535dd87bb5 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -29,7 +29,7 @@ namespace chart
{
//.............................................................................
-class NumberFormatDialog : public SfxSingleTabDialog
+class NumberFormatDialog : public SfxNoLayoutSingleTabDialog
{
public:
NumberFormatDialog(Window* pParent, SfxItemSet& rSet);
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();
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 91f292a4193e..78f8b60582c3 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -47,7 +47,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
,SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName)
- :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
+ :SfxNoLayoutSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
,m_bStopExecution(sal_False)
,m_pOutSet(_pItems)
@@ -76,7 +76,7 @@ short OTableSubscriptionDialog::Execute()
short nRet = RET_CANCEL;
if ( !m_bStopExecution )
{
- nRet = SfxSingleTabDialog::Execute();
+ nRet = SfxNoLayoutSingleTabDialog::Execute();
if ( nRet == RET_OK )
{
m_pOutSet->Put(*GetOutputItemSet());
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 31aa38076437..3c045ef40777 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -44,7 +44,7 @@ class ODbDataSourceAdministrationHelper;
//========================================================================
//= OTableSubscriptionDialog
//========================================================================
- class OTableSubscriptionDialog : public SfxSingleTabDialog, public IItemSetHelper
+ class OTableSubscriptionDialog : public SfxNoLayoutSingleTabDialog, public IItemSetHelper
{
::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
sal_Bool m_bStopExecution; // set when the dialog should not be executed
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index fb691d0f850f..7f62516bbb91 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2723,7 +2723,7 @@ namespace pcr
aCoreSet.Put( aFormatter );
// a tab dialog with a single page
- ::std::auto_ptr< SfxSingleTabDialog > pDialog( new SfxSingleTabDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet, 0 ) );
+ ::std::auto_ptr< SfxNoLayoutSingleTabDialog > pDialog( new SfxNoLayoutSingleTabDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet, 0 ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT( pFact, "CreateFactory fail!" );
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index a4b13ba0957a..e0cc29779922 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -228,7 +228,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl)
else
{
String aText;
- SfxSingleTabDialog* pDlg = new SfxSingleTabDialog( this, aDataSet, 42 );
+ SfxNoLayoutSingleTabDialog* pDlg = new SfxNoLayoutSingleTabDialog( this, aDataSet, 42 );
sal_Bool bRightPage = aCntSharedBox.IsChecked()
|| ( SVX_PAGE_LEFT != SvxPageUsage(nPageUsage) );
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index e76b6e1283b1..5084268d7592 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -353,7 +353,7 @@ OUString SdAbstractSfxDialog_Impl::GetText() const
return pDlg->GetText();
}
-//AbstractSfxSingleTabDialog_Impl end
+//AbstractSfxNoLayoutSingleTabDialog_Impl end
//AbstractSdVectorizeDlg_Impl begin
const GDIMetaFile& AbstractSdVectorizeDlg_Impl::GetGDIMetaFile() const
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 01c04d7984e9..b42311071a8c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -86,7 +86,7 @@ using namespace com::sun::star::lang;
SdActionDlg::SdActionDlg (
::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) :
- SfxSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ),
+ SfxNoLayoutSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ),
rOutAttrs ( *pAttr )
{
// FreeResource();
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index be1dc6010216..bcf23fa94492 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -42,7 +42,7 @@ class SdDrawDocument;
|* Effekte-SingleTab-Dialog
|*
\************************************************************************/
-class SdActionDlg : public SfxSingleTabDialog
+class SdActionDlg : public SfxNoLayoutSingleTabDialog
{
private:
const SfxItemSet& rOutAttrs;
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index d532f3cc9c09..141f082e1e2a 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -149,7 +149,7 @@ public:
};
-// class SfxSingleTabDialog --------------------------------------------------
+// class SfxNoLayoutSingleTabDialog --------------------------------------------------
struct SingleTabDlgImpl
{
@@ -167,13 +167,13 @@ struct SingleTabDlgImpl
typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
-class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
+class SFX2_DLLPUBLIC SfxNoLayoutSingleTabDialog : public SfxModalDialog
{
public:
- SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
- SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 );
+ SfxNoLayoutSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
+ SfxNoLayoutSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 );
- virtual ~SfxSingleTabDialog();
+ virtual ~SfxNoLayoutSingleTabDialog();
void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 );
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index 2b3bdbede9d0..b3b39d5161b3 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -119,7 +119,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxSingleTabDialog
+class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxNoLayoutSingleTabDialog
{
public:
SfxMacroAssignDlg(
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 341e591d20e3..31b39bd067e1 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -668,9 +668,9 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
}
-// SfxSingleTabDialog ----------------------------------------------------
+// SfxNoLayoutSingleTabDialog ----------------------------------------------------
-IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)