rename class

Change-Id: I09ad268ff848d684022dbb696501afe8332f3771

3 files changed, 21 insertions, 21 deletions

diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 5b41742e5520..b08b81543524 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -237,7 +237,7 @@ struct ExCfRuleModel
     OUString maColorScaleType;
 };
 
-class ExtCfRule : public WorksheetHelper
+class ExtCfDataBarRule : public WorksheetHelper
 {
     enum RuleType
     {
@@ -252,7 +252,7 @@ class ExtCfRule : public WorksheetHelper
     ScDataBarFormatData* mpTarget;
 public:
 
-    ExtCfRule(ScDataBarFormatData* pTarget, WorksheetHelper& rParent);
+    ExtCfDataBarRule(ScDataBarFormatData* pTarget, WorksheetHelper& rParent);
     void finalizeImport();
     void importDataBar(  const AttributeList& rAttribs );
     void importNegativeFillColor(  const AttributeList& rAttribs );
@@ -262,7 +262,7 @@ public:
 };
 
 typedef std::shared_ptr< CondFormat > CondFormatRef;
-typedef std::shared_ptr< ExtCfRule > ExtCfRuleRef;
+typedef std::shared_ptr< ExtCfDataBarRule > ExtCfDataBarRuleRef;
 
 class CondFormatBuffer : public WorksheetHelper
 {
@@ -273,7 +273,7 @@ public:
     CondFormatRef       importConditionalFormatting( const AttributeList& rAttribs );
     /** Imports settings from the CONDFORMATTING record. */
     CondFormatRef       importCondFormatting( SequenceInputStream& rStrm );
-    ExtCfRuleRef        createExtCfRule(ScDataBarFormatData* pTarget);
+    ExtCfDataBarRuleRef createExtCfDataBarRule(ScDataBarFormatData* pTarget);
 
     /** Converts an OOXML condition operator token to the API constant. */
     static sal_Int32    convertToApiOperator( sal_Int32 nToken );
@@ -284,9 +284,9 @@ private:
 
 private:
     typedef RefVector< CondFormat > CondFormatVec;
-    typedef RefVector< ExtCfRule > ExtCfRuleVec;
+    typedef RefVector< ExtCfDataBarRule > ExtCfDataBarRuleVec;
     CondFormatVec       maCondFormats;      /// All conditional formatting in a sheet.
-    ExtCfRuleVec        maCfRules;          /// All external conditional formatting rules in a sheet.
+    ExtCfDataBarRuleVec        maCfRules;          /// All external conditional formatting rules in a sheet.
 };
 
 } // namespace xls
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 2917e0871324..8a95d2d4382f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1116,8 +1116,8 @@ void CondFormatBuffer::finalizeImport()
         if ( (*it).get() )
             (*it).get()->finalizeImport();
     }
-    ExtCfRuleVec::iterator ext_it = maCfRules.begin();
-    ExtCfRuleVec::iterator ext_end = maCfRules.end();
+    ExtCfDataBarRuleVec::iterator ext_it = maCfRules.begin();
+    ExtCfDataBarRuleVec::iterator ext_end = maCfRules.end();
     for ( ; ext_it != ext_end; ++ext_it )
     {
         if ( (*ext_it).get() )
@@ -1132,9 +1132,9 @@ CondFormatRef CondFormatBuffer::importCondFormatting( SequenceInputStream& rStrm
     return xCondFmt;
 }
 
-ExtCfRuleRef CondFormatBuffer::createExtCfRule(ScDataBarFormatData* pTarget)
+ExtCfDataBarRuleRef CondFormatBuffer::createExtCfDataBarRule(ScDataBarFormatData* pTarget)
 {
-    ExtCfRuleRef extRule( new ExtCfRule( pTarget, *this ) );
+    ExtCfDataBarRuleRef extRule( new ExtCfDataBarRule( pTarget, *this ) );
     maCfRules.push_back( extRule );
     return extRule;
 }
@@ -1183,14 +1183,14 @@ CondFormatRef CondFormatBuffer::createCondFormat()
     return xCondFmt;
 }
 
-ExtCfRule::ExtCfRule(ScDataBarFormatData* pTarget, WorksheetHelper& rParent):
+ExtCfDataBarRule::ExtCfDataBarRule(ScDataBarFormatData* pTarget, WorksheetHelper& rParent):
     WorksheetHelper(rParent),
-    mnRuleType( ExtCfRule::UNKNOWN ),
+    mnRuleType( ExtCfDataBarRule::UNKNOWN ),
     mpTarget(pTarget)
 {
 }
 
-void ExtCfRule::finalizeImport()
+void ExtCfDataBarRule::finalizeImport()
 {
     switch ( mnRuleType )
     {
@@ -1250,14 +1250,14 @@ void ExtCfRule::finalizeImport()
     }
 }
 
-void ExtCfRule::importDataBar( const AttributeList& rAttribs )
+void ExtCfDataBarRule::importDataBar( const AttributeList& rAttribs )
 {
     mnRuleType = DATABAR;
     maModel.mbGradient = rAttribs.getBool( XML_gradient, true );
     maModel.maAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" );
 }
 
-void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs )
+void ExtCfDataBarRule::importNegativeFillColor( const AttributeList& rAttribs )
 {
     mnRuleType = NEGATIVEFILLCOLOR;
     ThemeBuffer& rThemeBuffer = getTheme();
@@ -1266,7 +1266,7 @@ void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs )
     maModel.mnNegativeColor = aColor;
 }
 
-void ExtCfRule::importAxisColor( const AttributeList& rAttribs )
+void ExtCfDataBarRule::importAxisColor( const AttributeList& rAttribs )
 {
     mnRuleType = AXISCOLOR;
     ThemeBuffer& rThemeBuffer = getTheme();
@@ -1275,7 +1275,7 @@ void ExtCfRule::importAxisColor( const AttributeList& rAttribs )
     maModel.mnAxisColor = aColor;
 }
 
-void ExtCfRule::importCfvo( const AttributeList& rAttribs )
+void ExtCfDataBarRule::importCfvo( const AttributeList& rAttribs )
 {
     mnRuleType = CFVO;
     maModel.maColorScaleType = rAttribs.getString( XML_type, OUString() );
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 3d431cdb5e56..2be338d507a8 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -40,25 +40,25 @@ void ExtCfRuleContext::onStartElement( const AttributeList& rAttribs )
     {
         case XLS14_TOKEN( dataBar ):
         {
-            ExtCfRuleRef xRule = getCondFormats().createExtCfRule(mpTarget);
+            ExtCfDataBarRuleRef xRule = getCondFormats().createExtCfDataBarRule(mpTarget);
             xRule->importDataBar( rAttribs );
             break;
         }
         case XLS14_TOKEN( negativeFillColor ):
         {
-            ExtCfRuleRef xRule = getCondFormats().createExtCfRule(mpTarget);
+            ExtCfDataBarRuleRef xRule = getCondFormats().createExtCfDataBarRule(mpTarget);
             xRule->importNegativeFillColor( rAttribs );
             break;
         }
         case XLS14_TOKEN( axisColor ):
         {
-            ExtCfRuleRef xRule = getCondFormats().createExtCfRule(mpTarget);
+            ExtCfDataBarRuleRef xRule = getCondFormats().createExtCfDataBarRule(mpTarget);
             xRule->importAxisColor( rAttribs );
             break;
         }
         case XLS14_TOKEN( cfvo ):
         {
-            ExtCfRuleRef xRule = getCondFormats().createExtCfRule(mpTarget);
+            ExtCfDataBarRuleRef xRule = getCondFormats().createExtCfDataBarRule(mpTarget);
             xRule->importCfvo( rAttribs );
             xRule->getModel().mbIsLower = mbFirstEntry;
             mbFirstEntry = false;