[Libreoffice-commits] .: svx/inc svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Feb 13 07:39:44 PST 2012
svx/inc/svx/sdr/overlay/overlaybitmapex.hxx | 2 -
svx/inc/svx/sdr/overlay/overlayhatchrect.hxx | 1
svx/inc/svx/sdr/overlay/overlayline.hxx | 1
svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx | 1
svx/inc/svx/sdr/overlay/overlayobjectlist.hxx | 3 -
svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx | 1
svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx | 2 -
svx/inc/svx/sdr/overlay/overlaytriangle.hxx | 2 -
svx/source/sdr/overlay/overlaybitmapex.cxx | 32 --------------------
svx/source/sdr/overlay/overlayhatchrect.cxx | 12 -------
svx/source/sdr/overlay/overlayline.cxx | 12 -------
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 8 -----
svx/source/sdr/overlay/overlayobjectlist.cxx | 12 -------
svx/source/sdr/overlay/overlaypolypolygon.cxx | 12 -------
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 24 ---------------
svx/source/sdr/overlay/overlaytriangle.cxx | 24 ---------------
16 files changed, 1 insertion(+), 148 deletions(-)
New commits:
commit a092057d2b8ff8abd1172b4163979ecf799d5888
Author: Björgvin Ragnarsson <nifgraup at gmail.com>
Date: Sun Feb 12 23:54:41 2012 +0000
Removed unused code.
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index 1892ff2..2183cbf 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -61,11 +61,9 @@ namespace sdr
virtual ~OverlayBitmapEx();
const BitmapEx& getBitmapEx() const { return maBitmapEx; }
- void setBitmapEx(const BitmapEx& rNew);
sal_uInt16 getCenterX() const { return mnCenterX; }
sal_uInt16 getCenterY() const { return mnCenterY; }
- void setCenterXY(sal_uInt16 nNewX, sal_uInt16 nNewY);
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index cd1bcb4..4003214 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -64,7 +64,6 @@ namespace sdr
double fRotation);
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
- void setSecondPosition(const basegfx::B2DPoint&);
// data read access
double getDiscreteGrow() const { return mfDiscreteGrow; }
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx
index fc235b7..4777218 100644
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayline.hxx
@@ -54,7 +54,6 @@ namespace sdr
// change second position
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
- void setSecondPosition(const basegfx::B2DPoint& rNew);
// react on stripe definition change
virtual void stripeDefinitionHasChanged();
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 0d0a1a5..8264f23 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -102,7 +102,6 @@ namespace sdr
// access to RefreshWithPreRendering Flag
bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; }
- void SetRefreshWithPreRendering(bool bNew);
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 43374b9..dcc641e 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -59,9 +59,8 @@ namespace sdr
// clear list, this includes deletion of all contained objects
void clear();
- // append/remove objects
+ // append objects
void append(OverlayObject& rOverlayObject) { maVector.push_back(&rOverlayObject); }
- void remove(OverlayObject& rOverlayObject);
// access to objects
sal_uInt32 count() const { return maVector.size(); }
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
index 3622e73..adf4816 100644
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -53,7 +53,6 @@ namespace sdr
// change geometry
basegfx::B2DPolyPolygon getPolyPolygon() const { return maPolyPolygon; }
- void setPolyPolygon(const basegfx::B2DPolyPolygon& rNew);
// react on stripe definition change
virtual void stripeDefinitionHasChanged();
diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
index 5a0b7ad..e785be5 100644
--- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -67,11 +67,9 @@ namespace sdr
// change extended lines
bool getExtendedLines() const { return mbExtendedLines; }
- void setExtendedLines(bool bNew);
// change show bounds
bool getShowBounds() const { return mbShowBounds; }
- void setShowBounds(bool bNew);
// react on stripe definition change
virtual void stripeDefinitionHasChanged();
diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
index 25e9429..fc876be 100644
--- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
@@ -57,11 +57,9 @@ namespace sdr
// change second position
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
- void setSecondPosition(const basegfx::B2DPoint& rNew);
// change third position
const basegfx::B2DPoint& getThirdPosition() const { return maThirdPosition; }
- void setThirdPosition(const basegfx::B2DPoint& rNew);
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index dc108ac..953a405 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -73,38 +73,6 @@ namespace sdr
OverlayBitmapEx::~OverlayBitmapEx()
{
}
-
- void OverlayBitmapEx::setBitmapEx(const BitmapEx& rNew)
- {
- if(rNew != maBitmapEx)
- {
- // remember new Bitmap
- maBitmapEx = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayBitmapEx::setCenterXY(sal_uInt16 nNewX, sal_uInt16 nNewY)
- {
- if(nNewX != mnCenterX || nNewY != mnCenterY)
- {
- // remember new values
- if(nNewX != mnCenterX)
- {
- mnCenterX = nNewX;
- }
-
- if(nNewY != mnCenterY)
- {
- mnCenterY = nNewY;
- }
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx
index 6b0d6f2..eed4dd2 100644
--- a/svx/source/sdr/overlay/overlayhatchrect.cxx
+++ b/svx/source/sdr/overlay/overlayhatchrect.cxx
@@ -74,18 +74,6 @@ namespace sdr
mfRotation(fRotation)
{
}
-
- void OverlayHatchRect::setSecondPosition(const basegfx::B2DPoint& rNew)
- {
- if(rNew != maSecondPosition)
- {
- // remember new value
- maSecondPosition = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index 57b14c1..064c4fc 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -87,18 +87,6 @@ namespace sdr
OverlayLineStriped::~OverlayLineStriped()
{
}
-
- void OverlayLineStriped::setSecondPosition(const basegfx::B2DPoint& rNew)
- {
- if(rNew != maSecondPosition)
- {
- // remember new value
- maSecondPosition = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index c5281b0..1a0016f 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -500,14 +500,6 @@ namespace sdr
}
}
}
-
- void OverlayManagerBuffered::SetRefreshWithPreRendering(bool bNew)
- {
- if((bool)mbRefreshWithPreRendering != bNew)
- {
- mbRefreshWithPreRendering = bNew;
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index ea94f3c..8715107 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -67,18 +67,6 @@ namespace sdr
maVector.clear();
}
- void OverlayObjectList::remove(OverlayObject& rOverlayObject)
- {
- const OverlayObjectVector::iterator aFindResult = ::std::find(maVector.begin(), maVector.end(), &rOverlayObject);
- const bool bFound(aFindResult != maVector.end());
- OSL_ENSURE(bFound, "Could not find given object in list (!)");
-
- if(bFound)
- {
- maVector.erase(aFindResult);
- }
- }
-
bool OverlayObjectList::isHitLogic(const basegfx::B2DPoint& rLogicPosition, double fLogicTolerance) const
{
if(!maVector.empty())
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index 9e52b63..5dd6c92 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -79,18 +79,6 @@ namespace sdr
OverlayPolyPolygonStriped::~OverlayPolyPolygonStriped()
{
}
-
- void OverlayPolyPolygonStriped::setPolyPolygon(const basegfx::B2DPolyPolygon& rNew)
- {
- if(rNew != maPolyPolygon)
- {
- // remember new value
- maPolyPolygon = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index db6fadc..7c94256 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -118,30 +118,6 @@ namespace sdr
objectChange();
}
}
-
- void OverlayRollingRectangleStriped::setExtendedLines(bool bNew)
- {
- if(bNew != (bool)mbExtendedLines)
- {
- // remember new value
- mbExtendedLines = bNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayRollingRectangleStriped::setShowBounds(bool bNew)
- {
- if(bNew != (bool)mbShowBounds)
- {
- // remember new value
- mbShowBounds = bNew;
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index 94080a5..e245f56 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -74,30 +74,6 @@ namespace sdr
OverlayTriangle::~OverlayTriangle()
{
}
-
- void OverlayTriangle::setSecondPosition(const basegfx::B2DPoint& rNew)
- {
- if(rNew != maSecondPosition)
- {
- // remember new value
- maSecondPosition = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayTriangle::setThirdPosition(const basegfx::B2DPoint& rNew)
- {
- if(rNew != maThirdPosition)
- {
- // remember new value
- maThirdPosition = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
} // end of namespace overlay
} // end of namespace sdr
More information about the Libreoffice-commits
mailing list