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

INTEGRATION: CWS cmcfixes2 (1.2.54); FILE MERGED

Browse Source 
2005/02/14 18:01:39 cmc 1.2.54.1: #i42421# iter != pointer
This commit is contained in:
Vladimir Glazounov
2005-02-24 13:42:44 +00:00
parent 3436139ea5
commit 079ef5ec23
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/source/propctrlr/propertycomposer.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: propertycomposer.cxx,v $ * $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 * 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 @@
* *
* *
************************************************************************/ ************************************************************************/
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
#include "propertycomposer.hxx" #include "propertycomposer.hxx"
#endif #endif
@@ -280,7 +279,7 @@ namespace pcr
MapStringToBoolPair::iterator aPos = m_EnabledButtons.find( _rPropertyName ); MapStringToBoolPair::iterator aPos = m_EnabledButtons.find( _rPropertyName );
if ( aPos == m_EnabledButtons.end() ) if ( aPos == m_EnabledButtons.end() )
{ {
m_EnabledButtons[ _rPropertyName ] = MapStringToBoolPair::data_type( _bEnablePrimary, _bEnableSecondary ); m_EnabledButtons[ _rPropertyName ] = MapStringToBoolPair::mapped_type( _bEnablePrimary, _bEnableSecondary );
} }
else else
{ {

11
extensions/source/propctrlr/propertyhandler.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: propertyhandler.cxx,v $ * $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 * 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 @@
* *
* *
************************************************************************/ ************************************************************************/
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
#include "propertyhandler.hxx" #include "propertyhandler.hxx"
#endif #endif
@@ -255,7 +254,7 @@ namespace pcr
FindPropertyByHandle( _nPropId ) FindPropertyByHandle( _nPropId )
); );
if ( pFound != m_aSupportedProperties.end() ) if ( pFound != m_aSupportedProperties.end() )
return pFound; return &(*pFound);
return NULL; return NULL;
} }
@@ -270,8 +269,8 @@ namespace pcr
m_aSupportedProperties.end(), m_aSupportedProperties.end(),
FindPropertyByHandle( _nPropId ) FindPropertyByHandle( _nPropId )
); );
OSL_ENSURE( pProp, "PropertyHandler::changeTypeOfSupportedProperty: This property is not known!" ); OSL_ENSURE( pProp != m_aSupportedProperties.end(), "PropertyHandler::changeTypeOfSupportedProperty: This property is not known!" );
if ( pProp ) if ( pProp != m_aSupportedProperties.end() )
pProp->Type = _rNewType; pProp->Type = _rNewType;
} }