connectivity/source/drivers/firebird/Connection.hxx | 75 +++++++++-----------
cui/source/options/optaboutconfig.cxx | 2
2 files changed, 35 insertions(+), 42 deletions(-)
New commits:
commit a865c1a4bf6dae773e8437d486520edd36d51c1e
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Mon Sep 9 20:56:20 2013 +0100
WaE: unused variable 'aText'
Change-Id: Ief0af6dd64e5d144dd6396789068b3c7dae977bc
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 3de545f..1c8e682 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -60,8 +60,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeCuiCustomMultilineEdit(Wind
void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent )
{
- OUString aText;
-
bool bValid;
bool bNonSpace = rKeyEvent.GetKeyCode().GetCode() != KEY_SPACE;
if( bNumericOnly && bNonSpace )
commit 82abb4ebde073aad7489f4c981e2bbe6d76960ca
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Mon Sep 9 20:03:38 2013 +0100
Cleanup public parts of Connection a little.
Change-Id: I76b0f9e547ce604aaace129a60c99b0beceac300
diff --git a/connectivity/source/drivers/firebird/Connection.hxx
b/connectivity/source/drivers/firebird/Connection.hxx
index 0d4e484..4a5c9e5 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -76,16 +76,9 @@ namespace connectivity
*/
static const OUString our_sDBLocation;
protected:
- ::osl::Mutex m_aMutex;
- public:
- ::osl::Mutex& getMutex()
- { return m_aMutex; }
- protected:
-
+ ::osl::Mutex m_aMutex;
-
-
- TTypeInfoVector m_aTypeInfo; // vector
containing an entry
+ TTypeInfoVector m_aTypeInfo; // vector containing an entry
// for
each row returned by
//
DatabaseMetaData.getTypeInfo.
/** The parent driver that created this connection. */
@@ -146,9 +139,9 @@ namespace connectivity
* version, hence we need to rebuild the indexes when switching icu
* versions.
*/
- void rebuildIndexes()
+ void rebuildIndexes()
throw(::com::sun::star::sdbc::SQLException);
- void buildTypeInfo()
+ void buildTypeInfo()
throw(::com::sun::star::sdbc::SQLException);
/**
@@ -156,19 +149,45 @@ namespace connectivity
* necessary discarding an existing transaction. This has to be
done
* anytime we change the transaction isolation, or autocommiting.
*/
- void setupTransaction()
+ void setupTransaction()
throw(::com::sun::star::sdbc::SQLException);
- void disposeStatements();
+ void disposeStatements();
+
public:
+ Connection(FirebirdDriver* _pDriver);
+ virtual ~Connection();
+
virtual void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& info)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- Connection(FirebirdDriver* _pDriver);
- virtual ~Connection();
+ FirebirdDriver* getDriver() const {return m_pDriver;}
+
+ ::rtl::OUString getConnectionURL() const {return
m_sConnectionURL;}
+ sal_Bool isEmbedded() const {return m_bIsEmbedded;}
+ ::rtl::OUString getUserName() const {return m_sUser;}
+ ::osl::Mutex& getMutex() {return m_aMutex;}
+ isc_db_handle& getDBHandle() {return m_aDBHandle;}
+ isc_tr_handle& getTransaction()
+ throw(::com::sun::star::sdbc::SQLException);
- void closeAllStatements () throw(
::com::sun::star::sdbc::SQLException);
+ /**
+ * Create a new Blob tied to this connection. Blobs are tied to a
+ * transaction and not to a statement, hence the connection should
+ * deal with their management.
+ */
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>
+ createBlob(ISC_QUAD* pBlobID)
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
+
+ /**
+ * Create and/or connect to the sdbcx Catalog. This is completely
+ * unrelated to the SQL "Catalog".
+ */
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbcx::XTablesSupplier >
+ createCatalog();
// OComponentHelper
virtual void SAL_CALL disposing(void);
@@ -206,30 +225,6 @@ namespace connectivity
// css.lang.XEventListener
virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source ) throw
(::com::sun::star::uno::RuntimeException);
- inline ::rtl::OUString getUserName() const { return
m_sUser; }
- inline isc_db_handle& getDBHandle() { return m_aDBHandle;
}
- inline FirebirdDriver* getDriver() const { return
m_pDriver;}
-
- ::rtl::OUString getConnectionURL() const { return
m_sConnectionURL; }
- sal_Bool isEmbedded() const { return
m_bIsEmbedded; }
- isc_tr_handle& getTransaction()
throw(::com::sun::star::sdbc::SQLException);
-
- /**
- * Create a new Blob tied to this connection. Blobs are tied to a
- * transaction and not to a statement, hence the connection should
- * deal with their management.
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>
- createBlob(ISC_QUAD* pBlobID)
- throw(::com::sun::star::sdbc::SQLException,
- ::com::sun::star::uno::RuntimeException);
-
- /**
- * Create and/or connect to the sdbcx Catalog. This is completely
- * unrelated to the SQL "Catalog".
- */
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sdbcx::XTablesSupplier >
- createCatalog();
};
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
