From 6c7e476ae6b6ff56b81ff19ef7dd0e8a9083a257 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <quikee@gmail.com>
Date: Sun, 21 Apr 2013 14:01:40 +0200
Subject: Regster rotate left, right menu items.

Change-Id: I64340da256a9ee66b13870854ccdccacaaf4f0d2
---
 svx/inc/svx/svxids.hrc            |  7 ++++--
 svx/sdi/svx.sdi                   | 47 +++++++++++++++++++++++++++++++++++++++
 sw/sdi/_grfsh.sdi                 | 12 ++++++++++
 sw/source/ui/app/mn.src           | 14 ++++++++++++
 vcl/source/filter/jpeg/transupp.c |  2 ++
 5 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index a343df421e53..da669b8fd8a6 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -923,15 +923,18 @@
 #define SID_INSERT_FORM_HSCROLL                         (SID_SVX_START+1112)
 #define SID_EXTERNAL_EDIT                               (SID_SVX_START+1113)
 #define SID_ATTR_PAGE_SHARED_FIRST                      (SID_SVX_START+1114)
-#define SID_CHANGE_PICTURE                              (SID_SVX_START+1125)
 #define SID_SAVE_GRAPHIC                                (SID_SVX_START+1116)
 #define SID_COMPRESS_GRAPHIC                            (SID_SVX_START+1117)
 #define SID_FRAME_UP                                    (SID_SVX_START+1118)
 #define SID_FRAME_DOWN                                  (SID_SVX_START+1119)
 #define SID_ATTR_SPECIALCHAR                            (SID_SVX_START+1120)
+#define SID_CHANGE_PICTURE                              (SID_SVX_START+1125)
+#define SID_ROTATE_GRAPHIC_LEFT                         (SID_SVX_START+1126)
+#define SID_ROTATE_GRAPHIC_RIGHT                        (SID_SVX_START+1127)
+
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               (SID_COMPRESS_GRAPHIC + 1)
+#define SID_SVX_FIRSTFREE                               (SID_ROTATE_GRAPHIC_RIGHT + 1)
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 279954b342b1..0778bb431e23 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5942,6 +5942,53 @@ SfxBoolItem ImageMapExecute SID_IMAP_EXEC
 ]
 
 SfxVoidItem ExternalEdit SID_EXTERNAL_EDIT
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_GRAPHIC;
+]
+
+SfxVoidItem RotateGraphicLeft SID_ROTATE_GRAPHIC_LEFT
+
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_GRAPHIC;
+]
+
+SfxVoidItem RotateGraphicRight SID_ROTATE_GRAPHIC_RIGHT
 
 [
     /* flags: */
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index a76718431409..f91eba916c6e 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -60,6 +60,18 @@ interface BaseTextGraphic
         StateMethod = GetAttrState ;
     ]
 
+    SID_ROTATE_GRAPHIC_LEFT
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetAttrState ;
+    ]
+
+    SID_ROTATE_GRAPHIC_RIGHT
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetAttrState ;
+    ]
+
     SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
     [
         ExecMethod = Execute ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 15f275bec9c0..a9871d49ff7f 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1289,6 +1289,20 @@ Menu MN_GRF_POPUPMENU
         MenuItem { ITEM_SAVE_GRAPHIC };
         MenuItem { ITEM_COMPRESS_GRAPHIC };
         MenuItem { ITEM_EXTERNAL_EDIT };
+
+        MenuItem
+        {
+            Identifier = SID_ROTATE_GRAPHIC_LEFT ;
+            Command = ".uno:RotateGraphicLeft" ;
+            Text [ en-US ] = "Rotate Graphic Left" ;
+        };
+        MenuItem
+        {
+            Identifier = SID_ROTATE_GRAPHIC_RIGHT ;
+            Command = ".uno:RotateGraphicRight" ;
+            Text [ en-US ] = "Rotate Graphic Right" ;
+        };
+
         SEPARATOR;
         MenuItem
         {
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 24b766746f61..fd2ff37eb257 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1593,6 +1593,8 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
    * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
    * if the encoder library already wrote one.
    */
+   if (option) {}
+
   for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
     if (dstinfo->write_JFIF_header &&
     marker->marker == JPEG_APP0 &&
-- 
cgit