codemaker/README | 7 +++++-- idlc/README | 10 +++++----- javaunohelper/cppumaker/Makefile | 2 +- sw/inc/swtable.hxx | 2 ++ sw/source/core/table/swtable.cxx | 7 +++++++ sw/source/filter/ww8/WW8TableInfo.cxx | 3 +-- 6 files changed, 21 insertions(+), 10 deletions(-)
New commits: commit 5c3dd5af41bc801ee6023513399c01c632dc7779 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Mar 21 17:15:06 2012 +0100 fdo#45522: WW8TableInfo::processSwTable: check that table has layout diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index e97de42..6473986 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -326,6 +326,8 @@ public: #ifdef DBG_UTIL void CheckConsistency() const; #endif + + bool HasLayout() const; }; class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt. diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 3c0b4c1..c5f0d09 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2800,6 +2800,13 @@ void SwTable::RegisterToFormat( SwFmt& rFmt ) rFmt.Add( this ); } +bool SwTable::HasLayout() const +{ + const SwFrmFmt* pFrmFmt = GetFrmFmt(); + //a table in a clipboard document doesn't have any layout information + return pFrmFmt && SwIterator<SwTabFrm,SwFmt>::FirstElement(*pFrmFmt); +} + void SwTableLine::RegisterToFormat( SwFmt& rFmt ) { rFmt.Add( this ); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 72993ba..7df6abc 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) WW8TableNodeInfo * pPrev = NULL; - SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); - if (pFrmFmt != NULL && pTable->IsTblComplex()) + if (pTable->IsTblComplex() && pTable->HasLayout()) { pPrev = processSwTableByLayout(pTable); commit dfa1983b5dcce0d74db76ea08b5d6334a82320b4 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 21 15:11:53 2012 +0100 javaunohelper: missing dependecy on udkapi.rdb diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile index f0f3642..8ed1298 100644 --- a/javaunohelper/cppumaker/Makefile +++ b/javaunohelper/cppumaker/Makefile @@ -28,7 +28,7 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk -done : $(gb_UnoApiTarget_CPPUMAKERTARGET) +done : $(gb_UnoApiTarget_CPPUMAKERTARGET) $(OUTDIR)/bin/udkapi.rdb $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker -C -BUCR -O. \ -Tcom.sun.star.beans.NamedValue \ commit 31fcce969deb8002307a1cd029867008a1c11ff0 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 21 14:26:18 2012 +0100 idlc/README: correct nonsense added in 534b3a9b2e diff --git a/codemaker/README b/codemaker/README index 96a08ac..3410b4b 100644 --- a/codemaker/README +++ b/codemaker/README @@ -1,2 +1,5 @@ -UNO interface declaration/stub generators for C++ (headers), Java (class files), ... the one for .Net is in cli_ure. - +UNO interface declaration/stub generators for: +- C++: cppumaker generates headers (.hpp and .hdl files) that provide + the UNO API C++ binding +- Java: javamaker generates class files that provide the JVM UNO API binding +- the one for .Net is in module cli_ure diff --git a/idlc/README b/idlc/README index 1b4c1f7..16eda1b 100644 --- a/idlc/README +++ b/idlc/README @@ -1,6 +1,6 @@ -Contains the C++ IDL compiler: idlcpp +Contains the UNO IDL compiler, idlc, and preprocessor, idlcpp + +This compiler generates binary RDB fragments that can be assembled +into a RDB (UNO type library) with the "regmerge" tool, as is done +primarily in the offapi and udkapi directories. -This compiler generates C++ headers - .hpp and .hdl files that provide -the UNO C++ binding. That compilation is done primarily in the offapi -and udkapi directories. -2
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits