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

[Caolán McNamara]

 chart2/source/controller/dialogs/dlg_NumberFormat.cxx |    6 +++---
 chart2/source/controller/dialogs/dlg_NumberFormat.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b38a0aacb035ed924084473e57901b09df1c74c9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 2 17:24:49 2013 +0100

    Related: fdo#66252 RID_SVXPAGE_NUMBERFORMAT needs a layout parent
    
    Change-Id: I25f87916e5b8480e50cafb30b78da4d575a7df24
    (cherry picked from commit eb39f90f071c03f8f9e61a0f129a060ffcfb96eb)
    Reviewed-on: https://gerrit.libreoffice.org/4683
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 7a595ca..348f667 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -40,15 +40,15 @@ namespace chart
 using namespace ::com::sun::star;
 
 NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet)
-    : SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
+    : SfxSingleTabDialog(pParent, rSet)
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
     if ( fnCreatePage )
     {
-        SfxTabPage* pTabPage = (*fnCreatePage)( this, rSet );
+        SfxTabPage* pTabPage = (*fnCreatePage)( get_content_area(), rSet );
         pTabPage->PageCreated(rSet);
-        SetTabPage(pTabPage);
+        setTabPage(pTabPage);
     }
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
index 31535dd..c574608 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -29,7 +29,7 @@ namespace chart
 {
 //.............................................................................
 
-class NumberFormatDialog : public SfxNoLayoutSingleTabDialog
+class NumberFormatDialog : public SfxSingleTabDialog
 {
 public:
      NumberFormatDialog(Window* pParent, SfxItemSet& rSet);