[Libreoffice-commits] .: 2 commits - desktop/source framework/source scp2/source

[Libreoffice Gerrit user]

 desktop/source/app/app.cxx                  |    2 +-
 framework/source/fwe/helper/titlehelper.cxx |    2 +-
 scp2/source/ooo/common_brand.scp            |    9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 9bdaff431bdd71717c64f002f3df0f110c146a08
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jan 6 16:58:39 2013 +0200

    Typo

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 19f088c..02f6001 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1459,7 +1459,7 @@ int Desktop::Main()
         //include buildid in non product builds
         ::rtl::OUString aDefault("development");
         aTitle += rtl::OUString(" [");
-        String aVerId( utl::Bootstrap::getProductBuildIdData(aDefault));
+        String aVerId( utl::Bootstrap::getBuildIdData(aDefault));
         aTitle += aVerId;
         aTitle += ']';
 #endif
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index baa8b8c..ff64742 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -579,7 +579,7 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle)
 void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle)
 {
     ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
-    ::rtl::OUString sVersion = ::utl::Bootstrap::getProductBuildIdData(sDefault);
+    ::rtl::OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault);
     sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ["));
     sTitle.append(sVersion);
     sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]"));
commit 1a23b4687aa4fdf0bf1df246cacaba6a3a028f39
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jan 6 16:57:47 2013 +0200

    No need to have a ProductSource in versionrc/version.ini any more

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7ba7e76..9582f76 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -972,15 +972,6 @@ ProfileItem gid_Brand_Profileitem_Version_Buildid
     Value = "<buildid>";
 End
 
-ProfileItem gid_Brand_Profileitem_Version_Productsource
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 7;
-    Key = "ProductSource";
-    Value = "<sourceid>";
-End
-
 #ifdef WNT
 
 ProfileItem gid_Brand_Profileitem_Version_Productcode