summaryrefslogtreecommitdiff
path: root/connectivity/source/commontools
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2015-05-15 13:27:19 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-15 17:55:15 +0000
commit5b1337f7b2e1f79d78d4bf6559bd84f1ebb934bf (patch)
tree82704da8367f25963d08c570a4fa57e30e4ca839 /connectivity/source/commontools
parent6fbda0905d4e721392038bfad9e173e180f788ee (diff)
tdf#62475: partial handmade fixes
Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4 Reviewed-on: https://gerrit.libreoffice.org/15712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'connectivity/source/commontools')
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx4
-rw-r--r--connectivity/source/commontools/conncleanup.cxx4
-rw-r--r--connectivity/source/commontools/dbcharset.cxx12
-rw-r--r--connectivity/source/commontools/dbexception.cxx9
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx7
-rw-r--r--connectivity/source/commontools/filtermanager.cxx4
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx7
-rw-r--r--connectivity/source/commontools/parameters.cxx8
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx8
-rw-r--r--connectivity/source/commontools/predicateinput.cxx4
-rw-r--r--connectivity/source/commontools/propertyids.cxx2
-rw-r--r--connectivity/source/commontools/sqlerror.cxx10
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx7
-rw-r--r--connectivity/source/commontools/warningscontainer.cxx4
14 files changed, 2 insertions, 88 deletions
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 21554757602a..0662f68d8797 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -896,8 +896,6 @@ namespace
};
}
-//= registration
-
extern "C"
{
@@ -907,6 +905,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char*
return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
}
-} // extern "C"
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index b5882d01475a..1decb69a5618 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -34,10 +34,6 @@ namespace dbtools
static const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
-
- //= OAutoConnectionDisposer
-
-
OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection)
:m_xRowSet( _rxRowSet )
,m_bRSListening( false )
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 99a5b62d8fd4..f8267bf4d2e4 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -26,11 +26,6 @@
namespace dbtools
{
-
-
- //= OCharsetMap
-
-
OCharsetMap::OCharsetMap()
{
}
@@ -129,9 +124,6 @@ namespace dbtools
}
- //= CharsetIteratorDerefHelper
-
-
CharsetIteratorDerefHelper::CharsetIteratorDerefHelper( const CharsetIteratorDerefHelper& _rSource )
:m_eEncoding( _rSource.m_eEncoding )
,m_aIanaName( _rSource.m_aIanaName )
@@ -145,10 +137,6 @@ namespace dbtools
{
}
-
- //= OCharsetMap::CharsetIterator
-
-
OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos )
:m_pContainer( _pContainer )
,m_aPos( _aPos )
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 38f6d67815cc..fa69855f95fc 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -39,10 +39,6 @@ namespace dbtools
using namespace ::comphelper;
using namespace ::connectivity;
-
-//= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class
-
-
SQLExceptionInfo::SQLExceptionInfo()
:m_eType(UNDEFINED)
{
@@ -262,11 +258,6 @@ void SQLExceptionInfo::doThrow()
throw RuntimeException();
}
-
-//= SQLExceptionIteratorHelper
-
-
-
SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo& _rChainStart )
:m_pCurrent( NULL )
,m_eCurrentType( SQLExceptionInfo::UNDEFINED )
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index fc2f1fd74728..f5a987b51b07 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -72,9 +72,6 @@ namespace dbtools
namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
-
- //= DatabaseMetaData_Impl
-
struct DatabaseMetaData_Impl
{
Reference< XConnection > xConnection;
@@ -180,10 +177,6 @@ namespace dbtools
}
}
-
- //= DatabaseMetaData
-
-
DatabaseMetaData::DatabaseMetaData()
:m_pImpl( new DatabaseMetaData_Impl )
{
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 0104e7ff04fa..ff1f03ec6806 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -38,10 +38,6 @@ namespace dbtools
using namespace ::com::sun::star::beans;
using namespace connectivity;
-
- //= FilterManager
-
-
FilterManager::FilterManager( )
:m_aFilterComponents( FC_COMPONENT_COUNT )
,m_bApplyPublicFilter( true )
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index a164763a8114..02bebf655366 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -66,9 +66,6 @@ namespace dbtools
namespace DataType = ::com::sun::star::sdbc::DataType;
namespace NumberFormat = ::com::sun::star::util::NumberFormat;
-
- //= FormattedColumnValue_Data
-
struct FormattedColumnValue_Data
{
Reference< XNumberFormatter > m_xFormatter;
@@ -211,10 +208,6 @@ namespace dbtools
}
}
-
- //= FormattedColumnValue
-
-
FormattedColumnValue::FormattedColumnValue( const Reference< XComponentContext >& _rxContext,
const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn )
:m_pData( new FormattedColumnValue_Data )
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 84ad4e4f8bed..8459ae933c9a 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -55,10 +55,6 @@ namespace dbtools
using namespace ::comphelper;
using namespace ::connectivity;
-
- //= ParameterManager
-
-
ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XComponentContext >& _rxContext )
:m_rMutex ( _rMutex )
,m_aParameterListeners( _rMutex )
@@ -1083,10 +1079,6 @@ namespace dbtools
m_xInnerParamUpdate->clearParameters( );
}
-
- //= OParameterContinuation
-
-
void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception )
{
m_aValues = _rValues;
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 70c9564e2811..fc575550b570 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -62,10 +62,6 @@ namespace param
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
namespace DataType = ::com::sun::star::sdbc::DataType;
-
- //= ParameterWrapper
-
-
ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn )
:PropertyBase( m_aBHelper )
,m_xDelegator( _rxColumn )
@@ -262,10 +258,6 @@ namespace param
m_aBHelper.bDisposed = sal_True;
}
-
- //= ParameterWrapperContainer
-
-
ParameterWrapperContainer::ParameterWrapperContainer()
:ParameterWrapperContainer_Base( m_aMutex )
{
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index bbb0863b9a00..92786f38e230 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -73,10 +73,6 @@ namespace dbtools
return nReturn;
}
-
- //= OPredicateInputController
-
-
bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
{
_rDecSep = '.';
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 2a5322ddd0d3..7acbe464a787 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -84,7 +84,7 @@ namespace dbtools
case PROPERTY_ID_DBASEPRECISIONCHANGED: pStr = "DbasePrecisionChanged"; break;
case PROPERTY_ID_ISCURRENCY: pStr = "IsCurrency"; break;
case PROPERTY_ID_ISBOOKMARKABLE: pStr = "IsBookmarkable"; break;
- case PROPERTY_ID_HY010: pStr = "HY010"; break; //= error messages
+ case PROPERTY_ID_HY010: pStr = "HY010"; break; // error messages
case PROPERTY_ID_DELIMITER: pStr = "/"; break;
case PROPERTY_ID_FORMATKEY: pStr = "FormatKey"; break;
case PROPERTY_ID_LOCALE: pStr = "Locale"; break;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index fa5f4c034ebc..f5318f80cba2 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -53,8 +53,6 @@ namespace connectivity
}
- //= SQLError_Impl - declaration
-
class SQLError_Impl
{
public:
@@ -95,10 +93,6 @@ namespace connectivity
bool m_bAttemptedInit;
};
-
- //= SQLError_Impl - implementation
-
-
SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
:m_aContext( _rxContext )
,m_pResources( )
@@ -282,10 +276,6 @@ namespace connectivity
return m_pResources.get() != NULL;
}
-
- //= SQLError
-
-
SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
:m_pImpl( new SQLError_Impl( _rxContext ) )
{
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 9838787f4fcd..5057aaf158f9 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -52,9 +52,6 @@ namespace dbtools
namespace CommandType = ::com::sun::star::sdb::CommandType;
-
- //= StatementComposer_Data
-
struct StatementComposer_Data
{
const Reference< XConnection > xConnection;
@@ -233,10 +230,6 @@ namespace dbtools
}
}
-
- //= StatementComposer
-
-
StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
const OUString& _rCommand, const sal_Int32 _nCommandType, const bool _bEscapeProcessing )
:m_pData( new StatementComposer_Data( _rxConnection ) )
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index e17e2cb82a06..4afe81aeaef8 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -32,10 +32,6 @@ namespace dbtools
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
-
- //= WarningsContainer
-
-
static void lcl_concatWarnings( Any& _rChainLeft, const Any& _rChainRight )
{
if ( !_rChainLeft.hasValue() )