[Libreoffice-commits] core.git: 3 commits - icon-themes/tango officecfg/registry sw/qa sw/uiconfig

[Tomaž Vajngerl]

 icon-themes/tango/links.txt                                              |    3 ++-
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |    2 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu      |    3 +++
 sw/qa/extras/htmlexport/htmlexport.cxx                                   |   10 ++++++++--
 sw/uiconfig/swriter/toolbar/previewobjectbar.xml                         |    2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit ea89ff15ed52c70aa2606e76106ba4580a5c1d5b
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Sep 24 11:24:03 2014 +0200

    Disable HTML any check which uses twip->pixel conversion on OSX
    
    Change-Id: Ifae32518aa503bfa8c912c18220bbbf28b76be09

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index d04e34c..1c479a0 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -184,13 +184,19 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt")
     assertXPath(pDoc, "/html/body/p/a/font/img", "name", "Text");
     assertXPath(pDoc, "/html/body/p/a/font/img", "alt", "Four colors");
     assertXPath(pDoc, "/html/body/p/a/font/img", "align", "middle");
-#ifndef MACOSX // For some reason the hspace is "28" on OSX - disable this check for now
+
+    // Probably the DPI in OSX is different and Twip -> Pixel conversion produces
+    // different results - so disable OSX for now.
+    //
+    // It would make sense to switch to use CSS and use "real world" units instead
+    // i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm")
+#ifndef MACOSX
     assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38");
     assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19");
     assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222");
     assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222");
-#endif
     assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3");
+#endif
     assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1");
 }
 
commit a37a8733609a59eccabf89b2ff67d5ee6bf194bb
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Sep 22 05:37:06 2014 +0400

    fdo#80654 - Add icon to 'Close Preview' button in Page Preview toolbar
    
    Change-Id: I287f8549b6bfb8435c6ad1daabbb8ac2c1a51c2b
    Reviewed-on: https://gerrit.libreoffice.org/11576
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>

diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index c14bf4e..d3f954e 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -149,7 +149,8 @@ cmd/lc_commentchangetracking.png cmd/lc_editdoc.png
 cmd/sc_commentchangetracking.png cmd/sc_editdoc.png
 cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png
 cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png
-
+cmd/lc_closepreview.png cmd/lc_closedoc.png
+cmd/sc_closepreview.png cmd/sc_closedoc.png
 
 # Duplicates
 cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 6154bf2..4d71def 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -983,6 +983,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Close Preview</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:AlignRight" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
index e50a23c..e140b40 100644
--- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
@@ -38,5 +38,5 @@
  <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/>
  <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:helpid="21253"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text" toolbar:helpid="5325"/>
 </toolbar:toolbar>
commit c5cacc506d8243b8278aa036cd4e6b2ccee65142
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Sep 23 07:19:34 2014 +0400

    fdo#55903 - fixed zoom mode button tooltip for better understanding
    
    Change-Id: I42c5ad557c00d2db80e691332756a544651ab7de
    Reviewed-on: https://gerrit.libreoffice.org/11596
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 4e2f83f..6e32a5e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1491,7 +1491,7 @@
       </node>
       <node oor:name=".uno:ZoomMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Zoom Tool</value>
+          <value xml:lang="en-US">Zoom & Pan (CTRL to Zoom Out, SHIFT to Pan)</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>