Skip to content

C
core
Kaydet (Commit) 71160a55 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann
Dosyalara gözat
Seçenekler

#121281# - correction of former solution (revision 1409212) - consider negative row span values

üst 3869d016
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sw/source/filter/ww8/WW8TableInfo.hxx
Dosyayı görüntüle @ 71160a55
...@@ -50,7 +50,7 @@ typedef ::std::vector<const SwTableBox *> TableBoxVector; ...@@ -50,7 +50,7 @@ typedef ::std::vector<const SwTableBox *> TableBoxVector;
typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr; typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
typedef ::std::vector<sal_uInt32> GridCols; typedef ::std::vector<sal_uInt32> GridCols;
typedef boost::shared_ptr<GridCols> GridColsPtr; 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 boost::shared_ptr<RowSpans> RowSpansPtr;
typedef ::std::vector<sal_uInt32> Widths; typedef ::std::vector<sal_uInt32> Widths;
typedef boost::shared_ptr<Widths> WidthsPtr; typedef boost::shared_ptr<Widths> WidthsPtr;
......
sw/source/filter/ww8/wrtww8.cxx
Dosyayı görüntüle @ 71160a55
...@@ -2038,14 +2038,14 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa ...@@ -2038,14 +2038,14 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa
} }
} }
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; sal_uInt16 nFlags = 0;
if (nRowSpan > 1) if (nRowSpan > 1)
nFlags |= (3 << 5); nFlags |= (3 << 5);
//else if (nRowSpan < 0) else if (nRowSpan < 0)
// nFlags |= (1 << 5); nFlags |= (1 << 5);
if (pBox != NULL) if (pBox != NULL)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment