diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-11 14:39:51 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-11 14:39:51 +0000 |
| commit | 48afedbf880adbb75630ec30ea33d81a485027af (patch) | |
| tree | 3ee731cf78c9df95796c3faaaa38426cd24c3f59 /sw/inc/unoprnms.hxx | |
| parent | 9acc1899961b3289217f9eac6d159f20e4a0c3a6 (diff) | |
INTEGRATION: CWS tleamisc (1.93.30); FILE MERGED
2004/07/08 12:16:33 tl 1.93.30.1: #i25802# inline declaration for GetPropName removed (does not work across DLL's)
Diffstat (limited to 'sw/inc/unoprnms.hxx')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 462b32c4491a..1a9390bc43ed 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.98 $ * - * last change: $Author: hr $ $Date: 2004-08-05 11:33:18 $ + * last change: $Author: obo $ $Date: 2004-08-11 15:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -768,15 +768,10 @@ struct SwPropNameLen typedef const SwPropNameLen SwPropNameTab[ SW_PROPNAME_END - SW_PROPNAME_BEGIN ]; extern const SwPropNameTab aPropNameTab; -#ifndef PRODUCT +// !!! function must not(!) be inline because it is called via the below !!! +// !!! listed macros from the swui DLL and that can not access the !!! +// !!! array aPropNameTab which is located in a different DLL. !!! const SwPropNameLen& GetPropName( USHORT nId ); -#else -inline const SwPropNameLen& GetPropName( USHORT nId ) -{ - return aPropNameTab[ nId - SW_PROPNAME_BEGIN]; -} -#endif - #define SW_PROP_NAME(nId) \ |