View | Details | Raw Unified | Return to issue 7065
Collapse All | Expand All

(-)openoffice.org.orig/sw/inc/cmdid.h (+2 lines)
Lines 539-544 Link Here
539
539
540
#define FN_SET_PAGE_STYLE			(FN_FORMAT + 93)  /* Anwenden Seitenv. */
540
#define FN_SET_PAGE_STYLE			(FN_FORMAT + 93)  /* Anwenden Seitenv. */
541
541
542
#define FN_FORMAT_TITLEPAGE_DLG		(FN_FORMAT + 98)  /* Title Page */
543
542
544
543
#define FN_TABLE_REP                (FN_FORMAT + 99)  /* TableRepresentation */
545
#define FN_TABLE_REP                (FN_FORMAT + 99)  /* TableRepresentation */
544
#define FN_CONVERT_TEXT_TABLE		(FN_FORMAT + 100)  /* Konvertierung Text <-> Tabelle */
546
#define FN_CONVERT_TEXT_TABLE		(FN_FORMAT + 100)  /* Konvertierung Text <-> Tabelle */
(-)openoffice.org.orig/sw/inc/doc.hxx (+1 lines)
Lines 758-763 Link Here
758
    virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
758
    virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
759
    virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
759
    virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
760
    virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
760
    virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
761
    VirtualDevice* ConstructVirtualDevice(bool bMSO_or_PDF=0) const;
761
    virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
762
    virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
762
    virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
763
    virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
763
    virtual const JobSetup* getJobsetup() const;
764
    virtual const JobSetup* getJobsetup() const;
(-)openoffice.org.orig/sw/inc/globals.hrc (-1 / +4 lines)
Lines 282-288 Link Here
282
#define TP_SECTION_INDENTS          (RC_GLOBALS_BEGIN +  102)
282
#define TP_SECTION_INDENTS          (RC_GLOBALS_BEGIN +  102)
283
#define TP_OPTCOMPATIBILITY_PAGE	(RC_GLOBALS_BEGIN +  103)
283
#define TP_OPTCOMPATIBILITY_PAGE	(RC_GLOBALS_BEGIN +  103)
284
#define TP_MAILCONFIG               (RC_GLOBALS_BEGIN +  104)
284
#define TP_MAILCONFIG               (RC_GLOBALS_BEGIN +  104)
285
//maximum: RC_GLOBALS_BEGIN +  119
285
#define TP_TITLEPAGE                (RC_GLOBALS_BEGIN +  105)
286
//maximum: RC_GLOBALS_BEGIN +  120
287
286
288
287
#if STR_DOC_STAT > RC_GLOBALS_END
289
#if STR_DOC_STAT > RC_GLOBALS_END
288
#error Resource-Id Ueberlauf in #file, #line
290
#error Resource-Id Ueberlauf in #file, #line
Lines 294-297 Link Here
294
#define SID_WRT_SHELL               (RC_GLOBALS_BEGIN +  117)
296
#define SID_WRT_SHELL               (RC_GLOBALS_BEGIN +  117)
295
297
296
#define DLG_LINE_NUMBERING          (RC_GLOBALS_BEGIN +  118)
298
#define DLG_LINE_NUMBERING          (RC_GLOBALS_BEGIN +  118)
299
#define DLG_TITLEPAGE               (RC_GLOBALS_BEGIN +  119)
297
#endif // _GLOBALS_HRC
300
#endif // _GLOBALS_HRC
(-)openoffice.org.orig/sw/inc/helpid.h (+1 lines)
Lines 986-988 Link Here
986
#define HID_MM_HEADER_12                            (HID_BASE + 2279)
986
#define HID_MM_HEADER_12                            (HID_BASE + 2279)
987
#define HID_MM_HEADER_13                            (HID_BASE + 2280)
987
#define HID_MM_HEADER_13                            (HID_BASE + 2280)
988
988
989
#define HID_TITLEPAGE 						  		(HID_BASE + 2281)
(-)openoffice.org.orig/sw/inc/rcid.hrc (-1 / +1 lines)
Lines 135-141 Link Here
135
135
136
// globale Ressourcen
136
// globale Ressourcen
137
#define RC_GLOBALS_BEGIN        	RC_GLOBALS
137
#define RC_GLOBALS_BEGIN        	RC_GLOBALS
138
#define RC_GLOBALS_END          	(RC_GLOBALS_BEGIN + 119)
138
#define RC_GLOBALS_END          	(RC_GLOBALS_BEGIN + 120)
139
139
140
// Format-Vorlagen
140
// Format-Vorlagen
141
#define RC_FMTUI_BEGIN          	RC_FMTUI
141
#define RC_FMTUI_BEGIN          	RC_FMTUI
(-)openoffice.org.orig/sw/inc/swabstdlg.hxx (+1 lines)
Lines 477-482 Link Here
477
												SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
477
												SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
478
	virtual AbstractInsFootNoteDlg*		CreateInsFootNoteDlg( int nResId,
478
	virtual AbstractInsFootNoteDlg*		CreateInsFootNoteDlg( int nResId,
479
												Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
479
												Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
480
    virtual VclAbstractDialog*          CreateTitlePageDlg ( Window * pParent ) = 0;
480
	virtual VclAbstractDialog *			CreateVclSwViewDialog( int nResId,
481
	virtual VclAbstractDialog *			CreateVclSwViewDialog( int nResId,
481
												SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
482
												SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
482
	virtual AbstractInsertGrfRulerDlg*		CreateInsertGrfRulerDlg( int nResId,
483
	virtual AbstractInsertGrfRulerDlg*		CreateInsertGrfRulerDlg( int nResId,
(-)openoffice.org.orig/sw/sdi/_basesh.sdi (+6 lines)
Lines 250-255 Link Here
250
		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
250
		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
251
	]
251
	]
252
252
253
	FN_FORMAT_TITLEPAGE_DLG  // status(final|play)
254
	[
255
		ExecMethod = ExecDlg ;
256
		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
257
	]
258
253
	FN_FORMAT_PAGE_COLUMN_DLG  // status(final|play)
259
	FN_FORMAT_PAGE_COLUMN_DLG  // status(final|play)
254
	[
260
	[
255
		ExecMethod = ExecDlg ;
261
		ExecMethod = ExecDlg ;
(-)openoffice.org.orig/sw/sdi/swriter.sdi (+25 lines)
Lines 6330-6335 Link Here
6330
]
6330
]
6331
6331
6332
//--------------------------------------------------------------------------
6332
//--------------------------------------------------------------------------
6333
SfxVoidItem TitlePageDialog FN_FORMAT_TITLEPAGE_DLG
6334
()
6335
[
6336
	/* flags: */
6337
	AutoUpdate = FALSE,
6338
	Cachable = Cachable,
6339
	FastCall = FALSE,
6340
	HasCoreId = FALSE,
6341
	HasDialog = TRUE,
6342
	ReadOnlyDoc = FALSE,
6343
	Toggle = FALSE,
6344
	Container = FALSE,
6345
	RecordAbsolute = FALSE,
6346
	RecordPerItem;
6347
	Asynchron;
6348
6349
	/* config: */
6350
	AccelConfig = TRUE,
6351
	MenuConfig = TRUE,
6352
	StatusBarConfig = FALSE,
6353
	ToolBoxConfig = TRUE,
6354
	GroupId = GID_FORMAT;
6355
]
6356
6357
//--------------------------------------------------------------------------
6333
SfxVoidItem PageDown FN_PAGEDOWN
6358
SfxVoidItem PageDown FN_PAGEDOWN
6334
()
6359
()
6335
[
6360
[
(-)openoffice.org.orig/sw/sdi/swslots.src (+4 lines)
Lines 307-312 Link Here
307
{
307
{
308
	Slotname [ en-US ] = "Page Settings";
308
	Slotname [ en-US ] = "Page Settings";
309
};
309
};
310
SfxSlotInfo FN_FORMAT_PAGE_DLG
311
{
312
	Slotname [ de ] = "~Title Page...";
313
};
310
SfxSlotInfo FN_FORMAT_RESET
314
SfxSlotInfo FN_FORMAT_RESET
311
{
315
{
312
	Slotname [ en-US ] = "Reset Font Attributes";
316
	Slotname [ en-US ] = "Reset Font Attributes";
(-)openoffice.org.orig/sw/source/ui/dialog/swdlgfact.cxx (+9 lines)
Lines 109-114 Link Here
109
#include <instable.hxx> //add for SwInsTableDlg
109
#include <instable.hxx> //add for SwInsTableDlg
110
#include <javaedit.hxx> //add for SwJavaEditDialog
110
#include <javaedit.hxx> //add for SwJavaEditDialog
111
#include <linenum.hxx> //add for SwLineNumberingDlg
111
#include <linenum.hxx> //add for SwLineNumberingDlg
112
#include <titlepage.hxx> //add for SwTitlePageDlg
112
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
113
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
113
#include <mergetbl.hxx> //add for SwMergeTblDlg
114
#include <mergetbl.hxx> //add for SwMergeTblDlg
114
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
115
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
Lines 1405-1410 Link Here
1405
	return 0;
1406
	return 0;
1406
}
1407
}
1407
1408
1409
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *pParent )
1410
{
1411
    Dialog* pDlg = new SwTitlePageDlg( pParent );
1412
    if ( pDlg )
1413
        return new VclAbstractDialog_Impl( pDlg );
1414
    return 0;
1415
}
1416
1408
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, 
1417
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, 
1409
											SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
1418
											SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
1410
{
1419
{
(-)openoffice.org.orig/sw/source/ui/dialog/swdlgfact.hxx (+1 lines)
Lines 532-537 Link Here
532
												SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
532
												SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
533
	virtual AbstractInsFootNoteDlg*		CreateInsFootNoteDlg( int nResId,
533
	virtual AbstractInsFootNoteDlg*		CreateInsFootNoteDlg( int nResId,
534
												Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
534
												Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
535
   virtual VclAbstractDialog *         CreateTitlePageDlg ( Window * pParent );
535
	virtual VclAbstractDialog *			CreateVclSwViewDialog( int nResId, 
536
	virtual VclAbstractDialog *			CreateVclSwViewDialog( int nResId, 
536
												SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
537
												SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
537
	virtual AbstractInsertGrfRulerDlg*		CreateInsertGrfRulerDlg( int nResId,
538
	virtual AbstractInsertGrfRulerDlg*		CreateInsertGrfRulerDlg( int nResId,
(-)openoffice.org.orig/sw/source/ui/inc/swmn_tmpl.hrc (-2 / +7 lines)
Lines 67-74 Link Here
67
        Identifier = FN_FORMAT_PAGE_DLG ; \
67
        Identifier = FN_FORMAT_PAGE_DLG ; \
68
        HelpID = FN_FORMAT_PAGE_DLG ; \
68
        HelpID = FN_FORMAT_PAGE_DLG ; \
69
        Text [ en-US ] = "Pa~ge..." ; \
69
        Text [ en-US ] = "Pa~ge..." ; \
70
	};
70
    };\
71
71
    MenuItem\
72
    {\
73
        Identifier = FN_FORMAT_TITLEPAGE_DLG ; \
74
        HelpID = FN_FORMAT_TITLEPAGE_DLG ; \
75
        Text [ en-US ] = "~Title Page..." ; \
76
    };
72
77
73
#define MN_TEXT_ATTR\
78
#define MN_TEXT_ATTR\
74
    MenuItem\
79
    MenuItem\
(-)openoffice.org.orig/sw/source/ui/misc/makefile.mk (-1 / +3 lines)
Lines 60-66 Link Here
60
	pgfnote.src \
60
	pgfnote.src \
61
    pggrid.src \
61
    pggrid.src \
62
    redlndlg.src \
62
    redlndlg.src \
63
    srtdlg.src
63
    srtdlg.src \
64
    titlepage.src
64
65
65
SLOFILES =	\
66
SLOFILES =	\
66
		$(SLO)$/bookmark.obj \
67
		$(SLO)$/bookmark.obj \
Lines 72-77 Link Here
72
		$(SLO)$/insfnote.obj \
73
		$(SLO)$/insfnote.obj \
73
		$(SLO)$/insrule.obj \
74
		$(SLO)$/insrule.obj \
74
		$(SLO)$/linenum.obj \
75
		$(SLO)$/linenum.obj \
76
		$(SLO)$/titlepage.obj \
75
		$(SLO)$/num.obj \
77
		$(SLO)$/num.obj \
76
		$(SLO)$/numberingtypelistbox.obj \
78
		$(SLO)$/numberingtypelistbox.obj \
77
		$(SLO)$/outline.obj \
79
		$(SLO)$/outline.obj \
(-)openoffice.org.orig/sw/source/ui/shells/basesh.cxx (+8 lines)
Lines 2546-2551 Link Here
2546
2546
2547
	switch ( nSlot )
2547
	switch ( nSlot )
2548
	{
2548
	{
2549
		case FN_FORMAT_TITLEPAGE_DLG:
2550
		{
2551
			SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
2552
			VclAbstractDialog* pDlg = pFact->CreateTitlePageDlg( pMDI );
2553
			pDlg->Execute();
2554
			delete pDlg;
2555
		}
2556
		break;
2549
		case FN_FORMAT_PAGE_COLUMN_DLG:
2557
		case FN_FORMAT_PAGE_COLUMN_DLG:
2550
		case FN_FORMAT_PAGE_DLG:
2558
		case FN_FORMAT_PAGE_DLG:
2551
		{
2559
		{
(-)openoffice.org.orig/sw/uiconfig/swriter/menubar/menubar.xml (+1 lines)
Lines 210-215 Link Here
210
            <menu:menuitem menu:id=".uno:ParagraphDialog"/>
210
            <menu:menuitem menu:id=".uno:ParagraphDialog"/>
211
            <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
211
            <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
212
            <menu:menuitem menu:id=".uno:PageDialog"/>
212
            <menu:menuitem menu:id=".uno:PageDialog"/>
213
            <menu:menuitem menu:id=".uno:TitlePageDialog"/>
213
            <menu:menuseparator/>
214
            <menu:menuseparator/>
214
            <menu:menu menu:id=".uno:TransliterateMenu">
215
            <menu:menu menu:id=".uno:TransliterateMenu">
215
                <menu:menupopup>
216
                <menu:menupopup>
(-)openoffice.org.orig/sw/util/makefile.mk (+1 lines)
Lines 263-268 Link Here
263
    $(SLO)$/instable.obj \
263
    $(SLO)$/instable.obj \
264
    $(SLO)$/insrule.obj \
264
    $(SLO)$/insrule.obj \
265
    $(SLO)$/javaedit.obj \
265
    $(SLO)$/javaedit.obj \
266
    $(SLO)$/titlepage.obj \
266
    $(SLO)$/linenum.obj \
267
    $(SLO)$/linenum.obj \
267
    $(SLO)$/mailmrge.obj \
268
    $(SLO)$/mailmrge.obj \
268
    $(SLO)$/multmrk.obj \
269
    $(SLO)$/multmrk.obj \
(-) (+117 lines)
Added Link Here
1
/*************************************************************************
2
 *
3
 *  OpenOffice.org - a multi-platform office productivity suite
4
 *
5
 *  $RCSfile$
6
 *
7
 *  $Revision$
8
 *
9
 *  last change: $Author$ $Date$
10
 *
11
 *  The Contents of this file are made available subject to
12
 *  the terms of GNU Lesser General Public License Version 2.1.
13
 *
14
 *
15
 *    GNU Lesser General Public License Version 2.1
16
 *    =============================================
17
 *    Copyright 2005 by Sun Microsystems, Inc.
18
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
19
 *
20
 *    This library is free software; you can redistribute it and/or
21
 *    modify it under the terms of the GNU Lesser General Public
22
 *    License version 2.1, as published by the Free Software Foundation.
23
 *
24
 *    This library is distributed in the hope that it will be useful,
25
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
26
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
27
 *    Lesser General Public License for more details.
28
 *
29
 *    You should have received a copy of the GNU Lesser General Public
30
 *    License along with this library; if not, write to the Free Software
31
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32
 *    MA  02111-1307  USA
33
 *
34
 ************************************************************************/
35
#ifndef _SWTITLEPAGE_HXX
36
#define _SWTITLEPAGE_HXX
37
38
#ifndef _BASEDLGS_HXX //autogen
39
#include <sfx2/basedlgs.hxx>
40
#endif
41
42
#ifndef _SFXTABDLG_HXX //autogen
43
#include <sfx2/tabdlg.hxx>
44
#endif
45
46
#ifndef _SV_FIXED_HXX //autogen
47
#include <vcl/fixed.hxx>
48
#endif
49
50
#ifndef _SV_FIELD_HXX //autogen
51
#include <vcl/field.hxx>
52
#endif
53
#ifndef _NUMBERINGTYPELISTBOX_HXX
54
#include <numberingtypelistbox.hxx>
55
#endif
56
57
#ifndef _LSTBOX_HXX //autogen
58
#include <vcl/lstbox.hxx>
59
#endif
60
61
class Window;
62
class SfxItemSet;
63
class SwView;
64
class SwWrtShell;
65
class SwPageDesc;
66
67
/*--------------------------------------------------------------------
68
   Beschreibung: SingleTabDialog
69
 --------------------------------------------------------------------*/
70
71
class SwTitlePageDlg : public SfxModalDialog
72
{
73
private:
74
	FixedLine	aMakeInsertFL;
75
	RadioButton	aUseExistingPagesRB;
76
	RadioButton	aInsertNewPagesRB;
77
	FixedText	aPageCountFT;
78
	NumericField	aPageCountNF;
79
	FixedText	aPagePagesFT;
80
81
	FixedLine	aNumberingFL;
82
	CheckBox	aRestartNumberingCB;
83
	FixedText	aRestartNumberingFT;
84
	NumericField	aRestartNumberingNF;
85
	CheckBox	aSetPageNumberCB;
86
	FixedText	aSetPageNumberFT;
87
	NumericField	aSetPageNumberNF;
88
89
	FixedLine	aPagePropertiesFL;
90
	ListBox		aPagePropertiesLB;
91
	PushButton	aPagePropertiesPB;
92
93
        FixedLine	aBottomFL;
94
        OKButton	aOkPB;
95
        CancelButton	aCancelPB;
96
        HelpButton	aHelpPB;
97
98
	const SwFmtPageDesc *mpPageFmtDesc;
99
100
        SwPageDesc *mpTitleDesc;
101
        const SwPageDesc *mpIndexDesc;
102
        const SwPageDesc *mpNormalDesc;
103
104
	void FillList();
105
106
	DECL_LINK( OKHdl, Button * );
107
	DECL_LINK( EditHdl, Button * );
108
	DECL_LINK( RestartNumberingHdl, CheckBox* );
109
	DECL_LINK( SetPageNumberHdl, CheckBox* );
110
        DECL_LINK( UpHdl, NumericField * );
111
        DECL_LINK( DownHdl, NumericField * );
112
public:
113
	SwTitlePageDlg( Window *pParent );
114
	~SwTitlePageDlg();
115
};
116
117
#endif
(-) (+222 lines)
Added Link Here
1
/*************************************************************************
2
 *
3
 *  OpenOffice.org - a multi-platform office productivity suite
4
 *
5
 *  $RCSfile$
6
 *
7
 *  $Revision$
8
 *
9
 *  last change: $Author$ $Date$
10
 *
11
 *  The Contents of this file are made available subject to
12
 *  the terms of GNU Lesser General Public License Version 2.1.
13
 *
14
 *
15
 *    GNU Lesser General Public License Version 2.1
16
 *    =============================================
17
 *    Copyright 2005 by Sun Microsystems, Inc.
18
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
19
 *
20
 *    This library is free software; you can redistribute it and/or
21
 *    modify it under the terms of the GNU Lesser General Public
22
 *    License version 2.1, as published by the Free Software Foundation.
23
 *
24
 *    This library is distributed in the hope that it will be useful,
25
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
26
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
27
 *    Lesser General Public License for more details.
28
 *
29
 *    You should have received a copy of the GNU Lesser General Public
30
 *    License along with this library; if not, write to the Free Software
31
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32
 *    MA  02111-1307  USA
33
 *
34
 ************************************************************************/
35
/* StarView ressource file */
36
37
#ifndef _SFX_HRC
38
#include <sfx2/sfx.hrc>
39
#endif
40
#ifndef _SVX_DIALOGS_HRC
41
#include <svx/dialogs.hrc>
42
#endif
43
#include "globals.hrc"
44
#include "misc.hrc"
45
#include "titlepage.hrc"
46
#include "helpid.h"
47
/**************************************************************************/
48
/*                                                                        */
49
/**************************************************************************/
50
ModalDialog DLG_TITLEPAGE
51
{
52
	HelpID = HID_TITLEPAGE ;
53
	OutputSize = TRUE ;
54
	SVLook = TRUE ;
55
	Size = MAP_APPFONT ( 216 , 169 ) ;
56
	Text [ en-US ] = "Title Pages" ;
57
	Moveable = TRUE ;
58
59
	FixedLine FL_MAKEINSERT
60
	{
61
		Pos = MAP_APPFONT ( 6 , 5 ) ;
62
		Size = MAP_APPFONT ( 204 , 8 ) ;
63
		Text [ en-US ] = "Make Title Pages" ;
64
		Text [ x-comment ] = " ";
65
	};
66
	RadioButton RB_USE_EXISTING_PAGES
67
	{
68
		Pos = MAP_APPFONT ( 12 , 18 ) ;
69
		Size = MAP_APPFONT ( 150 , 10 ) ;
70
		Text [ en-US ] = "Convert existing pages to title pages" ;
71
		TabStop = TRUE ;
72
		Group = TRUE ;
73
		Text [ x-comment ] = " ";
74
	};
75
	RadioButton RB_INSERT_NEW_PAGES
76
	{
77
		Pos = MAP_APPFONT ( 12 , 34 ) ;
78
		Size = MAP_APPFONT ( 150 , 10 ) ;
79
		Text [ en-US ] = "Insert new title pages" ;
80
		Text [ x-comment ] = " ";
81
	};
82
	FixedText FT_PAGE_COUNT
83
	{
84
		Pos = MAP_APPFONT ( 12 , 50 ) ;
85
		Size = MAP_APPFONT ( 80 , 8 ) ;
86
		Text [ en-US ] = "Number of title pages" ;
87
		Text [ x-comment ] = " ";
88
	};
89
	NumericField NF_PAGE_COUNT
90
	{
91
		Pos = MAP_APPFONT ( 80 , 50 ) ;
92
		Size = MAP_APPFONT ( 30 , 12 ) ;
93
		Border = TRUE ;
94
		TabStop = TRUE ;
95
		Left = TRUE ;
96
		Repeat = TRUE ;
97
		Spin = TRUE ;
98
		Minimum = 1 ;
99
		Maximum = 1000 ;
100
		First = 1 ;
101
		Last = 1000 ;
102
		SpinSize = 1 ;
103
	};
104
	FixedText FT_PAGE_PAGES
105
	{
106
		Pos = MAP_APPFONT ( 116 , 50 ) ;
107
		Size = MAP_APPFONT ( 80 , 10 ) ;
108
		Text [ en-US ] = "pages" ;
109
		Text [ x-comment ] = " ";
110
	};
111
	FixedLine FL_NUMBERING
112
	{
113
		Pos = MAP_APPFONT ( 6 , 66 ) ;
114
		Size = MAP_APPFONT ( 204 , 8 ) ;
115
		Text [ en-US ] = "Page Numbering" ;
116
		Text [ x-comment ] = " ";
117
	};
118
	CheckBox CB_RESTART_NUMBERING
119
	{
120
		Pos = MAP_APPFONT ( 12, 79 ) ;
121
		Size = MAP_APPFONT ( 150 , 10 ) ;
122
		TabStop = TRUE ;
123
		Text [ en-US ] = "Reset Page Numbering after title pages" ;
124
		Text [ x-comment ] = " ";
125
	};
126
	FixedText FT_RESTART_NUMBERING
127
	{
128
		Pos = MAP_APPFONT ( 140 , 79 ) ;
129
		Size = MAP_APPFONT ( 50 , 10 ) ;
130
		Text [ en-US ] = "Page Number" ;
131
		Text [ x-comment ] = " ";
132
	};
133
	NumericField NF_RESTART_NUMBERING
134
	{
135
		Pos = MAP_APPFONT ( 180 , 79 ) ;
136
		Size = MAP_APPFONT ( 30 , 12 ) ;
137
		Border = TRUE ;
138
		TabStop = TRUE ;
139
		Left = TRUE ;
140
		Repeat = TRUE ;
141
		Spin = TRUE ;
142
		Minimum = 1 ;
143
		Maximum = 1000 ;
144
		First = 1 ;
145
		Last = 1000 ;
146
		SpinSize = 1 ;
147
	};
148
	CheckBox CB_SET_PAGE_NUMBER
149
	{
150
		Pos = MAP_APPFONT ( 12 , 93 ) ;
151
		Size = MAP_APPFONT ( 150 , 10 ) ;
152
		TabStop = TRUE ;
153
		Text [ en-US ] = "Set Page Number for first title page" ;
154
		Text [ x-comment ] = " ";
155
	};
156
	FixedText FT_SET_PAGE_NUMBER
157
	{
158
		Pos = MAP_APPFONT ( 140 , 93 ) ;
159
		Size = MAP_APPFONT ( 50 , 10 ) ;
160
		Text [ en-US ] = "Page Number" ;
161
		Text [ x-comment ] = " ";
162
	};
163
	NumericField NF_SET_PAGE_NUMBER
164
	{
165
		Pos = MAP_APPFONT ( 180 , 93 ) ;
166
		Size = MAP_APPFONT ( 30 , 12 ) ;
167
		Border = TRUE ;
168
		TabStop = TRUE ;
169
		Left = TRUE ;
170
		Repeat = TRUE ;
171
		Spin = TRUE ;
172
		Minimum = 1 ;
173
		Maximum = 1000 ;
174
		First = 1 ;
175
		Last = 1000 ;
176
		SpinSize = 1 ;
177
	};
178
	FixedLine FL_PAGE_PROPERTIES
179
	{
180
		Pos = MAP_APPFONT ( 6 , 109 ) ;
181
		Size = MAP_APPFONT ( 204 , 8 ) ;
182
		Text [ en-US ] = "Edit Page Properties" ;
183
		Text [ x-comment ] = " ";
184
	};
185
	ListBox LB_PAGE_PROPERTIES
186
	{
187
		Border = TRUE ;
188
		Pos = MAP_APPFONT ( 12 , 122 ) ;
189
		Size = MAP_APPFONT ( 150 , 80 ) ;
190
		TabStop = TRUE ;
191
		DropDown = TRUE ;
192
		CurPos = 0 ;
193
	};
194
	PushButton PB_PAGE_PROPERTIES
195
	{
196
                Pos = MAP_APPFONT ( 170 , 122 ) ;
197
		Size = MAP_APPFONT ( 30 , 12 ) ;
198
		Text [ en-US ] = "Edit..." ;
199
	};
200
	FixedLine FL_BOTTOM
201
	{
202
		Pos = MAP_APPFONT ( 6 , 138 ) ;
203
		Size = MAP_APPFONT ( 204 , 8 ) ;
204
	};
205
	OKButton PB_OK
206
	{
207
		Pos = MAP_APPFONT ( 54 , 149 ) ;
208
		Size = MAP_APPFONT ( 50 , 14 ) ;
209
		DefButton = TRUE ;
210
	};
211
	CancelButton PB_CANCEL
212
	{
213
		Pos = MAP_APPFONT ( 107 , 149 ) ;
214
		Size = MAP_APPFONT ( 50 , 14 ) ;
215
		DefButton = TRUE ;
216
	};
217
	HelpButton PB_HELP
218
	{
219
		Pos = MAP_APPFONT ( 160 , 149 ) ;
220
		Size = MAP_APPFONT ( 50 , 14 ) ;
221
	};
222
};
(-) (+54 lines)
Added Link Here
1
/*************************************************************************
2
 *
3
 *  OpenOffice.org - a multi-platform office productivity suite
4
 *
5
 *  $RCSfile$
6
 *
7
 *  $Revision$
8
 *
9
 *  last change: $Author$ $Date$
10
 *
11
 *  The Contents of this file are made available subject to
12
 *  the terms of GNU Lesser General Public License Version 2.1.
13
 *
14
 *
15
 *    GNU Lesser General Public License Version 2.1
16
 *    =============================================
17
 *    Copyright 2005 by Sun Microsystems, Inc.
18
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
19
 *
20
 *    This library is free software; you can redistribute it and/or
21
 *    modify it under the terms of the GNU Lesser General Public
22
 *    License version 2.1, as published by the Free Software Foundation.
23
 *
24
 *    This library is distributed in the hope that it will be useful,
25
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
26
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
27
 *    Lesser General Public License for more details.
28
 *
29
 *    You should have received a copy of the GNU Lesser General Public
30
 *    License along with this library; if not, write to the Free Software
31
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32
 *    MA  02111-1307  USA
33
 *
34
 ************************************************************************/
35
#define FL_MAKEINSERT         1
36
#define RB_USE_EXISTING_PAGES 2
37
#define RB_INSERT_NEW_PAGES   3
38
#define FT_PAGE_COUNT         4
39
#define NF_PAGE_COUNT         5
40
#define FT_PAGE_PAGES         6
41
#define FL_NUMBERING          7
42
#define CB_RESTART_NUMBERING  8
43
#define FT_RESTART_NUMBERING  9
44
#define NF_RESTART_NUMBERING 10
45
#define CB_SET_PAGE_NUMBER   11
46
#define FT_SET_PAGE_NUMBER   12
47
#define NF_SET_PAGE_NUMBER   13
48
#define FL_PAGE_PROPERTIES   13
49
#define LB_PAGE_PROPERTIES   14
50
#define PB_PAGE_PROPERTIES   15
51
#define FL_BOTTOM            16
52
#define PB_OK                17
53
#define PB_CANCEL            18
54
#define PB_HELP              19
(-) (+368 lines)
Added Link Here
1
/*************************************************************************
2
 *
3
 *  OpenOffice.org - a multi-platform office productivity suite
4
 *
5
 *  $RCSfile$
6
 *
7
 *  $Revision$
8
 *
9
 *  last change: $Author$ $Date$
10
 *
11
 *  The Contents of this file are made available subject to
12
 *  the terms of GNU Lesser General Public License Version 2.1.
13
 *
14
 *
15
 *    GNU Lesser General Public License Version 2.1
16
 *    =============================================
17
 *    Copyright 2005 by Sun Microsystems, Inc.
18
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
19
 *
20
 *    This library is free software; you can redistribute it and/or
21
 *    modify it under the terms of the GNU Lesser General Public
22
 *    License version 2.1, as published by the Free Software Foundation.
23
 *
24
 *    This library is distributed in the hope that it will be useful,
25
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
26
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
27
 *    Lesser General Public License for more details.
28
 *
29
 *    You should have received a copy of the GNU Lesser General Public
30
 *    License along with this library; if not, write to the Free Software
31
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32
 *    MA  02111-1307  USA
33
 *
34
 ************************************************************************/
35
36
// MARKER(update_precomp.py): autogen include statement, do not remove
37
#include "precompiled_sw.hxx"
38
39
#ifdef SW_DLLIMPLEMENTATION
40
#undef SW_DLLIMPLEMENTATION
41
#endif
42
43
#ifndef _SFXVIEWFRM_HXX //autogen
44
#include <sfx2/viewfrm.hxx>
45
#endif
46
47
#ifndef _SFXSTYLE_HXX //autogen
48
#include <svtools/style.hxx>
49
#endif
50
51
#ifndef _SV_MSGBOX_HXX //autogen
52
#include <vcl/msgbox.hxx>
53
#endif
54
55
#ifndef _SWVIEW_HXX //autogen
56
#include <view.hxx>
57
#endif
58
#ifndef _SWMODULE_HXX
59
#include <swmodule.hxx>
60
#endif
61
#ifndef _WRTSH_HXX //autogen
62
#include <wrtsh.hxx>
63
#endif
64
#ifndef _POOLFMT_HXX
65
#include <poolfmt.hxx>
66
#endif
67
#ifndef _SWDOCSH_HXX //autogen
68
#include <docsh.hxx>
69
#endif
70
71
#ifndef _CHARFMT_HXX //autogen
72
#include <charfmt.hxx>
73
#endif
74
75
#ifndef _DOCSTYLE_HXX //autogen
76
#include <docstyle.hxx>
77
#endif
78
79
#include "fldbas.hxx"
80
#include "lineinfo.hxx"
81
#include "globals.hrc"
82
#include "titlepage.hrc"
83
#include "titlepage.hxx"
84
#include "uitool.hxx"
85
#include "fmtpdsc.hxx"
86
#include "pagedesc.hxx"
87
88
#include <IDocumentStylePoolAccess.hxx>
89
90
namespace
91
{
92
	bool lcl_GetPageDesc(SwWrtShell *pSh, USHORT &rPageNo, const SwFmtPageDesc **ppPageFmtDesc)
93
	{
94
		bool bRet = false;
95
		SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC );
96
		if (pSh->GetCurAttr( aSet ))
97
		{
98
			const SfxPoolItem* pItem(0);
99
			if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, TRUE, &pItem ) && pItem)
100
			{
101
				rPageNo = ((const SwFmtPageDesc *)pItem)->GetNumOffset();
102
				if (ppPageFmtDesc)
103
					(*ppPageFmtDesc) = (const SwFmtPageDesc *)(pItem->Clone());
104
				bRet = true;
105
			}
106
		}
107
		return bRet;
108
	}
109
110
        void lcl_ChangePage(SwWrtShell *pSh, USHORT nNoPages, USHORT nNewNumber, const SwPageDesc *pNewDesc)
111
	{
112
		pSh->SttDoc();
113
		FASTBOOL bAllOk = true;
114
		
115
		for (USHORT nI = 0; nI < nNoPages; ++nI)
116
			bAllOk = pSh->SttNxtPg();
117
		
118
		if (bAllOk);
119
		{
120
		    const USHORT nCurIdx = pSh->GetCurPageDesc();
121
		    const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
122
123
		    const SwFmtPageDesc *pPageFmtDesc(0);
124
		    USHORT nDontCare;
125
		    lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
126
127
		    //If we want a new number then set it, otherwise reuse the existing one
128
		    USHORT nPgNo = nNewNumber ? nNewNumber : ( pPageFmtDesc ? pPageFmtDesc->GetNumOffset() : 0 );
129
130
		    //If we want a new descriptior then set it, otherwise reuse the existing one
131
		    if (!pNewDesc)
132
		    {
133
			SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
134
			if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
135
			pSh->SetAttr(aPageFmtDesc);
136
		    }
137
		    else
138
		    {
139
			SwFmtPageDesc aPageFmtDesc(pNewDesc);
140
			if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
141
			pSh->SetAttr(aPageFmtDesc);
142
		    }
143
144
		    delete pPageFmtDesc;
145
		}
146
	}
147
148
	void lcl_PushCursor(SwWrtShell *pSh)
149
	{
150
		pSh->LockView( TRUE );
151
		pSh->StartAllAction();
152
		pSh->SwCrsrShell::Push();
153
    		pSh->SttDoc();
154
	}
155
156
	void lcl_PopCursor(SwWrtShell *pSh)
157
	{
158
		pSh->SwCrsrShell::Pop( FALSE );
159
		pSh->EndAllAction();
160
        	pSh->LockView( FALSE );
161
	}
162
}
163
164
/*
165
 * Only include the Index page in the list if the page count implies one
166
 * to reduce confusing things
167
 */
168
void SwTitlePageDlg::FillList()
169
{
170
	USHORT nTitlePages = aPageCountNF.GetValue();
171
	aPagePropertiesLB.Clear();
172
	if (mpTitleDesc)
173
		aPagePropertiesLB.InsertEntry(mpTitleDesc->GetName());
174
	if (nTitlePages > 1 && mpIndexDesc)
175
		aPagePropertiesLB.InsertEntry(mpIndexDesc->GetName());
176
	if (mpNormalDesc)
177
		aPagePropertiesLB.InsertEntry(mpNormalDesc->GetName());
178
        aPagePropertiesLB.SelectEntryPos(0);
179
}
180
181
/*--------------------------------------------------------------------
182
	Beschreibung:
183
 --------------------------------------------------------------------*/
184
185
SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
186
	SfxModalDialog( pParent, SW_RES(DLG_TITLEPAGE) ),
187
#pragma warning (disable : 4355)
188
	aMakeInsertFL		( this, SW_RES( FL_MAKEINSERT )),
189
	aUseExistingPagesRB	( this, SW_RES( RB_USE_EXISTING_PAGES )),
190
	aInsertNewPagesRB	( this, SW_RES( RB_INSERT_NEW_PAGES )),
191
	aPageCountFT		( this, SW_RES( FT_PAGE_COUNT )),
192
	aPageCountNF		( this, SW_RES( NF_PAGE_COUNT )),
193
	aPagePagesFT		( this, SW_RES( FT_PAGE_PAGES )),
194
	aNumberingFL		( this, SW_RES( FL_NUMBERING )),
195
	aRestartNumberingCB	( this, SW_RES( CB_RESTART_NUMBERING )),
196
	aRestartNumberingFT	( this, SW_RES( FT_RESTART_NUMBERING )),
197
	aRestartNumberingNF	( this, SW_RES( NF_RESTART_NUMBERING )),
198
	aSetPageNumberCB	( this, SW_RES( CB_SET_PAGE_NUMBER )),
199
	aSetPageNumberFT	( this, SW_RES( FT_SET_PAGE_NUMBER )),
200
	aSetPageNumberNF	( this, SW_RES( NF_SET_PAGE_NUMBER )),
201
	aPagePropertiesFL	( this, SW_RES( FL_PAGE_PROPERTIES )),
202
	aPagePropertiesLB	( this, SW_RES( LB_PAGE_PROPERTIES )),
203
	aPagePropertiesPB	( this, SW_RES( PB_PAGE_PROPERTIES )),
204
        aBottomFL		( this, SW_RES( FL_BOTTOM )),
205
        aOkPB			( this, SW_RES( PB_OK )),
206
        aCancelPB		( this, SW_RES( PB_CANCEL )),
207
        aHelpPB			( this, SW_RES( PB_HELP )),
208
	mpPageFmtDesc		(0)
209
#pragma warning (default : 4355)
210
{
211
	FreeResource();
212
213
        aOkPB.SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
214
        aRestartNumberingCB.SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
215
	aSetPageNumberCB.SetClickHdl(LINK(this, SwTitlePageDlg, SetPageNumberHdl));
216
217
	USHORT nSetPage = 1;
218
	USHORT nResetPage = 1;
219
	USHORT nTitlePages = 1;
220
	SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
221
	lcl_PushCursor(pSh);
222
223
	SwView& rView = pSh->GetView();
224
	rView.InvalidateRulerPos();
225
226
	bool bMaybeResetNumbering = false;
227
228
	mpTitleDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_FIRST);
229
	mpIndexDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_REGISTER);
230
	mpNormalDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
231
232
	if (lcl_GetPageDesc( pSh, nSetPage, &mpPageFmtDesc ))
233
	{
234
    		if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
235
    		{
236
			while (pSh->SttNxtPg())
237
			{
238
                               	const USHORT nCurIdx = pSh->GetCurPageDesc();
239
                               	const SwPageDesc &rPageDesc = pSh->GetPageDesc( nCurIdx );
240
					
241
        			if (mpIndexDesc != &rPageDesc)
242
				{
243
					mpNormalDesc = &rPageDesc;
244
        				bMaybeResetNumbering = lcl_GetPageDesc(pSh, nResetPage, NULL);
245
       					break;
246
				}
247
				++nTitlePages;
248
			}
249
    			pSh->SttDoc();
250
    		}
251
        }
252
	lcl_PopCursor(pSh);
253
254
        aUseExistingPagesRB.Check();
255
        aPageCountNF.SetValue(nTitlePages);
256
        aPageCountNF.SetUpHdl(LINK(this, SwTitlePageDlg, UpHdl));
257
        aPageCountNF.SetDownHdl(LINK(this, SwTitlePageDlg, DownHdl));
258
259
	if (bMaybeResetNumbering && nResetPage > 0)
260
	{
261
        	aRestartNumberingCB.Check();
262
        	aRestartNumberingNF.SetValue(nResetPage);
263
	}
264
	aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
265
266
        aSetPageNumberNF.SetValue(nSetPage);
267
	if (nSetPage > 1)
268
        	aSetPageNumberCB.Check();
269
	aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
270
271
	FillList();
272
        aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl));
273
}
274
275
IMPL_LINK(SwTitlePageDlg, UpHdl, NumericField *, EMPTYARG)
276
{
277
	if (aPageCountNF.GetValue() == 2)
278
		FillList();
279
        return 0;
280
}
281
282
IMPL_LINK(SwTitlePageDlg, DownHdl, NumericField *, EMPTYARG)
283
{
284
	if (aPageCountNF.GetValue() == 1)
285
		FillList();
286
        return 0;
287
}
288
289
IMPL_LINK(SwTitlePageDlg, RestartNumberingHdl, CheckBox*, EMPTYARG)
290
{
291
    aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
292
    return 0;
293
}
294
295
IMPL_LINK(SwTitlePageDlg, SetPageNumberHdl, CheckBox*, EMPTYARG)
296
{
297
    aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
298
    return 0;
299
}
300
301
/*--------------------------------------------------------------------
302
	Beschreibung:
303
 --------------------------------------------------------------------*/
304
305
__EXPORT SwTitlePageDlg::~SwTitlePageDlg()
306
{
307
	delete mpPageFmtDesc;
308
}
309
310
/*--------------------------------------------------------------------
311
	 Beschreibung:
312
 --------------------------------------------------------------------*/
313
314
IMPL_LINK( SwTitlePageDlg, EditHdl, Button *, pBtn )
315
{
316
    SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
317
    SwView& rView = pSh->GetView();
318
    rView.GetDocShell()->FormatPage(aPagePropertiesLB.GetSelectEntry(), false, pSh);
319
    rView.InvalidateRulerPos();
320
321
    return 0;
322
}
323
324
IMPL_LINK( SwTitlePageDlg, OKHdl, Button *, pBtn )
325
{
326
    SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
327
    lcl_PushCursor(pSh);
328
    pSh->StartUndo();
329
330
    SwFmtPageDesc aTitleDesc(mpTitleDesc);
331
332
    if (aSetPageNumberCB.IsChecked())
333
        aTitleDesc.SetNumOffset(aSetPageNumberNF.GetValue());
334
    else if (mpPageFmtDesc)
335
        aTitleDesc.SetNumOffset(mpPageFmtDesc->GetNumOffset());
336
337
    USHORT nNoPages = aPageCountNF.GetValue();
338
    if (!aUseExistingPagesRB.IsChecked())
339
    {
340
        for (USHORT nI=0; nI < nNoPages; ++nI)
341
        	pSh->InsertPageBreak();
342
    }
343
    for (USHORT nI=1; nI < nNoPages; ++nI)
344
        lcl_ChangePage(pSh, nI, 0, mpIndexDesc);
345
346
    pSh->SttDoc();
347
    pSh->SetAttr(aTitleDesc);
348
349
    if (nNoPages > 1 && pSh->GotoPage(nNoPages, false))
350
    {
351
	SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
352
    	pSh->SetAttr(aPageFmtDesc);
353
    }
354
355
    if (aRestartNumberingCB.IsChecked() || nNoPages > 1)
356
    {
357
        USHORT nPgNo = aRestartNumberingCB.IsChecked() ? aRestartNumberingNF.GetValue() : 0;
358
        const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : 0;
359
        lcl_ChangePage(pSh, nNoPages, nPgNo, pNewDesc);
360
    }
361
362
    pSh->EndUndo();
363
    lcl_PopCursor(pSh);
364
    if (!aUseExistingPagesRB.IsChecked())
365
        pSh->SttDoc();
366
    EndDialog( RET_OK );
367
    return 0;
368
}
(-)openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu (+5 lines)
Lines 802-807 Link Here
802
                    <value xml:lang="en-US">~Page...</value>
802
                    <value xml:lang="en-US">~Page...</value>
803
                </prop>
803
                </prop>
804
            </node>
804
            </node>
805
			<node oor:name=".uno:TitlePageDialog" oor:op="replace">
806
				<prop oor:name="Label" oor:type="xs:string">
807
					<value xml:lang="en-US">Title Page...</value>
808
				</prop>
809
			</node>
805
			<node oor:name=".uno:FormatColumns" oor:op="replace">
810
			<node oor:name=".uno:FormatColumns" oor:op="replace">
806
				<prop oor:name="Label" oor:type="xs:string">
811
				<prop oor:name="Label" oor:type="xs:string">
807
                    <value xml:lang="en-US">Co~lumns...</value>
812
                    <value xml:lang="en-US">Co~lumns...</value>

Return to issue 7065