15 files changed, 100 insertions, 23 deletions
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 491d01a83258..508b99599e6e 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -46,30 +46,35 @@ interface BaseTextGraphic
     [
         ExecMethod = Execute ;
         StateMethod = GetAttrState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_COMPRESS_GRAPHIC
     [
         ExecMethod = Execute ;
         StateMethod = GetAttrState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_EXTERNAL_EDIT
     [
         ExecMethod = Execute ;
         StateMethod = GetAttrState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ROTATE_GRAPHIC_LEFT
     [
         ExecMethod = ExecuteRotation ;
-        StateMethod = GetAttrState ;
+        StateMethod = GetAttrStateForRotation ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ROTATE_GRAPHIC_RIGHT
     [
         ExecMethod = ExecuteRotation ;
-        StateMethod = GetAttrState ;
+        StateMethod = GetAttrStateForRotation ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 3c230f9d02ff..630411eceef3 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1294,7 +1294,7 @@ Menu MN_GRF_POPUPMENU
         {
             Identifier = SID_MENU_MANAGE_GRAPHIC ;
             Command = ".uno:ManageGraphicMenu" ;
-            Text [ en-US ] = "~Manage Graphic" ;
+            Text [ en-US ] = "~Rotate Image" ;
             SubMenu = Menu
             {
                 ItemList =
@@ -1302,13 +1302,13 @@ Menu MN_GRF_POPUPMENU
                     MenuItem
                     {
                         Identifier = SID_ROTATE_GRAPHIC_LEFT ;
-                        Command = ".uno:RotateGraphicLeft" ;
+                        Command = ".uno:RotateLeft" ;
                         Text [ en-US ] = "Rotate 90° Left" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_ROTATE_GRAPHIC_RIGHT ;
-                        Command = ".uno:RotateGraphicRight" ;
+                        Command = ".uno:RotateRight" ;
                         Text [ en-US ] = "Rotate 90° Right" ;
                     };
                 };
diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx
index b9567860c330..a963d95a2a8b 100644
--- a/sw/source/ui/inc/grfsh.hxx
+++ b/sw/source/ui/inc/grfsh.hxx
@@ -27,11 +27,12 @@ public:
     SFX_DECL_INTERFACE(SW_GRFSHELL)
 
     void Execute(SfxRequest& rRequest);
-    void ExecuteRotation(SfxRequest &rRequest);
     void ExecAttr(SfxRequest& rRequest);
-
     void GetAttrState(SfxItemSet& rRequest);
 
+    void ExecuteRotation(SfxRequest &rRequest);
+    void GetAttrStateForRotation(SfxItemSet& rRequest);
+
     SwGrfShell(SwView &rView);
 };
 
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 17c441c501bc..feceaae75fe3 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -595,22 +595,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
             if( rSh.GetGraphicType() == GRAPHIC_NONE )
                 bDisable = true;
             break;
-        case SID_ROTATE_GRAPHIC_LEFT:
-        case SID_ROTATE_GRAPHIC_RIGHT:
-            if( rSh.GetGraphicType() == GRAPHIC_NONE )
-            {
-                bDisable = true;
-            }
-            else
-            {
-                Graphic aGraphic = *rSh.GetGraphic();
-                GraphicNativeTransform aTransform(aGraphic);
-                if (!aTransform.canBeRotated())
-                {
-                    bDisable = true;
-                }
-            }
-            break;
         case SID_COLOR_SETTINGS:
         {
             if ( bParentCntProt || !bIsGrfCntnt )
@@ -787,6 +771,47 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
     rShell.EndAllAction();
 }
 
+void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
+{
+    SwWrtShell& rShell = GetShell();
+    bool bIsParentContentProtected = 0 != rShell.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
+
+    SetGetStateSet( &rSet );
+
+    SfxWhichIter aIterator( rSet );
+    sal_uInt16 nWhich = aIterator.FirstWhich();
+    while( nWhich )
+    {
+        bool bDisable = bIsParentContentProtected;
+        switch( nWhich )
+        {
+        case SID_ROTATE_GRAPHIC_LEFT:
+        case SID_ROTATE_GRAPHIC_RIGHT:
+            if( rShell.GetGraphicType() == GRAPHIC_NONE )
+            {
+                bDisable = true;
+            }
+            else
+            {
+                Graphic aGraphic = *rShell.GetGraphic();
+                GraphicNativeTransform aTransform(aGraphic);
+                if (!aTransform.canBeRotated())
+                {
+                    bDisable = true;
+                }
+            }
+            break;
+        default:
+            bDisable = false;
+        }
+
+        if( bDisable )
+            rSet.DisableItem( nWhich );
+        nWhich = aIterator.NextWhich();
+    }
+    SetGetStateSet( 0 );
+}
+
 
 SwGrfShell::SwGrfShell(SwView &_rView) :
     SwBaseShell(_rView)
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 92d6d01414c1..51acde7a0a22 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -319,6 +319,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
index 4b942df9a95e..6e7201c82042 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
  <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index e51a1c7ed34b..6022a3de7d24 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -264,6 +264,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index bd471d4679a2..870dad31ed56 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -318,6 +318,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
index 4b942df9a95e..6e7201c82042 100644
--- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
  <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 788612eaf31f..8b81c84dec41 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -319,6 +319,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
index 4b942df9a95e..6e7201c82042 100644
--- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
  <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 284cfe713aeb..3c437407c8b1 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -327,6 +327,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
index 4b942df9a95e..6e7201c82042 100644
--- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
  <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e651ae61d90e..d74d3c8005e1 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -320,6 +320,12 @@
           <menu:menuitem menu:id=".uno:FlipVertical"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menu menu:id=".uno:RotateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:RotateLeft"/>
+          <menu:menuitem menu:id=".uno:RotateRight"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:GroupMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
index 4b942df9a95e..6e7201c82042 100644
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
  <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
 </toolbar:toolbar>