summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/fmtools.hxx1
-rw-r--r--include/svx/framelink.hxx38
-rw-r--r--include/svx/ofaitem.hxx4
-rw-r--r--include/svx/svdmodel.hxx3
-rw-r--r--include/svx/svdotext.hxx2
-rw-r--r--include/svx/svdtrans.hxx2
-rw-r--r--include/svx/textchainflow.hxx2
7 files changed, 1 insertions, 51 deletions
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 57305c6a8d13..4f836601d05a 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -78,7 +78,6 @@ namespace vcl { class Window; }
// displaying a database exception for the user
// display info about a simple css::sdbc::SQLException
void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL);
-void displayException(const css::sdbc::SQLWarning&, vcl::Window* _pParent = NULL);
SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL);
void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL);
void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL);
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index e64f1ce5e985..17fc58b791a1 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -173,10 +173,8 @@ private:
bool operator==( const Style& rL, const Style& rR );
SVX_DLLPUBLIC bool operator<( const Style& rL, const Style& rR );
-inline bool operator!=( const Style& rL, const Style& rR ) { return !(rL == rR); }
inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; }
inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); }
-inline bool operator>=( const Style& rL, const Style& rR ) { return !(rL < rR); }
@@ -219,24 +217,6 @@ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight );
/** Returns the angle between horizontal border of a rectangle and its diagonal.
The returned values represents the inner angle between the diagonals and
- horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle positions may be unordered, they are adjusted internally.
- */
-inline double GetHorDiagAngle( long nX1, long nX2, long nY1, long nY2 )
-{ return GetHorDiagAngle( nX2 - nX1, nY2 - nY1 ); }
-
-/** Returns the angle between horizontal border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
- horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle edges may be unordered, they are adjusted internally.
- */
-inline double GetHorDiagAngle( const Point& rP1, const Point& rP2 )
-{ return GetHorDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); }
-
-/** Returns the angle between horizontal border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
horizontal borders, and is therefore in the range [0,PI/2] (inclusive).
*/
inline double GetHorDiagAngle( const Rectangle& rRect )
@@ -256,24 +236,6 @@ inline double GetVerDiagAngle( long nWidth, long nHeight )
/** Returns the angle between vertical border of a rectangle and its diagonal.
The returned values represents the inner angle between the diagonals and
- vertical borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle positions may be unordered, they are adjusted internally.
- */
-inline double GetVerDiagAngle( long nX1, long nX2, long nY1, long nY2 )
-{ return GetVerDiagAngle( nX2 - nX1, nY2 - nY1 ); }
-
-/** Returns the angle between vertical border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
- vertical borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle edges may be unordered, they are adjusted internally.
- */
-inline double GetVerDiagAngle( const Point& rP1, const Point& rP2 )
-{ return GetVerDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); }
-
-/** Returns the angle between vertical border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
vertical borders, and is therefore in the range [0,PI/2] (inclusive).
*/
inline double GetVerDiagAngle( const Rectangle& rRect )
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 9da08188480a..3340f5e63127 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -66,10 +66,6 @@ public:
{
return mxRef;
}
- inline void SetValue( const rtl::Reference<reference_type> &xRef )
- {
- mxRef = xRef;
- }
};
#endif
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8bcb82f0a326..6379540c2dda 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -331,8 +331,7 @@ public:
static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL) const;
- TextChain *GetTextChain() const;
- static void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext);
+ TextChain * GetTextChain() const;
// ReferenceDevice for the EditEngine
void SetRefDevice(OutputDevice* pDev);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 651a61d69369..2552f678e67b 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -520,8 +520,6 @@ public:
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
- void SetToBeChained(bool bToBeChained);
-
/** Setup given Outliner equivalently to SdrTextObj::Paint()
To setup an arbitrary Outliner in the same way as the draw
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 2f20a41e4478..a8f5d77d36d3 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -55,7 +55,6 @@ inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5);
inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); }
inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); }
inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
-inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
void MoveXPoly(XPolygon& rPoly, const Size& S);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false);
@@ -69,7 +68,6 @@ void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs);
void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2);
-void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 3e95bbc3c3b1..3d58e027aaa5 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -101,8 +101,6 @@ public:
protected:
virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) SAL_OVERRIDE;
- virtual void impSetTextForEditingOutliner(OutlinerParaObject *);
-
virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) SAL_OVERRIDE;
private: