diff -r eafb6a51f853 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu Mon Apr 12 17:07:10 2010 +0200
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu Mon Apr 12 17:07:41 2010 +0200
@@ -814,6 +814,11 @@
~Page...
+
+
+ Title Page...
+
+
Co~lumns...
diff -r eafb6a51f853 sw/inc/cmdid.h
--- a/sw/inc/cmdid.h Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/inc/cmdid.h Mon Apr 12 17:07:41 2010 +0200
@@ -533,6 +533,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 */
diff -r eafb6a51f853 sw/inc/globals.hrc
--- a/sw/inc/globals.hrc Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/inc/globals.hrc Mon Apr 12 17:07:41 2010 +0200
@@ -275,7 +275,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
@@ -287,4 +289,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
diff -r eafb6a51f853 sw/inc/helpid.h
--- a/sw/inc/helpid.h Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/inc/helpid.h Mon Apr 12 17:07:41 2010 +0200
@@ -981,3 +981,4 @@
#define HID_MM_HEADER_12 (HID_BASE + 2279)
#define HID_MM_HEADER_13 (HID_BASE + 2280)
+#define HID_TITLEPAGE (HID_BASE + 2281)
diff -r eafb6a51f853 sw/inc/rcid.hrc
--- a/sw/inc/rcid.hrc Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/inc/rcid.hrc Mon Apr 12 17:07:41 2010 +0200
@@ -127,7 +127,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
diff -r eafb6a51f853 sw/inc/swabstdlg.hxx
--- a/sw/inc/swabstdlg.hxx Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/inc/swabstdlg.hxx Mon Apr 12 17:07:41 2010 +0200
@@ -435,6 +435,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,
diff -r eafb6a51f853 sw/sdi/_basesh.sdi
--- a/sw/sdi/_basesh.sdi Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/sdi/_basesh.sdi Mon Apr 12 17:07:41 2010 +0200
@@ -247,6 +247,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 ;
diff -r eafb6a51f853 sw/sdi/swriter.sdi
--- a/sw/sdi/swriter.sdi Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/sdi/swriter.sdi Mon Apr 12 17:07:41 2010 +0200
@@ -6329,6 +6329,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
()
[
diff -r eafb6a51f853 sw/sdi/swslots.src
--- a/sw/sdi/swslots.src Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/sdi/swslots.src Mon Apr 12 17:07:41 2010 +0200
@@ -299,6 +299,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";
diff -r eafb6a51f853 sw/source/ui/dialog/swdlgfact.cxx
--- a/sw/source/ui/dialog/swdlgfact.cxx Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/source/ui/dialog/swdlgfact.cxx Mon Apr 12 17:07:41 2010 +0200
@@ -94,6 +94,7 @@
#include //add for SwInsTableDlg
#include //add for SwJavaEditDialog
#include //add for SwLineNumberingDlg
+#include //add for SwTitlePageDlg
#include //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
#include //add for SwMergeTblDlg
#include //add for SwMultiTOXMarkDlg
@@ -1354,6 +1355,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
{
diff -r eafb6a51f853 sw/source/ui/dialog/swdlgfact.hxx
--- a/sw/source/ui/dialog/swdlgfact.hxx Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/source/ui/dialog/swdlgfact.hxx Mon Apr 12 17:07:41 2010 +0200
@@ -514,6 +514,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,
diff -r eafb6a51f853 sw/source/ui/inc/swmn_tmpl.hrc
--- a/sw/source/ui/inc/swmn_tmpl.hrc Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/source/ui/inc/swmn_tmpl.hrc Mon Apr 12 17:07:41 2010 +0200
@@ -59,8 +59,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\
diff -r eafb6a51f853 sw/source/ui/misc/makefile.mk
--- a/sw/source/ui/misc/makefile.mk Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/source/ui/misc/makefile.mk Mon Apr 12 17:07:41 2010 +0200
@@ -52,7 +52,8 @@
pgfnote.src \
pggrid.src \
redlndlg.src \
- srtdlg.src
+ srtdlg.src \
+ titlepage.src
EXCEPTIONSFILES = \
$(SLO)$/glossary.obj \
@@ -73,6 +74,7 @@
$(SLO)$/insfnote.obj \
$(SLO)$/insrule.obj \
$(SLO)$/linenum.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/num.obj \
$(SLO)$/numberingtypelistbox.obj \
$(SLO)$/outline.obj \
diff -r eafb6a51f853 sw/source/ui/shells/basesh.cxx
--- a/sw/source/ui/shells/basesh.cxx Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/source/ui/shells/basesh.cxx Mon Apr 12 17:07:41 2010 +0200
@@ -2454,6 +2454,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:
{
diff -r eafb6a51f853 sw/uiconfig/swriter/menubar/menubar.xml
--- a/sw/uiconfig/swriter/menubar/menubar.xml Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/uiconfig/swriter/menubar/menubar.xml Mon Apr 12 17:07:41 2010 +0200
@@ -216,6 +216,7 @@
+
diff -r eafb6a51f853 sw/util/makefile.mk
--- a/sw/util/makefile.mk Mon Apr 12 17:07:10 2010 +0200
+++ b/sw/util/makefile.mk Mon Apr 12 17:07:41 2010 +0200
@@ -256,6 +256,7 @@
$(SLO)$/instable.obj \
$(SLO)$/insrule.obj \
$(SLO)$/javaedit.obj \
+ $(SLO)$/titlepage.obj \
$(SLO)$/linenum.obj \
$(SLO)$/mailmrge.obj \
$(SLO)$/multmrk.obj \