connectivity/source/inc/odbc/OBoundParam.hxx | 2 +- odk/settings/std.mk | 4 ++-- offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 +++++++++------- solenv/gbuild/Executable.mk | 4 ++++ solenv/gbuild/Helper.mk | 1 + writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 +++++-- 6 files changed, 22 insertions(+), 12 deletions(-)
New commits: commit 0a28ddf2084f86743e229667ae2c9b7e4f95e49e Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Tue Feb 14 06:19:08 2012 +0100 correct documentation of com::sun::star::sdbc::XDatabaseMetaData (cherry picked from commit 7535373fa693ddff5311054800efcc602cdcacd9) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl index 20dc8b3..ce07b4e 100644 --- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl +++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl @@ -44,31 +44,33 @@ the form of <type scope="com::sun::star::sdbc">XResultSet</type> objects. - You can use the normal <type scope="com::sun::star::sdbc">XResultSet</type> + You can use the normal <type scope="com::sun::star::sdbc">XRow</type> + (or <type scope="com::sun::star::sdb">XColumn</type>) methods such as - <member scope="com::sun::star::sdbc">XResultSet::getString()</member> + <member scope="com::sun::star::sdbc">XRow::getString()</member> and - <member scope="com::sun::star::sdbc">XResultSet::getInt()</member> + <member scope="com::sun::star::sdbc">XRow::getInt()</member> to retrieve the data from these XResultSets. If a given form of metadata is not available, these methods should throw a <type scope="com::sun::star::sdbc">SQLException</type> . - That a value of <type scope="com::sun::star::sdbc">XResultSet</type> is <NULL/> - can be checked with the method <member scope="com::sun::star::sdbc">XResultSet::wasNull()</member>. + After calling one of the getXXX() methods, + one can check whether that value is <NULL/> + with the method <member scope="com::sun::star::sdbc">XRow::wasNull()</member>. In the text only "(may be <NULL/>)" is mentioned for this case. </p> <p>Some of these methods take arguments that are String patterns. These arguments all have names such as fooPattern. Within a pattern String, "%" means match any substring of 0 or more characters, and "_" means match any one character. Only metadata entries matching the search pattern - are returned. If a search pattern argument is set to <VOID/>, + is returned. If a search pattern argument is set to <VOID/>, that argument's criteria will be dropped from the search. </p> <p> A <type scope="com::sun::star::sdbc">SQLException</type> will be thrown if a driver does not support - a meta data method. In the case of methods that return an XResultSet, + a metadata method. In the case of methods that return an XResultSet, either an XResultSet (which may be empty) is returned or a SQLException is thrown.</p> */ commit b88db173e610da5058099d5524e8fa7db2fc733d Author: Miklos Vajna <vmik...@suse.cz> Date: Mon Feb 13 12:52:21 2012 +0100 n#695479 fix RTF import of text frames with exact height (cherry picked from commit e0328096dc21ce12d15db2045074e7860872570f) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f0aa513..df60ff7 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3375,6 +3375,7 @@ RTFSprms RTFFrame::getSprms() { NS_ooxml::LN_CT_FramePr_x, NS_ooxml::LN_CT_FramePr_y, + NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before nH NS_sprm::LN_PWHeightAbs, NS_sprm::LN_PDxaWidth, NS_sprm::LN_PDxaFromText, @@ -3385,8 +3386,7 @@ RTFSprms RTFFrame::getSprms() NS_ooxml::LN_CT_FramePr_yAlign, NS_sprm::LN_PWr, NS_ooxml::LN_CT_FramePr_dropCap, - NS_ooxml::LN_CT_FramePr_lines, - NS_ooxml::LN_CT_FramePr_hRule + NS_ooxml::LN_CT_FramePr_lines }; for ( int i = 0, len = sizeof( pNames ) / sizeof( Id ); i < len; ++i ) @@ -3438,7 +3438,10 @@ RTFSprms RTFFrame::getSprms() { sal_Int32 nHRule = NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto; if ( nH < 0 ) + { nHRule = NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact; + nH = -nH; // The negative value just sets nHRule + } else if ( nH > 0 ) nHRule = NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast; pValue.reset(new RTFValue(nHRule)); commit f3f925c8a4784cf578d2ab2d1b3f593f582bcdbc Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Tue Feb 14 14:54:03 2012 +0100 odbc 64 bit crash: correct buffer length allocation for a SQLLEN (cherry picked from commit 84d21e4de26bd69f7ca5b10f2c72779f07e11347) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 2310a2e..99a4901 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -68,7 +68,7 @@ namespace connectivity // to a Java sal_Int32. The jdbcodbc 'C' bridge provides an // interface to do this. - paramLength = new sal_Int8[4]; + paramLength = new sal_Int8[sizeof(SQLLEN)]; } //-------------------------------------------------------------------- commit 249fdaa87062fc8a6a7d5a068a7d1401b6c37b5c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 14 10:32:59 2012 +0100 Resolves rhbz#789622: Adapt SDK to changed paths in LO installation (cherry picked from commit bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 0726631..705b528 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) -OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)" -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)" +OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb) OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" commit f52982734a8507ecfffa6a3a8b983cc617018cb5 Author: Michael Stahl <mst...@redhat.com> Date: Tue Jan 10 17:50:47 2012 +0100 gbuild: Executable.mk: don't build unregistered exes (cherry picked from commit 5a0ab1a45858f4f7336f6dbdc218502cc31f0168) Signed-off-by: Rene Engelhard <r...@debian.org> diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 7858967..2c5d9ea 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -43,6 +43,10 @@ $(call gb_Executable_get_target,%) : $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target)))) define gb_Executable_Executable +ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN))) +$$(eval $$(call gb_Output_info,Currently known executables: $(sort $(gb_Executable_KNOWN)),ALL)) +$$(eval $$(call gb_Output_error,Executable $(1) must be registered in Repository.mk)) +endif $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT)) endef diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index e27d2ee..84e6cd9 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -116,6 +116,7 @@ endef define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) +gb_Executable_KNOWN := $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group))) endef _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits