Rename TypedStrData to ScTypedStrData, just to be consistent.

6 files changed, 32 insertions, 33 deletions

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e5e78f39a95a..da5e168170bc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -62,7 +62,7 @@ class ScMarkData;
 class ScPatternAttr;
 class ScStyleSheet;
 class SvtBroadcaster;
-class TypedStrData;
+class ScTypedStrData;
 class ScProgress;
 class ScPostIt;
 struct ScFunctionData;
@@ -379,8 +379,8 @@ public:
                 /// Including current, may return -1
     SCsROW      GetNextUnprotected( SCROW nRow, bool bUp ) const;
 
-    void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<TypedStrData>& rStrings, bool& rHasDates);
-    bool GetDataEntries(SCROW nRow, std::set<TypedStrData>& rStrings, bool bLimit);
+    void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
+    bool GetDataEntries(SCROW nRow, std::set<ScTypedStrData>& rStrings, bool bLimit);
 
     void        UpdateInsertTabAbs(SCTAB nNewPos);
     bool    TestTabRefAbs(SCTAB nTable);
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a796c3294098..343a62da07e8 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1486,15 +1486,15 @@ public:
      * database range that contains the specified cell position.
      */
     bool GetFilterEntries(
-        SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<TypedStrData>& rStrings, bool& rHasDates);
+        SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
 
     SC_DLLPUBLIC bool GetFilterEntriesArea(
         SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens,
-        std::vector<TypedStrData>& rStrings, bool& rHasDates);
+        std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
 
     bool GetDataEntries(
         SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens,
-        std::vector<TypedStrData>& rStrings, bool bLimit = false );
+        std::vector<ScTypedStrData>& rStrings, bool bLimit = false );
     bool GetFormulaEntries( ScTypedCaseStrSet& rStrings );
 
     bool HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab );
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 55a6aeae24ff..3619f03dfcb3 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -92,7 +92,7 @@
 #define DP_PROP_FILTER              "Filter"
 #define DP_PROP_POSITION            "Position"
 
-class TypedStrData;
+class ScTypedStrData;
 class ScDPObject;
 class ScDPInfoWnd;
 class ScDocShell;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2bae9938d79d..bb11dd5ed574 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -761,9 +761,9 @@ public:
     SCSIZE      Query(ScQueryParam& rQueryParam, bool bKeepSub);
     bool        CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
 
-    void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, std::vector<TypedStrData>& rStrings, bool& rHasDates);
-    void GetFilteredFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, std::vector<TypedStrData>& rStrings, bool& rHasDates );
-    bool GetDataEntries(SCCOL nCol, SCROW nRow, std::set<TypedStrData>& rStrings, bool bLimit);
+    void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, std::vector<ScTypedStrData>& rStrings, bool& rHasDates);
+    void GetFilteredFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, std::vector<ScTypedStrData>& rStrings, bool& rHasDates );
+    bool GetDataEntries(SCCOL nCol, SCROW nRow, std::set<ScTypedStrData>& rStrings, bool bLimit);
 
     bool        HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
     bool        HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 2e7d28a3fde9..e33d16ae3110 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -34,7 +34,7 @@
 
 #include <set>
 
-class TypedStrData
+class ScTypedStrData
 {
 public:
     enum StringType {
@@ -45,39 +45,38 @@ public:
         Header   = 4
     };
 
-    TypedStrData( const rtl::OUString& rStr, double nVal = 0.0,
-                  StringType eType = Standard );
+    ScTypedStrData( const rtl::OUString& rStr, double nVal = 0.0,
+                    StringType eType = Standard );
 
-    TypedStrData( const TypedStrData& rCpy );
+    ScTypedStrData( const ScTypedStrData& rCpy );
 
     bool IsStrData() const;
     SC_DLLPUBLIC const rtl::OUString& GetString() const;
     double GetValue() const;
     StringType GetStringType() const;
 
-    struct LessCaseSensitive : std::binary_function<TypedStrData, TypedStrData, bool>
+    struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
     {
-        bool operator() (const TypedStrData& left, const TypedStrData& right) const;
+        bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
     };
 
-    struct LessCaseInsensitive : std::binary_function<TypedStrData, TypedStrData, bool>
+    struct LessCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
     {
-        bool operator() (const TypedStrData& left, const TypedStrData& right) const;
+        bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
     };
 
-    struct EqualCaseSensitive : std::binary_function<TypedStrData, TypedStrData, bool>
+    struct EqualCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
     {
-        bool operator() (const TypedStrData& left, const TypedStrData& right) const;
+        bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
     };
 
-    struct EqualCaseInsensitive : std::binary_function<TypedStrData, TypedStrData, bool>
+    struct EqualCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
     {
-        bool operator() (const TypedStrData& left, const TypedStrData& right) const;
+        bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const;
     };
 
-    bool operator== (const TypedStrData& r) const;
-    bool operator< (const TypedStrData& r) const;
-
+    bool operator== (const ScTypedStrData& r) const;
+    bool operator< (const ScTypedStrData& r) const;
 
 private:
     rtl::OUString maStrValue;
@@ -85,16 +84,16 @@ private:
     StringType meStrType;
 };
 
-class FindTypedStrData : std::unary_function<TypedStrData, bool>
+class FindTypedStrData : std::unary_function<ScTypedStrData, bool>
 {
-    TypedStrData maVal;
+    ScTypedStrData maVal;
     bool mbCaseSens;
 public:
-    FindTypedStrData(const TypedStrData& rVal, bool bCaseSens);
-    bool operator() (const TypedStrData& r) const;
+    FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens);
+    bool operator() (const ScTypedStrData& r) const;
 };
 
-typedef std::set<TypedStrData, TypedStrData::LessCaseSensitive> ScTypedCaseStrSet;
+typedef std::set<ScTypedStrData, ScTypedStrData::LessCaseSensitive> ScTypedCaseStrSet;
 
 #endif
 
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 44bc37a290b8..b8a661ffefee 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -37,7 +37,7 @@ namespace ValidListType = ::com::sun::star::sheet::TableValidationVisibility;
 
 class ScPatternAttr;
 class ScTokenArray;
-class TypedStrData;
+class ScTypedStrData;
 
 enum ScValidationMode
 {
@@ -131,7 +131,7 @@ public:
         @descr  Fills the list only, if this is a list validation and IsShowList() is enabled.
         @param rStrings  (out-param) The string list to fill with list validation entires.
         @return  true = rStrings has been filled with at least one entry. */
-    bool FillSelectionList(std::vector<TypedStrData>& rStrings, const ScAddress& rPos) const;
+    bool FillSelectionList(std::vector<ScTypedStrData>& rStrings, const ScAddress& rPos) const;
 
                     //  with string: during input, with cell: for detective / RC_FORCED
     sal_Bool            IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
@@ -166,7 +166,7 @@ private:
         @param rMatch    (out-param) the index of the first item that matched, -1 if nothing matched.
         @return  true = Cell range found, rRange is valid, or an error entry stuffed into the list if pCell==NULL. */
     bool GetSelectionFromFormula(
-        std::vector<TypedStrData>* pStrings, ScBaseCell* pCell, const ScAddress& rPos,
+        std::vector<ScTypedStrData>* pStrings, ScBaseCell* pCell, const ScAddress& rPos,
         const ScTokenArray& rTokArr, int& rMatch) const;
 
     /** Tests, if pCell is equal to what the passed token array represents. */