tdf#112411 Remove all that remains of the More controls toolbars Change-Id: I82a348c7be067e777dced15dd014b8139cc9b1dc Reviewed-on: https://gerrit.libreoffice.org/69224 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

commit: 00f96e88a7c6feea98d446e82a2718c5aae6256c [log]
author: Roman Kuznetsov <antilibreoffice@gmail.com> Wed Mar 13 19:18:49 2019 +0100
committer: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Thu Mar 14 08:52:29 2019 +0100
tree: 9bff711b6e7b70ede72cd6a9f913a72ac237981e
parent: c196d70337f6b755cfc4c34beda05554c6fab114 [diff]
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index f137729..17bbcf3 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx

@@ -94,7 +94,6 @@ enum class SfxShellFeature
    FormShowFilterNavigator = 0x0100,
    FormShowTextControlBar  = 0x0200,
    FormTBControls          = 0x0400,
    FormTBMoreControls      = 0x0800,
    FormTBDesign            = 0x1000,
    FormShowDataNavigator   = 0x2000,
    // masks to make sure modules don't use flags from another

diff --git a/include/sfx2/toolbarids.hxx b/include/sfx2/toolbarids.hxx
index bf02ce1..1aedb4e 100644
--- a/include/sfx2/toolbarids.hxx
+++ b/include/sfx2/toolbarids.hxx

@@ -26,7 +26,6 @@ enum class ToolbarId : sal_uInt32
    SvxTbx_Form_Filter = 18002,
    SvxTbx_Text_Control_Attributes = 18003,
    SvxTbx_Controls = 18004,
    SvxTbx_MoreControls = 18005,
    SvxTbx_FormDesign = 18006,
    Math_Toolbox = 20050,
    Webtools_Toolbox = 20402,

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 78bedb9..4c40a79 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc

@@ -829,7 +829,6 @@ class SfxStringItem;
#define SID_SHRINK_FONT_SIZE                            ( SID_SVX_START + 1043 )
// color subtoolbar on graphictoolbar
#define SID_COLOR_SETTINGS                              ( SID_SVX_START + 1044 )
#define SID_FM_MORE_CONTROLS                            ( SID_SVX_START + 1045 )
#define SID_FM_FORM_DESIGN_TOOLS                        ( SID_SVX_START + 1046 )
#define SID_DRAWTBX_CS_BASIC                            ( SID_SVX_START + 1047 )
#define SID_DRAWTBX_CS_SYMBOL                           ( SID_SVX_START + 1048 )

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 254d52c..7dd89f6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu

@@ -326,20 +326,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 9f33993..5b316f1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu

@@ -519,20 +519,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 29b0400..ea10db2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

@@ -5324,14 +5324,6 @@
          <value>1</value>
        </prop>
      </node>
      <node oor:name=".uno:MoreControls" oor:op="replace">
        <prop oor:name="Label" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Properties" oor:type="xs:int">
          <value>9</value>
        </prop>
      </node>
      <node oor:name=".uno:FormDesignTools" oor:op="replace">
        <prop oor:name="Label" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 7cac22a..c3d2192 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu

@@ -402,20 +402,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index 6254676..c0c6afe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu

@@ -366,20 +366,6 @@
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index a8e4e8e..ce94fe0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu

@@ -360,20 +360,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 4cc23c3..b7238b5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu

@@ -363,20 +363,6 @@
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 87c4c86..321eda4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu

@@ -407,20 +407,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 28d1780..7cceb866 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu

@@ -438,20 +438,6 @@
          <value>false</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 09f3c16..24a1964 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu

@@ -357,20 +357,6 @@
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">More Controls</value>
        </prop>
        <prop oor:name="Docked" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="Visible" oor:type="xs:boolean">
          <value>false</value>
        </prop>
        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
          <value>true</value>
        </prop>
      </node>
      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
        <prop oor:name="UIName" oor:type="xs:string">
          <value xml:lang="en-US">Form Design</value>

diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst
index 0ec2d33..d0b226c 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst

@@ -111,7 +111,6 @@ modules/scalc/toolbar/graphicobjectbar.xml
modules/scalc/toolbar/insertbar.xml
modules/scalc/toolbar/insertcellsbar.xml
modules/scalc/toolbar/mediaobjectbar.xml
modules/scalc/toolbar/moreformcontrols.xml
modules/scalc/toolbar/previewbar.xml
modules/scalc/toolbar/standardbar.xml
modules/scalc/toolbar/starshapes.xml
@@ -148,7 +147,6 @@ modules/sdraw/toolbar/insertbar.xml
modules/sdraw/toolbar/linesbar.xml
modules/sdraw/toolbar/masterviewtoolbar.xml
modules/sdraw/toolbar/mediaobjectbar.xml
modules/sdraw/toolbar/moreformcontrols.xml
modules/sdraw/toolbar/optionsbar.xml
modules/sdraw/toolbar/positionbar.xml
modules/sdraw/toolbar/standardbar.xml
@@ -189,7 +187,6 @@ modules/simpress/toolbar/insertbar.xml
modules/simpress/toolbar/linesbar.xml
modules/simpress/toolbar/masterviewtoolbar.xml
modules/simpress/toolbar/mediaobjectbar.xml
modules/simpress/toolbar/moreformcontrols.xml
modules/simpress/toolbar/optionsbar.xml
modules/simpress/toolbar/outlinetoolbar.xml
modules/simpress/toolbar/positionbar.xml
@@ -230,7 +227,6 @@ modules/sglobal/toolbar/graffilterbar.xml
modules/sglobal/toolbar/graphicobjectbar.xml
modules/sglobal/toolbar/insertbar.xml
modules/sglobal/toolbar/mediaobjectbar.xml
modules/sglobal/toolbar/moreformcontrols.xml
modules/sglobal/toolbar/numobjectbar.xml
modules/sglobal/toolbar/oleobjectbar.xml
modules/sglobal/toolbar/optimizetablebar.xml
@@ -299,7 +295,6 @@ modules/swriter/toolbar/graffilterbar.xml
modules/swriter/toolbar/graphicobjectbar.xml
modules/swriter/toolbar/insertbar.xml
modules/swriter/toolbar/mediaobjectbar.xml
modules/swriter/toolbar/moreformcontrols.xml
modules/swriter/toolbar/navigationobjectbar.xml
modules/swriter/toolbar/numobjectbar.xml
modules/swriter/toolbar/oleobjectbar.xml

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index a349a80..5294519 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx

@@ -74,7 +74,6 @@ static const ResIdToResName pToolBarResToName[] =
    { ToolbarId::SvxTbx_Form_Filter,      "formsfilterbar"       },
    { ToolbarId::SvxTbx_Text_Control_Attributes, "formtextobjectbar"    },
    { ToolbarId::SvxTbx_Controls,         "formcontrols"         },
    { ToolbarId::SvxTbx_MoreControls,     "moreformcontrols"     },
    { ToolbarId::SvxTbx_FormDesign,       "formdesign"           },
    { ToolbarId::Math_Toolbox,            "toolbar"              },      //math
    { ToolbarId::Text_Toolbox_Sc,         "textobjectbar"        },      //calc

diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index 8eda2c5..d1dd4fd 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi

@@ -625,11 +625,6 @@ shell FmFormShell

    SID_FM_CONFIG // ole : no, status : ?
    []
    SID_FM_MORE_CONTROLS
    [
        ExecMethod = Execute ;
        StateMethod = GetState ;
    ]
    SID_FM_FORM_DESIGN_TOOLS
    [
        ExecMethod = Execute ;

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c21c376..3aaf07b 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi

@@ -1634,25 +1634,6 @@ SfxVoidItem Config SID_FM_CONFIG
]


SfxBoolItem MoreControls SID_FM_MORE_CONTROLS

[
    AutoUpdate = TRUE,
    FastCall = FALSE,
    ReadOnlyDoc = FALSE,
    Toggle = TRUE,
    Container = FALSE,
    RecordAbsolute = FALSE,
    RecordPerSet;


    AccelConfig = FALSE,
    MenuConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = SfxGroupId::Controls;
]


SfxBoolItem FormDesignTools SID_FM_FORM_DESIGN_TOOLS

[

diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 6719116..3b8187c 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx

@@ -174,10 +174,6 @@ void FmFormShell::InitInterface_Impl()
                                            SfxShellFeature::FormTBControls);

    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard,
                                            ToolbarId::SvxTbx_MoreControls,
                                            SfxShellFeature::FormTBMoreControls);

    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Standard,
                                            ToolbarId::SvxTbx_FormDesign,
                                            SfxShellFeature::FormTBDesign);
}
@@ -331,7 +327,6 @@ bool FmFormShell::HasUIFeature(SfxShellFeature nFeature) const
        bResult = GetImpl()->isEnhancedForm_Lock();
    }
    else if (  (nFeature & SfxShellFeature::FormTBControls)
            || (nFeature & SfxShellFeature::FormTBMoreControls)
            || (nFeature & SfxShellFeature::FormTBDesign)
            )
    {
@@ -512,7 +507,6 @@ void FmFormShell::Execute(SfxRequest &rReq)
    // individual actions
    switch( nSlot )
    {
        case SID_FM_MORE_CONTROLS:
        case SID_FM_FORM_DESIGN_TOOLS:
        {
            FormToolboxes aToolboxAccess(GetImpl()->getHostFrame_Lock());
@@ -809,7 +803,6 @@ void FmFormShell::GetState(SfxItemSet &rSet)
    {
        switch( nWhich )
        {
            case SID_FM_MORE_CONTROLS:
            case SID_FM_FORM_DESIGN_TOOLS:
            {
                FormToolboxes aToolboxAccess(GetImpl()->getHostFrame_Lock());

diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index fdf299b..52ee511 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx

@@ -79,16 +79,10 @@ namespace svxform

    OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId )
    {
        OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ),
        OSL_ENSURE( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ,
            "FormToolboxes::getToolboxResourceName: unsupported slot!" );

        const sal_Char* pToolBarName = "moreformcontrols";
        if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS )
            pToolBarName = "formdesign";

        OUString aToolBarResStr( "private:resource/toolbar/" );
        aToolBarResStr += OUString::createFromAscii( pToolBarName );
        return aToolBarResStr;
        return "private:resource/toolbar/formdesign";
    }



diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 588a170..a54bc05 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba

@@ -1672,7 +1672,6 @@ Const cstUnoPrefix = &quot;.uno:&quot;
		Case UCase(sOOCommand) = &quot;LISTBOX&quot; : sDispatch = &quot;ListBox&quot;
		Case UCase(sOOCommand) = &quot;MACRODIALOG&quot; : sDispatch = &quot;MacroDialog&quot;
		Case UCase(sOOCommand) = &quot;MACROORGANIZER&quot; : sDispatch = &quot;MacroOrganizer&quot;
		Case UCase(sOOCommand) = &quot;MORECONTROLS&quot; : sDispatch = &quot;MoreControls&quot;
		Case UCase(sOOCommand) = &quot;NAVIGATIONBAR&quot; : sDispatch = &quot;NavigationBar&quot;
		Case iVBACommand = acCmdObjectBrowser  Or UCase(sOOCommand) = &quot;NAVIGATOR&quot; : sDispatch = &quot;Navigator&quot;
		Case UCase(sOOCommand) = &quot;NEWDOC&quot; : sDispatch = &quot;NewDoc&quot;
commit	00f96e88a7c6feea98d446e82a2718c5aae6256c	[log]
author	Roman Kuznetsov <antilibreoffice@gmail.com>	Wed Mar 13 19:18:49 2019 +0100
committer	Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>	Thu Mar 14 08:52:29 2019 +0100
tree	9bff711b6e7b70ede72cd6a9f913a72ac237981e
parent	c196d70337f6b755cfc4c34beda05554c6fab114 [diff]