summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgt <gt@openoffice.org>2002-08-14 06:42:26 +0000
committergt <gt@openoffice.org>2002-08-14 06:42:26 +0000
commitb67f45364dd551afd2c3ab4b5710eb15c2fcf93e (patch)
treee194aa25faf4eb5d735e947508c83d4986de0216
parent6107b10b1603f176a34854ac4fb104506a701c74 (diff)
#99927# remove of SfxSmallMacroTabPage
-rw-r--r--sw/source/ui/dialog/macassgn.cxx11
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx8
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx11
-rw-r--r--sw/source/ui/inc/macassgn.hxx6
4 files changed, 21 insertions, 15 deletions
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index a2731979772a..44ef342f859d 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: macassgn.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $
+ * last change: $Author: gt $ $Date: 2002-08-14 07:40:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,7 +99,7 @@ SwMacroAssignDlg::SwMacroAssignDlg( Window* pParent, SfxItemSet& rSet,
: SfxMacroAssignDlg( pParent, rSet )
{
// TabPage holen
- SwMacroAssignDlg::AddEvents( *(SfxSmallMacroTabPage*) GetTabPage(), eType );
+ SwMacroAssignDlg::AddEvents( *(SfxMacroTabPage*) GetTabPage(), eType );
}
@@ -108,7 +108,7 @@ SwMacroAssignDlg::~SwMacroAssignDlg()
}
-void SwMacroAssignDlg::AddEvents( SfxSmallMacroTabPage& rPg, DlgEventType eType )
+void SwMacroAssignDlg::AddEvents( SfxMacroTabPage& rPg, DlgEventType eType )
{
const SfxItemSet& rSet = rPg.GetItemSet();
@@ -233,6 +233,9 @@ SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* pTbPg, const String& rLa
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:34 hr
+ initial import
+
Revision 1.40 2000/09/18 16:05:20 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 08fe13609d31..dab9263fd089 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tmpdlg.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: pb $ $Date: 2002-08-06 11:51:45 $
+ * last change: $Author: gt $ $Date: 2002-08-14 07:40:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -342,7 +342,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
AddTabPage(TP_COLUMN, SwColumnPage::Create,
SwColumnPage::GetRanges );
- AddTabPage( TP_MACRO_ASSIGN, SfxSmallMacroTabPage::Create, 0);
+ AddTabPage( TP_MACRO_ASSIGN, SfxMacroTabPage::Create, 0);
// Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
@@ -607,7 +607,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case TP_MACRO_ASSIGN:
- SwMacroAssignDlg::AddEvents( (SfxSmallMacroTabPage&)rPage, MACASSGN_ALLFRM);
+ SwMacroAssignDlg::AddEvents( (SfxMacroTabPage&)rPage, MACASSGN_ALLFRM);
break;
case RID_SVXPAGE_PICK_NUM:
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 386c367821b7..2c45253ae0ab 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: frmdlg.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:37 $
+ * last change: $Author: gt $ $Date: 2002-08-14 07:41:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -180,7 +180,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pFrame,
AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
}
AddTabPage(TP_BACKGROUND,SvxBackgroundTabPage::Create, 0);
- AddTabPage( TP_MACRO_ASSIGN, SfxSmallMacroTabPage::Create, 0);
+ AddTabPage( TP_MACRO_ASSIGN, SfxMacroTabPage::Create, 0);
AddTabPage( TP_BORDER, SvxBorderTabPage::Create, 0);
if(bHtmlMode)
@@ -258,7 +258,7 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case TP_MACRO_ASSIGN:
- SwMacroAssignDlg::AddEvents( (SfxSmallMacroTabPage&)rPage,
+ SwMacroAssignDlg::AddEvents( (SfxMacroTabPage&)rPage,
DLG_FRM_GRF == nDlgType ? MACASSGN_GRAPHIC
: DLG_FRM_OLE == nDlgType ? MACASSGN_OLE
: MACASSGN_FRMURL );
@@ -278,6 +278,9 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
/*-----------------25.02.94 21:22-------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:37 hr
+ initial import
+
Revision 1.196 2000/09/18 16:05:33 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx
index dc147435e931..7a770209982c 100644
--- a/sw/source/ui/inc/macassgn.hxx
+++ b/sw/source/ui/inc/macassgn.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: macassgn.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ * last change: $Author: gt $ $Date: 2002-08-14 07:42:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,7 +84,7 @@ public:
SwMacroAssignDlg( Window* pParent, SfxItemSet& rSet, DlgEventType eType );
virtual ~SwMacroAssignDlg();
- static void AddEvents( SfxSmallMacroTabPage& rPg, DlgEventType eType );
+ static void AddEvents( SfxMacroTabPage& rPg, DlgEventType eType );
static BOOL INetFmtDlg( Window* pParent, SwWrtShell& rSh,
SvxMacroItem*& rpINetItem );
};