[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/dlg/dlgattr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7829f390995c663a7d7d9c14def46f0de70e2598
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 12 09:01:28 2014 +0100

    Resolves: fdo#82413 crash in format->column
    
    Change-Id: I3af776c14ec0f224884488fdc99ee26ebbba7cb8
    (cherry picked from commit e2d2fa4f0663cf990c0595f8827ff9123c88d41a)
    Reviewed-on: https://gerrit.libreoffice.org/10877
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0a83ba3..8af7569 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,13 +39,14 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
     : SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs)
     , m_nNumberFormatId(0)
 {
-
     pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
 
     if (bRow)
         SetText(get<FixedText>("alttitle")->GetText());
     if (bHasFormat)
         m_nNumberFormatId = AddTabPage("format", RID_SVXPAGE_NUMBERFORMAT);
+    else
+        RemoveTabPage("format");
     AddTabPage("alignment", RID_SVXPAGE_ALIGNMENT);
 }