sw/source/filter/ww8/docxtablestyleexport.cxx | 2 +- sw/source/filter/ww8/rtfattributeoutput.cxx | 4 ++-- sw/source/filter/ww8/rtfexport.cxx | 2 +- writerfilter/source/dmapper/SdtHelper.cxx | 4 ++-- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- writerfilter/source/rtftok/rtfsdrimport.cxx | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit e0026b25e796eb89fa01fb42a759e89af4ab43e5 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue May 17 09:32:20 2016 +0200 sw, writerfilter: indentation fixes These files had a consistent style perviously, don't break that. Change-Id: I8d204e78463e7fe302a172a1af6ad3de51997977 diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index 107fe77..a1b90a0 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -673,7 +673,7 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>& tableStyleRPr(aRPr); tableStyleTablePr(aTablePr); tableStyleTcPr(aTcPr); - for (uno::Sequence<beans::PropertyValue> & i : aTableStylePrs) + for (uno::Sequence<beans::PropertyValue>& i : aTableStylePrs) tableStyleTableStylePr(i); m_pSerializer->endElementNS(XML_w, XML_style); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 9cd98a6..2aa0cf6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1880,7 +1880,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi lcl_TextFrameShadow(m_aFlyProperties, rFrameFormat); lcl_TextFrameRelativeSize(m_aFlyProperties, rFrameFormat); - for (std::pair<OString,OString> & rPair : m_aFlyProperties) + for (std::pair<OString,OString>& rPair : m_aFlyProperties) { m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); @@ -3966,7 +3966,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat if (!pFlyFrameFormat->GetOpaque().GetValue()) aFlyProperties.push_back(std::make_pair<OString, OString>("fBehindDocument", "1")); - for (std::pair<OString,OString> & rPair : aFlyProperties) + for (std::pair<OString,OString>& rPair : aFlyProperties) { m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index c572804..729ce24 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -392,7 +392,7 @@ void RtfExport::WriteMainText() std::vector< std::pair<OString, OString> > aProperties; aProperties.push_back(std::make_pair<OString, OString>("shapeType", "1")); aProperties.push_back(std::make_pair<OString, OString>("fillColor", OString::number(msfilter::util::BGRToRGB(oBrush->GetColor().GetColor())))); - for (std::pair<OString,OString> & rPair : aProperties) + for (std::pair<OString,OString>& rPair : aProperties) { Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 293ff4f..ba8410d 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -29,7 +29,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString& r { OUString aLongest = rDefault; sal_Int32 nHeight = 0; - for (const OUString & rItem : rItems) + for (const OUString& rItem : rItems) if (rItem.getLength() > aLongest.getLength()) aLongest = rItem; @@ -190,7 +190,7 @@ sal_Int32 SdtHelper::getInteropGrabBagSize() bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName) { - for (beans::PropertyValue & i : m_aGrabBag) + for (beans::PropertyValue& i : m_aGrabBag) if (i.Name == rValueName) return true; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 8793d4f..24a9456 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1458,7 +1458,7 @@ void RTFDocumentImpl::replayRowBuffer( rCellsSrpms.pop_front(); rCellsAttributes.pop_front(); } - for (Buf_t & i : rBuffer) + for (Buf_t& i : rBuffer) { SAL_WARN_IF(BUFFER_CELLEND == std::get<0>(i), "writerfilter.rtf", "dropping table cell!"); diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 5e919d3..3984fd6 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -298,7 +298,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, createShape("com.sun.star.text.TextFrame", o_xShape, o_xPropSet); m_bTextFrame = true; std::vector<beans::PropertyValue> aDefaults = getTextFrameDefaults(true); - for (beans::PropertyValue & i : aDefaults) + for (beans::PropertyValue& i : aDefaults) o_xPropSet->setPropertyValue(i.Name, i.Value); break; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits