[libreoffice/f21] Resolves: rhbz#1204244 group sdb windows together as 'base'

[Caolán McNamara]

commit bd7baa95d8d0e9a050a1e894308319302e1dd41b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 23 10:48:14 2015 +0000

    Resolves: rhbz#1204244 group sdb windows together as 'base'

 ...bz-1204244-group-sdb-windows-together-as-.patch | 49 ++++++++++++++++++++++
 libreoffice.spec                                   |  6 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch b/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch
new file mode 100644
index 0000000..ea2244a
--- /dev/null
+++ b/0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch
@@ -0,0 +1,49 @@
+From 71c00b3e96fb639e0ff0815608827936219adac5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 23 Mar 2015 10:41:21 +0000
+Subject: [PATCH] Resolves: rhbz#1204244 group sdb windows together as 'base'
+
+Change-Id: Ie0d17e562b24a8108d79d13592fff3bf2b9a6713
+---
+ framework/source/helper/titlebarupdate.cxx | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
+index 7626309..b79b5b2 100644
+--- a/framework/source/helper/titlebarupdate.cxx
++++ b/framework/source/helper/titlebarupdate.cxx
+@@ -139,25 +139,17 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
+ 
+         OUString sDesktopName;
+         OUString aModuleId = xModuleManager->identify(xFrame);
+-        if ( aModuleId == "com.sun.star.text.TextDocument" ||
+-             aModuleId == "com.sun.star.text.GlobalDocument" ||
+-             aModuleId == "com.sun.star.text.WebDocument" ||
+-             aModuleId == "com.sun.star.xforms.XMLFormDocument" )
++        if ( aModuleId.startsWith("com.sun.star.text.") || aModuleId.startsWith("com.sun.star.xforms.") )
+             sDesktopName = "Writer";
+-        else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
++        else if ( aModuleId.startsWith("com.sun.star.sheet.") )
+             sDesktopName = "Calc";
+-        else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
++        else if ( aModuleId.startsWith("com.sun.star.presentation.") )
+             sDesktopName = "Impress";
+-        else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
++        else if ( aModuleId.startsWith("com.sun.star.drawing." ) )
+             sDesktopName = "Draw";
+-        else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
++        else if ( aModuleId.startsWith("com.sun.star.formula." ) )
+             sDesktopName = "Math";
+-        else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" ||
+-                  aModuleId == "com.sun.star.sdb.OfficeDatabaseDocument" ||
+-                  aModuleId == "com.sun.star.sdb.RelationDesign" ||
+-                  aModuleId == "com.sun.star.sdb.QueryDesign" ||
+-                  aModuleId == "com.sun.star.sdb.TableDesign" ||
+-                  aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
++        else if ( aModuleId.startsWith("com.sun.star.sdb.") )
+             sDesktopName = "Base";
+         else
+             sDesktopName = "Startcenter";
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index aef670f..426206d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?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 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -373,6 +373,7 @@ Patch75: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch
 Patch76: 0001-build-libetonyek-with-no-strict-aliasing.patch
 Patch77: 0002-propagate-user-set-CFLAGS-to-build.patch
 Patch78: 0001-fdo-69036-do-not-try-to-create-a-sfxApplication-when.patch
+Patch79: 0001-fdo-69036-do-not-try-to-create-a-sfxApplication-when.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2353,6 +2354,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Mon Mar 23 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-5
+- Resolves: rhbz#1204244 group sdb windows together as 'base'
+
 * Thu Mar 19 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-4
 - Resolves: rhbz#1202138 fix crash on exit