diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-12-11 17:14:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-11 20:22:58 +0000 |
commit | a0edd406695b92b9c8fbc0dabda9713903319e09 (patch) | |
tree | 2bc0bfedba3151f861d860d4d6d541c2783a2fe1 | |
parent | b5d7ac8dc9bc778d1166c3eac91d765ee5a9691f (diff) |
titlepage.src is unused now
Change-Id: Ia2846861e103d719e6dd7cc80ddd200d4c69c1a2
-rw-r--r-- | sw/AllLangResTarget_sw.mk | 1 | ||||
-rw-r--r-- | sw/inc/globals.hrc | 2 | ||||
-rw-r--r-- | sw/inc/swabstdlg.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 5 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.hrc | 53 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.src | 232 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 2 |
9 files changed, 7 insertions, 310 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index fbd038fd98c3..ea1196b7cc74 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -151,7 +151,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/misc/pggrid.src \ sw/source/ui/misc/redlndlg.src \ sw/source/ui/misc/srtdlg.src \ - sw/source/ui/misc/titlepage.src \ sw/source/ui/ribbar/inputwin.src \ sw/source/ui/ribbar/tbxanchr.src \ sw/source/ui/ribbar/workctrl.src \ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index ec4c02ef3f78..5362aee13930 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -222,6 +222,4 @@ #define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116) #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 --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 5355b97fb100..555680fd5bb3 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -433,8 +433,7 @@ public: virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0; - virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, - SwView& rView, sal_Bool bCol = sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg + virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; //add for SwInsTableDlg virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) = 0; //add for SwJavaEditDialog diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 3028bba653a7..8c157c04e782 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1178,22 +1178,10 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *p return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, - SwView& rView, sal_Bool /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog(SwView& rView) { - Dialog* pDlg=NULL; - switch ( nResId ) - { - case DLG_LINE_NUMBERING : - pDlg = new SwLineNumberingDlg( &rView ); - break; - default: - break; - } - - if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); - return 0; + Dialog* pDlg = new SwLineNumberingDlg( &rView ); + return new VclAbstractDialog_Impl( pDlg ); } AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView) //add for SwInsTableDlg diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 451d59515135..e8fc6cb0b8b2 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -500,9 +500,8 @@ public: SwField* pField, sal_Bool bNextButton = sal_False ); //add for SwFldInputDlg virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); //add for SwInsFootNoteDlg - virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ); - virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, - SwView& rView, sal_Bool bCol = sal_False ); //add for SwInsRowColDlg, SwLineNumberingDlg + virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ); + virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView); //add for SwInsRowColDlg, SwLineNumberingDlg virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); //add for SwInsTableDlg virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh); //add for SwJavaEditDialog diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 9e8aca23c4a6..90c6b5b1179d 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -40,7 +40,6 @@ #include "fldbas.hxx" #include "lineinfo.hxx" #include "globals.hrc" -#include "titlepage.hrc" #include "titlepage.hxx" #include "uitool.hxx" #include "fmtpdsc.hxx" diff --git a/sw/source/ui/misc/titlepage.hrc b/sw/source/ui/misc/titlepage.hrc deleted file mode 100644 index 191581bec21f..000000000000 --- a/sw/source/ui/misc/titlepage.hrc +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com> - * (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#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 FT_PAGE_START 7 -#define RB_DOCUMENT_START 8 -#define RB_PAGE_START 9 -#define NF_PAGE_START 10 -#define FL_NUMBERING 11 -#define CB_RESTART_NUMBERING 12 -#define FT_RESTART_NUMBERING 13 -#define NF_RESTART_NUMBERING 14 -#define CB_SET_PAGE_NUMBER 15 -#define FT_SET_PAGE_NUMBER 16 -#define NF_SET_PAGE_NUMBER 17 -#define FL_PAGE_PROPERTIES 18 -#define LB_PAGE_PROPERTIES 19 -#define PB_PAGE_PROPERTIES 20 -#define FL_BOTTOM 21 -#define PB_OK 22 -#define PB_CANCEL 23 -#define PB_HELP 24 diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src deleted file mode 100644 index aff142e496b8..000000000000 --- a/sw/source/ui/misc/titlepage.src +++ /dev/null @@ -1,232 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com> - * (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#include "misc.hrc" -#include "titlepage.hrc" -#include "globals.hrc" -#include "cmdid.h" -#include "helpid.h" - -ModalDialog DLG_TITLEPAGE -{ - HelpID = HID_TITLEPAGE ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 216 , 229 ) ; - 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" ; - }; - RadioButton RB_USE_EXISTING_PAGES - { - Pos = MAP_APPFONT ( 12 , 18 ) ; - Size = MAP_APPFONT ( 198 , 10 ) ; - Text [ en-US ] = "Convert existing pages to title pages" ; - TabStop = TRUE ; - Check = TRUE ; - }; - RadioButton RB_INSERT_NEW_PAGES - { - Pos = MAP_APPFONT ( 12 , 34 ) ; - Size = MAP_APPFONT ( 198 , 10 ) ; - Text [ en-US ] = "Insert new title pages" ; - }; - FixedText FT_PAGE_COUNT - { - Pos = MAP_APPFONT ( 12 , 50 ) ; - Size = MAP_APPFONT ( 82 , 8 ) ; - Text [ en-US ] = "Number of title pages" ; - }; - NumericField NF_PAGE_COUNT - { - Pos = MAP_APPFONT ( 100 , 50 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 65535; - First = 1 ; - Last = 65535; - SpinSize = 1 ; - }; - FixedText FT_PAGE_PAGES - { - Pos = MAP_APPFONT ( 136 , 50 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; - Text [ en-US ] = "pages" ; - }; - FixedText FT_PAGE_START - { - Pos = MAP_APPFONT ( 12 , 66 ) ; - Size = MAP_APPFONT ( 82 , 8 ) ; - Text [ en-US ] = "Place title pages at" ; - }; - RadioButton RB_DOCUMENT_START - { - Pos = MAP_APPFONT ( 100 , 66 ) ; - Size = MAP_APPFONT ( 110 , 10 ) ; - Text [ en-US ] = "Document Start" ; - TabStop = TRUE ; - Check = TRUE ; - }; - RadioButton RB_PAGE_START - { - Pos = MAP_APPFONT ( 100 , 78 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; - Text [ en-US ] = "Page" ; - }; - NumericField NF_PAGE_START - { - Pos = MAP_APPFONT ( 131 , 78 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 65535; - First = 1 ; - Last = 65535; - SpinSize = 1 ; - }; - FixedLine FL_NUMBERING - { - Pos = MAP_APPFONT ( 6 , 98 ) ; - Size = MAP_APPFONT ( 204 , 8 ) ; - Text [ en-US ] = "Page Numbering" ; - }; - CheckBox CB_RESTART_NUMBERING - { - Pos = MAP_APPFONT ( 12, 111 ) ; - Size = MAP_APPFONT ( 198 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Reset Page Numbering after title pages" ; - }; - FixedText FT_RESTART_NUMBERING - { - Pos = MAP_APPFONT ( 20 , 125 ) ; - Size = MAP_APPFONT ( 74 , 10 ) ; - Text [ en-US ] = "Page Number" ; - }; - NumericField NF_RESTART_NUMBERING - { - Pos = MAP_APPFONT ( 100 , 125 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 65535; - First = 1 ; - Last = 65535; - SpinSize = 1 ; - }; - CheckBox CB_SET_PAGE_NUMBER - { - Pos = MAP_APPFONT ( 12 , 139 ) ; - Size = MAP_APPFONT ( 198 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Set Page Number for first title page" ; - }; - FixedText FT_SET_PAGE_NUMBER - { - Pos = MAP_APPFONT ( 20 , 153 ) ; - Size = MAP_APPFONT ( 74 , 10 ) ; - Text [ en-US ] = "Page Number" ; - }; - NumericField NF_SET_PAGE_NUMBER - { - Pos = MAP_APPFONT ( 100 , 153 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 65535; - First = 1 ; - Last = 65535; - SpinSize = 1 ; - }; - FixedLine FL_PAGE_PROPERTIES - { - Pos = MAP_APPFONT ( 6 , 169 ) ; - Size = MAP_APPFONT ( 204 , 8 ) ; - Text [ en-US ] = "Edit Page Properties" ; - }; - ListBox LB_PAGE_PROPERTIES - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 182 ) ; - Size = MAP_APPFONT ( 132 , 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - CurPos = 0 ; - }; - PushButton PB_PAGE_PROPERTIES - { - Pos = MAP_APPFONT ( 150 , 182 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - Text [ en-US ] = "Edit..." ; - }; - FixedLine FL_BOTTOM - { - Pos = MAP_APPFONT ( 6 , 198 ) ; - Size = MAP_APPFONT ( 204 , 8 ) ; - }; - OKButton PB_OK - { - Pos = MAP_APPFONT ( 54 , 209 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - }; - CancelButton PB_CANCEL - { - Pos = MAP_APPFONT ( 107 , 209 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - }; - HelpButton PB_HELP - { - Pos = MAP_APPFONT ( 160 , 209 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; -}; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index ff570ef7b877..4f568a847eb0 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -489,7 +489,7 @@ void SwView::Execute(SfxRequest &rReq) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - VclAbstractDialog* pDlg = pFact->CreateVclSwViewDialog( DLG_LINE_NUMBERING, *this); + VclAbstractDialog* pDlg = pFact->CreateVclSwViewDialog(*this); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlg->Execute(); delete pDlg; |