Convert Paragraph Outline&Numbering tab page to Widget UI

Conflicts:
	sw/UI_swriter.mk

Change-Id: I5280ddaa714db0f9ffd61cf400acf9a9fcc1087b
Reviewed-on: https://gerrit.libreoffice.org/3337Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/AllLangResTarget_sw.mk

@@ -76,7 +76,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/chrdlg/chardlg.src \
     sw/source/ui/chrdlg/chrdlg.src \
     sw/source/ui/chrdlg/drpcps.src \
-    sw/source/ui/chrdlg/numpara.src \
     sw/source/ui/chrdlg/paradlg.src \
     sw/source/ui/config/mailconfigpage.src \
     sw/source/ui/config/optcomp.src \

sw/UIConfig_swriter.mk

@@ -84,6 +84,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/insertscript \
 	sw/uiconfig/swriter/ui/inserttable \
 	sw/uiconfig/swriter/ui/linenumbering \
+	sw/uiconfig/swriter/ui/numparapage \
 	sw/uiconfig/swriter/ui/opttestpage \
 	sw/uiconfig/swriter/ui/outlinenumbering \
 	sw/uiconfig/swriter/ui/outlinenumberingpage \

sw/inc/helpid.h

@@ -170,7 +170,7 @@
 #define HID_FLD_FUNC                                            "SW_HID_FLD_FUNC"
 #define HID_FLD_REF                                             "SW_HID_FLD_REF"
 #define HID_OPTSHDWCRSR                                         "SW_HID_OPTSHDWCRSR"
-#define HID_NUMPARA                                             "SW_HID_NUMPARA"
+
 #define HID_REDLINE_OPT                                         "SW_HID_REDLINE_OPT"
 #define HID_EDIT_FLD_DB                                         "SW_HID_EDIT_FLD_DB"
 #define HID_EDIT_FLD_DOKINF                                     "SW_HID_EDIT_FLD_DOKINF"

sw/source/ui/chrdlg/numpara.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _NUMPARA_HRC
-#define _NUMPARA_HRC
-
-// #define ******************************************************************
-
-#define LB_NUMBER_STYLE             1
-#define FT_NUMBER_STYLE                         2
-#define CB_NEW_START                3
-#define CB_NUMBER_NEW_START         4
-#define FL_NEW_START                5
-#define NF_NEW_START                6
-#define FL_COUNT_PARA               7
-#define CB_COUNT_PARA               8
-#define CB_RESTART_PARACOUNT        9
-#define FT_RESTART_NO              10
-#define NF_RESTART_PARA            11
-#define FL_OUTLINE_START       12
-#define LB_OUTLINE_LEVEL       13
-#define FT_OUTLINE_LEVEL       14
-// **********************************************************************
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/chrdlg/numpara.src

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "globals.hrc"
-#include "chrdlg.hrc"
-#include "numpara.hrc"
-#include "helpid.h"
- // TabPage ******************************************************************
-TabPage TP_NUMPARA
-{
-    HelpID = HID_NUMPARA ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-    FixedLine FL_OUTLINE_START
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Outline" ;
-    };
-    FixedText FT_OUTLINE_LEVEL
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "Outline level" ;
-    };
-    ListBox LB_OUTLINE_LEVEL
-    {
-        HelpID = "sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL";
-        Pos = MAP_APPFONT ( 130 , 14 ) ;
-        Size = MAP_APPFONT ( 118 , 65 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Body text" ; > ;
-            < "Level 1" ; >;
-            < "Level 2" ; >;
-            < "Level 3" ; >;
-            < "Level 4" ; >;
-            < "Level 5" ; >;
-            < "Level 6" ; >;
-            < "Level 7" ; >;
-            < "Level 8" ; >;
-            < "Level 9" ; >;
-            < "Level 10" ; >;
-        };
-        StringList [ x-comment ] =
-        {
-            < "Level 0" ; > ;
-            < "Level 1" ; >;
-            < "Level 2" ; >;
-            < "Level 3" ; >;
-            < "Level 4" ; >;
-            < "Level 5" ; >;
-            < "Level 6" ; >;
-            < "Level 7" ; >;
-            < "Level 8" ; >;
-            < "Level 9" ; >;
-            < "Level 10" ; >;
-        };
-    };
-    FixedLine FL_NEW_START
-    {
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Numbering" ;
-    };
-    FixedText FT_NUMBER_STYLE
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "Numbering Style" ;
-    };
-    ListBox LB_NUMBER_STYLE
-    {
-        HelpID = "sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE";
-        Pos = MAP_APPFONT ( 130 , 41 ) ;
-        Size = MAP_APPFONT ( 118 , 65 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "None" ; > ;
-        };
-    };
-    TriStateBox CB_NEW_START
-    {
-        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NEW_START";
-        Pos = MAP_APPFONT ( 12 , 58 ) ;
-        Size = MAP_APPFONT ( 160 , 10 ) ;
-        Hide = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "R~estart at this paragraph" ;
-    };
-    TriStateBox CB_NUMBER_NEW_START
-    {
-        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START";
-        Pos = MAP_APPFONT ( 21 , 73 ) ;
-        Size = MAP_APPFONT ( 103 , 10 ) ;
-        Hide = TRUE ;
-        Disable = TRUE ;
-        Text [ en-US ] = "S~tart with" ;
-    };
-    NumericField NF_NEW_START
-    {
-        HelpID = "sw:NumericField:TP_NUMPARA:NF_NEW_START";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 72 ) ;
-        Size = MAP_APPFONT ( 26 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        Value = 0 ;
-        First = 0 ;
-        Last = 9999 ;
-        Hide = TRUE ;
-        Disable = TRUE ;
-    };
-    FixedLine FL_COUNT_PARA
-    {
-        Pos = MAP_APPFONT ( 6 , 89 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Line numbering" ;
-    };
-    TriStateBox CB_COUNT_PARA
-    {
-        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA";
-        Pos = MAP_APPFONT ( 12 , 100 ) ;
-        Size = MAP_APPFONT ( 160 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Include this paragraph in line numbering" ;
-    };
-    TriStateBox CB_RESTART_PARACOUNT
-    {
-        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT";
-        Pos = MAP_APPFONT ( 12 , 116 ) ;
-        Size = MAP_APPFONT ( 160 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Rest~art at this paragraph" ;
-    };
-    FixedText FT_RESTART_NO
-    {
-        Pos = MAP_APPFONT ( 21 , 132 ) ;
-        Size = MAP_APPFONT ( 103 , 8 ) ;
-        Disable = TRUE ;
-        Text [ en-US ] = "~Start with" ;
-    };
-    NumericField NF_RESTART_PARA
-    {
-        HelpID = "sw:NumericField:TP_NUMPARA:NF_RESTART_PARA";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 130 ) ;
-        Size = MAP_APPFONT ( 26 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 65000 ;
-        Value = 1 ;
-        First = 1 ;
-        Last = 65000 ;
-        Disable = TRUE ;
-    };
-};
- // ********************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/inc/numpara.hxx

@@ -34,26 +34,26 @@
  ---------------------------------------------------------------------------*/
 class SwParagraphNumTabPage : public SfxTabPage
 {
-    FixedLine               aOutlineStartFL;
-    FixedText               aOutlineLvFT;
-    ListBox                 aOutlineLvLB;
+    VclHBox*                 m_pOutlineStartBX;
+    ListBox*                 m_pOutlineLvLB;
 
-    FixedLine               aNewStartFL;
-    FixedText               aNumberStyleFT;
-    ListBox                 aNumberStyleLB;
+    VclHBox*                 m_pNumberStyleBX;
+    ListBox*                 m_pNumberStyleLB;
 
-    TriStateBox             aNewStartCB;
-    TriStateBox             aNewStartNumberCB;
-    NumericField            aNewStartNF;
+    TriStateBox*             m_pNewStartCB;
+    VclHBox*                 m_pNewStartBX;
+    TriStateBox*             m_pNewStartNumberCB;
+    NumericField*            m_pNewStartNF;
 
-    FixedLine               aCountParaFL;
-    TriStateBox             aCountParaCB;
-    TriStateBox             aRestartParaCountCB;
-    FixedText               aRestartFT;
-    NumericField            aRestartNF;
+    VclFrame*                m_pCountParaFram;
+    TriStateBox*             m_pCountParaCB;
+    TriStateBox*             m_pRestartParaCountCB;
+
+    VclHBox*                 m_pRestartBX;
+    NumericField*            m_pRestartNF;
 
     // --> OD 2008-04-14 #outlinelevel#
-    const String msOutlineNumbering;
+    const OUString msOutlineNumbering;
 
     sal_Bool                    bModified : 1;
     sal_Bool                    bCurNumrule : 1;
@@ -64,6 +64,7 @@ class SwParagraphNumTabPage : public SfxTabPage
 
 protected:
         SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet );
+    void aCountParaFL();
 
 public:
         ~SwParagraphNumTabPage();
@@ -79,7 +80,7 @@ public:
     void                DisableOutline();
     void                DisableNumbering();
 
-    ListBox&            GetStyleBox() {return aNumberStyleLB;};
+    ListBox&            GetStyleBox() {return *m_pNumberStyleLB;};
 };