diff options
| author | Stefan Heinemann <stefan.heinemann@codedump.ch> | 2015-03-11 15:10:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 12:33:02 +0200 |
| commit | 33f1e29cb91f70e52c1af6ae33491c667b5225a6 (patch) | |
| tree | f479bd5faeedf0e6d153a9ace89c924d63ea7bb9 /officecfg | |
| parent | bc1e32d6b8f5df9cf55a110bfcf3331a6756673e (diff) | |
tdf#87441: Adjustable hidden content removal in e-mails
Possibility to adjust the hidden content behaviour in the send e-mail
functionality via option under the e-mail program setting
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, taking just the parts
that store the configuration property within /org.openoffice.Office/Security
(rather than /org.openoffice.Office/Common/ExternalMailer) and throwing away
the parts overlapping with previously picked
<https://gerrit.libreoffice.org/#/c/14994/> "fdo#87441-Send document as Email
removes invisible content." Plus making the configuration property
non-nillable, -Werror,-Winconsistent-missing-override, loplugin:salbool, and
removal of trailing whitespace.
Conflicts:
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/uiconfig/ui/optemailpage.ui
sw/source/uibase/app/docsh2.cxx
Change-Id: I1fb70418c5fe8011a86a379c2e75eae9ad3e18c3
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 6 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Security.xcs | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index abfa4044442c..b613d3f4d176 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6394,12 +6394,6 @@ </info> <value/> </prop> - <prop oor:name="Hidden" oor:type="xs:boolean" oor:nillable="false"> - <info> - <desc>Specifies whether invisible content should be hidden or not.</desc> - </info> - <value>true</value> - </prop> </group> <group oor:name="I18N"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Security.xcs b/officecfg/registry/schema/org/openoffice/Office/Security.xcs index 7fe78b9fdcf7..9b4374aa057c 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Security.xcs @@ -49,5 +49,17 @@ </info> </prop> </group> + <group oor:name="HiddenContent"> + <info> + <author>SH</author> + <desc>Specifies whether to remove the hidden content when sending the document attached to an e-mail</desc> + </info> + <prop oor:name="RemoveHiddenContent" oor:type="xs:boolean" oor:nillable="false"> + <info> + <desc>Specify wheter hidden content should be removed when sending via email</desc> + </info> + <value>true</value> + </prop> + </group> </component> </oor:component-schema> |