1 files changed, 42 insertions, 56 deletions

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index bc60d24a1a2d..a31f5148a095 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "dlg_InsertAxis_Grid.hxx"
-#include "dlg_InsertAxis_Grid.hrc"
 
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
@@ -53,72 +52,59 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 
 SchAxisDlg::SchAxisDlg( Window* pWindow
                        , const InsertAxisOrGridDialogData& rInput, sal_Bool bAxisDlg )
-                       :
-        ModalDialog( pWindow, SchResId( DLG_AXIS_OR_GRID )),
-
-        aFlPrimary( this, SchResId( FL_PRIMARY_AXIS )),
-        aFlPrimaryGrid( this, SchResId( FL_PRIMARY_GRID )),
-        aCbPrimaryX( this, SchResId( CB_X_PRIMARY )),
-        aCbPrimaryY( this, SchResId( CB_Y_PRIMARY )),
-        aCbPrimaryZ( this, SchResId( CB_Z_PRIMARY )),
-
-        aFlSecondary( this, SchResId( FL_SECONDARY_AXIS )),
-        aFlSecondaryGrid( this, SchResId( FL_SECONDARY_GRID )),
-        aCbSecondaryX( this, SchResId( CB_X_SECONDARY )),
-        aCbSecondaryY( this, SchResId( CB_Y_SECONDARY )),
-        aCbSecondaryZ( this, SchResId( CB_Z_SECONDARY )),
-
-        aPbOK( this, SchResId( BTN_OK )),
-        aPbCancel( this, SchResId( BTN_CANCEL )),
-        aPbHelp( this, SchResId( BTN_HELP ))
-
+        : ModalDialog(pWindow,
+              bAxisDlg ?
+                  OString("InsertAxisDialog") :
+                  OString("InsertGridDialog"),
+              bAxisDlg ?
+                  OUString("modules/schart/ui/insertaxisdlg.ui") :
+                  OUString("modules/schart/ui/insertgriddlg.ui"))
         //rOutAttrs( rInAttrs )
 {
-    FreeResource();
+    get(m_pCbPrimaryX, "primaryX");
+    get(m_pCbPrimaryY, "primaryY");
+    get(m_pCbPrimaryZ, "primaryZ");
+    get(m_pCbSecondaryX, "secondaryX");
+    get(m_pCbSecondaryY, "secondaryY");
+    get(m_pCbSecondaryZ, "secondaryZ");
+
     if(!bAxisDlg)
     {
         SetHelpId( HID_INSERT_GRIDS );
-        SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) );
-
-        aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID );
-        aCbPrimaryY.SetHelpId( HID_SCH_CB_YGRID );
-        aCbPrimaryZ.SetHelpId( HID_SCH_CB_ZGRID );
-        aCbSecondaryX.SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
-        aCbSecondaryY.SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
-        aCbSecondaryZ.SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
-
-        aFlPrimary.Hide();
-        aFlSecondary.Hide();
-        aFlPrimaryGrid.Show();
-        aFlSecondaryGrid.Show();
+
+        m_pCbPrimaryX->SetHelpId( HID_SCH_CB_XGRID );
+        m_pCbPrimaryY->SetHelpId( HID_SCH_CB_YGRID );
+        m_pCbPrimaryZ->SetHelpId( HID_SCH_CB_ZGRID );
+        m_pCbSecondaryX->SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
+        m_pCbSecondaryY->SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
+        m_pCbSecondaryZ->SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
     }
     else
     {
-        SetText( ObjectNameProvider::getName(OBJECTTYPE_AXIS,true) );
 
         //todo: remove if secondary z axis are possible somewhere
         {
-            aCbSecondaryZ.Hide();
+            m_pCbSecondaryZ->Hide();
 
             Size aSize( GetSizePixel() );
-            aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() );
+            aSize.Height() -= ( m_pCbSecondaryZ->GetPosPixel().Y() - m_pCbSecondaryY->GetPosPixel().Y() );
             SetSizePixel(aSize);
         }
     }
 
-    aCbPrimaryX.Check( rInput.aExistenceList[0] );
-    aCbPrimaryY.Check( rInput.aExistenceList[1] );
-    aCbPrimaryZ.Check( rInput.aExistenceList[2] );
-    aCbSecondaryX.Check( rInput.aExistenceList[3] );
-    aCbSecondaryY.Check( rInput.aExistenceList[4] );
-    aCbSecondaryZ.Check( rInput.aExistenceList[5] );
-
-    aCbPrimaryX.Enable( rInput.aPossibilityList[0] );
-    aCbPrimaryY.Enable( rInput.aPossibilityList[1] );
-    aCbPrimaryZ.Enable( rInput.aPossibilityList[2] );
-    aCbSecondaryX.Enable( rInput.aPossibilityList[3] );
-    aCbSecondaryY.Enable( rInput.aPossibilityList[4] );
-    aCbSecondaryZ.Enable( rInput.aPossibilityList[5] );
+    m_pCbPrimaryX->Check( rInput.aExistenceList[0] );
+    m_pCbPrimaryY->Check( rInput.aExistenceList[1] );
+    m_pCbPrimaryZ->Check( rInput.aExistenceList[2] );
+    m_pCbSecondaryX->Check( rInput.aExistenceList[3] );
+    m_pCbSecondaryY->Check( rInput.aExistenceList[4] );
+    m_pCbSecondaryZ->Check( rInput.aExistenceList[5] );
+
+    m_pCbPrimaryX->Enable( rInput.aPossibilityList[0] );
+    m_pCbPrimaryY->Enable( rInput.aPossibilityList[1] );
+    m_pCbPrimaryZ->Enable( rInput.aPossibilityList[2] );
+    m_pCbSecondaryX->Enable( rInput.aPossibilityList[3] );
+    m_pCbSecondaryY->Enable( rInput.aPossibilityList[4] );
+    m_pCbSecondaryZ->Enable( rInput.aPossibilityList[5] );
 }
 
 SchAxisDlg::~SchAxisDlg()
@@ -127,12 +113,12 @@ SchAxisDlg::~SchAxisDlg()
 
 void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput )
 {
-    rOutput.aExistenceList[0]=aCbPrimaryX.IsChecked();
-    rOutput.aExistenceList[1]=aCbPrimaryY.IsChecked();
-    rOutput.aExistenceList[2]=aCbPrimaryZ.IsChecked();
-    rOutput.aExistenceList[3]=aCbSecondaryX.IsChecked();
-    rOutput.aExistenceList[4]=aCbSecondaryY.IsChecked();
-    rOutput.aExistenceList[5]=aCbSecondaryZ.IsChecked();
+    rOutput.aExistenceList[0]=m_pCbPrimaryX->IsChecked();
+    rOutput.aExistenceList[1]=m_pCbPrimaryY->IsChecked();
+    rOutput.aExistenceList[2]=m_pCbPrimaryZ->IsChecked();
+    rOutput.aExistenceList[3]=m_pCbSecondaryX->IsChecked();
+    rOutput.aExistenceList[4]=m_pCbSecondaryY->IsChecked();
+    rOutput.aExistenceList[5]=m_pCbSecondaryZ->IsChecked();
 }
 
 SchGridDlg::SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput )