[Libreoffice-commits] core.git: sc/source

[Kohei Yoshida]

 sc/source/filter/inc/worksheetfragment.hxx |   34 +++++++++++++++--------------
 sc/source/filter/oox/worksheetfragment.cxx |   20 ++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit e8b43ac1ef8811e7b02e78bf48f6d71c822339d7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Dec 2 22:20:16 2016 -0500

    Fix the formatting style a bit, to be more consistent.
    
    Change-Id: Iaca5837e5502ef8eed4cddbca1d00e00c71c53c2
    Reviewed-on: https://gerrit.libreoffice.org/31576
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx
index 9fc348b..945b174 100644
--- a/sc/source/filter/inc/worksheetfragment.hxx
+++ b/sc/source/filter/inc/worksheetfragment.hxx
@@ -25,24 +25,26 @@
 namespace oox {
 namespace xls {
 
-class DataValidationsContext_Base {
+class DataValidationsContextBase
+{
 public:
-                                   DataValidationsContext_Base() {}
-    void                           SetSqref(const OUString& rChars) { mSqref = rChars; }
-    void                           SetFormula1(const OUString& rChars) { mFormula1 = rChars; }
-    void                           SetFormula2(const OUString& rChars) { mFormula2 = rChars; }
-    void                           SetValidation(::oox::xls::WorksheetHelper& rTarget);
+    void SetSqref( const OUString& rChars ) { maSqref = rChars; }
+    void SetFormula1( const OUString& rChars ) { maFormula1 = rChars; }
+    void SetFormula2( const OUString& rChars ) { maFormula2 = rChars; }
+    void SetValidation( WorksheetHelper& rTarget );
     /** Imports the dataValidation element containing data validation settings. */
-    void                           importDataValidation(const AttributeList& rAttribs);
+    void importDataValidation( const AttributeList& rAttribs );
     /** Imports the DATAVALIDATION record containing data validation settings. */
-    static void                    importDataValidation(SequenceInputStream& rStrm, ::oox::xls::WorksheetHelper& rTarget);
-    bool                           isFormula1Set() const { return !mFormula1.isEmpty(); }
-    bool                           isFormula2Set() const { return !mFormula2.isEmpty(); }
+    static void importDataValidation( SequenceInputStream& rStrm, WorksheetHelper& rTarget );
+    bool isFormula1Set() const { return !maFormula1.isEmpty(); }
+    bool isFormula2Set() const { return !maFormula2.isEmpty(); }
+
 private:
-    ::std::unique_ptr< ValidationModel > mxValModel;
-    OUString                             mSqref;
-    OUString                             mFormula1;
-    OUString                             mFormula2;
+    std::unique_ptr< ValidationModel > mxValModel;
+
+    OUString maSqref;
+    OUString maFormula1;
+    OUString maFormula2;
 };
 
 // For following types of validations:
@@ -69,7 +71,7 @@ private:
 //    </dataValidation>
 //  </dataValidations>
 
-class DataValidationsContext : public WorksheetContextBase, private DataValidationsContext_Base
+class DataValidationsContext : public WorksheetContextBase, private DataValidationsContextBase
 {
 public:
     explicit            DataValidationsContext( WorksheetFragmentBase& rFragment );
@@ -97,7 +99,7 @@ protected:
 //    </ext>
 //  </extLst>
 
-class ExtDataValidationsContext : public WorksheetContextBase, private DataValidationsContext_Base
+class ExtDataValidationsContext : public WorksheetContextBase, private DataValidationsContextBase
 {
 public:
     explicit            ExtDataValidationsContext( WorksheetContextBase& rFragment );
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 8a2f1e0..ead566a 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -75,31 +75,31 @@ const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD  = 0x0002;
 
 } // namespace
 
-void DataValidationsContext_Base::SetValidation(::oox::xls::WorksheetHelper& rTarget)
+void DataValidationsContextBase::SetValidation( WorksheetHelper& rTarget )
 {
     if (!mxValModel.get())
         return;
 
-    rTarget.getAddressConverter().convertToCellRangeList(mxValModel->maRanges, mSqref, rTarget.getSheetIndex(), true);
-    mxValModel->msRef = mSqref;
+    rTarget.getAddressConverter().convertToCellRangeList(mxValModel->maRanges, maSqref, rTarget.getSheetIndex(), true);
+    mxValModel->msRef = maSqref;
 
-    mxValModel->maTokens1 = rTarget.getFormulaParser().importFormula(mxValModel->maRanges.getBaseAddress(), mFormula1);
+    mxValModel->maTokens1 = rTarget.getFormulaParser().importFormula(mxValModel->maRanges.getBaseAddress(), maFormula1);
     // process string list of a list validation (convert to list of string tokens)
     if (mxValModel->mnType == XML_list)
         rTarget.getFormulaParser().convertStringToStringList(mxValModel->maTokens1, ',', true);
 
-    mxValModel->maTokens2 = rTarget.getFormulaParser().importFormula(mxValModel->maRanges.getBaseAddress(), mFormula2);
+    mxValModel->maTokens2 = rTarget.getFormulaParser().importFormula(mxValModel->maRanges.getBaseAddress(), maFormula2);
 
     rTarget.setValidation(*mxValModel);
     mxValModel.reset();
 }
 
-void DataValidationsContext_Base::importDataValidation(const AttributeList& rAttribs)
+void DataValidationsContextBase::importDataValidation( const AttributeList& rAttribs )
 {
     mxValModel.reset(new ValidationModel);
-    mFormula1.clear();
-    mFormula2.clear();
-    mSqref = rAttribs.getString(XML_sqref, OUString());
+    maFormula1.clear();
+    maFormula2.clear();
+    maSqref = rAttribs.getString(XML_sqref, OUString());
     mxValModel->maInputTitle = rAttribs.getXString(XML_promptTitle, OUString());
     mxValModel->maInputMessage = rAttribs.getXString(XML_prompt, OUString());
     mxValModel->maErrorTitle = rAttribs.getXString(XML_errorTitle, OUString());
@@ -116,7 +116,7 @@ void DataValidationsContext_Base::importDataValidation(const AttributeList& rAtt
     mxValModel->mbAllowBlank = rAttribs.getBool(XML_allowBlank, false);
 }
 
-void DataValidationsContext_Base::importDataValidation(SequenceInputStream& rStrm, ::oox::xls::WorksheetHelper& rTarget)
+void DataValidationsContextBase::importDataValidation( SequenceInputStream& rStrm, WorksheetHelper& rTarget )
 {
     ValidationModel aModel;