[Libreoffice-commits] .: 3 commits - jvmfwk/plugins jvmfwk/source

[Takeshi Abe]

 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |    2 +-
 jvmfwk/source/elements.cxx                       |    3 +--
 jvmfwk/source/fwkbase.cxx                        |    8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit b904d47d5c75406a6c9a57d1d5fe6cc16ef50dd7
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Mar 24 23:38:25 2011 +0900

    Fixed typo

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index 997793f..5167f83 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -93,7 +93,7 @@ class VendorBase: public salhelper::SimpleReferenceObject
 {
 public:
     VendorBase();
-    /* returns relativ paths to the java executable as
+    /* returns relative paths to the java executable as
        file URLs.
 
        For example "bin/java.exe". You need
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 78d741e..9a55813 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -327,7 +327,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
         xmlNodeListGetString(
             m_xmlDocVendorSettings,pathObjVendor->nodesetval->nodeTab[0], 1);
 
-    //make an absolute file url from the relativ plugin URL
+    //make an absolute file url from the relative plugin URL
     OUString sUrl = findPlugin(m_xmlDocVendorSettingsFileUrl, xmlCharPlugin);
     if (sUrl.getLength() == 0)
     {
commit 1fd4485a98318da0f98f03beb8a1befd6a855692
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Mar 24 23:35:20 2011 +0900

    Fixed the source file name

diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 4d7de4b..78d741e 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -82,7 +82,7 @@ rtl::OString getVendorSettingsPath(rtl::OUString const & sURL)
         throw FrameworkException(
             JFW_E_ERROR,
             rtl::OString("[Java framework] Error in function "
-                         "getVendorSettingsPath (fwkutil.cxx) "));
+                         "getVendorSettingsPath (fwkbase.cxx) "));
     rtl::OString osSystemPathSettings =
         rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
     return osSystemPathSettings;
@@ -286,7 +286,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors()
     if (xmlXPathNodeSetIsEmpty(result->nodesetval))
         throw FrameworkException(
             JFW_E_ERROR,
-            rtl::OString("[Java framework] Error in function getSupportedVendors (fwkutil.cxx)."));
+            rtl::OString("[Java framework] Error in function getSupportedVendors (fwkbase.cxx)."));
     
     //get the values of the library elements + vendor attribute
     xmlNode* cur = result->nodesetval->nodeTab[0];
@@ -307,7 +307,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 {
     OSL_ASSERT(sVendor.getLength() > 0);
 
-    OString sExcMsg("[Java framework] Error in function getPluginLibrary (fwkutil.cxx).");
+    OString sExcMsg("[Java framework] Error in function getPluginLibrary (fwkbase.cxx).");
     OString sVendorsPath = getVendorSettingsPath(m_xmlDocVendorSettingsFileUrl);
     OUStringBuffer usBuffer(256);
     usBuffer.appendAscii("/jf:javaSelection/jf:plugins/jf:library[@vendor=\"");
commit 4866ced3a3628fbfb973ab04812f1992f9f48d96
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Mar 24 23:19:02 2011 +0900

    Removed an unchanged variable

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 131f689..5ba370f 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -1136,11 +1136,10 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
 
 sal_uInt32 NodeJava::getModifiedTime() const
 {
-    sal_uInt32 ret = 0;
     if (m_layer != INSTALL)
     {
         OSL_ASSERT(0);
-        return ret;
+        return 0;
     }
     rtl::OString modTimeSeconds = getElementModified();
     return (sal_uInt32) modTimeSeconds.toInt64();