jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 4 +++- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 1 + odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx | 3 ++- odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 0274246d088469752c9a91120c0b90c2f08c9282 Author: Stephan Bergmann <[email protected]> Date: Tue Feb 18 16:39:20 2014 +0100 Support OpenJDK "-internal" version suffix ...as e.g. produced by java-1.8.0-openjdk.fc20 (Sorting Rel_INTERNAL < Rel_EA is somewhat arbitrary.) Change-Id: I25449ec4da63243fc1044aae366f8fa6c5ef1eb5 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 9e31143..90feb46 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -206,7 +206,9 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char *szRelease) { if (szRelease == NULL) return Rel_NONE; - if( ! strcmp(szRelease,"ea")) + if( ! strcmp(szRelease,"internal")) + return Rel_INTERNAL; + else if( ! strcmp(szRelease,"ea")) return Rel_EA; else if( ! strcmp(szRelease,"ea1")) return Rel_EA1; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx index b60959c..f2bb726 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx @@ -56,6 +56,7 @@ protected: enum PreRelease { Rel_NONE, + Rel_INTERNAL, Rel_EA, Rel_EA1, Rel_EA2, commit a3ba2c4784d388bcaf20ef6f5b8b357024969a59 Author: Stephan Bergmann <[email protected]> Date: Tue Feb 18 16:36:45 2014 +0100 deprecated OUString::valueOf -> OUString::number Change-Id: I363289075b457bafcf821af5d08c234977f8d765 diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx index 4df406e..727abb9 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx @@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { - return ::rtl::OUString("Column") + ::rtl::OUString::valueOf(column); + return ::rtl::OUString("Column") + ::rtl::OUString::number(column); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) commit 15cd82cb0978821141e8f0e8ee50741c3165d377 Author: Stephan Bergmann <[email protected]> Date: Tue Feb 18 16:36:22 2014 +0100 typo Change-Id: I6f324dc684f868736ac9351911f8c7eda9b830f1 diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx index 52d02ef..c979408 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx @@ -233,7 +233,8 @@ namespace connectivity sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ { \ return cppu::supportsService(this, _rServiceName); \ - } \ + } + } } #endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
