Kaydet (Commit) 85959fcc authored tarafından Pranav Kant's avatar Pranav Kant Kaydeden (comit) pranavk

lok: Unique annotation Ids to SwPostItFields

Change-Id: I6dd5186eb18ca99a75a5cb73263cc6bfcc7ff345
Reviewed-on: https://gerrit.libreoffice.org/33467Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarpranavk <pranavk@collabora.co.uk>
üst c67040c1
...@@ -444,14 +444,18 @@ class SW_DLLPUBLIC SwPostItField : public SwField ...@@ -444,14 +444,18 @@ class SW_DLLPUBLIC SwPostItField : public SwField
DateTime aDateTime; DateTime aDateTime;
OutlinerParaObject* mpText; OutlinerParaObject* mpText;
rtl::Reference<SwTextAPIObject> m_xTextObject; rtl::Reference<SwTextAPIObject> m_xTextObject;
sal_uInt32 m_nPostItId;
public: public:
static sal_uInt32 m_nLastPostItId;
SwPostItField( SwPostItFieldType*, SwPostItField( SwPostItFieldType*,
const OUString& rAuthor, const OUString& rAuthor,
const OUString& rText, const OUString& rText,
const OUString& rInitials, const OUString& rInitials,
const OUString& rName, const OUString& rName,
const DateTime& rDate); const DateTime& rDate,
const sal_uInt32 nPostItId = 0);
SwPostItField(const SwPostItField&) = delete; SwPostItField(const SwPostItField&) = delete;
SwPostItField* operator=(const SwPostItField&) = delete; SwPostItField* operator=(const SwPostItField&) = delete;
...@@ -464,6 +468,7 @@ public: ...@@ -464,6 +468,7 @@ public:
const DateTime& GetDateTime() const { return aDateTime; } const DateTime& GetDateTime() const { return aDateTime; }
inline const Date GetDate() const { return Date(aDateTime.GetDate()); } inline const Date GetDate() const { return Date(aDateTime.GetDate()); }
inline const tools::Time GetTime() const { return aDateTime.GetTime(); } inline const tools::Time GetTime() const { return aDateTime.GetTime(); }
inline sal_uInt32 GetPostItId() const { return m_nPostItId; }
/// Author /// Author
virtual OUString GetPar1() const override; virtual OUString GetPar1() const override;
......
...@@ -1635,12 +1635,15 @@ SwFieldType* SwPostItFieldType::Copy() const ...@@ -1635,12 +1635,15 @@ SwFieldType* SwPostItFieldType::Copy() const
// PostIt field // PostIt field
sal_uInt32 SwPostItField::m_nLastPostItId = 1;
SwPostItField::SwPostItField( SwPostItFieldType* pT, SwPostItField::SwPostItField( SwPostItFieldType* pT,
const OUString& rAuthor, const OUString& rAuthor,
const OUString& rText, const OUString& rText,
const OUString& rInitials, const OUString& rInitials,
const OUString& rName, const OUString& rName,
const DateTime& rDateTime ) const DateTime& rDateTime,
const sal_uInt32 nPostItId)
: SwField( pT ) : SwField( pT )
, sText( rText ) , sText( rText )
, sAuthor( rAuthor ) , sAuthor( rAuthor )
...@@ -1649,6 +1652,7 @@ SwPostItField::SwPostItField( SwPostItFieldType* pT, ...@@ -1649,6 +1652,7 @@ SwPostItField::SwPostItField( SwPostItFieldType* pT,
, aDateTime( rDateTime ) , aDateTime( rDateTime )
, mpText( nullptr ) , mpText( nullptr )
{ {
m_nPostItId = nPostItId == 0 ? m_nLastPostItId++ : nPostItId;
} }
SwPostItField::~SwPostItField() SwPostItField::~SwPostItField()
...@@ -1674,7 +1678,7 @@ OUString SwPostItField::GetDescription() const ...@@ -1674,7 +1678,7 @@ OUString SwPostItField::GetDescription() const
SwField* SwPostItField::Copy() const SwField* SwPostItField::Copy() const
{ {
SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sText, sInitials, sName, SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sText, sInitials, sName,
aDateTime); aDateTime, m_nPostItId);
if (mpText) if (mpText)
pRet->SetTextObject( new OutlinerParaObject(*mpText) ); pRet->SetTextObject( new OutlinerParaObject(*mpText) );
......
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