summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2014-11-08 23:02:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-11-18 09:37:36 +0000
commitebabf6d1fa648d62dd63529e9fe64dcb631caee8 (patch)
tree4b1ef689c110eb5285970296540411dc915b4a81
parent3ec607fbb2bc98924126a0098fbef88c87305ddf (diff)
fdo#86018 Don't do anything when clicked on placeholder in statusbar
No idea why this code got executed in sw, it has no action in sd and sc. Change-Id: I1d2b4b049f6ae6d117e7bf3464ae993c6951f1dc Reviewed-on: https://gerrit.libreoffice.org/12314 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/view/cellsh3.cxx3
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx3
-rw-r--r--sw/source/uibase/uiview/view2.cxx53
3 files changed, 0 insertions, 59 deletions
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index a94de11007cc..a30253474e15 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -101,9 +101,6 @@ void ScCellShell::Execute( SfxRequest& rReq )
switch ( nSlot )
{
- case SID_ATTR_SIZE://XXX ???
- break;
-
case SID_COLLABORATION:
#if ENABLE_TELEPATHY
GetViewData()->GetDocShell()->GetCollaboration()->DisplayContacts();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 6b0cb71528fb..312ff21905be 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -473,9 +473,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Ignore();//XXX wird von SFX erledigt
}
- case SID_ATTR_SIZE://XXX ???
- break;
-
case SID_PRINTPREVIEW:
{
if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 7aca2c1734e8..7dcde992313a 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1485,26 +1485,6 @@ 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() )
@@ -1796,39 +1776,6 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
}
break;
- case SID_ATTR_SIZE:
- {
- sal_uInt16 nId = FN_INSERT_FIELD;
- 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 )