diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 16:26:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 16:26:17 +0000 |
| commit | 10f7a2e69f0145f48d612de7628b77fb107b0808 (patch) | |
| tree | e483003c006c3246b3c3b5aba3dd4e0c43e94611 /cppu/source/uno/lbmap.cxx | |
| parent | 3c1b620aa9a10e4054a2b1313f17ee3431104597 (diff) | |
INTEGRATION: CWS bunoidmap (1.26.16); FILE MERGED
2006/11/09 09:04:40 kr 1.26.16.1: implemented: i71242 - Binary Uno should support Ident Mappings
Diffstat (limited to 'cppu/source/uno/lbmap.cxx')
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 0179f9f06..4dcac7203 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lbmap.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:21:32 $ + * last change: $Author: rt $ $Date: 2006-12-01 17:26:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "IdentityMapping.hxx" + #include <hash_map> #include <set> #include <algorithm> @@ -571,6 +573,10 @@ void SAL_CALL uno_getMapping( aRet = (*iFind).second->pMapping; } + // See if an identity mapping does fit. + if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength()) + aRet = createIdentityMapping(pFrom); + if (! aRet.is()) // try callback chain { MutexGuard aGuard( rData.aCallbacksMutex ); |