Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Office
Calligra
Commits
59320c42
Commit
59320c42
authored
Nov 04, 2012
by
C. Boemann
Browse files
Fix crash on inserting what amounts to a new page (either enough text or page break)
BUG: 305006
parent
e5fe7eba
Changes
4
Hide whitespace changes
Inline
Side-by-side
libs/flake/KoShapeManager.h
View file @
59320c42
...
...
@@ -98,7 +98,7 @@ public slots:
* @param shape the shape to add
* @param repaint if true it will trigger a repaint of the shape
*/
void
addShape
(
KoShape
*
shape
,
Repaint
repaint
=
PaintShapeOnAdd
);
void
addShape
(
KoShape
*
shape
,
KoShapeManager
::
Repaint
repaint
=
PaintShapeOnAdd
);
/**
* Add an additional shape to the manager.
...
...
words/part/KWDocument.cpp
View file @
59320c42
...
...
@@ -175,7 +175,7 @@ void KWDocument::addShape(KoShape* shape, KoTextAnchor* anchor)
addFrameSet
(
frame
->
frameSet
());
}
emit
shapeAdded
(
shape
);
emit
shapeAdded
(
shape
,
KoShapeManager
::
PaintShapeOnAdd
);
shape
->
update
();
}
...
...
@@ -422,8 +422,8 @@ void KWDocument::addFrame(KWFrame *frame)
{
kDebug
(
32001
)
<<
"frame="
<<
frame
<<
"frameSet="
<<
frame
->
frameSet
();
//firePageSetupChanged();
emit
resourceChanged
(
Words
::
CurrentFrameSetCount
,
m_frameSets
.
count
());
emit
shapeAdded
(
frame
->
shape
(),
KoShapeManager
::
AddWithoutRepaint
);
emit
resourceChanged
(
Words
::
CurrentFrameSetCount
,
m_frameSets
.
count
());
}
void
KWDocument
::
removeFrame
(
KWFrame
*
frame
)
...
...
words/part/KWDocument.h
View file @
59320c42
...
...
@@ -223,7 +223,7 @@ signals:
void
pageSetupChanged
();
/// emitted whenever a shape is added.
void
shapeAdded
(
KoShape
*
,
KoShapeManager
::
Repaint
repaint
=
KoShapeManager
::
PaintShapeOnAdd
);
void
shapeAdded
(
KoShape
*
,
KoShapeManager
::
Repaint
);
/// emitted whenever a shape is removed
void
shapeRemoved
(
KoShape
*
);
...
...
words/part/KWPart.cpp
View file @
59320c42
...
...
@@ -69,7 +69,7 @@ KoView *KWPart::createViewInstance(QWidget *parent)
void
KWPart
::
setupViewInstance
(
KWView
*
view
)
{
connect
(
m_document
,
SIGNAL
(
shapeAdded
(
KoShape
*
)),
view
->
canvasBase
()
->
shapeManager
(),
SLOT
(
addShape
(
KoShape
*
)));
connect
(
m_document
,
SIGNAL
(
shapeAdded
(
KoShape
*
,
KoShapeManager
::
Repaint
)),
view
->
canvasBase
()
->
shapeManager
(),
SLOT
(
addShape
(
KoShape
*
,
KoShapeManager
::
Repaint
)));
connect
(
m_document
,
SIGNAL
(
resourceChanged
(
int
,
const
QVariant
&
)),
view
->
canvasBase
()
->
resourceManager
(),
SLOT
(
setResource
(
int
,
const
QVariant
&
)));
bool
switchToolCalled
=
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment