diff options
Diffstat (limited to 'sc/source/core/data/bcaslot.cxx')
| -rw-r--r-- | sc/source/core/data/bcaslot.cxx | 105 |
1 files changed, 70 insertions, 35 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 116980d6b710..602f6a7e8519 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -1,35 +1,28 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include <sfx2/objsh.hxx> #include <svl/listener.hxx> #include <svl/listeneriter.hxx> +#include <boost/mem_fn.hpp> + #include "document.hxx" #include "brdcst.hxx" #include "bcaslot.hxx" @@ -274,15 +267,25 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const if (aBroadcastAreaTbl.empty()) return false; sal_Bool bIsBroadcasted = false; + + // issue 118012 + // do not iterate on <aBoardcastAreaTbl> as its reveals that its iterators + // are destroyed during notification. + std::vector< ScBroadcastArea* > aCopyForIteration( aBroadcastAreaTbl.begin(), aBroadcastAreaTbl.end() ); + std::for_each( aCopyForIteration.begin(), aCopyForIteration.end(), boost::mem_fn( &ScBroadcastArea::IncRef ) ); + const ScAddress& rAddress = rHint.GetAddress(); - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()), - aIterEnd = aBroadcastAreaTbl.end(); aIter != aIterEnd; /* increment in body */ ) + const std::vector< ScBroadcastArea* >::const_iterator aEnd( aCopyForIteration.end() ); + std::vector< ScBroadcastArea* >::const_iterator aIter; + for ( aIter = aCopyForIteration.begin(); aIter != aEnd; ++aIter ) { ScBroadcastArea* pArea = *aIter; - // A Notify() during broadcast may call EndListeningArea() and thus - // dispose this area if it was the last listener, which would - // invalidate the iterator, hence increment before call. - ++aIter; + // check, if copied item has been already removed from <aBroadcastAreaTbl> + if ( aBroadcastAreaTbl.find( pArea ) == aBroadcastAreaTbl.end() ) + { + continue; + } + const ScRange& rAreaRange = pArea->GetRange(); if (rAreaRange.In( rAddress)) { @@ -293,6 +296,17 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const } } } + + // delete no longer referenced <ScBroadcastArea> instances + for ( aIter = aCopyForIteration.begin(); aIter != aEnd; ++aIter ) + { + ScBroadcastArea* pArea = *aIter; + if ( !pArea->DecRef() ) + { + delete pArea; + } + } + return bIsBroadcasted; } @@ -303,14 +317,24 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, if (aBroadcastAreaTbl.empty()) return false; sal_Bool bIsBroadcasted = false; - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); - aIter != aBroadcastAreaTbl.end(); /* increment in body */ ) + + // issue 118012 + // do not iterate on <aBoardcastAreaTbl> as its reveals that its iterators + // are destroyed during notification. + std::vector< ScBroadcastArea* > aCopyForIteration( aBroadcastAreaTbl.begin(), aBroadcastAreaTbl.end() ); + std::for_each( aCopyForIteration.begin(), aCopyForIteration.end(), boost::mem_fn( &ScBroadcastArea::IncRef ) ); + + const std::vector< ScBroadcastArea* >::const_iterator aEnd( aCopyForIteration.end() ); + std::vector< ScBroadcastArea* >::const_iterator aIter; + for ( aIter = aCopyForIteration.begin(); aIter != aEnd; ++aIter ) { ScBroadcastArea* pArea = *aIter; - // A Notify() during broadcast may call EndListeningArea() and thus - // dispose this area if it was the last listener, which would - // invalidate the iterator, hence increment before call. - ++aIter; + // check, if copied item has been already removed from <aBroadcastAreaTbl> + if ( aBroadcastAreaTbl.find( pArea ) == aBroadcastAreaTbl.end() ) + { + continue; + } + const ScRange& rAreaRange = pArea->GetRange(); if (rAreaRange.Intersects( rRange )) { @@ -321,6 +345,17 @@ sal_Bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, } } } + + // delete no longer referenced <ScBroadcastArea> instances + for ( aIter = aCopyForIteration.begin(); aIter != aEnd; ++aIter ) + { + ScBroadcastArea* pArea = *aIter; + if ( !pArea->DecRef() ) + { + delete pArea; + } + } + return bIsBroadcasted; } |