mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS cmcfixes2 (1.14.48); FILE MERGED

Browse Source 
2005/02/10 16:01:51 cmc 1.14.48.1: #i42421# swap order of comparison
This commit is contained in:
Vladimir Glazounov
2005-02-24 13:44:04 +00:00
parent ba678ac52d
commit a143acba9d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bridges/source/jni_uno/jni_info.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: jni_info.cxx,v $ * $RCSfile: jni_info.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: obo $ $Date: 2004-06-04 03:00:54 $ * last change: $Author: vg $ $Date: 2005-02-24 14:44:04 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -58,7 +58,6 @@
* *
* *
************************************************************************/ ************************************************************************/
#include "jni_bridge.h" #include "jni_bridge.h"
#include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/RuntimeException.hpp"
@@ -444,8 +443,9 @@ JNI_type_info const * JNI_info::get_type_info(
OUString const & uno_name = OUString::unacquired( &td->pTypeName ); OUString const & uno_name = OUString::unacquired( &td->pTypeName );
JNI_type_info const * info; JNI_type_info const * info;
ClearableMutexGuard guard( m_mutex ); ClearableMutexGuard guard( m_mutex );
t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) );
if (m_type_map.end() == iFind) if (iFind == m_type_map.end())
{ {
guard.clear(); guard.clear();
info = create_type_info( jni, td ); info = create_type_info( jni, td );
@@ -471,7 +471,7 @@ JNI_type_info const * JNI_info::get_type_info(
JNI_type_info const * info; JNI_type_info const * info;
ClearableMutexGuard guard( m_mutex ); ClearableMutexGuard guard( m_mutex );
t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) );
if (m_type_map.end() == iFind) if (iFind == m_type_map.end())
{ {
guard.clear(); guard.clear();
TypeDescr td( type ); TypeDescr td( type );
@@ -498,7 +498,7 @@ JNI_type_info const * JNI_info::get_type_info(
JNI_type_info const * info; JNI_type_info const * info;
ClearableMutexGuard guard( m_mutex ); ClearableMutexGuard guard( m_mutex );
t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) );
if (m_type_map.end() == iFind) if (iFind == m_type_map.end())
{ {
guard.clear(); guard.clear();
css::uno::TypeDescription td( uno_name ); css::uno::TypeDescription td( uno_name );