Rename this to SharedFormulaBuffer, which is readable.

ShrfmlaBuffer is not readable.

Change-Id: Ic91f7c2fcc15d4210af4f97341199ce03593d223

4 files changed, 14 insertions, 14 deletions

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 2cf90d2e140f..28ddd9f64fd2 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -125,7 +125,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
     pExcRoot->pIR = this;   // ExcRoot -> XclImpRoot
     pExcRoot->eDateiTyp = BiffX;
     pExcRoot->pExtSheetBuff = new ExtSheetBuffer( pExcRoot );   //&aExtSheetBuff;
-    pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot );     //&aShrfrmlaBuff;
+    pExcRoot->pShrfmlaBuff = new SharedFormulaBuffer( pExcRoot );     //&aShrfrmlaBuff;
     pExcRoot->pExtNameBuff = new ExtNameBuff ( *this );
 
     pExtNameBuff = new NameBuffer( pExcRoot );          //prevent empty rootdata
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index eb9e90cccda3..6279c87758be 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -76,14 +76,14 @@ sal_uInt16  nShrCnt;
 #endif
 
 
-size_t ShrfmlaBuffer::ScAddressHashFunc::operator() (const ScAddress &addr) const
+size_t SharedFormulaBuffer::ScAddressHashFunc::operator() (const ScAddress &addr) const
 {
     // Use something simple, it is just a hash.
     return static_cast< sal_uInt16 >( addr.Row() ) | (static_cast< sal_uInt8 >( addr.Col() ) << 16);
 }
 
 const size_t nBase = 16384; // Range~ und Shared~ Dingens mit jeweils der Haelfte Ids
-ShrfmlaBuffer::ShrfmlaBuffer( RootData* pRD ) :
+SharedFormulaBuffer::SharedFormulaBuffer( RootData* pRD ) :
     ExcRoot( pRD ),
     mnCurrIdx (nBase)
 {
@@ -92,18 +92,18 @@ ShrfmlaBuffer::ShrfmlaBuffer( RootData* pRD ) :
 #endif
 }
 
-ShrfmlaBuffer::~ShrfmlaBuffer()
+SharedFormulaBuffer::~SharedFormulaBuffer()
 {
 }
 
-void ShrfmlaBuffer::Clear()
+void SharedFormulaBuffer::Clear()
 {
     index_hash.clear();
     // do not clear index_list, index calculation depends on complete list size...
     // do not change mnCurrIdx
 }
 
-void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
+void SharedFormulaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
 {
     String          aName( CreateName( rRange.aStart ) );
 
@@ -121,7 +121,7 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
 }
 
 
-sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
+sal_uInt16 SharedFormulaBuffer::Find( const ScAddress & aAddr ) const
 {
     ShrfmlaHash::const_iterator hash = index_hash.find (aAddr);
     if (hash != index_hash.end())
@@ -138,7 +138,7 @@ sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
 
 #define SHRFMLA_BASENAME    "SHARED_FORMULA_"
 
-String ShrfmlaBuffer::CreateName( const ScRange& r )
+String SharedFormulaBuffer::CreateName( const ScRange& r )
 {
     OUString aName = SHRFMLA_BASENAME +
                      OUString::number( r.aStart.Col() ) + "_" +
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index 38ead51c4006..6f5aa2827b90 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -149,7 +149,7 @@ inline void NameBuffer::SetBase( sal_uInt16 nNewBase )
 
 
 
-class ShrfmlaBuffer : public ExcRoot
+class SharedFormulaBuffer : public ExcRoot
 {
     struct ScAddressHashFunc : public std::unary_function< const ScAddress &, size_t >
     {
@@ -163,14 +163,14 @@ class ShrfmlaBuffer : public ExcRoot
     size_t                  mnCurrIdx;
 
 public:
-                            ShrfmlaBuffer( RootData* pRD );
-    virtual                 ~ShrfmlaBuffer();
+    SharedFormulaBuffer( RootData* pRD );
+    virtual ~SharedFormulaBuffer();
     void                    Clear();
     void                    Store( const ScRange& rRange, const ScTokenArray& );
     sal_uInt16                  Find (const ScAddress & rAddress ) const;
 
     static String           CreateName( const ScRange& );
-    };
+};
 
 
 
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index 1c9e075c8da3..492a463e8994 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -30,7 +30,7 @@
 class ScRangeName;
 
 class RangeNameBufferWK3;
-class ShrfmlaBuffer;
+class SharedFormulaBuffer;
 class ExtNameBuff;
 class ExtSheetBuffer;
 class ExcelToSc;
@@ -51,7 +51,7 @@ struct RootData     // -> Inkarnation jeweils im ImportExcel-Objekt!
 {
     BiffTyp             eDateiTyp;              // feine Differenzierung
     ExtSheetBuffer*     pExtSheetBuff;
-    ShrfmlaBuffer*      pShrfmlaBuff;
+    SharedFormulaBuffer*      pShrfmlaBuff;
     ExtNameBuff*        pExtNameBuff;
     ExcelToSc*          pFmlaConverter;
     XclImpColRowSettings* pColRowBuff;        // Col/Row-Einstellungen 1 Tabelle