diff options
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/inc/pch/precompiled_ado.hxx | 26 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_calc.hxx | 30 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_dbase.hxx | 92 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_dbpool2.hxx | 8 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_dbtools.hxx | 31 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_file.hxx | 84 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_firebird_sdbc.hxx | 18 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_flat.hxx | 64 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_mysql_jdbc.hxx | 176 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_odbc.hxx | 48 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx | 9 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 4 |
12 files changed, 292 insertions, 298 deletions
diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 2376a46f8660..90e1a8ed1129 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:13:59 using: + Generated on 2020-02-01 19:24:06 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,10 +26,12 @@ #include <cstddef> #include <cstdlib> #include <limits> +#include <map> #include <memory> #include <oledb.h> #include <sstream> #include <string> +#include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -50,6 +52,7 @@ #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/FetchDirection.hpp> @@ -58,29 +61,50 @@ #include <com/sun/star/sdbc/ProcedureResult.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> +#include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/sdbc/XColumnLocate.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaData.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> +#include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/XRowUpdate.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/uno/Reference.h> +#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/util/Date.hpp> +#include <com/sun/star/util/XCancellable.hpp> +#include <comphelper/proparrhlp.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/cppuhelperdllapi.h> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> +#include <resource/sharedresources.hxx> #include <salhelper/singletonref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <OColumn.hxx> +#include <TConnection.hxx> +#include <connectivity/CommonTools.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> +#include <connectivity/sdbcx/VCollection.hxx> #endif // PCH_LEVEL >= 4 // Cleanup windows header macro pollution. diff --git a/connectivity/inc/pch/precompiled_calc.hxx b/connectivity/inc/pch/precompiled_calc.hxx index 39da5dec46e2..2c36c7a89818 100644 --- a/connectivity/inc/pch/precompiled_calc.hxx +++ b/connectivity/inc/pch/precompiled_calc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:00 using: + Generated on 2020-01-22 15:57:33 using: ./bin/update_pch connectivity calc --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,12 +25,10 @@ #include <cstddef> #include <cstring> #include <limits> -#include <memory> #include <new> #include <string_view> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 -#include <osl/thread.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> #include <rtl/math.hxx> @@ -44,30 +42,34 @@ #include <rtl/uuid.h> #include <sal/config.h> #include <sal/log.hxx> -#include <sal/saldllapi.h> #include <sal/types.h> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/sdbc/ColumnValue.hpp> -#include <com/sun/star/sdbc/DataType.hpp> +#include <calc/CCatalog.hxx> +#include <calc/CConnection.hxx> +#include <calc/CDatabaseMetaData.hxx> +#include <calc/CDriver.hxx> +#include <calc/CTable.hxx> +#include <calc/CTables.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sheet/XCellRangeAddressable.hpp> -#include <com/sun/star/sheet/XCellRangesQuery.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <com/sun/star/sheet/XDatabaseRanges.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> -#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/util/NumberFormat.hpp> -#include <comphelper/processfactory.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/cppuhelperdllapi.h> -#include <o3tl/typed_flags_set.hxx> -#include <svl/svldllapi.h> +#include <file/filedllapi.hxx> +#include <resource/sharedresources.hxx> +#include <tools/toolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <connectivity/CommonTools.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtoolsdllapi.hxx> #endif // PCH_LEVEL >= 4 diff --git a/connectivity/inc/pch/precompiled_dbase.hxx b/connectivity/inc/pch/precompiled_dbase.hxx index 7433450b4eb1..8882fc958888 100644 --- a/connectivity/inc/pch/precompiled_dbase.hxx +++ b/connectivity/inc/pch/precompiled_dbase.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:02 using: + Generated on 2020-02-01 10:57:27 using: ./bin/update_pch connectivity dbase --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -34,7 +34,7 @@ #include <memory> #include <new> #include <ostream> -#include <set> +#include <stack> #include <stddef.h> #include <string.h> #include <string> @@ -53,11 +53,9 @@ #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> -#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> -#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> @@ -88,6 +86,7 @@ #if PCH_LEVEL >= 3 #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> @@ -95,26 +94,32 @@ #include <com/sun/star/beans/XPropertySetOption.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp> -#include <com/sun/star/i18n/Calendar2.hpp> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include <com/sun/star/i18n/LanguageCountryInfo.hpp> -#include <com/sun/star/i18n/LocaleDataItem2.hpp> -#include <com/sun/star/i18n/LocaleItem.hpp> -#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> -#include <com/sun/star/i18n/TransliterationModules.hpp> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> -#include <com/sun/star/i18n/reservedWords.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/sdbc/XColumnLocate.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> +#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <com/sun/star/sdbcx/XGroupsSupplier.hpp> +#include <com/sun/star/sdbcx/XTablesSupplier.hpp> +#include <com/sun/star/sdbcx/XUsersSupplier.hpp> +#include <com/sun/star/sdbcx/XViewsSupplier.hpp> +#include <com/sun/star/ucb/XContent.hpp> +#include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -132,15 +137,15 @@ #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XCancellable.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> +#include <comphelper/propertycontainer.hxx> +#include <comphelper/propertycontainerhelper.hxx> #include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> @@ -149,32 +154,51 @@ #include <comphelper/uno3.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase_ex.hxx> +#include <cppuhelper/implbase_ex_post.hxx> +#include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/proptypehlp.h> #include <cppuhelper/proptypehlp.hxx> +#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/weak.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> -#include <i18nutil/transliteration.hxx> -#include <o3tl/strong_int.hxx> +#include <cppuhelper/weakagg.hxx> +#include <cppuhelper/weakref.hxx> +#include <dbase/DCatalog.hxx> +#include <dbase/DColumns.hxx> +#include <dbase/DConnection.hxx> +#include <dbase/DDatabaseMetaData.hxx> +#include <dbase/DDriver.hxx> +#include <dbase/DIndex.hxx> +#include <dbase/DIndexColumns.hxx> +#include <dbase/DIndexIter.hxx> +#include <dbase/DIndexes.hxx> +#include <dbase/DPreparedStatement.hxx> +#include <dbase/DResultSet.hxx> +#include <dbase/DStatement.hxx> +#include <dbase/DTable.hxx> +#include <dbase/DTables.hxx> +#include <file/fcode.hxx> +#include <file/filedllapi.hxx> +#include <o3tl/safeint.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> -#include <svl/nfkeytab.hxx> -#include <svl/ondemand.hxx> +#include <resource/sharedresources.hxx> +#include <salhelper/salhelperdllapi.h> +#include <salhelper/simplereferenceobject.hxx> #include <svl/svldllapi.h> #include <tools/config.hxx> -#include <tools/date.hxx> -#include <tools/datetime.hxx> #include <tools/lineend.hxx> -#include <tools/link.hxx> #include <tools/ref.hxx> #include <tools/stream.hxx> -#include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> @@ -183,22 +207,22 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/calendarwrapper.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/nativenumberwrapper.hxx> -#include <unotools/readwritemutexguard.hxx> #include <unotools/sharedunocomponent.hxx> -#include <unotools/syslocale.hxx> -#include <unotools/transliterationwrapper.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <TConnection.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> +#include <connectivity/IParseContext.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtoolsdllapi.hxx> +#include <connectivity/sdbcx/IRefreshable.hxx> +#include <connectivity/sdbcx/VCatalog.hxx> #include <connectivity/sdbcx/VColumn.hxx> +#include <connectivity/sqliterator.hxx> +#include <propertyids.hxx> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_dbpool2.hxx b/connectivity/inc/pch/precompiled_dbpool2.hxx index 55e63dc20c3b..b78f7d5a8f68 100644 --- a/connectivity/inc/pch/precompiled_dbpool2.hxx +++ b/connectivity/inc/pch/precompiled_dbpool2.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:02 using: + Generated on 2020-01-22 15:57:34 using: ./bin/update_pch connectivity dbpool2 --cutoff=5 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,7 +25,6 @@ #include <cassert> #include <cstddef> #include <cstring> -#include <functional> #include <initializer_list> #include <iomanip> #include <limits> @@ -37,7 +36,6 @@ #include <string_view> #include <type_traits> #include <utility> -#include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -58,7 +56,6 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> -#include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> #include <sal/saldllapi.h> @@ -71,11 +68,9 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> @@ -83,7 +78,6 @@ #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <typelib/typeclass.h> diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index ea2bc6c2e6cd..2decd6f0db0d 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:04 using: + Generated on 2020-02-01 10:57:27 using: ./bin/update_pch connectivity dbtools --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -27,6 +27,7 @@ #include <functional> #include <iterator> #include <limits> +#include <map> #include <memory> #include <new> #include <ostream> @@ -35,13 +36,12 @@ #include <string_view> #include <utility> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> +#include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/thread.h> -#include <rtl/alloc.h> #include <rtl/character.hxx> #include <rtl/locale.h> #include <rtl/math.hxx> @@ -76,6 +76,8 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XEventListener.hpp> +#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdb/BooleanComparisonMode.hpp> @@ -85,7 +87,6 @@ #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdb/XColumnUpdate.hpp> -#include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> @@ -94,20 +95,24 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> -#include <com/sun/star/sdbc/IndexType.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> -#include <com/sun/star/sdbc/ProcedureResult.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XBlob.hpp> +#include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> -#include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> +#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -118,14 +123,15 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XAggregation.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> +#include <comphelper/IdPropArrayHelper.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/enumhelper.hxx> @@ -133,6 +139,7 @@ #include <comphelper/numbers.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/property.hxx> +#include <comphelper/propertycontainer.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/servicehelper.hxx> @@ -152,7 +159,9 @@ #include <i18nlangtag/lang.h> #include <o3tl/any.hxx> #include <o3tl/functional.hxx> +#include <o3tl/safeint.hxx> #include <o3tl/typed_flags_set.hxx> +#include <resource/sharedresources.hxx> #include <salhelper/simplereferenceobject.hxx> #include <tools/diagnose_ex.h> #include <tools/toolsdllapi.h> @@ -161,6 +170,11 @@ #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <FDatabaseMetaDataResultSet.hxx> +#include <FDatabaseMetaDataResultSetMetaData.hxx> +#include <ParameterSubstitution.hxx> +#include <RowFunctionParser.hxx> +#include <TConnection.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/DriversConfig.hxx> #include <connectivity/FValue.hxx> @@ -186,7 +200,6 @@ #include <connectivity/sdbcx/VCollection.hxx> #include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> -#include <connectivity/sdbcx/VIndex.hxx> #include <connectivity/sdbcx/VIndexColumn.hxx> #include <connectivity/sdbcx/VKey.hxx> #include <connectivity/sdbcx/VKeyColumn.hxx> diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx index 45f42158b841..72acb30e6c62 100644 --- a/connectivity/inc/pch/precompiled_file.hxx +++ b/connectivity/inc/pch/precompiled_file.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:06 using: + Generated on 2020-01-22 15:57:35 using: ./bin/update_pch connectivity file --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,11 +24,13 @@ #include <algorithm> #include <cassert> #include <cstddef> +#include <cstring> #include <functional> #include <initializer_list> #include <iomanip> #include <limits> #include <map> +#include <math.h> #include <memory> #include <new> #include <ostream> @@ -40,23 +42,24 @@ #include <type_traits> #include <utility> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> +#include <osl/endian.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> -#include <osl/nlsupport.h> #include <osl/thread.h> +#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> -#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> @@ -70,6 +73,7 @@ #include <sal/config.h> #include <sal/log.hxx> #include <sal/macros.h> +#include <sal/mathconf.h> #include <sal/saldllapi.h> #include <sal/types.h> #include <sal/typesizes.h> @@ -86,19 +90,12 @@ #include <com/sun/star/beans/XPropertySetOption.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp> -#include <com/sun/star/i18n/Calendar2.hpp> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include <com/sun/star/i18n/LanguageCountryInfo.hpp> -#include <com/sun/star/i18n/LocaleDataItem2.hpp> -#include <com/sun/star/i18n/LocaleItem.hpp> -#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> -#include <com/sun/star/i18n/TransliterationModules.hpp> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> -#include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdb/SQLFilterOperator.hpp> @@ -110,7 +107,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/sdbcx/XIndexesSupplier.hpp> +#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -129,50 +126,70 @@ #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Time.hpp> +#include <comphelper/IdPropArrayHelper.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> +#include <comphelper/propertycontainer.hxx> +#include <comphelper/propertycontainerhelper.hxx> #include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/types.hxx> #include <comphelper/uno3.hxx> +#include <component/CColumns.hxx> +#include <component/CResultSet.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase_ex.hxx> +#include <cppuhelper/implbase_ex_post.hxx> +#include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/proptypehlp.h> -#include <cppuhelper/proptypehlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> -#include <i18nutil/transliteration.hxx> -#include <o3tl/strong_int.hxx> +#include <file/FCatalog.hxx> +#include <file/FColumns.hxx> +#include <file/FConnection.hxx> +#include <file/FDatabaseMetaData.hxx> +#include <file/FDateFunctions.hxx> +#include <file/FDriver.hxx> +#include <file/FNumericFunctions.hxx> +#include <file/FPreparedStatement.hxx> +#include <file/FResultSet.hxx> +#include <file/FResultSetMetaData.hxx> +#include <file/FStatement.hxx> +#include <file/FStringFunctions.hxx> +#include <file/FTable.hxx> +#include <file/FTables.hxx> +#include <file/fanalyzer.hxx> +#include <file/fcode.hxx> +#include <file/fcomp.hxx> +#include <file/filedllapi.hxx> +#include <o3tl/optional.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> +#include <resource/sharedresources.hxx> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <svl/nfkeytab.hxx> -#include <svl/ondemand.hxx> -#include <svl/svldllapi.h> #include <tools/date.hxx> -#include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/lineend.hxx> -#include <tools/link.hxx> #include <tools/ref.hxx> #include <tools/stream.hxx> #include <tools/time.hxx> @@ -185,23 +202,20 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/calendarwrapper.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/nativenumberwrapper.hxx> #include <unotools/options.hxx> -#include <unotools/readwritemutexguard.hxx> -#include <unotools/syslocale.hxx> -#include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <FDatabaseMetaDataResultSet.hxx> #include <connectivity/CommonTools.hxx> +#include <connectivity/FValue.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VColumn.hxx> +#include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/sqlparse.hxx> #endif // PCH_LEVEL >= 4 diff --git a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx index 728d2abec37b..deb68a2c2d93 100644 --- a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx +++ b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:07 using: + Generated on 2020-01-22 15:57:35 using: ./bin/update_pch connectivity firebird_sdbc --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,9 +25,8 @@ #include <cstddef> #include <memory> #include <stddef.h> -#include <string.h> #include <string_view> -#include <time.h> +#include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -37,29 +36,27 @@ #include <osl/process.h> #include <osl/thread.h> #include <osl/time.h> +#include <rtl/alloc.h> #include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> -#include <rtl/string.hxx> -#include <rtl/textenc.h> #include <rtl/unload.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/log.hxx> #include <sal/macros.h> -#include <sal/saldllapi.h> #include <sal/types.h> #include <sal/typesizes.h> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -68,15 +65,18 @@ #include <comphelper/comphelperdllapi.h> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> +#include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <salhelper/singletonref.hxx> +#include <resource/sharedresources.hxx> #include <unotools/localfilehelper.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <TConnection.hxx> +#include <connectivity/CommonTools.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> +#include <propertyids.hxx> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx index e5d01933008e..bcf25cae8f5c 100644 --- a/connectivity/inc/pch/precompiled_flat.hxx +++ b/connectivity/inc/pch/precompiled_flat.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:08 using: + Generated on 2020-01-22 15:57:36 using: ./bin/update_pch connectivity flat --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -34,7 +34,6 @@ #include <memory> #include <new> #include <ostream> -#include <set> #include <stddef.h> #include <string.h> #include <string> @@ -51,7 +50,6 @@ #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> -#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> @@ -84,37 +82,43 @@ #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertiesChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetOption.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/i18n/Calendar2.hpp> #include <com/sun/star/i18n/DirectionProperty.hpp> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> -#include <com/sun/star/i18n/LanguageCountryInfo.hpp> -#include <com/sun/star/i18n/LocaleDataItem2.hpp> -#include <com/sun/star/i18n/LocaleItem.hpp> -#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <com/sun/star/i18n/ParseResult.hpp> -#include <com/sun/star/i18n/TransliterationModules.hpp> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/UnicodeScript.hpp> -#include <com/sun/star/i18n/reservedWords.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/sdbc/XColumnLocate.hpp> +#include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> +#include <com/sun/star/sdbcx/XGroupsSupplier.hpp> +#include <com/sun/star/sdbcx/XTablesSupplier.hpp> +#include <com/sun/star/sdbcx/XUsersSupplier.hpp> +#include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -132,16 +136,20 @@ #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XCancellable.hpp> #include <comphelper/IdPropArrayHelper.hxx> +#include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/processfactory.hxx> +#include <comphelper/propagg.hxx> +#include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/propertycontainerhelper.hxx> +#include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/types.hxx> +#include <comphelper/uno3.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> @@ -159,22 +167,25 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> +#include <file/filedllapi.hxx> +#include <flat/ECatalog.hxx> +#include <flat/EColumns.hxx> +#include <flat/EConnection.hxx> +#include <flat/EDatabaseMetaData.hxx> +#include <flat/EDriver.hxx> +#include <flat/EPreparedStatement.hxx> +#include <flat/EResultSet.hxx> +#include <flat/EStatement.hxx> +#include <flat/ETable.hxx> +#include <flat/ETables.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> -#include <i18nutil/transliteration.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <svl/nfkeytab.hxx> -#include <svl/ondemand.hxx> -#include <svl/svldllapi.h> -#include <tools/date.hxx> -#include <tools/datetime.hxx> -#include <tools/link.hxx> -#include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> @@ -182,18 +193,15 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/calendarwrapper.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/nativenumberwrapper.hxx> -#include <unotools/readwritemutexguard.hxx> -#include <unotools/syslocale.hxx> -#include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <connectivity/CommonTools.hxx> +#include <connectivity/FValue.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtoolsdllapi.hxx> +#include <connectivity/sdbcx/IRefreshable.hxx> +#include <connectivity/sdbcx/VCatalog.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #endif // PCH_LEVEL >= 4 diff --git a/connectivity/inc/pch/precompiled_mysql_jdbc.hxx b/connectivity/inc/pch/precompiled_mysql_jdbc.hxx index 6eb7e071128d..fed482c16be2 100644 --- a/connectivity/inc/pch/precompiled_mysql_jdbc.hxx +++ b/connectivity/inc/pch/precompiled_mysql_jdbc.hxx @@ -13,160 +13,52 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2017-09-20 22:52:00 using: - ./bin/update_pch connectivity mysql --cutoff=4 --exclude:system --include:module --exclude:local + Generated on 2020-01-22 15:57:36 using: + ./bin/update_pch connectivity mysql_jdbc --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_mysql.hxx "make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_mysql_jdbc.hxx "make connectivity.build" --find-conflicts */ -#include <algorithm> -#include <cassert> -#include <config_features.h> -#include <config_typesizes.h> -#include <cstddef> -#include <cstdlib> -#include <cstring> -#include <exception> -#include <functional> -#include <iomanip> -#include <map> -#include <math.h> -#include <memory> -#include <new> -#include <ostream> -#include <sstream> -#include <stddef.h> -#include <stdlib.h> -#include <string.h> -#include <string> -#include <utility> -#include <vector> -#include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> -#include <osl/getglobalmutex.hxx> -#include <osl/interlck.h> -#include <osl/mutex.h> -#include <osl/mutex.hxx> -#include <rtl/alloc.h> -#include <rtl/instance.hxx> -#include <rtl/ref.hxx> -#include <rtl/string.h> -#include <rtl/string.hxx> -#include <rtl/stringutils.hxx> -#include <rtl/tencinfo.h> -#include <rtl/textcvt.h> -#include <rtl/textenc.h> -#include <rtl/unload.h> -#include <rtl/ustrbuf.h> -#include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> -#include <rtl/ustring.hxx> -#include <sal/config.h> -#include <sal/detail/log.h> -#include <sal/log.hxx> -#include <sal/macros.h> -#include <sal/saldllapi.h> -#include <sal/types.h> -#include <sal/typesizes.h> -#include <salhelper/salhelperdllapi.h> -#include <salhelper/simplereferenceobject.hxx> -#include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetOption.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/sdbc/XColumnLocate.hpp> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#if PCH_LEVEL >= 1 +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/sdbc/DriverManager.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbcx/XAlterTable.hpp> -#include <com/sun/star/sdbcx/XAppend.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#include <com/sun/star/sdbcx/XDrop.hpp> -#include <com/sun/star/sdbcx/XIndexesSupplier.hpp> -#include <com/sun/star/sdbcx/XKeysSupplier.hpp> -#include <com/sun/star/sdbcx/XRename.hpp> -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Type.h> -#include <com/sun/star/uno/Type.hxx> -#include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/TypeClass.hpp> -#include <com/sun/star/uno/XAggregation.hpp> +#include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/XWeak.hpp> -#include <com/sun/star/uno/genfunc.h> -#include <com/sun/star/uno/genfunc.hxx> -#include <com/sun/star/util/XRefreshable.hpp> -#include <comphelper/IdPropArrayHelper.hxx> -#include <comphelper/broadcasthelper.hxx> -#include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer2.hxx> -#include <comphelper/propertycontainer.hxx> -#include <comphelper/propertycontainerhelper.hxx> -#include <comphelper/propstate.hxx> -#include <comphelper/sequence.hxx> -#include <comphelper/stl_types.hxx> +#include <comphelper/namedvaluecollection.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/property.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> -#include <comphelper/uno3.hxx> -#include <cppu/cppudllapi.h> -#include <cppu/unotype.hxx> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/compbase_ex.hxx> -#include <cppuhelper/component.hxx> -#include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase10.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/implbase_ex_post.hxx> -#include <cppuhelper/implbase_ex_pre.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/propshlp.hxx> +#include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> -#include <cppuhelper/weakref.hxx> -#include <typelib/typeclass.h> -#include <typelib/typedescription.h> -#include <typelib/uik.h> -#include <uno/any2.h> -#include <uno/data.h> -#include <uno/sequence2.h> -#include <connectivity/CommonTools.hxx> +#include <mysql/YCatalog.hxx> +#include <mysql/YColumns.hxx> +#include <mysql/YDriver.hxx> +#include <mysql/YTable.hxx> +#include <mysql/YTables.hxx> +#include <mysql/YUser.hxx> +#include <mysql/YUsers.hxx> +#include <mysql/YViews.hxx> +#include <resource/sharedresources.hxx> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#include <TConnection.hxx> +#include <connectivity/TIndexes.hxx> +#include <connectivity/TKeys.hxx> +#include <connectivity/dbcharset.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> -#include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> -#include <connectivity/sdbcx/VCollection.hxx> -#include <connectivity/sdbcx/VDescriptor.hxx> -#include <connectivity/sdbcx/VTypeDef.hxx> +#include <connectivity/sdbcx/VColumn.hxx> +#include <connectivity/sdbcx/VView.hxx> +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx index b2b950096c71..668470fd36db 100644 --- a/connectivity/inc/pch/precompiled_odbc.hxx +++ b/connectivity/inc/pch/precompiled_odbc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:56:48 using: + Generated on 2020-02-01 10:57:29 using: ./bin/update_pch connectivity odbc --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -21,17 +21,13 @@ */ #if PCH_LEVEL >= 1 -#include <algorithm> -#include <memory> #include <string.h> +#include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/endian.h> -#include <osl/mutex.hxx> -#include <osl/process.h> -#include <osl/thread.h> -#include <osl/time.h> +#include <rtl/ref.hxx> #include <rtl/strbuf.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> @@ -40,24 +36,52 @@ #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/log.hxx> -#include <sal/saldllapi.h> #include <sal/types.h> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 -#include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> -#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/sdbc/XCloseable.hpp> +#include <com/sun/star/sdbc/XColumnLocate.hpp> +#include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> +#include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/util/Date.hpp> +#include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XCancellable.hpp> +#include <comphelper/proparrhlp.hxx> #include <comphelper/property.hxx> +#include <comphelper/propertycontainer.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/basemutex.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <salhelper/singletonref.hxx> +#include <o3tl/safeint.hxx> +#include <odbc/OConnection.hxx> +#include <odbc/ODatabaseMetaData.hxx> +#include <odbc/ODatabaseMetaDataResultSet.hxx> +#include <odbc/ODriver.hxx> +#include <odbc/OFunctions.hxx> +#include <odbc/OPreparedStatement.hxx> +#include <odbc/OResultSet.hxx> +#include <odbc/OResultSetMetaData.hxx> +#include <odbc/OStatement.hxx> +#include <odbc/OTools.hxx> +#include <resource/sharedresources.hxx> +#include <salhelper/simplereferenceobject.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <FDatabaseMetaDataResultSet.hxx> +#include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx b/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx index b27bca84af1b..c8f2a2ac371a 100644 --- a/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx +++ b/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-04-29 21:18:35 using: + Generated on 2020-01-22 15:57:37 using: ./bin/update_pch connectivity postgresql-sdbc-impl --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,17 +22,18 @@ #if PCH_LEVEL >= 1 #include <string.h> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/module.h> -#include <osl/thread.h> +#include <osl/time.h> #include <rtl/bootstrap.hxx> +#include <rtl/instance.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/uuid.h> #include <sal/config.h> #include <sal/log.hxx> +#include <sal/macros.h> #include <sal/saldllapi.h> #include <sal/types.h> #endif // PCH_LEVEL >= 2 @@ -41,7 +42,6 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> @@ -51,7 +51,6 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #endif // PCH_LEVEL >= 3 diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 5fc64ab84625..6566e165a9cc 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -589,7 +589,7 @@ void ODbaseTable::ReadMemoHeader() } } -OUString ODbaseTable::getEntry(OConnection const * _pConnection,const OUString& _sName ) +OUString ODbaseTable::getEntry(file::OConnection const * _pConnection,const OUString& _sName ) { OUString sURL; try @@ -2271,7 +2271,7 @@ void SAL_CALL ODbaseTable::rename( const OUString& newName ) } namespace { - void renameFile(OConnection const * _pConenction,const OUString& oldName, + void renameFile(file::OConnection const * _pConenction,const OUString& oldName, const OUString& newName,const OUString& _sExtension) { OUString aName = ODbaseTable::getEntry(_pConenction,oldName); |