summaryrefslogtreecommitdiffstats
path: root/chart2/source/controller/dialogs/dlg_DataSource.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /chart2/source/controller/dialogs/dlg_DataSource.cxx
parentTypo. (diff)
parentmasterfix DEV300: #i10000# usage of L10N build_type (diff)
downloadcore-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz
core-12343c15568dcc2c9209d8ca41fda2263122448f.zip
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_DataSource.cxx')
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index ec72cd6c0381..b90f9a569665 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -147,7 +147,7 @@ void DataSourceTabControl::EnableTabToggling()
// ----------------------------------------
-USHORT DataSourceDialog::m_nLastPageId = 0;
+sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
DataSourceDialog::DataSourceDialog(
Window * pParent,
@@ -221,7 +221,7 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
if( ! (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid ))
{
- m_aBtnOK.Enable( FALSE );
+ m_aBtnOK.Enable( sal_False );
OSL_ASSERT( m_pTabControl );
// note: there seems to be no suitable mechanism to address pages by
// identifier, at least it is unclear what the page identifiers are.
@@ -243,7 +243,7 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage )
if( m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid )
{
- m_aBtnOK.Enable( TRUE );
+ m_aBtnOK.Enable( sal_True );
OSL_ASSERT( m_pTabControl );
m_pTabControl->EnableTabToggling();
}