[Libreoffice-commits] core.git: framework/source officecfg/registry vcl/source

[Samuel Mehrbrodt]

 framework/source/uielement/uicommanddescription.cxx                  |    8 +++---
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   12 +++++-----
 officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs      |    4 +--
 vcl/source/helper/commandinfoprovider.cxx                            |    5 +---
 4 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit b23d20d6d2bf0ef4c9acf5f38d11e51cdceee271
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 17 15:12:03 2016 +0200

    Make 'IsExperimental' property boolean
    
    Change-Id: If88ea931ead8dd031fda9b17d9023a771ab0a0d0
    Reviewed-on: https://gerrit.libreoffice.org/29970
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 0aac542..41b50d2 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -120,7 +120,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
         {
             CmdToInfoMap() : bPopup( false ),
                              bCommandNameCreated( false ),
-                             nIsExperimental( 0 ),
+                             bIsExperimental( false ),
                              nProperties( 0 ) {}
 
             OUString            aLabel;
@@ -131,7 +131,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
             OUString            aTargetURL;
             bool                bPopup : 1,
                                 bCommandNameCreated : 1;
-            sal_Int32           nIsExperimental;
+            bool                bIsExperimental;
             sal_Int32           nProperties;
         };
 
@@ -338,7 +338,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman
         aPropSeq[6].Name  = m_aPropTargetURL;
         aPropSeq[6].Value <<= pIter->second.aTargetURL;
         aPropSeq[7].Name = m_aPropIsExperimental;
-        aPropSeq[7].Value <<= pIter->second.nIsExperimental;
+        aPropSeq[7].Value <<= pIter->second.bIsExperimental;
         return makeAny( aPropSeq );
     }
 
@@ -368,7 +368,7 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
                     xNameAccess->getByName( m_aPropUIPopupLabel )   >>= aCmdToInfo.aPopupLabel;
                     xNameAccess->getByName( m_aPropUITooltipLabel )   >>= aCmdToInfo.aTooltipLabel;
                     xNameAccess->getByName( m_aPropUITargetURL )    >>= aCmdToInfo.aTargetURL;
-                    xNameAccess->getByName( m_aPropUIIsExperimental ) >>= aCmdToInfo.nIsExperimental;
+                    xNameAccess->getByName( m_aPropUIIsExperimental ) >>= aCmdToInfo.bIsExperimental;
                     xNameAccess->getByName( m_aPropProperties )     >>= aCmdToInfo.nProperties;
 
                     m_aCmdInfoCache.insert( CommandToInfoCache::value_type( aNameSeq[i], aCmdToInfo ));
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 01fc956..a9bef87 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4012,8 +4012,8 @@
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
-        <prop oor:name="IsExperimental" oor:type="xs:int">
-          <value>1</value>
+        <prop oor:name="IsExperimental" oor:type="xs:boolean">
+          <value>true</value>
         </prop>
       </node>
       <node oor:name=".uno:TransformRotationX" oor:op="replace">
@@ -4137,8 +4137,8 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Notebookbar</value>
         </prop>
-        <prop oor:name="IsExperimental" oor:type="xs:int">
-          <value xml:lang="en-US">1</value>
+        <prop oor:name="IsExperimental" oor:type="xs:boolean">
+          <value>true</value>
         </prop>
       </node>
       <node oor:name=".uno:Sidebar" oor:op="replace">
@@ -5890,8 +5890,8 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Toolbar Layout</value>
         </prop>
-        <prop oor:name="IsExperimental" oor:type="xs:int">
-          <value>1</value>
+        <prop oor:name="IsExperimental" oor:type="xs:boolean">
+          <value>true</value>
         </prop>
       </node>
       <node oor:name=".uno:AvailableToolbars" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 6ff9c43..b82a25ac 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
@@ -51,9 +51,9 @@
           <desc>The actual command to use for everything except label/icon, typically when the main command doesn't map to a valid application slot.</desc>
         </info>
       </prop>
-      <prop oor:name="IsExperimental" oor:type="xs:int" oor:localized="false">
+      <prop oor:name="IsExperimental" oor:type="xs:boolean">
         <info>
-          <desc>If set to '1', this command is available only when Experimental features are activated.</desc>
+          <desc>If set to "true", this command is available only when Experimental features are activated.</desc>
         </info>
       </prop>
       <prop oor:name="Properties" oor:type="xs:int" oor:nillable="false">
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index 881a008..2b23821 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -317,9 +317,8 @@ bool CommandInfoProvider::IsExperimental(const OUString& rsCommandName,
             {
                 if (aProperties[nIndex].Name == "IsExperimental")
                 {
-                    sal_Int32 nValue;
-                    return (aProperties[nIndex].Value >>= nValue)
-                        && nValue == 1;
+                    bool bValue;
+                    return (aProperties[nIndex].Value >>= bValue) && bValue;
                 }
             }
         }