android/experimental/DocumentLoader/Makefile | 1 -
android/experimental/LibreOffice4Android/Makefile | 1 -
android/qa/desktop/Makefile | 1 -
desktop/source/app/app.cxx | 4 ++--
framework/source/fwe/helper/titlehelper.cxx | 2 +-
qadevOOo/runner/graphical/BuildID.java | 11 -----------
sal/osl/unx/osxlocale.cxx | 3 ---
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 8 ++++----
unotools/inc/unotools/bootstrap.hxx | 3 ---
unotools/source/config/bootstrap.cxx | 14 +-------------
10 files changed, 8 insertions(+), 40 deletions(-)
New commits:
commit 4427bb0c588382d56d5368e691a29c4c0bbdf944
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Jan 6 15:12:12 2013 +0200
The "ProductSource" (MWS name) makes no sense any more
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 880a032..6cd8a29 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -126,7 +126,6 @@ copy-stuff:
echo 'ProductBuildid=3' >> assets/program/versionrc
echo 'ProductMajor=360' >> assets/program/versionrc
echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ProductSource=OOO350' >> assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
#
# .res files
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 20627fd..eded9e6 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -103,7 +103,6 @@ copy-stuff:
echo 'ProductBuildid=3' >> assets/program/versionrc
echo 'ProductMajor=360' >> assets/program/versionrc
echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ProductSource=OOO350' >> assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
#
# .res files
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index bb96eef..bec3908 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -70,7 +70,6 @@ buildrcs:
echo "ProductBuildid=3" >> assets/program/versionrc
echo "ProductMajor=360" >> assets/program/versionrc
echo "ProductMinor=1" >> assets/program/versionrc
- echo "ProductSource=OOO350" >> assets/program/versionrc
echo "ReferenceOOoMajorMinor=3.6" >> assets/program/versionrc
echo "UpdateID=LibreOffice_3_en-US" >> assets/program/versionrc
echo "UpdateURL=" >> assets/program/versionrc
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index adcf4b7..19f088c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1456,10 +1456,10 @@ int Desktop::Main()
delete pLabelResMgr;
#ifdef DBG_UTIL
- //include version ID in non product builds
+ //include buildid in non product builds
::rtl::OUString aDefault("development");
aTitle += rtl::OUString(" [");
- String aVerId( utl::Bootstrap::getProductSource(aDefault));
+ String aVerId( utl::Bootstrap::getProductBuildIdData(aDefault));
aTitle += aVerId;
aTitle += ']';
#endif
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index b54c304..baa8b8c 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::getProductSource(sDefault);
+ ::rtl::OUString sVersion =
::utl::Bootstrap::getProductBuildIdData(sDefault);
sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ["));
sTitle.append(sVersion);
sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]"));
diff --git a/qadevOOo/runner/graphical/BuildID.java
b/qadevOOo/runner/graphical/BuildID.java
index f6bc0a6..ce21a0c 100644
--- a/qadevOOo/runner/graphical/BuildID.java
+++ b/qadevOOo/runner/graphical/BuildID.java
@@ -163,13 +163,6 @@ public class BuildID
// System.exit(1);
// }
- public static String getMaster(String _sOfficePath)
- {
- final String sOfficePath = getOfficePath(_sOfficePath);
- final String sMaster = getBuildID(sOfficePath,
"ProductSource");
- return sMaster;
- }
-
public static String getMinor(String _sOfficePath)
{
final String sOfficePath = getOfficePath(_sOfficePath);
@@ -199,10 +192,6 @@ public class BuildID
// sBuildID = getBuildID(sApp);
// System.out.println("BuildID is: " + sBuildID);
//
-// String sMaster;
-// sMaster = getMaster(sApp);
-// System.out.println("Master is: " + sMaster);
-//
// String sMinor;
// sMinor = getMinor(sApp);
// System.out.println("Minor is: " + sMinor);
diff --git a/unotools/inc/unotools/bootstrap.hxx
b/unotools/inc/unotools/bootstrap.hxx
index 4555390..23418de 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -46,9 +46,6 @@ namespace utl
/// retrieve the product key; uses the given default, if not found
static rtl::OUString getProductKey(rtl::OUString const& _sDefault);
- /// retrieve the product source (MWS name)
- static rtl::OUString getProductSource(rtl::OUString const& _sDefault);
-
/// retrieve the BUILDID information item; uses the given default, if
not found
static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault);
diff --git a/unotools/source/config/bootstrap.cxx
b/unotools/source/config/bootstrap.cxx
index f8e40a1..4c7b0e1 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -42,7 +42,6 @@
#define BOOTSTRAP_DATA_NAME SAL_CONFIGFILE("bootstrap")
#define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey"
-#define BOOTSTRAP_ITEM_PRODUCT_SOURCE "ProductSource"
#define BOOTSTRAP_ITEM_VERSIONFILE "Location"
#define BOOTSTRAP_ITEM_BUILDID "buildid"
#define BOOTSTRAP_ITEM_BUILDVERSION "BuildVersion"
@@ -586,23 +585,12 @@ OUString Bootstrap::getProductKey(OUString const&
_sDefault)
}
//
---------------------------------------------------------------------------------------
-OUString Bootstrap::getProductSource(OUString const& _sDefault)
-{
- OUString const
csProductSourceItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_SOURCE));
-
- OUString sProductSource;
- // read ProductSource from version.ini (versionrc)
- data().getVersionValue( csProductSourceItem, sProductSource, _sDefault );
- return sProductSource;
-}
-//
---------------------------------------------------------------------------------------
-
OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
{
OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION);
OUString sBuildVersion;
- // read ProductSource from version.ini (versionrc)
+ // read BuildVersion from version.ini (versionrc)
data().getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault );
return sBuildVersion;
}
commit f79da8fa288fbbe4742ad416844aad53ee8d00f5
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Jan 6 13:30:49 2013 +0200
Bin obsolete comment
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index 80ed86d..87b34c1 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -56,9 +56,6 @@ namespace /* private */
CFStringRef sref = (CFGetTypeID(pref) == CFArrayGetTypeID()) ?
(CFStringRef)CFArrayGetValueAtIndex((CFArrayRef)pref, 0) : (CFStringRef)pref;
- // NOTE: this API is only available with Mac OS X >=10.3. We need to
use it because
- // Apple used non-ISO values on systems <10.2 like "German" for
instance but didn't
- // upgrade those values during upgrade to newer Mac OS X versions. See
also #i54337#
return
CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);
}
} // namespace private
commit 73090aae235d69e394c56be3f90c8433247c0f48
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Jan 6 13:09:43 2013 +0200
WaE: format specifies type 'int' but the argument has type 'sal_Int32' (aka
'long')
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 7567117..f380a79 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -207,8 +207,8 @@ namespace rtl_DoubleLocking
nValueOK2 = p2Thread->getOK();
#if OSL_DEBUG_LEVEL > 2
- printf("Value in Thread #1 is %d\n", nValueOK);
- printf("Value in Thread #2 is %d\n", nValueOK2);
+ printf("Value in Thread #1 is %" SAL_PRIdINT32 "\n", nValueOK);
+ printf("Value in Thread #2 is %" SAL_PRIdINT32 "\n",
nValueOK2);
#else
(void)nValueOK2;
#endif
@@ -220,8 +220,8 @@ namespace rtl_DoubleLocking
nValueFails2 = p2Thread->getFails();
#if OSL_DEBUG_LEVEL > 2
- printf("Fails in Thread #1 is %d\n", nValueFails);
- printf("Fails in Thread #2 is %d\n", nValueFails2);
+ printf("Fails in Thread #1 is %" SAL_PRIdINT32 "\n",
nValueFails);
+ printf("Fails in Thread #2 is %" SAL_PRIdINT32 "\n",
nValueFails2);
#endif
delete pThread;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
