Author: orw
Date: Mon Dec 3 11:59:19 2012
New Revision: 1416474
URL: http://svn.apache.org/viewvc?rev=1416474&view=rev
Log:
#121281# - correction of former solution (revision 1409212) - consider negative
row span values
Modified:
openoffice/trunk/main/sw/source/filter/ww8/WW8TableInfo.hxx
openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
Modified: openoffice/trunk/main/sw/source/filter/ww8/WW8TableInfo.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/WW8TableInfo.hxx?rev=1416474&r1=1416473&r2=1416474&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/WW8TableInfo.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/WW8TableInfo.hxx Mon Dec 3
11:59:19 2012
@@ -50,7 +50,7 @@ typedef ::std::vector<const SwTableBox *
typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
typedef ::std::vector<sal_uInt32> GridCols;
typedef boost::shared_ptr<GridCols> GridColsPtr;
-typedef ::std::vector<sal_uInt32> RowSpans;
+typedef ::std::vector<sal_Int32> RowSpans;
typedef boost::shared_ptr<RowSpans> RowSpansPtr;
typedef ::std::vector<sal_uInt32> Widths;
typedef boost::shared_ptr<Widths> WidthsPtr;
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx?rev=1416474&r1=1416473&r2=1416474&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx Mon Dec 3 11:59:19
2012
@@ -2038,14 +2038,14 @@ void WW8AttributeOutput::TableInfoRow( w
}
}
-static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, const
sal_uInt32 nRowSpan)
+static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, const
sal_Int32 nRowSpan)
{
sal_uInt16 nFlags = 0;
if (nRowSpan > 1)
nFlags |= (3 << 5);
- //else if (nRowSpan < 0)
- // nFlags |= (1 << 5);
+ else if (nRowSpan < 0)
+ nFlags |= (1 << 5);
if (pBox != NULL)
{
