From 5ec3ee2c2d0581e0c946cc3253344f1a69864c92 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 15 Jun 2015 09:09:11 +0200 Subject: sw: indentation fixes Change-Id: I495c8bd4ee24832573cb56b6ffe4533263eb39f0 --- sw/source/filter/ww8/rtfsdrexport.cxx | 74 +++++++++++++++++------------------ sw/source/uibase/dbui/dbui.cxx | 8 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'sw') diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 5d01fbcccdfb..5a28807fd79e 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -288,51 +288,51 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRec aSegmentInfo.append(';').append((sal_Int32)nSeg); switch (nSegmentType) { - case msopathLineTo: - 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: + case msopathLineTo: + 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; + nVertices ++; } - case msopathCurveTo: - for (unsigned short j = 0; j < nSegmentCount; ++j) + break; + 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); - aVerticies.append(";(").append(nX).append(",").append(nY).append(")"); - nVertices ++; - } + 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 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: - case msopathClose: - case msopathEnd: - break; - default: - SAL_WARN("oox", "Totally b0rked\n"); - break; + 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: + case msopathClose: + case msopathEnd: + break; + default: + SAL_WARN("oox", "Totally b0rked\n"); + break; } } diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index e410558e47d3..fbbdf3b262dc 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -134,10 +134,10 @@ void CancelableDialog::SetCancelHdl( const Link<>& rLink ) void CancelableDialog::Show() { - if (mbModal) - StartExecuteModal( Link<>() ); - else - Dialog::Show(); + if (mbModal) + StartExecuteModal( Link<>() ); + else + Dialog::Show(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit