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>

7 files changed, 11 insertions, 13 deletions

diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 5170883b3379..384600f94771 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -264,8 +264,8 @@ public:
     virtual void    ReadFrameViewData(FrameView* pView) override;
     virtual void    WriteFrameViewData() override;
 
-    virtual ErrCode DoVerb(::tools::Long nVerb) override;
-    virtual bool    ActivateObject(SdrOle2Obj* pObj, ::tools::Long nVerb) override;
+    virtual ErrCode DoVerb(sal_Int32 nVerb) override;
+    virtual bool    ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb) override;
 
     void            SetZoomOnPage( bool bZoom ) { mbZoomOnPage = bZoom; }
     bool            IsZoomOnPage() const { return mbZoomOnPage; }
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index e1856d9a231f..834461a4de96 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -229,7 +229,7 @@ public:
     void  WriteUserData();
     void  ReadUserData();
 
-    virtual bool  ActivateObject(SdrOle2Obj* pObj, ::tools::Long nVerb);
+    virtual bool ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb);
 
     /** @returns
             current or selected page or 0. This method
@@ -370,7 +370,7 @@ public:
     /** This function is called from the underlying ViewShellBase
         object to handle a verb execution request.
     */
-    virtual ErrCode DoVerb (::tools::Long nVerb);
+    virtual ErrCode DoVerb(sal_Int32 nVerb);
 
     virtual void UIActivating( SfxInPlaceClient* );
     virtual void UIDeactivated( SfxInPlaceClient* );
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 0510b2ad0fb5..d80e6113fdd3 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -118,7 +118,7 @@ public:
 
     /** This call is forwarded to the main sub-shell.
     */
-    virtual ErrCode DoVerb (::tools::Long nVerb) override;
+    virtual ErrCode DoVerb(sal_Int32 nVerb) override;
 
     /** Return a new renderer that can be used for example for printing the
         document.
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 241befe0ba5a..d4067944f802 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -506,13 +506,13 @@ void ViewShellBase::Rearrange()
     GetViewFrame()->Resize(true);
 }
 
-ErrCode ViewShellBase::DoVerb (::tools::Long nVerb)
+ErrCode ViewShellBase::DoVerb(sal_Int32 nVerb)
 {
     ErrCode aResult = ERRCODE_NONE;
 
     ::sd::ViewShell* pShell = GetMainViewShell().get();
     if (pShell != nullptr)
-        aResult = pShell->DoVerb (nVerb);
+        aResult = pShell->DoVerb(nVerb);
 
     return aResult;
 }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index b1105e38872f..f17f81799bae 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -709,8 +709,7 @@ void DrawViewShell::ResetActualPage()
 /**
  * Apply "Verb" on OLE-object.
  */
-
-ErrCode DrawViewShell::DoVerb(::tools::Long nVerb)
+ErrCode DrawViewShell::DoVerb(sal_Int32 nVerb)
 {
     if ( mpDrawView->AreObjectsMarked() )
     {
@@ -737,8 +736,7 @@ ErrCode DrawViewShell::DoVerb(::tools::Long nVerb)
 /**
  * Activate OLE-object
  */
-
-bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, ::tools::Long nVerb)
+bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb)
 {
     bool bActivated = false;
 
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 8bfc9739e6e7..8d68fe58c017 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -627,7 +627,7 @@ void ViewShell::WriteFrameViewData()
 {
 }
 
-bool ViewShell::ActivateObject(SdrOle2Obj* pObj, ::tools::Long nVerb)
+bool ViewShell::ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb)
 {
     ErrCode aErrCode = ERRCODE_NONE;
 
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 1ae50f7ae7e6..eeec0ad78447 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1399,7 +1399,7 @@ SdDrawDocument* ViewShell::GetDoc() const
     return GetViewShellBase().GetDocument();
 }
 
-ErrCode ViewShell::DoVerb (::tools::Long )
+ErrCode ViewShell::DoVerb(sal_Int32 /*nVerb*/)
 {
     return ERRCODE_NONE;
 }