diff options
-rw-r--r-- | basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 6 | ||||
-rw-r--r-- | basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx | 7 | ||||
-rw-r--r-- | basegfx/inc/basegfx/polygon/b3dpolygontools.hxx | 3 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygontools.cxx | 27 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolygonclipper.cxx | 12 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolygontools.cxx | 21 | ||||
-rw-r--r-- | sot/inc/sot/exchange.hxx | 17 | ||||
-rw-r--r-- | sot/source/base/formats.cxx | 57 | ||||
-rwxr-xr-x | unusedcode.easy | 5 |
9 files changed, 0 insertions, 155 deletions
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index 3fdadbcb4aa6..d26475e23694 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -316,9 +316,6 @@ namespace basegfx // distort polygon. rOriginal describes the original range, where the given points describe the distorted corresponding points. BASEGFX_DLLPUBLIC B2DPolygon distort(const B2DPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight); - // rotate polygon around given point with given angle. - BASEGFX_DLLPUBLIC B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle); - // expand all segments (which are not yet) to curve segments. This is done with setting the control // vectors on the 1/3 resp. 2/3 distances on each segment. BASEGFX_DLLPUBLIC B2DPolygon expandToCurve(const B2DPolygon& rCandidate); @@ -327,9 +324,6 @@ namespace basegfx // vectors on the 1/3 resp. 2/3 distances. The return value describes if a change took place. BASEGFX_DLLPUBLIC bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex); - // set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too. - B2DPolygon setContinuity(const B2DPolygon& rCandidate, B2VectorContinuity eContinuity); - // set continuity for given index. If not a curve, nothing will change. Non-curve points are not changed, too. // The return value describes if a change took place. BASEGFX_DLLPUBLIC bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity); diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx index d125d478ab8a..a6ca7146b31e 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx @@ -52,13 +52,6 @@ namespace basegfx B3DORIENTATION_Z // Z-Axis }; - // Clip given 3D polygon against a plane orthogonal to X,Y or Z axis. The plane is defined using the - // enum ePlaneOrthogonal which names the vector orthogonal to the plane, the fPlaneOffset gives the distance - // of the plane from the center (0.0). - // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane). - // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). - BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); - // version for Polygons BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx index 9d66ca5c117e..c94495ed7504 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx @@ -76,9 +76,6 @@ namespace basegfx // get area of polygon BASEGFX_DLLPUBLIC double getArea(const ::basegfx::B3DPolygon& rCandidate); - // get length of polygon edge from point nIndex to nIndex + 1 - BASEGFX_DLLPUBLIC double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex); - // get length of polygon BASEGFX_DLLPUBLIC double getLength(const B3DPolygon& rCandidate); diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index f86f0c655e9b..cfe9f3a71bc5 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -2549,21 +2549,6 @@ namespace basegfx } } - B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle) - { - const sal_uInt32 nPointCount(rCandidate.count()); - B2DPolygon aRetval(rCandidate); - - if(nPointCount) - { - const B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(rCenter, fAngle)); - - aRetval.transform(aMatrix); - } - - return aRetval; - } - B2DPolygon expandToCurve(const B2DPolygon& rCandidate) { B2DPolygon aRetval(rCandidate); @@ -2618,18 +2603,6 @@ namespace basegfx return bRetval; } - B2DPolygon setContinuity(const B2DPolygon& rCandidate, B2VectorContinuity eContinuity) - { - B2DPolygon aRetval(rCandidate); - - for(sal_uInt32 a(0L); a < rCandidate.count(); a++) - { - setContinuityInPoint(aRetval, a, eContinuity); - } - - return aRetval; - } - bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity) { OSL_ENSURE(nIndex < rCandidate.count(), "setContinuityInPoint: Access to polygon out of range (!)"); diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx index 6db49e23beb6..8130d00eced2 100644 --- a/basegfx/source/polygon/b3dpolygonclipper.cxx +++ b/basegfx/source/polygon/b3dpolygonclipper.cxx @@ -294,18 +294,6 @@ namespace basegfx return aRetval; } - B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke) - { - B3DPolyPolygon aRetval; - - for(sal_uInt32 a(0L); a < rCandidate.count(); a++) - { - aRetval.append(clipPolygonOnOrthogonalPlane(rCandidate.getB3DPolygon(a), ePlaneOrthogonal, bClipPositive, fPlaneOffset, bStroke)); - } - - return aRetval; - } - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index 306f97b5c621..8bdfd132faa3 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++ b/basegfx/source/polygon/b3dpolygontools.cxx @@ -153,27 +153,6 @@ namespace basegfx return fRetval; } - double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex) - { - OSL_ENSURE(nIndex < rCandidate.count(), "getEdgeLength: Access to polygon out of range (!)"); - double fRetval(0.0); - const sal_uInt32 nPointCount(rCandidate.count()); - - if(nIndex < nPointCount) - { - if(rCandidate.isClosed() || ((nIndex + 1L) != nPointCount)) - { - const sal_uInt32 nNextIndex(getIndexOfSuccessor(nIndex, rCandidate)); - const B3DPoint aCurrentPoint(rCandidate.getB3DPoint(nIndex)); - const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex)); - const B3DVector aVector(aNextPoint - aCurrentPoint); - fRetval = aVector.getLength(); - } - } - - return fRetval; - } - double getLength(const B3DPolygon& rCandidate) { double fRetval(0.0); diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx index 7ab886f314ac..2623ad48534b 100644 --- a/sot/inc/sot/exchange.hxx +++ b/sot/inc/sot/exchange.hxx @@ -224,23 +224,6 @@ public: // In:- optional - check the contents of Xtransferable const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL ); - // same for XTransferable interface - static sal_uInt16 GetExchangeAction( - // XTransferable - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, - // Ziel der Aktion (EXCHG_DEST_*) - sal_uInt16 nDestination, - // Aktionen, die Quelle unterstuetzt (EXCHG_SOURCE_...) - sal_uInt16 nSourceOptions, - // vom Anwender gewaehlte Aktion (EXCHG_IN_*, EXCHG_INOUT_*) - sal_uInt16 nUserAction, - // In:- Out: Zu benutzendes Format - sal_uLong& rFormat, - // In:- Out: Default-Action (EXCHG_IN_*, EXCHG_INOUT_*) - sal_uInt16& rDefaultAction, - // In:- optional - check only for this specific format - sal_uLong nOnlyTestFormat = 0 ); - static sal_uInt16 IsChart( const SvGlobalName& rName ); static sal_uInt16 IsMath( const SvGlobalName& rName ); }; diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index efb34c5428c9..67514735230b 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1548,63 +1548,6 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor // ----------------------------------------------------------------------------- -sal_uInt16 SotExchange::GetExchangeAction( - const Reference< XTransferable >& rxTransferable, - sal_uInt16 nDestination, sal_uInt16 nSourceOptions, - sal_uInt16 nUserAction, sal_uLong& rFormat, - sal_uInt16& rDefaultAction, sal_uLong nOnlyTestFormat ) -{ - DataFlavorExVector aVector; - - if( rxTransferable.is() ) - { - try - { - const Sequence< DataFlavor > aFlavors( rxTransferable->getTransferDataFlavors() ); - - for( sal_Int32 i = 0; i < aFlavors.getLength(); i++ ) - { - DataFlavorEx aFlavorEx; - const DataFlavor& rFlavor = aFlavors[ i ]; - - aFlavorEx.MimeType = rFlavor.MimeType; - aFlavorEx.HumanPresentableName = rFlavor.HumanPresentableName; - aFlavorEx.DataType = rFlavor.DataType; - aFlavorEx.mnSotId = SotExchange::RegisterFormat( rFlavor ); - - aVector.push_back( aFlavorEx ); - - if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) && - !IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) ) - { - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) ) - { - aFlavorEx.mnSotId = SOT_FORMAT_BITMAP; - aVector.push_back( aFlavorEx ); - } - } - else if( ( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) || - ( SOT_FORMATSTR_ID_EMF == aFlavorEx.mnSotId ) ) && - !IsFormatSupported( aVector, SOT_FORMAT_GDIMETAFILE ) ) - { - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_GDIMETAFILE, aFlavorEx ) ) - { - aFlavorEx.mnSotId = SOT_FORMAT_GDIMETAFILE; - aVector.push_back( aFlavorEx ); - } - } - } - } - catch( const ::com::sun::star::uno::Exception& ) - { - } - } - - return( SotExchange::GetExchangeAction( aVector, nDestination, nSourceOptions, - nUserAction, rFormat, rDefaultAction, - nOnlyTestFormat, &rxTransferable ) ); -} - sal_uInt16 SotExchange::IsChart( const SvGlobalName& rName ) { sal_uInt16 nRet=0; diff --git a/unusedcode.easy b/unusedcode.easy index d51eed7dbf57..92e5b72e0a6a 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -163,7 +163,6 @@ SortedPositions::Remove(unsigned short, unsigned short) SortedPositions_SAR::Replace(unsigned int const&, unsigned short) SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short) SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*) -SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long) SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SpanStyleManager::get(WPXString const&) const SpinButton::SpinButton(Window*, ResId const&) @@ -504,13 +503,9 @@ _ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short) _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*) basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) -basegfx::tools::clipPolyPolygonOnOrthogonalPlane(basegfx::B3DPolyPolygon const&, basegfx::tools::B3DOrientation, bool, double, bool) basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&) basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&) -basegfx::tools::getEdgeLength(basegfx::B3DPolygon const&, unsigned int) basegfx::tools::getSignedArea(basegfx::B3DPolygon const&) -basegfx::tools::rotateAroundPoint(basegfx::B2DPolygon const&, basegfx::B2DPoint const&, double) -basegfx::tools::setContinuity(basegfx::B2DPolygon const&, basegfx::B2VectorContinuity) basic::ScriptExtensionIterator::implGetScriptPackageFromPackage(com::sun::star::uno::Reference<com::sun::star::deployment::XPackage>, bool&) basic::vba::getCurrentDirectory(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&) binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short) |