[Libreoffice-commits] .: binfilter/bf_svx binfilter/bf_sw binfilter/inc

Stephan Bergmann sbergmann at kemper.freedesktop.org
Wed Oct 12 03:55:25 PDT 2011


 binfilter/bf_svx/source/svdraw/svx_svdobj.cxx    |    4 ++--
 binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx  |    4 ++--
 binfilter/bf_svx/source/svdraw/svx_svdopath.cxx  |    4 ++--
 binfilter/bf_svx/source/svdraw/svx_svdorect.cxx  |    4 ++--
 binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx  |    2 +-
 binfilter/bf_sw/source/core/draw/sw_dcontact.cxx |    4 ++--
 binfilter/inc/bf_svx/svdobj.hxx                  |    2 +-
 binfilter/inc/bf_svx/svdocirc.hxx                |    2 +-
 binfilter/inc/bf_svx/svdopath.hxx                |    2 +-
 binfilter/inc/bf_svx/svdorect.hxx                |    2 +-
 binfilter/inc/bf_svx/svdotext.hxx                |    2 +-
 binfilter/inc/bf_sw/dcontact.hxx                 |    2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 9ad58b9ef3d72e55c53bcf6f0db66613b6a8b3dd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 12 12:55:06 2011 +0200

    Some more warning cleanup.

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 84ff471..b93ae59 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2034,7 +2034,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   SetRectsDirty();
 /*N*/ }
 
-/*N*/ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+/*N*/ void SdrObject::NbcRotate(const Point& rRef, long, double sn, double cs)
 /*N*/ {
 /*N*/   aOutRect.Move(-rRef.X(),-rRef.Y());
 /*N*/   Rectangle R(aOutRect);
@@ -2129,7 +2129,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*N*/   if (nWink!=0) {
 /*N*/       Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
 /*N*/       SendRepaintBroadcast();
-/*N*/       NbcShear(rRef,nWink,tn,bVShear);
+/*N*/       NbcShear(rRef,tn,bVShear);
 /*N*/       SetChanged();
 /*N*/       SendRepaintBroadcast();
 /*N*/       SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index 39d6f58..06e6725 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -516,9 +516,9 @@ namespace binfilter {
 /*N*/   ImpSetCircInfoToAttr();
 /*N*/ }
 
-/*N*/ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+/*N*/ void SdrCircObj::NbcShear(const Point& rRef, double tn, bool bVShear)
 /*N*/ {
-/*N*/   SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+/*N*/   SdrTextObj::NbcShear(rRef,tn,bVShear);
 /*N*/   SetXPolyDirty();
 /*N*/   ImpSetCircInfoToAttr();
 /*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
index 3ebbe27..b48398f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
@@ -470,9 +470,9 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 /*N*/   RotateXPoly(aPathPolygon,rRef,sn,cs);
 /*N*/ }
 
-/*N*/ void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear)
+/*N*/ void SdrPathObj::NbcShear(const Point& rRefPnt, double fTan, bool bVShear)
 /*N*/ {
-/*N*/   SdrTextObj::NbcShear(rRefPnt,nAngle,fTan,bVShear);
+/*N*/   SdrTextObj::NbcShear(rRefPnt,fTan,bVShear);
 /*N*/   ShearXPoly(aPathPolygon,rRefPnt,fTan,bVShear);
 /*N*/ }
 
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
index a1ba95a..1701d79 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
@@ -457,9 +457,9 @@ namespace binfilter {
 /*N*/   SetXPolyDirty();
 /*N*/ }
 
-/*N*/ void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+/*N*/ void SdrRectObj::NbcShear(const Point& rRef, double tn, bool bVShear)
 /*N*/ {
-/*N*/   SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+/*N*/   SdrTextObj::NbcShear(rRef,tn,bVShear);
 /*N*/   SetXPolyDirty();
 /*N*/ }
 
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
index 0453b94..cbf1fac 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx
@@ -225,7 +225,7 @@ namespace binfilter {
 /*N*/   SetRectsDirty();
 /*N*/ }
 
-/*N*/ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+/*N*/ void SdrTextObj::NbcShear(const Point& rRef, double tn, bool bVShear)
 /*N*/ {
 /*N*/   // #75889# when this is a SdrPathObj aRect maybe not initialized
 /*N*/   Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index f12dc33..e7fa4b1 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -1090,9 +1090,9 @@ void SwDrawVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     SetRectsDirty();
 }
 
-void SwDrawVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SwDrawVirtObj::NbcShear(const Point& rRef, double tn, bool bVShear)
 {
-    rRefObj.NbcShear(rRef - maOffset, nWink, tn, bVShear);
+    rRefObj.NbcShear(rRef - maOffset, tn, bVShear);
     SetRectsDirty();
 }
 
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index 315e017..15295a7 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -728,7 +728,7 @@ public:
 /*N*/   virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
 /*N*/   virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
 /*N*/   virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
-/*N*/   virtual void NbcShear (const Point&, long, double, bool) {} // DBG_BF_ASSERT
+/*N*/   virtual void NbcShear (const Point&, double, bool) {} // DBG_BF_ASSERT
 
     virtual void Move  (const Size& rSiz);
     virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
diff --git a/binfilter/inc/bf_svx/svdocirc.hxx b/binfilter/inc/bf_svx/svdocirc.hxx
index 3fc4a06..e96433b 100644
--- a/binfilter/inc/bf_svx/svdocirc.hxx
+++ b/binfilter/inc/bf_svx/svdocirc.hxx
@@ -109,7 +109,7 @@ public:
 
     virtual void NbcMove(const Size& aSiz);
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-    virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
+    virtual void NbcShear (const Point& rRef, double tn, bool bVShear);
     virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
 
 protected:
diff --git a/binfilter/inc/bf_svx/svdopath.hxx b/binfilter/inc/bf_svx/svdopath.hxx
index 8f5d4e2..4e3c27a 100644
--- a/binfilter/inc/bf_svx/svdopath.hxx
+++ b/binfilter/inc/bf_svx/svdopath.hxx
@@ -108,7 +108,7 @@ public:
     virtual void NbcMove(const Size& aSize);
     virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact);
     virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos);
-    virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear);
+    virtual void NbcShear(const Point& rRefPnt, double fTan, bool bVShear);
 
 
     virtual bool IsPolyObj() const;
diff --git a/binfilter/inc/bf_svx/svdorect.hxx b/binfilter/inc/bf_svx/svdorect.hxx
index f528e24..f2d4875 100644
--- a/binfilter/inc/bf_svx/svdorect.hxx
+++ b/binfilter/inc/bf_svx/svdorect.hxx
@@ -120,7 +120,7 @@ public:
     virtual void NbcMove(const Size& rSiz);
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
-    virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
+    virtual void NbcShear(const Point& rRef, double tn, bool bVShear);
 
 
     virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
diff --git a/binfilter/inc/bf_svx/svdotext.hxx b/binfilter/inc/bf_svx/svdotext.hxx
index a4274b1..91037f0 100644
--- a/binfilter/inc/bf_svx/svdotext.hxx
+++ b/binfilter/inc/bf_svx/svdotext.hxx
@@ -325,7 +325,7 @@ public:
     virtual void NbcMove(const Size& rSiz);
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
-    virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
+    virtual void NbcShear(const Point& rRef, double tn, bool bVShear);
 
     virtual bool HasTextEdit() const;
     virtual bool BegTextEdit(SdrOutliner& rOutl);
diff --git a/binfilter/inc/bf_sw/dcontact.hxx b/binfilter/inc/bf_sw/dcontact.hxx
index d9468f5..c75d566 100644
--- a/binfilter/inc/bf_sw/dcontact.hxx
+++ b/binfilter/inc/bf_sw/dcontact.hxx
@@ -200,7 +200,7 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
         virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
         virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
-        virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
+        virtual void NbcShear(const Point& rRef, double tn, bool bVShear);
         virtual void Move(const Size& rSiz);
         virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
         virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);


More information about the Libreoffice-commits mailing list