rpms/openoffice.org/devel openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.2, 1.3
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jul 10 14:48:40 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25285
Modified Files:
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
Log Message:
backport it
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:
Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 10 Jul 2007 13:37:56 -0000 1.2
+++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 10 Jul 2007 14:48:36 -0000 1.3
@@ -96,15 +96,14 @@
diff -u -r1.13 swabstdlg.hxx
--- openoffice.org.orig/sw/inc/swabstdlg.hxx 26 Apr 2007 08:48:16 -0000 1.13
+++ openoffice.org/sw/inc/swabstdlg.hxx 10 Jul 2007 12:55:16 -0000
-@@ -476,6 +476,8 @@
+@@ -476,6 +476,7 @@
SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( const ResId& rResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
-+
- virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
+ virtual VclAbstractDialog * CreateVclSwViewDialog( const ResId& rResId,
SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( const ResId& rResId,
Index: sdi/_basesh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_basesh.sdi,v
@@ -209,7 +208,7 @@
+ return 0;
+}
+
- VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
+ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( const ResId& rResId,
SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Index: source/ui/dialog/swdlgfact.hxx
@@ -219,17 +218,15 @@
diff -u -r1.9 swdlgfact.hxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.hxx 26 Apr 2007 09:06:34 -0000 1.9
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.hxx 10 Jul 2007 13:05:50 -0000
-@@ -531,6 +531,10 @@
+@@ -531,6 +531,8 @@
SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( const ResId& rResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
-+
+ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
-+
+
- virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
+ virtual VclAbstractDialog * CreateVclSwViewDialog( const ResId& rResId,
SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( const ResId& rResId,
Index: source/ui/inc/swmn_tmpl.hrc
===================================================================
RCS file: /cvs/sw/sw/source/ui/inc/swmn_tmpl.hrc,v
More information about the fedora-extras-commits
mailing list