diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-23 10:18:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-23 10:30:25 +0100 |
| commit | 2c5f02539d8e1ae079b2ee68838024865610b6d8 (patch) | |
| tree | 6bfa4357efaf90a1a3f1d305e69293cac6273647 /chart2/source/controller/dialogs/dlg_CreationWizard.cxx | |
| parent | _SwSaveTypeCountContent dead and gone (and there was much rejoicing.) (diff) | |
| download | core-2c5f02539d8e1ae079b2ee68838024865610b6d8.tar.gz core-2c5f02539d8e1ae079b2ee68838024865610b6d8.zip | |
drop DLG_CHART_WIZARD via .res
Change-Id: I394a42bfb761e2f7cf8c3186f5ec412331b5950c
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_CreationWizard.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
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() { } |