Workaround to fix issue #32

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/33/head
Michele Calgaro 11 months ago
parent 3cd0cbde8a
commit 273530af4f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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 )

@ -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,

@ -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 )

@ -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

Loading…
Cancel
Save