diff options
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/prj/d.lst | 1 | ||||
| -rw-r--r-- | cppuhelper/source/component_context.cxx | 19 | ||||
| -rw-r--r-- | cppuhelper/source/msvc_win32_intel.map | 5 |
3 files changed, 18 insertions, 7 deletions
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst index 38f954c03bef..e27a93cd9474 100644 --- a/cppuhelper/prj/d.lst +++ b/cppuhelper/prj/d.lst @@ -53,6 +53,7 @@ mkdir: %_DEST%\inc%_EXT%\cppuhelper ..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc%_EXT%\cppuhelper\servicefactory.hxx ..\inc\cppuhelper\smartservices.hxx %_DEST%\inc%_EXT%\cppuhelper\smartservices.hxx ..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc%_EXT%\cppuhelper\implementationentry.hxx +..\inc\cppuhelper\access_control.hxx %_DEST%\inc%_EXT%\cppuhelper\access_control.hxx ..\%__SRC%\bin\cppuhelper*.dll %_DEST%\bin%_EXT%\cppuhelper*.dll ..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\* diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 863e0f534cc7..11d2ef287fef 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -2,9 +2,9 @@ * * $RCSfile: component_context.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dbo $ $Date: 2001-12-14 13:19:51 $ + * last change: $Author: dbo $ $Date: 2001-12-17 12:25:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -605,7 +605,8 @@ void ComponentContext::disposing() // first dispose all context objects t_map::const_iterator iPos( m_map.begin() ); - for ( ; iPos != m_map.end(); ++iPos ) + t_map::const_iterator iEnd( m_map.end() ); + while (iPos != iEnd) { ContextEntry * pEntry = iPos->second; @@ -646,6 +647,8 @@ void ComponentContext::disposing() } } } + + ++iPos; } // second dispose service manager @@ -667,11 +670,12 @@ void ComponentContext::disposing() } // everything is disposed, hopefully nobody accesses the context anymore... - for ( iPos = m_map.begin(); iPos != m_map.end(); ++iPos ) + iPos = m_map.begin(); + while (iPos != iEnd) { delete iPos->second; + ++iPos; } - m_map.clear(); } //__________________________________________________________________________________________________ @@ -1007,7 +1011,8 @@ void ConfigurationComponentContext::disposing() // first dispose all context objects t_singletons::const_iterator iPos( m_singletons.begin() ); - for ( ; iPos != m_singletons.end(); ++iPos ) + t_singletons::const_iterator iEnd( m_singletons.end() ); + while (iPos != iEnd) { // to be disposed separately if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SMGR_SINGLETON) )) @@ -1022,11 +1027,11 @@ void ConfigurationComponentContext::disposing() { xAC = iPos->second; } - else { __dispose( iPos->second ); } + ++iPos; } m_singletons.clear(); diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map index b6b41c68b5ea..8dbb7be8521f 100644 --- a/cppuhelper/source/msvc_win32_intel.map +++ b/cppuhelper/source/msvc_win32_intel.map @@ -192,6 +192,11 @@ component_getDescriptionFunc ?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVWeakAggComponentImplHelperBase@1@@Z ?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z ?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z + +?ac_defimpl_getRestriction@cppu@@YA?AV?$Reference@VXAccessControlContext@security@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXCurrentContext@uno@star@sun@com@@@3456@@Z +?ac_defimpl_doRestricted@cppu@@YA?AVAny@uno@star@sun@com@@ABV?$Reference@VXAction@security@star@sun@com@@@3456@ABV?$Reference@VXAccessControlContext@security@star@sun@com@@@3456@ABV?$Reference@VXCurrentContext@uno@star@sun@com@@@3456@@Z +?ac_defimpl_doPrivileged@cppu@@YA?AVAny@uno@star@sun@com@@ABV?$Reference@VXAction@security@star@sun@com@@@3456@ABV?$Reference@VXAccessControlContext@security@star@sun@com@@@3456@ABV?$Reference@VXCurrentContext@uno@star@sun@com@@@3456@@Z + local: *; }; |