diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-07-15 12:15:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-16 09:01:02 +0100 |
| commit | 133d6d8d4dec497276c3a9b0ba6761cffd322f81 (patch) | |
| tree | 26282ae68d27e44ff6bf7ad22023272cf4d1bf54 /sw/source/core/frmedt | |
| parent | 7dd5f9308895644ae6ece56253c892046cc6ed5e (diff) | |
Resolves: #i121443# register text frames and graphics...
on the correct page frame
- trigger formatting of selected object when moving view to the selected object
or when graphical horizontal line has been inserted.
(cherry picked from commit 82fafc47de0c59c783c5df596c976a429ff8a21d)
Conflicts:
sw/source/core/frmedt/feshview.cxx
sw/source/core/layout/fly.cxx
sw/source/ui/shells/textsh.cxx
Change-Id: I4b4b523ff445f2ce20d9b81ad1187db7b44bd145
Diffstat (limited to 'sw/source/core/frmedt')
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 75b3d3342765..8aa17a8c6814 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2253,9 +2253,10 @@ const SwFrmFmt* SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType, bool bI // show the current selected object void SwFEShell::MakeSelVisible() { - if( Imp()->HasDrawView() && - Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ) + if ( Imp()->HasDrawView() && + Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ) { + GetCurrFrm(); // just to trigger formatting in case the selected object is not formatted. MakeVisible( Imp()->GetDrawView()->GetAllMarkedRect() ); } else |