diff options
author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
---|---|---|
committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
commit | f42f3b496a1d956f72fad8aaf37da790e89ed803 (patch) | |
tree | b6f9cea18fda9b1c8a0af9642958a9671de6f713 /extensions/source/abpilot | |
parent | de539c71865e6eec7b1db38031f661d7d8ad0714 (diff) | |
parent | 16680c16eb84b5315dbbeeb61b3693c4d567640a (diff) |
accfixes: merged to m100
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/abspilot.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 2ffeb0d09739..ed7dde55290f 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -78,7 +78,7 @@ namespace abp m_aName.SetModifyHdl( LINK(this, FinalPage, OnNameModified) ); m_aLocation.SetModifyHdl( LINK(this, FinalPage, OnNameModified) ); m_aRegisterName.SetClickHdl( LINK( this, FinalPage, OnRegister ) ); - m_aRegisterName.Check(TRUE); + m_aRegisterName.Check(sal_True); } //--------------------------------------------------------------------- @@ -217,7 +217,7 @@ namespace abp // ----------------------------------------------------------------------------- IMPL_LINK( FinalPage, OnRegister, CheckBox*, EMPTYARG ) { - BOOL bEnable = m_aRegisterName.IsChecked(); + sal_Bool bEnable = m_aRegisterName.IsChecked(); m_aNameLabel.Enable(bEnable); m_aName.Enable(bEnable); implCheckName(); diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index d8007873a2c4..83200c373385 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -140,7 +140,7 @@ namespace abp //--------------------------------------------------------------------- String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const { - USHORT nResId = 0; + sal_uInt16 nResId = 0; switch ( _nState ) { case STATE_SELECT_ABTYPE: nResId = STR_SELECT_ABTYPE; break; @@ -205,7 +205,7 @@ namespace abp } //--------------------------------------------------------------------- - BOOL OAddessBookSourcePilot::Close() + sal_Bool OAddessBookSourcePilot::Close() { implCleanup(); diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 0abdacd0281d..c87748a49da2 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -84,7 +84,7 @@ namespace abp // RoadmapWizard virtual String getStateDisplayName( WizardState _nState ) const; - virtual BOOL Close(); + virtual sal_Bool Close(); private: DECL_LINK( OnCancelClicked, void* ); |