[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/sdi sfx2/source

[Maxim Monastirsky]

 sfx2/sdi/sfx.sdi             |    2 +-
 sfx2/source/view/viewfrm.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c56af9da2ebd1cc060fff01cb78e80eb69100cfb
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Aug 7 23:53:04 2014 +0300

    fdo#82278 SfxUInt16Item -> SfxInt16Item
    
    A regression of 2245288574ef77b09416872326b4543c82790815.
    VerbID can be negative.
    
    Change-Id: Ib242376696346ab310031d1b7c5c74362fb4b3d1
    Reviewed-on: https://gerrit.libreoffice.org/10823
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 154c20cb320fb62cdd54cd248c3b981acc3903c8)
    Reviewed-on: https://gerrit.libreoffice.org/10858
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4302753..4ce0378 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4235,7 +4235,7 @@ SfxVoidItem ObjectCatalog SID_BASICIDE_OBJCAT
 
 
 SfxStringItem ObjectMenue SID_OBJECT
-(SfxUInt16Item VerbID SID_OBJECT)
+(SfxInt16Item VerbID SID_OBJECT)
 [
     /* flags: */
     AutoUpdate = FALSE,
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 84d0a71..33e7d4c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2279,7 +2279,7 @@ void SfxViewFrame::ExecView_Impl
 
         case SID_OBJECT:
         {
-            SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, SID_OBJECT, false );
+            SFX_REQUEST_ARG( rReq, pItem, SfxInt16Item, SID_OBJECT, false );
 
             SfxViewShell *pViewShell = GetViewShell();
             if ( pViewShell && pItem )