rpms/openoffice.org/devel openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch, NONE, 1.1 .cvsignore, 1.169, 1.170 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch, 1.1, 1.2 openoffice.org.spec, 1.1529, 1.1530 sources, 1.294, 1.295 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.7, NONE openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch, 1.1, NONE openoffice.org-3.0.0.ooo88815.oox.parallel.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jun 10 07:49:37 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19256
Modified Files:
.cvsignore openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
openoffice.org.spec sources
Added Files:
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
Removed Files:
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
openoffice.org-3.0.0.ooo88815.oox.parallel.patch
Log Message:
next version
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:
--- NEW FILE openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch ---
Index: inc/cmdid.h
===================================================================
RCS file: /cvs/sw/sw/inc/cmdid.h,v
retrieving revision 1.72
diff -u -r1.72 cmdid.h
--- openoffice.org.orig/sw/inc/cmdid.h 27 Jun 2007 13:12:47 -0000 1.72
+++ openoffice.org/sw/inc/cmdid.h 10 Jul 2007 12:54:59 -0000
@@ -539,6 +539,8 @@
#define FN_SET_PAGE_STYLE (FN_FORMAT + 93) /* Anwenden Seitenv. */
+#define FN_FORMAT_TITLEPAGE_DLG (FN_FORMAT + 98) /* Title Page */
+
#define FN_TABLE_REP (FN_FORMAT + 99) /* TableRepresentation */
#define FN_CONVERT_TEXT_TABLE (FN_FORMAT + 100) /* Konvertierung Text <-> Tabelle */
Index: inc/doc.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/doc.hxx,v
retrieving revision 1.138
diff -u -r1.138 doc.hxx
--- openoffice.org.orig/sw/inc/doc.hxx 27 Jun 2007 13:13:17 -0000 1.138
+++ openoffice.org/sw/inc/doc.hxx 10 Jul 2007 12:55:02 -0000
@@ -758,6 +758,7 @@
virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
+ VirtualDevice* ConstructVirtualDevice(bool bMSO_or_PDF=0) const;
virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
virtual const JobSetup* getJobsetup() const;
Index: inc/globals.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/globals.hrc,v
retrieving revision 1.16
diff -u -r1.16 globals.hrc
--- openoffice.org.orig/sw/inc/globals.hrc 2 May 2006 15:13:43 -0000 1.16
+++ openoffice.org/sw/inc/globals.hrc 10 Jul 2007 12:55:08 -0000
@@ -282,7 +282,9 @@
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104)
-//maximum: RC_GLOBALS_BEGIN + 119
+#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105)
+//maximum: RC_GLOBALS_BEGIN + 120
+
#if STR_DOC_STAT > RC_GLOBALS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -294,4 +296,5 @@
#define SID_WRT_SHELL (RC_GLOBALS_BEGIN + 117)
#define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
+#define DLG_TITLEPAGE (RC_GLOBALS_BEGIN + 119)
#endif // _GLOBALS_HRC
Index: inc/helpid.h
===================================================================
RCS file: /cvs/sw/sw/inc/helpid.h,v
retrieving revision 1.30
diff -u -r1.30 helpid.h
--- openoffice.org.orig/sw/inc/helpid.h 2 Jan 2007 16:45:16 -0000 1.30
+++ openoffice.org/sw/inc/helpid.h 10 Jul 2007 12:55:09 -0000
@@ -986,3 +986,4 @@
#define HID_MM_HEADER_12 (HID_BASE + 2279)
#define HID_MM_HEADER_13 (HID_BASE + 2280)
+#define HID_TITLEPAGE (HID_BASE + 2281)
Index: inc/rcid.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/rcid.hrc,v
retrieving revision 1.12
diff -u -r1.12 rcid.hrc
--- openoffice.org.orig/sw/inc/rcid.hrc 22 May 2007 16:20:20 -0000 1.12
+++ openoffice.org/sw/inc/rcid.hrc 10 Jul 2007 12:55:14 -0000
@@ -135,7 +135,7 @@
// globale Ressourcen
#define RC_GLOBALS_BEGIN RC_GLOBALS
-#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 119)
+#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
// Format-Vorlagen
#define RC_FMTUI_BEGIN RC_FMTUI
Index: inc/swabstdlg.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/swabstdlg.hxx,v
retrieving revision 1.13
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
@@ -477,6 +477,7 @@
SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: sdi/_basesh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_basesh.sdi,v
retrieving revision 1.16
diff -u -r1.16 _basesh.sdi
--- openoffice.org.orig/sw/sdi/_basesh.sdi 2 May 2006 15:13:56 -0000 1.16
+++ openoffice.org/sw/sdi/_basesh.sdi 10 Jul 2007 12:55:36 -0000
@@ -250,6 +250,12 @@
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ FN_FORMAT_TITLEPAGE_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
[
ExecMethod = ExecDlg ;
Index: sdi/swriter.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/swriter.sdi,v
retrieving revision 1.66
diff -u -r1.66 swriter.sdi
--- openoffice.org.orig/sw/sdi/swriter.sdi 27 Jun 2007 13:16:04 -0000 1.66
+++ openoffice.org/sw/sdi/swriter.sdi 10 Jul 2007 12:57:02 -0000
@@ -6330,6 +6330,31 @@
]
//--------------------------------------------------------------------------
+SfxVoidItem TitlePageDialog FN_FORMAT_TITLEPAGE_DLG
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Asynchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
SfxVoidItem PageDown FN_PAGEDOWN
()
[
Index: sdi/swslots.src
===================================================================
RCS file: /cvs/sw/sw/sdi/swslots.src,v
retrieving revision 1.131
diff -u -r1.131 swslots.src
--- openoffice.org.orig/sw/sdi/swslots.src 27 Jun 2007 13:16:20 -0000 1.131
+++ openoffice.org/sw/sdi/swslots.src 10 Jul 2007 12:57:02 -0000
@@ -307,6 +307,10 @@
{
Slotname [ en-US ] = "Page Settings";
};
+SfxSlotInfo FN_FORMAT_PAGE_DLG
+{
+ Slotname [ de ] = "~Title Page...";
+};
SfxSlotInfo FN_FORMAT_RESET
{
Slotname [ en-US ] = "Reset Font Attributes";
Index: source/ui/dialog/swdlgfact.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/swdlgfact.cxx,v
retrieving revision 1.13
diff -u -r1.13 swdlgfact.cxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.cxx 26 Apr 2007 09:06:20 -0000 1.13
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.cxx 10 Jul 2007 13:05:50 -0000
@@ -109,6 +109,7 @@
#include <instable.hxx> //add for SwInsTableDlg
#include <javaedit.hxx> //add for SwJavaEditDialog
#include <linenum.hxx> //add for SwLineNumberingDlg
+#include <titlepage.hxx> //add for SwTitlePageDlg
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
#include <mergetbl.hxx> //add for SwMergeTblDlg
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
@@ -1405,6 +1406,14 @@
return 0;
}
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *pParent )
+{
+ Dialog* pDlg = new SwTitlePageDlg( pParent );
+ if ( pDlg )
+ return new VclAbstractDialog_Impl( pDlg );
+ return 0;
+}
+
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Index: source/ui/dialog/swdlgfact.hxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/swdlgfact.hxx,v
retrieving revision 1.9
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
@@ -532,6 +532,7 @@
SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
+ virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Index: source/ui/inc/swmn_tmpl.hrc
===================================================================
RCS file: /cvs/sw/sw/source/ui/inc/swmn_tmpl.hrc,v
retrieving revision 1.13
diff -u -r1.13 swmn_tmpl.hrc
--- openoffice.org.orig/sw/source/ui/inc/swmn_tmpl.hrc 27 Jun 2007 13:25:09 -0000 1.13
+++ openoffice.org/sw/source/ui/inc/swmn_tmpl.hrc 10 Jul 2007 13:08:19 -0000
@@ -67,8 +67,13 @@
Identifier = FN_FORMAT_PAGE_DLG ; \
HelpID = FN_FORMAT_PAGE_DLG ; \
Text [ en-US ] = "Pa~ge..." ; \
- };
-
+ };\
+ MenuItem\
+ {\
+ Identifier = FN_FORMAT_TITLEPAGE_DLG ; \
+ HelpID = FN_FORMAT_TITLEPAGE_DLG ; \
+ Text [ en-US ] = "~Title Page..." ; \
+ };
#define MN_TEXT_ATTR\
MenuItem\
Index: source/ui/misc/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/makefile.mk,v
retrieving revision 1.12
diff -u -r1.12 makefile.mk
--- openoffice.org.orig/sw/source/ui/misc/makefile.mk 9 Sep 2005 10:35:47 -0000 1.12
+++ openoffice.org/sw/source/ui/misc/makefile.mk 10 Jul 2007 13:09:42 -0000
@@ -60,7 +60,8 @@
pgfnote.src \
pggrid.src \
redlndlg.src \
- srtdlg.src
+ srtdlg.src \
+ titlepage.src
SLOFILES = \
$(SLO)$/bookmark.obj \
@@ -72,6 +73,7 @@
$(SLO)$/insfnote.obj \
$(SLO)$/insrule.obj \
$(SLO)$/linenum.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/num.obj \
$(SLO)$/numberingtypelistbox.obj \
$(SLO)$/outline.obj \
Index: source/ui/shells/basesh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/shells/basesh.cxx,v
retrieving revision 1.81
diff -u -r1.81 basesh.cxx
--- openoffice.org.orig/sw/source/ui/shells/basesh.cxx 10 May 2007 16:22:02 -0000 1.81
+++ openoffice.org/sw/source/ui/shells/basesh.cxx 10 Jul 2007 13:10:07 -0000
@@ -2546,6 +2546,14 @@
switch ( nSlot )
{
+ case FN_FORMAT_TITLEPAGE_DLG:
+ {
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact->CreateTitlePageDlg( pMDI );
+ pDlg->Execute();
+ delete pDlg;
+ }
+ break;
case FN_FORMAT_PAGE_COLUMN_DLG:
case FN_FORMAT_PAGE_DLG:
{
Index: uiconfig/swriter/menubar/menubar.xml
===================================================================
RCS file: /cvs/sw/sw/uiconfig/swriter/menubar/menubar.xml,v
retrieving revision 1.28
diff -u -r1.28 menubar.xml
--- openoffice.org.orig/sw/uiconfig/swriter/menubar/menubar.xml 29 May 2007 14:49:53 -0000 1.28
+++ openoffice.org/sw/uiconfig/swriter/menubar/menubar.xml 10 Jul 2007 13:13:00 -0000
@@ -210,6 +210,7 @@
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
<menu:menuitem menu:id=".uno:PageDialog"/>
+ <menu:menuitem menu:id=".uno:TitlePageDialog"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:TransliterateMenu">
<menu:menupopup>
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
retrieving revision 1.61
diff -u -r1.61 makefile.mk
--- openoffice.org.orig/sw/util/makefile.mk 22 May 2007 16:41:25 -0000 1.61
+++ openoffice.org/sw/util/makefile.mk 10 Jul 2007 13:13:05 -0000
@@ -263,6 +263,7 @@
$(SLO)$/instable.obj \
$(SLO)$/insrule.obj \
$(SLO)$/javaedit.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/linenum.obj \
$(SLO)$/mailmrge.obj \
$(SLO)$/multmrk.obj \
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/inc/titlepage.hxx 2007-07-10 10:43:39.000000000 +0100
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#ifndef _SWTITLEPAGE_HXX
+#define _SWTITLEPAGE_HXX
+
+#ifndef _BASEDLGS_HXX //autogen
+#include <sfx2/basedlgs.hxx>
+#endif
+
+#ifndef _SFXTABDLG_HXX //autogen
+#include <sfx2/tabdlg.hxx>
+#endif
+
+#ifndef _SV_FIXED_HXX //autogen
+#include <vcl/fixed.hxx>
+#endif
+
+#ifndef _SV_FIELD_HXX //autogen
+#include <vcl/field.hxx>
+#endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
+
+#ifndef _LSTBOX_HXX //autogen
+#include <vcl/lstbox.hxx>
+#endif
+
+class Window;
+class SfxItemSet;
+class SwView;
+class SwWrtShell;
+class SwPageDesc;
+
+/*--------------------------------------------------------------------
+ Beschreibung: SingleTabDialog
+ --------------------------------------------------------------------*/
+
+class SwTitlePageDlg : public SfxModalDialog
+{
+private:
+ FixedLine aMakeInsertFL;
+ RadioButton aUseExistingPagesRB;
+ RadioButton aInsertNewPagesRB;
+ FixedText aPageCountFT;
+ NumericField aPageCountNF;
+ FixedText aPagePagesFT;
+
+ FixedLine aNumberingFL;
+ CheckBox aRestartNumberingCB;
+ FixedText aRestartNumberingFT;
+ NumericField aRestartNumberingNF;
+ CheckBox aSetPageNumberCB;
+ FixedText aSetPageNumberFT;
+ NumericField aSetPageNumberNF;
+
+ FixedLine aPagePropertiesFL;
+ ListBox aPagePropertiesLB;
+ PushButton aPagePropertiesPB;
+
+ FixedLine aBottomFL;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
+
+ const SwFmtPageDesc *mpPageFmtDesc;
+
+ SwPageDesc *mpTitleDesc;
+ const SwPageDesc *mpIndexDesc;
+ const SwPageDesc *mpNormalDesc;
+
+ void FillList();
+
+ DECL_LINK( OKHdl, Button * );
+ DECL_LINK( EditHdl, Button * );
+ DECL_LINK( RestartNumberingHdl, CheckBox* );
+ DECL_LINK( SetPageNumberHdl, CheckBox* );
+ DECL_LINK( UpHdl, NumericField * );
+ DECL_LINK( DownHdl, NumericField * );
+public:
+ SwTitlePageDlg( Window *pParent );
+ ~SwTitlePageDlg();
+};
+
+#endif
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.src 2007-07-10 09:58:33.000000000 +0100
@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+/* StarView ressource file */
+
+#ifndef _SFX_HRC
+#include <sfx2/sfx.hrc>
+#endif
+#ifndef _SVX_DIALOGS_HRC
+#include <svx/dialogs.hrc>
+#endif
+#include "globals.hrc"
+#include "misc.hrc"
+#include "titlepage.hrc"
+#include "helpid.h"
+/**************************************************************************/
+/* */
+/**************************************************************************/
+ModalDialog DLG_TITLEPAGE
+{
+ HelpID = HID_TITLEPAGE ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 216 , 169 ) ;
+ Text [ en-US ] = "Title Pages" ;
+ Moveable = TRUE ;
+
+ FixedLine FL_MAKEINSERT
+ {
+ Pos = MAP_APPFONT ( 6 , 5 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Make Title Pages" ;
+ Text [ x-comment ] = " ";
+ };
+ RadioButton RB_USE_EXISTING_PAGES
+ {
+ Pos = MAP_APPFONT ( 12 , 18 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text [ en-US ] = "Convert existing pages to title pages" ;
+ TabStop = TRUE ;
+ Group = TRUE ;
+ Text [ x-comment ] = " ";
+ };
+ RadioButton RB_INSERT_NEW_PAGES
+ {
+ Pos = MAP_APPFONT ( 12 , 34 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ Text [ en-US ] = "Insert new title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_PAGE_COUNT
+ {
+ Pos = MAP_APPFONT ( 12 , 50 ) ;
+ Size = MAP_APPFONT ( 80 , 8 ) ;
+ Text [ en-US ] = "Number of title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_PAGE_COUNT
+ {
+ Pos = MAP_APPFONT ( 80 , 50 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ FixedText FT_PAGE_PAGES
+ {
+ Pos = MAP_APPFONT ( 116 , 50 ) ;
+ Size = MAP_APPFONT ( 80 , 10 ) ;
+ Text [ en-US ] = "pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedLine FL_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 6 , 66 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Page Numbering" ;
+ Text [ x-comment ] = " ";
+ };
+ CheckBox CB_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 12, 79 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Reset Page Numbering after title pages" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 140 , 79 ) ;
+ Size = MAP_APPFONT ( 50 , 10 ) ;
+ Text [ en-US ] = "Page Number" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_RESTART_NUMBERING
+ {
+ Pos = MAP_APPFONT ( 180 , 79 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ CheckBox CB_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 12 , 93 ) ;
+ Size = MAP_APPFONT ( 150 , 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Set Page Number for first title page" ;
+ Text [ x-comment ] = " ";
+ };
+ FixedText FT_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 140 , 93 ) ;
+ Size = MAP_APPFONT ( 50 , 10 ) ;
+ Text [ en-US ] = "Page Number" ;
+ Text [ x-comment ] = " ";
+ };
+ NumericField NF_SET_PAGE_NUMBER
+ {
+ Pos = MAP_APPFONT ( 180 , 93 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Minimum = 1 ;
+ Maximum = 1000 ;
+ First = 1 ;
+ Last = 1000 ;
+ SpinSize = 1 ;
+ };
+ FixedLine FL_PAGE_PROPERTIES
+ {
+ Pos = MAP_APPFONT ( 6 , 109 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ Text [ en-US ] = "Edit Page Properties" ;
+ Text [ x-comment ] = " ";
+ };
+ ListBox LB_PAGE_PROPERTIES
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 12 , 122 ) ;
+ Size = MAP_APPFONT ( 150 , 80 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ CurPos = 0 ;
+ };
+ PushButton PB_PAGE_PROPERTIES
+ {
+ Pos = MAP_APPFONT ( 170 , 122 ) ;
+ Size = MAP_APPFONT ( 30 , 12 ) ;
+ Text [ en-US ] = "Edit..." ;
+ };
+ FixedLine FL_BOTTOM
+ {
+ Pos = MAP_APPFONT ( 6 , 138 ) ;
+ Size = MAP_APPFONT ( 204 , 8 ) ;
+ };
+ OKButton PB_OK
+ {
+ Pos = MAP_APPFONT ( 54 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ DefButton = TRUE ;
+ };
+ CancelButton PB_CANCEL
+ {
+ Pos = MAP_APPFONT ( 107 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ DefButton = TRUE ;
+ };
+ HelpButton PB_HELP
+ {
+ Pos = MAP_APPFONT ( 160 , 149 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
+};
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.hrc 2007-07-10 10:00:43.000000000 +0100
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+#define FL_MAKEINSERT 1
+#define RB_USE_EXISTING_PAGES 2
+#define RB_INSERT_NEW_PAGES 3
+#define FT_PAGE_COUNT 4
+#define NF_PAGE_COUNT 5
+#define FT_PAGE_PAGES 6
+#define FL_NUMBERING 7
+#define CB_RESTART_NUMBERING 8
+#define FT_RESTART_NUMBERING 9
+#define NF_RESTART_NUMBERING 10
+#define CB_SET_PAGE_NUMBER 11
+#define FT_SET_PAGE_NUMBER 12
+#define NF_SET_PAGE_NUMBER 13
+#define FL_PAGE_PROPERTIES 13
+#define LB_PAGE_PROPERTIES 14
+#define PB_PAGE_PROPERTIES 15
+#define FL_BOTTOM 16
+#define PB_OK 17
+#define PB_CANCEL 18
+#define PB_HELP 19
--- /dev/null 2007-07-10 08:03:57.022658051 +0100
+++ openoffice.org/sw/source/ui/misc/titlepage.cxx 2007-07-10 14:18:25.000000000 +0100
@@ -0,0 +1,368 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sw.hxx"
+
+#ifdef SW_DLLIMPLEMENTATION
+#undef SW_DLLIMPLEMENTATION
+#endif
+
+#ifndef _SFXVIEWFRM_HXX //autogen
+#include <sfx2/viewfrm.hxx>
+#endif
+
+#ifndef _SFXSTYLE_HXX //autogen
+#include <svtools/style.hxx>
+#endif
+
+#ifndef _SV_MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
+#endif
+
+#ifndef _SWVIEW_HXX //autogen
+#include <view.hxx>
+#endif
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _WRTSH_HXX //autogen
+#include <wrtsh.hxx>
+#endif
+#ifndef _POOLFMT_HXX
+#include <poolfmt.hxx>
+#endif
+#ifndef _SWDOCSH_HXX //autogen
+#include <docsh.hxx>
+#endif
+
+#ifndef _CHARFMT_HXX //autogen
+#include <charfmt.hxx>
+#endif
+
+#ifndef _DOCSTYLE_HXX //autogen
+#include <docstyle.hxx>
+#endif
+
+#include "fldbas.hxx"
+#include "lineinfo.hxx"
+#include "globals.hrc"
+#include "titlepage.hrc"
+#include "titlepage.hxx"
+#include "uitool.hxx"
+#include "fmtpdsc.hxx"
+#include "pagedesc.hxx"
+
+#include <IDocumentStylePoolAccess.hxx>
+
+namespace
+{
+ bool lcl_GetPageDesc(SwWrtShell *pSh, USHORT &rPageNo, const SwFmtPageDesc **ppPageFmtDesc)
+ {
+ bool bRet = false;
+ SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC );
+ if (pSh->GetCurAttr( aSet ))
+ {
+ const SfxPoolItem* pItem(0);
+ if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, TRUE, &pItem ) && pItem)
+ {
+ rPageNo = ((const SwFmtPageDesc *)pItem)->GetNumOffset();
+ if (ppPageFmtDesc)
+ (*ppPageFmtDesc) = (const SwFmtPageDesc *)(pItem->Clone());
+ bRet = true;
+ }
+ }
+ return bRet;
+ }
+
+ void lcl_ChangePage(SwWrtShell *pSh, USHORT nNoPages, USHORT nNewNumber, const SwPageDesc *pNewDesc)
+ {
+ pSh->SttDoc();
+ FASTBOOL bAllOk = true;
+
+ for (USHORT nI = 0; nI < nNoPages; ++nI)
+ bAllOk = pSh->SttNxtPg();
+
+ if (bAllOk);
+ {
+ const USHORT nCurIdx = pSh->GetCurPageDesc();
+ const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
+
+ const SwFmtPageDesc *pPageFmtDesc(0);
+ USHORT nDontCare;
+ lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
+
+ //If we want a new number then set it, otherwise reuse the existing one
+ USHORT nPgNo = nNewNumber ? nNewNumber : ( pPageFmtDesc ? pPageFmtDesc->GetNumOffset() : 0 );
+
+ //If we want a new descriptior then set it, otherwise reuse the existing one
+ if (!pNewDesc)
+ {
+ SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
+ if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+ else
+ {
+ SwFmtPageDesc aPageFmtDesc(pNewDesc);
+ if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+
+ delete pPageFmtDesc;
+ }
+ }
+
+ void lcl_PushCursor(SwWrtShell *pSh)
+ {
+ pSh->LockView( TRUE );
+ pSh->StartAllAction();
+ pSh->SwCrsrShell::Push();
+ pSh->SttDoc();
+ }
+
+ void lcl_PopCursor(SwWrtShell *pSh)
+ {
+ pSh->SwCrsrShell::Pop( FALSE );
+ pSh->EndAllAction();
+ pSh->LockView( FALSE );
+ }
+}
+
+/*
+ * Only include the Index page in the list if the page count implies one
+ * to reduce confusing things
+ */
+void SwTitlePageDlg::FillList()
+{
+ USHORT nTitlePages = aPageCountNF.GetValue();
+ aPagePropertiesLB.Clear();
+ if (mpTitleDesc)
+ aPagePropertiesLB.InsertEntry(mpTitleDesc->GetName());
+ if (nTitlePages > 1 && mpIndexDesc)
+ aPagePropertiesLB.InsertEntry(mpIndexDesc->GetName());
+ if (mpNormalDesc)
+ aPagePropertiesLB.InsertEntry(mpNormalDesc->GetName());
+ aPagePropertiesLB.SelectEntryPos(0);
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
+ SfxModalDialog( pParent, SW_RES(DLG_TITLEPAGE) ),
+#pragma warning (disable : 4355)
+ aMakeInsertFL ( this, SW_RES( FL_MAKEINSERT )),
+ aUseExistingPagesRB ( this, SW_RES( RB_USE_EXISTING_PAGES )),
+ aInsertNewPagesRB ( this, SW_RES( RB_INSERT_NEW_PAGES )),
+ aPageCountFT ( this, SW_RES( FT_PAGE_COUNT )),
+ aPageCountNF ( this, SW_RES( NF_PAGE_COUNT )),
+ aPagePagesFT ( this, SW_RES( FT_PAGE_PAGES )),
+ aNumberingFL ( this, SW_RES( FL_NUMBERING )),
+ aRestartNumberingCB ( this, SW_RES( CB_RESTART_NUMBERING )),
+ aRestartNumberingFT ( this, SW_RES( FT_RESTART_NUMBERING )),
+ aRestartNumberingNF ( this, SW_RES( NF_RESTART_NUMBERING )),
+ aSetPageNumberCB ( this, SW_RES( CB_SET_PAGE_NUMBER )),
+ aSetPageNumberFT ( this, SW_RES( FT_SET_PAGE_NUMBER )),
+ aSetPageNumberNF ( this, SW_RES( NF_SET_PAGE_NUMBER )),
+ aPagePropertiesFL ( this, SW_RES( FL_PAGE_PROPERTIES )),
+ aPagePropertiesLB ( this, SW_RES( LB_PAGE_PROPERTIES )),
+ aPagePropertiesPB ( this, SW_RES( PB_PAGE_PROPERTIES )),
+ aBottomFL ( this, SW_RES( FL_BOTTOM )),
+ aOkPB ( this, SW_RES( PB_OK )),
+ aCancelPB ( this, SW_RES( PB_CANCEL )),
+ aHelpPB ( this, SW_RES( PB_HELP )),
+ mpPageFmtDesc (0)
+#pragma warning (default : 4355)
+{
+ FreeResource();
+
+ aOkPB.SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
+ aRestartNumberingCB.SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
+ aSetPageNumberCB.SetClickHdl(LINK(this, SwTitlePageDlg, SetPageNumberHdl));
+
+ USHORT nSetPage = 1;
+ USHORT nResetPage = 1;
+ USHORT nTitlePages = 1;
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ lcl_PushCursor(pSh);
+
+ SwView& rView = pSh->GetView();
+ rView.InvalidateRulerPos();
+
+ bool bMaybeResetNumbering = false;
+
+ mpTitleDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_FIRST);
+ mpIndexDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_REGISTER);
+ mpNormalDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
+
+ if (lcl_GetPageDesc( pSh, nSetPage, &mpPageFmtDesc ))
+ {
+ if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
+ {
+ while (pSh->SttNxtPg())
+ {
+ const USHORT nCurIdx = pSh->GetCurPageDesc();
+ const SwPageDesc &rPageDesc = pSh->GetPageDesc( nCurIdx );
+
+ if (mpIndexDesc != &rPageDesc)
+ {
+ mpNormalDesc = &rPageDesc;
+ bMaybeResetNumbering = lcl_GetPageDesc(pSh, nResetPage, NULL);
+ break;
+ }
+ ++nTitlePages;
+ }
+ pSh->SttDoc();
+ }
+ }
+ lcl_PopCursor(pSh);
+
+ aUseExistingPagesRB.Check();
+ aPageCountNF.SetValue(nTitlePages);
+ aPageCountNF.SetUpHdl(LINK(this, SwTitlePageDlg, UpHdl));
+ aPageCountNF.SetDownHdl(LINK(this, SwTitlePageDlg, DownHdl));
+
+ if (bMaybeResetNumbering && nResetPage > 0)
+ {
+ aRestartNumberingCB.Check();
+ aRestartNumberingNF.SetValue(nResetPage);
+ }
+ aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
+
+ aSetPageNumberNF.SetValue(nSetPage);
+ if (nSetPage > 1)
+ aSetPageNumberCB.Check();
+ aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
+
+ FillList();
+ aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl));
+}
+
+IMPL_LINK(SwTitlePageDlg, UpHdl, NumericField *, EMPTYARG)
+{
+ if (aPageCountNF.GetValue() == 2)
+ FillList();
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, DownHdl, NumericField *, EMPTYARG)
+{
+ if (aPageCountNF.GetValue() == 1)
+ FillList();
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, RestartNumberingHdl, CheckBox*, EMPTYARG)
+{
+ aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
+ return 0;
+}
+
+IMPL_LINK(SwTitlePageDlg, SetPageNumberHdl, CheckBox*, EMPTYARG)
+{
+ aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
+ return 0;
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+__EXPORT SwTitlePageDlg::~SwTitlePageDlg()
+{
+ delete mpPageFmtDesc;
+}
+
+/*--------------------------------------------------------------------
+ Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SwTitlePageDlg, EditHdl, Button *, pBtn )
+{
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ SwView& rView = pSh->GetView();
+ rView.GetDocShell()->FormatPage(aPagePropertiesLB.GetSelectEntry(), false, pSh);
+ rView.InvalidateRulerPos();
+
+ return 0;
+}
+
+IMPL_LINK( SwTitlePageDlg, OKHdl, Button *, pBtn )
+{
+ SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
+ lcl_PushCursor(pSh);
+ pSh->StartUndo();
+
+ SwFmtPageDesc aTitleDesc(mpTitleDesc);
+
+ if (aSetPageNumberCB.IsChecked())
+ aTitleDesc.SetNumOffset(aSetPageNumberNF.GetValue());
+ else if (mpPageFmtDesc)
+ aTitleDesc.SetNumOffset(mpPageFmtDesc->GetNumOffset());
+
+ USHORT nNoPages = aPageCountNF.GetValue();
+ if (!aUseExistingPagesRB.IsChecked())
+ {
+ for (USHORT nI=0; nI < nNoPages; ++nI)
+ pSh->InsertPageBreak();
+ }
+ for (USHORT nI=1; nI < nNoPages; ++nI)
+ lcl_ChangePage(pSh, nI, 0, mpIndexDesc);
+
+ pSh->SttDoc();
+ pSh->SetAttr(aTitleDesc);
+
+ if (nNoPages > 1 && pSh->GotoPage(nNoPages, false))
+ {
+ SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
+ pSh->SetAttr(aPageFmtDesc);
+ }
+
+ if (aRestartNumberingCB.IsChecked() || nNoPages > 1)
+ {
+ USHORT nPgNo = aRestartNumberingCB.IsChecked() ? aRestartNumberingNF.GetValue() : 0;
+ const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : 0;
+ lcl_ChangePage(pSh, nNoPages, nPgNo, pNewDesc);
+ }
+
+ pSh->EndUndo();
+ lcl_PopCursor(pSh);
+ if (!aUseExistingPagesRB.IsChecked())
+ pSh->SttDoc();
+ EndDialog( RET_OK );
+ return 0;
+}
diff -ru openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 2007-07-10 14:35:38.000000000 +0100
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 2007-07-09 12:03:44.000000000 +0100
@@ -802,6 +802,11 @@
<value xml:lang="en-US">~Page...</value>
</prop>
</node>
+ <node oor:name=".uno:TitlePageDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Title Page...</value>
+ </prop>
+ </node>
<node oor:name=".uno:FormatColumns" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Co~lumns...</value>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- .cvsignore 5 Jun 2008 14:35:42 -0000 1.169
+++ .cvsignore 10 Jun 2008 07:48:56 -0000 1.170
@@ -4,4 +4,4 @@
Tigert-templates.tar.gz
unowinreg.dll
bengali.sdf
-DEV300_m17.tar.bz2
+DEV300_m18.tar.bz2
openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch:
Index: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch 6 Jun 2008 09:54:04 -0000 1.1
+++ openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch 10 Jun 2008 07:48:56 -0000 1.2
@@ -1,25 +1,34 @@
-Index: mozsrc/npapi.h
+Index: source/nsplugin/source/npshell.cxx
===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/npapi.h,v
-retrieving revision 1.2
-diff -u -r1.2 npapi.h
---- openoffice.org.orig/np_sdk/mozsrc/npapi.h 9 Feb 2006 14:04:20 -0000 1.2
-+++ openoffice.org/np_sdk/mozsrc/npapi.h 6 Jun 2008 09:46:09 -0000
-@@ -154,7 +154,7 @@
- #endif
+RCS file: /cvs/util/extensions/source/nsplugin/source/npshell.cxx,v
+retrieving revision 1.17
+diff -u -r1.17 npshell.cxx
+--- openoffice.org.orig/extensions/source/nsplugin/source/npshell.cxx 11 Apr 2008 10:07:27 -0000 1.17
++++ openoffice.org/extensions/source/nsplugin/source/npshell.cxx 6 Jun 2008 10:17:57 -0000
+@@ -75,6 +75,26 @@
+ #include <string.h>
+ #include <errno.h>
- #ifndef _UINT32
--# if defined(__alpha)
-+# if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
- typedef unsigned int uint32;
- # else /* __alpha */
- typedef unsigned long uint32;
-@@ -170,7 +170,7 @@
- #endif
++//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
++//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
++#ifdef UNIX
++# ifndef _UINT32
++# if defined(__alpha) || defined(__LP64__)
++ typedef unsigned int uint32;
++# else /* __alpha */
++ typedef unsigned long uint32;
++# endif
++# define _UINT32
++# endif
++# ifndef _INT32
++# if defined(__alpha) || defined(__LP64__)
++ typedef int int32;
++# else /* __alpha */
++ typedef long int32;
++# endif
++# define _INT32
++# endif
++#endif
- #ifndef _INT32
--# if defined(__alpha)
-+# if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
- typedef int int32;
- # else /* __alpha */
- typedef long int32;
+ #include "npapi.h"
+ #include "npshell.hxx"
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -u -r1.1529 -r1.1530
--- openoffice.org.spec 6 Jun 2008 09:54:04 -0000 1.1529
+++ openoffice.org.spec 10 Jun 2008 07:48:56 -0000 1.1530
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 17
+%define ooomilestone 18
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -105,7 +105,7 @@
Patch29: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
Patch30: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
Patch31: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch32: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch32: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
Patch33: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
Patch35: openoffice.org-2.3.0.ooo76649.httpencoding.patch
@@ -114,26 +114,24 @@
Patch38: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
Patch39: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
Patch40: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch41: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch42: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch43: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch44: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch45: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch46: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch47: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch48: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch49: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch50: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch51: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch52: openoffice.org-3.0.0.ooo88815.oox.parallel.patch
-Patch53: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch54: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch55: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
-Patch56: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch57: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch58: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch59: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch60: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch41: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch42: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch43: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch44: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch45: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch46: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch47: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch48: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch49: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch50: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch51: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch52: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch53: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
+Patch54: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch55: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch56: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch57: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch58: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1242,7 +1240,7 @@
%patch29 -p1 -b .ooo63159.sal.dtype.patch
%patch30 -p1 -b .ooo76393.sal.dynamicsection.patch
%patch31 -p1 -b .ooo80816.selinux.bridges.patch
-%patch32 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch32 -p1 -b .ooo7065.sw.titlepagedialog.patch
%patch33 -p1 -b .ooo80257.sd.textonlystyle.patch
tar xzf %{PATCH34}
%patch35 -p1 -b .ooo76649.httpencoding.patch
@@ -1251,26 +1249,24 @@
%patch38 -p1 -b .rh133741.alwaysgtk.vcl.patch
%patch39 -p1 -b .ooo85429.sw.a11ycrash.patch
%patch40 -p1 -b .ooo85448.emptyrpath.patch
-%patch41 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch42 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch43 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch44 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch45 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch46 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch47 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch48 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch49 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch50 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch51 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch52 -p1 -b .ooo88815.oox.parallel.patch
-%patch53 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch54 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch55 -p1 -b .ooo90071.chart2.negativecount.patch
-%patch56 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch57 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch58 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch59 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch60 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch41 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch42 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch43 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch44 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch45 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch46 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch47 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch48 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch49 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch50 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch51 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch52 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch53 -p1 -b .ooo90071.chart2.negativecount.patch
+%patch54 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch55 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch56 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch57 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch58 -p1 -b .ooo82545.np_sdk.x86_64.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3438,6 +3434,11 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Mon Jun 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.18-1
+- next version
+- drop integrated openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+- drop integrated openoffice.org-3.0.0.ooo88815.oox.parallel.patch
+
* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-2
- Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- sources 5 Jun 2008 14:35:42 -0000 1.294
+++ sources 10 Jun 2008 07:48:56 -0000 1.295
@@ -4,4 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-43a9638838899e23caf68fbce1c50abb DEV300_m17.tar.bz2
+e6bf91116aacb544db0f44e7f138b45b DEV300_m18.tar.bz2
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch DELETED ---
--- openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch DELETED ---
--- openoffice.org-3.0.0.ooo88815.oox.parallel.patch DELETED ---
More information about the fedora-extras-commits
mailing list