[Libreoffice-commits] .: 3 commits - framework/source sfx2/source

[Caolán McNamara]

 framework/source/fwe/helper/titlehelper.cxx |   11 +++++------
 sfx2/source/appl/appbas.cxx                 |   16 ----------------
 sfx2/source/view/viewfrm2.cxx               |    4 ++--
 3 files changed, 7 insertions(+), 24 deletions(-)

New commits:
commit 23d3606ad021079082dbbd7670ea70b5fa73dee6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 28 13:16:58 2011 +0100

    Make titlebar string shorter in dbgutil mode

diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index d92730d..9e8ce62 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -609,12 +609,11 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle)
 #ifdef DBG_UTIL
 void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle)
 {
-        ::rtl::OUString sDefault ;
-        ::rtl::OUString sVersion = ::utl::Bootstrap::getBuildIdData( sDefault );
-
-        sTitle.appendAscii (" ["    );
-        sTitle.append      (sVersion);
-        sTitle.appendAscii ("]"     );
+    ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
+    ::rtl::OUString sVersion = ::utl::Bootstrap::getProductSource(sDefault);
+    sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ["));
+    sTitle.append(sVersion);
+    sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]"));
 }
 #else
 void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&)
commit 03d198c57dba070921dcccb194fa5a395991c0b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 28 13:12:26 2011 +0100

    remove unused lcl_GetVersionString

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 356135e..95046dd 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -100,22 +100,6 @@ using namespace ::com::sun::star::script;
 
 using ::basic::BasicManagerRepository;
 
-//------------------------------------------------------------------------
-String lcl_GetVersionString()
-{
-    ::rtl::OUString aDefault;
-    String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
-
-    if ( aVersion.Len() == 0 )
-    {
-        OSL_FAIL( "No BUILDID in bootstrap file found" );
-    }
-
-    aVersion.Erase( 0, aVersion.Search( ':' ) + 1 );
-    aVersion.Erase( aVersion.Search( ')' ) );
-    return aVersion;
-}
-
 //=========================================================================
 sal_uInt16 SfxApplication::SaveBasicManager() const
 {
commit 7ad13afd0dc5cee5ffc501be38db36e497651e35
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 28 13:05:59 2011 +0100

    Make titlebar string shorter in dbgutil mode.

diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 63c3d48..2dca4ec 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -245,9 +245,9 @@ String SfxViewFrame::UpdateTitle()
     ::rtl::OUString aDocServiceName( GetObjectShell()->GetFactory().GetDocumentServiceName() );
     aTitle += String( GetModuleName_Impl( aDocServiceName ) );
 #ifdef DBG_UTIL
-    ::rtl::OUString	aDefault;
+    ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
     aTitle += DEFINE_CONST_UNICODE(" [");
-    String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
+    String aVerId( utl::Bootstrap::getProductSource( aDefault ));
     aTitle += aVerId;
     aTitle += ']';
 #endif