[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source sw/inc sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 2 16:57:30 UTC 2021
include/sfx2/ipclient.hxx | 2 +-
include/sfx2/viewsh.hxx | 2 +-
sc/source/ui/inc/tabvwsh.hxx | 4 ++--
sc/source/ui/view/tabvwshb.cxx | 4 ++--
sd/source/ui/inc/DrawViewShell.hxx | 4 ++--
sd/source/ui/inc/ViewShell.hxx | 4 ++--
sd/source/ui/inc/ViewShellBase.hxx | 2 +-
sd/source/ui/view/ViewShellBase.cxx | 4 ++--
sd/source/ui/view/drviews1.cxx | 6 ++----
sd/source/ui/view/viewshe2.cxx | 2 +-
sd/source/ui/view/viewshel.cxx | 2 +-
sfx2/source/view/ipclient.cxx | 2 +-
sfx2/source/view/viewsh.cxx | 6 +-----
sw/inc/view.hxx | 2 +-
sw/source/uibase/inc/wrtsh.hxx | 3 ++-
sw/source/uibase/uiview/view.cxx | 2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 3 +--
17 files changed, 24 insertions(+), 30 deletions(-)
New commits:
commit a2e533767bed88f293d2129aca9dfd9c4c60226b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 2 12:03:20 2021 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 2 17:56:38 2021 +0100
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 at redhat.com>
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index d3fead566486..438807a0020d 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -81,7 +81,7 @@ public:
static SfxInPlaceClient* GetClient( SfxObjectShell const * pDoc, const css::uno::Reference < css::embed::XEmbeddedObject >& xObject );
sal_Int64 GetAspect() const;
sal_Int64 GetObjectMiscStatus() const;
- ErrCode DoVerb( tools::Long nVerb );
+ ErrCode DoVerb(sal_Int32 nVerb);
void VisAreaChanged();
void ResetObject();
bool IsUIActive() const;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 67671a6a678b..a25da48c39d4 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -206,7 +206,7 @@ public:
SfxInPlaceClient* GetUIActiveClient() const;
SfxInPlaceClient* FindIPClient( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const;
- virtual ErrCode DoVerb(tools::Long nVerb);
+ virtual ErrCode DoVerb(sal_Int32 nVerb);
void OutplaceActivated( bool bActive );
virtual void UIActivating( SfxInPlaceClient* pClient );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index b5d6306e937e..351c9e2cbeee 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -297,7 +297,7 @@ public:
ObjectSelectionType GetCurObjectSelectionType() const { return eCurOST; }
- virtual ErrCode DoVerb(tools::Long nVerb) override;
+ virtual ErrCode DoVerb(sal_Int32 nVerb) override;
void StopEditShell();
bool IsDrawTextShell() const;
@@ -320,7 +320,7 @@ public:
virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) override;
void ConnectObject( const SdrOle2Obj* pObj );
- void ActivateObject( SdrOle2Obj* pObj, tools::Long nVerb );
+ void ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb);
void DeactivateOle();
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index d0006564d53e..3d545dd109aa 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -142,7 +142,7 @@ public:
}
-void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, tools::Long nVerb )
+void ScTabViewShell::ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb)
{
// Do not leave the hint message box on top of the object
RemoveHintWindow();
@@ -260,7 +260,7 @@ void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, tools::Long nVerb )
//xIPObj->SetDocumentName( GetViewData().GetDocShell()->GetTitle() );
}
-ErrCode ScTabViewShell::DoVerb(tools::Long nVerb)
+ErrCode ScTabViewShell::DoVerb(sal_Int32 nVerb)
{
SdrView* pView = GetScDrawView();
if (!pView)
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;
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 5b4ba3fdf3dd..2f05207c1d02 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -876,7 +876,7 @@ sal_Int64 SfxInPlaceClient::GetAspect() const
return m_xImp->m_nAspect;
}
-ErrCode SfxInPlaceClient::DoVerb( tools::Long nVerb )
+ErrCode SfxInPlaceClient::DoVerb(sal_Int32 nVerb)
{
SfxErrorContext aEc(ERRCTX_SO_DOVERB, m_pViewSh->GetFrameWeld(), RID_SO_ERRCTX);
ErrCode nError = ERRCODE_NONE;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 42431f20ed42..41bec12ba05f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -731,7 +731,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
}
}
-
void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
const Fraction &rZoomY )
{
@@ -742,8 +741,7 @@ void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
GetWindow()->SetMapMode( aMap );
}
-
-ErrCode SfxViewShell::DoVerb(tools::Long /*nVerb*/)
+ErrCode SfxViewShell::DoVerb(sal_Int32 /*nVerb*/)
/* [Description]
@@ -756,14 +754,12 @@ ErrCode SfxViewShell::DoVerb(tools::Long /*nVerb*/)
return ERRCODE_SO_NOVERBS;
}
-
void SfxViewShell::OutplaceActivated( bool bActive )
{
if ( !bActive )
GetFrame()->GetFrame().Appear();
}
-
void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
{
uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() );
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 7e3feca87883..e71a75423b88 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -373,7 +373,7 @@ public:
virtual SdrView* GetDrawView() const override;
virtual bool HasUIFeature(SfxShellFeature nFeature) const override;
virtual void ShowCursor( bool bOn = true ) override;
- virtual ErrCode DoVerb( tools::Long nVerb ) override;
+ virtual ErrCode DoVerb(sal_Int32 nVerb) override;
virtual sal_uInt16 SetPrinter( SfxPrinter* pNew,
SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL) override;
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() )
More information about the Libreoffice-commits
mailing list