[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/chrdlg/pardlg.cxx  |   24 +++++++++++++++---------
 sw/source/ui/inc/swuipardlg.hxx |    2 --
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 952bc9feece3ab57014263371dd00d60bf1c75ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 12 09:03:45 2013 +0100

    ensure all tabpageids are initialized
    
    Change-Id: I0973daedacf38ed9fbe969063c3f7f17a2fa4758

diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 1073d2e..20b4f95 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -50,15 +50,21 @@ SwParaDlg::SwParaDlg(Window *pParent,
                     sal_uInt8 nDialogMode,
                     const String *pTitle,
                     sal_Bool bDraw,
-                    sal_uInt16 nDefPage):
-    SfxTabDialog(pParent,
+                    sal_uInt16 nDefPage)
+    : SfxTabDialog(pParent,
                  "ParagraphPropertiesDialog",
                  "modules/swriter/ui/paradialog.ui",
-                 &rCoreSet,  0 != pTitle),
-    rView(rVw),
-    nDlgMode(nDialogMode),
-    bDrawParaDlg(bDraw)
-
+                 &rCoreSet,  0 != pTitle)
+    , rView(rVw)
+    , nDlgMode(nDialogMode)
+    , bDrawParaDlg(bDraw)
+    , m_nParaStd(0)
+    , m_nParaAlign(0)
+    , m_nParaExt(0)
+    , m_nParaNumPara(0)
+    , m_nParaDrpCps(0)
+    , m_nParaBckGrnd(0)
+    , m_nParaBorder(0)
 {
     nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
     sal_Bool bHtmlMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON);
@@ -101,7 +107,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
     {
         OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
         OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
-        m_nParaAsian = AddTabPage( "labelTP_PARA_ASIAN",  pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
+        AddTabPage( "labelTP_PARA_ASIAN",  pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
                                    pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
     }
     else
@@ -115,7 +121,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
     {
         OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");
         OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");
-        m_nParaTab = AddTabPage( "labelTP_TABULATOR", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+        AddTabPage( "labelTP_TABULATOR", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
     }
 
     // remove unwanted tabs for draw text box paragraph properties
diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx
index 379863f..75ad561 100644
--- a/sw/source/ui/inc/swuipardlg.hxx
+++ b/sw/source/ui/inc/swuipardlg.hxx
@@ -30,8 +30,6 @@ class SwParaDlg: public SfxTabDialog
     sal_uInt16 m_nParaStd;
     sal_uInt16 m_nParaAlign;
     sal_uInt16 m_nParaExt;
-    sal_uInt16 m_nParaAsian;
-    sal_uInt16 m_nParaTab;
     sal_uInt16 m_nParaNumPara;
     sal_uInt16 m_nParaDrpCps;
     sal_uInt16 m_nParaBckGrnd;