diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-02 12:03:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-02 17:56:38 +0100 |
| commit | a2e533767bed88f293d2129aca9dfd9c4c60226b (patch) | |
| tree | 86e3e8cdfa9d13fe546daa2bbabdd24290085b26 /sw/source/uibase | |
| parent | 43fadd3beaf3fbc8a402363cf1c0bbda339b2edc (diff) | |
verbs can be sal_Int32 instead of tools::Long
Change-Id: I51c88b837928760c72b77de1535f7843b4fd575e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110318
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/wrtsh.hxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 1bf0ce26db8a..cd50a2f3f7a9 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -25,6 +25,7 @@ #include <IMark.hxx> #include "navmgr.hxx" #include <optional> +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <o3tl/typed_flags_set.hxx> #include <svx/swframetypes.hxx> #include <vcl/weld.hxx> @@ -338,7 +339,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)(); sal_uInt16 nSlotId = 0); // SlotId for dialog bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr ); - void LaunchOLEObj( tools::Long nVerb = 0 ); // start server + void LaunchOLEObj(sal_Int32 nVerb = css::embed::EmbedVerbs::MS_OLEVERB_PRIMARY); // start server virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = nullptr, diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index a6639e3bcb9c..33a7344107c0 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1567,7 +1567,7 @@ void SwView::ShowCursor( bool bOn ) m_pWrtShell->LockView( false ); } -ErrCode SwView::DoVerb( tools::Long nVerb ) +ErrCode SwView::DoVerb(sal_Int32 nVerb) { if ( !GetViewFrame()->GetFrame().IsInPlace() ) { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 496a302a1d1e..32b91a1ff2fd 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -603,8 +603,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame // The current selected OLE object will be loaded with the // verb into the server. - -void SwWrtShell::LaunchOLEObj( tools::Long nVerb ) +void SwWrtShell::LaunchOLEObj(sal_Int32 nVerb) { if ( GetCntType() != CNT_OLE || GetView().GetViewFrame()->GetFrame().IsInPlace() ) |