diff options
author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 14:04:40 +0100 |
---|---|---|
committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 14:04:40 +0100 |
commit | d3f3babe5fa6931a98f723b91a4ec72d8cb0d1fa (patch) | |
tree | 79865a93b14aab684a26e6dec14088811113e601 /chart2/source/controller/dialogs/dlg_CreationWizard.cxx | |
parent | chart51: #i116681# fixed defaults for lights (diff) | |
parent | CWS-TOOLING: integrate CWS hr75 (diff) | |
download | core-d3f3babe5fa6931a98f723b91a4ec72d8cb0d1fa.tar.gz core-d3f3babe5fa6931a98f723b91a4ec72d8cb0d1fa.zip |
chart51: merge with DEV300_m100
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_CreationWizard.cxx')
-rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index e7a7a8bd43d8..fe035acb09e4 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -96,7 +96,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC )); // Do not call FreeResource(), because there are no sub-elements defined in // the dialog resource - ShowButtonFixedLine( TRUE ); + ShowButtonFixedLine( sal_True ); defaultButton( WZB_FINISH ); if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount ) @@ -236,7 +236,7 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ ) String CreationWizard::getStateDisplayName( WizardState nState ) const { - USHORT nResId = 0; + sal_uInt16 nResId = 0; switch( nState ) { case STATE_CHARTTYPE: |