Skip to content

C
core
Kaydet (Commit) 224b2359 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

fdo#78535: Don't process borders of 0 width. 

Or they would get drawn for real.

Change-Id: Iec24e70a80ff8aa1ef7512e71249a99243297c4e
üst 5e2918bc
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 42 deletions
sc/source/ui/view/output.cxx
Dosyayı görüntüle @ 224b2359
...@@ -1681,50 +1681,62 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) ...@@ -1681,50 +1681,62 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const svx::frame::Style noStyle; const svx::frame::Style noStyle;
// Horizontal lines // Horizontal lines
long nUpperRotate = lcl_getRotate( mpDoc, nTab, nX, nY - 1 ); if (aTopLine.Prim() || aTopLine.Secn())
pProcessor->process( svx::frame::CreateBorderPrimitives( {
aPoints[bLayoutRTL?1:0], aPoints[bLayoutRTL?0:1], aTopLine, long nUpperRotate = lcl_getRotate( mpDoc, nTab, nX, nY - 1 );
svx::frame::Style(), pProcessor->process( svx::frame::CreateBorderPrimitives(
svx::frame::Style(), aPoints[bLayoutRTL?1:0], aPoints[bLayoutRTL?0:1], aTopLine,
aLeftLine, svx::frame::Style(),
svx::frame::Style(), svx::frame::Style(),
svx::frame::Style(), aLeftLine,
aRightLine, svx::frame::Style(),
pForceColor, nUpperRotate, nAttrRotate ) ); svx::frame::Style(),
aRightLine,
long nLowerRotate = lcl_getRotate( mpDoc, nTab, nX, nY + 1 ); pForceColor, nUpperRotate, nAttrRotate ) );
pProcessor->process( svx::frame::CreateBorderPrimitives( }
aPoints[bLayoutRTL?2:3], aPoints[bLayoutRTL?3:2], aBottomLine,
aLeftLine, if (aBottomLine.Prim() || aBottomLine.Secn())
svx::frame::Style(), {
svx::frame::Style(), long nLowerRotate = lcl_getRotate( mpDoc, nTab, nX, nY + 1 );
aRightLine, pProcessor->process( svx::frame::CreateBorderPrimitives(
svx::frame::Style(), aPoints[bLayoutRTL?2:3], aPoints[bLayoutRTL?3:2], aBottomLine,
svx::frame::Style(), aLeftLine,
pForceColor, 18000 - nAttrRotate, 18000 - nLowerRotate ) ); svx::frame::Style(),
svx::frame::Style(),
aRightLine,
svx::frame::Style(),
svx::frame::Style(),
pForceColor, 18000 - nAttrRotate, 18000 - nLowerRotate ) );
}
// Vertical slanted lines // Vertical slanted lines
long nLeftRotate = lcl_getRotate( mpDoc, nTab, nX - 1, nY ); if (aLeftLine.Prim() || aLeftLine.Secn())
pProcessor->process( svx::frame::CreateBorderPrimitives( {
aPoints[0], aPoints[3], aLeftLine, long nLeftRotate = lcl_getRotate( mpDoc, nTab, nX - 1, nY );
aTopLine, pProcessor->process( svx::frame::CreateBorderPrimitives(
svx::frame::Style(), aPoints[0], aPoints[3], aLeftLine,
svx::frame::Style(), aTopLine,
aBottomLine, svx::frame::Style(),
svx::frame::Style(), svx::frame::Style(),
svx::frame::Style(), aBottomLine,
pForceColor, nAttrRotate, nLeftRotate ) ); svx::frame::Style(),
svx::frame::Style(),
long nRightRotate = lcl_getRotate( mpDoc, nTab, nX + 1, nY ); pForceColor, nAttrRotate, nLeftRotate ) );
pProcessor->process( svx::frame::CreateBorderPrimitives( }
aPoints[1], aPoints[2], aRightLine,
svx::frame::Style(), if (aRightLine.Prim() || aRightLine.Secn())
svx::frame::Style(), {
aTopLine, long nRightRotate = lcl_getRotate( mpDoc, nTab, nX + 1, nY );
svx::frame::Style(), pProcessor->process( svx::frame::CreateBorderPrimitives(
svx::frame::Style(), aPoints[1], aPoints[2], aRightLine,
aBottomLine, svx::frame::Style(),
pForceColor, 18000 - nRightRotate, 18000 - nAttrRotate ) ); svx::frame::Style(),
aTopLine,
svx::frame::Style(),
svx::frame::Style(),
aBottomLine,
pForceColor, 18000 - nRightRotate, 18000 - nAttrRotate ) );
}
} }
} }
nPosX += nColWidth * nLayoutSign; nPosX += nColWidth * nLayoutSign;
......
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