Merge remote branch 'extensions/master'MELD_LIBREOFFICE_REPOS

* extensions/master: (978 commits)
  get this building for me
  Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
  enable l10n of presenter screen
  oops Bjoern's .gitattributes link got commited by mistake
  enable l10n of presenter screen
  Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
  poppler 0.17.0 changed its api for no some reason or other
  Branch libreoffice-3-4-2
  Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
  Remove component_getImplementationEnvironment
  hotfix to include localizations of Presenter screen extension
  hotfix to include localizations of Presenter screen extension
  Goodbye to CWS_WORK_STAMP
  use OString::equalsL
  fixing rebase errors
  ause130: #i117218# change .idl handling to gnu make
  CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
  Use DESKTOP and NATIVE where appropriate
  Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
  createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
  ...

1 files changed, 111 insertions, 0 deletions

diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
new file mode 100644
index 000000000000..aad30a06d5da
--- /dev/null
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
+#define CONNECTIVITY_SRESULSETMETADATA_HXX
+
+#include "mysqlc_connection.hxx"
+
+#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+#include <cppconn/resultset_metadata.h>
+
+namespace connectivity
+{
+    namespace mysqlc
+    {
+        using ::com::sun::star::sdbc::SQLException;
+        using ::com::sun::star::uno::RuntimeException;
+        using ::rtl::OUString;
+        //**************************************************************
+        //************ Class: ResultSetMetaData
+        //**************************************************************
+        typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+
+        class OResultSetMetaData : public OResultSetMetaData_BASE
+        {
+            sql::ResultSetMetaData * meta;
+            rtl_TextEncoding        m_encoding;
+        protected:
+            virtual ~OResultSetMetaData();
+        public:
+            OResultSetMetaData( sql::ResultSetMetaData * _meta, rtl_TextEncoding _encoding )
+                :meta(_meta)
+                ,m_encoding( _encoding )
+            {
+            }
+
+            inline ::rtl::OUString convert( const ::std::string& _string ) const
+            {
+                return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding );
+            }
+
+            /// Avoid ambigous cast error from the compiler.
+            inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
+            { return this; }
+
+            sal_Int32 SAL_CALL getColumnCount()                     throw(SQLException, RuntimeException);
+
+            sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column)     throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column)     throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isSearchable(sal_Int32 column)        throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isCurrency(sal_Int32 column)          throw(SQLException, RuntimeException);
+
+            sal_Int32 SAL_CALL isNullable(sal_Int32 column)         throw(SQLException, RuntimeException);
+
+            sal_Bool SAL_CALL isSigned(sal_Int32 column)            throw(SQLException, RuntimeException);
+
+            sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException);
+
+            OUString SAL_CALL getColumnLabel(sal_Int32 column)      throw(SQLException, RuntimeException);
+            OUString SAL_CALL getColumnName(sal_Int32 column)       throw(SQLException, RuntimeException);
+            OUString SAL_CALL getSchemaName(sal_Int32 column)       throw(SQLException, RuntimeException);
+
+            sal_Int32 SAL_CALL getPrecision(sal_Int32 column)       throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getScale(sal_Int32 column)           throw(SQLException, RuntimeException);
+
+            OUString SAL_CALL getTableName(sal_Int32 column)        throw(SQLException, RuntimeException);
+            OUString SAL_CALL getCatalogName(sal_Int32 column)      throw(SQLException, RuntimeException);
+
+            sal_Int32 SAL_CALL getColumnType(sal_Int32 column)      throw(SQLException, RuntimeException);
+
+            OUString SAL_CALL getColumnTypeName(sal_Int32 column)   throw(SQLException, RuntimeException);
+
+            sal_Bool SAL_CALL isReadOnly(sal_Int32 column)          throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isWritable(sal_Int32 column)          throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException);
+
+            OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException);
+
+            void checkColumnIndex(sal_Int32 columnIndex)            throw (SQLException, RuntimeException);
+        };
+    }
+}
+
+#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */