[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sd/sdi sd/source svx/inc svx/sdi

[Libreoffice Gerrit user]

 sd/sdi/_drvwsh.sdi               |    5 +++++
 sd/source/ui/app/popup2_tmpl.src |    1 +
 sd/source/ui/view/drviews8.cxx   |    1 +
 svx/inc/globlmn_tmpl.hrc         |    5 +++++
 svx/inc/svx/svxids.hrc           |    3 ++-
 svx/sdi/svx.sdi                  |   24 ++++++++++++++++++++++++
 6 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit cee6d978a17b3f820f6c7c578a5a57785a10f8f8
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Dec 4 15:58:21 2012 +0100

    added Change picture menu item to graphic shape popup
    
    Conflicts:
    	sd/sdi/_drvwsh.sdi
    	sd/source/ui/app/popup2_tmpl.src
    	svx/inc/globlmn_tmpl.hrc
    	svx/inc/svx/svxids.hrc
    	svx/sdi/svx.sdi
    
    Change-Id: I6e4927b847ca6990990be1075c8371404736e27e

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 018e7d0..4dc1d76 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -70,6 +70,11 @@ interface DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
+    SID_CHANGE_PICTURE
+    [
+        ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
+    ]
     SID_SAVEGRAPHIC
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index a1ded7c..46297bf 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -659,6 +659,7 @@
         MN_STYLEDT
         SEPARATOR
         MN_SAVEGRAPHIC
+        MenuItem { ITEM_CHANGE_PICTURE };
     };
 };
 
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index ea01389..f202825 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -162,6 +162,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
         }
         break;
 
+        case SID_CHANGE_PICTURE:
         case SID_INSERT_GRAPHIC:
         {
             SetCurrentFunction( FuInsertGraphic::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index f6b8f73..119bd02 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -257,6 +257,11 @@
     Command = ".uno:ImageMapDialog" ; \
     Text [ en-US ] = "ImageMap" ; \
 
+#define ITEM_CHANGE_PICTURE \
+    Identifier = SID_CHANGE_PICTURE ; \
+    Command = ".uno:ChangePicture" ; \
+    Text [ en-US ] = "Change Picture..." ; \
+
 #define ITEM_VIEW_ATTR_ZOOM \
     Identifier = SID_ATTR_ZOOM ; \
     Command = ".uno:Zoom" ; \
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index f66af83..df9aed3 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1267,9 +1267,10 @@
 #define SID_INSERT_FORM_SPIN                            (SID_SVX_START+1110)
 #define SID_INSERT_FORM_VSCROLL                         (SID_SVX_START+1111)
 #define SID_INSERT_FORM_HSCROLL                         (SID_SVX_START+1112)
+#define SID_CHANGE_PICTURE                              (SID_SVX_START+1113)
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               (SID_INSERT_FORM_HSCROLL + 1)
+#define SID_SVX_FIRSTFREE                               (SID_CHANGE_PICTURE + 1)
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 8afec8b..7732f08 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5948,6 +5948,30 @@ SfxBoolItem ImageMapExecute SID_IMAP_EXEC
     GroupId = GID_EDIT;
 ]
 
+SfxVoidItem ChangePicture SID_CHANGE_PICTURE
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_GRAPHIC;
+]
+
 //--------------------------------------------------------------------------
 SfxBoolItem Init3D SID_3D_INIT