[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - 2 commits - sc/inc sc/source
Kohei Yoshida
kohei.yoshida at gmail.com
Mon Aug 19 14:41:34 PDT 2013
sc/inc/dbdataformatting.hxx | 74 +++++++++++++++----------------
sc/source/core/tool/dbdataformatting.cxx | 22 ++++-----
2 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 3a6626f030a495212c8245b4359fecb88ed0f02e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Aug 19 17:38:08 2013 -0400
Let's consistently use 'm' prefix for data members.
And fix incorrect initialization order.
Change-Id: I3ea1cc2fa19fb28780f076762208e62237a386b2
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index dc9d6ed..c14bed1 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -23,8 +23,8 @@ class SC_DLLPUBLIC ScDBDataFormatting
sal_Int32 maSecondRowStripeSize;
sal_Int32 maFirstColStripeSize;
sal_Int32 maSecondColStripeSize;
- bool bBandedRows;
- bool bBandedColumns;
+ bool mbBandedRows;
+ bool mbBandedColumns;
public:
ScDBDataFormatting();
ScDBDataFormatting(const OUString& rTableStyleName, const OUString& rFirstRowStripeStyle, const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
diff --git a/sc/source/core/tool/dbdataformatting.cxx b/sc/source/core/tool/dbdataformatting.cxx
index 67f0ba3..07f1ede 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -16,12 +16,12 @@ ScDBDataFormatting::ScDBDataFormatting():
maSecondRowStripeStyle ( "Default" ),
maFirstColStripeStyle ( "Default" ),
maSecondColStripeStyle ( "Default" ),
- bBandedRows ( false ),
- bBandedColumns ( false ),
maFirstRowStripeSize ( 1 ),
maSecondRowStripeSize ( 1 ),
maFirstColStripeSize ( 1 ),
- maSecondColStripeSize ( 1 )
+ maSecondColStripeSize ( 1 ),
+ mbBandedRows ( false ),
+ mbBandedColumns ( false )
{
}
@@ -31,8 +31,8 @@ ScDBDataFormatting::ScDBDataFormatting(const OUString& rTableStyleName, const OU
maSecondRowStripeStyle ( rSecondRowStripeStyle ),
maFirstColStripeStyle ( rFirstColStripeStyle ),
maSecondColStripeStyle ( rSecondColStripeStyle ),
- bBandedRows ( bBRows ),
- bBandedColumns ( bBCols )
+ mbBandedRows ( bBRows ),
+ mbBandedColumns ( bBCols )
{
}
@@ -42,8 +42,8 @@ ScDBDataFormatting::ScDBDataFormatting( const ScDBDataFormatting& rTableFormatDa
maSecondRowStripeStyle ( rTableFormatData.maSecondRowStripeStyle ),
maFirstColStripeStyle ( rTableFormatData.maFirstColStripeStyle ),
maSecondColStripeStyle ( rTableFormatData.maSecondColStripeStyle ),
- bBandedRows ( rTableFormatData.bBandedRows ),
- bBandedColumns ( rTableFormatData.bBandedColumns )
+ mbBandedRows ( rTableFormatData.mbBandedRows ),
+ mbBandedColumns ( rTableFormatData.mbBandedColumns )
{
}
@@ -59,22 +59,22 @@ const OUString& ScDBDataFormatting::GetTableStyleName()
void ScDBDataFormatting::SetBandedRows( bool bBRows )
{
- bBandedRows = bBRows;
+ mbBandedRows = bBRows;
}
bool ScDBDataFormatting::GetBandedRows()
{
- return bBandedRows;
+ return mbBandedRows;
}
void ScDBDataFormatting::SetBandedColumns( bool bBCols )
{
- bBandedColumns = bBCols;
+ mbBandedColumns = bBCols;
}
bool ScDBDataFormatting::GetBandedColumns()
{
- return bBandedColumns;
+ return mbBandedColumns;
}
const OUString& ScDBDataFormatting::GetFirstRowStripeStyle() const
commit f3f060986ff8dcd310dfa944259c7189b9d8c3cd
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Aug 19 17:32:55 2013 -0400
Fix excessive indentation.
Change-Id: I464c8e103f1c31f9e4321b4f481413df6a4822e7
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index 91666c6..dc9d6ed 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -14,43 +14,43 @@
class SC_DLLPUBLIC ScDBDataFormatting
{
- OUString maTableStyleName;
- OUString maFirstRowStripeStyle;
- OUString maSecondRowStripeStyle;
- OUString maFirstColStripeStyle;
- OUString maSecondColStripeStyle;
- sal_Int32 maFirstRowStripeSize;
- sal_Int32 maSecondRowStripeSize;
- sal_Int32 maFirstColStripeSize;
- sal_Int32 maSecondColStripeSize;
- bool bBandedRows;
- bool bBandedColumns;
- public:
- ScDBDataFormatting();
- ScDBDataFormatting(const OUString& rTableStyleName, const OUString& rFirstRowStripeStyle, const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
- ScDBDataFormatting( const ScDBDataFormatting& rTableFormatData );
- void SetTableStyleName( const OUString& rTableStyleName );
- const OUString& GetTableStyleName();
- void SetBandedRows( bool bBRows );
- bool GetBandedRows();
- void SetBandedColumns( bool bBCols );
- bool GetBandedColumns();
- const OUString& GetFirstRowStripeStyle() const;
- const OUString& GetSecondRowStripeStyle() const;
- const OUString& GetFirstColStripeStyle() const;
- const OUString& GetSecondColStripeStyle() const;
- sal_Int32 GetFirstRowStripeSize() const { return maFirstRowStripeSize; }
- sal_Int32 GetSecondRowStripeSize() const { return maSecondRowStripeSize; }
- sal_Int32 GetFirstColStripeSize() const { return maFirstColStripeSize; }
- sal_Int32 GetSecondColStripeSize() const { return maSecondColStripeSize; }
- void SetFirstRowStripeSize( const sal_Int32 nSize ){ maFirstRowStripeSize = nSize; }
- void SetSecondRowStripeSize( const sal_Int32 nSize ){ maSecondRowStripeSize = nSize; }
- void SetFirstColStripeSize( const sal_Int32 nSize ){ maFirstColStripeSize = nSize; }
- void SetSecondColStripeSize( const sal_Int32 nSize ){ maSecondColStripeSize = nSize; }
- void SetFirstRowStripeStyle( const OUString& aStyleName );
- void SetSecondRowStripeStyle( const OUString& aStyleName );
- void SetFirstColStripeStyle( const OUString& aStyleName );
- void SetSecondColStripeStyle( const OUString& aStyleName );
+ OUString maTableStyleName;
+ OUString maFirstRowStripeStyle;
+ OUString maSecondRowStripeStyle;
+ OUString maFirstColStripeStyle;
+ OUString maSecondColStripeStyle;
+ sal_Int32 maFirstRowStripeSize;
+ sal_Int32 maSecondRowStripeSize;
+ sal_Int32 maFirstColStripeSize;
+ sal_Int32 maSecondColStripeSize;
+ bool bBandedRows;
+ bool bBandedColumns;
+public:
+ ScDBDataFormatting();
+ ScDBDataFormatting(const OUString& rTableStyleName, const OUString& rFirstRowStripeStyle, const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
+ ScDBDataFormatting( const ScDBDataFormatting& rTableFormatData );
+ void SetTableStyleName( const OUString& rTableStyleName );
+ const OUString& GetTableStyleName();
+ void SetBandedRows( bool bBRows );
+ bool GetBandedRows();
+ void SetBandedColumns( bool bBCols );
+ bool GetBandedColumns();
+ const OUString& GetFirstRowStripeStyle() const;
+ const OUString& GetSecondRowStripeStyle() const;
+ const OUString& GetFirstColStripeStyle() const;
+ const OUString& GetSecondColStripeStyle() const;
+ sal_Int32 GetFirstRowStripeSize() const { return maFirstRowStripeSize; }
+ sal_Int32 GetSecondRowStripeSize() const { return maSecondRowStripeSize; }
+ sal_Int32 GetFirstColStripeSize() const { return maFirstColStripeSize; }
+ sal_Int32 GetSecondColStripeSize() const { return maSecondColStripeSize; }
+ void SetFirstRowStripeSize( const sal_Int32 nSize ){ maFirstRowStripeSize = nSize; }
+ void SetSecondRowStripeSize( const sal_Int32 nSize ){ maSecondRowStripeSize = nSize; }
+ void SetFirstColStripeSize( const sal_Int32 nSize ){ maFirstColStripeSize = nSize; }
+ void SetSecondColStripeSize( const sal_Int32 nSize ){ maSecondColStripeSize = nSize; }
+ void SetFirstRowStripeStyle( const OUString& aStyleName );
+ void SetSecondRowStripeStyle( const OUString& aStyleName );
+ void SetFirstColStripeStyle( const OUString& aStyleName );
+ void SetSecondColStripeStyle( const OUString& aStyleName );
};
#endif
More information about the Libreoffice-commits
mailing list