[Libreoffice-commits] core.git: framework/source

[Caolán McNamara]

 framework/source/helper/titlebarupdate.cxx |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 9450d7e7089aab4b14a669bf947cc34ae0f6b892
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 23 10:41:21 2015 +0000

    Resolves: rhbz#1204244 group sdb windows together as 'base'
    
    Change-Id: Ie0d17e562b24a8108d79d13592fff3bf2b9a6713

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";