Kaydet (Commit) 5ec3ee2c authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: indentation fixes

Change-Id: I495c8bd4ee24832573cb56b6ffe4533263eb39f0
üst d0bedaf9
...@@ -288,51 +288,51 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRec ...@@ -288,51 +288,51 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRec
aSegmentInfo.append(';').append((sal_Int32)nSeg); aSegmentInfo.append(';').append((sal_Int32)nSeg);
switch (nSegmentType) switch (nSegmentType)
{ {
case msopathLineTo: case msopathLineTo:
for (unsigned short i = 0; i < nSegmentCount; ++i) for (unsigned short i = 0; i < nSegmentCount; ++i)
{
sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
nVertices ++;
}
break;
case msopathMoveTo:
{ {
sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize); sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize); sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
aVerticies.append(";(").append(nX).append(",").append(nY).append(")"); aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
nVertices++; nVertices ++;
break;
} }
case msopathCurveTo: break;
for (unsigned short j = 0; j < nSegmentCount; ++j) case msopathMoveTo:
{
sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
nVertices++;
break;
}
case msopathCurveTo:
for (unsigned short j = 0; j < nSegmentCount; ++j)
{
for (int i = 0; i < 3; i++)
{ {
for (int i = 0; i < 3; i++) sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
{ sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize); aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize); nVertices ++;
aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
nVertices ++;
}
} }
break;
case msopathEscape:
{
// If the segment type is msopathEscape, the lower 13 bits are
// divided in a 5 bit escape code and 8 bit
// vertex count (not segment count!)
unsigned char nVertexCount = nSegmentCount & 0x00FF;
nVerticesPos += nVertexCount;
break;
} }
case msopathClientEscape: break;
case msopathClose: case msopathEscape:
case msopathEnd: {
break; // If the segment type is msopathEscape, the lower 13 bits are
default: // divided in a 5 bit escape code and 8 bit
SAL_WARN("oox", "Totally b0rked\n"); // vertex count (not segment count!)
break; unsigned char nVertexCount = nSegmentCount & 0x00FF;
nVerticesPos += nVertexCount;
break;
}
case msopathClientEscape:
case msopathClose:
case msopathEnd:
break;
default:
SAL_WARN("oox", "Totally b0rked\n");
break;
} }
} }
......
...@@ -134,10 +134,10 @@ void CancelableDialog::SetCancelHdl( const Link<>& rLink ) ...@@ -134,10 +134,10 @@ void CancelableDialog::SetCancelHdl( const Link<>& rLink )
void CancelableDialog::Show() void CancelableDialog::Show()
{ {
if (mbModal) if (mbModal)
StartExecuteModal( Link<>() ); StartExecuteModal( Link<>() );
else else
Dialog::Show(); Dialog::Show();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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