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

sw content controls, plain text: add insert UI

Browse source 
- handle the plain text case in SwWrtShell::InsertContentControl()

- expose this as a new .uno:InsertPlainTextContentControl command

- add the new uno command to the default & MS-compatible menus

Change-Id: Ie6eb7271f2c1603fb92036e0067b1e6be70d93ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137447
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2022-07-26 08:21:48 +02:00
parent bbda36c328
commit 7748a0c437
10 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
View file

@ -667,6 +667,14 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:InsertPlainTextContentControl" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Plain Text Content Control</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:InsertObjectDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Other Objects</value>

1
sw/inc/cmdid.h
View file

@ -225,6 +225,7 @@ class SwUINumRuleItem;
#define FN_CONTENT_CONTROL_PROPERTIES (FN_INSERT + 25) /* Content control properties */
#define FN_INSERT_PICTURE_CONTENT_CONTROL (FN_INSERT + 26) /* Picture content control */
#define FN_INSERT_DATE_CONTENT_CONTROL (FN_INSERT + 27) /* Date content control */
#define FN_INSERT_PLAIN_TEXT_CONTENT_CONTROL (FN_INSERT + 28) /* Plain text content control */
#define FN_POSTIT (FN_INSERT + 29) /* Insert/edit PostIt */
#define FN_INSERT_TABLE (FN_INSERT + 30) /* Insert Table */
#define FN_INSERT_STRING (FN_INSERT+31)

21
sw/qa/uibase/wrtsh/wrtsh.cxx
View file

@ -367,6 +367,27 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertDateContentControl)
// handling for date content control.
CPPUNIT_ASSERT(pContentControl->GetDate());
}
CPPUNIT_TEST_FIXTURE(Test, testInsertPlainTextContentControl)
{
// Given an empty document:
SwDoc* pDoc = createSwDoc();
// When inserting a plain text content control:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->InsertContentControl(SwContentControlType::PLAIN_TEXT);
// Then make sure that the matching text attribute is added to the document model:
SwTextNode* pTextNode = pWrtShell->GetCursor()->GetNode().GetTextNode();
SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0, RES_TXTATR_CONTENTCONTROL);
auto pTextContentControl = static_txtattr_cast<SwTextContentControl*>(pAttr);
auto& rFormatContentControl
= static_cast<SwFormatContentControl&>(pTextContentControl->GetAttr());
std::shared_ptr<SwContentControl> pContentControl = rFormatContentControl.GetContentControl();
// Without the accompanying fix in place, this test would have failed, there was no special
// handling for plain text content controls.
CPPUNIT_ASSERT(pContentControl->GetPlainText());
}
}
CPPUNIT_PLUGIN_IMPLEMENT();

6
sw/sdi/_textsh.sdi
View file

@ -302,6 +302,12 @@ interface BaseText
StateMethod = NoState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
FN_INSERT_PLAIN_TEXT_CONTENT_CONTROL // status(final|play)
[
ExecMethod = ExecInsert ;
StateMethod = NoState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
FN_CONTENT_CONTROL_PROPERTIES // status(final|play)
[
ExecMethod = ExecInsert ;

17
sw/sdi/swriter.sdi
View file

@ -3117,6 +3117,23 @@ SfxVoidItem InsertDateContentControl FN_INSERT_DATE_CONTENT_CONTROL
GroupId = SfxGroupId::Insert;
]
SfxVoidItem InsertPlainTextContentControl FN_INSERT_PLAIN_TEXT_CONTENT_CONTROL
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Insert;
]
SfxVoidItem ContentControlProperties FN_CONTENT_CONTROL_PROPERTIES
()
[

5
sw/source/uibase/shells/textsh.cxx
View file

@ -244,6 +244,11 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
rReq.Done();
break;
case FN_INSERT_PLAIN_TEXT_CONTENT_CONTROL:
rSh.InsertContentControl(SwContentControlType::PLAIN_TEXT);
rReq.Done();
break;
case FN_CONTENT_CONTROL_PROPERTIES:
{
SwWrtShell& rWrtSh = GetShell();

2
sw/source/uibase/uiview/view.cxx
View file

@ -594,7 +594,7 @@ void SwView::CheckReadonlyState()
FN_INSERT_BREAK, FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK,
FN_INSERT_BREAK_DLG, FN_INSERT_CONTENT_CONTROL, FN_INSERT_CHECKBOX_CONTENT_CONTROL,
FN_INSERT_DROPDOWN_CONTENT_CONTROL, FN_INSERT_PICTURE_CONTENT_CONTROL,
FN_INSERT_DATE_CONTENT_CONTROL,
FN_INSERT_DATE_CONTENT_CONTROL, FN_INSERT_PLAIN_TEXT_CONTENT_CONTROL,
FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD,
FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE,
FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE,

4
sw/source/uibase/wrtsh/wrtsh1.cxx
View file

@ -1037,6 +1037,10 @@ void SwWrtShell::InsertContentControl(SwContentControlType eType)
case SwContentControlType::PLAIN_TEXT:
{
pContentControl->SetShowingPlaceHolder(true);
if (eType == SwContentControlType::PLAIN_TEXT)
{
pContentControl->SetPlainText(true);
}
if (!HasSelection())
{
aPlaceholder = SwResId(STR_CONTENT_CONTROL_PLACEHOLDER);

1
sw/uiconfig/swriter/menubar/menubar.xml
View file

@ -713,6 +713,7 @@
<menu:menu menu:id=".uno:ContentControlsMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertContentControl"/>
<menu:menuitem menu:id=".uno:InsertPlainTextContentControl"/>
<menu:menuitem menu:id=".uno:InsertPictureContentControl"/>
<menu:menuitem menu:id=".uno:InsertCheckboxContentControl"/>
<menu:menuitem menu:id=".uno:InsertDropdownContentControl"/>

1
sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
View file

@ -16,6 +16,7 @@
<menu:menu menu:id=".uno:MSCompatContentControls">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertContentControl"/>
<menu:menuitem menu:id=".uno:InsertPlainTextContentControl"/>
<menu:menuitem menu:id=".uno:InsertPictureContentControl"/>
<menu:menuitem menu:id=".uno:InsertCheckboxContentControl"/>
<menu:menuitem menu:id=".uno:InsertDropdownContentControl"/>