[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - framework/source

[Tor Lillqvist]

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

New commits:
commit 53bd91ad654495130ceba74dd72d4a6f95c94fc5
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: I0b975a1a0e73c546beec96599fd4e5f87caa51db
    Reviewed-on: https://gerrit.libreoffice.org/7838
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index b7f56a1..b2c5717 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 ();