[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source officecfg/registry

[Libreoffice Gerrit user]

 desktop/source/migration/wizard.src                                    |    3 ++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ed04784ebca3aadda1c438c22b567e93d2c91da1
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Feb 15 21:38:52 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Feb 15 21:38:52 2019 +0000

    Sometimes the frame toolbar is missing from Writer when selecting a frame.
    
    This should fix it.

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 0c2a00be3502..e7ed23a96050 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -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>
commit cd54f70ec9c5ab371cd26efb75545f97cd817119
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Feb 15 21:10:02 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Feb 15 21:10:02 2019 +0000

    This is no longer a registration wizard, so changing the wording.

diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index f6be7c0055fb..4317906a2b00 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -82,7 +82,7 @@ String STR_WELCOME_MIGRATION
 
 String STR_WELCOME_WITHOUT_LICENSE
 {
-    Text [ en-US ] = "This wizard will guide you through the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
+    Text [ en-US ] = "This wizard will guide you through the setup of %PRODUCTNAME.\n\nClick 'Next' to continue.";
 };
 
 String STR_FINISH
@@ -436,3 +436,4 @@ TabPage TP_REGISTRATION
     };
 };
 
+// ********************************************************************** EOF