[libreoffice] Resolves: rhbz#976304 gallery elements may not insert

[Caolán McNamara]

commit 29c4b2d903d249a9b08d0fdd046119d479b4ea0c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 23 20:50:26 2013 +0100

    Resolves: rhbz#976304 gallery elements may not insert

 ...bz-976304-gallery-elements-may-not-suppor.patch |   48 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch b/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch
new file mode 100644
index 0000000..9ed026a
--- /dev/null
+++ b/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch
@@ -0,0 +1,48 @@
+From 517fc70fb19dd2afb72890aaf7ccee5d422b7aa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sun, 23 Jun 2013 20:46:07 +0100
+Subject: [PATCH] Resolves: rhbz#976304 gallery elements may not support
+ document.Settings
+
+so the createInstance throws, so the element doesn't get inserted into
+the documents.
+
+regression since f0cd6fe9075cd0aa00162474784ad804a07ed138
+
+Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
+---
+ xmloff/source/draw/sdxmlexp.cxx | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
+index 6e86da3..c9149b9 100644
+--- a/xmloff/source/draw/sdxmlexp.cxx
++++ b/xmloff/source/draw/sdxmlexp.cxx
+@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
+         Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
+         if( xFac.is() )
+         {
+-            Reference<beans::XPropertySet> const xProps( xFac->createInstance(
+-                         "com.sun.star.document.Settings"), UNO_QUERY );
+-            if (xProps.is())
++            try
+             {
+-                try // clipboard document doesn't have shell so throws here
+-                {
+-                    xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
+-                }
+-                catch (uno::Exception const&) { }
++                Reference<beans::XPropertySet> const xProps( xFac->createInstance(
++                             "com.sun.star.document.Settings"), UNO_QUERY_THROW );
++                xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
++            }
++            catch (...)
++            {
++                // clipboard document doesn't have shell so throws from getPropertyValue
++                // gallery elements may not support com.sun.star.document.Settings so throws from createInstance
+             }
+         }
+     }
+-- 
+1.8.2.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8548867..c9ce6c8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -249,6 +249,7 @@ Patch18: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
 Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
 Patch20: 0001-buildfix.patch
 Patch21: 0001-fix-rtf-import-on-big-endian.patch
+Patch22: 0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -988,6 +989,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch19 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
 %patch20 -p1 -b .buildfix.patch
 %patch21 -p1 -b .fix-rtf-import-on-big-endian.patch
+%patch22 -p1 -b .rhbz-976304-gallery-elements-may-not-suppor.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2058,6 +2060,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Sun Jun 23 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.0.1-3
+- Resolves: rhbz#976304 gallery elements may not insert
+
 * Wed Jun 19 2013 Dennis Gilmore <dennis at ausil.us> - 1:4.1.0.1-2
 - fix _smp_mflags macro useage