diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:46:27 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:46:27 +0000 |
| commit | 0f2059f717c436f678e13bd9b3e698783ff56759 (patch) | |
| tree | 9d0f1104c331b3ca6b2c51b0a9de107ee258eeb5 /sfx2/source/appl/appbas.cxx | |
| parent | 26dc53b1ebf62d14ce02d8c6776b6be09173c915 (diff) | |
INTEGRATION: CWS sb59 (1.43.60); FILE MERGED
2006/08/16 09:31:13 sb 1.43.60.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'sfx2/source/appl/appbas.cxx')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 4bffd3949f..9f1755dba9 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appbas.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:13:37 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:46:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -244,7 +244,9 @@ String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/) String aVersion( utl::Bootstrap::getBuildIdData( aDefault )); if ( aVersion.Len() == 0 ) + { DBG_ERROR( "No BUILDID in bootstrap file found" ); + } aVersion.Erase( 0, aVersion.Search( ':' ) + 1 ); aVersion.Erase( aVersion.Search( ')' ) ); @@ -916,7 +918,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet ) break; case SID_ATTR_UNDO_COUNT: - rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, SvtUndoOptions().GetUndoCount() ) ); + rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< UINT16 >( SvtUndoOptions().GetUndoCount() ) ) ); break; case SID_UPDATE_VERSION: |