summaryrefslogtreecommitdiff
path: root/stoc/source/inspect
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
commit414c097c65bb7925eef9ddc158b112228b49ed12 (patch)
treede9571ec116da8f9a4c0033c55a7ad6c4fb890c5 /stoc/source/inspect
parent45bb07d39bdd63e741b4fe692a3a0d421a642a79 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'stoc/source/inspect')
-rw-r--r--stoc/source/inspect/introspection.cxx22
1 files changed, 17 insertions, 5 deletions
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 6325e3f4bc0c..6d69ab63c10b 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: introspection.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: ab $ $Date: 2002-11-07 14:54:17 $
+ * last change: $Author: hr $ $Date: 2003-03-27 12:00:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2915,10 +2915,22 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
{
// Eintragen
rMethodNameMap[ aMethName ] = iAllExportedMethod;
+
+ // Tabelle fuer XExactName pflegen
+ rLowerToExactNameMap[ toLower( aMethName ) ] = aMethName;
}
+ else
+ {
+ sal_Int32 iHashResult = (*aIt).second;
- // Tabelle fuer XExactName pflegen
- rLowerToExactNameMap[ toLower( aMethName ) ] = aMethName;
+ Reference<XIdlMethod> xExistingMethod = pDestMethods[ iHashResult ];
+
+ Reference< XIdlClass > xExistingMethClass =
+ xExistingMethod->getDeclaringClass();
+ Reference< XIdlClass > xNewMethClass = rxMethod->getDeclaringClass();
+ if( xExistingMethClass->equals( xNewMethClass ) )
+ continue;
+ }
pDestMethods[ iAllExportedMethod ] = rxMethod;
@@ -2977,7 +2989,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
bXInterfaceIsInvalid = sal_True;
delete[] pMethodTypes;
- delete pLocalMethodConcepts;
+ delete[] pLocalMethodConcepts;
}
// Super-Klasse(n) vorhanden? Dann dort fortsetzen