Kaydet (Commit) a6f5770b authored tarafından Michael Stahl's avatar Michael Stahl

Revert "loplugin:unusedmethods sax,shell,stoc,basegfx"

The basegfx changes appear to break Windows builds.

This reverts commit 3b32c589.
üst 5bc343cc
...@@ -131,6 +131,15 @@ namespace basegfx ...@@ -131,6 +131,15 @@ namespace basegfx
return *this; return *this;
} }
// blend to another color using luminance
void blend(const BColor& rColor)
{
const double fLuminance(luminance());
mfX = rColor.getRed() * fLuminance;
mfY = rColor.getGreen() * fLuminance;
mfZ = rColor.getBlue() * fLuminance;
}
// luminance // luminance
double luminance() const double luminance() const
{ {
...@@ -155,6 +164,16 @@ namespace basegfx ...@@ -155,6 +164,16 @@ namespace basegfx
return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB); return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
} }
double getMinimumDistance(const BColor& rColor) const
{
const double fDistR(getDistanceRed(rColor));
const double fDistG(getDistanceGreen(rColor));
const double fDistB(getDistanceBlue(rColor));
double fRetval(fDistR < fDistG ? fDistR : fDistG);
return (fRetval < fDistB ? fRetval : fDistB);
}
double getMaximumDistance(const BColor& rColor) const double getMaximumDistance(const BColor& rColor) const
{ {
const double fDistR(getDistanceRed(rColor)); const double fDistR(getDistanceRed(rColor));
...@@ -187,6 +206,18 @@ namespace basegfx ...@@ -187,6 +206,18 @@ namespace basegfx
return static_cast<const BColor&>( ::basegfx::B3DTuple::getEmptyTuple() ); return static_cast<const BColor&>( ::basegfx::B3DTuple::getEmptyTuple() );
} }
com::sun::star::uno::Sequence< double > colorToDoubleSequence(const com::sun::star::uno::Reference< com::sun::star::rendering::XGraphicDevice >& /*xGraphicDevice*/) const
{
com::sun::star::uno::Sequence< double > aRet(4);
double* pRet = aRet.getArray();
pRet[0] = mfX;
pRet[1] = mfY;
pRet[2] = mfZ;
pRet[3] = 1.0;
return aRet;
}
}; };
} // end of namespace basegfx } // end of namespace basegfx
......
...@@ -218,6 +218,7 @@ namespace basegfx ...@@ -218,6 +218,7 @@ namespace basegfx
const B2DVector& getScale() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maScale; } const B2DVector& getScale() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maScale; }
const B2DVector& getTranslate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maTranslate; } const B2DVector& getTranslate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maTranslate; }
double getRotate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfRotate; } double getRotate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfRotate; }
double getShearX() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfShearX; }
}; };
} // end of namespace tools } // end of namespace tools
......
...@@ -95,16 +95,21 @@ namespace basegfx ...@@ -95,16 +95,21 @@ namespace basegfx
sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; } sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; }
sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; } sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; }
sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; } sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; }
sal_uInt32 getRedGreenBlueOpacity() const { return maPixelUnion.maCombinedRGBO.mnValue; }
// data access write // data access write
void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; } void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; }
void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; } void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; }
void setBlue(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnB = nNew; } void setBlue(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnB = nNew; }
void setOpacity(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnO = nNew; } void setOpacity(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnO = nNew; }
void setRedGreenBlueOpacity(sal_uInt32 nRedGreenBlueOpacity) { maPixelUnion.maCombinedRGBO.mnValue = nRedGreenBlueOpacity; }
void setRedGreenBlue(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB) { maPixelUnion.maRGBO.mnR = nR; maPixelUnion.maRGBO.mnG = nG; maPixelUnion.maRGBO.mnB = nB; }
// comparators // comparators
bool isInvisible() const { return (0 == maPixelUnion.maRGBO.mnO); } bool isInvisible() const { return (0 == maPixelUnion.maRGBO.mnO); }
bool isVisible() const { return (0 != maPixelUnion.maRGBO.mnO); } bool isVisible() const { return (0 != maPixelUnion.maRGBO.mnO); }
bool isEmpty() const { return isInvisible(); }
bool isUsed() const { return isVisible(); }
bool operator==( const BPixel& rPixel ) const bool operator==( const BPixel& rPixel ) const
{ {
......
...@@ -71,6 +71,12 @@ namespace basegfx ...@@ -71,6 +71,12 @@ namespace basegfx
return maRange.isEmpty(); return maRange.isEmpty();
} }
/// reset the object to empty state again, clearing all values
void reset()
{
maRange.reset();
}
bool operator==( const B1DRange& rRange ) const bool operator==( const B1DRange& rRange ) const
{ {
return (maRange == rRange.maRange); return (maRange == rRange.maRange);
...@@ -81,6 +87,11 @@ namespace basegfx ...@@ -81,6 +87,11 @@ namespace basegfx
return (maRange != rRange.maRange); return (maRange != rRange.maRange);
} }
bool equal(const B1DRange& rRange) const
{
return (maRange.equal(rRange.maRange));
}
/// get lower bound of the set. returns arbitrary values for empty sets. /// get lower bound of the set. returns arbitrary values for empty sets.
double getMinimum() const double getMinimum() const
{ {
...@@ -111,6 +122,12 @@ namespace basegfx ...@@ -111,6 +122,12 @@ namespace basegfx
return maRange.isInside(fValue); return maRange.isInside(fValue);
} }
/// yields true if rRange is inside, or equal to set
bool isInside(const B1DRange& rRange) const
{
return maRange.isInside(rRange.maRange);
}
/// yields true if rRange at least partly inside set /// yields true if rRange at least partly inside set
bool overlaps(const B1DRange& rRange) const bool overlaps(const B1DRange& rRange) const
{ {
...@@ -141,6 +158,11 @@ namespace basegfx ...@@ -141,6 +158,11 @@ namespace basegfx
maRange.intersect(rRange.maRange); maRange.intersect(rRange.maRange);
} }
/// grow set by fValue on both sides
void grow(double fValue)
{
maRange.grow(fValue);
}
}; };
} // end of namespace basegfx } // end of namespace basegfx
......
...@@ -104,6 +104,13 @@ namespace basegfx ...@@ -104,6 +104,13 @@ namespace basegfx
return maRangeX.isEmpty() || maRangeY.isEmpty(); return maRangeX.isEmpty() || maRangeY.isEmpty();
} }
/// reset the object to empty state again, clearing all values
void reset()
{
maRangeX.reset();
maRangeY.reset();
}
bool operator==( const B2IBox& rBox ) const bool operator==( const B2IBox& rBox ) const
{ {
return (maRangeX == rBox.maRangeX return (maRangeX == rBox.maRangeX
...@@ -170,6 +177,24 @@ namespace basegfx ...@@ -170,6 +177,24 @@ namespace basegfx
); );
} }
/// return difference between upper and lower value. returns (0,0) for empty sets.
B2I64Tuple getRange() const
{
return B2I64Tuple(
maRangeX.getRange(),
maRangeY.getRange()
);
}
/// return center point of set. returns (0,0) for empty sets.
B2DPoint getCenter() const
{
return B2DPoint(
maRangeX.getCenter(),
maRangeY.getCenter()
);
}
/// yields true if point is contained in set /// yields true if point is contained in set
bool isInside(const B2ITuple& rTuple) const bool isInside(const B2ITuple& rTuple) const
{ {
...@@ -179,6 +204,24 @@ namespace basegfx ...@@ -179,6 +204,24 @@ namespace basegfx
); );
} }
/// yields true if rBox is inside, or equal to set
bool isInside(const B2IBox& rBox) const
{
return (
maRangeX.isInside(rBox.maRangeX)
&& maRangeY.isInside(rBox.maRangeY)
);
}
/// yields true if rBox at least partly inside set
bool overlaps(const B2IBox& rBox) const
{
return (
maRangeX.overlaps(rBox.maRangeX)
&& maRangeY.overlaps(rBox.maRangeY)
);
}
/// add point to the set, expanding as necessary /// add point to the set, expanding as necessary
void expand(const B2ITuple& rTuple) void expand(const B2ITuple& rTuple)
{ {
...@@ -186,6 +229,13 @@ namespace basegfx ...@@ -186,6 +229,13 @@ namespace basegfx
maRangeY.expand(rTuple.getY()); maRangeY.expand(rTuple.getY());
} }
/// add rBox to the set, expanding as necessary
void expand(const B2IBox& rBox)
{
maRangeX.expand(rBox.maRangeX);
maRangeY.expand(rBox.maRangeY);
}
/// calc set intersection /// calc set intersection
void intersect(const B2IBox& rBox) void intersect(const B2IBox& rBox)
{ {
...@@ -193,6 +243,13 @@ namespace basegfx ...@@ -193,6 +243,13 @@ namespace basegfx
maRangeY.intersect(rBox.maRangeY); maRangeY.intersect(rBox.maRangeY);
} }
/// grow set by nValue on all sides
void grow(sal_Int32 nValue)
{
maRangeX.grow(nValue);
maRangeY.grow(nValue);
}
private: private:
BasicBox maRangeX; BasicBox maRangeX;
BasicBox maRangeY; BasicBox maRangeY;
......
...@@ -178,6 +178,15 @@ namespace basegfx ...@@ -178,6 +178,15 @@ namespace basegfx
); );
} }
/// return center point of set. returns (0,0) for empty sets.
B2DPoint getCenter() const
{
return B2DPoint(
maRangeX.getCenter(),
maRangeY.getCenter()
);
}
/// yields true if given point is contained in set /// yields true if given point is contained in set
bool isInside(const B2ITuple& rTuple) const bool isInside(const B2ITuple& rTuple) const
{ {
...@@ -187,6 +196,33 @@ namespace basegfx ...@@ -187,6 +196,33 @@ namespace basegfx
); );
} }
/// yields true if rRange is inside, or equal to set
bool isInside(const B2IRange& rRange) const
{
return (
maRangeX.isInside(rRange.maRangeX)
&& maRangeY.isInside(rRange.maRangeY)
);
}
/// yields true if rRange at least partly inside set
bool overlaps(const B2IRange& rRange) const
{
return (
maRangeX.overlaps(rRange.maRangeX)
&& maRangeY.overlaps(rRange.maRangeY)
);
}
/// yields true if overlaps(rRange) does, and the overlap is larger than infinitesimal
bool overlapsMore(const B2IRange& rRange) const
{
return (
maRangeX.overlapsMore(rRange.maRangeX)
&& maRangeY.overlapsMore(rRange.maRangeY)
);
}
/// add point to the set, expanding as necessary /// add point to the set, expanding as necessary
void expand(const B2ITuple& rTuple) void expand(const B2ITuple& rTuple)
{ {
...@@ -194,6 +230,13 @@ namespace basegfx ...@@ -194,6 +230,13 @@ namespace basegfx
maRangeY.expand(rTuple.getY()); maRangeY.expand(rTuple.getY());
} }
/// add rRange to the set, expanding as necessary
void expand(const B2IRange& rRange)
{
maRangeX.expand(rRange.maRangeX);
maRangeY.expand(rRange.maRangeY);
}
/// calc set intersection /// calc set intersection
void intersect(const B2IRange& rRange) void intersect(const B2IRange& rRange)
{ {
...@@ -201,6 +244,13 @@ namespace basegfx ...@@ -201,6 +244,13 @@ namespace basegfx
maRangeY.intersect(rRange.maRangeY); maRangeY.intersect(rRange.maRangeY);
} }
/// grow set by nValue on all sides
void grow(sal_Int32 nValue)
{
maRangeX.grow(nValue);
maRangeY.grow(nValue);
}
private: private:
typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange; typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange;
......
...@@ -102,6 +102,13 @@ namespace basegfx ...@@ -102,6 +102,13 @@ namespace basegfx
|| maRangeZ != rRange.maRangeZ); || maRangeZ != rRange.maRangeZ);
} }
bool equal(const B3DRange& rRange) const
{
return (maRangeX.equal(rRange.maRangeX)
&& maRangeY.equal(rRange.maRangeY)
&& maRangeZ.equal(rRange.maRangeZ));
}
double getMinX() const double getMinX() const
{ {
return maRangeX.getMinimum(); return maRangeX.getMinimum();
...@@ -147,6 +154,24 @@ namespace basegfx ...@@ -147,6 +154,24 @@ namespace basegfx
return maRangeZ.getRange(); return maRangeZ.getRange();
} }
B3DPoint getMinimum() const
{
return B3DPoint(
maRangeX.getMinimum(),
maRangeY.getMinimum(),
maRangeZ.getMinimum()
);
}
B3DPoint getMaximum() const
{
return B3DPoint(
maRangeX.getMaximum(),
maRangeY.getMaximum(),
maRangeZ.getMaximum()
);
}
B3DVector getRange() const B3DVector getRange() const
{ {
return B3DVector( return B3DVector(
...@@ -165,6 +190,39 @@ namespace basegfx ...@@ -165,6 +190,39 @@ namespace basegfx
); );
} }
double getCenterX() const
{
return maRangeX.getCenter();
}
double getCenterY() const
{
return maRangeY.getCenter();
}
double getCenterZ() const
{
return maRangeZ.getCenter();
}
bool isInside(const B3DTuple& rTuple) const
{
return (
maRangeX.isInside(rTuple.getX())
&& maRangeY.isInside(rTuple.getY())
&& maRangeZ.isInside(rTuple.getZ())
);
}
bool isInside(const B3DRange& rRange) const
{
return (
maRangeX.isInside(rRange.maRangeX)
&& maRangeY.isInside(rRange.maRangeY)
&& maRangeZ.isInside(rRange.maRangeZ)
);
}
bool overlaps(const B3DRange& rRange) const bool overlaps(const B3DRange& rRange) const
{ {
return ( return (
...@@ -188,6 +246,13 @@ namespace basegfx ...@@ -188,6 +246,13 @@ namespace basegfx
maRangeZ.expand(rRange.maRangeZ); maRangeZ.expand(rRange.maRangeZ);
} }
void intersect(const B3DRange& rRange)
{
maRangeX.intersect(rRange.maRangeX);
maRangeY.intersect(rRange.maRangeY);
maRangeZ.intersect(rRange.maRangeZ);
}
void grow(double fValue) void grow(double fValue)
{ {
maRangeX.grow(fValue); maRangeX.grow(fValue);
......
...@@ -91,6 +91,18 @@ namespace basegfx ...@@ -91,6 +91,18 @@ namespace basegfx
return mnY; return mnY;
} }
/// Set X-Coordinate of 2D Tuple
void setX(sal_Int64 fX)
{
mnX = fX;
}
/// Set Y-Coordinate of 2D Tuple
void setY(sal_Int64 fY)
{
mnY = fY;
}
/// Array-access to 2D Tuple /// Array-access to 2D Tuple
const sal_Int64& operator[] (int nPos) const const sal_Int64& operator[] (int nPos) const
{ {
...@@ -159,6 +171,8 @@ namespace basegfx ...@@ -159,6 +171,8 @@ namespace basegfx
return B2I64Tuple(-mnX, -mnY); return B2I64Tuple(-mnX, -mnY);
} }
bool equalZero() const { return mnX == 0 && mnY == 0; }
bool operator==( const B2I64Tuple& rTup ) const bool operator==( const B2I64Tuple& rTup ) const
{ {
return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY); return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
......
...@@ -104,6 +104,24 @@ namespace basegfx ...@@ -104,6 +104,24 @@ namespace basegfx
return mnZ; return mnZ;
} }
/// set X-Coordinate of 3D Tuple
void setX(sal_Int32 nX)
{
mnX = nX;
}
/// set Y-Coordinate of 3D Tuple
void setY(sal_Int32 nY)
{
mnY = nY;
}
/// set Z-Coordinate of 3D Tuple
void setZ(sal_Int32 nZ)
{
mnZ = nZ;
}
/// Array-access to 3D Tuple /// Array-access to 3D Tuple
const sal_Int32& operator[] (int nPos) const const sal_Int32& operator[] (int nPos) const
{ {
......
...@@ -126,6 +126,18 @@ namespace basegfx ...@@ -126,6 +126,18 @@ namespace basegfx
return sqrt(fLen); return sqrt(fLen);
} }
/** Calculate the length in the XY-Plane for this 3D Vector
@return The XY-Plane Length of the 3D Vector
*/
double getXYLength() const
{
double fLen((mfX * mfX) + (mfY * mfY));
if((0.0 == fLen) || (1.0 == fLen))
return fLen;
return sqrt(fLen);
}
/** Calculate the length in the XZ-Plane for this 3D Vector /** Calculate the length in the XZ-Plane for this 3D Vector
@return The XZ-Plane Length of the 3D Vector @return The XZ-Plane Length of the 3D Vector
...@@ -182,6 +194,20 @@ namespace basegfx ...@@ -182,6 +194,20 @@ namespace basegfx
*/ */
B3DVector& normalize(); B3DVector& normalize();
/** Test if this 3D Vector is normalized
@return
true if lenth of vector is equal to 1.0
false else
*/
bool isNormalized() const
{
const double fOne(1.0);
const double fScalar(scalar(*this));
return (::basegfx::fTools::equal(fOne, fScalar));
}
/** get a 3D Vector which is perpendicular to this and a given 3D Vector /** get a 3D Vector which is perpendicular to this and a given 3D Vector
@attention This only works if this and the given 3D Vector are @attention This only works if this and the given 3D Vector are
......
...@@ -56,6 +56,10 @@ public: ...@@ -56,6 +56,10 @@ public:
Unicode2TextConverter( rtl_TextEncoding encoding ); Unicode2TextConverter( rtl_TextEncoding encoding );
~Unicode2TextConverter(); ~Unicode2TextConverter();
inline ::com::sun::star::uno::Sequence<sal_Int8> convert( const OUString &s )
{
return convert( s.getStr() , s.getLength() );
}
::com::sun::star::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32 nLength ); ::com::sun::star::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32 nLength );
bool canContinue() { return m_bCanContinue; } bool canContinue() { return m_bCanContinue; }
......
...@@ -40,6 +40,10 @@ class i_xml_parser_event_handler ...@@ -40,6 +40,10 @@ class i_xml_parser_event_handler
public: public:
virtual ~i_xml_parser_event_handler() {}; virtual ~i_xml_parser_event_handler() {};
virtual void start_document() = 0;
virtual void end_document() = 0;
virtual void start_element( virtual void start_element(
const string_t& raw_name, const string_t& raw_name,
const string_t& local_name, const string_t& local_name,
...@@ -55,6 +59,9 @@ public: ...@@ -55,6 +59,9 @@ public:
virtual void ignore_whitespace( virtual void ignore_whitespace(
const string_t& whitespaces) = 0; const string_t& whitespaces) = 0;
virtual void processing_instruction(
const string_t& target, const string_t& data) = 0;
virtual void comment(const string_t& comment) = 0; virtual void comment(const string_t& comment) = 0;
}; };
......
...@@ -266,9 +266,16 @@ namespace /* private */ { ...@@ -266,9 +266,16 @@ namespace /* private */ {
current_element_ += character; current_element_ += character;
} }
virtual void start_document() SAL_OVERRIDE {}
virtual void end_document() SAL_OVERRIDE {}
virtual void ignore_whitespace(const string_t& /*whitespaces*/) SAL_OVERRIDE virtual void ignore_whitespace(const string_t& /*whitespaces*/) SAL_OVERRIDE
{} {}
virtual void processing_instruction(
const string_t& /*target*/, const string_t& /*data*/) SAL_OVERRIDE
{}
virtual void comment(const string_t& /*comment*/) SAL_OVERRIDE virtual void comment(const string_t& /*comment*/) SAL_OVERRIDE
{} {}
private: private:
......
...@@ -159,6 +159,10 @@ public: ...@@ -159,6 +159,10 @@ public:
{ return _pTypeDescr; } { return _pTypeDescr; }
IdlReflectionServiceImpl * getReflection() const IdlReflectionServiceImpl * getReflection() const
{ return _pReflection; } { return _pReflection; }
css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const
{ return _pReflection->getSMgr(); }
css::uno::Reference< css::container::XHierarchicalNameAccess > getTDMgr() const
{ return getReflection()->getTDMgr(); }
// Ctor // Ctor
IdlClassImpl( IdlReflectionServiceImpl * pReflection, IdlClassImpl( IdlReflectionServiceImpl * pReflection,
...@@ -342,6 +346,8 @@ protected: ...@@ -342,6 +346,8 @@ protected:
public: public:
IdlReflectionServiceImpl * getReflection() const IdlReflectionServiceImpl * getReflection() const
{ return _pReflection; } { return _pReflection; }
css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const
{ return _pReflection->getSMgr(); }
typelib_TypeDescription * getTypeDescr() const typelib_TypeDescription * getTypeDescr() const
{ return _pTypeDescr; } { return _pTypeDescr; }
typelib_TypeDescription * getDeclTypeDescr() const typelib_TypeDescription * getDeclTypeDescr() const
......
...@@ -128,6 +128,9 @@ private: ...@@ -128,6 +128,9 @@ private:
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
JavaVM * createJavaVM(JVM const & jvm, JNIEnv ** pMainThreadEnv);
// throws css::uno::RuntimeException
void registerConfigChangesListener(); void registerConfigChangesListener();
void setINetSettingsInVM(bool set_reset); void setINetSettingsInVM(bool set_reset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment