diff options
Diffstat (limited to 'chart2/source')
6 files changed, 11 insertions, 9 deletions
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 0ea306632448..9e01d5c3bd7b 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -61,9 +61,9 @@ OUString DragMethod_Base::getUndoDescription() const m_eActionType, ObjectNameProvider::getName( ObjectIdentifier::getObjectType( m_aObjectCID ))); } -void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const +OUString DragMethod_Base::GetSdrDragComment() const { - rStr = getUndoDescription(); + return getUndoDescription(); } PointerStyle DragMethod_Base::GetSdrDragPointer() const { diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 03494044b032..a558bdfbf533 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -39,7 +39,7 @@ public: OUString getUndoDescription() const; - virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual OUString GetSdrDragComment() const override; virtual PointerStyle GetSdrDragPointer() const override; protected: diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index e3f0a820a272..9e8e995838f0 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -69,10 +69,11 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper DragMethod_PieSegment::~DragMethod_PieSegment() { } -void DragMethod_PieSegment::TakeSdrDragComment(OUString& rStr) const +OUString DragMethod_PieSegment::GetSdrDragComment() const { - rStr = SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED); - rStr = rStr.replaceFirst( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); + OUString aStr = SchResId(STR_STATUS_PIE_SEGMENT_EXPLODED); + aStr = aStr.replaceFirst( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); + return aStr; } bool DragMethod_PieSegment::BeginSdrDrag() { diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index 35739769c106..4a1264a017f1 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -32,7 +32,7 @@ public: , const css::uno::Reference< css::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment() override; - virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual OUString GetSdrDragComment() const override; virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 5ed1cb16c5ed..8e29facf3cd5 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -96,8 +96,9 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr DragMethod_RotateDiagram::~DragMethod_RotateDiagram() { } -void DragMethod_RotateDiagram::TakeSdrDragComment(OUString& /*rStr*/) const +OUString DragMethod_RotateDiagram::GetSdrDragComment() const { + return OUString(); } bool DragMethod_RotateDiagram::BeginSdrDrag() { diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index b2698bf85b18..a9401c923a1c 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -47,7 +47,7 @@ public: ); virtual ~DragMethod_RotateDiagram() override; - virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual OUString GetSdrDragComment() const override; virtual bool BeginSdrDrag() override; virtual void MoveSdrDrag(const Point& rPnt) override; |