diff options
| -rw-r--r-- | sc/inc/externalrefmgr.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 26 |
2 files changed, 0 insertions, 32 deletions
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index e7a5e79a7c60..c072cfd5eb2a 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -768,12 +768,6 @@ private: private: ScDocument* mpDoc; - /** Mutex for accessing cached data and/or source document shells. */ - mutable osl::Mutex maMtxCacheAccess; - - /** Mutex for source document meta-data access. */ - mutable osl::Mutex maMtxSrcFiles; - /** cache of referenced ranges and names from source documents. */ ScExternalRefCache maRefCache; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 9c07fd7360f1..c06490ee14a4 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1606,7 +1606,6 @@ void ScExternalRefManager::getAllCachedNumberFormats(vector<sal_uInt32>& rNumFmt sal_uInt16 ScExternalRefManager::getExternalFileCount() const { - osl::MutexGuard aGuard(&maMtxSrcFiles); return static_cast< sal_uInt16 >( maSrcFiles.size() ); } @@ -1759,8 +1758,6 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rCell, const ScAddress* pCurPos, SCTAB* pTab, ScExternalRefCache::CellFormat* pFmt) { - osl::MutexGuard aGuard(&maMtxCacheAccess); - if (pCurPos) insertRefCell(nFileId, *pCurPos); @@ -1853,8 +1850,6 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken( ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokens( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange, const ScAddress* pCurPos) { - osl::MutexGuard aGuard(&maMtxCacheAccess); - if (pCurPos) insertRefCell(nFileId, *pCurPos); @@ -1901,8 +1896,6 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokens( ScExternalRefCache::TokenArrayRef ScExternalRefManager::getRangeNameTokens( sal_uInt16 nFileId, const OUString& rName, const ScAddress* pCurPos) { - osl::MutexGuard aGuard(&maMtxCacheAccess); - if (pCurPos) insertRefCell(nFileId, *pCurPos); @@ -1956,8 +1949,6 @@ bool hasRangeName(ScDocument& rDoc, const OUString& rName) bool ScExternalRefManager::isValidRangeName(sal_uInt16 nFileId, const OUString& rName) { - osl::MutexGuard aGuard(&maMtxCacheAccess); - maybeLinkExternalFile(nFileId); ScDocument* pSrcDoc = getInMemorySrcDocument(nFileId); if (pSrcDoc) @@ -2415,7 +2406,6 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const OUString& void ScExternalRefManager::maybeCreateRealFileName(sal_uInt16 nFileId) { - osl::MutexGuard aGuard(&maMtxSrcFiles); if (nFileId >= maSrcFiles.size()) return; @@ -2460,8 +2450,6 @@ void ScExternalRefManager::convertToAbsName(OUString& rFile) const sal_uInt16 ScExternalRefManager::getExternalFileId(const OUString& rFile) { - osl::MutexGuard aGuard(&maMtxSrcFiles); - vector<SrcFileData>::const_iterator itrBeg = maSrcFiles.begin(), itrEnd = maSrcFiles.end(); vector<SrcFileData>::const_iterator itr = find_if(itrBeg, itrEnd, FindSrcFileByName(rFile)); if (itr != itrEnd) @@ -2478,8 +2466,6 @@ sal_uInt16 ScExternalRefManager::getExternalFileId(const OUString& rFile) const OUString* ScExternalRefManager::getExternalFileName(sal_uInt16 nFileId, bool bForceOriginal) { - osl::MutexGuard aGuard(&maMtxSrcFiles); - if (nFileId >= maSrcFiles.size()) return NULL; @@ -2496,14 +2482,11 @@ const OUString* ScExternalRefManager::getExternalFileName(sal_uInt16 nFileId, bo bool ScExternalRefManager::hasExternalFile(sal_uInt16 nFileId) const { - osl::MutexGuard aGuard(&maMtxSrcFiles); return nFileId < maSrcFiles.size(); } bool ScExternalRefManager::hasExternalFile(const OUString& rFile) const { - osl::MutexGuard aGuard(&maMtxSrcFiles); - vector<SrcFileData>::const_iterator itrBeg = maSrcFiles.begin(), itrEnd = maSrcFiles.end(); vector<SrcFileData>::const_iterator itr = find_if(itrBeg, itrEnd, FindSrcFileByName(rFile)); return itr != itrEnd; @@ -2602,8 +2585,6 @@ void ScExternalRefManager::breakLink(sal_uInt16 nFileId) void ScExternalRefManager::switchSrcFile(sal_uInt16 nFileId, const OUString& rNewFile, const OUString& rNewFilter) { - osl::MutexGuard aGuard(&maMtxSrcFiles); - maSrcFiles[nFileId].maFileName = rNewFile; maSrcFiles[nFileId].maRelativeName = OUString(); maSrcFiles[nFileId].maRealFileName = OUString(); @@ -2618,8 +2599,6 @@ void ScExternalRefManager::switchSrcFile(sal_uInt16 nFileId, const OUString& rNe void ScExternalRefManager::setRelativeFileName(sal_uInt16 nFileId, const OUString& rRelUrl) { - osl::MutexGuard aGuard(&maMtxSrcFiles); - if (nFileId >= maSrcFiles.size()) return; maSrcFiles[nFileId].maRelativeName = rRelUrl; @@ -2627,8 +2606,6 @@ void ScExternalRefManager::setRelativeFileName(sal_uInt16 nFileId, const OUStrin void ScExternalRefManager::setFilterData(sal_uInt16 nFileId, const OUString& rFilterName, const OUString& rOptions) { - osl::MutexGuard aGuard(&maMtxSrcFiles); - if (nFileId >= maSrcFiles.size()) return; maSrcFiles[nFileId].maFilterName = rFilterName; @@ -2647,13 +2624,11 @@ void ScExternalRefManager::clear() bool ScExternalRefManager::hasExternalData() const { - osl::MutexGuard aGuard(&maMtxSrcFiles); return !maSrcFiles.empty(); } void ScExternalRefManager::resetSrcFileData(const OUString& rBaseFileUrl) { - osl::MutexGuard aGuard(&maMtxSrcFiles); for (vector<SrcFileData>::iterator itr = maSrcFiles.begin(), itrEnd = maSrcFiles.end(); itr != itrEnd; ++itr) { @@ -2669,7 +2644,6 @@ void ScExternalRefManager::resetSrcFileData(const OUString& rBaseFileUrl) void ScExternalRefManager::updateAbsAfterLoad() { - osl::MutexGuard aGuard(&maMtxSrcFiles); OUString aOwn( getOwnDocumentName() ); for (vector<SrcFileData>::iterator itr = maSrcFiles.begin(), itrEnd = maSrcFiles.end(); itr != itrEnd; ++itr) |