sc/source/ui/docshell/docsh.cxx | 2 +- sc/source/ui/inc/uiitems.hxx | 4 ++-- sc/source/ui/view/tabvwsh5.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 43a8b03e6f250dad19ba36d41adaa0b39be88b10 Author: Eike Rathke <er...@redhat.com> Date: Thu Sep 22 13:05:51 2016 +0200 rename GetId() to GetTablesHintId() and GetIndexHintId() In preparation of moving SfxSimpleHint that has GetId() to SfxHint. Change-Id: If781ba9578931d9543875ee288ce37c727bfba10 diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 384823e..83b43f7 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -638,7 +638,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) const ScTablesHint* pScHint = dynamic_cast< const ScTablesHint* >( &rHint ); if (pScHint) { - if (pScHint->GetId() == SC_TAB_INSERTED) + if (pScHint->GetTablesHintId() == SC_TAB_INSERTED) { uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = aDocument.GetVbaEventProcessor(); if ( xVbaEvents.is() ) try diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index fe278be..f114e0c 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -92,7 +92,7 @@ public: ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0); virtual ~ScTablesHint() override; - sal_uInt16 GetId() const { return nId; } + sal_uInt16 GetTablesHintId() const { return nId; } SCTAB GetTab1() const { return nTab1; } SCTAB GetTab2() const { return nTab2; } }; @@ -122,7 +122,7 @@ public: ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx); virtual ~ScIndexHint() override; - sal_uInt16 GetId() const { return nId; } + sal_uInt16 GetIndexHintId() const { return nId; } sal_uInt16 GetIndex() const { return nIndex; } }; diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 6167187..261d2ce 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -205,7 +205,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) const ScTablesHint& rTabHint = static_cast<const ScTablesHint&>(rHint); SCTAB nTab1 = rTabHint.GetTab1(); SCTAB nTab2 = rTabHint.GetTab2(); - sal_uInt16 nId = rTabHint.GetId(); + sal_uInt16 nId = rTabHint.GetTablesHintId(); switch (nId) { case SC_TAB_INSERTED: @@ -291,7 +291,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) else if (dynamic_cast<const ScIndexHint*>(&rHint)) { const ScIndexHint& rIndexHint = static_cast<const ScIndexHint&>(rHint); - sal_uInt16 nId = rIndexHint.GetId(); + sal_uInt16 nId = rIndexHint.GetIndexHintId(); sal_uInt16 nIndex = rIndexHint.GetIndex(); switch (nId) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits