From 7384d06c3b8d34b31848bcbe5a353903281680d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 18 Dec 2010 18:34:43 +0000 Subject: [PATCH] Resoves: rhbz#663857 font color missing in transitions --- ...857-font-color-missing-C-FAQ-10.3-do.patch | 26 +++++++++++++++++++ libreoffice.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch diff --git a/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch b/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch new file mode 100644 index 0000000..25e1824 --- /dev/null +++ b/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch @@ -0,0 +1,26 @@ +From 963c6b655032b4e5d0f26555f3c26a129a9efb03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 18 Dec 2010 18:26:18 +0000 +Subject: [PATCH] Resoves: rhbz#663857 font color missing; C++ FAQ 10.3 doomage + +--- + slideshow/source/engine/color.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx +index 0f8a8f7..341a54a 100644 +--- a/slideshow/source/engine/color.cxx ++++ b/slideshow/source/engine/color.cxx +@@ -229,8 +229,8 @@ namespace slideshow + } + + RGBColor::RGBColor(const RGBColor& rLHS) ++ : maRGBTriple( rLHS.maRGBTriple ) + { +- RGBColor(rLHS.getRed(), rLHS.getGreen(), rLHS.getBlue()); + } + + RGBColor& RGBColor::operator=( const RGBColor& rLHS ){ +-- +1.7.3.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 229bfed..353d078 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Version: 3.3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -94,6 +94,7 @@ Patch11: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch Patch12: turn-script-providers-into-extensions.patch Patch13: libreoffice-installfix.patch Patch14: 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch +Patch15: 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -703,6 +704,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch12 -p1 -b .turn-script-providers-into-extensions.patch %patch13 -p1 -b .libreoffice-installfix.patch %patch14 -p1 -b .don-t-bail-out-on-mislength-records.patch +%patch15 -p1 -b .font-color-missing-C-FAQ-10.3-do.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/javascript/delzip @@ -2009,6 +2011,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/share/registry/pyuno.xcd %changelog +* Sat Dec 18 2010 Caolán McNamara 3.3.0.1-3 +- Resoves: rhbz#663857 font color missing in transitions + * Wed Dec 15 2010 Caolán McNamara 3.3.0.1-2 - Fix up some doc imports