diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-11-27 23:04:25 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-27 23:08:08 +0100 |
| commit | 5b940edaf66ab8371192ef67ef9171c0d40f7e18 (patch) | |
| tree | 10929c3f973da757519237eca0953cc72a16641c | |
| parent | fdo#84686 prevent std::bad_alloc exception by stricter input check (diff) | |
| download | core-5b940edaf66ab8371192ef67ef9171c0d40f7e18.tar.gz core-5b940edaf66ab8371192ef67ef9171c0d40f7e18.zip | |
unused function Calc_nBLIPPos
Change-Id: Iaa4073e2f1c0ccea7a5d63d24e34ac5647a0e7b0
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 9 | ||||
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/inc/xiescher.hxx | 2 |
4 files changed, 0 insertions, 18 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d1ca58185dcd..22eda4097197 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5863,10 +5863,6 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe if( (!nBLIPPos) && (nBLIPLen < nLenFBSE) ) nBLIPPos = rSt.Tell() + 4; - // That worked great! - // We store, that we do have one FBSE more in the pointer array. - nBLIPPos = Calc_nBLIPPos(nBLIPPos, rSt.Tell()); - if( USHRT_MAX == nBLIPCount ) nBLIPCount = 1; else @@ -6485,11 +6481,6 @@ void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader return; // will be overloaded by SJ in Draw } -sal_uLong SvxMSDffManager::Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong /* nStreamPos */ ) const -{ - return nOrgVal; -} - bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const { return false; diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 45234622d999..f129ec80f68a 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -504,8 +504,6 @@ protected : void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL); - virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, - sal_uLong nStreamPos ) const; virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const; // Fontwork objects use a new implementation of ReadObjText because the old diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index bc25d5a2d070..3da59ae39045 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3534,11 +3534,6 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO return xSdrObj.release(); } -sal_uLong XclImpDffConverter::Calc_nBLIPPos( sal_uLong /*nOrgVal*/, sal_uLong nStreamPos ) const -{ - return nStreamPos + 4; -} - bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFormComp, const ::com::sun::star::awt::Size& /*rSize*/, Reference< XShape >* pxShape, bool /*bFloatingCtrl*/ ) diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 0a936efc4cc2..dc2be34a7fab 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -977,8 +977,6 @@ private: void* pClientData, Rectangle& rTextRect, SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE; - /** Returns the BLIP stream position, based on the passed DFF stream position. */ - virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const SAL_OVERRIDE; // virtual functions of SvxMSConvertOCXControls |