sc/source/core/tool/interpr1.cxx | 32 +++++++++++++++++++++--------
sc/source/filter/inc/XclExpChangeTrack.hxx | 2 -
sc/source/filter/inc/xichart.hxx | 5 +++-
3 files changed, 29 insertions(+), 10 deletions(-)
New commits:
commit d9b9a3bffa5ed71e4ecadab863a545515803a183
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 14 15:03:29 2016 +0100
-Werror=misleading-indentation (GCC 6)
Change-Id: Ie583f5158fdc764c10981244efea204558219465
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 1a1ada5..266b0d7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2054,10 +2054,18 @@ void getFormatString(SvNumberFormatter* pFormatter,
sal_uLong nFormat, OUString&
switch( pFormatter->GetType( nFormat ) )
{
- case css::util::NumberFormat::NUMBER: if(bThousand) rFmtStr =
","; else rFmtStr = "F"; break;
- case css::util::NumberFormat::CURRENCY: rFmtStr = "C";
break;
- case css::util::NumberFormat::SCIENTIFIC: rFmtStr = "S";
break;
- case css::util::NumberFormat::PERCENT: rFmtStr = "P";
break;
+ case css::util::NumberFormat::NUMBER:
+ if(bThousand) rFmtStr = ","; else rFmtStr = "F";
+ break;
+ case css::util::NumberFormat::CURRENCY:
+ rFmtStr = "C";
+ break;
+ case css::util::NumberFormat::SCIENTIFIC:
+ rFmtStr = "S";
+ break;
+ case css::util::NumberFormat::PERCENT:
+ rFmtStr = "P";
+ break;
default:
{
bAppendPrec = false;
@@ -6829,10 +6837,18 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
else
nErg += aValue.mfValue;
break;
- case ifSUMSQ: nErg += aValue.mfValue * aValue.mfValue;
break;
- case ifPRODUCT: nErg *= aValue.mfValue; break;
- case ifMAX: if( aValue.mfValue > nErg ) nErg =
aValue.mfValue; break;
- case ifMIN: if( aValue.mfValue < nErg ) nErg =
aValue.mfValue; break;
+ case ifSUMSQ:
+ nErg += aValue.mfValue * aValue.mfValue;
+ break;
+ case ifPRODUCT:
+ nErg *= aValue.mfValue;
+ break;
+ case ifMAX:
+ if( aValue.mfValue > nErg ) nErg = aValue.mfValue;
+ break;
+ case ifMIN:
+ if( aValue.mfValue < nErg ) nErg = aValue.mfValue;
+ break;
default: ; // nothing
}
}
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 875906e..2818210 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -319,7 +319,7 @@ private:
sal_uInt16* pBuffer;
sal_uInt16 nTabCount;
- inline void Clear() { if( pBuffer ) delete[] pBuffer;
pBuffer = nullptr; }
+ inline void Clear() { delete[] pBuffer; pBuffer = nullptr;
}
virtual void SaveCont( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 54d76be..9b0dd19 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -394,7 +394,10 @@ public:
/** Returns true, if the source link contains explicit string data. */
inline bool HasString() const { return mxString &&
!mxString->IsEmpty(); }
/** Returns explicit string data or an empty string. */
- OUString GetString() const { if (mxString) return
mxString->GetText(); return OUString(); }
+ OUString GetString() const {
+ if (mxString) return mxString->GetText();
+ return OUString();
+ }
/** Returns the number of data points of this source link. */
sal_uInt16 GetCellCount() const;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
