drop DLG_CHART_WIZARD via .res

Change-Id: I394a42bfb761e2f7cf8c3186f5ec412331b5950c

4 files changed, 8 insertions, 68 deletions

diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index ebd27e0855aa..7c6dc042ce97 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -23,9 +23,6 @@
 //for strings see Strings.hrc
 //for Bimaps see Bimaps.hrc
 
-//Dialog Ids:
-#define DLG_CHART_WIZARD    902
-
 //TabPage Ids:
 #define TP_LEGEND_POS   900
 #define TP_DATA_DESCR   901
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 1c2877a203e8..35fbcfb11582 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "dlg_CreationWizard.hxx"
-#include "dlg_CreationWizard.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
 #include "Strings.hrc"
@@ -31,6 +30,9 @@
 #include "ChartTypeTemplateProvider.hxx"
 #include "DialogModel.hxx"
 
+#define CHART_WIZARD_PAGEWIDTH  250
+#define CHART_WIZARD_PAGEHEIGHT 170
+
 namespace chart
 {
 using namespace ::com::sun::star;
@@ -51,10 +53,10 @@ namespace
 CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel
                                , const uno::Reference< uno::XComponentContext >& xContext
                                , sal_Int32 nOnePageOnlyIndex )
-                : svt::RoadmapWizard( pParent, SchResId(DLG_CHART_WIZARD)
-                    , ( nOnePageOnlyIndex >= 0 && nOnePageOnlyIndex < nPageCount )
+                : svt::RoadmapWizard( pParent,
+                    static_cast<sal_uInt32>((nOnePageOnlyIndex >= 0 && nOnePageOnlyIndex < nPageCount)
                         ?  WZB_HELP | WZB_CANCEL | WZB_FINISH
-                        :  WZB_HELP | WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH
+                        :  WZB_HELP | WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
                   )
                 , m_xChartModel(xChartModel,uno::UNO_QUERY)
                 , m_xCC( xContext )
@@ -67,8 +69,6 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
                 , m_bCanTravel( true )
 {
     m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
-    // Do not call FreeResource(), because there are no sub-elements defined in
-    // the dialog resource
     ShowButtonFixedLine( true );
     defaultButton( WZB_FINISH );
 
@@ -90,7 +90,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
     this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
     this->SetRoadmapInteractive( true );
     Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) );
-    Size aSize( this->GetSizePixel() );
+    Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MAP_APPFONT));
     aSize.Width() += aAdditionalRoadmapSize.Width();
     this->SetSizePixel( aSize );
 
@@ -106,6 +106,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
     // Call ActivatePage, to create and activate the first page
     ActivatePage();
 }
+
 CreationWizard::~CreationWizard()
 {
 }
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc
deleted file mode 100644
index 5c0304827efd..000000000000
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- 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 "ResourceIds.hrc"
-
-#define CHART_WIZARD_PAGEWIDTH  250
-#define CHART_WIZARD_PAGEHEIGHT 140
-//width 198 height 150
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.src b/chart2/source/controller/dialogs/dlg_CreationWizard.src
deleted file mode 100644
index 3f5689888de8..000000000000
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.src
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- 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 "dlg_CreationWizard.hrc"
-#include "HelpIds.hrc"
-
-ModalDialog DLG_CHART_WIZARD
-{
-    HelpID = HID_SCH_CHART_AUTO_FORMAT ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT+30 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */