From a37a8733609a59eccabf89b2ff67d5ee6bf194bb Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Mon, 22 Sep 2014 05:37:06 +0400
Subject: 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@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
---
 icon-themes/tango/links.txt                                         | 3 ++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 +++
 sw/uiconfig/swriter/toolbar/previewobjectbar.xml                    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index c14bf4ebf33b..d3f954e35560 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 6154bf2d96b2..4d71def4a1af 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 e50a23c2ed3c..e140b401657b 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>
-- 
cgit 

kan@gmail.com</email>
</author>
<published>2012-10-21T19:03:06+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=8c6276a312a3dd88d7469be3187bf8d9d077f0d8'/>
<id>8c6276a312a3dd88d7469be3187bf8d9d077f0d8</id>
<content type='text'>
Change-Id: I313afb391562adae4f91c55480a036c228e0b540
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I313afb391562adae4f91c55480a036c228e0b540
</pre>
</div>
</content>
</entry>
<entry>
<title>translations is a source-only module</title>
<updated>2012-10-01T13:19:10+00:00</updated>
<author>
<name>Andras Timar</name>
<email>atimar@suse.com</email>
</author>
<published>2012-10-01T13:19:10+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866'/>
<id>39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866</id>
<content type='text'>
Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4
</pre>
</div>
</content>
</entry>
<entry>
<title>gbuildize shell</title>
<updated>2012-05-29T05:33:44+00:00</updated>
<author>
<name>David Tardon</name>
<email>dtardon@redhat.com</email>
</author>
<published>2012-04-28T18:48:14+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=d4efa8b0cf48f092d8984f3f085909cd1a6a39af'/>
<id>d4efa8b0cf48f092d8984f3f085909cd1a6a39af</id>
<content type='text'>
Change-Id: I91a89f9d0bd1eb88a94179f1c1a41bc832599fed
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I91a89f9d0bd1eb88a94179f1c1a41bc832599fed
</pre>
</div>
</content>
</entry>
<entry>
<title>TDE integration</title>
<updated>2012-05-15T01:09:41+00:00</updated>
<author>
<name>Norbert Thiebaud</name>
<email>nthiebaud@gmail.com</email>
</author>
<published>2012-05-15T01:09:41+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d'/>
<id>07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d</id>
<content type='text'>
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
</pre>
</div>
</content>
</entry>
<entry>
<title>make gbuild the default assumption of build.pl</title>
<updated>2012-04-29T01:50:46+00:00</updated>
<author>
<name>Bjoern Michaelsen</name>
<email>bjoern.michaelsen@canonical.com</email>
</author>
<published>2012-04-28T11:04:45+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a'/>
<id>b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a</id>
<content type='text'>
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
</pre>
</div>
</content>
</entry>