[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - framework/source

[Tor Lillqvist]

 framework/source/fwe/helper/titlehelper.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2912b5cbf27bf7dfb87b4ec4fd13b43f6093f8a8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Feb 3 14:30:32 2014 +0100

    fdo#70376: Put only document (file) name in window title on OS X
    
    (cherry picked from commit eeb840d6ba930015b969c3d0a98031f0ae508d61)
    
    Change-Id: Ib45fdbdb734b439dea88d2269de86c82df31264f

diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 07bf13d..ea36cb4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -486,10 +486,13 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
     OUStringBuffer sTitle (256);
 
     impl_appendComponentTitle   (sTitle, xComponent);
+#ifndef MACOSX
+    // fdo#70376: We want the window title to contain just the
+    // document name (from the above "component title").
     impl_appendProductName      (sTitle);
     impl_appendModuleName       (sTitle);
     impl_appendDebugVersion     (sTitle);
-
+#endif
     // SYNCHRONIZED ->
     aLock.reset ();