From ac9212feedb828064c5cf5cbb0bde8f02cc93d65 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 17:59:09 +0100 Subject: Remove visual noise from connectivity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: connectivity/source/inc/odbc/OConnection.hxx Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626 Reviewed-on: https://gerrit.libreoffice.org/8245 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- .../mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4 ++-- .../mozab/mozillasrc/MDatabaseMetaDataHelper.hxx | 2 +- .../drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 20 ++++++++++---------- .../drivers/mozab/mozillasrc/MLdapAttributeMap.hxx | 12 ++++++------ .../source/drivers/mozab/mozillasrc/MNSInclude.hxx | 4 ++-- .../source/drivers/mozab/mozillasrc/MQuery.cxx | 22 +++++++++++----------- .../drivers/mozab/mozillasrc/MQueryHelper.cxx | 8 ++++---- 7 files changed, 36 insertions(+), 36 deletions(-) (limited to 'connectivity/source/drivers/mozab/mozillasrc') diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index e71d28ba965a..04b25a247ad6 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -183,9 +183,9 @@ static nsresult insertPABDescription() } return rv; } -// + // nsAbDirectoryDataSource -// + #define NS_RDF_CONTRACTID "@mozilla.org/rdf" #define NS_RDF_DATASOURCE_CONTRACTID NS_RDF_CONTRACTID "/datasource;1" #define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name=" diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 4aa86de5bf92..fc690313fbb9 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -47,7 +47,7 @@ namespace connectivity MDatabaseMetaDataHelper(); ~MDatabaseMetaDataHelper(); - // + sal_Bool getTableStrings( OConnection* _pCon, ::std::vector< OUString >& _rStrings, ::std::vector< OUString >& _rTypes); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 1324d7822a97..9c346b00ddc4 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -31,13 +31,13 @@ #include -//........................................................................ + namespace connectivity { namespace mozab { -//........................................................................ - //==================================================================== + + //= helper - //==================================================================== + namespace { typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**)); @@ -131,16 +131,16 @@ namespace connectivity { namespace mozab { } } - //==================================================================== + //= AttributeMap_Data - //==================================================================== + struct AttributeMap_Data { }; - //==================================================================== + //= MLdapAttributeMap - //==================================================================== + MLdapAttributeMap::MLdapAttributeMap() :m_pData( new AttributeMap_Data ) @@ -436,8 +436,8 @@ namespace connectivity { namespace mozab { } } -//........................................................................ + } } // namespace connectivity::mozab -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index 8a34d6c9efaf..1ed096ea06e1 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx @@ -24,16 +24,16 @@ #include -//........................................................................ + namespace connectivity { namespace mozab { -//........................................................................ + struct AttributeMap_Data; class MQueryHelperResultEntry; - //==================================================================== + //= class MLdapAttributeMap - //==================================================================== + /** implements the nsIAbLDAPAttributeMap interface Somewhere between Mozilla 1.7.5 and SeaMonkey 1.1.12, the LDAP address book @@ -61,9 +61,9 @@ namespace connectivity { namespace mozab { ::std::auto_ptr< AttributeMap_Data > m_pData; }; -//........................................................................ + } } // namespace connectivity::mozab -//........................................................................ + #endif // CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx index 9073f4546c38..b5ab0f756b89 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx @@ -19,9 +19,9 @@ #ifndef _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ #define _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ -// + // Only include Mozilla include files once and using this file... -// + // moved this here and in first position due to "long l;" unxsoli4 warning #include diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 2395bd0009b0..9a03fcea28af 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -53,7 +53,7 @@ using namespace connectivity; // Used to store an nsIAbDirectoryQuery member without the need to use Mozilla // types in the MQuery.hxx file. -// + namespace connectivity { namespace mozab { struct MQueryDirectory { @@ -86,7 +86,7 @@ MQuery::~MQuery() // MQueryHelper is reference counted, so we need to decrement the // count here. - // + if ( m_aQueryDirectory->contextId != -1 && m_aQueryDirectory->directoryQuery != NULL ) m_aQueryDirectory->directoryQuery->StopQuery(m_aQueryDirectory->contextId); @@ -109,7 +109,7 @@ void MQuery::construct() m_aQueryDirectory = new MQueryDirectory(); // MQueryHelper is reference counted, so we need to add to the // count here to prevent accidental deletion else where... - // + m_aQueryHelper = new MQueryHelper(); NS_IF_ADDREF( m_aQueryHelper); } @@ -564,11 +564,11 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) } -// -// + + // If the query executed is being done asynchronously then this may return // -1 as the count, ie. it's undetermined. -// + sal_Int32 MQuery::getRowCount() { @@ -576,21 +576,21 @@ MQuery::getRowCount() } -// -// + + // As opposed to getRowCount() this returns the actual number of rows fetched // so far (if is an async query) -// + sal_uInt32 MQuery::getRealRowCount() { return( m_aQueryHelper->getRealCount() ); } -// + // If the query executed is being done asynchronously then this may be // false -// + sal_Bool MQuery::queryComplete( void ) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 0e9264a39fad..a2ea1ea7c28f 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -34,9 +34,9 @@ using namespace connectivity::mozab; NS_IMPL_THREADSAFE_ISUPPORTS1(connectivity::mozab::MQueryHelper,nsIAbDirectoryQueryResultListener) -// + // class MQueryHelperResultEntry -// + MQueryHelperResultEntry::MQueryHelperResultEntry() @@ -83,9 +83,9 @@ void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rVa { m_Fields[ key ] = rValue; } -// + // class MQueryHelper -// + MQueryHelper::MQueryHelper() :m_nIndex( 0 ) ,m_bHasMore( sal_True ) -- cgit