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?= +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 51da686..30fdb4c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -326,6 +326,7 @@ Patch21: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch Patch22: 0001-build-libetonyek-with-no-strict-aliasing.patch Patch23: 0002-propagate-user-set-CFLAGS-to-build.patch Patch24: 0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch +Patch25: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice