sc/inc/dbdata.hxx | 4 ++--
sc/source/core/tool/dbdata2.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ee6a3b678319b0740a338781cf6cce6e1bd963e0
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Mon Aug 19 17:52:18 2013 -0400
Ensure correct initialization order.
Change-Id: Ife8a4f0654d1ca6e9342750ff53c6f3e00bbc286
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index f337a38..a7a49b5 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -58,7 +58,6 @@ private:
bool bDoSize;
bool bKeepFmt;
bool bStripData;
- bool bHasFormatting;
/// QueryParam
bool bIsAdvanced; ///< true if created by advanced filter
@@ -69,6 +68,7 @@ private:
sal_uInt16 nIndex; ///< unique index formulas
bool bAutoFilter; ///< AutoFilter? (not saved)
bool bModified; ///< is set/cleared for/by(?)
UpdateReference
+ bool bHasFormatting;
using ScRefreshTimer::operator==;
commit 82acea96bbf9ac89feddbf91e1881330b26c253b
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Mon Aug 19 17:48:16 2013 -0400
Don't return a reference to a temporary variable.
That's a recipe for trouble.
Change-Id: I78647225209e57cf88c04718d99a07142983369d
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index e6a35ed..f337a38 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -156,7 +156,7 @@ public:
SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
void ExtendDataArea(ScDocument* pDoc);
- const OUString& GetCellStyle( const ScAddress& rPos, bool bRowStripe );
+ OUString GetCellStyle( const ScAddress& rPos, bool bRowStripe );
};
class SC_DLLPUBLIC ScDBCollection
diff --git a/sc/source/core/tool/dbdata2.cxx b/sc/source/core/tool/dbdata2.cxx
index 0f70a6f..879437a 100644
--- a/sc/source/core/tool/dbdata2.cxx
+++ b/sc/source/core/tool/dbdata2.cxx
@@ -11,7 +11,7 @@
#include "dbdata.hxx"
#include "dbdataformatting.hxx"
-const OUString& ScDBData::GetCellStyle( const ScAddress& rPos, bool bRowStripe
)
+OUString ScDBData::GetCellStyle( const ScAddress& rPos, bool bRowStripe )
{
//first see if the DB Range has any DB Formatting at all
if( !HasFormatting() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
