strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support setting writer comment contents from simple-html

Browse source 
Change-Id: I42002c1b1ade940603ca6d2ca0f6072f1672cce8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174471
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-10-01 20:27:19 +01:00
parent 71293e4c19
commit 6d94b7988f
6 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/svx/svxids.hrc
View file

@ -1070,8 +1070,10 @@ class XFillGradientItem;
#define SID_ATTR_BULLET_FONT TypedWhichId<SfxStringItem>(SID_SVX_START + 1213)
#define SID_ATTR_BULLET_INDEX TypedWhichId<SfxUInt16Item>(SID_SVX_START + 1214)
#define SID_ATTR_POSTIT_HTML TypedWhichId<SvxPostItTextItem>( SID_SVX_START + 1215 )
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1214 + 1 )
#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1215 + 1 )
// Overflow check for slot IDs

10
svx/sdi/svx.sdi
View file

@ -4684,7 +4684,10 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE
SfxVoidItem InsertAnnotation SID_INSERT_POSTIT
(SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT)
(SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,
SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,
SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,
SvxPostItTextItem Html SID_ATTR_POSTIT_HTML)
[
AutoUpdate = FALSE,
FastCall = FALSE,
@ -4705,6 +4708,7 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,
SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,
SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,
SvxPostItTextItem Html SID_ATTR_POSTIT_HTML,
SfxInt32Item PositionX SID_ATTR_POSTIT_POSITION_X
SfxInt32Item PositionY SID_ATTR_POSTIT_POSITION_Y)
[
@ -4758,7 +4762,9 @@ SfxVoidItem ShowResolvedAnnotations SID_TOGGLE_RESOLVED_NOTES
SfxVoidItem ReplyToAnnotation SID_REPLYTO_POSTIT
(SvxPostItIdItem Id SID_ATTR_POSTIT_ID,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT)
(SvxPostItIdItem Id SID_ATTR_POSTIT_ID,
SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,
SvxPostItTextItem Html SID_ATTR_POSTIT_HTML)
[
AutoUpdate = FALSE,
FastCall = FALSE,

3
sw/inc/AnnotationWin.hxx
View file

@ -72,7 +72,8 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin final : public InterimItemWindow
void GotoPos();
const SwPostItField* GetPostItField() const { return mpField; }
SwFormatField* GetFormatField() const { return mpFormatField; }
void UpdateText(const OUString& aText);
void UpdateText(const OUString& rText);
void UpdateHTML(const OUString& rHtml);
OUString GetAuthor() const;
Date GetDate() const;

9
sw/sdi/swriter.sdi
View file

@ -2519,7 +2519,10 @@ SfxVoidItem IndexMarkToIndex FN_IDX_MARK_TO_IDX
]
SfxVoidItem InsertAnnotation FN_POSTIT
(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE)
(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,
SvxPostItTextItem Html SID_ATTR_POSTIT_HTML,
SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,
SvxPostItDateItem Date SID_ATTR_POSTIT_DATE)
[
AutoUpdate = FALSE,
FastCall = FALSE,
@ -7684,7 +7687,9 @@ SfxBoolItem SelectionModeDefault FN_SELECTION_MODE_DEFAULT
]
SfxVoidItem ReplyComment FN_REPLY
(SvxPostItIdItem Id SID_ATTR_POSTIT_ID,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT)
(SvxPostItIdItem Id SID_ATTR_POSTIT_ID,
SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,
SvxPostItTextItem Html SID_ATTR_POSTIT_HTML)
[
AutoUpdate = FALSE,
FastCall = FALSE,

10
sw/source/uibase/docvw/AnnotationWin.cxx
View file

@ -484,6 +484,16 @@ void SwAnnotationWin::UpdateText(const OUString& aText)
UpdateData();
}
void SwAnnotationWin::UpdateHTML(const OUString& rHtml)
{
mpOutliner->Clear();
OString sHtmlContent(rHtml.toUtf8());
SvMemoryStream aHTMLStream(const_cast<char*>(sHtmlContent.getStr()),
sHtmlContent.getLength(), StreamMode::READ);
GetOutlinerView()->Read(aHTMLStream, EETextFormat::Html, nullptr);
UpdateData();
}
bool SwAnnotationWin::IsReadOnlyOrProtected() const
{
return mbReadonly ||

16
sw/source/uibase/shells/textfld.cxx
View file

@ -533,15 +533,19 @@ void SwTextShell::ExecField(SfxRequest &rReq)
const SvxPostItIdItem* pIdItem = rReq.GetArg<SvxPostItIdItem>(SID_ATTR_POSTIT_ID);
if (pIdItem && !pIdItem->GetValue().isEmpty())
{
const SvxPostItTextItem* pTextItem = rReq.GetArg<SvxPostItTextItem>(SID_ATTR_POSTIT_TEXT);
OUString sText;
if ( pTextItem )
sText = pTextItem->GetValue();
sw::annotation::SwAnnotationWin* pAnnotationWin = GetView().GetPostItMgr()->GetAnnotationWin(pIdItem->GetValue().toUInt32());
if (pAnnotationWin && lcl_canUserModifyAnnotation(GetView(), pAnnotationWin))
{
pAnnotationWin->UpdateText(sText);
if (const SvxPostItTextItem* pHtmlItem = rReq.GetArg<SvxPostItTextItem>(SID_ATTR_POSTIT_HTML))
pAnnotationWin->UpdateHTML(pHtmlItem->GetValue());
else
{
const SvxPostItTextItem* pTextItem = rReq.GetArg<SvxPostItTextItem>(SID_ATTR_POSTIT_TEXT);
OUString sText;
if (pTextItem)
sText = pTextItem->GetValue();
pAnnotationWin->UpdateText(sText);
}
// explicit state update to get the Undo state right
GetView().AttrChangedNotify(nullptr);