refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

7 files changed, 5 insertions, 12 deletions

diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 1f1f4f8dd32a..3c598526a63c 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -197,7 +197,7 @@ void OSQLAnalyzer::dispose()
     }
 }
 
-void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
+void OSQLAnalyzer::setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols)
 {
     m_aCompiler->setOrigColumns(rCols);
     for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 8f7c828bed91..4dbf6a3091c3 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -39,8 +39,6 @@ namespace connectivity
                                                ::com::sun::star::lang::XUnoTunnel
                                            > OMetaConnection_BASE;
 
-    typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >  TConditions;
-
     class OOO_DLLPUBLIC_DBTOOLS OMetaConnection : public OMetaConnection_BASE
     {
     protected:
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 8a3af3dca736..dd152a5745f2 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -30,7 +30,6 @@
 
 namespace connectivity
 {
-        typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >  TConditions;
         class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
                                         public  comphelper::OBaseMutex,
                                         public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData2,
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index ebcaf0efca38..f03c67ca8e00 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -75,7 +75,7 @@ namespace connectivity
             bool hasFunctions() const;
             inline bool evaluateRestriction()   { return m_aInterpreter->start(); }
             void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
-            void setOrigColumns(const OFileColumns& rCols);
+            void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols);
             static OOperandAttr* createOperandAttr(sal_Int32 _nPos,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL);
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 0a55d94bc4e8..913c01a309d6 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -42,9 +42,6 @@ namespace connectivity
         class OBoolOperator;
         typedef ::std::map<sal_Int32,sal_Int32> OEvaluateSet;
 
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> OFileColumns;
-
-
         class OOO_DLLPUBLIC_FILE OCode
         {
         public:
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 5b0d52c8b644..68ab356ccdd7 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -39,7 +39,7 @@ namespace connectivity
             friend class OSQLAnalyzer;
 
             OCodeList                               m_aCodeList;
-            OFileColumns                            m_orgColumns; // in filecurs this are the filecolumns
+            css::uno::Reference< css::container::XNameAccess>                           m_orgColumns; // in filecurs this are the filecolumns
             OSQLAnalyzer*                           m_pAnalyzer;
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xIndexes;
             sal_Int32                               m_nParamCounter;
@@ -65,8 +65,8 @@ namespace connectivity
             void Clean();
             bool isClean() const {return m_aCodeList.empty();}
             bool hasCode() const {return !isClean();}
-            void     setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; }
-            const OFileColumns getOrigColumns() const { return m_orgColumns; }
+            void  setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols) { m_orgColumns = rCols; }
+            const css::uno::Reference< css::container::XNameAccess> getOrigColumns() const { return m_orgColumns; }
         protected:
             OOperand* execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             OOperand* execute_LIKE(connectivity::OSQLParseNode* pPredicateNode) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 7bd7766f3526..5ea18fcc4b87 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -66,7 +66,6 @@ namespace connectivity
         typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr;
         typedef ::std::allocator< TVoidPtr > TVoidAlloc;
         typedef ::std::vector<TVoidPtr> TVoidVector;
-        //  typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector;
         /// unary_function Functor object for class ZZ returntype is void
         struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool >
         {