diff -r 23debe0bf2cd sc/inc/externalrefmgr.hxx --- a/sc/inc/externalrefmgr.hxx Thu Jun 17 09:00:57 2010 +0200 +++ b/sc/inc/externalrefmgr.hxx Fri Jun 18 10:30:55 2010 +0100 @@ -178,7 +178,6 @@ /// Returns the half-open range of used columns in the specified row. Returns [0,0) if row is empty. SC_DLLPUBLIC ::std::pair< SCCOL, SCCOL > getColRange( SCROW nRow ) const; void getAllNumberFormats(::std::vector& rNumFmts) const; - const ScRangeList& getCachedRanges() const; bool isRangeCached(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; void setCachedCell(SCCOL nCol, SCROW nRow); @@ -212,7 +211,6 @@ ~ScExternalRefCache(); const String* getRealTableName(sal_uInt16 nFileId, const String& rTabName) const; - const String* getRealRangeName(sal_uInt16 nFileId, const String& rRangeName) const; /** * Get a cached cell data at specified cell location. @@ -297,7 +295,6 @@ bool mbAllReferenced; ReferencedStatus(); - explicit ReferencedStatus( size_t nDocs ); void reset( size_t nDocs ); void checkAllDocs(); @@ -607,7 +604,6 @@ const SrcFileData* getExternalFileData(sal_uInt16 nFileId) const; const String* getRealTableName(sal_uInt16 nFileId, const String& rTabName) const; - const String* getRealRangeName(sal_uInt16 nFileId, const String& rRangeName) const; void refreshNames(sal_uInt16 nFileId); void breakLink(sal_uInt16 nFileId); void switchSrcFile(sal_uInt16 nFileId, const String& rNewFile, const String& rNewFilter); diff -r 23debe0bf2cd sc/source/filter/excel/xechart.cxx --- a/sc/source/filter/excel/xechart.cxx Thu Jun 17 09:00:57 2010 +0200 +++ b/sc/source/filter/excel/xechart.cxx Fri Jun 18 10:30:55 2010 +0100 @@ -320,16 +320,6 @@ return aRect; } -sal_Int32 XclExpChRoot::CalcChartXFromRelative( double fPosX ) const -{ - return CalcChartXFromHmm( static_cast< sal_Int32 >( fPosX * mxChData->maChartRect.GetWidth() + 0.5 ) ); -} - -sal_Int32 XclExpChRoot::CalcChartYFromRelative( double fPosY ) const -{ - return CalcChartYFromHmm( static_cast< sal_Int32 >( fPosY * mxChData->maChartRect.GetHeight() + 0.5 ) ); -} - void XclExpChRoot::ConvertLineFormat( XclChLineFormat& rLineFmt, const ScfPropertySet& rPropSet, XclChPropertyMode ePropMode ) const { diff -r 23debe0bf2cd sc/source/filter/inc/xechart.hxx --- a/sc/source/filter/inc/xechart.hxx Thu Jun 17 09:00:57 2010 +0200 +++ b/sc/source/filter/inc/xechart.hxx Fri Jun 18 10:30:55 2010 +0100 @@ -118,11 +118,6 @@ /** Converts the passed rectangle from 1/100 mm to Excel chart units. */ XclChRectangle CalcChartRectFromHmm( const ::com::sun::star::awt::Rectangle& rRect ) const; - /** Converts the passed horizontal coordinate from a relative position to Excel chart units. */ - sal_Int32 CalcChartXFromRelative( double fPosX ) const; - /** Converts the passed vertical coordinate from a relative position to Excel chart units. */ - sal_Int32 CalcChartYFromRelative( double fPosY ) const; - /** Reads all line properties from the passed property set. */ void ConvertLineFormat( XclChLineFormat& rLineFmt, diff -r 23debe0bf2cd sc/source/ui/docshell/externalrefmgr.cxx --- a/sc/source/ui/docshell/externalrefmgr.cxx Thu Jun 17 09:00:57 2010 +0200 +++ b/sc/source/ui/docshell/externalrefmgr.cxx Fri Jun 18 10:30:55 2010 +0100 @@ -388,11 +388,6 @@ } } -const ScRangeList& ScExternalRefCache::Table::getCachedRanges() const -{ - return maCachedRanges; -} - bool ScExternalRefCache::Table::isRangeCached(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const { return maCachedRanges.In(ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0)); @@ -480,25 +475,6 @@ return &rDoc.maTableNames[itrTabId->second].maRealName; } -const String* ScExternalRefCache::getRealRangeName(sal_uInt16 nFileId, const String& rRangeName) const -{ - DocDataType::const_iterator itrDoc = maDocs.find(nFileId); - if (itrDoc == maDocs.end()) - { - // specified document is not cached. - return NULL; - } - - const DocItem& rDoc = itrDoc->second; - NamePairMap::const_iterator itr = rDoc.maRealRangeNameMap.find( - ScGlobal::pCharClass->upper(rRangeName)); - if (itr == rDoc.maRealRangeNameMap.end()) - // range name not found. - return NULL; - - return &itr->second; -} - ScExternalRefCache::TokenRef ScExternalRefCache::getCellData( sal_uInt16 nFileId, const String& rTabName, SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex) { @@ -1128,12 +1104,6 @@ reset(0); } -ScExternalRefCache::ReferencedStatus::ReferencedStatus( size_t nDocs ) : - mbAllReferenced(false) -{ - reset( nDocs); -} - void ScExternalRefCache::ReferencedStatus::reset( size_t nDocs ) { if (nDocs) @@ -2227,11 +2197,6 @@ return maRefCache.getRealTableName(nFileId, rTabName); } -const String* ScExternalRefManager::getRealRangeName(sal_uInt16 nFileId, const String& rRangeName) const -{ - return maRefCache.getRealRangeName(nFileId, rRangeName); -} - template void lcl_removeByFileId(sal_uInt16 nFileId, MapContainer& rMap) {