officecfg/registry/data/org/openoffice/Office/Common.xcu | 4 ++--
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 6 +++---
svx/source/dialog/ClassificationDialog.cxx | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit bcdc5f56f064e875f58a2f22872393d1fef31839
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Sat Nov 4 02:37:07 2017 +0900
TSCP: make the configuration key names shorter
Change-Id: If28e283666f4e1f87758c401b2d4fb5986eb6d8c
Reviewed-on: https://gerrit.libreoffice.org/44281
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 33c1db97f618..c7d198e38cd4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -539,9 +539,9 @@
<node oor:name="Classification">
<prop oor:name="Policy" oor:type="xs:short">
</prop>
- <prop
oor:name="AdvancedClassificationDialogIntellectualPropertySectionExpanded"
oor:type="xs:boolean">
+ <prop oor:name="IntellectualPropertySectionExpanded"
oor:type="xs:boolean">
</prop>
- <prop
oor:name="AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm"
oor:type="xs:boolean">
+ <prop oor:name="IntellectualPropertyTextInputIsFreeForm"
oor:type="xs:boolean">
</prop>
</node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 22c92a7124fa..8eeced165011 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6393,15 +6393,15 @@
</info>
<value>3</value>
</prop>
- <prop
oor:name="AdvancedClassificationDialogIntellectualPropertySectionExpanded"
oor:type="xs:boolean" oor:nillable="false">
+ <prop oor:name="IntellectualPropertySectionExpanded"
oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if the intellectual property section in the
advanced classification dialog should be expanded when the dialog is
open.</desc>
</info>
<value>true</value>
</prop>
- <prop
oor:name="AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm"
oor:type="xs:boolean" oor:nillable="false">
+ <prop oor:name="IntellectualPropertyTextInputIsFreeForm"
oor:type="xs:boolean" oor:nillable="false">
<info>
- <desc>Specifies if the intellectual property text is free-form or
limited to ';', '/' and ' ' characters.</desc>
+ <desc>Specifies if the intellectual property text in the advanced
classification is free-form or limited to ';', '/' and ' ' (space) and delete
key.</desc>
</info>
<value>true</value>
</prop>
diff --git a/svx/source/dialog/ClassificationDialog.cxx
b/svx/source/dialog/ClassificationDialog.cxx
index 6c70d97dd83f..3210d1a2f761 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -41,7 +41,7 @@ VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit)
void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent)
{
- bool bTextIsFreeForm =
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get();
+ bool bTextIsFreeForm =
officecfg::Office::Common::Classification::IntellectualPropertyTextInputIsFreeForm::get();
if (bTextIsFreeForm)
{
@@ -230,7 +230,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window*
pParent, const bool bPer
m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog,
SelectRecentlyUsedHdl));
- bool bExpand =
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertySectionExpanded::get();
+ bool bExpand =
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
m_pIntellectualPropertyExpander->set_expanded(bExpand);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
