Author: mseidel
Date: Sun Feb 17 09:36:57 2019
New Revision: 1853741
URL: http://svn.apache.org/viewvc?rev=1853741&view=rev
Log:
Merged r1853670 and r1853726 from trunk.
Sometimes the frame toolbar was "hidden" behind the standard toolbar.
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 17 09:36:57 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853668
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853668,1853670,1853726
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -290,6 +290,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -45,29 +45,29 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/findbar"
oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>1,0</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Find</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="ContextSensitive"
oor:type="xs:boolean">
+ <value>false</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Find</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="ContextSensitive" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- </node>
<node oor:name="private:resource/toolbar/textobjectbar"
oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,1</value>
@@ -85,7 +85,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/toolbar"
oor:op="replace">
@@ -99,7 +99,7 @@
<value xml:lang="en-US">Tools</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>false</value>
+ <value>false</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
@@ -113,7 +113,7 @@
<value xml:lang="en-US">Table</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/numobjectbar"
oor:op="replace">
@@ -127,7 +127,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
@@ -150,7 +150,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/alignmentbar"
oor:op="replace">
@@ -178,7 +178,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
@@ -215,7 +215,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/formsfilterbar" oor:op="replace">
@@ -232,11 +232,11 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
+ </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
</node>
<node
oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
@@ -258,7 +258,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/formcontrols"
oor:op="replace">
@@ -298,6 +298,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
@@ -308,7 +314,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/fullscreenbar"
oor:op="replace">
@@ -331,7 +337,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/graffilterbar"
oor:op="replace">
@@ -359,7 +365,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/insertbar"
oor:op="replace">
@@ -393,7 +399,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
@@ -429,11 +435,11 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawtextobjectbar" oor:op="replace">
@@ -456,7 +462,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/viewerbar"
oor:op="replace">
@@ -475,11 +481,11 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>false</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/drawbar"
oor:op="replace">
@@ -513,7 +519,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/colorbar"
oor:op="replace">
@@ -628,7 +634,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/fontworkshapetype" oor:op="replace">
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -45,7 +45,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/textobjectbar"
oor:op="replace">
@@ -65,7 +65,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/toolbar"
oor:op="replace">
@@ -79,7 +79,7 @@
<value xml:lang="en-US">Tools</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>false</value>
+ <value>false</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
@@ -93,7 +93,7 @@
<value xml:lang="en-US">Table</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/numobjectbar"
oor:op="replace">
@@ -107,7 +107,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
@@ -130,7 +130,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/alignmentbar"
oor:op="replace">
@@ -158,7 +158,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
@@ -178,7 +178,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/formtextobjectbar" oor:op="replace">
@@ -195,7 +195,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/formsfilterbar" oor:op="replace">
@@ -212,11 +212,11 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
+ </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
</node>
<node
oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
@@ -238,7 +238,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/formcontrols"
oor:op="replace">
@@ -248,12 +248,12 @@
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>2</value>
- </prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>0,0</value>
- </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>2</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
</prop>
@@ -290,6 +290,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
@@ -300,7 +306,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/fullscreenbar"
oor:op="replace">
@@ -323,7 +329,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/graffilterbar"
oor:op="replace">
@@ -351,7 +357,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/insertbar"
oor:op="replace">
@@ -399,7 +405,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
@@ -435,11 +441,11 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawtextobjectbar" oor:op="replace">
@@ -462,7 +468,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/viewerbar"
oor:op="replace">
@@ -481,20 +487,20 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>false</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/drawbar"
oor:op="replace">
<prop oor:name="DockingArea" oor:type="xs:int">
<value>1</value>
</prop>
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
- </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>1,0</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
</prop>
@@ -522,7 +528,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/colorbar"
oor:op="replace">
@@ -637,7 +643,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/fontworkshapetype" oor:op="replace">
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -48,26 +48,26 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Find</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="ContextSensitive" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- </node>
+ <node oor:name="private:resource/toolbar/findbar"
oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>1,0</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Find</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="ContextSensitive"
oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/textobjectbar"
oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,1</value>
@@ -140,6 +140,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
@@ -297,9 +303,9 @@
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
</node>
<node
oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
@@ -397,17 +403,17 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/insertbar"
oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Insert</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
- </prop>
+ <node oor:name="private:resource/toolbar/insertbar"
oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Insert</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>
- </node>
+ </node>
<node oor:name="private:resource/toolbar/numobjectbar"
oor:op="replace">
<prop oor:name="Docked" oor:type="xs:boolean">
<value>false</value>
@@ -444,9 +450,9 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>false</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
<value>true</value>
</prop>
@@ -467,9 +473,9 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
<value>true</value>
</prop>
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -304,6 +304,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
Modified:
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu?rev=1853741&r1=1853740&r2=1853741&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
(original)
+++
openoffice/branches/AOO42X/main/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
Sun Feb 17 09:36:57 2019
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -45,29 +45,29 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/findbar"
oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>1,0</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Find</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="ContextSensitive"
oor:type="xs:boolean">
+ <value>false</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
- <prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
- </prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Find</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- <prop oor:name="ContextSensitive" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- </node>
<node oor:name="private:resource/toolbar/textobjectbar"
oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,1</value>
@@ -85,7 +85,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/toolbar"
oor:op="replace">
@@ -99,7 +99,7 @@
<value xml:lang="en-US">Tools</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>false</value>
+ <value>false</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
@@ -113,7 +113,7 @@
<value xml:lang="en-US">Table</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/numobjectbar"
oor:op="replace">
@@ -127,7 +127,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
@@ -150,7 +150,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/alignmentbar"
oor:op="replace">
@@ -178,7 +178,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
@@ -198,7 +198,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/formtextobjectbar" oor:op="replace">
@@ -215,7 +215,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/formsfilterbar" oor:op="replace">
@@ -232,11 +232,11 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
+ </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
</node>
<node
oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
@@ -258,7 +258,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/formcontrols"
oor:op="replace">
@@ -304,6 +304,12 @@
</prop>
</node>
<node
oor:name="private:resource/toolbar/frameobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Frame</value>
</prop>
@@ -314,7 +320,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/fullscreenbar"
oor:op="replace">
@@ -337,7 +343,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/graffilterbar"
oor:op="replace">
@@ -365,7 +371,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/insertbar"
oor:op="replace">
@@ -413,7 +419,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
@@ -449,11 +455,11 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/drawtextobjectbar" oor:op="replace">
@@ -476,7 +482,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/viewerbar"
oor:op="replace">
@@ -495,11 +501,11 @@
<prop oor:name="HideFromToolbarMenu"
oor:type="xs:boolean">
<value>false</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
- <value>true</value>
- </prop>
+ <prop oor:name="NoClose" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/drawbar"
oor:op="replace">
@@ -533,7 +539,7 @@
<value>true</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node oor:name="private:resource/toolbar/colorbar"
oor:op="replace">
@@ -648,7 +654,7 @@
<value>false</value>
</prop>
<prop oor:name="ContextSensitive"
oor:type="xs:boolean">
- <value>true</value>
+ <value>true</value>
</prop>
</node>
<node
oor:name="private:resource/toolbar/fontworkshapetype" oor:op="replace">
