diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:52:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:52:06 +0000 |
| commit | 33a52a668f3f47f06459f4c7e8eb0f529ff43d6f (patch) | |
| tree | e91681f18a2d66812798d10ce6e4c107c8ca14bb /sfx2 | |
| parent | 336273cd291980bd54007b4e8bf3ec779b62dfe0 (diff) | |
INTEGRATION: CWS pj55 (1.6.50); FILE MERGED
2006/07/20 09:52:13 pjanik 1.6.50.1: #i67408#: prevent "Types cannot be declared in anonymous union" compiler
warning.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index ef5a3cef178e..f481dea77c64 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lnkbase2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-19 22:11:10 $ + * last change: $Author: ihi $ $Date: 2006-08-01 11:52:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,20 +67,23 @@ class ImplDdeItem; // nur fuer die interne Verwaltung struct ImplBaseLinkData { + struct tClientType + { + // gilt fuer alle Links + ULONG nCntntType; // Update Format + // nicht Ole-Links + BOOL bIntrnlLnk; // ist es ein interner Link + USHORT nUpdateMode;// UpdateMode + }; + + struct tDDEType + { + ImplDdeItem* pItem; + }; + union { - struct - { - // gilt fuer alle Links - ULONG nCntntType; // Update Format - // nicht Ole-Links - BOOL bIntrnlLnk; // ist es ein interner Link - USHORT nUpdateMode;// UpdateMode - } ClientType; - - struct - { - ImplDdeItem* pItem; - } DDEType; + tClientType ClientType; + tDDEType DDEType; }; ImplBaseLinkData() { |