Kaydet (Commit) 741be403 authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS intptr (1.98.58); FILE MERGED

2005/09/13 14:51:12 kendy 1.98.58.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
üst e7fe4313
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: sfxbasemodel.cxx,v $ * $RCSfile: sfxbasemodel.cxx,v $
* *
* $Revision: 1.99 $ * $Revision: 1.100 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 18:49:33 $ * last change: $Author: kz $ $Date: 2005-10-06 11:15:09 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -3582,9 +3582,9 @@ sal_Int64 SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequ ...@@ -3582,9 +3582,9 @@ sal_Int64 SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequ
{ {
SvGlobalName aName( aIdentifier ); SvGlobalName aName( aIdentifier );
if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) ) if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )
return (sal_Int64)(sal_Int32)(SvObject*)GetObjectShell(); return (sal_Int64)(sal_IntPtr)(SvObject*)GetObjectShell();
else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) ) else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )
return (sal_Int64)(sal_Int32)(SfxObjectShell*)GetObjectShell(); return (sal_Int64)(sal_IntPtr)(SfxObjectShell*)GetObjectShell();
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment