summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
parent5f1e50030cdb3a4eacc3b78b2e197a7f57219bcb (diff)
rename SfxSingleTabDialog to SfxNoLayoutSingleTabDialog
Change-Id: I4922b719bf819879909e9949bf7946f20914d1e5
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx10
-rw-r--r--sfx2/inc/sfx2/macropg.hxx2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx14
3 files changed, 13 insertions, 13 deletions
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)
+IMPL_LINK_NOARG(SfxNoLayoutSingleTabDialog, OKHdl_Impl)
/* [Description]
@@ -718,7 +718,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
// -----------------------------------------------------------------------
-SfxSingleTabDialog::SfxSingleTabDialog
+SfxNoLayoutSingleTabDialog::SfxNoLayoutSingleTabDialog
(
Window *pParent,
const SfxItemSet& rSet,
@@ -744,7 +744,7 @@ SfxSingleTabDialog::SfxSingleTabDialog
// -----------------------------------------------------------------------
-SfxSingleTabDialog::SfxSingleTabDialog
+SfxNoLayoutSingleTabDialog::SfxNoLayoutSingleTabDialog
(
Window* pParent,
sal_uInt16 nUniqueId,
@@ -771,7 +771,7 @@ SfxSingleTabDialog::SfxSingleTabDialog
// -----------------------------------------------------------------------
-SfxSingleTabDialog::~SfxSingleTabDialog()
+SfxNoLayoutSingleTabDialog::~SfxNoLayoutSingleTabDialog()
{
delete pOKBtn;
delete pCancelBtn;
@@ -783,7 +783,7 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
// -----------------------------------------------------------------------
-void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
+void SfxNoLayoutSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
GetTabPageRanges pRangesFunc )
/* [Description]
@@ -796,7 +796,7 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
if ( !pOKBtn )
{
pOKBtn = new OKButton( this, WB_DEFBUTTON );
- pOKBtn->SetClickHdl( LINK( this, SfxSingleTabDialog, OKHdl_Impl ) );
+ pOKBtn->SetClickHdl( LINK( this, SfxNoLayoutSingleTabDialog, OKHdl_Impl ) );
}
if ( !pCancelBtn )
pCancelBtn = new CancelButton( this );