[Libreoffice-commits] core.git: include/svx officecfg/registry svx/source svx/uiconfig

[Tomaž Vajngerl]

 include/svx/ClassificationDialog.hxx                       |    2 ++
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |    3 +++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    6 ++++++
 svx/source/dialog/ClassificationDialog.cxx                 |    8 ++++++++
 svx/uiconfig/ui/classificationdialog.ui                    |    2 +-
 5 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 8748b1afbfb419405d197fad7b95a2b10bfa1b3a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Nov 2 15:21:31 2017 +0900

    TSCP: make configurable if IP section is expanded
    
    Change-Id: I38b8c1da096c2b38f52defd8bb9a522e32fb881c
    Reviewed-on: https://gerrit.libreoffice.org/44188
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx
index a03f9cb550ab..ddea7af12592 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -17,6 +17,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/layout.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/ClassificationEditView.hxx>
 #include <sfx2/classificationhelper.hxx>
@@ -39,6 +40,7 @@ private:
     VclPtr<ListBox> m_pIntellectualPropertyPartNumberListBox;
     VclPtr<PushButton> m_pIntellectualPropertyPartAddButton;
     VclPtr<Edit> m_pIntellectualPropertyPartEdit;
+    VclPtr<VclExpander> m_pIntellectualPropertyExpander;
 
     SfxClassificationHelper maHelper;
     SfxClassificationHelper maInternationalHelper;
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index a3fb32d76b2b..2d98eec21da9 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -540,5 +540,8 @@
       <prop oor:name="Policy" oor:type="xs:short">
         <value>3</value>
       </prop>
+      <prop oor:name="AdvancedClassificationDialogIntellectualPropertySectionExpanded" oor:type="xs:boolean">
+        <value>true</value>
+      </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 01651dabe8f5..fe7f8e806a7b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6393,6 +6393,12 @@
         </info>
         <value>3</value>
       </prop>
+      <prop oor:name="AdvancedClassificationDialogIntellectualPropertySectionExpanded" 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>
     </group>
   </component>
 </oor:component-schema>
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index b82743a1675a..ef7ef7010ada 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -23,6 +23,8 @@
 #include <tools/XmlWriter.hxx>
 #include <tools/XmlWalker.hxx>
 
+#include <officecfg/Office/Common.hxx>
+
 namespace svx {
 
 namespace {
@@ -138,6 +140,8 @@ ClassificationDialog::ClassificationDialog(vcl::Window* pParent, const bool bPer
     get(m_pIntellectualPropertyPartAddButton, "intellectualPropertyPartAddButton");
     get(m_pIntellectualPropertyPartEdit, "intellectualPropertyPartEntry");
 
+    get(m_pIntellectualPropertyExpander, "intellectualPropertyExpander");
+
     m_pSignButton->SetClickHdl(LINK(this, ClassificationDialog, ButtonClicked));
     m_pSignButton->Show(m_bPerParagraph);
 
@@ -178,6 +182,9 @@ ClassificationDialog::ClassificationDialog(vcl::Window* pParent, const bool bPer
     m_pIntellectualPropertyPartListBox->EnableAutoSize(true);
 
     m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog, SelectRecentlyUsedHdl));
+
+    bool bExpand = officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertySectionExpanded::get();
+    m_pIntellectualPropertyExpander->set_expanded(bExpand);
 }
 
 ClassificationDialog::~ClassificationDialog()
@@ -199,6 +206,7 @@ void ClassificationDialog::dispose()
     m_pIntellectualPropertyPartNumberListBox.clear();
     m_pIntellectualPropertyPartAddButton.clear();
     m_pIntellectualPropertyPartEdit.clear();
+    m_pIntellectualPropertyExpander.clear();
 
     ModalDialog::dispose();
 }
diff --git a/svx/uiconfig/ui/classificationdialog.ui b/svx/uiconfig/ui/classificationdialog.ui
index 99d8bf88ad5a..b953c003e0ec 100644
--- a/svx/uiconfig/ui/classificationdialog.ui
+++ b/svx/uiconfig/ui/classificationdialog.ui
@@ -261,7 +261,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkExpander">
+              <object class="GtkExpander" id="intellectualPropertyExpander">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>