summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/factory/dlgfact.cxx22
-rw-r--r--cui/source/factory/dlgfact.hxx4
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx5
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx1
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx17
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx1
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx15
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx15
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx3
10 files changed, 83 insertions, 3 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 41124d6b9d2e..8664374846e9 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -196,6 +196,11 @@ void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -617,6 +622,12 @@ void AbstractSvxTransformTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxTransformTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -650,6 +661,12 @@ void AbstractSvxCaptionDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxCaptionDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -870,6 +887,11 @@ void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 3c97f2ba7c7e..080d8b760460 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -123,6 +123,7 @@ class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -341,6 +342,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -352,6 +354,7 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -498,6 +501,7 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index e755318546b5..642acfcffb50 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -121,6 +121,11 @@ void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void ScAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* ScAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 289bf0660ffd..b51439b44d9a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -373,6 +373,7 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 203c759074b9..c42e17bf067e 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -95,6 +95,12 @@ void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
+
+void SdAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -125,6 +131,12 @@ void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId );
}
+
+void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )
+{
+ static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const
{
return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet();
@@ -155,6 +167,11 @@ void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* SdPresLayoutTemplateDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index dd47cf294835..d1c9ef7726e8 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -78,6 +78,7 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -94,6 +95,7 @@ class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -108,6 +110,7 @@ class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString& rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 0465dbbf002a..d119eb772216 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -67,6 +67,7 @@ class SfxAbstractTabDialog : virtual public SfxAbstractDialog
{
public:
virtual void SetCurPageId( sal_uInt16 nId ) = 0;
+ virtual void SetCurPageId( const OString &rName ) = 0;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0;
virtual void SetInputSet( const SfxItemSet* pInSet ) = 0;
};
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index d9593c053c39..d25a72cf39be 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -185,9 +185,18 @@ public:
void RemoveTabPage( sal_uInt16 nId );
- void SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; }
- sal_uInt16 GetCurPageId() const
- { return m_pTabCtrl->GetCurPageId(); }
+ void SetCurPageId(sal_uInt16 nId)
+ {
+ nAppPageId = nId;
+ }
+ void SetCurPageId(const OString& rName)
+ {
+ nAppPageId = m_pTabCtrl->GetPageId(rName);
+ }
+ sal_uInt16 GetCurPageId() const
+ {
+ return m_pTabCtrl->GetCurPageId();
+ }
void ShowPage( sal_uInt16 nId );
// may provide local slots converted by Map
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index dd84f2340ae7..c928c8dca967 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -131,6 +131,11 @@ void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractTabDialog_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -249,6 +254,11 @@ void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSwLabDlg_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSwLabDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
@@ -309,6 +319,11 @@ void AbstractSwFldDlg_Impl::SetCurPageId( sal_uInt16 nId )
pDlg->SetCurPageId( nId );
}
+void AbstractSwFldDlg_Impl::SetCurPageId( const OString &rName )
+{
+ pDlg->SetCurPageId( rName );
+}
+
const SfxItemSet* AbstractSwFldDlg_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index cf4f4693c91c..880cf8cdad88 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -133,6 +133,7 @@ class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -189,6 +190,7 @@ class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
@@ -224,6 +226,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
virtual void SetCurPageId( sal_uInt16 nId );
+ virtual void SetCurPageId( const OString &rName );
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );