diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-05-08 14:00:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-05-09 19:14:36 +0900 |
| commit | b19ae6acefb3f4f21e2f7e1a7202faee71389fbc (patch) | |
| tree | 69412cb45d8e4ebb2a4636753641d5fb73123343 | |
| parent | 3cd0cbde8a3af86c8d72253e4da2a79e22cafee7 (diff) | |
| download | koffice-b19ae6acefb3f4f21e2f7e1a7202faee71389fbc.tar.gz koffice-b19ae6acefb3f4f21e2f7e1a7202faee71389fbc.zip | |
Workaround to fix issue #32
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 273530af4f44c3c9170cd92ec3f8e9e1b7c5507c)
| -rw-r--r-- | kpresenter/KPrCommand.cpp | 4 | ||||
| -rw-r--r-- | kpresenter/KPrCommand.h | 6 | ||||
| -rw-r--r-- | kpresenter/KPrPenStyleWidget.cpp | 8 | ||||
| -rw-r--r-- | kpresenter/KPrView.cpp | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index bef363bb..b5558afa 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -940,10 +940,10 @@ void KoPenCmd::execute() { Pen tmpPen = *oldPen.at( i ); - if ( flags & LineBegin ) + if ( flags & BeginLine ) tmpPen.lineBegin = newPen.lineBegin; - if ( flags & LineEnd ) + if ( flags & EndLine ) tmpPen.lineEnd = newPen.lineEnd; if ( flags & Color ) diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index 4ad3497c..b7d47a89 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -375,12 +375,12 @@ public: // the flags indicate what has changed enum PenConfigChange { - LineBegin = 1, - LineEnd = 2, + BeginLine = 1, + EndLine = 2, Color = 4, Width = 8, Style = 16, - All = LineBegin | LineEnd | Color | Width | Style + All = BeginLine | EndLine | Color | Width | Style }; KoPenCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Pen _newPen, diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index f05e1f2a..a8a2f653 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -195,9 +195,9 @@ int KPrPenStyleWidget::getPenConfigChange() const int flags = 0; if ( getLineEnd() != m_pen.lineEnd ) - flags = flags | KoPenCmd::LineEnd; + flags = flags | KoPenCmd::EndLine; if ( getLineBegin() != m_pen.lineBegin ) - flags = flags | KoPenCmd::LineBegin; + flags = flags | KoPenCmd::BeginLine; if ( getKPPen().color() != m_pen.pen.color() ) flags = flags | KoPenCmd::Color; if ( getKPPen().style() != m_pen.pen.style() ) @@ -227,10 +227,10 @@ void KPrPenStyleWidget::apply() { int flags = getPenConfigChange(); - if ( flags & KoPenCmd::LineEnd ) + if ( flags & KoPenCmd::EndLine ) m_pen.lineEnd = getLineEnd(); - if ( flags & KoPenCmd::LineBegin ) + if ( flags & KoPenCmd::BeginLine ) m_pen.lineBegin = getLineBegin(); if ( flags & KoPenCmd::Color ) diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 220dc91b..c581ddf4 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -2049,7 +2049,7 @@ void KPrView::extraLineBeginDoubleLineArrow() void KPrView::setExtraLineBegin(LineEnd lb) { KCommand * cmd( getPenCmd( i18n("Change Line Begin"), KoPen(), - lb, L_NORMAL, KoPenCmd::LineBegin ) ); + lb, L_NORMAL, KoPenCmd::BeginLine ) ); if( cmd ) kPresenterDoc()->addCommand( cmd ); else @@ -2099,7 +2099,7 @@ void KPrView::extraLineEndDoubleLineArrow() void KPrView::setExtraLineEnd(LineEnd le) { KCommand * cmd( getPenCmd( i18n("Change Line End"), KoPen(), - L_NORMAL, le, KoPenCmd::LineEnd ) ); + L_NORMAL, le, KoPenCmd::EndLine ) ); if( cmd ) kPresenterDoc()->addCommand( cmd ); else |