Kaydet (Commit) 921686a8 authored tarafından Noel Grandin's avatar Noel Grandin

convert SC_LINKREFTYPE to scoped enum

Change-Id: Ia894548d87390e5170d2b704eac26e34729ebe8e
Reviewed-on: https://gerrit.libreoffice.org/18736Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 588e1f97
...@@ -81,15 +81,13 @@ public: ...@@ -81,15 +81,13 @@ public:
}; };
//! move ScLinkRefreshedHint to a different file? //! move ScLinkRefreshedHint to a different file?
enum class ScLinkRefType {
#define SC_LINKREFTYPE_NONE 0 NONE, SHEET, AREA, DDE
#define SC_LINKREFTYPE_SHEET 1 };
#define SC_LINKREFTYPE_AREA 2
#define SC_LINKREFTYPE_DDE 3
class ScLinkRefreshedHint : public SfxHint class ScLinkRefreshedHint : public SfxHint
{ {
sal_uInt16 nLinkType; // SC_LINKREFTYPE_... ScLinkRefType nLinkType;
OUString aUrl; // used for sheet links OUString aUrl; // used for sheet links
OUString aDdeAppl; // used for dde links: OUString aDdeAppl; // used for dde links:
OUString aDdeTopic; OUString aDdeTopic;
...@@ -106,7 +104,7 @@ public: ...@@ -106,7 +104,7 @@ public:
void SetDdeLink( const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM ); void SetDdeLink( const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM );
void SetAreaLink( const ScAddress& rPos ); void SetAreaLink( const ScAddress& rPos );
sal_uInt16 GetLinkType() const { return nLinkType; } ScLinkRefType GetLinkType() const { return nLinkType; }
const OUString& GetUrl() const { return aUrl; } const OUString& GetUrl() const { return aUrl; }
const OUString& GetDdeAppl() const { return aDdeAppl; } const OUString& GetDdeAppl() const { return aDdeAppl; }
const OUString& GetDdeTopic() const { return aDdeTopic; } const OUString& GetDdeTopic() const { return aDdeTopic; }
......
...@@ -57,7 +57,7 @@ ScPointerChangedHint::~ScPointerChangedHint() ...@@ -57,7 +57,7 @@ ScPointerChangedHint::~ScPointerChangedHint()
// ScLinkRefreshedHint - a link has been refreshed // ScLinkRefreshedHint - a link has been refreshed
ScLinkRefreshedHint::ScLinkRefreshedHint() : ScLinkRefreshedHint::ScLinkRefreshedHint() :
nLinkType( SC_LINKREFTYPE_NONE ), nLinkType( ScLinkRefType::NONE ),
nDdeMode( 0 ) nDdeMode( 0 )
{ {
} }
...@@ -68,14 +68,14 @@ ScLinkRefreshedHint::~ScLinkRefreshedHint() ...@@ -68,14 +68,14 @@ ScLinkRefreshedHint::~ScLinkRefreshedHint()
void ScLinkRefreshedHint::SetSheetLink( const OUString& rSourceUrl ) void ScLinkRefreshedHint::SetSheetLink( const OUString& rSourceUrl )
{ {
nLinkType = SC_LINKREFTYPE_SHEET; nLinkType = ScLinkRefType::SHEET;
aUrl = rSourceUrl; aUrl = rSourceUrl;
} }
void ScLinkRefreshedHint::SetDdeLink( void ScLinkRefreshedHint::SetDdeLink(
const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM ) const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM )
{ {
nLinkType = SC_LINKREFTYPE_DDE; nLinkType = ScLinkRefType::DDE;
aDdeAppl = rA; aDdeAppl = rA;
aDdeTopic = rT; aDdeTopic = rT;
aDdeItem = rI; aDdeItem = rI;
...@@ -84,7 +84,7 @@ void ScLinkRefreshedHint::SetDdeLink( ...@@ -84,7 +84,7 @@ void ScLinkRefreshedHint::SetDdeLink(
void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos ) void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos )
{ {
nLinkType = SC_LINKREFTYPE_AREA; nLinkType = ScLinkRefType::AREA;
aDestPos = rPos; aDestPos = rPos;
} }
......
...@@ -102,7 +102,7 @@ void ScSheetLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) ...@@ -102,7 +102,7 @@ void ScSheetLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) ) else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) )
{ {
const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint); const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint);
if ( rLH.GetLinkType() == SC_LINKREFTYPE_SHEET && rLH.GetUrl() == aFileName ) if ( rLH.GetLinkType() == ScLinkRefType::SHEET && rLH.GetUrl() == aFileName )
Refreshed_Impl(); Refreshed_Impl();
} }
} }
...@@ -628,7 +628,7 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) ...@@ -628,7 +628,7 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) ) else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) )
{ {
const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint); const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint);
if ( rLH.GetLinkType() == SC_LINKREFTYPE_AREA ) if ( rLH.GetLinkType() == ScLinkRefType::AREA )
{ {
// get this link to compare dest position // get this link to compare dest position
ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos);
...@@ -1074,7 +1074,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) ...@@ -1074,7 +1074,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) ) else if ( dynamic_cast<const ScLinkRefreshedHint*>(&rHint) )
{ {
const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint); const ScLinkRefreshedHint& rLH = static_cast<const ScLinkRefreshedHint&>(rHint);
if ( rLH.GetLinkType() == SC_LINKREFTYPE_DDE && if ( rLH.GetLinkType() == ScLinkRefType::DDE &&
rLH.GetDdeAppl() == aAppl && rLH.GetDdeAppl() == aAppl &&
rLH.GetDdeTopic() == aTopic && rLH.GetDdeTopic() == aTopic &&
rLH.GetDdeItem() == aItem ) //! mode is ignored rLH.GetDdeItem() == aItem ) //! mode is ignored
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment