summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/shells/drawsh.cxx10
-rw-r--r--sw/source/uibase/shells/grfsh.cxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index a0b3b3504613..e62b324293ed 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -422,16 +422,6 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
rSet.DisableItem( nWhich );
break;
- case SID_OBJECT_ROTATE:
- {
- const bool bIsRotate = GetView().IsDrawRotate();
- if ( (!bIsRotate && !pSdrView->IsRotateAllowed()) || bProtected )
- rSet.DisableItem( nWhich );
- else
- rSet.Put( SfxBoolItem( nWhich, bIsRotate ) );
- }
- break;
-
case SID_BEZIER_EDIT:
if (!Disable(rSet, nWhich))
rSet.Put( SfxBoolItem( nWhich, !GetView().IsDrawSelMode()));
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index db916633f505..dd64d1346ca3 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -840,6 +840,15 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
SwWrtShell& rShell = GetShell();
+ if (rReq.GetSlot() == SID_OBJECT_ROTATE)
+ {
+ if (GetView().IsDrawRotate())
+ rShell.SetDragMode(SdrDragMode::Move);
+ else
+ rShell.SetDragMode(SdrDragMode::Rotate);
+
+ GetView().FlipDrawRotate();
+ }
if (rReq.GetSlot() == SID_ROTATE_GRAPHIC_LEFT)
{
aRotation = 900;
@@ -908,6 +917,7 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
bool bDisable = bIsParentContentProtected;
switch( nWhich )
{
+ case SID_OBJECT_ROTATE:
case SID_ROTATE_GRAPHIC_LEFT:
case SID_ROTATE_GRAPHIC_RIGHT:
if( rShell.GetGraphicType() == GraphicType::NONE )