diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-06-11 00:01:38 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-02 15:52:55 +0000 |
| commit | 7ea10bbd898f31565e5cdfb2612b1e8b22ed3809 (patch) | |
| tree | c2f2bef7012faec1dac31e6c91d0d8ce401f7305 | |
| parent | de43a2fd64085c6887c66fede95ee9cdf0e431d4 (diff) | |
tdf#91613 restore functionality of clicking to .uno:Size status bar element
... in Writer.
This (partially) reverts commit ebabf6d1fa648d62dd63529e9fe64dcb631caee8.
I did not see the point to open Fields dialog by default, but other uses
are fully valid.
Reviewed-on: https://gerrit.libreoffice.org/16221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit a2716e53c140b09d886591a3d6611ee8f166e417)
Change-Id: Ia06803fbb956266fb40c53f51099f9a32ddd6548
Reviewed-on: https://gerrit.libreoffice.org/16693
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 9c98971c971f..7cf5b7c1b568 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1483,6 +1483,26 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rSet.DisableItem( SID_ATTR_ZOOMSLIDER ); } break; + case SID_ATTR_POSITION: + case SID_ATTR_SIZE: + { + if( !rShell.IsFrmSelected() && !rShell.IsObjSelected() ) + SwBaseShell::_SetFrmMode( FLY_DRAG_END ); + else + { + FlyMode eFrameMode = SwBaseShell::GetFrmMode(); + if ( eFrameMode == FLY_DRAG_START || eFrameMode == FLY_DRAG ) + { + if ( nWhich == SID_ATTR_POSITION ) + rSet.Put( SfxPointItem( SID_ATTR_POSITION, + rShell.GetAnchorObjDiff())); + else + rSet.Put( SvxSizeItem( SID_ATTR_SIZE, + rShell.GetObjSize())); + } + } + } + break; case SID_TABLE_CELL: if( rShell.IsFrmSelected() || rShell.IsObjSelected() ) @@ -1774,6 +1794,39 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) } break; + case SID_ATTR_SIZE: + { + sal_uInt16 nId = 0; + if( rSh.IsCrsrInTbl() ) + nId = FN_FORMAT_TABLE_DLG; + else if( rSh.GetCurTOX() ) + nId = FN_INSERT_MULTI_TOX; + else if( rSh.GetCurrSection() ) + nId = FN_EDIT_REGION; + else + { + const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCrsrPos(); + if( pNumRule ) // cursor in numbering + { + if( pNumRule->IsAutoRule() ) + nId = FN_NUMBER_BULLETS; + else + { + // start dialog of the painter + nId = 0; + } + } + else if( rSh.IsFrmSelected() ) + nId = FN_FORMAT_FRAME_DLG; + else if( rSh.IsObjSelected() ) + nId = SID_ATTR_TRANSFORM; + } + if( nId ) + GetViewFrame()->GetDispatcher()->Execute(nId, + SfxCallMode::SYNCHRON | SfxCallMode::RECORD ); + } + break; + case FN_STAT_SELMODE: { if ( pArgs ) |