[Libreoffice-commits] core.git: 3 commits - sd/uiconfig sw/uiconfig vcl/inc

Thomas Arnhold thomas at arnhold.org
Wed Sep 3 01:48:12 PDT 2014 

 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml    |    1 +
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml |    1 +
 sd/uiconfig/simpress/toolbar/standardbar.xml      |    2 ++
 sw/uiconfig/sglobal/toolbar/textobjectbar.xml     |    1 +
 sw/uiconfig/sweb/toolbar/textobjectbar.xml        |    1 +
 sw/uiconfig/swform/toolbar/textobjectbar.xml      |    1 +
 sw/uiconfig/swreport/toolbar/textobjectbar.xml    |    1 +
 sw/uiconfig/swriter/toolbar/textobjectbar.xml     |    1 +
 sw/uiconfig/swxform/toolbar/textobjectbar.xml     |    1 +
 vcl/inc/accel.h                                   |    2 +-
 10 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit fd81523328891c69ee7cb28bf22308225da42744
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 3 09:54:13 2014 +0200

    fix signature
    
    Change-Id: I3e8f7691135120cc880cccdbea3491c2fdb49c75

diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h
index b1a07b8..0c27a54 100644
--- a/vcl/inc/accel.h
+++ b/vcl/inc/accel.h
@@ -34,7 +34,7 @@ public:
     bool            mbEnabled;
 };
 
-void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
+bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
 
 #endif // INCLUDED_VCL_INC_ACCEL_H
 
commit 6b27bca82a3afc98746b5170e1c4cba3f779ab79
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 3 09:34:04 2014 +0200

    Related: fdo#73151 bring DesignerDialog back as invisible button
    
    Let the user decide if he wants to have this button and/or use
    the sidebar.
    
    Partial revert of b4558b508141af16d335f45a0f12bdd34521e944
    
    Maybe we should do the same for the Navigator button.
    
    Change-Id: I05ba37e7fa18b4d0a74ae90db05f8e5c63cf449c

diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 5e5da76..d7facae 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
  <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
  <toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 2551643..f32d084 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
  <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
index 2e97c66..aac9cdd 100644
--- a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
diff --git a/sw/uiconfig/sweb/toolbar/textobjectbar.xml b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
index 757ae2e..9b8c5c6 100644
--- a/sw/uiconfig/sweb/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="10007"/>
diff --git a/sw/uiconfig/swform/toolbar/textobjectbar.xml b/sw/uiconfig/swform/toolbar/textobjectbar.xml
index 2e97c66..aac9cdd 100644
--- a/sw/uiconfig/swform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
diff --git a/sw/uiconfig/swreport/toolbar/textobjectbar.xml b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
index 2e97c66..aac9cdd 100644
--- a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 2e97c66..aac9cdd 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
diff --git a/sw/uiconfig/swxform/toolbar/textobjectbar.xml b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
index 2e97c66..aac9cdd 100644
--- a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
@@ -18,6 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
commit ae218332b13a82e13f1a9a9f0fb79ef76a51ce39
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 3 09:30:41 2014 +0200

    Related: fdo#73151 bring ZoomToolBox back
    
    Accidently dropped by b4558b508141af16d335f45a0f12bdd34521e944 ?
    
    Because in draw it's still visible.
    
    Change-Id: Ifce5a349ddbb3ae3e33185eb38014ebd9ce4a80f

diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index b849c7b..d25382f 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -48,6 +48,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:style="dropdown"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HelpIndex"  />
  <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>

More information about the Libreoffice-commits mailing list