diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svx/source/svdraw | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svx/source/svdraw')
53 files changed, 0 insertions, 370 deletions
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index ac9804db37ef..e9cbb38a1c0c 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -179,7 +179,6 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons } - void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst) { diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index faad745a0578..ec3a4d21dba0 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -90,7 +90,6 @@ SdrObject* SdrObjectPrimitiveHit( } - SdrObject* SdrObjListPrimitiveHit( const SdrObjList& rList, const Point& rPnt, @@ -114,7 +113,6 @@ SdrObject* SdrObjListPrimitiveHit( } - bool ViewObjectContactPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC, const basegfx::B2DPoint& rHitPosition, diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 9b8f4aa3790d..642c86769d12 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -38,7 +38,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - using namespace ::com::sun::star; struct SdrPageWindow::Impl @@ -303,7 +302,6 @@ namespace #endif // CLIPPER_TEST - void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector ) { // set Redirector diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index c35207e1049d..c18bfa5f3a46 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -186,7 +186,6 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio } - void SdrPaintWindow::impCreateOverlayManager() { // not yet one created? diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index 374cb8f05f7c..4d020c8f0779 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -20,7 +20,6 @@ #include <svx/sdrundomanager.hxx> - SdrUndoManager::SdrUndoManager(sal_uInt16 nMaxUndoActionCount) : EditUndoManager(nMaxUndoActionCount) , maEndTextEditHdl() diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index a93510abbf7a..3b9d4601156d 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -625,7 +625,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) // FractionItem - SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) { @@ -695,7 +694,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const // ScaleItem - bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const @@ -736,7 +734,6 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const // OnOffItem - SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrOnOffItem(Which(),GetValue()); @@ -802,7 +799,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, // class SdrPercentItem - SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrPercentItem(Which(),GetValue()); @@ -835,7 +831,6 @@ bool SdrPercentItem::GetPresentation( // class SdrAngleItem - SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrAngleItem(Which(),GetValue()); @@ -923,7 +918,6 @@ bool SdrAngleItem::GetPresentation( // class SdrMetricItem - SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMetricItem(Which(),GetValue()); @@ -972,7 +966,6 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, // items of the legend object - SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } @@ -1970,7 +1963,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) // class SdrSignedPercentItem - SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrSignedPercentItem( Which(), GetValue() ); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 0e4719f83807..90ee92ffe465 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -118,7 +118,6 @@ ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay() } - class ImpSdrCreateViewExtraData { // The OverlayObjects for XOR replacement @@ -179,11 +178,9 @@ void ImpSdrCreateViewExtraData::HideOverlay() } - // CreateView - void SdrCreateView::ImpClearConnectMarker() { if(mpCoMaOverlay) @@ -875,7 +872,6 @@ void SdrCreateView::HideCreateObj() } - bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(pAktCreate) diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b1e8db07e9b2..db4f68822412 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -74,7 +74,6 @@ #include <vector> - SdrDragEntry::SdrDragEntry() : mbAddToTransparent(false) { @@ -85,7 +84,6 @@ SdrDragEntry::~SdrDragEntry() } - SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon) : SdrDragEntry(), maOriginalPolyPolygon(rOriginalPolyPolygon) @@ -138,7 +136,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPolyPolygon::createP } - SdrDragEntrySdrObject::SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) : SdrDragEntry(), maOriginal(rOriginal), @@ -205,7 +202,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntrySdrObject::createPri } - SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rSequence, bool bAddToTransparent) @@ -231,7 +227,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPrimitive2DSequence: } - SdrDragEntryPointGlueDrag::SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag) : maPositions(rPositions), mbIsPointDrag(bIsPointDrag) @@ -301,8 +296,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPointGlueDrag::creat } - - void SdrDragMethod::resetSdrDragEntries() { // clear entries; creation is on demand @@ -962,8 +955,6 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragMethod::AddConnectorOverl } - - SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView) : SdrDragMethod(rNewView) { @@ -1177,8 +1168,6 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const } - - SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView) : SdrDragMethod(rNewView), mpClone(nullptr) @@ -1483,8 +1472,6 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const } - - void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) { // for SdrDragMove, use current Primitive2DContainer of SdrObject visualization @@ -1761,8 +1748,6 @@ Pointer SdrDragMove::GetSdrDragPointer() const } - - SdrDragResize::SdrDragResize(SdrDragView& rNewView) : SdrDragMethod(rNewView), aXFact(1,1), @@ -2097,8 +2082,6 @@ Pointer SdrDragResize::GetSdrDragPointer() const } - - void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { rTarget.Rotate(DragStat().GetRef1(), nAngle, sin(nAngle*nPi180), cos(nAngle*nPi180)); @@ -2233,8 +2216,6 @@ Pointer SdrDragRotate::GetSdrDragPointer() const } - - SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1) : SdrDragMethod(rNewView), aFact(1,1), @@ -2514,8 +2495,6 @@ Pointer SdrDragShear::GetSdrDragPointer() const } - - void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { if(bMirrored) @@ -2644,8 +2623,6 @@ Pointer SdrDragMirror::GetSdrDragPointer() const } - - SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad) : SdrDragMethod(rNewView), pIAOHandle(nullptr), @@ -2804,8 +2781,6 @@ Pointer SdrDragGradient::GetSdrDragPointer() const } - - SdrDragCrook::SdrDragCrook(SdrDragView& rNewView) : SdrDragMethod(rNewView), aFact(1,1), @@ -3440,8 +3415,6 @@ Pointer SdrDragCrook::GetSdrDragPointer() const } - - SdrDragDistort::SdrDragDistort(SdrDragView& rNewView) : SdrDragMethod(rNewView), nPolyPt(0), @@ -3593,8 +3566,6 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol } - - SdrDragCrop::SdrDragCrop(SdrDragView& rNewView) : SdrDragObjOwn(rNewView) { diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 88dc38a92243..acc28ac97c0c 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -44,11 +44,9 @@ using namespace sdr; - // DragView - void SdrDragView::ImpClearVars() { mbFramDrag=false; @@ -200,7 +198,6 @@ bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const } - bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { return false; @@ -831,7 +828,6 @@ void SdrDragView::HideDragObj() } - void SdrDragView::SetNoDragXorPolys(bool bOn) { if (IsNoDragXorPolys()!=bOn) diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index ab122e9dbd93..b3f97e6c595d 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -103,7 +103,6 @@ SdrEditView::~SdrEditView() } - void SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) { SdrLayerAdmin& rLA=mpModel->GetLayerAdmin(); @@ -282,7 +281,6 @@ void SdrEditView::DeleteLayer(const OUString& rName) } - void SdrEditView::EndUndo() { // #i13033# @@ -660,7 +658,6 @@ void SdrEditView::CheckPossibilities() } - void SdrEditView::ForceMarkedObjToAnotherPage() { bool bFlg=false; @@ -958,7 +955,6 @@ void SdrEditView::CopyMarkedObj() } - bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions) { if (nOptions & SdrInsertFlags::SETDEFLAYER) { @@ -1033,7 +1029,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO } - bool SdrEditView::IsUndoEnabled() const { return mpModel->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 961e084b125d..20fa36595097 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -63,11 +63,9 @@ #include <svx/xlnwtit.hxx> - // EditView - void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); @@ -704,7 +702,6 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto } - void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/) { // bReplaceAll has no effect here @@ -1239,7 +1236,6 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe } - bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) @@ -1283,7 +1279,6 @@ bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHard } - SfxItemSet SdrEditView::GetGeoAttrFromMarked() const { SfxItemSet aRetSet(mpModel->GetItemPool(), // SID_ATTR_TRANSFORM_... from s:svxids.hrc @@ -1748,7 +1743,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } - bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f2c0fcaadef2..f9a3d7a039a3 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -103,7 +103,6 @@ SdrObjEditView::~SdrObjEditView() } - bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); @@ -1185,7 +1184,6 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const } - OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { if (pWin==nullptr) return nullptr; @@ -1484,7 +1482,6 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) } - bool SdrObjEditView::ImpIsTextEditAllSelected() const { bool bRet=false; @@ -1793,7 +1790,6 @@ bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveH } - void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWindow) { SdrGlueEditView::AddWindowToPaintView(pNewWin, pWindow); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index cc4fa7e16103..d79f6d25de68 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -255,7 +255,6 @@ IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) } - void SdrLinkList::Clear() { aList.clear(); @@ -298,7 +297,6 @@ void SdrLinkList::RemoveLink(const Link<SdrObjFactory*,void>& rLink) } - bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { drawing::FillStyle eFill=static_cast<const XFillStyleItem&>(rSet.Get(XATTR_FILLSTYLE)).GetValue(); @@ -550,7 +548,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange } - SvdProgressInfo::SvdProgressInfo( const Link<void*,bool>&_rLink ) { maLink = _rLink; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 0067d86f80cd..b9736b2e0ede 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1112,7 +1112,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) } - void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) { // #i73407# reformulation to use new B2DPolygon classes @@ -1163,7 +1162,6 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) } - void ImpSdrGDIMetaFileImport::DoAction(MetaLineColorAction& rAct) { rAct.Execute(mpVD); @@ -1198,7 +1196,6 @@ void ImpSdrGDIMetaFileImport::MapScaling() } - void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rMtf, sal_uLong& a) // GDIMetaFile* pMtf ) { bool aSkipComment = false; diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 3b603b332ce3..12d74a1e7667 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -30,7 +30,6 @@ #include <svx/svdobj.hxx> - SdrGlueEditView::SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut): SdrPolyEditView(pModel1,pOut) { @@ -41,7 +40,6 @@ SdrGlueEditView::~SdrGlueEditView() } - void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -85,7 +83,6 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co } - static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -129,7 +126,6 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo } - static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -166,7 +162,6 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn) } - static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet)); @@ -266,7 +261,6 @@ void SdrGlueEditView::DeleteMarkedGluePoints() } - void SdrGlueEditView::ImpCopyMarkedGluePoints() { const bool bUndo = IsUndoEnabled(); @@ -316,7 +310,6 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() } - void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -352,7 +345,6 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo } - static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { rPt.X()+=static_cast<const Size*>(p1)->Width(); @@ -372,7 +364,6 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy) } - static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); @@ -391,7 +382,6 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& } - static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 4ec986e7f336..946b26dd7966 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -276,7 +276,6 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO } - void SdrGluePointList::Clear() { sal_uInt16 nCount=GetCount(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 058f7bdd67e4..36340c67a252 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -268,7 +268,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal } - SdrHdl::SdrHdl(): pObj(nullptr), pPV(nullptr), @@ -1308,7 +1307,6 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool } - SdrHdlLine::~SdrHdlLine() {} void SdrHdlLine::CreateB2dIAObject() @@ -1364,7 +1362,6 @@ Pointer SdrHdlLine::GetPointer() const } - SdrHdlBezWgt::~SdrHdlBezWgt() {} void SdrHdlBezWgt::CreateB2dIAObject() @@ -1421,7 +1418,6 @@ void SdrHdlBezWgt::CreateB2dIAObject() } - E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly) { aWireframePoly = rWireframePoly; @@ -1467,7 +1463,6 @@ void E3dVolumeMarker::CreateB2dIAObject() } - ImpEdgeHdl::~ImpEdgeHdl() { } @@ -1592,7 +1587,6 @@ bool ImpEdgeHdl::IsHorzDrag() const } - ImpMeasureHdl::~ImpMeasureHdl() { } @@ -1668,7 +1662,6 @@ Pointer ImpMeasureHdl::GetPointer() const } - ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) : SdrHdl(rRect.TopLeft(),HDL_MOVE), maRect(rRect) @@ -1729,7 +1722,6 @@ void ImpTextframeHdl::CreateB2dIAObject() } - static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) { SdrHdlKind eKind1=lhs->GetKind(); @@ -1874,7 +1866,6 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 } - void SdrHdlList::TravelFocusHdl(bool bForward) { // security correction @@ -2051,7 +2042,6 @@ void SdrHdlList::ResetFocusHdl() } - SdrHdlList::SdrHdlList(SdrMarkView* pV) : mnFocusIndex(SAL_MAX_SIZE), pView(pV), @@ -2247,14 +2237,12 @@ SdrCropHdl::SdrCropHdl( } - BitmapEx SdrCropHdl::GetHandlesBitmap() { return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); } - BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) { int nPixelSize = 0, nX = 0, nY = 0, nOffset = 0; @@ -2296,7 +2284,6 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) } - void SdrCropHdl::CreateB2dIAObject() { // first throw away old one diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 0204b580e7c7..851016e8cc33 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -26,7 +26,6 @@ #include <vcl/lineinfo.hxx> - Pointer SdrHelpLine::GetPointer() const { switch (eKind) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index fc2ad8828119..48299e9acaa8 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -18,8 +18,6 @@ */ - - #include <svx/svdmark.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> @@ -220,7 +218,6 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } - void SdrMarkList::ForceSort() const { if(!mbSorted) @@ -747,7 +744,6 @@ bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const } - namespace sdr { ViewSelection::ViewSelection() diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d992ab27a368..8096a1dc1e2e 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -97,7 +97,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - struct SdrModelImpl { SfxUndoManager* mpUndoManager; @@ -105,7 +104,6 @@ struct SdrModelImpl }; - void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, bool bUseExtColorTable, bool bLoadRefCounts) { @@ -338,7 +336,6 @@ void SdrModel::SetReadOnly(bool bYes) } - void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount) { if (nCount<1) nCount=1; @@ -1557,7 +1554,6 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) } - void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, bool bUndo, bool bMoveNoCopy) @@ -1857,7 +1853,6 @@ void SdrModel::setLock( bool bLock ) } - void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ) { assert(pNewModel != nullptr); @@ -1914,7 +1909,6 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe } - void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { if( mpForbiddenCharactersTable ) @@ -2100,7 +2094,6 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() } - SdrHint::SdrHint(SdrHintKind eNewHint) : mpPage(nullptr), mpObj(nullptr), @@ -2132,6 +2125,4 @@ void SdrHint::SetKind(SdrHintKind eNewKind) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 03fca1e23467..82129509957d 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -121,11 +121,9 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition } - // MarkView - void SdrMarkView::ImpClearVars() { meDragMode=SDRDRAG_MOVE; @@ -211,7 +209,6 @@ void SdrMarkView::ModelHasChanged() } - bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); @@ -282,7 +279,6 @@ void SdrMarkView::TakeActionRect(Rectangle& rRect) const } - void SdrMarkView::ClearPageView() { UnmarkAllObj(); @@ -313,7 +309,6 @@ void SdrMarkView::HideSdrPage() } - bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) { BrkAction(); @@ -372,7 +367,6 @@ void SdrMarkView::BrkMarkObj() } - bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark) { if(HasMarkablePoints()) @@ -438,7 +432,6 @@ void SdrMarkView::BrkMarkPoints() } - bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark) { if(HasMarkableGluePoints()) @@ -1318,7 +1311,6 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) } - bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) @@ -2020,7 +2012,6 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const } - void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const { rStr = ImpGetResStr(nStrCacheID); @@ -2046,7 +2037,6 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } - void SdrMarkView::EnterMarkedGroup() { // We enter only the first group found (in only one PageView), because @@ -2074,7 +2064,6 @@ void SdrMarkView::EnterMarkedGroup() } - void SdrMarkView::MarkListHasChanged() { GetMarkedObjectListWriteAccess().SetNameDirty(); @@ -2097,7 +2086,6 @@ void SdrMarkView::MarkListHasChanged() } - void SdrMarkView::SetMoveOutside(bool bOn) { maHdlList.SetMoveOutside(bOn); diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index beb13620e84d..298a12a1295a 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -374,7 +374,6 @@ void SdrMarkView::UndirtyMrkPnt() const } - bool SdrMarkView::HasMarkableGluePoints() const { bool bRet=false; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1038d3f3fd9c..80dd6fd6cac1 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -405,7 +405,6 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS } - Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { if (mxCustomShapeEngine.is()) @@ -1410,7 +1409,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } - void SdrObjCustomShape::RecalcSnapRect() { SdrTextObj::RecalcSnapRect(); @@ -1728,7 +1726,6 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nAngle, double tn, boo } - SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# @@ -1756,7 +1753,6 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const } - // #i38892# void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() { @@ -1879,7 +1875,6 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } - sal_uInt32 SdrObjCustomShape::GetHdlCount() const { const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount()); @@ -1920,7 +1915,6 @@ SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const } - bool SdrObjCustomShape::hasSpecialDrag() const { return true; @@ -2142,7 +2136,6 @@ bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag) } - void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) { Rectangle aRect1; @@ -2220,7 +2213,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r } - // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape bool SdrObjCustomShape::IsAutoGrowHeight() const diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index e6102e9e21b4..ffcb005cb7ca 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -80,8 +80,6 @@ sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() } - - SdrAttrObj::SdrAttrObj() { } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3c13f3de3734..5d2c35b85eee 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -141,8 +141,6 @@ using namespace ::com::sun::star; - - SdrObjUserCall::~SdrObjUserCall() { } @@ -159,7 +157,6 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : bDown(false) {} - SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) : nInventor(nInv), nIdentifier(nId), @@ -288,15 +285,12 @@ void SdrObject::ActionChanged() const } - void SdrObject::SetBoundRectDirty() { aOutRect = Rectangle(); } - - SdrObject::SdrObject() : mpImpl(new Impl), mpProperties(nullptr) @@ -831,16 +825,12 @@ sal_uInt32 SdrObject::GetNavigationPosition() } - - void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition) { mnNavigationPosition = nNewPosition; } - - // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and sometimes problematic (inside a bigger object change you will get // non-useful BoundRects sometimes) I rename that method from GetBoundRect() to @@ -1288,7 +1278,6 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const } - bool SdrObject::hasSpecialDrag() const { return false; @@ -1870,7 +1859,6 @@ bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const } - SdrObjGeoData* SdrObject::NewGeoData() const { return new SdrObjGeoData; @@ -2362,7 +2350,6 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const } - void extractLineContourFromPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rxSequence, basegfx::B2DPolygonVector& rExtractedHairlines, @@ -2389,7 +2376,6 @@ void extractLineContourFromPrimitive2DSequence( } - SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) { bool bNoChange(true); @@ -2554,21 +2540,12 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas } - - - - void SdrObject::SetMarkProtect(bool bProt) { bMarkProt = bProt; } - - - - - void SdrObject::SetEmptyPresObj(bool bEpt) { bEmptyPresObj = bEpt; @@ -2581,8 +2558,6 @@ void SdrObject::SetNotVisibleAsMaster(bool bFlg) } - - // convert this path object to contour object, even when it is a group SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const { @@ -2623,7 +2598,6 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) } - SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const { SdrObject* pRet = DoConvertToPolyObj(bBezier, true); @@ -2645,14 +2619,12 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const } - SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return nullptr; } - void SdrObject::SetInserted(bool bIns) { if (bIns!=IsInserted()) { @@ -2720,7 +2692,6 @@ void SdrObject::SetVisible(bool bVisible) } - sal_uInt16 SdrObject::GetUserDataCount() const { if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return 0; @@ -2966,7 +2937,6 @@ void SdrObject::notifyShapePropertyChange( const svx::ShapeProperty _eProperty ) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index b23d0e9159b9..dfd94564165a 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -61,7 +61,6 @@ #include <svx/xpool.hxx> - enum EscDir {LKS,RTS,OBN,UNT}; class ImpCaptParams @@ -192,8 +191,6 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() } - - SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // default size: 3 points = 2 lines @@ -307,7 +304,6 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCaptionObj::hasSpecialDrag() const { return true; @@ -419,7 +415,6 @@ OUString SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 9db693604359..3862ec002aec 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -105,8 +105,6 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() } - - SdrCircObj::SdrCircObj(SdrObjKind eNewKind) { nStartAngle=0; @@ -466,7 +464,6 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCircObj::hasSpecialDrag() const { return true; @@ -612,7 +609,6 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void ImpCircUser::SetCreateParams(SdrDragStat& rStat) { rStat.TakeCreateRect(aR); @@ -1064,7 +1060,6 @@ void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } - void SdrCircObj::ImpSetAttrToCircInfo() { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index aa064ce6d339..1b768d3921e9 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -49,7 +49,6 @@ #include <svx/xpool.hxx> - SdrObjConnection::~SdrObjConnection() { } @@ -164,7 +163,6 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() } - SdrEdgeObj::SdrEdgeObj() : SdrTextObj(), nNotifyingCount(0), @@ -1809,7 +1807,6 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrEdgeObj::hasSpecialDrag() const { return true; @@ -1960,7 +1957,6 @@ OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const { basegfx::B2DPolygon aResult; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9ffba232f3d0..1ffb9dc1bbdb 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -640,7 +640,6 @@ bool SdrGrafObj::IsLinkedGraphic() const } - void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 7cbaf43f1dce..4bbd9b518377 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -67,8 +67,6 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() } - - SdrObjGroup::SdrObjGroup() { pSub=new SdrObjList(nullptr,nullptr); @@ -714,7 +712,6 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt) } - void SdrObjGroup::NbcSetRelativePos(const Point& rPnt) { Point aRelPos0(GetSnapRect().TopLeft()-aAnchor); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 9b2fbd29645f..8e69c8d998b2 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -72,7 +72,6 @@ #include <unotools/syslocale.hxx> - SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} @@ -210,8 +209,6 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() } - - SdrMeasureObj::SdrMeasureObj(): bTextDirty(false) { @@ -796,7 +793,6 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrMeasureObj::hasSpecialDrag() const { return true; @@ -967,7 +963,6 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c } - bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho8Possible(); diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 229c0f18fc62..2f36bfd460a2 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; - // Note: the temp file is read only, until it is deleted! // It may be shared between multiple documents in case of copy/paste, // hence the shared_ptr. @@ -77,8 +76,6 @@ struct SdrMediaObj::Impl }; - - SdrMediaObj::SdrMediaObj() : SdrRectObj() , m_xImpl( new Impl() ) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 9cb32791a195..6d4ab3dd650f 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -589,7 +589,6 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow > } - class SdrEmbedObjectLink : public sfx2::SvBaseLink { SdrOle2Obj* pObj; @@ -606,7 +605,6 @@ public: }; - SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ), pObj(pObject) @@ -615,13 +613,11 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): } - SdrEmbedObjectLink::~SdrEmbedObjectLink() { } - ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ ) { @@ -658,7 +654,6 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() } - void SdrEmbedObjectLink::Closed() { pObj->BreakFileLink_Impl(); @@ -666,7 +661,6 @@ void SdrEmbedObjectLink::Closed() } - class SdrOle2ObjImpl { public: @@ -741,7 +735,6 @@ public: }; - // Predicate determining whether the given OLE is an internal math // object static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObjRef ) @@ -781,8 +774,6 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() } - - SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : mpImpl(new SdrOle2ObjImpl(bFrame_)) { @@ -812,7 +803,6 @@ OUString SdrOle2Obj::GetStyleString() } - SdrOle2Obj::~SdrOle2Obj() { mpImpl->mbInDestruction = true; @@ -899,7 +889,6 @@ bool SdrOle2Obj::IsEmpty() const } - void SdrOle2Obj::Connect() { if( IsEmptyPresObj() ) @@ -918,7 +907,6 @@ void SdrOle2Obj::Connect() } - bool SdrOle2Obj::UpdateLinkURL_Impl() { bool bResult = false; @@ -978,7 +966,6 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() } - void SdrOle2Obj::BreakFileLink_Impl() { uno::Reference<document::XStorageBasedDocument> xDoc; @@ -1011,7 +998,6 @@ void SdrOle2Obj::BreakFileLink_Impl() } - void SdrOle2Obj::DisconnectFileLink_Impl() { sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : nullptr; @@ -1023,7 +1009,6 @@ void SdrOle2Obj::DisconnectFileLink_Impl() } - void SdrOle2Obj::CheckFileLink_Impl() { if (pModel && mpImpl->mxObjRef.GetObject().is() && !mpImpl->mpObjectLink) @@ -1061,7 +1046,6 @@ void SdrOle2Obj::CheckFileLink_Impl() } - void SdrOle2Obj::Reconnect_Impl() { DBG_ASSERT( mpImpl->mbConnected, "Assigned unconnected object?!" ); @@ -1186,7 +1170,6 @@ void SdrOle2Obj::AddListeners_Impl() } - void SdrOle2Obj::Disconnect() { if( IsEmptyPresObj() ) @@ -1315,7 +1298,6 @@ void SdrOle2Obj::Disconnect_Impl() } - SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const { const Graphic* pOLEGraphic = GetGraphic(); @@ -1393,7 +1375,6 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const } - void SdrOle2Obj::SetModel(SdrModel* pNewModel) { ::comphelper::IEmbeddedHelper* pDestPers = pNewModel ? pNewModel->GetPersist() : nullptr; @@ -1469,7 +1450,6 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) } - void SdrOle2Obj::SetPage(SdrPage* pNewPage) { bool bRemove=pNewPage==nullptr && pPage!=nullptr; @@ -1505,7 +1485,6 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) } - void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef ) { DBG_ASSERT( !rNewObjRef.is() || !mpImpl->mxObjRef.GetObject().is(), "SetObjRef called on already initialized object!"); @@ -1545,7 +1524,6 @@ void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObj } - void SdrOle2Obj::SetClosedObj( bool bIsClosed ) { // TODO/LATER: do we still need this hack? @@ -1554,7 +1532,6 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed ) } - SdrObject* SdrOle2Obj::getFullDragClone() const { // #i118485# use central replacement generator @@ -1562,7 +1539,6 @@ SdrObject* SdrOle2Obj::getFullDragClone() const } - void SdrOle2Obj::SetPersistName( const OUString& rPersistName ) { DBG_ASSERT( mpImpl->aPersistName.isEmpty(), "Persist name changed!"); @@ -1582,14 +1558,12 @@ void SdrOle2Obj::AbandonObject() } - OUString SdrOle2Obj::GetPersistName() const { return mpImpl->aPersistName; } - void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { // #i118485# Allowing much more attributes for OLEs @@ -1611,14 +1585,12 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const } - sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { return mpImpl->mbFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } - OUString SdrOle2Obj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(mpImpl->mbFrame ? STR_ObjNameSingulFrame : STR_ObjNameSingulOLE2)); @@ -1636,7 +1608,6 @@ OUString SdrOle2Obj::TakeObjNameSingul() const } - OUString SdrOle2Obj::TakeObjNamePlural() const { return ImpGetResStr(mpImpl->mbFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2); @@ -1846,7 +1817,6 @@ void SdrOle2Obj::ImpSetVisAreaSize() } - void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if( pModel && !pModel->isLocked() ) @@ -1867,7 +1837,6 @@ void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } - void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) { SdrRectObj::SetGeoData(rGeo); @@ -1877,7 +1846,6 @@ void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) { SdrRectObj::NbcSetSnapRect(rRect); @@ -1895,7 +1863,6 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) } - void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect) { SdrRectObj::NbcSetLogicRect(rRect); @@ -1918,7 +1885,6 @@ void SdrOle2Obj::GetNewReplacement() } - Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const { return mpImpl->mxObjRef.GetSize( pTargetMapMode ); @@ -1938,7 +1904,6 @@ void SdrOle2Obj::NbcMove(const Size& rSize) } - bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { uno::Reference<embed::XEmbedPersist2> xPersist(xObj, uno::UNO_QUERY); @@ -1980,7 +1945,6 @@ bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObje } - bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { bool bResult = false; @@ -2007,7 +1971,6 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s } - bool SdrOle2Obj::Unload() { if (!mpImpl->mxObjRef.is()) @@ -2024,7 +1987,6 @@ bool SdrOle2Obj::Unload() } - void SdrOle2Obj::GetObjRef_Impl() { if ( !mpImpl->mxObjRef.is() && !mpImpl->aPersistName.isEmpty() && pModel && pModel->GetPersist() ) @@ -2116,7 +2078,6 @@ uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const } - uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const { GetObjRef(); @@ -2127,7 +2088,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const } - bool SdrOle2Obj::IsChart() const { if (!mpImpl->mbTypeAsked) @@ -2247,14 +2207,12 @@ bool SdrOle2Obj::AddOwnLightClient() } - Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); } - void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow) { if ( mpImpl->mxObjRef.is() && mpImpl->pLightClient ) diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 1b3f0edc36e0..02f2dfcbceaf 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -65,8 +65,6 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) } - - SdrPageObj::SdrPageObj(SdrPage* pNewPage) : mpShownPage(pNewPage) { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 174f58c9d01d..e18b68b0c77d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2852,7 +2852,6 @@ void SdrPathObj::impDeleteDAC() const } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 56a491229705..b1692206c6b5 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -62,8 +62,6 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() } - - SdrRectObj::SdrRectObj() : mpXPoly(nullptr) { @@ -382,7 +380,6 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrRectObj::hasSpecialDrag() const { return true; @@ -473,7 +470,6 @@ OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) const { Rectangle aRect1; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 64bb308c320e..05b629a8fd8b 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -81,8 +81,6 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() } - - SdrTextObj::SdrTextObj() : SdrAttrObj(), mpText(nullptr), @@ -1397,7 +1395,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint } - OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const { SdrText* pText = getActiveText(); @@ -1635,7 +1632,6 @@ void SdrTextObj::SetVerticalWriting(bool bVertical) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear @@ -2208,7 +2204,6 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) } - // The concept of the text object: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attributes/Variations: @@ -2272,5 +2267,4 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - and many more... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index bb9d04fefba0..cc5f37de2dd9 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -58,7 +58,6 @@ #include <sdr/attribute/sdrformtextoutlineattribute.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 70993e660b3f..dd99dd42ff37 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -63,7 +63,6 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrTextObj::hasSpecialDrag() const { return true; diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index b48855ead024..fb8ba7e101d2 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -284,7 +284,6 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) } - SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const { SdrObject* pRetval = nullptr; @@ -407,7 +406,6 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const } - SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { if(bAddText) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index a13c042c6945..eac5c32e9484 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -57,7 +57,6 @@ using namespace sdr::contact; // Defines - // Helper class SdrControlEventListenerImpl #include <com/sun/star/lang/XEventListener.hpp> @@ -335,7 +334,6 @@ void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } - bool SdrUnoObj::hasSpecialDrag() const { // no special drag; we have no rounding rect and diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 9c16a472a3f8..587363daf1dc 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -30,7 +30,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const { return rRefObj.GetProperties(); @@ -44,8 +43,6 @@ sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() } - - SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) { @@ -60,7 +57,6 @@ SdrVirtObj::~SdrVirtObj() } - const SdrObject& SdrVirtObj::GetReferencedObj() const { return rRefObj; @@ -86,7 +82,6 @@ void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos) } - void SdrVirtObj::SetModel(SdrModel* pNewModel) { SdrObject::SetModel(pNewModel); @@ -189,7 +184,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const } - sal_uInt32 SdrVirtObj::GetHdlCount() const { return rRefObj.GetHdlCount(); @@ -259,7 +253,6 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const } - bool SdrVirtObj::hasSpecialDrag() const { return rRefObj.hasSpecialDrag(); @@ -314,7 +307,6 @@ OUString SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - bool SdrVirtObj::BegCreate(SdrDragStat& rStat) { return rRefObj.BegCreate(rStat); @@ -347,7 +339,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con } - void SdrVirtObj::NbcMove(const Size& rSiz) { MovePoint(aAnchor,rSiz); @@ -379,7 +370,6 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea } - void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { @@ -430,7 +420,6 @@ void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) } - void SdrVirtObj::RecalcSnapRect() { aSnapRect=rRefObj.GetSnapRect(); @@ -465,7 +454,6 @@ void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) } - const Rectangle& SdrVirtObj::GetLogicRect() const { const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! @@ -492,7 +480,6 @@ void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect) } - long SdrVirtObj::GetRotateAngle() const { return rRefObj.GetRotateAngle(); @@ -504,7 +491,6 @@ long SdrVirtObj::GetShearAngle(bool bVertical) const } - sal_uInt32 SdrVirtObj::GetSnapPointCount() const { return rRefObj.GetSnapPointCount(); @@ -541,7 +527,6 @@ void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) } - SdrObjGeoData* SdrVirtObj::NewGeoData() const { return rRefObj.NewGeoData(); @@ -559,7 +544,6 @@ void SdrVirtObj::RestGeoData(const SdrObjGeoData& rGeo) } - SdrObjGeoData* SdrVirtObj::GetGeoData() const { return rRefObj.GetGeoData(); @@ -574,7 +558,6 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrVirtObj::NbcReformatText() { rRefObj.NbcReformatText(); @@ -586,7 +569,6 @@ void SdrVirtObj::ReformatText() } - bool SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 870186ffc75f..e6d961b3a87e 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -68,7 +68,6 @@ public: }; - static const sal_Int32 InitialObjectContainerCapacity (64); @@ -679,8 +678,6 @@ size_t SdrObjList::GetObjCount() const } - - SdrObject* SdrObjList::GetObj(size_t nNum) const { if (nNum >= maList.size()) @@ -693,8 +690,6 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const } - - bool SdrObjList::IsReadOnly() const { bool bRet = false; @@ -760,16 +755,12 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) } - - bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != nullptr; } - - void SdrObjList::SetObjectNavigationPosition ( SdrObject& rObject, const sal_uInt32 nNewPosition) @@ -824,8 +815,6 @@ void SdrObjList::SetObjectNavigationPosition ( } - - SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigationPosition) const { if (HasObjectNavigationOrder()) @@ -854,8 +843,6 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat } - - void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); @@ -863,8 +850,6 @@ void SdrObjList::ClearObjectNavigationOrder() } - - bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) @@ -885,8 +870,6 @@ bool SdrObjList::RecalcNavigationPositions() } - - void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAccess>& rxOrder) { if (rxOrder.is()) @@ -914,8 +897,6 @@ void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAcces } - - void SdrObjList::InsertObjectIntoContainer ( SdrObject& rObject, const sal_uInt32 nInsertPosition) @@ -942,8 +923,6 @@ void SdrObjList::InsertObjectIntoContainer ( } - - void SdrObjList::ReplaceObjectInContainer ( SdrObject& rNewObject, const sal_uInt32 nObjectPosition) @@ -979,8 +958,6 @@ void SdrObjList::ReplaceObjectInContainer ( } - - void SdrObjList::RemoveObjectFromContainer ( const sal_uInt32 nObjectPosition) { @@ -1024,9 +1001,6 @@ void SdrObjList::dumpAsXml(xmlTextWriterPtr pWriter) const } - - - void SdrPageGridFrameList::Clear() { sal_uInt16 nCount=GetCount(); @@ -1196,8 +1170,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) } - - SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), mpViewContact(nullptr), @@ -1544,7 +1516,6 @@ void SdrPage::SetModel(SdrModel* pNewModel) } - // #i68775# React on PageNum changes (from Model in most cases) void SdrPage::SetPageNum(sal_uInt16 nNew) { diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 5b40fe096fc0..93788cf0dcec 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -135,7 +135,6 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) } - SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) : mrView(rNewView), // col_auto color lets the view takes the default SvxColorConfig entry @@ -265,7 +264,6 @@ void SdrPageView::InvalidateAllWin() } - void SdrPageView::PrePaint() { const sal_uInt32 nCount(PageWindowCount()); @@ -416,7 +414,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const } - void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { if (GetPage()==nullptr) @@ -959,5 +956,4 @@ void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 2f620569d2fd..ee86bbb0ac7a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -119,16 +119,12 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const } - SvxViewHint::SvxViewHint (HintType eHintType) : meHintType(eHintType) { } - - - BitmapEx convertMetafileToBitmapEx( const GDIMetaFile& rMtf, const basegfx::B2DRange& rTargetRange, @@ -154,9 +150,6 @@ BitmapEx convertMetafileToBitmapEx( } - - - void SdrPaintView::ImpClearVars() { #ifdef DBG_UTIL @@ -247,7 +240,6 @@ SdrPaintView::~SdrPaintView() } - void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { //If the stylesheet has been destroyed @@ -333,7 +325,6 @@ void SdrPaintView::ModelHasChanged() } - bool SdrPaintView::IsAction() const { return false; @@ -373,7 +364,6 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const } - sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { if (nMinMov>=0) return sal_uInt16(nMinMov); @@ -417,7 +407,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) } - void SdrPaintView::ClearPageView() { BrkAction(); @@ -769,7 +758,6 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo } - SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { // #i74769# use BeginCompleteRedraw() as common base @@ -853,7 +841,6 @@ vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl } - void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) { if(mpPageView) @@ -876,7 +863,6 @@ void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) } - bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; @@ -1117,7 +1103,6 @@ bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHar } - #ifdef DBG_UTIL void SdrPaintView::ShowItemBrowser(bool bShow) { diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 2dfd64ee2cf8..5eaa83060647 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -36,7 +36,6 @@ using namespace sdr; - void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; @@ -612,7 +611,6 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* } - static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { MovePoint(rPt,*static_cast<const Size*>(p1)); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 2964d00e9b36..40a8563247d8 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -208,7 +208,6 @@ SdrSnapView::~SdrSnapView() } - bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); @@ -260,7 +259,6 @@ void SdrSnapView::TakeActionRect(Rectangle& rRect) const } - Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const { Point aPt(rPnt); @@ -447,7 +445,6 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } - void SdrSnapView::BegSetPageOrg(const Point& rPnt) { BrkAction(); @@ -497,7 +494,6 @@ void SdrSnapView::BrkSetPageOrg() } - bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=nullptr; diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index c25d34ceed05..53b5685ea593 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -285,7 +285,6 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen } - void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; @@ -356,7 +355,6 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, } - void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { sal_uInt16 nPolyCount=rPoly.Count(); @@ -382,7 +380,6 @@ void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rR } - long GetAngle(const Point& rPnt) { long a=0; @@ -447,7 +444,6 @@ long GetLen(const Point& rPnt) } - void GeoStat::RecalcSinCos() { if (nRotationAngle==0) { @@ -471,7 +467,6 @@ void GeoStat::RecalcTan() } - tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo) { tools::Polygon aPol(5); @@ -527,7 +522,6 @@ void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) } - void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); @@ -558,7 +552,6 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) } - long BigMulDiv(long nVal, long nMul, long nDiv) { BigInt aVal(nVal); @@ -660,7 +653,6 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) }; - // 1 mile = 8 furlong = 63.360" = 1.609.344,0mm // 1 furlong = 10 chains = 7.920" = 201.168,0mm // 1 chain = 4 poles = 792" = 20.116,8mm @@ -1050,6 +1042,4 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b3cf6ae637fa..b33fadc0161b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -56,8 +56,6 @@ static void ImplUnmarkObject( SdrObject* pObj ) } - - SdrUndoAction::~SdrUndoAction() {} bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const @@ -96,7 +94,6 @@ OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) : SdrUndoAction(rNewMod), aBuf(), @@ -553,7 +550,6 @@ OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoMoveObj::~SdrUndoMoveObj() {} void SdrUndoMoveObj::Undo() @@ -597,7 +593,6 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) , pUndoGeo(nullptr) @@ -677,7 +672,6 @@ OUString SdrUndoGeoObj::GetComment() const } - SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj) , bOwner(false) @@ -762,7 +756,6 @@ SdrUndoRemoveObj::~SdrUndoRemoveObj() } - void SdrUndoInsertObj::Undo() { // Trigger PageChangeCall @@ -851,7 +844,6 @@ OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - void SdrUndoNewObj::Undo() { SdrUndoInsertObj::Undo(); @@ -971,7 +963,6 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew) } - OUString SdrUndoCopyObj::GetComment() const { OUString aStr; @@ -1002,7 +993,6 @@ void SdrUndoObjectLayerChange::Redo() } - SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) : SdrUndoObj(rNewObj) , nOldOrdNum(nOldOrdNum1) @@ -1046,7 +1036,6 @@ OUString SdrUndoObjOrdNum::GetComment() const } - SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) , pOldText(nullptr) @@ -1305,7 +1294,6 @@ SdrUndoLayer::~SdrUndoLayer() } - void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction."); @@ -1327,7 +1315,6 @@ OUString SdrUndoNewLayer::GetComment() const } - void SdrUndoDelLayer::Undo() { DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer does not belong to UndoAction."); @@ -1349,7 +1336,6 @@ OUString SdrUndoDelLayer::GetComment() const } - void SdrUndoMoveLayer::Undo() { SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos); @@ -1433,7 +1419,6 @@ void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } - SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg) : SdrUndoPage(rNewPg) , bItsMine(false) @@ -1450,7 +1435,6 @@ SdrUndoPageList::~SdrUndoPageList() } - SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) , pUndoGroup(nullptr) @@ -1533,7 +1517,6 @@ bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const } - void SdrUndoNewPage::Undo() { ImpRemovePage(nPageNum); @@ -1556,7 +1539,6 @@ OUString SdrUndoNewPage::GetComment() const } - OUString SdrUndoCopyPage::GetComment() const { OUString aStr; @@ -1582,7 +1564,6 @@ bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const } - void SdrUndoSetPageNum::Undo() { ImpMovePage(nNewPageNum,nOldPageNum); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 3c20ccaabf5b..e1dbaa3a30d5 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -51,7 +51,6 @@ #include <drawinglayer/processor2d/contourextractor2d.hxx> - SdrViewEvent::SdrViewEvent() : pHdl(nullptr), pObj(nullptr), @@ -152,7 +151,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay() } - SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), bNoExtendedMouseDispatcher(false), diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 3cdfc2c1b57f..a34a9e510689 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,6 @@ #include <svx/sdrpaintwindow.hxx> - void SdrViewIter::ImpInitVars() { mnListenerNum = 0L; @@ -38,7 +37,6 @@ void SdrViewIter::ImpInitVars() } - SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) { mpPage = pPage; @@ -49,7 +47,6 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) } - SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) { mpObject = pObject; @@ -67,7 +64,6 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) } - bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const { if(!mpPage) @@ -167,7 +163,6 @@ SdrView* SdrViewIter::ImpFindView() } - SdrView* SdrViewIter::FirstView() { ImpInitVars(); @@ -175,7 +170,6 @@ SdrView* SdrViewIter::FirstView() } - SdrView* SdrViewIter::NextView() { mnListenerNum++; diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 2cf6bee83511..51d91c1cb19c 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -521,7 +521,6 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const } - GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) const { GDIMetaFile aMtf; @@ -583,7 +582,6 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co } - Graphic SdrExchangeView::GetAllMarkedGraphic() const { Graphic aRet; @@ -600,7 +598,6 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const } - Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj ) { Graphic aRet; @@ -668,7 +665,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - ::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const { SortMarkedObjects(); @@ -706,7 +702,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const { ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects()); @@ -722,7 +717,6 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const } - SdrModel* SdrExchangeView::GetMarkedObjModel() const { // Sorting the MarkList here might be problematic in the future, so @@ -775,7 +769,6 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const } - bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported any more." ); @@ -783,7 +776,6 @@ bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) } - bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported any more." ); @@ -791,7 +783,6 @@ bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) } - bool SdrExchangeView::Paste(vcl::Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx index 23bd8f54a0a3..798720563f9a 100644 --- a/svx/source/svdraw/textchaincursor.cxx +++ b/svx/source/svdraw/textchaincursor.cxx @@ -164,7 +164,6 @@ void TextChainCursorManager::HandleCursorEvent( SdrTextObj *pPrevLink = mpTextObj->GetPrevLinkInChain(); - switch ( aCurEvt ) { case CursorChainingEvent::UNCHANGED: // Set same selection as before the chaining (which is saved as PostChainingSel) |