From 079ef5ec23345d9f4bcc44163b7b748c7d4097ce Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 24 Feb 2005 13:42:44 +0000
Subject: [PATCH] INTEGRATION: CWS cmcfixes2 (1.2.54); FILE MERGED 2005/02/14
 18:01:39 cmc 1.2.54.1: #i42421# iter != pointer

---
 extensions/source/propctrlr/propertycomposer.cxx |  7 +++----
 extensions/source/propctrlr/propertyhandler.cxx  | 11 +++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 9ade7e38ad04..ceea00a55b68 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertycomposer.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-16 12:10:39 $
+ *  last change: $Author: vg $ $Date: 2005-02-24 14:42:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,7 +58,6 @@
  *
  *
  ************************************************************************/
-
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
 #include "propertycomposer.hxx"
 #endif
@@ -280,7 +279,7 @@ namespace pcr
             MapStringToBoolPair::iterator aPos = m_EnabledButtons.find( _rPropertyName );
             if ( aPos == m_EnabledButtons.end() )
             {
-                m_EnabledButtons[ _rPropertyName ] = MapStringToBoolPair::data_type( _bEnablePrimary, _bEnableSecondary );
+                m_EnabledButtons[ _rPropertyName ] = MapStringToBoolPair::mapped_type( _bEnablePrimary, _bEnableSecondary );
             }
             else
             {
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index b2e3089181df..fcd6b0133924 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertyhandler.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-16 12:11:27 $
+ *  last change: $Author: vg $ $Date: 2005-02-24 14:42:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,7 +58,6 @@
  *
  *
  ************************************************************************/
-
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
 #include "propertyhandler.hxx"
 #endif
@@ -255,7 +254,7 @@ namespace pcr
             FindPropertyByHandle( _nPropId )
         );
         if ( pFound != m_aSupportedProperties.end() )
-            return pFound;
+            return &(*pFound);
         return NULL;
     }
 
@@ -270,8 +269,8 @@ namespace pcr
             m_aSupportedProperties.end(),
             FindPropertyByHandle( _nPropId )
         );
-        OSL_ENSURE( pProp, "PropertyHandler::changeTypeOfSupportedProperty: This property is not known!" );
-        if ( pProp )
+        OSL_ENSURE( pProp != m_aSupportedProperties.end(), "PropertyHandler::changeTypeOfSupportedProperty: This property is not known!" );
+        if ( pProp != m_aSupportedProperties.end() )
             pProp->Type = _rNewType;
     }