diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-10 20:14:52 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-10 20:15:21 +0200 |
commit | 510c3586460f234a5ba6f9da16eea0dd5768656c (patch) | |
tree | 421310ef4217c295750a2dcbe39581be3178e647 | |
parent | ccaaa544350156ed4cd113634ceb66ad8cc5af23 (diff) |
indentation fixes
Change-Id: I56664b455383f69137399e4c5fb28521ef813287
-rw-r--r-- | starmath/source/wordexportbase.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 20 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 26af5a9f5ccf..885ca729eb82 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -172,7 +172,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel) case TDIVIDEBY: case TACUTE: OSL_ASSERT(false); - // the above are handled elsewhere, e.g. when handling BINHOR + // the above are handled elsewhere, e.g. when handling BINHOR default: HandleText(pNode, nLevel); break; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index d834c7066fcb..b371b8e24dab 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -626,7 +626,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS break; } } - else if(const SdrObject* pObject = pFrmFmt->FindRealSdrObject()) + else if (const SdrObject* pObject = pFrmFmt->FindRealSdrObject()) { // No shadow, but we have an idea what was the original effectExtent. uno::Any aAny; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 89ba42c0132f..a576ddcd9f10 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3187,10 +3187,10 @@ void RtfAttributeOutput::WriteExpand(const SwField* pFld) OUString sCmd; // for optional Parameters switch (pFld->GetTyp()->Which()) { - //#i119803# Export user field and DB field for RTF filter + //#i119803# Export user field and DB field for RTF filter case RES_DBFLD: sCmd = FieldString(ww::eMERGEFIELD); - // no break !! + // no break !! case RES_USERFLD: sCmd += pFld->GetTyp()->GetName(); m_rExport.OutputField(pFld, ww::eNONE, sCmd); @@ -3640,14 +3640,14 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw pGraphicAry = aGraphicLink.GetData(); switch (aGraphicLink.GetType()) { - // #i15508# trying to add BMP type for better exports, need to check if this works - // checked, does not work. Also need to reset pGraphicAry to NULL to force conversion - // to PNG, else the BMP array will be used. - // It may work using direct DIB data, but that needs to be checked eventually - // - // #i15508# before GFX_LINK_TYPE_NATIVE_BMP was added the graphic data - // (to be hold in pGraphicAry) was not available; thus for now to stay - // compatible, keep it that way by assigning NULL value to pGraphicAry + // #i15508# trying to add BMP type for better exports, need to check if this works + // checked, does not work. Also need to reset pGraphicAry to NULL to force conversion + // to PNG, else the BMP array will be used. + // It may work using direct DIB data, but that needs to be checked eventually + // + // #i15508# before GFX_LINK_TYPE_NATIVE_BMP was added the graphic data + // (to be hold in pGraphicAry) was not available; thus for now to stay + // compatible, keep it that way by assigning NULL value to pGraphicAry case GFX_LINK_TYPE_NATIVE_BMP: // pBLIPType = OOO_STRING_SVTOOLS_RTF_WBITMAP; pGraphicAry = 0; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 83084d3a0265..d2661837374f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1152,8 +1152,8 @@ void RTFDocumentImpl::text(OUString& rString) bool bRet = true; switch (m_aStates.top().nDestinationState) { - // Note: in fonttbl there may or may not be groups; in stylesheet - // and revtbl groups are mandatory + // Note: in fonttbl there may or may not be groups; in stylesheet + // and revtbl groups are mandatory case DESTINATION_FONTTABLE: case DESTINATION_FONTENTRY: case DESTINATION_STYLEENTRY: @@ -1876,7 +1876,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_FLYMAINCONTENT; break; case RTF_LISTTEXT: - // Should be ignored by any reader that understands Word 97 through Word 2007 numbering. + // Should be ignored by any reader that understands Word 97 through Word 2007 numbering. case RTF_NONESTTABLES: // This destination should be ignored by readers that support nested tables. m_aStates.top().nDestinationState = DESTINATION_SKIP; @@ -2570,8 +2570,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { switch (nKeyword) { - // brdrhair and brdrs are the same, brdrw will make a difference - // map to values in ooxml/model.xml resource ST_Border + // brdrhair and brdrs are the same, brdrw will make a difference + // map to values in ooxml/model.xml resource ST_Border case RTF_BRDRHAIR: case RTF_BRDRS: nParam = NS_ooxml::LN_Value_ST_Border_single; diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index facae3feb8eb..71050848f82c 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -284,7 +284,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, o_xPropSet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value); break; } - // fall-through intended + // fall-through intended default: createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet); o_rIsCustomShape = true; |