summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-08-07 23:53:04 +0300
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-09-04 05:54:03 -0500
commitc56af9da2ebd1cc060fff01cb78e80eb69100cfb (patch)
tree208c68ddafba409745cca2a32b470836b701ea62
parentd20f9f3f8116f29dda638fb0957af91c43ae0111 (diff)
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@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 154c20cb320fb62cdd54cd248c3b981acc3903c8) Reviewed-on: https://gerrit.libreoffice.org/10858 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sfx2/sdi/sfx.sdi2
-rw-r--r--sfx2/source/view/viewfrm.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4302753318de..4ce0378cd539 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 84d0a711c2e7..33e7d4c6d10a 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 )