You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2025/01/09 03:47:54 UTC
(openoffice) branch windows-amd64 created (now 6fa359a043)
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a change to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
at 6fa359a043 Remove unused files.
This branch includes the following new commits:
new 870859ad65 Replace the 32 bit only SetClassLong()/GetClassLong() Windows API calls with SetClassLongPtr()/GetClassLongPtr() which work on Win64 too.
new 54a25c1641 Use GetWindowLongPtr() instead of GetWindowLong(), for Win64 compatibility.
new 9b64d14c8d Win64 compatibility for: SetWindowLong() -> SetWindowLongPtr() GetWindowLong() -> GetWindowLongPtr()
new 4042308da1 Fix a time calculation on Win64.
new d038565f15 Reduce ImplPreparePolyDraw() pPoints to sal_uInt32.
new c2ec84c8f7 wParam is already a UINT_PTR, no need to use a bad conversion function.
new b4ae19cf68 Add "version" as a library on Windows, and link to it so we can find functions like VerQueryValueW() on Win64.
new f3e0634fae Use the right entrypoint name for X86-64.
new 73ea0802dd Win64 fixes for fpicker.
new b077179428 More fpicker Win64 fixes.
new 5bd8f24dc3 For now, only build the StarBasic "DLL manager" on Win32. Other architectures and operating systems were never supported.
new d5088e2def Fix the return type of Get10ThSec(), so it's Win64 compatible.
new 2104eb8264 Use the right data types for the IMediaEvent::GetEvent() call.
new 8740daf50e Win64 compatiblity fixes for crashrep.
new e0a850ba13 crashrep needs to link with psapi.dll for some imports.
new 49924e3864 Early, incomplete attempt to port connectivity to gbuild.
new 7a44928a82 Add additional types unixODBC needs on Win64.
new 24cfd890cd Fix Win64 compatibility issues with the ADO database driver.
new 50afe12f1b Get the integer parameters passed to Min() to have the same type on all platforms.
new ae34fae466 Fix a path to FileSystemRuntimeException.
new d2e7baabf8 Add needed types for unixODBC on Win64.
new 93b3eead64 Fix a 0 vs NULL pointer ambiguity on Win64.
new 59efa0e13c Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
new bc51a717b4 Preliminary, incomplete port of charts2 to gbuild.
new da40f208db Use the gbuild paths to connectivity components.
new 57e08e4bf0 Disable building testtools for now, as its tests break the Win64 build.
new 6fa359a043 Remove unused files.
The 27 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(openoffice) 03/27: Win64 compatibility for: SetWindowLong() -> SetWindowLongPtr() GetWindowLong() -> GetWindowLongPtr()
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9b64d14c8db820b12fd46309c893e56e42d4b053
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:38:09 2025 +0200
Win64 compatibility for:
SetWindowLong() -> SetWindowLongPtr()
GetWindowLong() -> GetWindowLongPtr()
Patch by: me
---
main/vcl/inc/win/saldata.hxx | 8 ++++----
main/vcl/win/source/app/saldata.cxx | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/main/vcl/inc/win/saldata.hxx b/main/vcl/inc/win/saldata.hxx
index 6fc4b3c1b5..d9dd581c49 100644
--- a/main/vcl/inc/win/saldata.hxx
+++ b/main/vcl/inc/win/saldata.hxx
@@ -344,8 +344,8 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
// -----------------
// A/W-Wrapper
-LONG ImplSetWindowLong( HWND hWnd, int nIndex, DWORD dwNewLong );
-LONG ImplGetWindowLong( HWND hWnd, int nIndex );
+LONG_PTR ImplSetWindowLong( HWND hWnd, int nIndex, LONG_PTR newLong );
+LONG_PTR ImplGetWindowLong( HWND hWnd, int nIndex );
BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax );
@@ -354,7 +354,7 @@ LONG ImplDispatchMessage( CONST MSG *lpMsg );
inline void SetWindowPtr( HWND hWnd, WinSalFrame* pThis )
{
- ImplSetWindowLong( hWnd, SAL_FRAME_THIS, (LONG)pThis );
+ ImplSetWindowLong( hWnd, SAL_FRAME_THIS, (LONG_PTR)pThis );
}
inline WinSalFrame* GetWindowPtr( HWND hWnd )
@@ -364,7 +364,7 @@ inline WinSalFrame* GetWindowPtr( HWND hWnd )
inline void SetSalObjWindowPtr( HWND hWnd, WinSalObject* pThis )
{
- ImplSetWindowLong( hWnd, SAL_OBJECT_THIS, (LONG)pThis );
+ ImplSetWindowLong( hWnd, SAL_OBJECT_THIS, (LONG_PTR)pThis );
}
inline WinSalObject* GetSalObjWindowPtr( HWND hWnd )
diff --git a/main/vcl/win/source/app/saldata.cxx b/main/vcl/win/source/app/saldata.cxx
index a75ee9e0ad..2750b68a6a 100644
--- a/main/vcl/win/source/app/saldata.cxx
+++ b/main/vcl/win/source/app/saldata.cxx
@@ -114,16 +114,16 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
// =======================================================================
-LONG ImplSetWindowLong( HWND hWnd, int nIndex, DWORD dwNewLong )
+LONG_PTR ImplSetWindowLong( HWND hWnd, int nIndex, LONG_PTR newLong )
{
- return SetWindowLongW( hWnd, nIndex, dwNewLong );
+ return SetWindowLongPtrW( hWnd, nIndex, newLong );
}
// -----------------------------------------------------------------------
-LONG ImplGetWindowLong( HWND hWnd, int nIndex )
+LONG_PTR ImplGetWindowLong( HWND hWnd, int nIndex )
{
- return GetWindowLongW( hWnd, nIndex );
+ return GetWindowLongPtrW( hWnd, nIndex );
}
// -----------------------------------------------------------------------
(openoffice) 02/27: Use GetWindowLongPtr() instead of GetWindowLong(), for Win64 compatibility.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 54a25c16419ebd7470cc23652bb26f36664d599a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:13:43 2025 +0200
Use GetWindowLongPtr() instead of GetWindowLong(), for Win64 compatibility.
Patch by: me
---
main/vcl/inc/win/wincomp.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/vcl/inc/win/wincomp.hxx b/main/vcl/inc/win/wincomp.hxx
index c173a0bd82..057e10e3a8 100644
--- a/main/vcl/inc/win/wincomp.hxx
+++ b/main/vcl/inc/win/wincomp.hxx
@@ -176,7 +176,7 @@ inline HBRUSH GetClassBrush( HWND hWnd )
inline HINSTANCE GetWindowInstance( HWND hWnd )
{
- return (HINSTANCE)GetWindowLong( hWnd, GWL_HINSTANCE );
+ return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE );
}
// ------------------------
(openoffice) 14/27: Win64 compatiblity fixes for crashrep.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8740daf50e2b22999ae9254a06874039f037006b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 08:18:39 2025 +0200
Win64 compatiblity fixes for crashrep.
Patch by: me
---
main/crashrep/source/win32/soreport.cpp | 76 +++++++++++++++++++--------------
1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/main/crashrep/source/win32/soreport.cpp b/main/crashrep/source/win32/soreport.cpp
index d3c95500bc..3059ec481c 100644
--- a/main/crashrep/source/win32/soreport.cpp
+++ b/main/crashrep/source/win32/soreport.cpp
@@ -166,7 +166,7 @@ static FILE *_tmpfile(void)
if ( IsValidHandle( hFile ) )
{
- int fd = _open_osfhandle( (int)hFile, 0 );
+ int fd = _open_osfhandle( (intptr_t)hFile, 0 );
fp = _fdopen( fd, "w+b" );
}
@@ -666,7 +666,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
if ( hFile )
{
- int fd = _open_osfhandle( (LONG)hFile, _O_TEXT );
+ int fd = _open_osfhandle( (intptr_t)hFile, _O_TEXT );
FILE *fp = _fdopen( fd, "w+t" );
CHAR szTitle[1024] = "";
CHAR szBuildId[1024] = "";
@@ -858,7 +858,7 @@ void ApplySystemFont( HWND hwndDlg )
}
*/
-BOOL CALLBACK PreviewDialogProc(
+INT_PTR CALLBACK PreviewDialogProc(
HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -892,8 +892,8 @@ BOOL CALLBACK PreviewDialogProc(
CrashReportParams *pParams = (CrashReportParams *)lParam;
TCHAR szBuffer[256] = TEXT("");
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
- HWND hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr( hwndDlg, GWLP_HINSTANCE );
+ HWND hwndParent = (HWND)GetWindowLongPtr( hwndDlg, GWLP_HWNDPARENT );
GetWindowText( hwndParent, szBuffer, elementsof(szBuffer) );
SetWindowText( hwndDlg, szBuffer );
@@ -997,7 +997,7 @@ BOOL CALLBACK PreviewDialogProc(
static void PreviewReport( HWND hwndParent, CrashReportParams *pParams )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndParent, GWLP_HINSTANCE );
WriteReportFile( pParams );
@@ -1028,7 +1028,7 @@ void UpdateOptionsDialogControls( HWND hwndDlg )
//***************************************************************************
-BOOL CALLBACK OptionsDialogProc(
+INT_PTR CALLBACK OptionsDialogProc(
HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -1042,8 +1042,8 @@ BOOL CALLBACK OptionsDialogProc(
case WM_INITDIALOG:
{
TCHAR szBuffer[1024] = TEXT("");
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
- //HWND hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr( hwndDlg, GWLP_HINSTANCE );
+ //HWND hwndParent = (HWND)GetWindowLongPtr( hwndDlg, GWLP_HWNDPARENT );
pParams = (CrashReportParams *)lParam;
@@ -1132,7 +1132,7 @@ BOOL CALLBACK OptionsDialogProc(
static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndParent, GWLP_HINSTANCE );
if ( IDOK == DialogBoxParam(
hInstance,
@@ -1158,7 +1158,7 @@ void UpdateReportDialogControls( HWND hwndDlg )
//***************************************************************************
-BOOL CALLBACK ReportDialogProc(
+INT_PTR CALLBACK ReportDialogProc(
HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -1169,8 +1169,8 @@ BOOL CALLBACK ReportDialogProc(
{
case WM_INITDIALOG:
{
- CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+ CrashReportParams *pParams = (CrashReportParams*)GetWindowLongPtr( GetParent(hwndDlg), GWLP_USERDATA );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE );
TCHAR szBuffer[FORMATBUFSIZE];
LoadAndFormatString( hInstance, IDS_REPORT_INTRO, szBuffer, elementsof(szBuffer) );
@@ -1214,8 +1214,8 @@ BOOL CALLBACK ReportDialogProc(
case WM_SHOWWINDOW:
if ( (BOOL)wParam )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
- CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE );
+ CrashReportParams *pParams = (CrashReportParams*)GetWindowLongPtr( GetParent(hwndDlg), GWLP_USERDATA );
TCHAR szBuffer[FORMATBUFSIZE];
LoadAndFormatString( hInstance, IDS_REPORT_CAPTION, szBuffer, elementsof(szBuffer) );
@@ -1236,10 +1236,10 @@ BOOL CALLBACK ReportDialogProc(
Edit_SetText( GetDlgItem(hwndDlg, IDC_EDIT_DESCRIPTION), pParams->sComment.c_str() );
/*
- SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWL_STYLE,
- GetWindowLong( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWL_STYLE) | BS_DEFPUSHBUTTON );
- SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDBACK), GWL_STYLE,
- GetWindowLong( GetDlgItem(GetParent(hwndDlg),IDBACK), GWL_STYLE) &~ BS_DEFPUSHBUTTON );
+ SetWindowLongPtr( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWLP_STYLE,
+ GetWindowLongPtr( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWLP_STYLE) | BS_DEFPUSHBUTTON );
+ SetWindowLongPtr( GetDlgItem(GetParent(hwndDlg),IDBACK), GWLP_STYLE,
+ GetWindowLongPtr( GetDlgItem(GetParent(hwndDlg),IDBACK), GWLP_STYLE) &~ BS_DEFPUSHBUTTON );
*/
SetFocus( GetDlgItem(hwndDlg,IDC_EDIT_TITLE) );
}
@@ -1251,7 +1251,7 @@ BOOL CALLBACK ReportDialogProc(
{
TCHAR szBuffer[32767];
- CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+ CrashReportParams *pParams = (CrashReportParams*)GetWindowLongPtr( GetParent(hwndDlg), GWLP_USERDATA );
pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
@@ -1272,7 +1272,7 @@ BOOL CALLBACK ReportDialogProc(
return TRUE;
case IDC_OPTIONS:
{
- CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+ CrashReportParams *pParams = (CrashReportParams*)GetWindowLongPtr( GetParent(hwndDlg), GWLP_USERDATA );
OptionsDialog( GetParent(hwndDlg), pParams );
}
return TRUE;
@@ -1290,13 +1290,13 @@ BOOL CALLBACK ReportDialogProc(
}
//***************************************************************************
-BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
switch ( uMsg )
{
case WM_INITDIALOG:
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE );
HWND hwndRichEdit = GetDlgItem(hwndDlg, IDC_RICHEDIT21);
TCHAR szBuffer[FORMATBUFSIZE];
TCHAR szBuffer2[FORMATBUFSIZE];
@@ -1329,7 +1329,7 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
case WM_SHOWWINDOW:
if ( (BOOL)wParam )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE );
TCHAR szBuffer[FORMATBUFSIZE];
LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szBuffer, elementsof(szBuffer) );
@@ -1380,7 +1380,7 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
}
//***************************************************************************
-BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
static HWND hwndPages[2] = { NULL };
static int iActualPage = 0;
@@ -1389,10 +1389,10 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
{
case WM_INITDIALOG:
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE );
TCHAR szBuffer[FORMATBUFSIZE];
- SetWindowLong( hwndDlg, GWL_USERDATA, (LONG)lParam );
+ SetWindowLongPtr( hwndDlg, GWLP_USERDATA, (LONG)lParam );
hwndPages[0] = CreateDialog(
hInstance,
MAKEINTRESOURCE(IDD_WELCOME_PAGE),
@@ -1458,7 +1458,7 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
case IDFINISH:
{
TCHAR szBuffer[32767];
- CrashReportParams *pParams = (CrashReportParams*)GetWindowLong( hwndDlg, GWL_USERDATA );
+ CrashReportParams *pParams = (CrashReportParams*)GetWindowLongPtr( hwndDlg, GWLP_USERDATA );
pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndPages[1], IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
@@ -1725,9 +1725,21 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
STACKFRAME frame;
ZeroMemory( &frame, sizeof(frame) );
+#if defined(INTEL)
frame.AddrPC.Offset = aContextRecord.Eip;
+#elif defined(X86_64)
+ frame.AddrPC.Offset = aContextRecord.Rip;
+#else
+#error Unsupported architecture
+#endif
frame.AddrPC.Mode = AddrModeFlat;
+#if defined(INTEL)
frame.AddrFrame.Offset = aContextRecord.Ebp;
+#elif defined(X86_64)
+ frame.AddrFrame.Offset = aContextRecord.Rbp;
+#else
+#error Unsupported architecture
+#endif
frame.AddrFrame.Mode = AddrModeFlat;
BOOL bSuccess;
@@ -1766,7 +1778,7 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
{
rLibraries[ GetFileName( moduleInfo.LoadedImageName ).c_str() ] = moduleInfo.LoadedImageName;
- DWORD dwRelOffset = 0;
+ DWORD64 dwRelOffset = 0;
BYTE symbolBuffer[sizeof(IMAGEHLP_SYMBOL) + 256 ];
PIMAGEHLP_SYMBOL pSymbol = (PIMAGEHLP_SYMBOL)symbolBuffer;
@@ -2600,7 +2612,7 @@ void _cdecl SendingThread( void *lpArgs )
//***************************************************************************
-BOOL CALLBACK SendingStatusDialogProc(
+INT_PTR CALLBACK SendingStatusDialogProc(
HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -2615,8 +2627,8 @@ BOOL CALLBACK SendingStatusDialogProc(
case WM_INITDIALOG:
{
TCHAR szBuffer[1024] = TEXT("");
- HINSTANCE hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
- //HWND hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr( hwndDlg, GWLP_HINSTANCE );
+ //HWND hwndParent = (HWND)GetWindowLongPtr( hwndDlg, GWLP_HWNDPARENT );
pRequest = (RequestParams *)lParam;
(openoffice) 04/27: Fix a time calculation on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4042308da106d31a43e5616acb83c45bf6d1315a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:44:55 2025 +0200
Fix a time calculation on Win64.
Patch by: me
---
main/vcl/source/window/scrwnd.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/vcl/source/window/scrwnd.cxx b/main/vcl/source/window/scrwnd.cxx
index 964165b1f9..5a7d8542a3 100644
--- a/main/vcl/source/window/scrwnd.cxx
+++ b/main/vcl/source/window/scrwnd.cxx
@@ -391,12 +391,12 @@ IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG )
if ( !ImplCallPreNotify( aNCmdEvt ) )
{
- const sal_uLong nTime = Time::GetSystemTicks();
+ const sal_uIntPtr nTime = Time::GetSystemTicks();
ImplDelData aDel( this );
pWindow->Command( aCEvt );
if( aDel.IsDead() )
return 0;
- mnRepaintTime = Max( Time::GetSystemTicks() - nTime, 1UL );
+ mnRepaintTime = Max( Time::GetSystemTicks() - nTime, sal_uIntPtr(1UL) );
ImplRecalcScrollValues();
}
}
(openoffice) 11/27: For now, only build the StarBasic "DLL manager" on Win32. Other architectures and operating systems were never supported.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 5bd8f24dc39ce5e1f844c83680dbecd9f1e51aff
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 06:36:10 2025 +0200
For now, only build the StarBasic "DLL manager" on Win32.
Other architectures and operating systems were never supported.
Patch by: me
---
main/basic/source/runtime/dllmgr.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/basic/source/runtime/dllmgr.cxx b/main/basic/source/runtime/dllmgr.cxx
index 466ab1d6f6..e9830704ec 100644
--- a/main/basic/source/runtime/dllmgr.cxx
+++ b/main/basic/source/runtime/dllmgr.cxx
@@ -60,7 +60,7 @@
variables accordingly.
*/
-#if defined WNT // only 32-bit Windows, actually
+#if defined WNT && defined INTEL
extern "C" {
(openoffice) 12/27: Fix the return type of Get10ThSec(), so it's Win64 compatible.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d5088e2def0f87fbfd37d4bad7b0f744c8592e1e
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 07:01:21 2025 +0200
Fix the return type of Get10ThSec(), so it's Win64 compatible.
Patch by: me
---
main/sfx2/source/bastyp/progress.cxx | 2 +-
main/sfx2/source/view/sfxbasecontroller.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/sfx2/source/bastyp/progress.cxx b/main/sfx2/source/bastyp/progress.cxx
index 6dea6bd400..a49729b047 100644
--- a/main/sfx2/source/bastyp/progress.cxx
+++ b/main/sfx2/source/bastyp/progress.cxx
@@ -110,7 +110,7 @@ struct SfxProgress_Impl
#define aTypeLibInfo aProgressTypeLibImpl
//========================================================================
-extern sal_uIntPtr Get10ThSec();
+extern clock_t Get10ThSec();
// -----------------------------------------------------------------------
diff --git a/main/sfx2/source/view/sfxbasecontroller.cxx b/main/sfx2/source/view/sfxbasecontroller.cxx
index 908e07419a..db5d190626 100644
--- a/main/sfx2/source/view/sfxbasecontroller.cxx
+++ b/main/sfx2/source/view/sfxbasecontroller.cxx
@@ -220,9 +220,9 @@ sal_Bool SupportsCommandGroup( sal_Int16 nCommandGroup )
return sal_False;
}
-sal_uInt32 Get10ThSec()
+clock_t Get10ThSec()
{
- sal_uInt32 n10Ticks = 10 * (sal_uInt32)clock();
+ clock_t n10Ticks = 10 * clock();
return n10Ticks / CLOCKS_PER_SEC;
}
@@ -246,7 +246,7 @@ friend class SfxBaseController;
SfxWorkWindow* pWorkWindow;
sal_Int32 _nRange;
sal_Int32 _nValue;
- long _nStartTime;
+ clock_t _nStartTime;
public:
SfxStatusIndicator(SfxBaseController* pController, SfxWorkWindow* pWork)
: xOwner( pController )
(openoffice) 20/27: Fix a path to FileSystemRuntimeException.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ae34fae466f1cf744b0a53aa64e531661003b201
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 15:11:34 2025 +0200
Fix a path to FileSystemRuntimeException.
Patch by: me
---
main/connectivity/Jar_sdbc_hsqldb.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
index 0a48734715..4bae2ec6ce 100644
--- a/main/connectivity/Jar_sdbc_hsqldb.mk
+++ b/main/connectivity/Jar_sdbc_hsqldb.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
))
$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
+ connectivity/org/hsqldb/lib/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
(openoffice) 09/27: Win64 fixes for fpicker.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 73ea0802ddd390c9ffc99bb32f60110e7746d311
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 01:35:28 2025 +0200
Win64 fixes for fpicker.
Patch by: me
---
.../source/win32/filepicker/FileOpenDlg.cxx | 34 +++++++++++-----------
.../source/win32/filepicker/FileOpenDlg.hxx | 10 +++----
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/main/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/main/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 1fa8b1ce4d..8af4603402 100644
--- a/main/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/main/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -144,7 +144,7 @@ CFileOpenDialog::CFileOpenDialog(
}
// set a pointer to myself as ofn parameter
- m_ofn.lCustData = reinterpret_cast<long>(this);
+ m_ofn.lCustData = reinterpret_cast<LPARAM>(this);
}
//------------------------------------------------------------------------
@@ -430,7 +430,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const rtl::OUString&)
+UINT_PTR SAL_CALL CFileOpenDialog::onShareViolation(const rtl::OUString&)
{
return 0;
}
@@ -439,7 +439,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const rtl::OUString&)
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk()
+UINT_PTR SAL_CALL CFileOpenDialog::onFileOk()
{
return 0;
}
@@ -489,7 +489,7 @@ void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32)
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16)
+UINT_PTR SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16)
{
return 0;
}
@@ -498,7 +498,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16)
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )
+UINT_PTR SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )
{
switch(lpOfNotify->hdr.code)
{
@@ -553,7 +553,7 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)
//
//------------------------------------------------------------------------
-unsigned int CALLBACK CFileOpenDialog::ofnHookProc(
+UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc(
HWND hChildDlg, unsigned int uiMsg, WPARAM wParam, LPARAM lParam)
{
HWND hwndDlg = GetParent(hChildDlg);
@@ -568,12 +568,12 @@ unsigned int CALLBACK CFileOpenDialog::ofnHookProc(
OSL_ASSERT(pImpl);
// subclass the base dialog for WM_NCDESTROY processing
- pImpl->m_pfnBaseDlgProc =
- reinterpret_cast<WNDPROC>(
- SetWindowLong(
- hwndDlg,
- GWL_WNDPROC,
- reinterpret_cast<LONG>(CFileOpenDialog::BaseDlgProc)));
+ pImpl->m_pfnBaseDlgProc =
+ reinterpret_cast<WNDPROC>(
+ SetWindowLongPtr(
+ hwndDlg,
+ GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(CFileOpenDialog::BaseDlgProc)));
// connect the instance handle to the window
SetProp(hwndDlg, CURRENT_INSTANCE, pImpl);
pImpl->handleInitDialog(hwndDlg, hChildDlg);
@@ -583,7 +583,7 @@ unsigned int CALLBACK CFileOpenDialog::ofnHookProc(
case WM_NOTIFY:
{
pImpl = getCurrentInstance(hwndDlg);
- return pImpl->onWMNotify(
+ return pImpl->onWMNotify(
hChildDlg, reinterpret_cast<LPOFNOTIFY>(lParam));
}
@@ -592,8 +592,8 @@ unsigned int CALLBACK CFileOpenDialog::ofnHookProc(
pImpl = getCurrentInstance(hwndDlg);
OSL_ASSERT(pImpl);
- return pImpl->onCtrlCommand(
- hChildDlg, LOWORD(wParam), HIWORD(lParam));
+ return pImpl->onCtrlCommand(
+ hChildDlg, LOWORD(wParam), HIWORD(lParam));
}
}
@@ -614,8 +614,8 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc(
pImpl = reinterpret_cast<CFileOpenDialog*>(
RemoveProp(hWnd,CURRENT_INSTANCE));
- SetWindowLong(hWnd, GWL_WNDPROC,
- reinterpret_cast<LONG>(pImpl->m_pfnBaseDlgProc));
+ SetWindowLongPtr(hWnd, GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(pImpl->m_pfnBaseDlgProc));
}
else
{
diff --git a/main/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/main/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 22b9fc0939..4a1bbe647e 100644
--- a/main/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/main/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -244,8 +244,8 @@ protected:
virtual void SAL_CALL postModal(sal_Int16 nDialogResult);
// message handler, to be overwritten by subclasses
- virtual sal_uInt32 SAL_CALL onShareViolation(const rtl::OUString& aPathName);
- virtual sal_uInt32 SAL_CALL onFileOk();
+ virtual UINT_PTR SAL_CALL onShareViolation(const rtl::OUString& aPathName);
+ virtual UINT_PTR SAL_CALL onFileOk();
virtual void SAL_CALL onSelChanged(HWND hwndListBox);
virtual void SAL_CALL onHelp();
@@ -256,9 +256,9 @@ protected:
virtual void SAL_CALL onInitDialog(HWND hwndDlg) = 0;
- virtual sal_uInt32 SAL_CALL onCtrlCommand(HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode);
+ virtual UINT_PTR SAL_CALL onCtrlCommand(HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode);
- sal_uInt32 SAL_CALL onWMNotify(HWND hwndChild, LPOFNOTIFYW lpOfNotify);
+ UINT_PTR SAL_CALL onWMNotify(HWND hwndChild, LPOFNOTIFYW lpOfNotify);
// we use non-virtual functions to do necessary work before
// calling the virtual functions (see Gamma: Template method)
@@ -300,7 +300,7 @@ private:
WNDPROC m_pfnBaseDlgProc;
// callback function
- static unsigned int CALLBACK ofnHookProc(
+ static UINT_PTR CALLBACK ofnHookProc(
HWND hChildDlg, // handle to child dialog box
unsigned int uiMsg, // message identifier
WPARAM wParam, // message parameter
(openoffice) 25/27: Use the gbuild paths to connectivity components.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit da40f208db2c6d6585a8db942343d096f771a175
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 5 14:27:32 2025 +0200
Use the gbuild paths to connectivity components.
Patch by: me
---
main/postprocess/packcomponents/makefile.mk | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/main/postprocess/packcomponents/makefile.mk b/main/postprocess/packcomponents/makefile.mk
index c4588cf487..998faa9b55 100644
--- a/main/postprocess/packcomponents/makefile.mk
+++ b/main/postprocess/packcomponents/makefile.mk
@@ -48,7 +48,6 @@ my_components = \
abp \
basprov \
bib \
- calc \
chartcontroller \
chartmodel \
charttools \
@@ -64,6 +63,11 @@ my_components = \
component/canvas/source/vcl/vclcanvas \
component/comphelper/util/comphelp \
component/configmgr/source/configmgr \
+ component/connectivity/source/drivers/calc/calc \
+ component/connectivity/source/drivers/dbase/dbase \
+ component/connectivity/source/drivers/flat/flat \
+ component/connectivity/source/drivers/mysql/mysql \
+ component/connectivity/source/drivers/odbc/odbc \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
component/dbaccess/source/ext/adabas/adabasui \
@@ -151,7 +155,6 @@ my_components = \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
- dbase \
dbp \
dbpool2 \
dbtools \
@@ -160,15 +163,12 @@ my_components = \
dlgprov \
filterconfig1 \
flash \
- flat \
frm \
localebe1 \
log \
mailmerge \
migrationoo2 \
msfilter \
- mysql \
- odbc \
offacc \
oooimprovecore \
pcr \
@@ -283,8 +283,8 @@ my_components += \
component/wizards/com/sun/star/wizards/agenda/agenda \
component/wizards/com/sun/star/wizards/fax/fax \
component/wizards/com/sun/star/wizards/form/form \
- hsqldb \
- jdbc \
+ component/connectivity/drivers/hsqldb/hsqldb \
+ component/connectivity/drivers/jdbc/jdbc \
postgresql \
component/wizards/com/sun/star/wizards/letter/letter \
component/wizards/com/sun/star/wizards/query/query \
@@ -321,9 +321,9 @@ my_components += \
.IF "$(OS)" == "WNT"
my_components += \
- ado \
component/accessibility/java/java_uno_accessbridge/java_uno_accessbridge \
component/avmedia/source/win/avmediawin \
+ component/connectivity/drivers/ado/ado \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
@@ -360,7 +360,7 @@ my_components += component/canvas/source/directx/directx5canvas
.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
-my_components += adabas
+my_components += component/connectivity/source/drivers/adabas/adabas
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
(openoffice) 19/27: Get the integer parameters passed to Min() to have the same type on all platforms.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 50afe12f1bad5058f456099ad5e48203f14c167f
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 14:56:24 2025 +0200
Get the integer parameters passed to Min() to have the same type
on all platforms.
Patch by: me
---
main/connectivity/source/drivers/dbase/DTable.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/connectivity/source/drivers/dbase/DTable.cxx b/main/connectivity/source/drivers/dbase/DTable.cxx
index 10aeaefd9e..665041f6c7 100644
--- a/main/connectivity/source/drivers/dbase/DTable.cxx
+++ b/main/connectivity/source/drivers/dbase/DTable.cxx
@@ -1343,7 +1343,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
{
throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
}
- (*m_pFileStream) << (sal_uInt8) Min((sal_uIntPtr)nPrecision, 255UL); //Feldlaenge
+ (*m_pFileStream) << (sal_uInt8) Min(nPrecision, (sal_Int32)255UL); //Feldlaenge
nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
(*m_pFileStream) << (sal_uInt8)0; //Nachkommastellen
break;
(openoffice) 15/27: crashrep needs to link with psapi.dll for some imports.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e0a850ba1307525df4b16338ae51d8fc1dc5423c
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 18:12:17 2025 +0200
crashrep needs to link with psapi.dll for some imports.
Patch by: me
---
main/crashrep/source/win32/makefile.mk | 3 ++-
main/solenv/inc/wntmscx.mk | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/main/crashrep/source/win32/makefile.mk b/main/crashrep/source/win32/makefile.mk
index 29e16dcb6b..80201d1efb 100644
--- a/main/crashrep/source/win32/makefile.mk
+++ b/main/crashrep/source/win32/makefile.mk
@@ -67,7 +67,8 @@ STDLIB1=\
$(ADVAPI32LIB)\
$(WSOCK32LIB)\
$(SHELL32LIB)\
- $(DBGHELPLIB)
+ $(DBGHELPLIB)\
+ $(PSAPILIB)
APP1NOSVRES=$(RES)$/$(TARGET).res
diff --git a/main/solenv/inc/wntmscx.mk b/main/solenv/inc/wntmscx.mk
index c6f33c9034..d03b3897ca 100644
--- a/main/solenv/inc/wntmscx.mk
+++ b/main/solenv/inc/wntmscx.mk
@@ -402,4 +402,5 @@ WININETLIB=wininet.lib
OLDNAMESLIB=oldnames.lib
MSIMG32LIB=msimg32.lib
PROPSYSLIB=propsys.lib
+PSAPILIB=psapi.lib
(openoffice) 16/27: Early, incomplete attempt to port connectivity to gbuild.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 49924e386444acf5a69b2e7165fbccffc1ee8bc4
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 09:43:24 2025 +0200
Early, incomplete attempt to port connectivity to gbuild.
Patch by: me
---
main/Repository.mk | 12 ++
main/connectivity/AllLangResTarget_cnr.mk | 41 +++++
main/connectivity/AllLangResTarget_hsqldb.mk | 44 +++++
main/connectivity/AllLangResTarget_sdbcl.mk | 41 +++++
main/connectivity/AllLangResTarget_sdberr.mk | 41 +++++
main/connectivity/Configuration.mk | 86 ++++++++++
main/connectivity/Jar_sdbc_hsqldb.mk | 58 +++++++
main/connectivity/Library_adabas.mk | 89 ++++++++++
main/connectivity/Library_ado.mk | 95 +++++++++++
main/connectivity/Library_calc.mk | 73 ++++++++
main/connectivity/Library_dbase.mk | 108 ++++++++++++
main/connectivity/Library_dbpool2.mk | 62 +++++++
main/connectivity/Library_dbtools.mk | 184 +++++++++++++++++++++
main/connectivity/Library_evoab2.mk | 89 ++++++++++
main/connectivity/Library_file.mk | 86 ++++++++++
main/connectivity/Library_flat.mk | 73 ++++++++
main/connectivity/Library_hsqldb.mk | 87 ++++++++++
main/connectivity/Library_jdbc.mk | 91 ++++++++++
main/connectivity/Library_macab1.mk | 58 +++++++
main/connectivity/Library_macabdrv1.mk | 78 +++++++++
main/connectivity/Library_mysql.mk | 66 ++++++++
main/connectivity/Library_odbc.mk | 65 ++++++++
main/connectivity/Library_odbcbase.mk | 74 +++++++++
main/connectivity/Library_sdbc2.mk | 58 +++++++
main/connectivity/Makefile | 32 ++++
main/connectivity/Module_connectivity.mk | 72 ++++++++
main/connectivity/Package_generated_inc.mk | 26 +++
main/connectivity/Package_inc.mk | 78 +++++++++
...led_connectivity.cxx => precompiled_adabas.cxx} | 2 +-
...led_connectivity.hxx => precompiled_adabas.hxx} | 0
...mpiled_connectivity.cxx => precompiled_ado.cxx} | 2 +-
...mpiled_connectivity.hxx => precompiled_ado.hxx} | 0
...piled_connectivity.cxx => precompiled_calc.cxx} | 2 +-
...piled_connectivity.hxx => precompiled_calc.hxx} | 0
...iled_connectivity.cxx => precompiled_dbase.cxx} | 2 +-
...iled_connectivity.hxx => precompiled_dbase.hxx} | 0
...ed_connectivity.cxx => precompiled_dbpool2.cxx} | 2 +-
...ed_connectivity.hxx => precompiled_dbpool2.hxx} | 0
...ed_connectivity.cxx => precompiled_dbtools.cxx} | 2 +-
...ed_connectivity.hxx => precompiled_dbtools.hxx} | 0
...led_connectivity.cxx => precompiled_evoab2.cxx} | 2 +-
...led_connectivity.hxx => precompiled_evoab2.hxx} | 0
...piled_connectivity.cxx => precompiled_file.cxx} | 2 +-
...piled_connectivity.hxx => precompiled_file.hxx} | 0
...piled_connectivity.cxx => precompiled_flat.cxx} | 2 +-
...piled_connectivity.hxx => precompiled_flat.hxx} | 0
...led_connectivity.cxx => precompiled_hsqldb.cxx} | 2 +-
...led_connectivity.hxx => precompiled_hsqldb.hxx} | 0
...piled_connectivity.cxx => precompiled_jdbc.cxx} | 2 +-
...piled_connectivity.hxx => precompiled_jdbc.hxx} | 0
...led_connectivity.cxx => precompiled_macab1.cxx} | 2 +-
...led_connectivity.hxx => precompiled_macab1.hxx} | 0
..._connectivity.cxx => precompiled_macabdrv1.cxx} | 2 +-
..._connectivity.hxx => precompiled_macabdrv1.hxx} | 0
...iled_connectivity.cxx => precompiled_mysql.cxx} | 2 +-
...iled_connectivity.hxx => precompiled_mysql.hxx} | 0
...piled_connectivity.cxx => precompiled_odbc.cxx} | 2 +-
...piled_connectivity.hxx => precompiled_odbc.hxx} | 0
...d_connectivity.cxx => precompiled_odbcbase.cxx} | 2 +-
...d_connectivity.hxx => precompiled_odbcbase.hxx} | 0
...iled_connectivity.cxx => precompiled_sdbc2.cxx} | 2 +-
...iled_connectivity.hxx => precompiled_sdbc2.hxx} | 0
main/connectivity/prj/build.lst | 30 +---
main/connectivity/prj/d.lst | 52 ------
main/connectivity/prj/makefile.mk | 44 +++++
.../source/commontools/AutoRetrievingBase.cxx | 2 +-
.../connectivity/source/commontools/BlobHelper.cxx | 2 +-
.../source/commontools/CommonTools.cxx | 2 +-
.../source/commontools/ConnectionWrapper.cxx | 2 +-
.../source/commontools/DateConversion.cxx | 2 +-
.../commontools/FDatabaseMetaDataResultSet.cxx | 2 +-
.../FDatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/commontools/FValue.cxx | 2 +-
.../source/commontools/ParamterSubstitution.cxx | 2 +-
.../source/commontools/RowFunctionParser.cxx | 2 +-
.../source/commontools/TColumnsHelper.cxx | 2 +-
.../source/commontools/TConnection.cxx | 2 +-
.../source/commontools/TDatabaseMetaDataBase.cxx | 2 +-
main/connectivity/source/commontools/TIndex.cxx | 2 +-
.../source/commontools/TIndexColumns.cxx | 2 +-
main/connectivity/source/commontools/TIndexes.cxx | 2 +-
main/connectivity/source/commontools/TKey.cxx | 2 +-
.../source/commontools/TKeyColumns.cxx | 2 +-
main/connectivity/source/commontools/TKeys.cxx | 2 +-
.../source/commontools/TPrivilegesResultSet.cxx | 2 +-
.../source/commontools/TSkipDeletedSet.cxx | 2 +-
.../connectivity/source/commontools/TSortIndex.cxx | 2 +-
.../source/commontools/TTableHelper.cxx | 2 +-
.../source/commontools/conncleanup.cxx | 2 +-
main/connectivity/source/commontools/dbcharset.cxx | 2 +-
.../source/commontools/dbconversion.cxx | 2 +-
.../source/commontools/dbexception.cxx | 2 +-
.../connectivity/source/commontools/dbmetadata.cxx | 2 +-
main/connectivity/source/commontools/dbtools.cxx | 2 +-
main/connectivity/source/commontools/dbtools2.cxx | 2 +-
.../source/commontools/filtermanager.cxx | 2 +-
.../source/commontools/formattedcolumnvalue.cxx | 2 +-
.../connectivity/source/commontools/parameters.cxx | 2 +-
.../source/commontools/paramwrapper.cxx | 2 +-
.../source/commontools/predicateinput.cxx | 2 +-
.../source/commontools/propertyids.cxx | 2 +-
main/connectivity/source/commontools/sqlerror.cxx | 2 +-
.../source/commontools/statementcomposer.cxx | 2 +-
.../source/commontools/warningscontainer.cxx | 2 +-
main/connectivity/source/cpool/ZConnectionPool.cxx | 2 +-
.../source/cpool/ZConnectionWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZDriverWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZPoolCollection.cxx | 2 +-
.../source/cpool/ZPooledConnection.cxx | 2 +-
main/connectivity/source/cpool/Zregistration.cxx | 2 +-
.../source/drivers/adabas/BCatalog.cxx | 2 +-
.../source/drivers/adabas/BColumns.cxx | 2 +-
.../source/drivers/adabas/BConnection.cxx | 2 +-
.../source/drivers/adabas/BDatabaseMetaData.cxx | 2 +-
.../connectivity/source/drivers/adabas/BDriver.cxx | 2 +-
.../source/drivers/adabas/BFunctions.cxx | 2 +-
main/connectivity/source/drivers/adabas/BGroup.cxx | 2 +-
.../connectivity/source/drivers/adabas/BGroups.cxx | 2 +-
main/connectivity/source/drivers/adabas/BIndex.cxx | 2 +-
.../source/drivers/adabas/BIndexColumns.cxx | 2 +-
.../source/drivers/adabas/BIndexes.cxx | 2 +-
main/connectivity/source/drivers/adabas/BKeys.cxx | 2 +-
.../source/drivers/adabas/BPreparedStatement.cxx | 2 +-
.../source/drivers/adabas/BResultSet.cxx | 2 +-
.../source/drivers/adabas/BResultSetMetaData.cxx | 2 +-
.../source/drivers/adabas/BStatement.cxx | 2 +-
main/connectivity/source/drivers/adabas/BTable.cxx | 2 +-
.../connectivity/source/drivers/adabas/BTables.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUser.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUsers.cxx | 2 +-
main/connectivity/source/drivers/adabas/BViews.cxx | 2 +-
.../source/drivers/adabas/Bservices.cxx | 2 +-
.../source/drivers/ado/ACallableStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ACatalog.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumn.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumns.cxx | 2 +-
.../source/drivers/ado/AConnection.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaData.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 2 +-
.../drivers/ado/ADatabaseMetaDataResultSet.cxx | 2 +-
.../ado/ADatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/drivers/ado/ADriver.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroup.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroups.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndex.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndexes.cxx | 2 +-
main/connectivity/source/drivers/ado/AKey.cxx | 2 +-
main/connectivity/source/drivers/ado/AKeys.cxx | 2 +-
.../source/drivers/ado/APreparedStatement.cxx | 2 +-
.../connectivity/source/drivers/ado/AResultSet.cxx | 2 +-
.../source/drivers/ado/AResultSetMetaData.cxx | 2 +-
.../connectivity/source/drivers/ado/AStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ATable.cxx | 2 +-
main/connectivity/source/drivers/ado/ATables.cxx | 2 +-
main/connectivity/source/drivers/ado/AUser.cxx | 2 +-
main/connectivity/source/drivers/ado/AUsers.cxx | 2 +-
main/connectivity/source/drivers/ado/AView.cxx | 2 +-
main/connectivity/source/drivers/ado/AViews.cxx | 2 +-
.../source/drivers/ado/Aolevariant.cxx | 2 +-
main/connectivity/source/drivers/ado/Aservices.cxx | 2 +-
main/connectivity/source/drivers/ado/Awrapado.cxx | 2 +-
main/connectivity/source/drivers/ado/adoimp.cxx | 2 +-
main/connectivity/source/drivers/calc/CCatalog.cxx | 2 +-
main/connectivity/source/drivers/calc/CColumns.cxx | 2 +-
.../source/drivers/calc/CConnection.cxx | 2 +-
.../source/drivers/calc/CDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/calc/CDriver.cxx | 2 +-
.../source/drivers/calc/CPreparedStatement.cxx | 2 +-
.../source/drivers/calc/CResultSet.cxx | 2 +-
.../source/drivers/calc/CStatement.cxx | 2 +-
main/connectivity/source/drivers/calc/CTable.cxx | 2 +-
main/connectivity/source/drivers/calc/CTables.cxx | 2 +-
.../connectivity/source/drivers/calc/Cservices.cxx | 2 +-
.../connectivity/source/drivers/dbase/DCatalog.cxx | 2 +-
main/connectivity/source/drivers/dbase/DCode.cxx | 2 +-
.../connectivity/source/drivers/dbase/DColumns.cxx | 2 +-
.../source/drivers/dbase/DConnection.cxx | 2 +-
.../source/drivers/dbase/DDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/dbase/DDriver.cxx | 2 +-
main/connectivity/source/drivers/dbase/DIndex.cxx | 2 +-
.../source/drivers/dbase/DIndexColumns.cxx | 2 +-
.../source/drivers/dbase/DIndexIter.cxx | 2 +-
.../connectivity/source/drivers/dbase/DIndexes.cxx | 2 +-
.../source/drivers/dbase/DNoException.cxx | 2 +-
.../source/drivers/dbase/DPreparedStatement.cxx | 2 +-
.../source/drivers/dbase/DResultSet.cxx | 2 +-
.../source/drivers/dbase/DStatement.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTable.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTables.cxx | 2 +-
.../source/drivers/dbase/Dservices.cxx | 2 +-
.../source/drivers/dbase/dindexnode.cxx | 2 +-
main/connectivity/source/drivers/evoab2/EApi.cxx | 2 +-
.../source/drivers/evoab2/NCatalog.cxx | 2 +-
.../source/drivers/evoab2/NColumns.cxx | 2 +-
.../source/drivers/evoab2/NConnection.cxx | 2 +-
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NDebug.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NDriver.cxx | 2 +-
.../source/drivers/evoab2/NPreparedStatement.cxx | 2 +-
.../source/drivers/evoab2/NResultSet.cxx | 2 +-
.../source/drivers/evoab2/NResultSetMetaData.cxx | 2 +-
.../source/drivers/evoab2/NServices.cxx | 2 +-
.../source/drivers/evoab2/NStatement.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NTable.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NTables.cxx | 2 +-
main/connectivity/source/drivers/file/FCatalog.cxx | 2 +-
main/connectivity/source/drivers/file/FColumns.cxx | 2 +-
.../source/drivers/file/FConnection.cxx | 2 +-
.../source/drivers/file/FDatabaseMetaData.cxx | 2 +-
.../source/drivers/file/FDateFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FDriver.cxx | 2 +-
.../source/drivers/file/FNoException.cxx | 2 +-
.../source/drivers/file/FNumericFunctions.cxx | 2 +-
.../source/drivers/file/FPreparedStatement.cxx | 2 +-
.../source/drivers/file/FResultSet.cxx | 2 +-
.../source/drivers/file/FResultSetMetaData.cxx | 2 +-
.../source/drivers/file/FStatement.cxx | 2 +-
.../source/drivers/file/FStringFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FTable.cxx | 2 +-
main/connectivity/source/drivers/file/FTables.cxx | 2 +-
.../connectivity/source/drivers/file/fanalyzer.cxx | 2 +-
main/connectivity/source/drivers/file/fcode.cxx | 2 +-
main/connectivity/source/drivers/file/fcomp.cxx | 2 +-
.../source/drivers/file/quotedstring.cxx | 2 +-
main/connectivity/source/drivers/flat/ECatalog.cxx | 2 +-
main/connectivity/source/drivers/flat/EColumns.cxx | 2 +-
.../source/drivers/flat/EConnection.cxx | 2 +-
.../source/drivers/flat/EDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/flat/EDriver.cxx | 2 +-
.../source/drivers/flat/EPreparedStatement.cxx | 2 +-
.../source/drivers/flat/EResultSet.cxx | 2 +-
.../source/drivers/flat/EStatement.cxx | 2 +-
main/connectivity/source/drivers/flat/ETable.cxx | 2 +-
main/connectivity/source/drivers/flat/ETables.cxx | 2 +-
.../connectivity/source/drivers/flat/Eservices.cxx | 2 +-
.../source/drivers/hsqldb/HCatalog.cxx | 2 +-
.../source/drivers/hsqldb/HColumns.cxx | 2 +-
.../source/drivers/hsqldb/HConnection.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HDriver.cxx | 2 +-
.../source/drivers/hsqldb/HStorageAccess.cxx | 2 +-
.../source/drivers/hsqldb/HStorageMap.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HTable.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HTables.cxx | 2 +-
.../source/drivers/hsqldb/HTerminateListener.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HTools.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUser.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUsers.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HView.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HViews.cxx | 2 +-
.../source/drivers/hsqldb/Hservices.cxx | 2 +-
.../source/drivers/hsqldb/StorageFileAccess.cxx | 2 +-
.../drivers/hsqldb/StorageNativeInputStream.cxx | 2 +-
.../drivers/hsqldb/StorageNativeOutputStream.cxx | 2 +-
.../source/drivers/hsqldb/accesslog.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Array.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Blob.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Boolean.cxx | 2 +-
.../source/drivers/jdbc/CallableStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Class.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Clob.cxx | 2 +-
.../source/drivers/jdbc/ConnectionLog.cxx | 2 +-
.../source/drivers/jdbc/ContextClassLoader.cxx | 2 +-
.../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Date.cxx | 2 +-
.../source/drivers/jdbc/DriverPropertyInfo.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Exception.cxx | 2 +-
.../source/drivers/jdbc/InputStream.cxx | 2 +-
.../source/drivers/jdbc/JBigDecimal.cxx | 2 +-
.../source/drivers/jdbc/JConnection.cxx | 2 +-
main/connectivity/source/drivers/jdbc/JDriver.cxx | 2 +-
.../source/drivers/jdbc/JStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Object.cxx | 2 +-
.../source/drivers/jdbc/PreparedStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Reader.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Ref.cxx | 2 +-
.../connectivity/source/drivers/jdbc/ResultSet.cxx | 2 +-
.../source/drivers/jdbc/ResultSetMetaData.cxx | 2 +-
.../source/drivers/jdbc/SQLException.cxx | 2 +-
.../source/drivers/jdbc/SQLWarning.cxx | 2 +-
main/connectivity/source/drivers/jdbc/String.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Throwable.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Timestamp.cxx | 2 +-
.../connectivity/source/drivers/jdbc/jservices.cxx | 2 +-
main/connectivity/source/drivers/jdbc/tools.cxx | 2 +-
.../source/drivers/macab/MacabAddressBook.cxx | 2 +-
.../source/drivers/macab/MacabCatalog.cxx | 2 +-
.../source/drivers/macab/MacabColumns.cxx | 2 +-
.../source/drivers/macab/MacabConnection.cxx | 2 +-
.../source/drivers/macab/MacabDatabaseMetaData.cxx | 2 +-
.../source/drivers/macab/MacabDriver.cxx | 2 +-
.../source/drivers/macab/MacabGroup.cxx | 2 +-
.../source/drivers/macab/MacabHeader.cxx | 2 +-
.../drivers/macab/MacabPreparedStatement.cxx | 2 +-
.../source/drivers/macab/MacabRecord.cxx | 2 +-
.../source/drivers/macab/MacabRecords.cxx | 2 +-
.../source/drivers/macab/MacabResultSet.cxx | 2 +-
.../drivers/macab/MacabResultSetMetaData.cxx | 2 +-
.../source/drivers/macab/MacabServices.cxx | 2 +-
.../source/drivers/macab/MacabStatement.cxx | 2 +-
.../source/drivers/macab/MacabTable.cxx | 2 +-
.../source/drivers/macab/MacabTables.cxx | 2 +-
.../source/drivers/macab/macabcondition.cxx | 2 +-
.../source/drivers/macab/macaborder.cxx | 2 +-
.../connectivity/source/drivers/mysql/YCatalog.cxx | 2 +-
.../connectivity/source/drivers/mysql/YColumns.cxx | 2 +-
main/connectivity/source/drivers/mysql/YDriver.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTable.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTables.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUser.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUsers.cxx | 2 +-
main/connectivity/source/drivers/mysql/YViews.cxx | 2 +-
.../source/drivers/mysql/Yservices.cxx | 2 +-
.../source/drivers/odbc/OFunctions.cxx | 2 +-
.../source/drivers/odbc/ORealDriver.cxx | 2 +-
.../connectivity/source/drivers/odbc/oservices.cxx | 2 +-
.../source/drivers/odbcbase/OConnection.cxx | 2 +-
.../source/drivers/odbcbase/ODatabaseMetaData.cxx | 2 +-
.../odbcbase/ODatabaseMetaDataResultSet.cxx | 2 +-
.../source/drivers/odbcbase/ODriver.cxx | 2 +-
.../source/drivers/odbcbase/OPreparedStatement.cxx | 2 +-
.../source/drivers/odbcbase/OResultSet.cxx | 2 +-
.../source/drivers/odbcbase/OResultSetMetaData.cxx | 2 +-
.../source/drivers/odbcbase/OStatement.cxx | 2 +-
.../source/drivers/odbcbase/OTools.cxx | 2 +-
.../source/inc/ParameterSubstitution.hxx | 1 -
.../connectivity/source/manager/mdrivermanager.cxx | 2 +-
main/connectivity/source/manager/mregistration.cxx | 2 +-
main/connectivity/source/parse/PColumn.cxx | 2 +-
main/connectivity/source/parse/internalnode.cxx | 2 +-
main/connectivity/source/parse/sqliterator.cxx | 2 +-
main/connectivity/source/parse/sqlnode.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlbison.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlflex.cxx | 2 +-
.../source/resource/sharedresources.cxx | 2 +-
main/connectivity/source/sdbcx/VCatalog.cxx | 2 +-
main/connectivity/source/sdbcx/VCollection.cxx | 2 +-
main/connectivity/source/sdbcx/VColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VDescriptor.cxx | 2 +-
main/connectivity/source/sdbcx/VGroup.cxx | 2 +-
main/connectivity/source/sdbcx/VIndex.cxx | 2 +-
main/connectivity/source/sdbcx/VIndexColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VKey.cxx | 2 +-
main/connectivity/source/sdbcx/VKeyColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VTable.cxx | 2 +-
main/connectivity/source/sdbcx/VUser.cxx | 2 +-
main/connectivity/source/sdbcx/VView.cxx | 2 +-
main/connectivity/source/simpledbt/charset_s.cxx | 2 +-
main/connectivity/source/simpledbt/dbtfactory.cxx | 2 +-
main/connectivity/source/simpledbt/parsenode_s.cxx | 2 +-
main/connectivity/source/simpledbt/parser_s.cxx | 2 +-
main/connectivity/source/simpledbt/refbase.cxx | 2 +-
.../source/simpledbt/staticdbtools_s.cxx | 2 +-
352 files changed, 2315 insertions(+), 385 deletions(-)
diff --git a/main/Repository.mk b/main/Repository.mk
index fdcdc8596d..07da7d2dbf 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
acc \
adabas \
adabasui \
+ ado \
agg \
analysis \
animcore \
@@ -84,6 +85,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
basegfx \
cached1 \
+ calc \
canvastools \
collator_data \
communi \
@@ -92,10 +94,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cui \
date \
dba \
+ dbase \
dbaxml \
dbmm \
dbui \
dbpool \
+ dbpool2 \
dbtools \
desktop_detector \
dict_ja \
@@ -107,9 +111,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
editeng \
embobj \
emboleobj \
+ evoab2 \
evtatt \
file \
fileacc \
+ flat \
fop \
for \
forui \
@@ -121,9 +127,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwl \
fwm \
guesslang \
+ hsqldb \
i18npaper \
index_data \
java_uno_accessbridge \
+ jdbc \
juh \
juhx \
lng \
@@ -131,9 +139,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
localedata_es \
localedata_euro \
localedata_others \
+ macab1 \
+ macabdrv1 \
mcnttype \
msfilter \
msword \
+ mysql \
odbc \
odbcbase \
oox \
@@ -151,6 +162,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
scfilt \
scui \
sdbc \
+ sdbc2 \
sdbt \
sfx \
simplecm \
diff --git a/main/connectivity/AllLangResTarget_cnr.mk b/main/connectivity/AllLangResTarget_cnr.mk
new file mode 100644
index 0000000000..329925b9da
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_cnr.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
+
+$(eval $(call gb_AllLangResTarget_add_srs,cnr,connectivity/cnr))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/cnr))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/cnr,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/cnr,\
+ connectivity/source/resource/conn_shared_res.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_hsqldb.mk b/main/connectivity/AllLangResTarget_hsqldb.mk
new file mode 100644
index 0000000000..7024f40487
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_hsqldb.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
+
+$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,connectivity/hsqldb))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/hsqldb))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/hsqldb,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/hsqldb \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/hsqldb,\
+ connectivity/source/drivers/hsqldb/hsqlui.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_sdbcl.mk b/main/connectivity/AllLangResTarget_sdbcl.mk
new file mode 100644
index 0000000000..43ac462259
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_sdbcl.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbcl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdbcl,connectivity/sdbcl))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/sdbcl))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/sdbcl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/sdbcl,\
+ connectivity/source/resource/conn_log_res.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_sdberr.mk b/main/connectivity/AllLangResTarget_sdberr.mk
new file mode 100644
index 0000000000..a310446917
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_sdberr.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdberr))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdberr,connectivity/sdberr))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/sdberr))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/sdberr,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/sdberr,\
+ connectivity/source/resource/conn_error_message.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Configuration.mk b/main/connectivity/Configuration.mk
new file mode 100644
index 0000000000..e38d819061
--- /dev/null
+++ b/main/connectivity/Configuration.mk
@@ -0,0 +1,86 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+#########
+# Inputs:
+#########
+
+PACKAGE := org.openoffice.Office.DataAccess
+COMPONENT_CONFIG_DATA := \
+ $(SRCDIR)/source/drivers/ado/ado.xcu \
+ $(SRCDIR)/source/drivers/adabas/adabas.xcu \
+ $(SRCDIR)/source/drivers/mysql/mysql.xcu \
+ $(SRCDIR)/source/drivers/hsqldb/hsqldb.xcu \
+ $(SRCDIR)/source/drivers/macab/macab.xcu \
+ $(SRCDIR)/source/drivers/evoab2/evoab2.xcu \
+ $(SRCDIR)/source/drivers/jdbc/jdbc.xcu \
+ $(SRCDIR)/source/drivers/dbase/dbase.xcu \
+ $(SRCDIR)/source/drivers/flat/flat.xcu \
+ $(SRCDIR)/source/drivers/calc/calc.xcu \
+ $(SRCDIR)/source/drivers/odbc/odbc.xcu
+
+LOCALIZEDFILES = $(COMPONENT_CONFIG_DATA)
+XCUFILES = $(COMPONENT_CONFIG_DATA)
+
+
+
+##############################################
+# Processing and output.
+# From dmake's main/solenv/inc/tg_config.mk:
+##############################################
+
+PACKAGEDIR = $(subst .,/,$(PACKAGE))
+XSLTPACKAGEDIR = $(PACKAGEDIR)
+
+XCSROOTURL = $(WORKDIR)/CustomTarget/connectivity
+ifeq ($(GUI),WNT)
+XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
+endif
+ifeq ($(GUI),OS2)
+XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
+endif
+
+XCU_DEFAULT = $(foreach file,$(XCUFILES),\
+ $(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/$(file))
+XCU_LANG = $(foreach file,$(LOCALIZEDFILES),\
+ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
+ $(WORKDIR)/CustomTarget/connectivity/registry/res/$(lang)/$(PACKAGEDIR)/$(file)))
+
+$(XCU_DEFAULT) : $(OUTPUTDIR)/xml/registry/component-update.dtd \
+ $(OUTPUTDIR)/xml/processing/data_val.xsl \
+ $(OUTPUTDIR)/xml/processing/alllang.xsl
+
+$(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
+ mkdir -p $(dir $@) && \
+ $(gb_XSLTPROC) --nonet -o $*.val \
+ --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
+ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+ --path $(OUTPUTDIR)/xml/registry \
+ $(OUTPUTDIR)/xml/processing/data_val.xsl $< && \
+ $(gb_XSLTPROC) --nonet -o $@ \
+ --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
+ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+ --path $(OUTPUTDIR)/xml/registry \
+ $(OUTPUTDIR)/xml/processing/alllang.xsl $< && \
+ rm $*.val
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
new file mode 100644
index 0000000000..0a48734715
--- /dev/null
+++ b/main/connectivity/Jar_sdbc_hsqldb.mk
@@ -0,0 +1,58 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Jar_Jar,sdbc_hsqldb,SRCDIR))
+
+ifeq ($(SYSTEM_HSQLDB),YES)
+# FIXME: not used anywhere else in AOO! Test!
+$(eval $(call gb_Jar_add_system_jars,sdbc_hsqldb,\
+ $(HSQLDB_JAR) \
+))
+else
+$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
+ $(OUTDIR)/bin/hsqldb.jar \
+))
+endif
+
+$(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com org))
+
+$(eval $(call gb_Jar_set_manifest,sdbc_hsqldb,$(SRCDIR)/connectivity/com/sun/star/sdbcx/comp/hsqldb/manifest))
+
+$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
+ hsqldb.jar \
+ .. \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_adabas.mk b/main/connectivity/Library_adabas.mk
new file mode 100644
index 0000000000..af433c26d9
--- /dev/null
+++ b/main/connectivity/Library_adabas.mk
@@ -0,0 +1,89 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,adabas))
+
+$(eval $(call gb_Library_add_precompiled_header,adabas,$(SRCDIR)/connectivity/inc/pch/precompiled_adabas))
+
+$(eval $(call gb_Library_set_componentfile,adabas,connectivity/source/drivers/adabas/adabas))
+
+$(eval $(call gb_Library_set_include,adabas,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/adabas \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,adabas,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,adabas,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,adabas,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ odbcbase \
+ sal \
+ stl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,adabas,\
+ connectivity/source/drivers/adabas/BCatalog \
+ connectivity/source/drivers/adabas/BColumns \
+ connectivity/source/drivers/adabas/BConnection \
+ connectivity/source/drivers/adabas/BDatabaseMetaData \
+ connectivity/source/drivers/adabas/BDriver \
+ connectivity/source/drivers/adabas/BFunctions \
+ connectivity/source/drivers/adabas/BGroup \
+ connectivity/source/drivers/adabas/BGroups \
+ connectivity/source/drivers/adabas/BIndex \
+ connectivity/source/drivers/adabas/BIndexColumns \
+ connectivity/source/drivers/adabas/BIndexes \
+ connectivity/source/drivers/adabas/BKeys \
+ connectivity/source/drivers/adabas/BPreparedStatement \
+ connectivity/source/drivers/adabas/BResultSet \
+ connectivity/source/drivers/adabas/BResultSetMetaData \
+ connectivity/source/drivers/adabas/BStatement \
+ connectivity/source/drivers/adabas/BTable \
+ connectivity/source/drivers/adabas/BTables \
+ connectivity/source/drivers/adabas/BUser \
+ connectivity/source/drivers/adabas/BUsers \
+ connectivity/source/drivers/adabas/BViews \
+ connectivity/source/drivers/adabas/Bservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_ado.mk b/main/connectivity/Library_ado.mk
new file mode 100644
index 0000000000..c9a09d557a
--- /dev/null
+++ b/main/connectivity/Library_ado.mk
@@ -0,0 +1,95 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,ado))
+
+$(eval $(call gb_Library_add_precompiled_header,ado,$(SRCDIR)/connectivity/inc/pch/precompiled_ado))
+
+$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
+
+$(eval $(call gb_Library_set_include,ado,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/ado \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,ado,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ado,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ ole32 \
+ oleaut32 \
+ sal \
+ stl \
+ uuid \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,ado,\
+ connectivity/source/drivers/ado/ACallableStatement \
+ connectivity/source/drivers/ado/ACatalog \
+ connectivity/source/drivers/ado/AColumn \
+ connectivity/source/drivers/ado/AColumns \
+ connectivity/source/drivers/ado/AConnection \
+ connectivity/source/drivers/ado/ADatabaseMetaData \
+ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \
+ connectivity/source/drivers/ado/ADatabaseMetaDataResultSet \
+ connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData \
+ connectivity/source/drivers/ado/ADriver \
+ connectivity/source/drivers/ado/AGroup \
+ connectivity/source/drivers/ado/AGroups \
+ connectivity/source/drivers/ado/AIndex \
+ connectivity/source/drivers/ado/AIndexes \
+ connectivity/source/drivers/ado/AKey \
+ connectivity/source/drivers/ado/AKeys \
+ connectivity/source/drivers/ado/Aolevariant \
+ connectivity/source/drivers/ado/APreparedStatement \
+ connectivity/source/drivers/ado/AResultSet \
+ connectivity/source/drivers/ado/AResultSetMetaData \
+ connectivity/source/drivers/ado/Aservices \
+ connectivity/source/drivers/ado/AStatement \
+ connectivity/source/drivers/ado/ATable \
+ connectivity/source/drivers/ado/ATables \
+ connectivity/source/drivers/ado/AUser \
+ connectivity/source/drivers/ado/AUsers \
+ connectivity/source/drivers/ado/AView \
+ connectivity/source/drivers/ado/AViews \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,ado,\
+ connectivity/source/drivers/ado/Awrapado \
+ connectivity/source/drivers/ado/adoimp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_calc.mk b/main/connectivity/Library_calc.mk
new file mode 100644
index 0000000000..bda3dcb4bc
--- /dev/null
+++ b/main/connectivity/Library_calc.mk
@@ -0,0 +1,73 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,calc))
+
+$(eval $(call gb_Library_add_precompiled_header,calc,$(SRCDIR)/connectivity/inc/pch/precompiled_calc))
+
+$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
+
+$(eval $(call gb_Library_set_include,calc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,calc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,calc,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,calc,\
+ connectivity/source/drivers/calc/CResultSet \
+ connectivity/source/drivers/calc/CStatement \
+ connectivity/source/drivers/calc/CPreparedStatement \
+ connectivity/source/drivers/calc/CDatabaseMetaData \
+ connectivity/source/drivers/calc/CCatalog \
+ connectivity/source/drivers/calc/CColumns \
+ connectivity/source/drivers/calc/CTable \
+ connectivity/source/drivers/calc/CTables \
+ connectivity/source/drivers/calc/CConnection \
+ connectivity/source/drivers/calc/Cservices \
+ connectivity/source/drivers/calc/CDriver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbase.mk b/main/connectivity/Library_dbase.mk
new file mode 100644
index 0000000000..fb886f4aa3
--- /dev/null
+++ b/main/connectivity/Library_dbase.mk
@@ -0,0 +1,108 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbase))
+
+$(eval $(call gb_Library_add_precompiled_header,dbase,$(SRCDIR)/connectivity/inc/pch/precompiled_dbase))
+
+$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
+
+$(eval $(call gb_Library_set_include,dbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,dbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbase,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DCode \
+ connectivity/source/drivers/dbase/DResultSet \
+ connectivity/source/drivers/dbase/DStatement \
+ connectivity/source/drivers/dbase/DPreparedStatement \
+ connectivity/source/drivers/dbase/dindexnode \
+ connectivity/source/drivers/dbase/DIndexIter \
+ connectivity/source/drivers/dbase/DDatabaseMetaData \
+ connectivity/source/drivers/dbase/DCatalog \
+ connectivity/source/drivers/dbase/DColumns \
+ connectivity/source/drivers/dbase/DIndexColumns \
+ connectivity/source/drivers/dbase/DIndex \
+ connectivity/source/drivers/dbase/DIndexes \
+ connectivity/source/drivers/dbase/DTables \
+ connectivity/source/drivers/dbase/DConnection \
+ connectivity/source/drivers/dbase/Dservices \
+ connectivity/source/drivers/dbase/DDriver \
+))
+
+# [kh] ppc linux gcc compiler problem
+# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with
+# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj
+
+# FIXME: no way to translate $(CCNUMVER)>=000300040000 && $(CCNUMVER)<000300050000)
+ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCPOWERPC)
+$(eval $(call gb_Library_add_cxxobjects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+ifeq ($(OS)$(COM)$(CPUNAME),FREEBSDCLANGX86_64)
+ifeq ("$(CCNUMVER)","000300040000")
+$(eval $(call gb_Library_add_cxxobjects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+))
+endif
+else
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbpool2.mk b/main/connectivity/Library_dbpool2.mk
new file mode 100644
index 0000000000..2d990bc63a
--- /dev/null
+++ b/main/connectivity/Library_dbpool2.mk
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbpool2))
+
+$(eval $(call gb_Library_add_precompiled_header,dbpool2,$(SRCDIR)/connectivity/inc/pch/precompiled_dbpool2))
+
+$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2))
+
+$(eval $(call gb_Library_set_include,dbpool2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,dbpool2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbpool2,\
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,dbpool2,\
+ connectivity/source/cpool/ZConnectionWrapper \
+ connectivity/source/cpool/ZDriverWrapper \
+ connectivity/source/cpool/ZPooledConnection \
+ connectivity/source/cpool/ZConnectionPool \
+ connectivity/source/cpool/ZPoolCollection \
+ connectivity/source/cpool/Zregistration \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbtools.mk b/main/connectivity/Library_dbtools.mk
new file mode 100644
index 0000000000..878d7f6b67
--- /dev/null
+++ b/main/connectivity/Library_dbtools.mk
@@ -0,0 +1,184 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbtools))
+
+$(eval $(call gb_Library_add_package_headers,dbtools,connectivity_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,dbtools,$(SRCDIR)/connectivity/inc/pch/precompiled_dbtools))
+
+$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
+
+$(eval $(call gb_Library_set_include,dbtools,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,dbtools,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,dbtools,\
+ -DOOO_DLLIMPLEMENTATION_DBTOOLS \
+ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+ -DCONN_SHARED_RESOURCE_FILE=cnr \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbtools,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ i18nisolang1 \
+ jvmaccess \
+ sal \
+ stl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+# NETBSD: somewhere we have to instantiate the static data members.
+# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
+# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS),SCO)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS)$(COM),OS2GCC)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+
+
+$(eval $(call gb_Library_add_exception_objects,dbtools,\
+ connectivity/source/sdbcx/VDescriptor \
+ connectivity/source/sdbcx/VCollection \
+ connectivity/source/sdbcx/VColumn \
+ connectivity/source/sdbcx/VIndexColumn \
+ connectivity/source/sdbcx/VKeyColumn \
+ connectivity/source/sdbcx/VUser \
+ connectivity/source/sdbcx/VGroup \
+ connectivity/source/sdbcx/VTable \
+ connectivity/source/sdbcx/VKey \
+ connectivity/source/sdbcx/VIndex \
+ connectivity/source/sdbcx/VCatalog \
+ connectivity/source/sdbcx/VView \
+ connectivity/source/commontools/predicateinput \
+ connectivity/source/commontools/ConnectionWrapper \
+ connectivity/source/commontools/TConnection \
+ connectivity/source/commontools/conncleanup \
+ connectivity/source/commontools/dbtools \
+ connectivity/source/commontools/dbtools2 \
+ connectivity/source/commontools/dbexception \
+ connectivity/source/commontools/CommonTools \
+ connectivity/source/commontools/TColumnsHelper \
+ connectivity/source/commontools/TTableHelper \
+ connectivity/source/commontools/TKeys \
+ connectivity/source/commontools/TKey \
+ connectivity/source/commontools/TKeyColumns \
+ connectivity/source/commontools/TIndexes \
+ connectivity/source/commontools/TIndex \
+ connectivity/source/commontools/TIndexColumns \
+ connectivity/source/commontools/DateConversion \
+ connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData \
+ connectivity/source/commontools/FDatabaseMetaDataResultSet \
+ connectivity/source/commontools/TDatabaseMetaDataBase \
+ connectivity/source/commontools/TPrivilegesResultSet \
+ connectivity/source/commontools/TSkipDeletedSet \
+ connectivity/source/commontools/dbmetadata \
+ connectivity/source/commontools/TSortIndex \
+ connectivity/source/commontools/dbcharset \
+ connectivity/source/commontools/propertyids \
+ connectivity/source/commontools/FValue \
+ connectivity/source/commontools/paramwrapper \
+ connectivity/source/commontools/statementcomposer \
+ connectivity/source/commontools/RowFunctionParser \
+ connectivity/source/commontools/sqlerror \
+ connectivity/source/commontools/filtermanager \
+ connectivity/source/commontools/parameters \
+ connectivity/source/commontools/ParamterSubstitution \
+ connectivity/source/commontools/DriversConfig \
+ connectivity/source/commontools/formattedcolumnvalue \
+ connectivity/source/commontools/BlobHelper \
+ connectivity/source/commontools/warningscontainer \
+ connectivity/source/parse/PColumn \
+ connectivity/source/parse/sqliterator \
+ connectivity/source/parse/sqlnode \
+ connectivity/source/parse/wrap_sqlbison \
+ connectivity/source/parse/internalnode \
+ connectivity/source/simpledbt/charset_s \
+ connectivity/source/simpledbt/staticdbtools_s \
+ connectivity/source/simpledbt/parsenode_s \
+ connectivity/source/simpledbt/parser_s \
+ connectivity/source/resource/sharedresources \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbtools,\
+ connectivity/source/commontools/AutoRetrievingBase \
+ connectivity/source/commontools/dbconversion \
+ connectivity/source/parse/wrap_sqlflex \
+ connectivity/source/simpledbt/refbase \
+ connectivity/source/simpledbt/dbtfactory \
+))
+
+############
+# BISON rule
+############
+
+# FIXME: no proper dependencies of other files on Yacc's outputs - needs "make clean" on any changes!
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx : TRTEMPFILE := $(shell $(gb_MKTEMP))
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx : $(SRCDIR)/connectivity/source/parse/sqlbison.y
+ tr -d "\015" < $< > $(TRTEMPFILE)
+ mkdir -p $(dir $@)
+ bison -v -d -l -pSQLyy -bsql -o $@ $(TRTEMPFILE)
+ rm $(TRTEMPFILE)
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx
+
+# Add depenedencies. This is so ugly and doesn't cover the fact evoab2 also uses it:
+
+$(SRCDIR)/connectivity/inc/connectivity/sqlparse.hxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx
+
+$(SRCDIR)/connectivity/source/parse/wrap_sqlbison.cxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx
+
+###########
+# FLEX rule
+###########
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlflex.cxx : $(SRCDIR)/connectivity/source/parse/sqlflex.l
+ mkdir -p $(dir $@)
+ flex -i -8 -PSQLyy -L -o$@ $<
+
+$(SRCDIR)/connectivity/source/parse/wrap_sqlflex.cxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlflex.cxx $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_evoab2.mk b/main/connectivity/Library_evoab2.mk
new file mode 100644
index 0000000000..74d53baad7
--- /dev/null
+++ b/main/connectivity/Library_evoab2.mk
@@ -0,0 +1,89 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,evoab2))
+
+$(eval $(call gb_Library_add_precompiled_header,evoab2,$(SRCDIR)/connectivity/inc/pch/precompiled_evoab2))
+
+$(eval $(call gb_Library_set_componentfile,evoab2,connectivity/source/drivers/evoab2/evoab))
+
+$(eval $(call gb_Library_set_include,evoab2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/evoab2 \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+ $(filter -I%,$(GTK_CFLAGS)) \
+ $(filter -I%,$(GOBJECT_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_cxxflags,evoab2,\
+ $(filter-out -I%,$(GTK_CFLAGS)) \
+ $(filter-out -I%,$(GOBJECT_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,evoab2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,evoab2,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,evoab2,\
+ $(GTK_LIBS) \
+ $(GOBJECT_LIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,evoab2,\
+ connectivity/source/drivers/evoab2/NCatalog \
+ connectivity/source/drivers/evoab2/NColumns \
+ connectivity/source/drivers/evoab2/NConnection \
+ connectivity/source/drivers/evoab2/NDatabaseMetaData \
+ connectivity/source/drivers/evoab2/NDriver \
+ connectivity/source/drivers/evoab2/NPreparedStatement \
+ connectivity/source/drivers/evoab2/NResultSet \
+ connectivity/source/drivers/evoab2/NResultSetMetaData \
+ connectivity/source/drivers/evoab2/NStatement \
+ connectivity/source/drivers/evoab2/NTable \
+ connectivity/source/drivers/evoab2/NTables \
+ connectivity/source/drivers/evoab2/NServices \
+ connectivity/source/drivers/evoab2/EApi \
+ connectivity/source/drivers/evoab2/NDebug \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_file.mk b/main/connectivity/Library_file.mk
new file mode 100644
index 0000000000..434bf9e375
--- /dev/null
+++ b/main/connectivity/Library_file.mk
@@ -0,0 +1,86 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,file))
+
+$(eval $(call gb_Library_add_precompiled_header,file,$(SRCDIR)/connectivity/inc/pch/precompiled_file))
+
+$(eval $(call gb_Library_set_include,file,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,file,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,file,\
+ -DOOO_DLLIMPLEMENTATION_FILE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,file,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,file,\
+ connectivity/source/drivers/file/FNoException \
+ connectivity/source/drivers/file/FConnection \
+ connectivity/source/drivers/file/FResultSetMetaData \
+ connectivity/source/drivers/file/FColumns \
+ connectivity/source/drivers/file/FTables \
+ connectivity/source/drivers/file/FTable \
+ connectivity/source/drivers/file/FCatalog \
+ connectivity/source/drivers/file/FResultSet \
+ connectivity/source/drivers/file/FStatement \
+ connectivity/source/drivers/file/FPreparedStatement \
+ connectivity/source/drivers/file/FDatabaseMetaData \
+ connectivity/source/drivers/file/FDriver \
+ connectivity/source/drivers/file/fanalyzer \
+ connectivity/source/drivers/file/fcomp \
+ connectivity/source/drivers/file/fcode \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,file,\
+ connectivity/source/drivers/file/FStringFunctions \
+ connectivity/source/drivers/file/FDateFunctions \
+ connectivity/source/drivers/file/FNumericFunctions \
+ connectivity/source/drivers/file/quotedstring \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_flat.mk b/main/connectivity/Library_flat.mk
new file mode 100644
index 0000000000..bed4d0ea90
--- /dev/null
+++ b/main/connectivity/Library_flat.mk
@@ -0,0 +1,73 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,flat))
+
+$(eval $(call gb_Library_add_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat))
+
+$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
+
+$(eval $(call gb_Library_set_include,flat,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,flat,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,flat,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,flat,\
+ connectivity/source/drivers/flat/ECatalog \
+ connectivity/source/drivers/flat/EColumns \
+ connectivity/source/drivers/flat/EConnection \
+ connectivity/source/drivers/flat/EDatabaseMetaData \
+ connectivity/source/drivers/flat/EDriver \
+ connectivity/source/drivers/flat/EPreparedStatement \
+ connectivity/source/drivers/flat/EResultSet \
+ connectivity/source/drivers/flat/EStatement \
+ connectivity/source/drivers/flat/ETable \
+ connectivity/source/drivers/flat/ETables \
+ connectivity/source/drivers/flat/Eservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_hsqldb.mk b/main/connectivity/Library_hsqldb.mk
new file mode 100644
index 0000000000..09606223f8
--- /dev/null
+++ b/main/connectivity/Library_hsqldb.mk
@@ -0,0 +1,87 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,hsqldb))
+
+$(eval $(call gb_Library_add_precompiled_header,hsqldb,$(SRCDIR)/connectivity/inc/pch/precompiled_hsqldb))
+
+$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
+
+$(eval $(call gb_Library_set_include,hsqldb,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+# FIXME: Macs will presumably also need to do something with:
+# SHL1CREATEJNILIB=TRUE
+
+ifeq ($(SYSTEM_HSQLDB),YES)
+$(eval $(call gb_Library_add_cxxflags,hsqldb,\
+ -DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
+))
+endif
+
+$(eval $(call gb_Library_add_api,hsqldb,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hsqldb,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ jvmfwk \
+ sal \
+ stl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,hsqldb,\
+ connectivity/source/drivers/hsqldb/HStorageMap \
+ connectivity/source/drivers/hsqldb/HStorageAccess \
+ connectivity/source/drivers/hsqldb/HDriver \
+ connectivity/source/drivers/hsqldb/HConnection \
+ connectivity/source/drivers/hsqldb/HTerminateListener \
+ connectivity/source/drivers/hsqldb/StorageNativeOutputStream \
+ connectivity/source/drivers/hsqldb/StorageNativeInputStream \
+ connectivity/source/drivers/hsqldb/StorageFileAccess \
+ connectivity/source/drivers/hsqldb/HTables \
+ connectivity/source/drivers/hsqldb/HTable \
+ connectivity/source/drivers/hsqldb/HView \
+ connectivity/source/drivers/hsqldb/HViews \
+ connectivity/source/drivers/hsqldb/HCatalog \
+ connectivity/source/drivers/hsqldb/HColumns \
+ connectivity/source/drivers/hsqldb/HUser \
+ connectivity/source/drivers/hsqldb/HUsers \
+ connectivity/source/drivers/hsqldb/Hservices \
+ connectivity/source/drivers/hsqldb/HTools \
+ connectivity/source/drivers/hsqldb/accesslog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_jdbc.mk b/main/connectivity/Library_jdbc.mk
new file mode 100644
index 0000000000..e81b2a0f74
--- /dev/null
+++ b/main/connectivity/Library_jdbc.mk
@@ -0,0 +1,91 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,jdbc))
+
+$(eval $(call gb_Library_add_precompiled_header,jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_jdbc))
+
+$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
+
+$(eval $(call gb_Library_set_include,jdbc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/jdbc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,jdbc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jdbc,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ jvmaccess \
+ jvmfwk \
+ sal \
+ stl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,jdbc,\
+ connectivity/source/drivers/jdbc/Array \
+ connectivity/source/drivers/jdbc/Blob \
+ connectivity/source/drivers/jdbc/Boolean \
+ connectivity/source/drivers/jdbc/CallableStatement \
+ connectivity/source/drivers/jdbc/Class \
+ connectivity/source/drivers/jdbc/Clob \
+ connectivity/source/drivers/jdbc/ConnectionLog \
+ connectivity/source/drivers/jdbc/DatabaseMetaData \
+ connectivity/source/drivers/jdbc/Date \
+ connectivity/source/drivers/jdbc/DriverPropertyInfo \
+ connectivity/source/drivers/jdbc/Exception \
+ connectivity/source/drivers/jdbc/InputStream \
+ connectivity/source/drivers/jdbc/JConnection \
+ connectivity/source/drivers/jdbc/JDriver \
+ connectivity/source/drivers/jdbc/JStatement \
+ connectivity/source/drivers/jdbc/Object \
+ connectivity/source/drivers/jdbc/PreparedStatement \
+ connectivity/source/drivers/jdbc/Reader \
+ connectivity/source/drivers/jdbc/Ref \
+ connectivity/source/drivers/jdbc/ResultSet \
+ connectivity/source/drivers/jdbc/ResultSetMetaData \
+ connectivity/source/drivers/jdbc/SQLException \
+ connectivity/source/drivers/jdbc/SQLWarning \
+ connectivity/source/drivers/jdbc/String \
+ connectivity/source/drivers/jdbc/Throwable \
+ connectivity/source/drivers/jdbc/Timestamp \
+ connectivity/source/drivers/jdbc/jservices \
+ connectivity/source/drivers/jdbc/JBigDecimal \
+ connectivity/source/drivers/jdbc/tools \
+ connectivity/source/drivers/jdbc/ContextClassLoader \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_macab1.mk b/main/connectivity/Library_macab1.mk
new file mode 100644
index 0000000000..449ccf576c
--- /dev/null
+++ b/main/connectivity/Library_macab1.mk
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,macab1))
+
+$(eval $(call gb_Library_add_precompiled_header,macab1,$(SRCDIR)/connectivity/inc/pch/precompiled_macab1))
+
+$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
+
+$(eval $(call gb_Library_set_include,macab1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/macab \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,macab1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,macab1,\
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,macab1,\
+ connectivity/source/drivers/macab/MacabDriver \
+ connectivity/source/drivers/macab/MacabServices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_macabdrv1.mk b/main/connectivity/Library_macabdrv1.mk
new file mode 100644
index 0000000000..e622c53ccf
--- /dev/null
+++ b/main/connectivity/Library_macabdrv1.mk
@@ -0,0 +1,78 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,macabdrv1))
+
+$(eval $(call gb_Library_add_precompiled_header,macabdrv1,$(SRCDIR)/connectivity/inc/pch/precompiled_macabdrv1))
+
+$(eval $(call gb_Library_set_include,macabdrv1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/macab \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,macabdrv1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_libs,macabdrv1,\
+ -framework Carbon \
+ -framework AddressBook \
+))
+
+$(eval $(call gb_Library_add_linked_libs,macabdrv1,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,macabdrv1,\
+ connectivity/source/drivers/macab/MacabColumns \
+ connectivity/source/drivers/macab/MacabTable \
+ connectivity/source/drivers/macab/MacabTables \
+ connectivity/source/drivers/macab/MacabCatalog \
+ connectivity/source/drivers/macab/MacabResultSet \
+ connectivity/source/drivers/macab/MacabStatement \
+ connectivity/source/drivers/macab/MacabPreparedStatement \
+ connectivity/source/drivers/macab/MacabDatabaseMetaData \
+ connectivity/source/drivers/macab/MacabConnection \
+ connectivity/source/drivers/macab/MacabResultSetMetaData \
+ connectivity/source/drivers/macab/macabcondition \
+ connectivity/source/drivers/macab/macaborder \
+ connectivity/source/drivers/macab/MacabRecord \
+ connectivity/source/drivers/macab/MacabRecords \
+ connectivity/source/drivers/macab/MacabHeader \
+ connectivity/source/drivers/macab/MacabGroup \
+ connectivity/source/drivers/macab/MacabAddressBook \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_mysql.mk b/main/connectivity/Library_mysql.mk
new file mode 100644
index 0000000000..fa0242f11f
--- /dev/null
+++ b/main/connectivity/Library_mysql.mk
@@ -0,0 +1,66 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,mysql))
+
+$(eval $(call gb_Library_add_precompiled_header,mysql,$(SRCDIR)/connectivity/inc/pch/precompiled_mysql))
+
+$(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
+
+$(eval $(call gb_Library_set_include,mysql,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/mysql \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,mysql,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mysql,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mysql,\
+ connectivity/source/drivers/mysql/YCatalog \
+ connectivity/source/drivers/mysql/YColumns \
+ connectivity/source/drivers/mysql/YDriver \
+ connectivity/source/drivers/mysql/YTable \
+ connectivity/source/drivers/mysql/YTables \
+ connectivity/source/drivers/mysql/YUser \
+ connectivity/source/drivers/mysql/YUsers \
+ connectivity/source/drivers/mysql/YViews \
+ connectivity/source/drivers/mysql/Yservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_odbc.mk b/main/connectivity/Library_odbc.mk
new file mode 100644
index 0000000000..8fd95dce99
--- /dev/null
+++ b/main/connectivity/Library_odbc.mk
@@ -0,0 +1,65 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,odbc))
+
+$(eval $(call gb_Library_add_precompiled_header,odbc,$(SRCDIR)/connectivity/inc/pch/precompiled_odbc))
+
+$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
+
+$(eval $(call gb_Library_set_include,odbc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,odbc,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,odbc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odbc,\
+ cppuhelper \
+ cppu \
+ odbcbase \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbc,\
+ connectivity/source/drivers/odbc/oservices \
+ connectivity/source/drivers/odbc/ORealDriver \
+ connectivity/source/drivers/odbc/OFunctions \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_odbcbase.mk b/main/connectivity/Library_odbcbase.mk
new file mode 100644
index 0000000000..8a7f984b4e
--- /dev/null
+++ b/main/connectivity/Library_odbcbase.mk
@@ -0,0 +1,74 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,odbcbase))
+
+$(eval $(call gb_Library_add_precompiled_header,odbcbase,$(SRCDIR)/connectivity/inc/pch/precompiled_odbcbase))
+
+$(eval $(call gb_Library_set_include,odbcbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_cxxflags,odbcbase,\
+ -DOOO_DLLIMPLEMENTATION_ODBCBASE \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,odbcbase,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,odbcbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odbcbase,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbcbase,\
+ connectivity/source/drivers/odbcbase/OPreparedStatement \
+ connectivity/source/drivers/odbcbase/OStatement \
+ connectivity/source/drivers/odbcbase/OResultSetMetaData \
+ connectivity/source/drivers/odbcbase/OResultSet \
+ connectivity/source/drivers/odbcbase/OTools \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaData \
+ connectivity/source/drivers/odbcbase/ODriver \
+ connectivity/source/drivers/odbcbase/OConnection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_sdbc2.mk b/main/connectivity/Library_sdbc2.mk
new file mode 100644
index 0000000000..4cbda2b89d
--- /dev/null
+++ b/main/connectivity/Library_sdbc2.mk
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,sdbc2))
+
+$(eval $(call gb_Library_add_precompiled_header,sdbc2,$(SRCDIR)/connectivity/inc/pch/precompiled_sdbc2))
+
+$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
+
+$(eval $(call gb_Library_set_include,sdbc2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,sdbc2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdbc2,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,sdbc2,\
+ connectivity/source/manager/mdrivermanager \
+ connectivity/source/manager/mregistration \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Makefile b/main/connectivity/Makefile
new file mode 100644
index 0000000000..c1d144cbd4
--- /dev/null
+++ b/main/connectivity/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Module_connectivity.mk b/main/connectivity/Module_connectivity.mk
new file mode 100644
index 0000000000..70b15d10b4
--- /dev/null
+++ b/main/connectivity/Module_connectivity.mk
@@ -0,0 +1,72 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,connectivity))
+
+$(eval $(call gb_Module_add_targets,connectivity,\
+ AllLangResTarget_cnr \
+ AllLangResTarget_hsqldb \
+ AllLangResTarget_sdbcl \
+ AllLangResTarget_sdberr \
+ Configuration \
+ Connectivity \
+ Jar_sdbc_hsqldb \
+ Library_adabas \
+ Library_calc \
+ Library_dbase \
+ Library_dbpool2 \
+ Library_dbtools \
+ Library_file \
+ Library_flat \
+ Library_hsqldb \
+ Library_jdbc \
+ Library_mysql \
+ Library_odbc \
+ Library_odbcbase \
+ Library_sdbc2 \
+ Package_inc \
+ Package_generated_inc \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_ado \
+))
+endif
+
+ifeq ($(ENABLE_EVOAB2),TRUE)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_evoab2 \
+))
+endif
+
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_macab1 \
+ Library_macabdrv1 \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Package_generated_inc.mk b/main/connectivity/Package_generated_inc.mk
new file mode 100644
index 0000000000..4ae3d0df28
--- /dev/null
+++ b/main/connectivity/Package_generated_inc.mk
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,connectivity_generated_inc,$(WORKDIR)/CustomTarget/connectivity/source/parse))
+
+$(eval $(call gb_Package_add_file,connectivity_generated_inc,inc/connectivity/sqlbison.hxx,sqlbison.hxx))
diff --git a/main/connectivity/Package_inc.mk b/main/connectivity/Package_inc.mk
new file mode 100644
index 0000000000..69f109206c
--- /dev/null
+++ b/main/connectivity/Package_inc.mk
@@ -0,0 +1,78 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc))
+
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,connectivity/BlobHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,connectivity/CommonTools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,connectivity/conncleanup.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ConnectionWrapper.hxx,connectivity/ConnectionWrapper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DateConversion.hxx,connectivity/DateConversion.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbcharset.hxx,connectivity/dbcharset.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbconversion.hxx,connectivity/dbconversion.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbexception.hxx,connectivity/dbexception.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbmetadata.hxx,connectivity/dbmetadata.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtools.hxx,connectivity/dbtools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtoolsdllapi.hxx,connectivity/dbtoolsdllapi.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DriversConfig.hxx,connectivity/DriversConfig.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/filtermanager.hxx,connectivity/filtermanager.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/formattedcolumnvalue.hxx,connectivity/formattedcolumnvalue.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/FValue.hxx,connectivity/FValue.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/IParseContext.hxx,connectivity/IParseContext.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ParameterCont.hxx,connectivity/ParameterCont.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/parameters.hxx,connectivity/parameters.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/paramwrapper.hxx,connectivity/paramwrapper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/PColumn.hxx,connectivity/PColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/predicateinput.hxx,connectivity/predicateinput.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/IRefreshable.hxx,connectivity/sdbcx/IRefreshable.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCatalog.hxx,connectivity/sdbcx/VCatalog.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCollection.hxx,connectivity/sdbcx/VCollection.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VColumn.hxx,connectivity/sdbcx/VColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VDescriptor.hxx,connectivity/sdbcx/VDescriptor.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VGroup.hxx,connectivity/sdbcx/VGroup.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndex.hxx,connectivity/sdbcx/VIndex.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndexColumn.hxx,connectivity/sdbcx/VIndexColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKey.hxx,connectivity/sdbcx/VKey.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKeyColumn.hxx,connectivity/sdbcx/VKeyColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTable.hxx,connectivity/sdbcx/VTable.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTypeDef.hxx,connectivity/sdbcx/VTypeDef.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VUser.hxx,connectivity/sdbcx/VUser.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VView.hxx,connectivity/sdbcx/VView.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlerror.hxx,connectivity/sqlerror.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqliterator.hxx,connectivity/sqliterator.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlnode.hxx,connectivity/sqlnode.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlparse.hxx,connectivity/sqlparse.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/SQLStatementHelper.hxx,connectivity/SQLStatementHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/standardsqlstate.hxx,connectivity/standardsqlstate.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/statementcomposer.hxx,connectivity/statementcomposer.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/StdTypeDefs.hxx,connectivity/StdTypeDefs.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TColumnsHelper.hxx,connectivity/TColumnsHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndex.hxx,connectivity/TIndex.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexColumns.hxx,connectivity/TIndexColumns.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexes.hxx,connectivity/TIndexes.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKey.hxx,connectivity/TKey.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeyColumns.hxx,connectivity/TKeyColumns.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeys.hxx,connectivity/TKeys.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TTableHelper.hxx,connectivity/TTableHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/virtualdbtools.hxx,connectivity/virtualdbtools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/warningscontainer.hxx,connectivity/warningscontainer.hxx))
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_adabas.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_adabas.cxx
index 585686d50e..47da7ddd8a 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_adabas.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_adabas.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_adabas.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_ado.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_ado.cxx
index 585686d50e..4a3ea73fff 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_ado.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_ado.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_ado.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_calc.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_calc.cxx
index 585686d50e..7efdb38a66 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_calc.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_calc.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_calc.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbase.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbase.cxx
index 585686d50e..b23aeda967 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbase.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbase.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbase.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbpool2.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbpool2.cxx
index 585686d50e..90ad91b818 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbpool2.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbpool2.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbpool2.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbtools.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbtools.cxx
index 585686d50e..888fe6201b 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbtools.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbtools.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbtools.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_evoab2.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_evoab2.cxx
index 585686d50e..2b0e9d8e7a 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_evoab2.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_evoab2.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_evoab2.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_file.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_file.cxx
index 585686d50e..8a2c288228 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_file.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_file.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_file.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_flat.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_flat.cxx
index 585686d50e..524768eec9 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_flat.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_flat.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_flat.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_hsqldb.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_hsqldb.cxx
index 585686d50e..54351bb5f5 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_hsqldb.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_hsqldb.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_hsqldb.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_jdbc.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_jdbc.cxx
index 585686d50e..b79f477926 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_jdbc.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_jdbc.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_jdbc.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_macab1.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_macab1.cxx
index 585686d50e..9353bd97ce 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_macab1.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_macab1.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_macab1.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_macabdrv1.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_macabdrv1.cxx
index 585686d50e..b85221030a 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_macabdrv1.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_macabdrv1.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_macabdrv1.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_mysql.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_mysql.cxx
index 585686d50e..9f31ec2889 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_mysql.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_mysql.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_mysql.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_odbc.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_odbc.cxx
index 585686d50e..38cca33711 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_odbc.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_odbc.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_odbc.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_odbcbase.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_odbcbase.cxx
index 585686d50e..4afdf874d4 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_odbcbase.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_odbcbase.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_odbcbase.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_sdbc2.cxx
similarity index 95%
rename from main/connectivity/inc/pch/precompiled_connectivity.cxx
rename to main/connectivity/inc/pch/precompiled_sdbc2.cxx
index 585686d50e..9a4bb44301 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_sdbc2.cxx
@@ -21,5 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_sdbc2.hxx
similarity index 100%
rename from main/connectivity/inc/pch/precompiled_connectivity.hxx
rename to main/connectivity/inc/pch/precompiled_sdbc2.hxx
diff --git a/main/connectivity/prj/build.lst b/main/connectivity/prj/build.lst
index 441742c91e..1db7f0d072 100644
--- a/main/connectivity/prj/build.lst
+++ b/main/connectivity/prj/build.lst
@@ -1,30 +1,2 @@
cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt APACHE_COMMONS:apache-commons NULL
-cn connectivity usr1 - all cn_mkout NULL
-cn connectivity\inc nmake - all cn_inc NULL
-cn connectivity\java\dbtools nmake - all cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_jdbc nmake - all cn_jdbc cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_postgresql nmake - all cn_postgresqldb cn_dbtools cn_jdbtools cn_inc NULL
-cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_inc NULL
-cn connectivity\source\manager nmake - all cn_manager cn_dbtools cn_inc NULL
-cn connectivity\source\cpool nmake - all cn_cpool cn_dbtools cn_inc NULL
-cn connectivity\source\resource nmake - all cn_res cn_inc NULL
-cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
-cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\calc nmake - all cn_calc cn_file cn_inc NULL
-cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
-cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
-cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
-cn connectivity\source\parse nmake - all cn_parse cn_inc NULL
-cn connectivity\source\simpledbt nmake - all cn_simpledbt cn_cmtools cn_inc NULL
-cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
-cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
-cn connectivity\qa\complex\connectivity nmake - all cn_qa_complex cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab cn_postgresqldb NULL
+cn connectivity\prj nmake - all cn_prj NULL
diff --git a/main/connectivity/prj/d.lst b/main/connectivity/prj/d.lst
index 7a7e5f40b8..e69de29bb2 100644
--- a/main/connectivity/prj/d.lst
+++ b/main/connectivity/prj/d.lst
@@ -1,52 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
-..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
-..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
-..\%__SRC%\lib\dbt*.lib %_DEST%\lib%_EXT%\dbt*.lib
-
-..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\adabas\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\ado\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\macab\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\file\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\flat\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\dbtools\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_hsqldb\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_jdbc\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_postgresql\*.jar %_DEST%\bin%_EXT%\*.jar
-
-mkdir: %_DEST%\inc%_EXT%\connectivity
-mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
-mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
-
-..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx
-..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
-..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
-#..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
-..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component
-..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component
-..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component
-..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
-..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
-..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
-..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
-..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
-..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
-..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
-..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
-..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
-..\%__SRC%\misc\postgresql.component %_DEST%\xml%_EXT%\postgresql.component
-..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
diff --git a/main/connectivity/prj/makefile.mk b/main/connectivity/prj/makefile.mk
new file mode 100644
index 0000000000..353f9e0db1
--- /dev/null
+++ b/main/connectivity/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/main/connectivity/source/commontools/AutoRetrievingBase.cxx b/main/connectivity/source/commontools/AutoRetrievingBase.cxx
index 45cb34f267..c1bed9220e 100644
--- a/main/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/main/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "AutoRetrievingBase.hxx"
namespace connectivity
diff --git a/main/connectivity/source/commontools/BlobHelper.cxx b/main/connectivity/source/commontools/BlobHelper.cxx
index c12701d0f3..b3f6ace0f2 100644
--- a/main/connectivity/source/commontools/BlobHelper.cxx
+++ b/main/connectivity/source/commontools/BlobHelper.cxx
@@ -21,7 +21,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/BlobHelper.hxx"
#include <comphelper/seqstream.hxx>
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/commontools/CommonTools.cxx b/main/connectivity/source/commontools/CommonTools.cxx
index 13a882cba3..75c73349d5 100644
--- a/main/connectivity/source/commontools/CommonTools.cxx
+++ b/main/connectivity/source/commontools/CommonTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/CommonTools.hxx"
diff --git a/main/connectivity/source/commontools/ConnectionWrapper.cxx b/main/connectivity/source/commontools/ConnectionWrapper.cxx
index 9b5153b112..da178f926c 100644
--- a/main/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/main/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
#include "connectivity/ConnectionWrapper.hxx"
#endif
diff --git a/main/connectivity/source/commontools/DateConversion.cxx b/main/connectivity/source/commontools/DateConversion.cxx
index 76a2e3e830..8a2b880a47 100644
--- a/main/connectivity/source/commontools/DateConversion.cxx
+++ b/main/connectivity/source/commontools/DateConversion.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbconversion.hxx"
diff --git a/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 30d9bc0682..9708442141 100644
--- a/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "ParameterSubstitution.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
diff --git a/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 3186cd6078..2fd7b76152 100644
--- a/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "FDatabaseMetaDataResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ProcedureResult.hpp>
diff --git a/main/connectivity/source/commontools/FValue.cxx b/main/connectivity/source/commontools/FValue.cxx
index e329fd6a66..9108a6601c 100644
--- a/main/connectivity/source/commontools/FValue.cxx
+++ b/main/connectivity/source/commontools/FValue.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/FValue.hxx"
diff --git a/main/connectivity/source/commontools/ParamterSubstitution.cxx b/main/connectivity/source/commontools/ParamterSubstitution.cxx
index 0c62cbc5a0..4e59d07fe9 100644
--- a/main/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/main/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -20,7 +20,7 @@
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "ParameterSubstitution.hxx"
#include "connectivity/sqlparse.hxx"
#include <comphelper/sequenceashashmap.hxx>
diff --git a/main/connectivity/source/commontools/RowFunctionParser.cxx b/main/connectivity/source/commontools/RowFunctionParser.cxx
index 8855917d66..5b24a4c936 100644
--- a/main/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/main/connectivity/source/commontools/RowFunctionParser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
// Makes parser a static resource,
// we're synchronized externally.
diff --git a/main/connectivity/source/commontools/TColumnsHelper.cxx b/main/connectivity/source/commontools/TColumnsHelper.cxx
index ba61f36a47..2dcfa33b60 100644
--- a/main/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/main/connectivity/source/commontools/TColumnsHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TColumnsHelper.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/commontools/TConnection.cxx b/main/connectivity/source/commontools/TConnection.cxx
index da01fadc7d..aae5cc530c 100644
--- a/main/connectivity/source/commontools/TConnection.cxx
+++ b/main/connectivity/source/commontools/TConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TConnection.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index c1147110fa..0b8029da35 100644
--- a/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TDatabaseMetaDataBase.hxx"
#include "RowFunctionParser.hxx"
diff --git a/main/connectivity/source/commontools/TIndex.cxx b/main/connectivity/source/commontools/TIndex.cxx
index dae95617c0..f85d5ffb97 100644
--- a/main/connectivity/source/commontools/TIndex.cxx
+++ b/main/connectivity/source/commontools/TIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndex.hxx"
#include "connectivity/TIndexColumns.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TIndexColumns.cxx b/main/connectivity/source/commontools/TIndexColumns.cxx
index baf414b17c..3c58b12bb7 100644
--- a/main/connectivity/source/commontools/TIndexColumns.cxx
+++ b/main/connectivity/source/commontools/TIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndexColumns.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TIndexes.cxx b/main/connectivity/source/commontools/TIndexes.cxx
index b7b82e001c..6c4fdc39c0 100644
--- a/main/connectivity/source/commontools/TIndexes.cxx
+++ b/main/connectivity/source/commontools/TIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndexes.hxx"
#include "connectivity/TIndex.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TKey.cxx b/main/connectivity/source/commontools/TKey.cxx
index c0a2ba878e..e3ff320a2e 100644
--- a/main/connectivity/source/commontools/TKey.cxx
+++ b/main/connectivity/source/commontools/TKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKey.hxx"
diff --git a/main/connectivity/source/commontools/TKeyColumns.cxx b/main/connectivity/source/commontools/TKeyColumns.cxx
index 5f04222157..228fbbe894 100644
--- a/main/connectivity/source/commontools/TKeyColumns.cxx
+++ b/main/connectivity/source/commontools/TKeyColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKeyColumns.hxx"
#include "connectivity/sdbcx/VKeyColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TKeys.cxx b/main/connectivity/source/commontools/TKeys.cxx
index eaafa2a86d..3660959498 100644
--- a/main/connectivity/source/commontools/TKeys.cxx
+++ b/main/connectivity/source/commontools/TKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKeys.hxx"
#include "connectivity/TKey.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TPrivilegesResultSet.cxx b/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 1c1abe3007..a4449b6bb1 100644
--- a/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TPrivilegesResultSet.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/commontools/TSkipDeletedSet.cxx b/main/connectivity/source/commontools/TSkipDeletedSet.cxx
index b5767bfc77..12d3894c40 100644
--- a/main/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/main/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TSkipDeletedSet.hxx"
#include <osl/diagnose.h>
#include <rtl/logfile.hxx>
diff --git a/main/connectivity/source/commontools/TSortIndex.cxx b/main/connectivity/source/commontools/TSortIndex.cxx
index 8cfbf28a52..2c045063b9 100644
--- a/main/connectivity/source/commontools/TSortIndex.cxx
+++ b/main/connectivity/source/commontools/TSortIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TSortIndex.hxx"
#include <algorithm>
#include <functional>
diff --git a/main/connectivity/source/commontools/TTableHelper.cxx b/main/connectivity/source/commontools/TTableHelper.cxx
index 4d4c144bd3..3fd29e1608 100644
--- a/main/connectivity/source/commontools/TTableHelper.cxx
+++ b/main/connectivity/source/commontools/TTableHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TTableHelper.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/commontools/conncleanup.cxx b/main/connectivity/source/commontools/conncleanup.cxx
index c9320884af..e1b42511e3 100644
--- a/main/connectivity/source/commontools/conncleanup.cxx
+++ b/main/connectivity/source/commontools/conncleanup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/conncleanup.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/main/connectivity/source/commontools/dbcharset.cxx b/main/connectivity/source/commontools/dbcharset.cxx
index ee00fcb3b1..ccac19b5a5 100644
--- a/main/connectivity/source/commontools/dbcharset.cxx
+++ b/main/connectivity/source/commontools/dbcharset.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbcharset.hxx>
#include "diagnose_ex.h"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/commontools/dbconversion.cxx b/main/connectivity/source/commontools/dbconversion.cxx
index 1eacb281a8..b453facd45 100644
--- a/main/connectivity/source/commontools/dbconversion.cxx
+++ b/main/connectivity/source/commontools/dbconversion.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbconversion.hxx>
#include <connectivity/dbcharset.hxx>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/commontools/dbexception.cxx b/main/connectivity/source/commontools/dbexception.cxx
index 2378866d5f..8aa1cde667 100644
--- a/main/connectivity/source/commontools/dbexception.cxx
+++ b/main/connectivity/source/commontools/dbexception.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbexception.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/main/connectivity/source/commontools/dbmetadata.cxx b/main/connectivity/source/commontools/dbmetadata.cxx
index bea46ea3c8..40fedb9f60 100644
--- a/main/connectivity/source/commontools/dbmetadata.cxx
+++ b/main/connectivity/source/commontools/dbmetadata.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbmetadata.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/commontools/dbtools.cxx b/main/connectivity/source/commontools/dbtools.cxx
index 8e23ce673b..d5106675ed 100644
--- a/main/connectivity/source/commontools/dbtools.cxx
+++ b/main/connectivity/source/commontools/dbtools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/CommonTools.hxx"
#include "diagnose_ex.h"
diff --git a/main/connectivity/source/commontools/dbtools2.cxx b/main/connectivity/source/commontools/dbtools2.cxx
index 475912b3a5..6a384d3408 100644
--- a/main/connectivity/source/commontools/dbtools2.cxx
+++ b/main/connectivity/source/commontools/dbtools2.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbtools.hxx"
#include "connectivity/dbconversion.hxx"
#include "connectivity/dbcharset.hxx"
diff --git a/main/connectivity/source/commontools/filtermanager.cxx b/main/connectivity/source/commontools/filtermanager.cxx
index 0b59069bf6..f70d6f2bb9 100644
--- a/main/connectivity/source/commontools/filtermanager.cxx
+++ b/main/connectivity/source/commontools/filtermanager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/filtermanager.hxx"
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/formattedcolumnvalue.cxx b/main/connectivity/source/commontools/formattedcolumnvalue.cxx
index 988949e404..0922c99a86 100644
--- a/main/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/main/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/formattedcolumnvalue.hxx"
#include "connectivity/dbtools.hxx"
diff --git a/main/connectivity/source/commontools/parameters.cxx b/main/connectivity/source/commontools/parameters.cxx
index fd48b69542..23191a791c 100644
--- a/main/connectivity/source/commontools/parameters.cxx
+++ b/main/connectivity/source/commontools/parameters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/parameters.hxx"
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/paramwrapper.cxx b/main/connectivity/source/commontools/paramwrapper.cxx
index d6aaf40902..742cb6ecb6 100644
--- a/main/connectivity/source/commontools/paramwrapper.cxx
+++ b/main/connectivity/source/commontools/paramwrapper.cxx
@@ -21,7 +21,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/paramwrapper.hxx>
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/predicateinput.cxx b/main/connectivity/source/commontools/predicateinput.cxx
index 5bf3e48efb..51a1d7121f 100644
--- a/main/connectivity/source/commontools/predicateinput.cxx
+++ b/main/connectivity/source/commontools/predicateinput.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/predicateinput.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/main/connectivity/source/commontools/propertyids.cxx b/main/connectivity/source/commontools/propertyids.cxx
index d1ea48ac33..52a11115c2 100644
--- a/main/connectivity/source/commontools/propertyids.cxx
+++ b/main/connectivity/source/commontools/propertyids.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "propertyids.hxx"
diff --git a/main/connectivity/source/commontools/sqlerror.cxx b/main/connectivity/source/commontools/sqlerror.cxx
index d7b25c66c5..da7534c26f 100644
--- a/main/connectivity/source/commontools/sqlerror.cxx
+++ b/main/connectivity/source/commontools/sqlerror.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sqlerror.hxx"
diff --git a/main/connectivity/source/commontools/statementcomposer.cxx b/main/connectivity/source/commontools/statementcomposer.cxx
index 5b83fac927..06d23b7b96 100644
--- a/main/connectivity/source/commontools/statementcomposer.cxx
+++ b/main/connectivity/source/commontools/statementcomposer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/statementcomposer.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/main/connectivity/source/commontools/warningscontainer.cxx b/main/connectivity/source/commontools/warningscontainer.cxx
index 26b2f2b0a1..684ffab008 100644
--- a/main/connectivity/source/commontools/warningscontainer.cxx
+++ b/main/connectivity/source/commontools/warningscontainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/warningscontainer.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/cpool/ZConnectionPool.cxx b/main/connectivity/source/cpool/ZConnectionPool.cxx
index 3ce8256694..017bb3de45 100644
--- a/main/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/main/connectivity/source/cpool/ZConnectionPool.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include <stdio.h>
#include "ZConnectionPool.hxx"
diff --git a/main/connectivity/source/cpool/ZConnectionWrapper.cxx b/main/connectivity/source/cpool/ZConnectionWrapper.cxx
index 218993890e..b16c7eb251 100644
--- a/main/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/main/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZConnectionWrapper.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/cpool/ZDriverWrapper.cxx b/main/connectivity/source/cpool/ZDriverWrapper.cxx
index b7730031fb..b8df5cdfff 100644
--- a/main/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/main/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZDriverWrapper.hxx"
#include "ZConnectionPool.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/cpool/ZPoolCollection.cxx b/main/connectivity/source/cpool/ZPoolCollection.cxx
index ac5b4ddb67..204f478deb 100644
--- a/main/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/main/connectivity/source/cpool/ZPoolCollection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZPoolCollection.hxx"
#include "ZDriverWrapper.hxx"
#include "ZConnectionPool.hxx"
diff --git a/main/connectivity/source/cpool/ZPooledConnection.cxx b/main/connectivity/source/cpool/ZPooledConnection.cxx
index 27bba4d096..d4e1519a27 100644
--- a/main/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/main/connectivity/source/cpool/ZPooledConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZPooledConnection.hxx"
#include "ZConnectionWrapper.hxx"
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
diff --git a/main/connectivity/source/cpool/Zregistration.cxx b/main/connectivity/source/cpool/Zregistration.cxx
index 3601ea63ad..e4cb73786b 100644
--- a/main/connectivity/source/cpool/Zregistration.cxx
+++ b/main/connectivity/source/cpool/Zregistration.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include <stdio.h>
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/adabas/BCatalog.cxx b/main/connectivity/source/drivers/adabas/BCatalog.cxx
index 1e9f2aff89..11fdd46c79 100644
--- a/main/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/main/connectivity/source/drivers/adabas/BCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BCatalog.hxx"
#include "adabas/BConnection.hxx"
#include "adabas/BGroups.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BColumns.cxx b/main/connectivity/source/drivers/adabas/BColumns.cxx
index fc42db29be..9bf58c048a 100644
--- a/main/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/main/connectivity/source/drivers/adabas/BColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BConnection.cxx b/main/connectivity/source/drivers/adabas/BConnection.cxx
index 313156ccb6..01de019d2d 100644
--- a/main/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/main/connectivity/source/drivers/adabas/BConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include <cppuhelper/typeprovider.hxx>
#include "adabas/BConnection.hxx"
#include "adabas/BDriver.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index 683a71990a..528d6d1cfb 100644
--- a/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_BDATABASEMETADATA_HXX_
#include "adabas/BDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BDriver.cxx b/main/connectivity/source/drivers/adabas/BDriver.cxx
index 88a0818e55..4e861b6979 100644
--- a/main/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/main/connectivity/source/drivers/adabas/BDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include <unotools/tempfile.hxx>
#include "adabas/BDriver.hxx"
#include "adabas/BConnection.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BFunctions.cxx b/main/connectivity/source/drivers/adabas/BFunctions.cxx
index def0e19ef6..a2b5c5327e 100644
--- a/main/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/main/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
//--------------------------------------------------------------------------
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BGroup.cxx b/main/connectivity/source/drivers/adabas/BGroup.cxx
index 41098bdfb8..d7bf2fa3b5 100644
--- a/main/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/main/connectivity/source/drivers/adabas/BGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_GROUP_HXX_
#include "adabas/BGroup.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BGroups.cxx b/main/connectivity/source/drivers/adabas/BGroups.cxx
index 21c4391a76..f9ebadf0a4 100644
--- a/main/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/main/connectivity/source/drivers/adabas/BGroups.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BGroups.hxx"
#include "adabas/BGroup.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndex.cxx b/main/connectivity/source/drivers/adabas/BIndex.cxx
index 0a9887443c..4e05fce5b1 100644
--- a/main/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BIndex.hxx"
#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_
#include "adabas/BIndexColumns.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndexColumns.cxx b/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
index c60ab4929c..7f852eebb5 100644
--- a/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_
#include "adabas/BIndexColumns.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndexes.cxx b/main/connectivity/source/drivers/adabas/BIndexes.cxx
index ff355f6b10..4ab0ea3a3a 100644
--- a/main/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BIndexes.hxx"
#include "adabas/BIndex.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BKeys.cxx b/main/connectivity/source/drivers/adabas/BKeys.cxx
index 5c52c91f14..7f9af0b0d9 100644
--- a/main/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/main/connectivity/source/drivers/adabas/BKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BKeys.hxx"
#include "adabas/BTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index 39665df98c..9550466c53 100644
--- a/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BPreparedStatement.hxx"
#include "adabas/BResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BResultSet.cxx b/main/connectivity/source/drivers/adabas/BResultSet.cxx
index 395360ee43..d91b26fe18 100644
--- a/main/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/main/connectivity/source/drivers/adabas/BResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BResultSet.hxx"
#include "adabas/BResultSetMetaData.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index ce70358771..400b8e7fd9 100644
--- a/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_BRESULTSETMETADATA_HXX_
#include "adabas/BResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BStatement.cxx b/main/connectivity/source/drivers/adabas/BStatement.cxx
index f045c6f1cc..8c8fedf86a 100644
--- a/main/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/main/connectivity/source/drivers/adabas/BStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BStatement.hxx"
#include "adabas/BResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BTable.cxx b/main/connectivity/source/drivers/adabas/BTable.cxx
index c95bfecd9b..c5ee67596f 100644
--- a/main/connectivity/source/drivers/adabas/BTable.cxx
+++ b/main/connectivity/source/drivers/adabas/BTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BTable.hxx"
#include "adabas/BTables.hxx"
#include "adabas/BIndexes.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BTables.cxx b/main/connectivity/source/drivers/adabas/BTables.cxx
index 4005550e53..2ee2a077df 100644
--- a/main/connectivity/source/drivers/adabas/BTables.cxx
+++ b/main/connectivity/source/drivers/adabas/BTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BTables.hxx"
#include "adabas/BViews.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BUser.cxx b/main/connectivity/source/drivers/adabas/BUser.cxx
index d60285adb9..ebac9f2df1 100644
--- a/main/connectivity/source/drivers/adabas/BUser.cxx
+++ b/main/connectivity/source/drivers/adabas/BUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BUser.hxx"
#include "adabas/BGroups.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BUsers.cxx b/main/connectivity/source/drivers/adabas/BUsers.cxx
index 9c4c7f6d76..f6f1e3e26f 100644
--- a/main/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/main/connectivity/source/drivers/adabas/BUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BUsers.hxx"
#include "adabas/BUser.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BViews.cxx b/main/connectivity/source/drivers/adabas/BViews.cxx
index 64b2497a74..37dffe3f3e 100644
--- a/main/connectivity/source/drivers/adabas/BViews.cxx
+++ b/main/connectivity/source/drivers/adabas/BViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BViews.hxx"
#include "adabas/BTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/Bservices.cxx b/main/connectivity/source/drivers/adabas/Bservices.cxx
index ef44d99456..5be3c79b6e 100644
--- a/main/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/main/connectivity/source/drivers/adabas/Bservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/ado/ACallableStatement.cxx b/main/connectivity/source/drivers/ado/ACallableStatement.cxx
index 08e07be301..9f386e3af1 100644
--- a/main/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/main/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ACallableStatement.hxx"
#include <connectivity/dbexception.hxx>
diff --git a/main/connectivity/source/drivers/ado/ACatalog.cxx b/main/connectivity/source/drivers/ado/ACatalog.cxx
index 444cb2f19b..9c4fb12fb9 100644
--- a/main/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/main/connectivity/source/drivers/ado/ACatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ACatalog.hxx"
#ifndef _CONNECTIVITY_ADO_BCONNECTION_HXX_
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AColumn.cxx b/main/connectivity/source/drivers/ado/AColumn.cxx
index 63107f1728..45542996b2 100644
--- a/main/connectivity/source/drivers/ado/AColumn.cxx
+++ b/main/connectivity/source/drivers/ado/AColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AColumn.hxx"
#include "ado/AConnection.hxx"
#include "ado/Awrapado.hxx"
diff --git a/main/connectivity/source/drivers/ado/AColumns.cxx b/main/connectivity/source/drivers/ado/AColumns.cxx
index 7a417b0606..bd61c03fba 100644
--- a/main/connectivity/source/drivers/ado/AColumns.cxx
+++ b/main/connectivity/source/drivers/ado/AColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AColumns.hxx"
#include "ado/AColumn.hxx"
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AConnection.cxx b/main/connectivity/source/drivers/ado/AConnection.cxx
index f392edef64..91fac417b1 100644
--- a/main/connectivity/source/drivers/ado/AConnection.cxx
+++ b/main/connectivity/source/drivers/ado/AConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AConnection.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADriver.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 2f694e7fb6..1c395942a4 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADatabaseMetaDataResultSet.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index c9b30bfdd6..f69a1c85d5 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
#include "ado/Awrapado.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index c2c26608b8..1e72cdd672 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include <comphelper/sequence.hxx>
#include "ado/ADatabaseMetaDataResultSet.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 9cc3e8bda2..8c3c19500e 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
#include "ado/Awrapado.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADriver.cxx b/main/connectivity/source/drivers/ado/ADriver.cxx
index 95a3fa468a..c241e2bccb 100644
--- a/main/connectivity/source/drivers/ado/ADriver.cxx
+++ b/main/connectivity/source/drivers/ado/ADriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADriver.hxx"
#include "ado/AConnection.hxx"
#include "ado/Awrapadox.hxx"
diff --git a/main/connectivity/source/drivers/ado/AGroup.cxx b/main/connectivity/source/drivers/ado/AGroup.cxx
index f7bc5eeaf2..ab25240423 100644
--- a/main/connectivity/source/drivers/ado/AGroup.cxx
+++ b/main/connectivity/source/drivers/ado/AGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#ifndef _CONNECTIVITY_ADO_GROUP_HXX_
#include "ado/AGroup.hxx"
diff --git a/main/connectivity/source/drivers/ado/AGroups.cxx b/main/connectivity/source/drivers/ado/AGroups.cxx
index 0f0afc81dc..c127d0ecf1 100644
--- a/main/connectivity/source/drivers/ado/AGroups.cxx
+++ b/main/connectivity/source/drivers/ado/AGroups.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AGroups.hxx"
#include "ado/AGroup.hxx"
#include "ado/ATable.hxx"
diff --git a/main/connectivity/source/drivers/ado/AIndex.cxx b/main/connectivity/source/drivers/ado/AIndex.cxx
index 6b97dde781..e5cce45852 100644
--- a/main/connectivity/source/drivers/ado/AIndex.cxx
+++ b/main/connectivity/source/drivers/ado/AIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AIndex.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/ado/AIndexes.cxx b/main/connectivity/source/drivers/ado/AIndexes.cxx
index e59d8016dc..dc46ece09c 100644
--- a/main/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/main/connectivity/source/drivers/ado/AIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AIndexes.hxx"
#include "ado/AIndex.hxx"
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AKey.cxx b/main/connectivity/source/drivers/ado/AKey.cxx
index ab0cde7bab..8b3a05d952 100644
--- a/main/connectivity/source/drivers/ado/AKey.cxx
+++ b/main/connectivity/source/drivers/ado/AKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AKey.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/ado/AKeys.cxx b/main/connectivity/source/drivers/ado/AKeys.cxx
index 731c9af0da..3fe0ff5c98 100644
--- a/main/connectivity/source/drivers/ado/AKeys.cxx
+++ b/main/connectivity/source/drivers/ado/AKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AKeys.hxx"
#ifndef _CONNECTIVITY_ADO_INDEX_HXX_
#include "ado/AKey.hxx"
diff --git a/main/connectivity/source/drivers/ado/APreparedStatement.cxx b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
index d1aadc7a5a..cd6dbec237 100644
--- a/main/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "connectivity/sqlparse.hxx"
#include "ado/APreparedStatement.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/AResultSet.cxx b/main/connectivity/source/drivers/ado/AResultSet.cxx
index f5a4ce8dcc..5bd22c8c90 100644
--- a/main/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AResultSet.hxx"
#include "ado/AResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 70da296fa8..bf72029dec 100644
--- a/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/main/connectivity/source/drivers/ado/AStatement.cxx b/main/connectivity/source/drivers/ado/AStatement.cxx
index af3978a9e4..8371a713b0 100644
--- a/main/connectivity/source/drivers/ado/AStatement.cxx
+++ b/main/connectivity/source/drivers/ado/AStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AStatement.hxx"
#include "ado/AConnection.hxx"
#include "ado/AResultSet.hxx"
diff --git a/main/connectivity/source/drivers/ado/ATable.cxx b/main/connectivity/source/drivers/ado/ATable.cxx
index bb0d05ef13..8186ec8a6c 100644
--- a/main/connectivity/source/drivers/ado/ATable.cxx
+++ b/main/connectivity/source/drivers/ado/ATable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ATable.hxx"
#include "ado/AIndexes.hxx"
#include "ado/AColumns.hxx"
diff --git a/main/connectivity/source/drivers/ado/ATables.cxx b/main/connectivity/source/drivers/ado/ATables.cxx
index 0b68a38bc5..82c5c39add 100644
--- a/main/connectivity/source/drivers/ado/ATables.cxx
+++ b/main/connectivity/source/drivers/ado/ATables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ATables.hxx"
#include "ado/ATable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/ado/AUser.cxx b/main/connectivity/source/drivers/ado/AUser.cxx
index 1f9277b04c..ee20df9308 100644
--- a/main/connectivity/source/drivers/ado/AUser.cxx
+++ b/main/connectivity/source/drivers/ado/AUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AUser.hxx"
#include "ado/ACatalog.hxx"
#include "ado/AGroups.hxx"
diff --git a/main/connectivity/source/drivers/ado/AUsers.cxx b/main/connectivity/source/drivers/ado/AUsers.cxx
index 6f8f3788e2..e5a8ebf8e8 100644
--- a/main/connectivity/source/drivers/ado/AUsers.cxx
+++ b/main/connectivity/source/drivers/ado/AUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AUsers.hxx"
#include "ado/AUser.hxx"
#include "ado/ATable.hxx"
diff --git a/main/connectivity/source/drivers/ado/AView.cxx b/main/connectivity/source/drivers/ado/AView.cxx
index 121ef42e7e..e8ed187c27 100644
--- a/main/connectivity/source/drivers/ado/AView.cxx
+++ b/main/connectivity/source/drivers/ado/AView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AView.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "ado/adoimp.hxx"
diff --git a/main/connectivity/source/drivers/ado/AViews.cxx b/main/connectivity/source/drivers/ado/AViews.cxx
index c83fda0f3e..8415d8c0b2 100644
--- a/main/connectivity/source/drivers/ado/AViews.cxx
+++ b/main/connectivity/source/drivers/ado/AViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AViews.hxx"
#include "ado/AView.hxx"
#include "ado/ATables.hxx"
diff --git a/main/connectivity/source/drivers/ado/Aolevariant.cxx b/main/connectivity/source/drivers/ado/Aolevariant.cxx
index 7a4c74d7a8..accd44b69f 100644
--- a/main/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/main/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/Aolevariant.hxx"
#include "connectivity/dbconversion.hxx"
#include <com/sun/star/sdbc/SQLException.hpp>
diff --git a/main/connectivity/source/drivers/ado/Aservices.cxx b/main/connectivity/source/drivers/ado/Aservices.cxx
index e3e4a9a44e..46a14b0a39 100644
--- a/main/connectivity/source/drivers/ado/Aservices.cxx
+++ b/main/connectivity/source/drivers/ado/Aservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/ado/Awrapado.cxx b/main/connectivity/source/drivers/ado/Awrapado.cxx
index 1b872930fb..47846c88c6 100644
--- a/main/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/main/connectivity/source/drivers/ado/Awrapado.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/Awrapado.hxx"
#include "ado/Awrapadox.hxx"
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/drivers/ado/adoimp.cxx b/main/connectivity/source/drivers/ado/adoimp.cxx
index 82c87d0698..a0583b2b2c 100644
--- a/main/connectivity/source/drivers/ado/adoimp.cxx
+++ b/main/connectivity/source/drivers/ado/adoimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/sdbcx/PrivilegeObject.hpp>
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/calc/CCatalog.cxx b/main/connectivity/source/drivers/calc/CCatalog.cxx
index f3bede34a8..07abc152d7 100644
--- a/main/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/main/connectivity/source/drivers/calc/CCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/CColumns.cxx b/main/connectivity/source/drivers/calc/CColumns.cxx
index 23e5260a5b..e57b2d080d 100644
--- a/main/connectivity/source/drivers/calc/CColumns.cxx
+++ b/main/connectivity/source/drivers/calc/CColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CColumns.hxx"
#include "calc/CTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/calc/CConnection.cxx b/main/connectivity/source/drivers/calc/CConnection.cxx
index c10ab2fbb7..14caed2eaf 100644
--- a/main/connectivity/source/drivers/calc/CConnection.cxx
+++ b/main/connectivity/source/drivers/calc/CConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CConnection.hxx"
#include "calc/CDatabaseMetaData.hxx"
#include "calc/CCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index d40b7ce763..210220bcbf 100644
--- a/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/calc/CDriver.cxx b/main/connectivity/source/drivers/calc/CDriver.cxx
index bd7903ac17..5dc8922486 100644
--- a/main/connectivity/source/drivers/calc/CDriver.cxx
+++ b/main/connectivity/source/drivers/calc/CDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDriver.hxx"
#include "calc/CConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/calc/CPreparedStatement.cxx b/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
index e6a1143321..15974a89ce 100644
--- a/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CPreparedStatement.hxx"
#include "calc/CResultSet.hxx"
diff --git a/main/connectivity/source/drivers/calc/CResultSet.cxx b/main/connectivity/source/drivers/calc/CResultSet.cxx
index d8eebcb28d..93d7b526f0 100644
--- a/main/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/main/connectivity/source/drivers/calc/CResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include "calc/CResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/calc/CStatement.cxx b/main/connectivity/source/drivers/calc/CStatement.cxx
index f3781b15ca..1b87ad85ea 100644
--- a/main/connectivity/source/drivers/calc/CStatement.cxx
+++ b/main/connectivity/source/drivers/calc/CStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CStatement.hxx"
#include "calc/CResultSet.hxx"
diff --git a/main/connectivity/source/drivers/calc/CTable.cxx b/main/connectivity/source/drivers/calc/CTable.cxx
index acbf105ba4..37fbf53022 100644
--- a/main/connectivity/source/drivers/calc/CTable.cxx
+++ b/main/connectivity/source/drivers/calc/CTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/calc/CTables.cxx b/main/connectivity/source/drivers/calc/CTables.cxx
index e51f26e456..c5ece97253 100644
--- a/main/connectivity/source/drivers/calc/CTables.cxx
+++ b/main/connectivity/source/drivers/calc/CTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CTables.hxx"
#include "calc/CTable.hxx"
#include "file/FCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/Cservices.cxx b/main/connectivity/source/drivers/calc/Cservices.cxx
index cc963cef87..1bda3211f8 100644
--- a/main/connectivity/source/drivers/calc/Cservices.cxx
+++ b/main/connectivity/source/drivers/calc/Cservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/dbase/DCatalog.cxx b/main/connectivity/source/drivers/dbase/DCatalog.cxx
index 4dd2644bf5..3692c166a8 100644
--- a/main/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/main/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DCatalog.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DCode.cxx b/main/connectivity/source/drivers/dbase/DCode.cxx
index 7976bf72a9..79ecff0790 100644
--- a/main/connectivity/source/drivers/dbase/DCode.cxx
+++ b/main/connectivity/source/drivers/dbase/DCode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DCode.hxx"
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include "dbase/DIndex.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DColumns.cxx b/main/connectivity/source/drivers/dbase/DColumns.cxx
index e5394f6c4f..2ec587b92b 100644
--- a/main/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/main/connectivity/source/drivers/dbase/DColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DColumns.hxx"
#include "dbase/DTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DConnection.cxx b/main/connectivity/source/drivers/dbase/DConnection.cxx
index 43d56772ab..9cdaacb994 100644
--- a/main/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/main/connectivity/source/drivers/dbase/DConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#ifndef _CONNECTIVITY_DBASE_OCONNECTION_HXX_
#include "dbase/DConnection.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index e25b05a604..d6b424e504 100644
--- a/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#ifndef _CONNECTIVITY_DBASE_ODbaseDatabaseMetaData_HXX_
diff --git a/main/connectivity/source/drivers/dbase/DDriver.cxx b/main/connectivity/source/drivers/dbase/DDriver.cxx
index fc376cf019..88f5c0e5d9 100644
--- a/main/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/main/connectivity/source/drivers/dbase/DDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DDriver.hxx"
#include "dbase/DConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndex.cxx b/main/connectivity/source/drivers/dbase/DIndex.cxx
index 706064e185..e3ce51a101 100644
--- a/main/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndex.hxx"
#include "dbase/DIndexColumns.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndexColumns.cxx b/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
index d1ff4d48b7..91483bebe6 100644
--- a/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexColumns.hxx"
#include "dbase/DTable.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DIndexIter.cxx b/main/connectivity/source/drivers/dbase/DIndexIter.cxx
index 4f467d8980..2dd0cb8ccc 100644
--- a/main/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexIter.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndexes.cxx b/main/connectivity/source/drivers/dbase/DIndexes.cxx
index f9e5dbd385..3a00badab1 100644
--- a/main/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexes.hxx"
#include "dbase/DIndex.hxx"
#include <connectivity/dbexception.hxx>
diff --git a/main/connectivity/source/drivers/dbase/DNoException.cxx b/main/connectivity/source/drivers/dbase/DNoException.cxx
index 492acf2179..99d22a82d5 100644
--- a/main/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/main/connectivity/source/drivers/dbase/DNoException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTable.hxx"
#include "dbase/DIndex.hxx"
#include "dbase/dindexnode.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 6ef688f172..cd877f338e 100644
--- a/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DPreparedStatement.hxx"
#include "dbase/DResultSet.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DResultSet.cxx b/main/connectivity/source/drivers/dbase/DResultSet.cxx
index 39ee84436d..18a7d941fd 100644
--- a/main/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/main/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include "dbase/DResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DStatement.cxx b/main/connectivity/source/drivers/dbase/DStatement.cxx
index 89105e08ea..678f58af65 100644
--- a/main/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/main/connectivity/source/drivers/dbase/DStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DStatement.hxx"
#include "dbase/DResultSet.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DTable.cxx b/main/connectivity/source/drivers/dbase/DTable.cxx
index fcca6e5ea9..10aeaefd9e 100644
--- a/main/connectivity/source/drivers/dbase/DTable.cxx
+++ b/main/connectivity/source/drivers/dbase/DTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DTables.cxx b/main/connectivity/source/drivers/dbase/DTables.cxx
index 8f3f8fe97c..6744285b1c 100644
--- a/main/connectivity/source/drivers/dbase/DTables.cxx
+++ b/main/connectivity/source/drivers/dbase/DTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTables.hxx"
#include "dbase/DTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/dbase/Dservices.cxx b/main/connectivity/source/drivers/dbase/Dservices.cxx
index 3f828aba34..6a9e130ab0 100644
--- a/main/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/main/connectivity/source/drivers/dbase/Dservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/dbase/dindexnode.cxx b/main/connectivity/source/drivers/dbase/dindexnode.cxx
index 852e2b16c1..39f1cfb2c6 100644
--- a/main/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/main/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/dindexnode.hxx"
#include "connectivity/CommonTools.hxx"
#include <osl/thread.h>
diff --git a/main/connectivity/source/drivers/evoab2/EApi.cxx b/main/connectivity/source/drivers/evoab2/EApi.cxx
index bec6cd40b6..9d9883985f 100644
--- a/main/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/main/connectivity/source/drivers/evoab2/EApi.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <rtl/ustring.hxx>
#include <osl/module.h>
diff --git a/main/connectivity/source/drivers/evoab2/NCatalog.cxx b/main/connectivity/source/drivers/evoab2/NCatalog.cxx
index 7e026d4276..8a780bf31f 100644
--- a/main/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/main/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NCatalog.hxx"
#include "NConnection.hxx"
#include "NTables.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NColumns.cxx b/main/connectivity/source/drivers/evoab2/NColumns.cxx
index ceb4c639b7..3bda59ae53 100644
--- a/main/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/main/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NColumns.hxx"
#include "NTable.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NConnection.cxx b/main/connectivity/source/drivers/evoab2/NConnection.cxx
index 182266732c..03118d0d24 100644
--- a/main/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/main/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NConnection.hxx"
#include "NDatabaseMetaData.hxx"
#include "NCatalog.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 9c6176f32b..d0ae930569 100644
--- a/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDatabaseMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/main/connectivity/source/drivers/evoab2/NDebug.cxx b/main/connectivity/source/drivers/evoab2/NDebug.cxx
index 8bdeab8416..010b27eb52 100644
--- a/main/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDebug.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDebug.hxx"
#include <osl/diagnose.h>
#ifdef DEBUG
diff --git a/main/connectivity/source/drivers/evoab2/NDriver.cxx b/main/connectivity/source/drivers/evoab2/NDriver.cxx
index 5c5fe5a322..f880c91788 100644
--- a/main/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDriver.hxx"
#include "NConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index c03bb6daf3..7f03acef01 100644
--- a/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NResultSet.cxx b/main/connectivity/source/drivers/evoab2/NResultSet.cxx
index 3cab939ac9..ad6587321b 100644
--- a/main/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/main/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDatabaseMetaData.hxx"
#include "NConnection.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index cb04adeb8c..8be5e5db29 100644
--- a/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NResultSetMetaData.hxx"
#include "NDatabaseMetaData.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NServices.cxx b/main/connectivity/source/drivers/evoab2/NServices.cxx
index 81f22faf66..59107c2b2c 100644
--- a/main/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/main/connectivity/source/drivers/evoab2/NServices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDriver.hxx"
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NStatement.cxx b/main/connectivity/source/drivers/evoab2/NStatement.cxx
index 4993e82c52..1753b09ad9 100644
--- a/main/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/main/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NTable.cxx b/main/connectivity/source/drivers/evoab2/NTable.cxx
index 1ba49ab58d..191e082072 100644
--- a/main/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/main/connectivity/source/drivers/evoab2/NTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NTable.hxx"
#include "NTables.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NTables.cxx b/main/connectivity/source/drivers/evoab2/NTables.cxx
index 6f290bf9ac..11bc7426a8 100644
--- a/main/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/main/connectivity/source/drivers/evoab2/NTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/file/FCatalog.cxx b/main/connectivity/source/drivers/file/FCatalog.cxx
index d85fe34b4a..4d14e0bb0f 100644
--- a/main/connectivity/source/drivers/file/FCatalog.cxx
+++ b/main/connectivity/source/drivers/file/FCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FCatalog.hxx"
#include "file/FConnection.hxx"
#include "file/FTables.hxx"
diff --git a/main/connectivity/source/drivers/file/FColumns.cxx b/main/connectivity/source/drivers/file/FColumns.cxx
index 8f062abb2e..02bdb4e1c7 100644
--- a/main/connectivity/source/drivers/file/FColumns.cxx
+++ b/main/connectivity/source/drivers/file/FColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/file/FConnection.cxx b/main/connectivity/source/drivers/file/FConnection.cxx
index bda4fc2da1..24a83e7baa 100644
--- a/main/connectivity/source/drivers/file/FConnection.cxx
+++ b/main/connectivity/source/drivers/file/FConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <cppuhelper/typeprovider.hxx>
#include "file/FConnection.hxx"
#include "file/FDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index af359826c6..66cae1dfa4 100644
--- a/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDatabaseMetaData.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/file/FDateFunctions.cxx b/main/connectivity/source/drivers/file/FDateFunctions.cxx
index 7a431dd986..2b42d705d1 100644
--- a/main/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDateFunctions.hxx"
#include <tools/date.hxx>
diff --git a/main/connectivity/source/drivers/file/FDriver.cxx b/main/connectivity/source/drivers/file/FDriver.cxx
index b427199532..7993f1e698 100644
--- a/main/connectivity/source/drivers/file/FDriver.cxx
+++ b/main/connectivity/source/drivers/file/FDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDriver.hxx"
#include "file/FConnection.hxx"
#include "file/fcode.hxx"
diff --git a/main/connectivity/source/drivers/file/FNoException.cxx b/main/connectivity/source/drivers/file/FNoException.cxx
index 7731481e41..c6c2e687ad 100644
--- a/main/connectivity/source/drivers/file/FNoException.cxx
+++ b/main/connectivity/source/drivers/file/FNoException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FCatalog.hxx"
#include "file/fcomp.hxx"
#include "file/fanalyzer.hxx"
diff --git a/main/connectivity/source/drivers/file/FNumericFunctions.cxx b/main/connectivity/source/drivers/file/FNumericFunctions.cxx
index b908af7c14..7de6e5ed55 100644
--- a/main/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <cmath>
#include "file/FNumericFunctions.hxx"
diff --git a/main/connectivity/source/drivers/file/FPreparedStatement.cxx b/main/connectivity/source/drivers/file/FPreparedStatement.cxx
index 67cb431578..aadb9f0163 100644
--- a/main/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/file/FResultSet.cxx b/main/connectivity/source/drivers/file/FResultSet.cxx
index 3dd42e3f6e..a8ce09a2fd 100644
--- a/main/connectivity/source/drivers/file/FResultSet.cxx
+++ b/main/connectivity/source/drivers/file/FResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <limits> // included here to prevent problems if compiling with C52
#ifdef GCC
diff --git a/main/connectivity/source/drivers/file/FResultSetMetaData.cxx b/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 4b1f2b476a..b8235600f0 100644
--- a/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FResultSetMetaData.hxx"
#include "file/FTable.hxx"
#include <comphelper/extract.hxx>
diff --git a/main/connectivity/source/drivers/file/FStatement.cxx b/main/connectivity/source/drivers/file/FStatement.cxx
index 184435a30d..e359b32b34 100644
--- a/main/connectivity/source/drivers/file/FStatement.cxx
+++ b/main/connectivity/source/drivers/file/FStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <osl/diagnose.h>
#include "file/FStatement.hxx"
#include "file/FConnection.hxx"
diff --git a/main/connectivity/source/drivers/file/FStringFunctions.cxx b/main/connectivity/source/drivers/file/FStringFunctions.cxx
index c6effb331a..7e5631fce4 100644
--- a/main/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FStringFunctions.hxx"
#include <rtl/ustrbuf.hxx>
diff --git a/main/connectivity/source/drivers/file/FTable.cxx b/main/connectivity/source/drivers/file/FTable.cxx
index dbce6fc13e..1a93d43472 100644
--- a/main/connectivity/source/drivers/file/FTable.cxx
+++ b/main/connectivity/source/drivers/file/FTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <stdio.h>
#include "file/FTable.hxx"
diff --git a/main/connectivity/source/drivers/file/FTables.cxx b/main/connectivity/source/drivers/file/FTables.cxx
index 06c2047ea3..1c7068e906 100644
--- a/main/connectivity/source/drivers/file/FTables.cxx
+++ b/main/connectivity/source/drivers/file/FTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FTables.hxx"
#include "file/FTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/file/fanalyzer.cxx b/main/connectivity/source/drivers/file/fanalyzer.cxx
index c60f4de5a1..c4af3bd9fc 100644
--- a/main/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/main/connectivity/source/drivers/file/fanalyzer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fanalyzer.hxx"
#include "connectivity/sqlparse.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/file/fcode.cxx b/main/connectivity/source/drivers/file/fcode.cxx
index 487a244377..a5714b031f 100644
--- a/main/connectivity/source/drivers/file/fcode.cxx
+++ b/main/connectivity/source/drivers/file/fcode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fcode.hxx"
#include <osl/diagnose.h>
#include "connectivity/sqlparse.hxx"
diff --git a/main/connectivity/source/drivers/file/fcomp.cxx b/main/connectivity/source/drivers/file/fcomp.cxx
index 5f2a420b24..37b7b5b558 100644
--- a/main/connectivity/source/drivers/file/fcomp.cxx
+++ b/main/connectivity/source/drivers/file/fcomp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fcomp.hxx"
#include <tools/debug.hxx>
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/file/quotedstring.cxx b/main/connectivity/source/drivers/file/quotedstring.cxx
index 366036b6f7..60477b2ada 100644
--- a/main/connectivity/source/drivers/file/quotedstring.cxx
+++ b/main/connectivity/source/drivers/file/quotedstring.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/quotedstring.hxx"
#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/main/connectivity/source/drivers/flat/ECatalog.cxx b/main/connectivity/source/drivers/flat/ECatalog.cxx
index 3272f4240e..961f08aefa 100644
--- a/main/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/main/connectivity/source/drivers/flat/ECatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/ECatalog.hxx"
diff --git a/main/connectivity/source/drivers/flat/EColumns.cxx b/main/connectivity/source/drivers/flat/EColumns.cxx
index ba155aaf73..66266ef891 100644
--- a/main/connectivity/source/drivers/flat/EColumns.cxx
+++ b/main/connectivity/source/drivers/flat/EColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EColumns.hxx"
#include "flat/ETable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/flat/EConnection.cxx b/main/connectivity/source/drivers/flat/EConnection.cxx
index b7d3f89fe6..0fb1f397c9 100644
--- a/main/connectivity/source/drivers/flat/EConnection.cxx
+++ b/main/connectivity/source/drivers/flat/EConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EConnection.hxx"
#include "flat/EDatabaseMetaData.hxx"
#include "flat/ECatalog.hxx"
diff --git a/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 71c873281b..7640419f98 100644
--- a/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/flat/EDriver.cxx b/main/connectivity/source/drivers/flat/EDriver.cxx
index cbb2d50cff..e45d0b039f 100644
--- a/main/connectivity/source/drivers/flat/EDriver.cxx
+++ b/main/connectivity/source/drivers/flat/EDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDriver.hxx"
#include "flat/EConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/flat/EPreparedStatement.cxx b/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 9d8328dbbf..34e69bd1e0 100644
--- a/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#ifndef _CONNECTIVITY_FLAT_EPREPAREDSTATEMENT_HXX_
#include "flat/EPreparedStatement.hxx"
diff --git a/main/connectivity/source/drivers/flat/EResultSet.cxx b/main/connectivity/source/drivers/flat/EResultSet.cxx
index aa4aba530a..658991ff3b 100644
--- a/main/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/main/connectivity/source/drivers/flat/EResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include "flat/EResultSet.hxx"
diff --git a/main/connectivity/source/drivers/flat/EStatement.cxx b/main/connectivity/source/drivers/flat/EStatement.cxx
index 899b29fa1d..6b15330736 100644
--- a/main/connectivity/source/drivers/flat/EStatement.cxx
+++ b/main/connectivity/source/drivers/flat/EStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EStatement.hxx"
#include "flat/EResultSet.hxx"
diff --git a/main/connectivity/source/drivers/flat/ETable.cxx b/main/connectivity/source/drivers/flat/ETable.cxx
index 23dbb3a9fb..bacd84d17a 100644
--- a/main/connectivity/source/drivers/flat/ETable.cxx
+++ b/main/connectivity/source/drivers/flat/ETable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include <ctype.h>
#include "flat/ETable.hxx"
diff --git a/main/connectivity/source/drivers/flat/ETables.cxx b/main/connectivity/source/drivers/flat/ETables.cxx
index b18b83b484..8765cb3873 100644
--- a/main/connectivity/source/drivers/flat/ETables.cxx
+++ b/main/connectivity/source/drivers/flat/ETables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/ETables.hxx"
#include "flat/ETable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/flat/Eservices.cxx b/main/connectivity/source/drivers/flat/Eservices.cxx
index 108cffe1e6..4a27bf38b1 100644
--- a/main/connectivity/source/drivers/flat/Eservices.cxx
+++ b/main/connectivity/source/drivers/flat/Eservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/hsqldb/HCatalog.cxx b/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 23fc27fd52..e403ffb206 100644
--- a/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HCatalog.hxx"
#include "hsqldb/HUsers.hxx"
#include "hsqldb/HTables.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HColumns.cxx b/main/connectivity/source/drivers/hsqldb/HColumns.cxx
index 8511771fa0..f2adceead8 100644
--- a/main/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HColumns.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HConnection.cxx b/main/connectivity/source/drivers/hsqldb/HConnection.cxx
index ebc6a706fa..96a87d57dd 100644
--- a/main/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HConnection.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HDriver.cxx b/main/connectivity/source/drivers/hsqldb/HDriver.cxx
index c19d2a329c..e778fce2b4 100644
--- a/main/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HDriver.hxx"
#include "hsqldb/HConnection.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 641c684023..5eadff6f55 100644
--- a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HStorageAccess.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index d500c18439..1619ee533a 100644
--- a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HStorageMap.hxx"
#include <comphelper/types.hxx>
#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HTable.cxx b/main/connectivity/source/drivers/hsqldb/HTable.cxx
index 36905e9c09..61090470d9 100644
--- a/main/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTable.hxx"
#include "hsqldb/HTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HTables.cxx b/main/connectivity/source/drivers/hsqldb/HTables.cxx
index 287ae6f684..76f95392ae 100644
--- a/main/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTables.hxx"
#include "hsqldb/HViews.hxx"
#include "hsqldb/HTable.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 9f201696dd..74fa886b0f 100644
--- a/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "HTerminateListener.hxx"
#include "hsqldb/HDriver.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HTools.cxx b/main/connectivity/source/drivers/hsqldb/HTools.cxx
index 45de4b7c7a..57c7dc89f9 100644
--- a/main/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HUser.cxx b/main/connectivity/source/drivers/hsqldb/HUser.cxx
index d7612ef7ac..23a63566f5 100644
--- a/main/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HUser.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HUsers.cxx b/main/connectivity/source/drivers/hsqldb/HUsers.cxx
index 3f4108c91b..ed970d50e7 100644
--- a/main/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HUsers.hxx"
#include "hsqldb/HUser.hxx"
#include "hsqldb/HTable.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HView.cxx b/main/connectivity/source/drivers/hsqldb/HView.cxx
index 4e9e1c3ecc..74777efcfe 100644
--- a/main/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HView.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HViews.cxx b/main/connectivity/source/drivers/hsqldb/HViews.cxx
index 3298d85f71..1ca805b76d 100644
--- a/main/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTables.hxx"
#include "hsqldb/HViews.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/Hservices.cxx b/main/connectivity/source/drivers/hsqldb/Hservices.cxx
index cdb5d6dfe2..6441a64f9e 100644
--- a/main/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/main/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 55fb8f9d8f..52d5aaf2bf 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 40a39483af..07e9b939b6 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index c3a8820944..d8f4e5106d 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/main/connectivity/source/drivers/hsqldb/accesslog.cxx b/main/connectivity/source/drivers/hsqldb/accesslog.cxx
index 9fdeaea5c5..bcace04644 100644
--- a/main/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/main/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#ifdef HSQLDB_DBG
#include "accesslog.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Array.cxx b/main/connectivity/source/drivers/jdbc/Array.cxx
index 9e86377f50..c6fb95f6f5 100644
--- a/main/connectivity/source/drivers/jdbc/Array.cxx
+++ b/main/connectivity/source/drivers/jdbc/Array.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Array.hxx"
#include "java/tools.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Blob.cxx b/main/connectivity/source/drivers/jdbc/Blob.cxx
index abbb608cbc..d1e40449e3 100644
--- a/main/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/main/connectivity/source/drivers/jdbc/Blob.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Blob.hxx"
#include "java/tools.hxx"
#include "java/io/InputStream.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Boolean.cxx b/main/connectivity/source/drivers/jdbc/Boolean.cxx
index 181e1597ff..32caeca74b 100644
--- a/main/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/main/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Boolean.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/CallableStatement.cxx b/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 21cf7e6dfe..a29ef156a8 100644
--- a/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/CallableStatement.hxx"
#include "java/tools.hxx"
#include "java/sql/Array.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Class.cxx b/main/connectivity/source/drivers/jdbc/Class.cxx
index 2ea87544d5..8d2064d56f 100644
--- a/main/connectivity/source/drivers/jdbc/Class.cxx
+++ b/main/connectivity/source/drivers/jdbc/Class.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Class.hxx"
#include "java/tools.hxx"
#include <rtl/ustring.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/Clob.cxx b/main/connectivity/source/drivers/jdbc/Clob.cxx
index d3b3547427..63f885ef1d 100644
--- a/main/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/main/connectivity/source/drivers/jdbc/Clob.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Clob.hxx"
#include "java/tools.hxx"
#include "java/io/Reader.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 6aa901e1e7..c27095f7ee 100644
--- a/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/ConnectionLog.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index aad0e92592..7e91b38e9a 100644
--- a/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/ContextClassLoader.hxx"
#include "java/lang/Object.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 4e009ccdc0..98b446b5f8 100644
--- a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/DatabaseMetaData.hxx"
#include "java/sql/Connection.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Date.cxx b/main/connectivity/source/drivers/jdbc/Date.cxx
index 612e76b684..13825ad28c 100644
--- a/main/connectivity/source/drivers/jdbc/Date.cxx
+++ b/main/connectivity/source/drivers/jdbc/Date.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/util/Date.hxx"
#include "java/tools.hxx"
#include "connectivity/dbconversion.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 873fd4f142..8f18ed355b 100644
--- a/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/DriverPropertyInfo.hxx"
#include "java/lang/Boolean.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Exception.cxx b/main/connectivity/source/drivers/jdbc/Exception.cxx
index 9271d2b2f7..62e722c33d 100644
--- a/main/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/main/connectivity/source/drivers/jdbc/Exception.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Exception.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/InputStream.cxx b/main/connectivity/source/drivers/jdbc/InputStream.cxx
index 53b9372e23..0a7d05de1d 100644
--- a/main/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/main/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/io/InputStream.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index bbf2d90c98..f47aec2342 100644
--- a/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/math/BigDecimal.hxx"
#include "java/tools.hxx"
#include "resource/jdbc_log.hrc"
diff --git a/main/connectivity/source/drivers/jdbc/JConnection.cxx b/main/connectivity/source/drivers/jdbc/JConnection.cxx
index 4ae2cb94d2..b7e2a40cad 100644
--- a/main/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/main/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Connection.hxx"
#include "java/lang/Class.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JDriver.cxx b/main/connectivity/source/drivers/jdbc/JDriver.cxx
index 3a0924955b..824355a270 100644
--- a/main/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/main/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Driver.hxx"
#include "java/lang/Object.hxx"
#include "java/lang/Class.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JStatement.cxx b/main/connectivity/source/drivers/jdbc/JStatement.cxx
index 2c4dd459c8..661260bd0f 100644
--- a/main/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/JStatement.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Object.cxx b/main/connectivity/source/drivers/jdbc/Object.cxx
index bf27913317..0814ad4b14 100644
--- a/main/connectivity/source/drivers/jdbc/Object.cxx
+++ b/main/connectivity/source/drivers/jdbc/Object.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#ifndef _CONNECTIVITY_JAVA_LANG_OBJJECT_HXX_
diff --git a/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 32eff4c2b9..4b9bca02ed 100644
--- a/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/PreparedStatement.hxx"
#include "java/sql/ResultSet.hxx"
#include "java/sql/ResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Reader.cxx b/main/connectivity/source/drivers/jdbc/Reader.cxx
index d57eea552e..bbd898fb6b 100644
--- a/main/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/main/connectivity/source/drivers/jdbc/Reader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/io/Reader.hxx"
#ifndef _INC_MEMORY
//#include <memory.h>
diff --git a/main/connectivity/source/drivers/jdbc/Ref.cxx b/main/connectivity/source/drivers/jdbc/Ref.cxx
index afc7745876..d40107af0d 100644
--- a/main/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/main/connectivity/source/drivers/jdbc/Ref.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Ref.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/ResultSet.cxx b/main/connectivity/source/drivers/jdbc/ResultSet.cxx
index 3a71f6b383..b3d3d454e3 100644
--- a/main/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/main/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/String.hxx"
#include "java/lang/Boolean.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index b8e2741208..30417c8fef 100644
--- a/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/ResultSetMetaData.hxx"
#include "java/sql/Connection.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/SQLException.cxx b/main/connectivity/source/drivers/jdbc/SQLException.cxx
index cd777c3daf..28f04a93d2 100644
--- a/main/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/main/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/SQLException.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/SQLWarning.cxx b/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 46baad7be2..5775160e21 100644
--- a/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/SQLWarning.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/String.cxx b/main/connectivity/source/drivers/jdbc/String.cxx
index b041f9912a..e6330216a8 100644
--- a/main/connectivity/source/drivers/jdbc/String.cxx
+++ b/main/connectivity/source/drivers/jdbc/String.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/String.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/Throwable.cxx b/main/connectivity/source/drivers/jdbc/Throwable.cxx
index 52e2a2ec99..fa5c4837f3 100644
--- a/main/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/main/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Throwable.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/Timestamp.cxx b/main/connectivity/source/drivers/jdbc/Timestamp.cxx
index 50684b1877..06018304ed 100644
--- a/main/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/main/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Timestamp.hxx"
#include "java/tools.hxx"
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/jservices.cxx b/main/connectivity/source/drivers/jdbc/jservices.cxx
index de8017388f..67c47e1b6e 100644
--- a/main/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/main/connectivity/source/drivers/jdbc/jservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Driver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/tools.cxx b/main/connectivity/source/drivers/jdbc/tools.cxx
index a2cdc102b0..42c8379ba0 100644
--- a/main/connectivity/source/drivers/jdbc/tools.cxx
+++ b/main/connectivity/source/drivers/jdbc/tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include <cstdarg>
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabAddressBook.cxx b/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 9c2e4c5c26..11e7ba428a 100644
--- a/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabAddressBook.hxx"
#include "MacabRecords.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabCatalog.cxx b/main/connectivity/source/drivers/macab/MacabCatalog.cxx
index e9d3d7d554..397ae16410 100644
--- a/main/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/main/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabCatalog.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabColumns.cxx b/main/connectivity/source/drivers/macab/MacabColumns.cxx
index c5f70b2f1c..e524c5f71f 100644
--- a/main/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/main/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabColumns.hxx"
#include "MacabTable.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabConnection.cxx b/main/connectivity/source/drivers/macab/MacabConnection.cxx
index 90bc870cf5..4f9b92b7b5 100644
--- a/main/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/main/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabConnection.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index f6137e77b2..203453fbaa 100644
--- a/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabDatabaseMetaData.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabDriver.cxx b/main/connectivity/source/drivers/macab/MacabDriver.cxx
index eabce5ef7f..539fcf804c 100644
--- a/main/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/main/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
#include "MacabDriver.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabGroup.cxx b/main/connectivity/source/drivers/macab/MacabGroup.cxx
index 6988723628..3c3d84223f 100644
--- a/main/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/main/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabGroup.hxx"
#include "MacabRecords.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabHeader.cxx b/main/connectivity/source/drivers/macab/MacabHeader.cxx
index 9e02e0286b..a05ad8bc3d 100644
--- a/main/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/main/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabHeader.hxx"
#include "MacabRecord.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 26069fefd6..492f43a1f9 100644
--- a/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabPreparedStatement.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabRecord.cxx b/main/connectivity/source/drivers/macab/MacabRecord.cxx
index a640e3d650..87f8b358b8 100644
--- a/main/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/main/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabRecord.hxx"
#include "macabutilities.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabRecords.cxx b/main/connectivity/source/drivers/macab/MacabRecords.cxx
index 5c5e7cb08c..aacf4124cf 100644
--- a/main/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/main/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabRecords.hxx"
#include "MacabRecord.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabResultSet.cxx b/main/connectivity/source/drivers/macab/MacabResultSet.cxx
index c12d07f316..50268886d0 100644
--- a/main/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/main/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabResultSet.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 7a91f3dbe6..7046274ad7 100644
--- a/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabResultSetMetaData.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabServices.cxx b/main/connectivity/source/drivers/macab/MacabServices.cxx
index 525c45298c..8537b1d553 100644
--- a/main/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/main/connectivity/source/drivers/macab/MacabServices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
#include "MacabDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/macab/MacabStatement.cxx b/main/connectivity/source/drivers/macab/MacabStatement.cxx
index c1e8572c67..66a87b5f5c 100644
--- a/main/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/main/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabStatement.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabTable.cxx b/main/connectivity/source/drivers/macab/MacabTable.cxx
index 75ab926e62..6fdaa98976 100644
--- a/main/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/main/connectivity/source/drivers/macab/MacabTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabTable.hxx"
#include "MacabTables.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabTables.cxx b/main/connectivity/source/drivers/macab/MacabTables.cxx
index 5e193538ef..e33eff5403 100644
--- a/main/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/main/connectivity/source/drivers/macab/MacabTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabTables.hxx"
#include "MacabTable.hxx"
diff --git a/main/connectivity/source/drivers/macab/macabcondition.cxx b/main/connectivity/source/drivers/macab/macabcondition.cxx
index 110d9891dc..438d7ad503 100644
--- a/main/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/main/connectivity/source/drivers/macab/macabcondition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "macabcondition.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/macab/macaborder.cxx b/main/connectivity/source/drivers/macab/macaborder.cxx
index 302fff66df..0571cb6d58 100644
--- a/main/connectivity/source/drivers/macab/macaborder.cxx
+++ b/main/connectivity/source/drivers/macab/macaborder.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "macaborder.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YCatalog.cxx b/main/connectivity/source/drivers/mysql/YCatalog.cxx
index c561053eb2..bc0c5d51e2 100644
--- a/main/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/main/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YCatalog.hxx"
#include "mysql/YUsers.hxx"
#include "mysql/YTables.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YColumns.cxx b/main/connectivity/source/drivers/mysql/YColumns.cxx
index 2c47c18661..a577f8c141 100644
--- a/main/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/main/connectivity/source/drivers/mysql/YColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YColumns.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YDriver.cxx b/main/connectivity/source/drivers/mysql/YDriver.cxx
index 0b59e2b1f4..705513505a 100644
--- a/main/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/main/connectivity/source/drivers/mysql/YDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YDriver.hxx"
#include "mysql/YCatalog.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/mysql/YTable.cxx b/main/connectivity/source/drivers/mysql/YTable.cxx
index 2bcb71bfb1..7a0231e617 100644
--- a/main/connectivity/source/drivers/mysql/YTable.cxx
+++ b/main/connectivity/source/drivers/mysql/YTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YTable.hxx"
#include "mysql/YTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/mysql/YTables.cxx b/main/connectivity/source/drivers/mysql/YTables.cxx
index d33051ff96..8cb56129bb 100644
--- a/main/connectivity/source/drivers/mysql/YTables.cxx
+++ b/main/connectivity/source/drivers/mysql/YTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YTables.hxx"
#include "mysql/YViews.hxx"
#include "mysql/YTable.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YUser.cxx b/main/connectivity/source/drivers/mysql/YUser.cxx
index cfc4dac04a..ade5667961 100644
--- a/main/connectivity/source/drivers/mysql/YUser.cxx
+++ b/main/connectivity/source/drivers/mysql/YUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YUser.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/mysql/YUsers.cxx b/main/connectivity/source/drivers/mysql/YUsers.cxx
index dad6543295..f0fabb25f0 100644
--- a/main/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/main/connectivity/source/drivers/mysql/YUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YUsers.hxx"
#include "mysql/YUser.hxx"
#include "mysql/YTable.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YViews.cxx b/main/connectivity/source/drivers/mysql/YViews.cxx
index 8b0c701440..15fdf3dbcf 100644
--- a/main/connectivity/source/drivers/mysql/YViews.cxx
+++ b/main/connectivity/source/drivers/mysql/YViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YViews.hxx"
#include "mysql/YTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/mysql/Yservices.cxx b/main/connectivity/source/drivers/mysql/Yservices.cxx
index 4fa5837a3a..8c061ca5db 100644
--- a/main/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/main/connectivity/source/drivers/mysql/Yservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/odbc/OFunctions.cxx b/main/connectivity/source/drivers/odbc/OFunctions.cxx
index 5d2cf0037c..bd6d583f28 100644
--- a/main/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/main/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
//--------------------------------------------------------------------------
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/odbc/ORealDriver.cxx b/main/connectivity/source/drivers/odbc/ORealDriver.cxx
index 561ff2b121..50173eb76a 100644
--- a/main/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/main/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
#include "ORealDriver.hxx"
#include "odbc/ODriver.hxx"
#include "odbc/OTools.hxx"
diff --git a/main/connectivity/source/drivers/odbc/oservices.cxx b/main/connectivity/source/drivers/odbc/oservices.cxx
index de4c357ca3..d8403694bf 100644
--- a/main/connectivity/source/drivers/odbc/oservices.cxx
+++ b/main/connectivity/source/drivers/odbc/oservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
#include "ORealDriver.hxx"
#include "odbc/ODriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/odbcbase/OConnection.cxx b/main/connectivity/source/drivers/odbcbase/OConnection.cxx
index 3669d8f2f3..32c59af94d 100644
--- a/main/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OConnection.hxx"
#include "odbc/ODatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 510da4f212..8bb8c45523 100644
--- a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/ODatabaseMetaData.hxx"
#include "odbc/OTools.hxx"
#ifndef _CONNECTIVITY_ODBC_ORESULTSET_HXX_
diff --git a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index a8fcaa5a7b..894e2eb22b 100644
--- a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "TConnection.hxx"
#ifndef _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
diff --git a/main/connectivity/source/drivers/odbcbase/ODriver.cxx b/main/connectivity/source/drivers/odbcbase/ODriver.cxx
index 5d153953b9..e03810b438 100644
--- a/main/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/ODriver.hxx"
#include "odbc/OConnection.hxx"
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index a414d4697e..40aed22f80 100644
--- a/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include <stdio.h>
#include <string.h>
diff --git a/main/connectivity/source/drivers/odbcbase/OResultSet.cxx b/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 99a9e87457..14e9790b0b 100644
--- a/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OResultSet.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 5407fe9419..715c2a6644 100644
--- a/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OResultSetMetaData.hxx"
#include "odbc/OTools.hxx"
#include <rtl/logfile.hxx>
diff --git a/main/connectivity/source/drivers/odbcbase/OStatement.cxx b/main/connectivity/source/drivers/odbcbase/OStatement.cxx
index 49a089f25c..efad2673e2 100644
--- a/main/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/odbcbase/OTools.cxx b/main/connectivity/source/drivers/odbcbase/OTools.cxx
index bea2a1a3fc..1e70a03755 100644
--- a/main/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OFunctions.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/inc/ParameterSubstitution.hxx b/main/connectivity/source/inc/ParameterSubstitution.hxx
index a3fc93ed85..8a47ac8a7f 100644
--- a/main/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/main/connectivity/source/inc/ParameterSubstitution.hxx
@@ -20,7 +20,6 @@
*************************************************************/
-#include "precompiled_connectivity.hxx"
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/main/connectivity/source/manager/mdrivermanager.cxx b/main/connectivity/source/manager/mdrivermanager.cxx
index b8ca852572..29783cc94f 100644
--- a/main/connectivity/source/manager/mdrivermanager.cxx
+++ b/main/connectivity/source/manager/mdrivermanager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
#include <stdio.h>
diff --git a/main/connectivity/source/manager/mregistration.cxx b/main/connectivity/source/manager/mregistration.cxx
index 8fbe7fe95f..93ba06ad74 100644
--- a/main/connectivity/source/manager/mregistration.cxx
+++ b/main/connectivity/source/manager/mregistration.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
#include "mdrivermanager.hxx"
diff --git a/main/connectivity/source/parse/PColumn.cxx b/main/connectivity/source/parse/PColumn.cxx
index 3d28050868..8fde3bf198 100644
--- a/main/connectivity/source/parse/PColumn.cxx
+++ b/main/connectivity/source/parse/PColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/PColumn.hxx"
#include "connectivity/dbtools.hxx"
diff --git a/main/connectivity/source/parse/internalnode.cxx b/main/connectivity/source/parse/internalnode.cxx
index 6df8bc0c10..e936d119c9 100644
--- a/main/connectivity/source/parse/internalnode.cxx
+++ b/main/connectivity/source/parse/internalnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "internalnode.hxx"
#include <algorithm>
diff --git a/main/connectivity/source/parse/sqliterator.cxx b/main/connectivity/source/parse/sqliterator.cxx
index a3f0f0f541..836df5e2e5 100644
--- a/main/connectivity/source/parse/sqliterator.cxx
+++ b/main/connectivity/source/parse/sqliterator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sqliterator.hxx"
#include "connectivity/sdbcx/VTable.hxx"
#include <connectivity/sqlparse.hxx>
diff --git a/main/connectivity/source/parse/sqlnode.cxx b/main/connectivity/source/parse/sqlnode.cxx
index 7fc706acc6..ff7aefe688 100644
--- a/main/connectivity/source/parse/sqlnode.cxx
+++ b/main/connectivity/source/parse/sqlnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/sqlnode.hxx>
diff --git a/main/connectivity/source/parse/wrap_sqlbison.cxx b/main/connectivity/source/parse/wrap_sqlbison.cxx
index 39f455844b..52e37d8930 100644
--- a/main/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/main/connectivity/source/parse/wrap_sqlbison.cxx
@@ -22,6 +22,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "sqlbison.cxx"
diff --git a/main/connectivity/source/parse/wrap_sqlflex.cxx b/main/connectivity/source/parse/wrap_sqlflex.cxx
index 332019ffbf..f86935f683 100644
--- a/main/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/main/connectivity/source/parse/wrap_sqlflex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#if defined _MSC_VER
#pragma warning(disable:4505)
diff --git a/main/connectivity/source/resource/sharedresources.cxx b/main/connectivity/source/resource/sharedresources.cxx
index 8eac967d91..d29d0dd594 100644
--- a/main/connectivity/source/resource/sharedresources.cxx
+++ b/main/connectivity/source/resource/sharedresources.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "resource/sharedresources.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/main/connectivity/source/sdbcx/VCatalog.cxx b/main/connectivity/source/sdbcx/VCatalog.cxx
index 16557b681e..9aa2ec4b82 100644
--- a/main/connectivity/source/sdbcx/VCatalog.cxx
+++ b/main/connectivity/source/sdbcx/VCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VCatalog.hxx"
#include "connectivity/sdbcx/VCollection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/sdbcx/VCollection.cxx b/main/connectivity/source/sdbcx/VCollection.cxx
index 74fd4303c8..658c13cac5 100644
--- a/main/connectivity/source/sdbcx/VCollection.cxx
+++ b/main/connectivity/source/sdbcx/VCollection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <algorithm>
#include <stdio.h>
diff --git a/main/connectivity/source/sdbcx/VColumn.cxx b/main/connectivity/source/sdbcx/VColumn.cxx
index 73fc123e66..8e31fb0808 100644
--- a/main/connectivity/source/sdbcx/VColumn.cxx
+++ b/main/connectivity/source/sdbcx/VColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/sequence.hxx>
diff --git a/main/connectivity/source/sdbcx/VDescriptor.cxx b/main/connectivity/source/sdbcx/VDescriptor.cxx
index f67dd479ef..9c2ec86df1 100644
--- a/main/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/main/connectivity/source/sdbcx/VDescriptor.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/main/connectivity/source/sdbcx/VGroup.cxx b/main/connectivity/source/sdbcx/VGroup.cxx
index 4e494ace28..c48804f24b 100644
--- a/main/connectivity/source/sdbcx/VGroup.cxx
+++ b/main/connectivity/source/sdbcx/VGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VGroup.hxx"
diff --git a/main/connectivity/source/sdbcx/VIndex.cxx b/main/connectivity/source/sdbcx/VIndex.cxx
index 7f079276f6..75a04514c5 100644
--- a/main/connectivity/source/sdbcx/VIndex.cxx
+++ b/main/connectivity/source/sdbcx/VIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VIndex.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/sdbcx/VIndexColumn.cxx b/main/connectivity/source/sdbcx/VIndexColumn.cxx
index b4fbbcd784..91b4b02601 100644
--- a/main/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/main/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/sdbcx/VKey.cxx b/main/connectivity/source/sdbcx/VKey.cxx
index 46dd4e7c9a..08c9db2314 100644
--- a/main/connectivity/source/sdbcx/VKey.cxx
+++ b/main/connectivity/source/sdbcx/VKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VKey.hxx"
diff --git a/main/connectivity/source/sdbcx/VKeyColumn.cxx b/main/connectivity/source/sdbcx/VKeyColumn.cxx
index b1dbf75cdf..9786bb22f8 100644
--- a/main/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/main/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VKeyColumn.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/sdbcx/VTable.cxx b/main/connectivity/source/sdbcx/VTable.cxx
index 21cdb363bf..54620e3c30 100644
--- a/main/connectivity/source/sdbcx/VTable.cxx
+++ b/main/connectivity/source/sdbcx/VTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VTable.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "connectivity/sdbcx/VIndex.hxx"
diff --git a/main/connectivity/source/sdbcx/VUser.cxx b/main/connectivity/source/sdbcx/VUser.cxx
index f08b4727a1..4426978d74 100644
--- a/main/connectivity/source/sdbcx/VUser.cxx
+++ b/main/connectivity/source/sdbcx/VUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VUser.hxx"
diff --git a/main/connectivity/source/sdbcx/VView.cxx b/main/connectivity/source/sdbcx/VView.cxx
index 234fb1ff3b..8be7b70397 100644
--- a/main/connectivity/source/sdbcx/VView.cxx
+++ b/main/connectivity/source/sdbcx/VView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VView.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/sequence.hxx>
diff --git a/main/connectivity/source/simpledbt/charset_s.cxx b/main/connectivity/source/simpledbt/charset_s.cxx
index 669618214f..6995231b88 100644
--- a/main/connectivity/source/simpledbt/charset_s.cxx
+++ b/main/connectivity/source/simpledbt/charset_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "charset_s.hxx"
//........................................................................
diff --git a/main/connectivity/source/simpledbt/dbtfactory.cxx b/main/connectivity/source/simpledbt/dbtfactory.cxx
index f0d147bbda..e3edd85c40 100644
--- a/main/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/main/connectivity/source/simpledbt/dbtfactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
diff --git a/main/connectivity/source/simpledbt/parsenode_s.cxx b/main/connectivity/source/simpledbt/parsenode_s.cxx
index e3ad1d7064..981d3b5d5c 100644
--- a/main/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/main/connectivity/source/simpledbt/parsenode_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "parsenode_s.hxx"
#include <connectivity/sqlnode.hxx>
diff --git a/main/connectivity/source/simpledbt/parser_s.cxx b/main/connectivity/source/simpledbt/parser_s.cxx
index 63a2c5a781..4274e7ec2e 100644
--- a/main/connectivity/source/simpledbt/parser_s.cxx
+++ b/main/connectivity/source/simpledbt/parser_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "parser_s.hxx"
#include "parsenode_s.hxx"
diff --git a/main/connectivity/source/simpledbt/refbase.cxx b/main/connectivity/source/simpledbt/refbase.cxx
index bf86b38600..83689b86ea 100644
--- a/main/connectivity/source/simpledbt/refbase.cxx
+++ b/main/connectivity/source/simpledbt/refbase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "refbase.hxx"
//........................................................................
diff --git a/main/connectivity/source/simpledbt/staticdbtools_s.cxx b/main/connectivity/source/simpledbt/staticdbtools_s.cxx
index 25c5e0a431..7c44da2be8 100644
--- a/main/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/main/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "staticdbtools_s.hxx"
#include "connectivity/dbconversion.hxx"
(openoffice) 07/27: Add "version" as a library on Windows, and link to it so we can find functions like VerQueryValueW() on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b4ae19cf680349e88513e826f373ee33cab7f5dc
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 00:36:02 2025 +0200
Add "version" as a library on Windows, and link to it so we
can find functions like VerQueryValueW() on Win64.
Patch by: me
---
main/solenv/gbuild/platform/windows.mk | 1 +
main/vcl/Library_vcl.mk | 1 +
2 files changed, 2 insertions(+)
diff --git a/main/solenv/gbuild/platform/windows.mk b/main/solenv/gbuild/platform/windows.mk
index ad75301570..70a1643355 100644
--- a/main/solenv/gbuild/platform/windows.mk
+++ b/main/solenv/gbuild/platform/windows.mk
@@ -531,6 +531,7 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ version \
winmm \
winspool \
ws2_32 \
diff --git a/main/vcl/Library_vcl.mk b/main/vcl/Library_vcl.mk
index fe9b9fe860..f31f503005 100644
--- a/main/vcl/Library_vcl.mk
+++ b/main/vcl/Library_vcl.mk
@@ -529,6 +529,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
shell32 \
user32 \
uuid \
+ version \
winspool \
$(gb_STDLIBS) \
))
(openoffice) 13/27: Use the right data types for the IMediaEvent::GetEvent() call.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2104eb8264bdbda5d076af53be0b149c80fff46b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 07:12:39 2025 +0200
Use the right data types for the IMediaEvent::GetEvent() call.
Patch by: me
---
main/avmedia/source/win/player.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/main/avmedia/source/win/player.cxx b/main/avmedia/source/win/player.cxx
index ec860fc4d4..506f954ecc 100644
--- a/main/avmedia/source/win/player.cxx
+++ b/main/avmedia/source/win/player.cxx
@@ -236,7 +236,8 @@ void Player::setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurf
long Player::processEvent()
{
- long nCode, nParam1, nParam2;
+ long nCode;
+ LONG_PTR nParam1, nParam2;
while( mpME && SUCCEEDED( mpME->GetEvent( &nCode, &nParam1, &nParam2, 0 ) ) )
{
(openoffice) 24/27: Preliminary, incomplete port of charts2 to gbuild.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit bc51a717b47b1d7399fad1d5c86319f44db2c8bb
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 5 13:20:10 2025 +0200
Preliminary, incomplete port of charts2 to gbuild.
Patch by: me
---
main/Repository.mk | 4 +
main/chart2/Library_chartcontroller.mk | 216 ++++++++++++++++
main/chart2/Library_chartmodel.mk | 115 +++++++++
main/chart2/Library_charttools.mk | 138 +++++++++++
main/chart2/Library_chartview.mk | 120 +++++++++
main/chart2/Makefile | 32 +++
main/chart2/Module_chart2.mk | 35 +++
main/chart2/Package_uiconfig.mk | 35 +++
.../pch/precompiled_chartcontroller.cxx} | 14 --
.../chart2/inc/pch/precompiled_chartcontroller.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_chartmodel.cxx} | 14 --
main/chart2/inc/pch/precompiled_chartmodel.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_charttools.cxx} | 14 --
main/chart2/inc/pch/precompiled_charttools.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_chartview.cxx} | 14 --
main/chart2/inc/pch/precompiled_chartview.hxx | 271 +++++++++++++++++++++
main/chart2/prj/build.lst | 28 +--
main/chart2/prj/d.lst | 27 --
main/chart2/prj/makefile.mk | 44 ++++
.../accessibility/AccStatisticsObject.cxx | 2 +-
.../controller/accessibility/AccessibleBase.cxx | 2 +-
.../accessibility/AccessibleChartElement.cxx | 2 +-
.../accessibility/AccessibleChartShape.cxx | 2 +-
.../accessibility/AccessibleChartView.cxx | 2 +-
.../accessibility/AccessibleTextHelper.cxx | 2 +-
.../accessibility/AccessibleViewForwarder.cxx | 2 +-
.../accessibility/ChartElementFactory.cxx | 2 +-
.../controller/chartapiwrapper/AreaWrapper.cxx | 2 +-
.../controller/chartapiwrapper/AxisWrapper.cxx | 2 +-
.../chartapiwrapper/Chart2ModelContact.cxx | 2 +-
.../chartapiwrapper/ChartDataWrapper.cxx | 2 +-
.../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +-
.../chartapiwrapper/DataSeriesPointWrapper.cxx | 2 +-
.../controller/chartapiwrapper/DiagramWrapper.cxx | 2 +-
.../controller/chartapiwrapper/GridWrapper.cxx | 2 +-
.../controller/chartapiwrapper/LegendWrapper.cxx | 2 +-
.../chartapiwrapper/MinMaxLineWrapper.cxx | 2 +-
.../controller/chartapiwrapper/TitleWrapper.cxx | 2 +-
.../chartapiwrapper/UpDownBarWrapper.cxx | 2 +-
.../chartapiwrapper/WallFloorWrapper.cxx | 2 +-
.../chartapiwrapper/WrappedAddInProperty.cxx | 2 +-
.../WrappedAutomaticPositionProperties.cxx | 2 +-
.../WrappedAxisAndGridExistenceProperties.cxx | 2 +-
.../WrappedCharacterHeightProperty.cxx | 2 +-
.../WrappedDataCaptionProperties.cxx | 2 +-
.../chartapiwrapper/WrappedGapwidthProperty.cxx | 2 +-
.../WrappedNumberFormatProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleTextProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSceneProperty.cxx | 2 +-
.../WrappedSeriesAreaOrLineProperty.cxx | 2 +-
.../chartapiwrapper/WrappedSplineProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStatisticProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStockProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSymbolProperties.cxx | 2 +-
.../WrappedTextRotationProperty.cxx | 2 +-
.../source/controller/dialogs/ChangingResource.cxx | 2 +-
.../dialogs/ChartTypeDialogController.cxx | 2 +-
.../source/controller/dialogs/DataBrowser.cxx | 2 +-
.../source/controller/dialogs/DataBrowserModel.cxx | 2 +-
.../source/controller/dialogs/DialogModel.cxx | 2 +-
.../controller/dialogs/ObjectNameProvider.cxx | 2 +-
.../chart2/source/controller/dialogs/RangeEdit.cxx | 2 +-
.../controller/dialogs/RangeSelectionButton.cxx | 2 +-
.../controller/dialogs/RangeSelectionHelper.cxx | 2 +-
.../controller/dialogs/RangeSelectionListener.cxx | 2 +-
.../controller/dialogs/TextDirectionListBox.cxx | 2 +-
.../dialogs/TimerTriggeredControllerLock.cxx | 2 +-
.../source/controller/dialogs/TitleDialogData.cxx | 2 +-
.../source/controller/dialogs/dlg_ChartType.cxx | 2 +-
.../controller/dialogs/dlg_ChartType_UNO.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +-
.../source/controller/dialogs/dlg_DataEditor.cxx | 2 +-
.../source/controller/dialogs/dlg_DataSource.cxx | 2 +-
.../controller/dialogs/dlg_InsertAxis_Grid.cxx | 2 +-
.../controller/dialogs/dlg_InsertDataLabel.cxx | 2 +-
.../controller/dialogs/dlg_InsertErrorBars.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertLegend.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertTitle.cxx | 2 +-
.../controller/dialogs/dlg_InsertTrendline.cxx | 2 +-
.../source/controller/dialogs/dlg_NumberFormat.cxx | 2 +-
.../controller/dialogs/dlg_ObjectProperties.cxx | 2 +-
.../source/controller/dialogs/dlg_ShapeFont.cxx | 2 +-
.../controller/dialogs/dlg_ShapeParagraph.cxx | 2 +-
.../source/controller/dialogs/dlg_View3D.cxx | 2 +-
.../source/controller/dialogs/res_BarGeometry.cxx | 2 +-
.../source/controller/dialogs/res_DataLabel.cxx | 2 +-
.../source/controller/dialogs/res_ErrorBar.cxx | 2 +-
.../controller/dialogs/res_LegendPosition.cxx | 2 +-
.../controller/dialogs/res_TextSeparator.cxx | 2 +-
.../source/controller/dialogs/res_Titles.cxx | 2 +-
.../source/controller/dialogs/res_Trendline.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneAppearance.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneGeometry.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneIllumination.cxx | 2 +-
.../source/controller/dialogs/tp_AxisLabel.cxx | 2 +-
.../source/controller/dialogs/tp_AxisPositions.cxx | 2 +-
.../source/controller/dialogs/tp_ChartType.cxx | 2 +-
.../source/controller/dialogs/tp_DataLabel.cxx | 2 +-
.../source/controller/dialogs/tp_DataSource.cxx | 2 +-
.../controller/dialogs/tp_DataSourceControls.cxx | 2 +-
.../source/controller/dialogs/tp_ErrorBars.cxx | 2 +-
.../controller/dialogs/tp_LegendPosition.cxx | 2 +-
.../source/controller/dialogs/tp_Location.cxx | 2 +-
.../source/controller/dialogs/tp_PointGeometry.cxx | 2 +-
.../source/controller/dialogs/tp_PolarOptions.cxx | 2 +-
.../source/controller/dialogs/tp_RangeChooser.cxx | 2 +-
main/chart2/source/controller/dialogs/tp_Scale.cxx | 2 +-
.../source/controller/dialogs/tp_SeriesToAxis.cxx | 2 +-
.../source/controller/dialogs/tp_TitleRotation.cxx | 2 +-
.../source/controller/dialogs/tp_Trendline.cxx | 2 +-
.../dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +-
.../controller/drawinglayer/DrawViewWrapper.cxx | 2 +-
.../drawinglayer/ViewElementListProvider.cxx | 2 +-
.../itemsetwrapper/AxisItemConverter.cxx | 2 +-
.../CharacterPropertyItemConverter.cxx | 2 +-
.../itemsetwrapper/DataPointItemConverter.cxx | 2 +-
.../itemsetwrapper/ErrorBarItemConverter.cxx | 2 +-
.../GraphicPropertyItemConverter.cxx | 2 +-
.../controller/itemsetwrapper/ItemConverter.cxx | 2 +-
.../itemsetwrapper/LegendItemConverter.cxx | 2 +-
.../itemsetwrapper/MultipleChartConverters.cxx | 2 +-
.../itemsetwrapper/MultipleItemConverter.cxx | 2 +-
.../RegressionCurveItemConverter.cxx | 2 +-
.../RegressionEquationItemConverter.cxx | 2 +-
.../itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 +-
.../itemsetwrapper/StatisticsItemConverter.cxx | 2 +-
.../itemsetwrapper/TitleItemConverter.cxx | 2 +-
.../source/controller/main/ChartController.cxx | 2 +-
.../controller/main/ChartController_EditData.cxx | 2 +-
.../controller/main/ChartController_Insert.cxx | 2 +-
.../controller/main/ChartController_Position.cxx | 2 +-
.../controller/main/ChartController_Properties.cxx | 2 +-
.../controller/main/ChartController_TextEdit.cxx | 2 +-
.../controller/main/ChartController_Tools.cxx | 2 +-
.../controller/main/ChartController_Window.cxx | 2 +-
.../controller/main/ChartDropTargetHelper.cxx | 2 +-
.../source/controller/main/ChartFrameloader.cxx | 2 +-
.../source/controller/main/ChartModelClone.cxx | 2 +-
.../source/controller/main/ChartTransferable.cxx | 2 +-
main/chart2/source/controller/main/ChartWindow.cxx | 2 +-
.../source/controller/main/CommandDispatch.cxx | 2 +-
.../controller/main/CommandDispatchContainer.cxx | 2 +-
.../source/controller/main/ConfigurationAccess.cxx | 2 +-
.../controller/main/ControllerCommandDispatch.cxx | 2 +-
.../source/controller/main/DragMethod_Base.cxx | 2 +-
.../controller/main/DragMethod_PieSegment.cxx | 2 +-
.../controller/main/DragMethod_RotateDiagram.cxx | 2 +-
.../source/controller/main/DrawCommandDispatch.cxx | 2 +-
.../source/controller/main/ElementSelector.cxx | 2 +-
.../controller/main/FeatureCommandDispatchBase.cxx | 2 +-
.../source/controller/main/ObjectHierarchy.cxx | 2 +-
.../controller/main/PositionAndSizeHelper.cxx | 2 +-
.../source/controller/main/SelectionHelper.cxx | 2 +-
.../source/controller/main/ShapeController.cxx | 2 +-
.../controller/main/ShapeToolbarController.cxx | 2 +-
.../controller/main/StatusBarCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoActions.cxx | 2 +-
.../source/controller/main/UndoCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoGuard.cxx | 2 +-
.../main/_serviceregistration_controller.cxx | 2 +-
main/chart2/source/model/filter/XMLFilter.cxx | 2 +-
main/chart2/source/model/main/Axis.cxx | 2 +-
.../source/model/main/BaseCoordinateSystem.cxx | 2 +-
.../model/main/CartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/ChartModel.cxx | 2 +-
.../source/model/main/ChartModel_Persistence.cxx | 2 +-
main/chart2/source/model/main/DataPoint.cxx | 2 +-
.../source/model/main/DataPointProperties.cxx | 2 +-
main/chart2/source/model/main/DataSeries.cxx | 2 +-
.../source/model/main/DataSeriesProperties.cxx | 2 +-
main/chart2/source/model/main/Diagram.cxx | 2 +-
main/chart2/source/model/main/FormattedString.cxx | 2 +-
main/chart2/source/model/main/GridProperties.cxx | 2 +-
main/chart2/source/model/main/LayoutContainer.cxx | 2 +-
main/chart2/source/model/main/Legend.cxx | 2 +-
main/chart2/source/model/main/PageBackground.cxx | 2 +-
.../source/model/main/PolarCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/StockBar.cxx | 2 +-
main/chart2/source/model/main/Title.cxx | 2 +-
main/chart2/source/model/main/UndoManager.cxx | 2 +-
main/chart2/source/model/main/Wall.cxx | 2 +-
.../model/main/_serviceregistration_model.cxx | 2 +-
.../chart2/source/model/template/AreaChartType.cxx | 2 +-
.../model/template/AreaChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/BarChartType.cxx | 2 +-
.../source/model/template/BarChartTypeTemplate.cxx | 2 +-
.../source/model/template/BubbleChartType.cxx | 2 +-
.../model/template/BubbleChartTypeTemplate.cxx | 2 +-
.../model/template/BubbleDataInterpreter.cxx | 2 +-
.../source/model/template/CandleStickChartType.cxx | 2 +-
main/chart2/source/model/template/ChartType.cxx | 2 +-
.../source/model/template/ChartTypeManager.cxx | 2 +-
.../source/model/template/ChartTypeTemplate.cxx | 2 +-
.../source/model/template/ColumnChartType.cxx | 2 +-
.../model/template/ColumnLineChartTypeTemplate.cxx | 2 +-
.../model/template/ColumnLineDataInterpreter.cxx | 2 +-
.../source/model/template/DataInterpreter.cxx | 2 +-
.../source/model/template/FilledNetChartType.cxx | 2 +-
.../chart2/source/model/template/LineChartType.cxx | 2 +-
.../model/template/LineChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/NetChartType.cxx | 2 +-
.../source/model/template/NetChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/PieChartType.cxx | 2 +-
.../source/model/template/PieChartTypeTemplate.cxx | 2 +-
.../source/model/template/ScatterChartType.cxx | 2 +-
.../model/template/ScatterChartTypeTemplate.cxx | 2 +-
.../model/template/StockChartTypeTemplate.cxx | 2 +-
.../source/model/template/StockDataInterpreter.cxx | 2 +-
.../source/model/template/XYDataInterpreter.cxx | 2 +-
.../template/_serviceregistration_charttypes.cxx | 2 +-
main/chart2/source/tools/AxisHelper.cxx | 2 +-
main/chart2/source/tools/BaseGFXHelper.cxx | 2 +-
main/chart2/source/tools/CachedDataSequence.cxx | 2 +-
main/chart2/source/tools/CharacterProperties.cxx | 2 +-
main/chart2/source/tools/ChartDebugTrace.cxx | 2 +-
main/chart2/source/tools/ChartModelHelper.cxx | 2 +-
main/chart2/source/tools/ChartTypeHelper.cxx | 2 +-
main/chart2/source/tools/ChartViewHelper.cxx | 2 +-
main/chart2/source/tools/ColorPerPointHelper.cxx | 2 +-
main/chart2/source/tools/CommonConverters.cxx | 2 +-
main/chart2/source/tools/ConfigColorScheme.cxx | 2 +-
main/chart2/source/tools/ControllerLockGuard.cxx | 2 +-
main/chart2/source/tools/DataSeriesHelper.cxx | 2 +-
main/chart2/source/tools/DataSource.cxx | 2 +-
main/chart2/source/tools/DataSourceHelper.cxx | 2 +-
main/chart2/source/tools/DiagramHelper.cxx | 2 +-
main/chart2/source/tools/ErrorBar.cxx | 2 +-
.../source/tools/ExplicitCategoriesProvider.cxx | 2 +-
.../tools/ExponentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/FillProperties.cxx | 2 +-
main/chart2/source/tools/FormattedStringHelper.cxx | 2 +-
main/chart2/source/tools/ImplOPropertySet.cxx | 2 +-
main/chart2/source/tools/InternalData.cxx | 2 +-
main/chart2/source/tools/InternalDataProvider.cxx | 2 +-
main/chart2/source/tools/LabeledDataSequence.cxx | 2 +-
main/chart2/source/tools/LegendHelper.cxx | 2 +-
main/chart2/source/tools/LifeTime.cxx | 2 +-
main/chart2/source/tools/LineProperties.cxx | 2 +-
.../tools/LinearRegressionCurveCalculator.cxx | 2 +-
.../tools/LogarithmicRegressionCurveCalculator.cxx | 2 +-
.../tools/MeanValueRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/MediaDescriptorHelper.cxx | 2 +-
.../chart2/source/tools/ModifyListenerCallBack.cxx | 2 +-
main/chart2/source/tools/ModifyListenerHelper.cxx | 2 +-
main/chart2/source/tools/MutexContainer.cxx | 2 +-
main/chart2/source/tools/NameContainer.cxx | 2 +-
main/chart2/source/tools/NamedFillProperties.cxx | 2 +-
main/chart2/source/tools/NamedLineProperties.cxx | 2 +-
main/chart2/source/tools/NamedProperties.cxx | 2 +-
.../chart2/source/tools/NumberFormatterWrapper.cxx | 2 +-
main/chart2/source/tools/OPropertySet.cxx | 2 +-
main/chart2/source/tools/ObjectIdentifier.cxx | 2 +-
.../tools/PotentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/PropertyHelper.cxx | 2 +-
main/chart2/source/tools/RangeHighlighter.cxx | 2 +-
main/chart2/source/tools/ReferenceSizeProvider.cxx | 2 +-
.../source/tools/RegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/RegressionCurveHelper.cxx | 2 +-
main/chart2/source/tools/RegressionCurveModel.cxx | 2 +-
main/chart2/source/tools/RegressionEquation.cxx | 2 +-
.../chart2/source/tools/RelativePositionHelper.cxx | 2 +-
main/chart2/source/tools/RelativeSizeHelper.cxx | 2 +-
main/chart2/source/tools/ResId.cxx | 2 +-
main/chart2/source/tools/RessourceManager.cxx | 2 +-
main/chart2/source/tools/Scaling.cxx | 2 +-
main/chart2/source/tools/SceneProperties.cxx | 2 +-
main/chart2/source/tools/StatisticsHelper.cxx | 2 +-
main/chart2/source/tools/ThreeDHelper.cxx | 2 +-
main/chart2/source/tools/TitleHelper.cxx | 2 +-
main/chart2/source/tools/TrueGuard.cxx | 2 +-
main/chart2/source/tools/UncachedDataSequence.cxx | 2 +-
main/chart2/source/tools/UserDefinedProperties.cxx | 2 +-
main/chart2/source/tools/WeakListenerAdapter.cxx | 2 +-
.../chart2/source/tools/WrappedDefaultProperty.cxx | 2 +-
.../source/tools/WrappedDirectStateProperty.cxx | 2 +-
main/chart2/source/tools/WrappedIgnoreProperty.cxx | 2 +-
main/chart2/source/tools/WrappedProperty.cxx | 2 +-
main/chart2/source/tools/WrappedPropertySet.cxx | 2 +-
main/chart2/source/tools/XMLRangeHelper.cxx | 2 +-
.../source/tools/_serviceregistration_tools.cxx | 2 +-
main/chart2/source/view/axes/DateHelper.cxx | 2 +-
main/chart2/source/view/axes/DateScaling.cxx | 2 +-
.../source/view/axes/MinimumAndMaximumSupplier.cxx | 2 +-
main/chart2/source/view/axes/ScaleAutomatism.cxx | 2 +-
main/chart2/source/view/axes/TickmarkHelper.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks_Dates.cxx | 2 +-
.../source/view/axes/Tickmarks_Equidistant.cxx | 2 +-
main/chart2/source/view/axes/VAxisBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisOrGridBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisProperties.cxx | 2 +-
main/chart2/source/view/axes/VCartesianAxis.cxx | 2 +-
.../view/axes/VCartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VCartesianGrid.cxx | 2 +-
main/chart2/source/view/axes/VCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarAngleAxis.cxx | 2 +-
main/chart2/source/view/axes/VPolarAxis.cxx | 2 +-
.../source/view/axes/VPolarCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarGrid.cxx | 2 +-
main/chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 +-
main/chart2/source/view/charttypes/AreaChart.cxx | 2 +-
main/chart2/source/view/charttypes/BarChart.cxx | 2 +-
.../source/view/charttypes/BarPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/BubbleChart.cxx | 2 +-
.../source/view/charttypes/CandleStickChart.cxx | 2 +-
.../view/charttypes/CategoryPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/PieChart.cxx | 2 +-
main/chart2/source/view/charttypes/Splines.cxx | 2 +-
.../source/view/charttypes/VSeriesPlotter.cxx | 2 +-
main/chart2/source/view/diagram/VDiagram.cxx | 2 +-
main/chart2/source/view/main/ChartItemPool.cxx | 2 +-
main/chart2/source/view/main/ChartView.cxx | 2 +-
main/chart2/source/view/main/Clipping.cxx | 2 +-
.../source/view/main/DataPointSymbolSupplier.cxx | 2 +-
main/chart2/source/view/main/DrawModelWrapper.cxx | 2 +-
.../source/view/main/LabelPositionHelper.cxx | 2 +-
.../source/view/main/Linear3DTransformation.cxx | 2 +-
main/chart2/source/view/main/PlotterBase.cxx | 2 +-
.../source/view/main/PlottingPositionHelper.cxx | 2 +-
.../source/view/main/PolarLabelPositionHelper.cxx | 2 +-
main/chart2/source/view/main/PropertyMapper.cxx | 2 +-
main/chart2/source/view/main/ShapeFactory.cxx | 2 +-
main/chart2/source/view/main/Stripe.cxx | 2 +-
main/chart2/source/view/main/VDataSeries.cxx | 2 +-
main/chart2/source/view/main/VLegend.cxx | 2 +-
.../source/view/main/VLegendSymbolFactory.cxx | 2 +-
main/chart2/source/view/main/VLineProperties.cxx | 2 +-
.../source/view/main/VPolarTransformation.cxx | 2 +-
main/chart2/source/view/main/VTitle.cxx | 2 +-
.../source/view/main/_serviceregistration_view.cxx | 2 +-
332 files changed, 2137 insertions(+), 423 deletions(-)
diff --git a/main/Repository.mk b/main/Repository.mk
index 07da7d2dbf..e32ef366be 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -87,6 +87,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cached1 \
calc \
canvastools \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
collator_data \
communi \
cppcanvas \
diff --git a/main/chart2/Library_chartcontroller.mk b/main/chart2/Library_chartcontroller.mk
new file mode 100644
index 0000000000..c69c3e7028
--- /dev/null
+++ b/main/chart2/Library_chartcontroller.mk
@@ -0,0 +1,216 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartcontroller))
+
+$(eval $(call gb_Library_add_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chartcontroller))
+
+$(eval $(call gb_Library_set_versionmap,chartcontroller,$(SRCDIR)/solenv/src/component.map))
+
+$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
+
+$(eval $(call gb_Library_set_include,chartcontroller,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/controller/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartcontroller, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
+ basegfx \
+ charttools \
+ chartview \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ ootk \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tl \
+ utl \
+ vcl \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartcontroller,\
+ chart2/source/controller/accessibility/AccessibleChartView \
+ chart2/source/controller/accessibility/ChartElementFactory \
+ chart2/source/controller/accessibility/AccessibleBase \
+ chart2/source/controller/accessibility/AccessibleChartElement \
+ chart2/source/controller/accessibility/AccessibleChartShape \
+ chart2/source/controller/accessibility/AccessibleTextHelper \
+ chart2/source/controller/accessibility/AccessibleViewForwarder \
+ chart2/source/controller/chartapiwrapper/Chart2ModelContact \
+ chart2/source/controller/chartapiwrapper/AreaWrapper \
+ chart2/source/controller/chartapiwrapper/AxisWrapper \
+ chart2/source/controller/chartapiwrapper/ChartDataWrapper \
+ chart2/source/controller/chartapiwrapper/ChartDocumentWrapper \
+ chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper \
+ chart2/source/controller/chartapiwrapper/DiagramWrapper \
+ chart2/source/controller/chartapiwrapper/GridWrapper \
+ chart2/source/controller/chartapiwrapper/LegendWrapper \
+ chart2/source/controller/chartapiwrapper/TitleWrapper \
+ chart2/source/controller/chartapiwrapper/MinMaxLineWrapper \
+ chart2/source/controller/chartapiwrapper/UpDownBarWrapper \
+ chart2/source/controller/chartapiwrapper/WallFloorWrapper \
+ chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties \
+ chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty \
+ chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties \
+ chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
+ chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty \
+ chart2/source/controller/chartapiwrapper/WrappedScaleProperty \
+ chart2/source/controller/chartapiwrapper/WrappedSplineProperties \
+ chart2/source/controller/chartapiwrapper/WrappedStockProperties \
+ chart2/source/controller/chartapiwrapper/WrappedSymbolProperties \
+ chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties \
+ chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty \
+ chart2/source/controller/chartapiwrapper/WrappedStatisticProperties \
+ chart2/source/controller/chartapiwrapper/WrappedSceneProperty \
+ chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty \
+ chart2/source/controller/chartapiwrapper/WrappedAddInProperty \
+ chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties \
+ chart2/source/controller/dialogs/ObjectNameProvider \
+ chart2/source/controller/dialogs/TimerTriggeredControllerLock \
+ chart2/source/controller/dialogs/ChangingResource \
+ chart2/source/controller/dialogs/DataBrowser \
+ chart2/source/controller/dialogs/DataBrowserModel \
+ chart2/source/controller/dialogs/DialogModel \
+ chart2/source/controller/dialogs/TitleDialogData \
+ chart2/source/controller/dialogs/res_Titles \
+ chart2/source/controller/dialogs/res_TextSeparator \
+ chart2/source/controller/dialogs/res_ErrorBar \
+ chart2/source/controller/dialogs/res_Trendline \
+ chart2/source/controller/dialogs/res_BarGeometry \
+ chart2/source/controller/dialogs/res_LegendPosition \
+ chart2/source/controller/dialogs/res_DataLabel \
+ chart2/source/controller/dialogs/ChartTypeDialogController \
+ chart2/source/controller/dialogs/tp_ChartType \
+ chart2/source/controller/dialogs/tp_RangeChooser \
+ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects \
+ chart2/source/controller/dialogs/tp_Location \
+ chart2/source/controller/dialogs/tp_AxisLabel \
+ chart2/source/controller/dialogs/tp_AxisPositions \
+ chart2/source/controller/dialogs/tp_DataLabel \
+ chart2/source/controller/dialogs/tp_DataSource \
+ chart2/source/controller/dialogs/tp_DataSourceControls \
+ chart2/source/controller/dialogs/tp_LegendPosition \
+ chart2/source/controller/dialogs/tp_PointGeometry \
+ chart2/source/controller/dialogs/tp_Scale \
+ chart2/source/controller/dialogs/tp_Trendline \
+ chart2/source/controller/dialogs/tp_ErrorBars \
+ chart2/source/controller/dialogs/tp_SeriesToAxis \
+ chart2/source/controller/dialogs/tp_TitleRotation \
+ chart2/source/controller/dialogs/tp_3D_SceneGeometry \
+ chart2/source/controller/dialogs/tp_3D_SceneAppearance \
+ chart2/source/controller/dialogs/tp_3D_SceneIllumination \
+ chart2/source/controller/dialogs/tp_PolarOptions \
+ chart2/source/controller/dialogs/dlg_ObjectProperties \
+ chart2/source/controller/dialogs/dlg_DataEditor \
+ chart2/source/controller/dialogs/dlg_DataSource \
+ chart2/source/controller/dialogs/dlg_View3D \
+ chart2/source/controller/dialogs/dlg_InsertAxis_Grid \
+ chart2/source/controller/dialogs/dlg_InsertDataLabel \
+ chart2/source/controller/dialogs/dlg_InsertLegend \
+ chart2/source/controller/dialogs/dlg_InsertTrendline \
+ chart2/source/controller/dialogs/dlg_InsertErrorBars \
+ chart2/source/controller/dialogs/dlg_InsertTitle \
+ chart2/source/controller/dialogs/dlg_CreationWizard \
+ chart2/source/controller/dialogs/dlg_CreationWizard_UNO \
+ chart2/source/controller/dialogs/dlg_ChartType_UNO \
+ chart2/source/controller/dialogs/dlg_ChartType \
+ chart2/source/controller/dialogs/dlg_NumberFormat \
+ chart2/source/controller/dialogs/dlg_ShapeFont \
+ chart2/source/controller/dialogs/dlg_ShapeParagraph \
+ chart2/source/controller/dialogs/RangeSelectionButton \
+ chart2/source/controller/dialogs/RangeSelectionHelper \
+ chart2/source/controller/dialogs/RangeSelectionListener \
+ chart2/source/controller/dialogs/RangeEdit \
+ chart2/source/controller/dialogs/TextDirectionListBox \
+ chart2/source/controller/drawinglayer/DrawViewWrapper \
+ chart2/source/controller/drawinglayer/ViewElementListProvider \
+ chart2/source/controller/itemsetwrapper/ItemConverter \
+ chart2/source/controller/itemsetwrapper/AxisItemConverter \
+ chart2/source/controller/itemsetwrapper/MultipleItemConverter \
+ chart2/source/controller/itemsetwrapper/MultipleChartConverters \
+ chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter \
+ chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter \
+ chart2/source/controller/itemsetwrapper/DataPointItemConverter \
+ chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter \
+ chart2/source/controller/itemsetwrapper/LegendItemConverter \
+ chart2/source/controller/itemsetwrapper/StatisticsItemConverter \
+ chart2/source/controller/itemsetwrapper/TitleItemConverter \
+ chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter \
+ chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter \
+ chart2/source/controller/itemsetwrapper/ErrorBarItemConverter \
+ chart2/source/controller/main/ConfigurationAccess \
+ chart2/source/controller/main/ElementSelector \
+ chart2/source/controller/main/SelectionHelper \
+ chart2/source/controller/main/PositionAndSizeHelper \
+ chart2/source/controller/main/ChartWindow \
+ chart2/source/controller/main/ChartController \
+ chart2/source/controller/main/ChartController_EditData \
+ chart2/source/controller/main/ChartController_Window \
+ chart2/source/controller/main/ChartController_Properties \
+ chart2/source/controller/main/ChartController_Insert \
+ chart2/source/controller/main/ChartController_TextEdit \
+ chart2/source/controller/main/ChartController_Position \
+ chart2/source/controller/main/ChartController_Tools \
+ chart2/source/controller/main/ChartFrameloader \
+ chart2/source/controller/main/CommandDispatchContainer \
+ chart2/source/controller/main/CommandDispatch \
+ chart2/source/controller/main/ControllerCommandDispatch \
+ chart2/source/controller/main/UndoCommandDispatch \
+ chart2/source/controller/main/DragMethod_Base \
+ chart2/source/controller/main/DragMethod_RotateDiagram \
+ chart2/source/controller/main/DragMethod_PieSegment \
+ chart2/source/controller/main/ObjectHierarchy \
+ chart2/source/controller/main/_serviceregistration_controller \
+ chart2/source/controller/main/ChartDropTargetHelper \
+ chart2/source/controller/main/StatusBarCommandDispatch \
+ chart2/source/controller/main/ChartTransferable \
+ chart2/source/controller/main/FeatureCommandDispatchBase \
+ chart2/source/controller/main/DrawCommandDispatch \
+ chart2/source/controller/main/ShapeController \
+ chart2/source/controller/main/ShapeToolbarController \
+ chart2/source/controller/main/UndoActions \
+ chart2/source/controller/main/UndoGuard \
+ chart2/source/controller/main/ChartModelClone \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_chartmodel.mk b/main/chart2/Library_chartmodel.mk
new file mode 100644
index 0000000000..9418ed4332
--- /dev/null
+++ b/main/chart2/Library_chartmodel.mk
@@ -0,0 +1,115 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartmodel))
+
+$(eval $(call gb_Library_add_precompiled_header,chartmodel,$(SRCDIR)/chart2/inc/pch/precompiled_chartmodel))
+
+$(eval $(call gb_Library_set_versionmap,chartmodel,$(SRCDIR)/solenv/src/component.map))
+
+$(eval $(call gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
+
+$(eval $(call gb_Library_set_include,chartmodel,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/model/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartmodel, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartmodel,\
+ charttools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ fwe \
+ sal \
+ svl \
+ svt \
+ ucbhelper \
+ utl \
+ vcl \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartmodel,\
+ chart2/source/model/filter/XMLFilter \
+ chart2/source/model/main/Axis \
+ chart2/source/model/main/GridProperties \
+ chart2/source/model/main/BaseCoordinateSystem \
+ chart2/source/model/main/CartesianCoordinateSystem \
+ chart2/source/model/main/ChartModel \
+ chart2/source/model/main/ChartModel_Persistence \
+ chart2/source/model/main/DataPoint \
+ chart2/source/model/main/DataPointProperties \
+ chart2/source/model/main/DataSeries \
+ chart2/source/model/main/Diagram \
+ chart2/source/model/main/DataSeriesProperties \
+ chart2/source/model/main/FormattedString \
+ chart2/source/model/main/Legend \
+ chart2/source/model/main/PageBackground \
+ chart2/source/model/main/PolarCoordinateSystem \
+ chart2/source/model/main/StockBar \
+ chart2/source/model/main/Title \
+ chart2/source/model/main/Wall \
+ chart2/source/model/main/UndoManager \
+ chart2/source/model/main/_serviceregistration_model \
+ chart2/source/model/template/AreaChartType \
+ chart2/source/model/template/AreaChartTypeTemplate \
+ chart2/source/model/template/BarChartType \
+ chart2/source/model/template/BarChartTypeTemplate \
+ chart2/source/model/template/CandleStickChartType \
+ chart2/source/model/template/ChartType \
+ chart2/source/model/template/ChartTypeManager \
+ chart2/source/model/template/ChartTypeTemplate \
+ chart2/source/model/template/ColumnChartType \
+ chart2/source/model/template/ColumnLineChartTypeTemplate \
+ chart2/source/model/template/DataInterpreter \
+ chart2/source/model/template/FilledNetChartType \
+ chart2/source/model/template/LineChartType \
+ chart2/source/model/template/LineChartTypeTemplate \
+ chart2/source/model/template/NetChartType \
+ chart2/source/model/template/NetChartTypeTemplate \
+ chart2/source/model/template/PieChartType \
+ chart2/source/model/template/PieChartTypeTemplate \
+ chart2/source/model/template/ScatterChartType \
+ chart2/source/model/template/ScatterChartTypeTemplate \
+ chart2/source/model/template/BubbleChartType \
+ chart2/source/model/template/BubbleChartTypeTemplate \
+ chart2/source/model/template/BubbleDataInterpreter \
+ chart2/source/model/template/StockChartTypeTemplate \
+ chart2/source/model/template/StockDataInterpreter \
+ chart2/source/model/template/XYDataInterpreter \
+ chart2/source/model/template/ColumnLineDataInterpreter \
+ chart2/source/model/template/_serviceregistration_charttypes \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_charttools.mk b/main/chart2/Library_charttools.mk
new file mode 100644
index 0000000000..309e11c7ca
--- /dev/null
+++ b/main/chart2/Library_charttools.mk
@@ -0,0 +1,138 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,charttools))
+
+$(eval $(call gb_Library_add_precompiled_header,charttools,$(SRCDIR)/charttools/inc/pch/precompiled_charttools))
+
+$(eval $(call gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
+
+$(eval $(call gb_Library_set_include,charttools,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,charttools, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,charttools,\
+ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,charttools,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ sal \
+ stl \
+ svl \
+ tl \
+ vcl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,charttools,\
+ chart2/source/tools/ErrorBar \
+ chart2/source/tools/TrueGuard \
+ chart2/source/tools/LifeTime \
+ chart2/source/tools/MediaDescriptorHelper \
+ chart2/source/tools/ConfigColorScheme \
+ chart2/source/tools/ColorPerPointHelper \
+ chart2/source/tools/ObjectIdentifier \
+ chart2/source/tools/CachedDataSequence \
+ chart2/source/tools/CommonConverters \
+ chart2/source/tools/DataSeriesHelper \
+ chart2/source/tools/DataSource \
+ chart2/source/tools/DataSourceHelper \
+ chart2/source/tools/DiagramHelper \
+ chart2/source/tools/ExponentialRegressionCurveCalculator \
+ chart2/source/tools/ImplOPropertySet \
+ chart2/source/tools/InternalData \
+ chart2/source/tools/InternalDataProvider \
+ chart2/source/tools/LabeledDataSequence \
+ chart2/source/tools/LinearRegressionCurveCalculator \
+ chart2/source/tools/LogarithmicRegressionCurveCalculator \
+ chart2/source/tools/MeanValueRegressionCurveCalculator \
+ chart2/source/tools/NumberFormatterWrapper \
+ chart2/source/tools/OPropertySet \
+ chart2/source/tools/WrappedPropertySet \
+ chart2/source/tools/WrappedProperty \
+ chart2/source/tools/WrappedIgnoreProperty \
+ chart2/source/tools/WrappedDefaultProperty \
+ chart2/source/tools/WrappedDirectStateProperty \
+ chart2/source/tools/PotentialRegressionCurveCalculator \
+ chart2/source/tools/RegressionCurveHelper \
+ chart2/source/tools/RegressionCurveModel \
+ chart2/source/tools/RelativeSizeHelper \
+ chart2/source/tools/RelativePositionHelper \
+ chart2/source/tools/Scaling \
+ chart2/source/tools/SceneProperties \
+ chart2/source/tools/ThreeDHelper \
+ chart2/source/tools/StatisticsHelper \
+ chart2/source/tools/ChartModelHelper \
+ chart2/source/tools/ChartViewHelper \
+ chart2/source/tools/ChartTypeHelper \
+ chart2/source/tools/AxisHelper \
+ chart2/source/tools/MutexContainer \
+ chart2/source/tools/PropertyHelper \
+ chart2/source/tools/FormattedStringHelper \
+ chart2/source/tools/TitleHelper \
+ chart2/source/tools/LegendHelper \
+ chart2/source/tools/CharacterProperties \
+ chart2/source/tools/LineProperties \
+ chart2/source/tools/FillProperties \
+ chart2/source/tools/UserDefinedProperties \
+ chart2/source/tools/NameContainer \
+ chart2/source/tools/ChartDebugTrace \
+ chart2/source/tools/_serviceregistration_tools \
+ chart2/source/tools/UncachedDataSequence \
+ chart2/source/tools/XMLRangeHelper \
+ chart2/source/tools/ModifyListenerHelper \
+ chart2/source/tools/ModifyListenerCallBack \
+ chart2/source/tools/BaseGFXHelper \
+ chart2/source/tools/ControllerLockGuard \
+ chart2/source/tools/WeakListenerAdapter \
+ chart2/source/tools/ResId \
+ chart2/source/tools/RessourceManager \
+ chart2/source/tools/RangeHighlighter \
+ chart2/source/tools/ReferenceSizeProvider \
+ chart2/source/tools/ExplicitCategoriesProvider \
+ chart2/source/tools/RegressionCurveCalculator \
+ chart2/source/tools/RegressionEquation \
+))
+
+# Disabled:
+# chart2/source/tools/NamedFillProperties
+# chart2/source/tools/NamedLineProperties
+# chart2/source/tools/NamedProperties
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_chartview.mk b/main/chart2/Library_chartview.mk
new file mode 100644
index 0000000000..92a1daa889
--- /dev/null
+++ b/main/chart2/Library_chartview.mk
@@ -0,0 +1,120 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartview))
+
+$(eval $(call gb_Library_add_precompiled_header,chartview,$(SRCDIR)/chart2/inc/pch/precompiled_chartview))
+
+$(eval $(call gb_Library_set_componentfile,chartview,chart2/source/view/chartview))
+
+$(eval $(call gb_Library_set_include,chartview,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/view/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartview, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,chartview,\
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartview,\
+ basegfx \
+ charttools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ sal \
+ sfx \
+ stl \
+ svl \
+ svt \
+ svxcore \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartview,\
+ chart2/source/view/axes/VAxisOrGridBase \
+ chart2/source/view/axes/VAxisBase \
+ chart2/source/view/axes/DateHelper \
+ chart2/source/view/axes/DateScaling \
+ chart2/source/view/axes/Tickmarks \
+ chart2/source/view/axes/Tickmarks_Equidistant \
+ chart2/source/view/axes/Tickmarks_Dates \
+ chart2/source/view/axes/MinimumAndMaximumSupplier \
+ chart2/source/view/axes/ScaleAutomatism \
+ chart2/source/view/axes/VAxisProperties \
+ chart2/source/view/axes/VCartesianAxis \
+ chart2/source/view/axes/VCartesianGrid \
+ chart2/source/view/axes/VCartesianCoordinateSystem \
+ chart2/source/view/axes/VPolarAxis \
+ chart2/source/view/axes/VPolarAngleAxis \
+ chart2/source/view/axes/VPolarRadiusAxis \
+ chart2/source/view/axes/VPolarGrid \
+ chart2/source/view/axes/VPolarCoordinateSystem \
+ chart2/source/view/axes/VCoordinateSystem \
+ chart2/source/view/charttypes/Splines \
+ chart2/source/view/charttypes/CategoryPositionHelper \
+ chart2/source/view/charttypes/BarPositionHelper \
+ chart2/source/view/charttypes/VSeriesPlotter \
+ chart2/source/view/charttypes/BarChart \
+ chart2/source/view/charttypes/PieChart \
+ chart2/source/view/charttypes/AreaChart \
+ chart2/source/view/charttypes/CandleStickChart \
+ chart2/source/view/charttypes/BubbleChart \
+ chart2/source/view/diagram/VDiagram \
+ chart2/source/view/main/ChartItemPool \
+ chart2/source/view/main/DrawModelWrapper \
+ chart2/source/view/main/PropertyMapper \
+ chart2/source/view/main/Stripe \
+ chart2/source/view/main/VLineProperties \
+ chart2/source/view/main/ShapeFactory \
+ chart2/source/view/main/VLegendSymbolFactory \
+ chart2/source/view/main/DataPointSymbolSupplier \
+ chart2/source/view/main/Linear3DTransformation \
+ chart2/source/view/main/VPolarTransformation \
+ chart2/source/view/main/Clipping \
+ chart2/source/view/main/PlottingPositionHelper \
+ chart2/source/view/main/LabelPositionHelper \
+ chart2/source/view/main/PolarLabelPositionHelper \
+ chart2/source/view/main/PlotterBase \
+ chart2/source/view/main/VDataSeries \
+ chart2/source/view/main/VLegend \
+ chart2/source/view/main/VTitle \
+ chart2/source/view/main/ChartView \
+ chart2/source/view/main/_serviceregistration_view \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Makefile b/main/chart2/Makefile
new file mode 100644
index 0000000000..c1d144cbd4
--- /dev/null
+++ b/main/chart2/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/chart2/Module_chart2.mk b/main/chart2/Module_chart2.mk
new file mode 100644
index 0000000000..4c3448ebf0
--- /dev/null
+++ b/main/chart2/Module_chart2.mk
@@ -0,0 +1,35 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,chart2))
+
+$(eval $(call gb_Module_add_targets,chart2,\
+ Library_chartcontroller \
+ Library_chartmodel \
+ Library_chartview \
+ Library_charttools \
+ Package_uiconfig \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/chart2/Package_uiconfig.mk b/main/chart2/Package_uiconfig.mk
new file mode 100644
index 0000000000..b315dc4390
--- /dev/null
+++ b/main/chart2/Package_uiconfig.mk
@@ -0,0 +1,35 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,chart2_uiconfig,$(SRCDIR)/chart2/uiconfig))
+
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/menubar/menubar.xml,menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/standardbar.xml,toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/toolbar.xml,toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/drawbar.xml,toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/starshapes.xml,toolbar/starshapes.xml))
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartcontroller.cxx
similarity index 79%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartcontroller.cxx
index d3fc6303b1..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartcontroller.cxx
@@ -21,19 +21,5 @@
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartcontroller.hxx b/main/chart2/inc/pch/precompiled_chartcontroller.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.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/WrappedTargetException.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/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/XAggregation.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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartmodel.cxx
similarity index 79%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartmodel.cxx
index d3fc6303b1..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartmodel.cxx
@@ -21,19 +21,5 @@
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartmodel.hxx b/main/chart2/inc/pch/precompiled_chartmodel.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartmodel.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.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/WrappedTargetException.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/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/XAggregation.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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_charttools.cxx
similarity index 79%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_charttools.cxx
index d3fc6303b1..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_charttools.cxx
@@ -21,19 +21,5 @@
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_charttools.hxx b/main/chart2/inc/pch/precompiled_charttools.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_charttools.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.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/WrappedTargetException.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/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/XAggregation.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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartview.cxx
similarity index 79%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartview.cxx
index d3fc6303b1..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartview.cxx
@@ -21,19 +21,5 @@
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartview.hxx b/main/chart2/inc/pch/precompiled_chartview.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartview.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.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/WrappedTargetException.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/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/XAggregation.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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/prj/build.lst b/main/chart2/prj/build.lst
index ccf4e1e4e2..46572676b4 100644
--- a/main/chart2/prj/build.lst
+++ b/main/chart2/prj/build.lst
@@ -1,28 +1,2 @@
ch chart2 : offapi offapi L10N:l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
-ch chart2 usr1 - all ch_mkout NULL
-ch chart2\inc nmake - all ch_inc NULL
-ch chart2\source\inc get - all ch_source_inc NULL
-ch chart2\source\inc\chartview get - all ch_source_inc_chartview NULL
-ch chart2\source\tools nmake - all ch_source_tools ch_inc NULL
-ch chart2\source\model nmake - all ch_source_model ch_source_tools ch_source_model_main ch_source_model_template ch_source_model_filter ch_inc NULL
-ch chart2\source\model\main nmake - all ch_source_model_main ch_inc NULL
-ch chart2\source\model\template nmake - all ch_source_model_template ch_inc NULL
-ch chart2\source\model\filter nmake - all ch_source_model_filter ch_inc NULL
-ch chart2\source\view nmake - all ch_source_view ch_source_tools ch_source_view_charttypes ch_source_view_axes ch_source_view_diagram ch_source_view_main ch_inc NULL
-ch chart2\source\view\inc get - all ch_source_view_inc NULL
-ch chart2\source\view\axes nmake - all ch_source_view_axes ch_source_tools ch_inc NULL
-ch chart2\source\view\charttypes nmake - all ch_source_view_charttypes ch_inc NULL
-ch chart2\source\view\diagram nmake - all ch_source_view_diagram ch_inc NULL
-ch chart2\source\view\main nmake - all ch_source_view_main ch_inc NULL
-ch chart2\source\controller nmake - all ch_source_controller ch_source_tools ch_source_view ch_source_controller_drawinglayer ch_source_controller_itemsetwrapper ch_source_controller_dialogs ch_source_controller_main ch_source_controller_chartapiwrapper ch_source_controller_accessibility ch_inc ch_source_controller_menus NULL
-ch chart2\source\controller\inc get - all ch_source_controller_inc NULL
-ch chart2\source\controller\accessibility nmake - all ch_source_controller_accessibility ch_inc NULL
-ch chart2\source\controller\dialogs nmake - all ch_source_controller_dialogs ch_inc NULL
-ch chart2\source\controller\drawinglayer nmake - all ch_source_controller_drawinglayer ch_inc NULL
-ch chart2\source\controller\itemsetwrapper nmake - all ch_source_controller_itemsetwrapper ch_inc NULL
-ch chart2\source\controller\chartapiwrapper nmake - all ch_source_controller_chartapiwrapper ch_inc NULL
-ch chart2\source\controller\main nmake - all ch_source_controller_main ch_inc NULL
-ch chart2\source\controller\menus nmake - all ch_source_controller_menus ch_inc NULL
-ch chart2\prj get - all ch_prj NULL
-ch chart2\qa\complex\chart2 nmake - all ch_qa_complex NULL
-ch chart2\qa\unoapi nmake - all ch_qa_unoapi NULL
+ch chart2\prj nmake - all ch_mkout NULL
diff --git a/main/chart2/prj/d.lst b/main/chart2/prj/d.lst
index bf1085336c..e69de29bb2 100644
--- a/main/chart2/prj/d.lst
+++ b/main/chart2/prj/d.lst
@@ -1,27 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*.rdb
-
-..\uiconfig\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar\*.xml
-..\uiconfig\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar\*.xml
-..\uiconfig\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\chart2
-..\%__SRC%\misc\chartcontroller.component %_DEST%\xml%_EXT%\chartcontroller.component
-..\%__SRC%\misc\chartmodel.component %_DEST%\xml%_EXT%\chartmodel.component
-..\%__SRC%\misc\charttools.component %_DEST%\xml%_EXT%\charttools.component
-..\%__SRC%\misc\chartview.component %_DEST%\xml%_EXT%\chartview.component
diff --git a/main/chart2/prj/makefile.mk b/main/chart2/prj/makefile.mk
new file mode 100644
index 0000000000..353f9e0db1
--- /dev/null
+++ b/main/chart2/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index af6bd1f676..5b8e31b847 100644
--- a/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccStatisticsObject.hxx"
#include <vcl/svapp.hxx>
diff --git a/main/chart2/source/controller/accessibility/AccessibleBase.cxx b/main/chart2/source/controller/accessibility/AccessibleBase.cxx
index f80ef72028..d18addb3a4 100644
--- a/main/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleBase.hxx"
#include "AccessibleChartShape.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 84ee0c3435..51dc72b0c0 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartElement.hxx"
#include "CharacterProperties.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 4979c740c7..e1ac7d4133 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartShape.hxx"
#include "ObjectHierarchy.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartView.cxx b/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
index d98357e12e..6da95174ef 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartView.hxx"
#include "chartview/ExplicitValueProvider.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index d0495e61c3..7aa8157467 100644
--- a/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleTextHelper.hxx"
#include "DrawViewWrapper.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 4ecd9d0b39..bc57e785f6 100644
--- a/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleViewForwarder.hxx"
#include "AccessibleChartView.hxx"
diff --git a/main/chart2/source/controller/accessibility/ChartElementFactory.cxx b/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
index 9547ee83fd..1039d44247 100644
--- a/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartElementFactory.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index e28ef6a22e..95cb774980 100644
--- a/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AreaWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index c746a0edb0..4df5a4e2f1 100644
--- a/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AxisWrapper.hxx"
#include "AxisHelper.hxx"
#include "TitleHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index ad727dc110..61b2397e11 100644
--- a/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "Chart2ModelContact.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 123a267910..67b3fa1a2e 100644
--- a/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDataWrapper.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 9b9405bb41..69ba20686a 100644
--- a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDocumentWrapper.hxx"
#include "macros.hxx"
#include "servicenames.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index b6e5796018..a164c12734 100644
--- a/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataSeriesPointWrapper.hxx"
#include "macros.hxx"
#include "RegressionCurveHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index a12aa3f852..c105406c20 100644
--- a/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DiagramWrapper.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 04299845c8..a82cd4a7a3 100644
--- a/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "GridWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 9414e71bd9..133b72f448 100644
--- a/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "LegendWrapper.hxx"
#include "macros.hxx"
#include "Chart2ModelContact.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index b0975e1815..4e1f1106e1 100644
--- a/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MinMaxLineWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index cd2382ae8c..1363bb5f91 100644
--- a/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleWrapper.hxx"
#include "macros.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 546a9b3a2c..4161edadf3 100644
--- a/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UpDownBarWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index a0ee9fe56c..87602ac80e 100644
--- a/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WallFloorWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index f323edf7b4..466eb4460e 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAddInProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 8f7bd1594c..31f0390e9a 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAutomaticPositionProperties.hxx"
#include "FastPropertyIdRanges.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 369a902259..d9dc2227ce 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAxisAndGridExistenceProperties.hxx"
#include "AxisHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 23300a781f..693df2f8cf 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedCharacterHeightProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index d3cf721900..3f4d5dee5e 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedDataCaptionProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 7070a1eb5e..937f36739a 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedGapwidthProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 20431fc492..645a3a981c 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedNumberFormatProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 6a034ea0f0..f05dd8bc15 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedScaleProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 194e56aefc..5bb14a1354 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedScaleTextProperties.hxx"
#include "FastPropertyIdRanges.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index eb97fc7e0b..b042dc7db9 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSceneProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 636874960f..41e4edc5f8 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSeriesAreaOrLineProperty.hxx"
#include "DataSeriesPointWrapper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index bd6bf184cc..d9126169d6 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSplineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index deade42473..cbe52f9de3 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedStatisticProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index ddf1226fa9..3fbe040fe5 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedStockProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 8ad19ffc29..2d19a5989d 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSymbolProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index e3de762bd8..d55e97e259 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedTextRotationProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/dialogs/ChangingResource.cxx b/main/chart2/source/controller/dialogs/ChangingResource.cxx
index 9025d8fae1..14ca4cc933 100644
--- a/main/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/main/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChangingResource.hxx"
diff --git a/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 3d0f703412..a7133384cf 100644
--- a/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartTypeDialogController.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/DataBrowser.cxx b/main/chart2/source/controller/dialogs/DataBrowser.cxx
index e34029d7af..61893f610e 100644
--- a/main/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/main/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
// header for class SvNumberformat
#ifndef _ZFORMAT_HXX
diff --git a/main/chart2/source/controller/dialogs/DataBrowserModel.cxx b/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 179bb4c8f4..a21eeb6084 100644
--- a/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataBrowserModel.hxx"
#include "DialogModel.hxx"
diff --git a/main/chart2/source/controller/dialogs/DialogModel.cxx b/main/chart2/source/controller/dialogs/DialogModel.cxx
index 0960f9179e..5e64a5fd09 100644
--- a/main/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/main/chart2/source/controller/dialogs/DialogModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DialogModel.hxx"
#include "RangeSelectionHelper.hxx"
diff --git a/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index d1ce7c0aff..dbd092c5c3 100644
--- a/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ObjectNameProvider.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeEdit.cxx b/main/chart2/source/controller/dialogs/RangeEdit.cxx
index b2f33b5fd5..208be4a552 100644
--- a/main/chart2/source/controller/dialogs/RangeEdit.cxx
+++ b/main/chart2/source/controller/dialogs/RangeEdit.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeEdit.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 1cc412bb31..baf3a243f0 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionButton.hxx"
#include "Bitmaps.hrc"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 518c95d247..01be9e6226 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionHelper.hxx"
#include "RangeSelectionListener.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index 9b84fdf3ea..6ec3a6f353 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionListener.hxx"
diff --git a/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 9d512e8f7a..fee40fcb7c 100644
--- a/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TextDirectionListBox.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index 8dfbc12d1f..09e9142249 100644
--- a/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TimerTriggeredControllerLock.hxx"
diff --git a/main/chart2/source/controller/dialogs/TitleDialogData.cxx b/main/chart2/source/controller/dialogs/TitleDialogData.cxx
index fc7516e461..cc416e0f05 100644
--- a/main/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/main/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleDialogData.hxx"
#include "TitleHelper.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ChartType.cxx b/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 63fbb2b841..055b14dff6 100644
--- a/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ChartType.hxx"
#include "dlg_ChartType.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 66fa775f25..c816a2ba7a 100644
--- a/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ChartType_UNO.hxx"
#include "dlg_ChartType.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 6231233096..8cd21e114f 100644
--- a/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_CreationWizard.hxx"
#include "dlg_CreationWizard.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index f022a70991..eba57ddfc9 100644
--- a/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_CreationWizard_UNO.hxx"
#include "dlg_CreationWizard.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 696e7adaf8..3cc965c9a3 100644
--- a/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_DataEditor.hxx"
#include "dlg_DataEditor.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_DataSource.cxx b/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
index c37952f030..27094a8cce 100644
--- a/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_DataSource.hxx"
#include "dlg_DataSource.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 2c76b4eefc..63ab5fe70a 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertAxis_Grid.hxx"
#include "dlg_InsertAxis_Grid.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 45e19bd119..77e1e7618c 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertDataLabel.hxx"
#include "dlg_InsertDataLabel.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index a29be7afaa..fd74e6fae1 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertErrorBars.hxx"
#include "dlg_InsertErrorBars.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index e520e8bec4..eb58a82b9f 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertLegend.hxx"
#include "dlg_InsertLegend.hrc"
#include "res_LegendPosition.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 7f68894318..d13fcad780 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTitle.hxx"
#include "dlg_InsertTitle.hrc"
#include "res_Titles.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
index 21ed054537..46af1b3655 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTrendline.hxx"
#include "dlg_InsertTrendline.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 32fc30423e..f1429b354c 100644
--- a/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_NumberFormat.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 254c46944b..41aa2b9f64 100644
--- a/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#ifndef _ZFORLIST_HXX
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
diff --git a/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index 22d848651e..36349fb0ec 100644
--- a/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ShapeFont.hxx"
#include "ViewElementListProvider.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 70dd3135f9..86885f8a32 100644
--- a/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ShapeParagraph.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_View3D.cxx b/main/chart2/source/controller/dialogs/dlg_View3D.cxx
index dd8b176924..8fbe68e3b9 100644
--- a/main/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_View3D.hxx"
#include "dlg_View3D.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_BarGeometry.cxx b/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 70f1fd447f..05b857953b 100644
--- a/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_BarGeometry.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_DataLabel.cxx b/main/chart2/source/controller/dialogs/res_DataLabel.cxx
index 8901dd24db..a737e2c661 100644
--- a/main/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_DataLabel.hxx"
#include "res_DataLabel_IDs.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_ErrorBar.cxx b/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
index c44c6a8c99..5edd8738ca 100644
--- a/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_ErrorBar.hxx"
#include "res_ErrorBar_IDs.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_LegendPosition.cxx b/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 487791ddd3..c2628db745 100644
--- a/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_LegendPosition.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_TextSeparator.cxx b/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 43accc1874..e3c026148e 100644
--- a/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_TextSeparator.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_Titles.cxx b/main/chart2/source/controller/dialogs/res_Titles.cxx
index 5ef36ff179..fd2a1ed908 100644
--- a/main/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/main/chart2/source/controller/dialogs/res_Titles.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_Titles.hxx"
#include "res_Titles.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_Trendline.cxx b/main/chart2/source/controller/dialogs/res_Trendline.cxx
index fa60145695..aa08ba6452 100644
--- a/main/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/main/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTrendline.hrc"
#include "res_Trendline.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index e64056e603..8189be1e82 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneAppearance.hxx"
#include "tp_3D_SceneAppearance.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 98c7070853..0b608d227d 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneGeometry.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index c9f9a7c2f2..7f651af45d 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneIllumination.hxx"
#include "tp_3D_SceneIllumination.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 603f3d0203..9217598554 100644
--- a/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_AxisLabel.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9427715e89..a8bcd3d755 100644
--- a/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_AxisPositions.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_ChartType.cxx b/main/chart2/source/controller/dialogs/tp_ChartType.cxx
index 01b4305368..ca5b50f7b8 100644
--- a/main/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/main/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_ChartType.hxx"
#include "tp_ChartType.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataLabel.cxx b/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 3dab8bd798..3f93e523bb 100644
--- a/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataLabel.hxx"
#include "TabPages.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataSource.cxx b/main/chart2/source/controller/dialogs/tp_DataSource.cxx
index 20b8e096f5..f2bcd9e1ee 100644
--- a/main/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataSource.hxx"
#include "tp_DataSource.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index b230907ed7..2b3ee74af3 100644
--- a/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataSourceControls.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index ddb93cc7c0..21a3c9d653 100644
--- a/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_ErrorBars.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 1121e2badd..00b19db93a 100644
--- a/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_LegendPosition.hxx"
#include "ResId.hxx"
#include "TabPages.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_Location.cxx b/main/chart2/source/controller/dialogs/tp_Location.cxx
index caade929fc..1194ca2974 100644
--- a/main/chart2/source/controller/dialogs/tp_Location.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Location.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Location.hxx"
#include "tp_Location.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 9a27581684..e785632aca 100644
--- a/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_PointGeometry.hxx"
#include "TabPages.hrc"
#include "res_BarGeometry.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index ebb9481781..aa6b6bb863 100644
--- a/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_PolarOptions.hxx"
#include "tp_PolarOptions.hrc"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 6c3e5431c0..93d2286c04 100644
--- a/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_RangeChooser.hxx"
#include "tp_RangeChooser.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_Scale.cxx b/main/chart2/source/controller/dialogs/tp_Scale.cxx
index cdbad736e6..9cf115ba90 100644
--- a/main/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Scale.hxx"
#include "tp_Scale.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index da9a23b1b9..0222423821 100644
--- a/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_SeriesToAxis.hxx"
#include "tp_SeriesToAxis.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 57bd458fb7..ac88f38d5d 100644
--- a/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_TitleRotation.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_Trendline.cxx b/main/chart2/source/controller/dialogs/tp_Trendline.cxx
index 5949a23cb0..4c58908405 100644
--- a/main/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Trendline.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 9fcf126d24..45c4d45d23 100644
--- a/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Wizard_TitlesAndObjects.hxx"
#include "tp_Wizard_TitlesAndObjects.hrc"
diff --git a/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 467f941dfc..af7bbbc888 100644
--- a/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DrawViewWrapper.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "ConfigurationAccess.hxx"
diff --git a/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 6ce7705396..2f5de93a5b 100644
--- a/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ViewElementListProvider.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "chartview/DataPointSymbolSupplier.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index e247da4005..a61085c9d8 100644
--- a/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AxisItemConverter.hxx"
#include "ItemPropertyMap.hxx"
#include "CharacterPropertyItemConverter.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 301bdff9fa..22ae3a2338 100644
--- a/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CharacterPropertyItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 08acd10964..cdd1c1e5dd 100644
--- a/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataPointItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 3752f32a9c..3e8a479db3 100644
--- a/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ErrorBarItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 190d53aaae..30a178a324 100644
--- a/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "GraphicPropertyItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 3f2e297ea0..3ebe106055 100644
--- a/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ItemConverter.hxx"
#include "macros.hxx"
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 6b2d096b2c..cd5694d649 100644
--- a/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "LegendItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 24aa2558f5..5aa777bc54 100644
--- a/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MultipleChartConverters.hxx"
#include "chartview/ChartSfxItemIds.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index 4f95669f4a..0dcd25e693 100644
--- a/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MultipleItemConverter.hxx"
#include "ItemPropertyMap.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 9d7fc293d6..c72fd62bcd 100644
--- a/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RegressionCurveHelper.hxx"
#include "RegressionCurveItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index b3f21a1540..545b421e17 100644
--- a/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RegressionEquationItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 67ef13dbb0..dd4f5a6efb 100644
--- a/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "SeriesOptionsItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 1cb7a32386..eb285cdaa8 100644
--- a/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "StatisticsItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 9f47985782..822c3bdaac 100644
--- a/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController.cxx b/main/chart2/source/controller/main/ChartController.cxx
index cec9b48bae..d9e1bdcd19 100644
--- a/main/chart2/source/controller/main/ChartController.cxx
+++ b/main/chart2/source/controller/main/ChartController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "servicenames.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_EditData.cxx b/main/chart2/source/controller/main/ChartController_EditData.cxx
index d2e9fe17b5..b8d4cc2f33 100644
--- a/main/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/main/chart2/source/controller/main/ChartController_EditData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Insert.cxx b/main/chart2/source/controller/main/ChartController_Insert.cxx
index fc9b85fdec..7e815bf825 100644
--- a/main/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/main/chart2/source/controller/main/ChartController_Insert.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "dlg_InsertAxis_Grid.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Position.cxx b/main/chart2/source/controller/main/ChartController_Position.cxx
index 1ad25b5c6b..8ce31204ea 100644
--- a/main/chart2/source/controller/main/ChartController_Position.cxx
+++ b/main/chart2/source/controller/main/ChartController_Position.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Properties.cxx b/main/chart2/source/controller/main/ChartController_Properties.cxx
index 9c004529ab..82467c6367 100644
--- a/main/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/main/chart2/source/controller/main/ChartController_Properties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartWindow.hxx"
#include "chartview/DrawModelWrapper.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_TextEdit.cxx b/main/chart2/source/controller/main/ChartController_TextEdit.cxx
index fae7650623..26f7adf6cb 100644
--- a/main/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/main/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Tools.cxx b/main/chart2/source/controller/main/ChartController_Tools.cxx
index 227fa28e22..f0cb49760f 100644
--- a/main/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/main/chart2/source/controller/main/ChartController_Tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartWindow.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Window.cxx b/main/chart2/source/controller/main/ChartController_Window.cxx
index c472de4765..20b2145930 100644
--- a/main/chart2/source/controller/main/ChartController_Window.cxx
+++ b/main/chart2/source/controller/main/ChartController_Window.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "PositionAndSizeHelper.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/main/ChartDropTargetHelper.cxx b/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
index b1e840f82c..64c66d34d2 100644
--- a/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDropTargetHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartFrameloader.cxx b/main/chart2/source/controller/main/ChartFrameloader.cxx
index 592087d568..7cfae18969 100644
--- a/main/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/main/chart2/source/controller/main/ChartFrameloader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartFrameloader.hxx"
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartModelClone.cxx b/main/chart2/source/controller/main/ChartModelClone.cxx
index fe3827011f..1fd3b17541 100644
--- a/main/chart2/source/controller/main/ChartModelClone.cxx
+++ b/main/chart2/source/controller/main/ChartModelClone.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartModelClone.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartTransferable.cxx b/main/chart2/source/controller/main/ChartTransferable.cxx
index 59363e3990..4e3a66ef70 100644
--- a/main/chart2/source/controller/main/ChartTransferable.cxx
+++ b/main/chart2/source/controller/main/ChartTransferable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartTransferable.hxx"
diff --git a/main/chart2/source/controller/main/ChartWindow.cxx b/main/chart2/source/controller/main/ChartWindow.cxx
index 3d655e07aa..dea4686db6 100644
--- a/main/chart2/source/controller/main/ChartWindow.cxx
+++ b/main/chart2/source/controller/main/ChartWindow.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartWindow.hxx"
#include "ChartController.hxx"
#include "HelpIds.hrc"
diff --git a/main/chart2/source/controller/main/CommandDispatch.cxx b/main/chart2/source/controller/main/CommandDispatch.cxx
index fe81bcdc21..45906d5f18 100644
--- a/main/chart2/source/controller/main/CommandDispatch.cxx
+++ b/main/chart2/source/controller/main/CommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CommandDispatch.hxx"
#include "CommonFunctors.hxx"
diff --git a/main/chart2/source/controller/main/CommandDispatchContainer.cxx b/main/chart2/source/controller/main/CommandDispatchContainer.cxx
index 297ff3d4d4..8878f98abb 100644
--- a/main/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/main/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CommandDispatchContainer.hxx"
#include "UndoCommandDispatch.hxx"
diff --git a/main/chart2/source/controller/main/ConfigurationAccess.cxx b/main/chart2/source/controller/main/ConfigurationAccess.cxx
index 51d213b12c..557348b740 100644
--- a/main/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/main/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ConfigurationAccess.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ControllerCommandDispatch.cxx b/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
index d0f181f066..637313eb1b 100644
--- a/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ControllerCommandDispatch.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_Base.cxx b/main/chart2/source/controller/main/DragMethod_Base.cxx
index e8fdcb32d7..c738406f55 100644
--- a/main/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/main/chart2/source/controller/main/DragMethod_Base.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_Base.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_PieSegment.cxx b/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 93901a8e5e..7d04cc30b0 100644
--- a/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_PieSegment.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index dacef473d6..05376c5f0b 100644
--- a/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_RotateDiagram.hxx"
#include "SelectionHelper.hxx"
diff --git a/main/chart2/source/controller/main/DrawCommandDispatch.cxx b/main/chart2/source/controller/main/DrawCommandDispatch.cxx
index 793a7331ac..a8c5badcd4 100644
--- a/main/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DrawCommandDispatch.hxx"
#include "DrawCommandDispatch.hrc"
diff --git a/main/chart2/source/controller/main/ElementSelector.cxx b/main/chart2/source/controller/main/ElementSelector.cxx
index 89587fb85a..f5b0145ade 100644
--- a/main/chart2/source/controller/main/ElementSelector.cxx
+++ b/main/chart2/source/controller/main/ElementSelector.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ElementSelector.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 61bdf4e810..9ac3671734 100644
--- a/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "FeatureCommandDispatchBase.hxx"
diff --git a/main/chart2/source/controller/main/ObjectHierarchy.cxx b/main/chart2/source/controller/main/ObjectHierarchy.cxx
index 0b00bc4637..67e822d5dc 100644
--- a/main/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/main/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ObjectHierarchy.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/main/PositionAndSizeHelper.cxx b/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 186298f7b2..25f7a1d576 100644
--- a/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "PositionAndSizeHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/SelectionHelper.cxx b/main/chart2/source/controller/main/SelectionHelper.cxx
index c9730d8861..4c9e4f4d3b 100644
--- a/main/chart2/source/controller/main/SelectionHelper.cxx
+++ b/main/chart2/source/controller/main/SelectionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "SelectionHelper.hxx"
#include "ObjectIdentifier.hxx"
//for C2U
diff --git a/main/chart2/source/controller/main/ShapeController.cxx b/main/chart2/source/controller/main/ShapeController.cxx
index d679e2a1db..665580fc4a 100644
--- a/main/chart2/source/controller/main/ShapeController.cxx
+++ b/main/chart2/source/controller/main/ShapeController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ShapeController.hxx"
#include "ShapeController.hrc"
diff --git a/main/chart2/source/controller/main/ShapeToolbarController.cxx b/main/chart2/source/controller/main/ShapeToolbarController.cxx
index 785c4aa670..07f3fb111c 100644
--- a/main/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/main/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ShapeToolbarController.hxx"
diff --git a/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 387fa73686..1c26827ff3 100644
--- a/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "StatusBarCommandDispatch.hxx"
#include "ObjectNameProvider.hxx"
diff --git a/main/chart2/source/controller/main/UndoActions.cxx b/main/chart2/source/controller/main/UndoActions.cxx
index 8ecde0b8aa..bd36aeaa9a 100644
--- a/main/chart2/source/controller/main/UndoActions.cxx
+++ b/main/chart2/source/controller/main/UndoActions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoActions.hxx"
#include "DisposeHelper.hxx"
diff --git a/main/chart2/source/controller/main/UndoCommandDispatch.cxx b/main/chart2/source/controller/main/UndoCommandDispatch.cxx
index 8ed0033f5d..8f795480ff 100644
--- a/main/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoCommandDispatch.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/UndoGuard.cxx b/main/chart2/source/controller/main/UndoGuard.cxx
index 6ebbac2968..3d8373dd5d 100644
--- a/main/chart2/source/controller/main/UndoGuard.cxx
+++ b/main/chart2/source/controller/main/UndoGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoGuard.hxx"
#include "ChartModelClone.hxx"
diff --git a/main/chart2/source/controller/main/_serviceregistration_controller.cxx b/main/chart2/source/controller/main/_serviceregistration_controller.cxx
index 7ba82ab972..204959e48f 100644
--- a/main/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/main/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartFrameloader.hxx"
#include "dlg_CreationWizard_UNO.hxx"
diff --git a/main/chart2/source/model/filter/XMLFilter.cxx b/main/chart2/source/model/filter/XMLFilter.cxx
index 51d860791b..5e4c5d6abb 100644
--- a/main/chart2/source/model/filter/XMLFilter.cxx
+++ b/main/chart2/source/model/filter/XMLFilter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "XMLFilter.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/Axis.cxx b/main/chart2/source/model/main/Axis.cxx
index 02852fe211..4d3014879f 100644
--- a/main/chart2/source/model/main/Axis.cxx
+++ b/main/chart2/source/model/main/Axis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Axis.hxx"
#include "GridProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/BaseCoordinateSystem.cxx b/main/chart2/source/model/main/BaseCoordinateSystem.cxx
index ff0025bb4d..cc1737f82f 100644
--- a/main/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BaseCoordinateSystem.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/CartesianCoordinateSystem.cxx b/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 6f504c7a74..524f7ccd54 100644
--- a/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "CartesianCoordinateSystem.hxx"
#include "macros.hxx"
#include "servicenames_coosystems.hxx"
diff --git a/main/chart2/source/model/main/ChartModel.cxx b/main/chart2/source/model/main/ChartModel.cxx
index 1f8049f303..296c694dd9 100644
--- a/main/chart2/source/model/main/ChartModel.cxx
+++ b/main/chart2/source/model/main/ChartModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartModel.hxx"
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/model/main/ChartModel_Persistence.cxx b/main/chart2/source/model/main/ChartModel_Persistence.cxx
index 33f46a8749..a894eca7cf 100644
--- a/main/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/main/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartModel.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/model/main/DataPoint.cxx b/main/chart2/source/model/main/DataPoint.cxx
index a187b8de8b..e16afea9c4 100644
--- a/main/chart2/source/model/main/DataPoint.cxx
+++ b/main/chart2/source/model/main/DataPoint.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataPoint.hxx"
#include "DataPointProperties.hxx"
#include "CharacterProperties.hxx"
diff --git a/main/chart2/source/model/main/DataPointProperties.cxx b/main/chart2/source/model/main/DataPointProperties.cxx
index d890f0f515..9b5ca59bed 100644
--- a/main/chart2/source/model/main/DataPointProperties.cxx
+++ b/main/chart2/source/model/main/DataPointProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataPointProperties.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/DataSeries.cxx b/main/chart2/source/model/main/DataSeries.cxx
index 1436e4aff2..b2aee0d313 100644
--- a/main/chart2/source/model/main/DataSeries.cxx
+++ b/main/chart2/source/model/main/DataSeries.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataSeries.hxx"
#include "DataSeriesProperties.hxx"
#include "DataPointProperties.hxx"
diff --git a/main/chart2/source/model/main/DataSeriesProperties.cxx b/main/chart2/source/model/main/DataSeriesProperties.cxx
index 92f0096b32..53535c1452 100644
--- a/main/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/main/chart2/source/model/main/DataSeriesProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataSeriesProperties.hxx"
#include "DataPointProperties.hxx"
#include "DataPoint.hxx"
diff --git a/main/chart2/source/model/main/Diagram.cxx b/main/chart2/source/model/main/Diagram.cxx
index d26169b4cb..f046703b4d 100644
--- a/main/chart2/source/model/main/Diagram.cxx
+++ b/main/chart2/source/model/main/Diagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Diagram.hxx"
#include "macros.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/model/main/FormattedString.cxx b/main/chart2/source/model/main/FormattedString.cxx
index f9505180e9..70b8549bcf 100644
--- a/main/chart2/source/model/main/FormattedString.cxx
+++ b/main/chart2/source/model/main/FormattedString.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "FormattedString.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/model/main/GridProperties.cxx b/main/chart2/source/model/main/GridProperties.cxx
index bd24d22e35..4195d0b227 100644
--- a/main/chart2/source/model/main/GridProperties.cxx
+++ b/main/chart2/source/model/main/GridProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "GridProperties.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/LayoutContainer.cxx b/main/chart2/source/model/main/LayoutContainer.cxx
index 254330e820..2e37e89d89 100644
--- a/main/chart2/source/model/main/LayoutContainer.cxx
+++ b/main/chart2/source/model/main/LayoutContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LayoutContainer.hxx"
#include "macros.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/model/main/Legend.cxx b/main/chart2/source/model/main/Legend.cxx
index 37386bf306..3e979d0f4b 100644
--- a/main/chart2/source/model/main/Legend.cxx
+++ b/main/chart2/source/model/main/Legend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Legend.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/PageBackground.cxx b/main/chart2/source/model/main/PageBackground.cxx
index 350c322a4f..05b7e9af33 100644
--- a/main/chart2/source/model/main/PageBackground.cxx
+++ b/main/chart2/source/model/main/PageBackground.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PageBackground.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/PolarCoordinateSystem.cxx b/main/chart2/source/model/main/PolarCoordinateSystem.cxx
index 90bf95ec51..6982b0dba3 100644
--- a/main/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PolarCoordinateSystem.hxx"
#include "macros.hxx"
#include "servicenames_coosystems.hxx"
diff --git a/main/chart2/source/model/main/StockBar.cxx b/main/chart2/source/model/main/StockBar.cxx
index 23d5798e48..982388ff82 100644
--- a/main/chart2/source/model/main/StockBar.cxx
+++ b/main/chart2/source/model/main/StockBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockBar.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/Title.cxx b/main/chart2/source/model/main/Title.cxx
index 937f6fadc9..3d1c494f1b 100644
--- a/main/chart2/source/model/main/Title.cxx
+++ b/main/chart2/source/model/main/Title.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Title.hxx"
#include "macros.hxx"
#include "FormattedString.hxx"
diff --git a/main/chart2/source/model/main/UndoManager.cxx b/main/chart2/source/model/main/UndoManager.cxx
index 5b6b65f988..06489f3b31 100644
--- a/main/chart2/source/model/main/UndoManager.cxx
+++ b/main/chart2/source/model/main/UndoManager.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "UndoManager.hxx"
#include "ChartViewHelper.hxx"
diff --git a/main/chart2/source/model/main/Wall.cxx b/main/chart2/source/model/main/Wall.cxx
index 47b884f324..b0ba52970d 100644
--- a/main/chart2/source/model/main/Wall.cxx
+++ b/main/chart2/source/model/main/Wall.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Wall.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/_serviceregistration_model.cxx b/main/chart2/source/model/main/_serviceregistration_model.cxx
index 93536e8171..86ab2e825a 100644
--- a/main/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/main/chart2/source/model/main/_serviceregistration_model.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include <cppuhelper/implementationentry.hxx>
#ifndef _CHARTMODEL_HXX
#include "ChartModel.hxx"
diff --git a/main/chart2/source/model/template/AreaChartType.cxx b/main/chart2/source/model/template/AreaChartType.cxx
index f027330238..98eaaa2d73 100644
--- a/main/chart2/source/model/template/AreaChartType.cxx
+++ b/main/chart2/source/model/template/AreaChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "AreaChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/AreaChartTypeTemplate.cxx b/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 77d51239e6..0f4fe9c2cd 100644
--- a/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "AreaChartTypeTemplate.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/BarChartType.cxx b/main/chart2/source/model/template/BarChartType.cxx
index 9f06ffc209..ded5042e2a 100644
--- a/main/chart2/source/model/template/BarChartType.cxx
+++ b/main/chart2/source/model/template/BarChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BarChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/BarChartTypeTemplate.cxx b/main/chart2/source/model/template/BarChartTypeTemplate.cxx
index 62bb9b4a07..7eed909c96 100644
--- a/main/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BarChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/model/template/BubbleChartType.cxx b/main/chart2/source/model/template/BubbleChartType.cxx
index 6bc8c19357..082b22b1c2 100644
--- a/main/chart2/source/model/template/BubbleChartType.cxx
+++ b/main/chart2/source/model/template/BubbleChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 250294d7c8..436f1f3e80 100644
--- a/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleChartTypeTemplate.hxx"
#include "macros.hxx"
#include "BubbleDataInterpreter.hxx"
diff --git a/main/chart2/source/model/template/BubbleDataInterpreter.cxx b/main/chart2/source/model/template/BubbleDataInterpreter.cxx
index df3bc39c51..5f6cf7ea2d 100644
--- a/main/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/main/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/CandleStickChartType.cxx b/main/chart2/source/model/template/CandleStickChartType.cxx
index eb4b74089a..1fb0f5d001 100644
--- a/main/chart2/source/model/template/CandleStickChartType.cxx
+++ b/main/chart2/source/model/template/CandleStickChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "CandleStickChartType.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/model/template/ChartType.cxx b/main/chart2/source/model/template/ChartType.cxx
index ce6a4dbf35..b10050cf7f 100644
--- a/main/chart2/source/model/template/ChartType.cxx
+++ b/main/chart2/source/model/template/ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartType.hxx"
#include "PropertyHelper.hxx"
#include "CommonFunctors.hxx"
diff --git a/main/chart2/source/model/template/ChartTypeManager.cxx b/main/chart2/source/model/template/ChartTypeManager.cxx
index a09c7e9bac..262e9bbb9e 100644
--- a/main/chart2/source/model/template/ChartTypeManager.cxx
+++ b/main/chart2/source/model/template/ChartTypeManager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartTypeManager.hxx"
#include "macros.hxx"
#include "StackMode.hxx"
diff --git a/main/chart2/source/model/template/ChartTypeTemplate.cxx b/main/chart2/source/model/template/ChartTypeTemplate.cxx
index 813d32b778..1d8df36b71 100644
--- a/main/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartTypeTemplate.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/ColumnChartType.cxx b/main/chart2/source/model/template/ColumnChartType.cxx
index 5b5ce0f570..d4c1818221 100644
--- a/main/chart2/source/model/template/ColumnChartType.cxx
+++ b/main/chart2/source/model/template/ColumnChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 8abbc883c3..5ded715e46 100644
--- a/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnLineChartTypeTemplate.hxx"
#include "macros.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 9b70151cad..440c347882 100644
--- a/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnLineDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/DataInterpreter.cxx b/main/chart2/source/model/template/DataInterpreter.cxx
index a4f074469b..bb2b756a05 100644
--- a/main/chart2/source/model/template/DataInterpreter.cxx
+++ b/main/chart2/source/model/template/DataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/FilledNetChartType.cxx b/main/chart2/source/model/template/FilledNetChartType.cxx
index 223b164142..a9287d3aa7 100644
--- a/main/chart2/source/model/template/FilledNetChartType.cxx
+++ b/main/chart2/source/model/template/FilledNetChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "FilledNetChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/LineChartType.cxx b/main/chart2/source/model/template/LineChartType.cxx
index ccdebdcb47..d88c778a03 100644
--- a/main/chart2/source/model/template/LineChartType.cxx
+++ b/main/chart2/source/model/template/LineChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LineChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/LineChartTypeTemplate.cxx b/main/chart2/source/model/template/LineChartTypeTemplate.cxx
index 7e1bd57c03..dc569b58bd 100644
--- a/main/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LineChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/model/template/NetChartType.cxx b/main/chart2/source/model/template/NetChartType.cxx
index f43070519c..4aaf9d0990 100644
--- a/main/chart2/source/model/template/NetChartType.cxx
+++ b/main/chart2/source/model/template/NetChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "NetChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/NetChartTypeTemplate.cxx b/main/chart2/source/model/template/NetChartTypeTemplate.cxx
index a5ff815974..468eef10ba 100644
--- a/main/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "NetChartTypeTemplate.hxx"
#include "macros.hxx"
#include "PolarCoordinateSystem.hxx"
diff --git a/main/chart2/source/model/template/PieChartType.cxx b/main/chart2/source/model/template/PieChartType.cxx
index c4edf07472..9027977146 100644
--- a/main/chart2/source/model/template/PieChartType.cxx
+++ b/main/chart2/source/model/template/PieChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PieChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/PieChartTypeTemplate.cxx b/main/chart2/source/model/template/PieChartTypeTemplate.cxx
index 3b277648f2..b921390abf 100644
--- a/main/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PieChartTypeTemplate.hxx"
#include "macros.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/model/template/ScatterChartType.cxx b/main/chart2/source/model/template/ScatterChartType.cxx
index 398556ed5e..4681ed78fe 100644
--- a/main/chart2/source/model/template/ScatterChartType.cxx
+++ b/main/chart2/source/model/template/ScatterChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ScatterChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 4ae94bf4e4..2b6571e3fe 100644
--- a/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ScatterChartTypeTemplate.hxx"
#include "macros.hxx"
#include "XYDataInterpreter.hxx"
diff --git a/main/chart2/source/model/template/StockChartTypeTemplate.cxx b/main/chart2/source/model/template/StockChartTypeTemplate.cxx
index 45c3399ac4..bccf736d4b 100644
--- a/main/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DataSeriesHelper.hxx"
diff --git a/main/chart2/source/model/template/StockDataInterpreter.cxx b/main/chart2/source/model/template/StockDataInterpreter.cxx
index f2a85ae7f2..707ba25866 100644
--- a/main/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/main/chart2/source/model/template/StockDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/XYDataInterpreter.cxx b/main/chart2/source/model/template/XYDataInterpreter.cxx
index dede445c29..36fa06e1f5 100644
--- a/main/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/main/chart2/source/model/template/XYDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "XYDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/_serviceregistration_charttypes.cxx b/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
index 86be87789d..b578c7ea46 100644
--- a/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ b/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "_serviceregistration_charttypes.hxx"
diff --git a/main/chart2/source/tools/AxisHelper.cxx b/main/chart2/source/tools/AxisHelper.cxx
index 912957fb2a..b2eae4d6e0 100644
--- a/main/chart2/source/tools/AxisHelper.cxx
+++ b/main/chart2/source/tools/AxisHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "AxisHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/BaseGFXHelper.cxx b/main/chart2/source/tools/BaseGFXHelper.cxx
index f8d7e00ea9..97c842bff9 100644
--- a/main/chart2/source/tools/BaseGFXHelper.cxx
+++ b/main/chart2/source/tools/BaseGFXHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "BaseGFXHelper.hxx"
#include <com/sun/star/drawing/DoubleSequence.hpp>
diff --git a/main/chart2/source/tools/CachedDataSequence.cxx b/main/chart2/source/tools/CachedDataSequence.cxx
index 19610386f9..afa49c6f8d 100644
--- a/main/chart2/source/tools/CachedDataSequence.cxx
+++ b/main/chart2/source/tools/CachedDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CachedDataSequence.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/CharacterProperties.cxx b/main/chart2/source/tools/CharacterProperties.cxx
index a9c93607db..1db2c82bc1 100644
--- a/main/chart2/source/tools/CharacterProperties.cxx
+++ b/main/chart2/source/tools/CharacterProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CharacterProperties.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ChartDebugTrace.cxx b/main/chart2/source/tools/ChartDebugTrace.cxx
index d831724d07..7bc6adae43 100644
--- a/main/chart2/source/tools/ChartDebugTrace.cxx
+++ b/main/chart2/source/tools/ChartDebugTrace.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartDebugTrace.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ChartModelHelper.cxx b/main/chart2/source/tools/ChartModelHelper.cxx
index 6d2222d576..8ef9dd0388 100644
--- a/main/chart2/source/tools/ChartModelHelper.cxx
+++ b/main/chart2/source/tools/ChartModelHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartModelHelper.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ChartTypeHelper.cxx b/main/chart2/source/tools/ChartTypeHelper.cxx
index 75fa301958..53df1a04be 100644
--- a/main/chart2/source/tools/ChartTypeHelper.cxx
+++ b/main/chart2/source/tools/ChartTypeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartTypeHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ChartViewHelper.cxx b/main/chart2/source/tools/ChartViewHelper.cxx
index ff884b8f0e..e67b8058d6 100644
--- a/main/chart2/source/tools/ChartViewHelper.cxx
+++ b/main/chart2/source/tools/ChartViewHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartViewHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ColorPerPointHelper.cxx b/main/chart2/source/tools/ColorPerPointHelper.cxx
index b23ed6afbb..2a01f18193 100644
--- a/main/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/main/chart2/source/tools/ColorPerPointHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ColorPerPointHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/CommonConverters.cxx b/main/chart2/source/tools/CommonConverters.cxx
index 6b938ca59f..7c1842739e 100644
--- a/main/chart2/source/tools/CommonConverters.cxx
+++ b/main/chart2/source/tools/CommonConverters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CommonConverters.hxx"
#include <com/sun/star/drawing/DoubleSequence.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
diff --git a/main/chart2/source/tools/ConfigColorScheme.cxx b/main/chart2/source/tools/ConfigColorScheme.cxx
index beb5e52f12..8b04dcdbb8 100644
--- a/main/chart2/source/tools/ConfigColorScheme.cxx
+++ b/main/chart2/source/tools/ConfigColorScheme.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ConfigColorScheme.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/tools/ControllerLockGuard.cxx b/main/chart2/source/tools/ControllerLockGuard.cxx
index e5e6f225ea..b42b4f29bf 100644
--- a/main/chart2/source/tools/ControllerLockGuard.cxx
+++ b/main/chart2/source/tools/ControllerLockGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ControllerLockGuard.hxx"
diff --git a/main/chart2/source/tools/DataSeriesHelper.cxx b/main/chart2/source/tools/DataSeriesHelper.cxx
index b039529842..f02433359d 100644
--- a/main/chart2/source/tools/DataSeriesHelper.cxx
+++ b/main/chart2/source/tools/DataSeriesHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSeriesHelper.hxx"
#include "DiagramHelper.hxx"
#include "DataSource.hxx"
diff --git a/main/chart2/source/tools/DataSource.cxx b/main/chart2/source/tools/DataSource.cxx
index acfcb551cd..29f25792eb 100644
--- a/main/chart2/source/tools/DataSource.cxx
+++ b/main/chart2/source/tools/DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSource.hxx"
#include "LabeledDataSequence.hxx"
diff --git a/main/chart2/source/tools/DataSourceHelper.cxx b/main/chart2/source/tools/DataSourceHelper.cxx
index 1a61ac3386..c22529f015 100644
--- a/main/chart2/source/tools/DataSourceHelper.cxx
+++ b/main/chart2/source/tools/DataSourceHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSourceHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/DiagramHelper.cxx b/main/chart2/source/tools/DiagramHelper.cxx
index bc1d764489..ddc344621b 100644
--- a/main/chart2/source/tools/DiagramHelper.cxx
+++ b/main/chart2/source/tools/DiagramHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DiagramHelper.hxx"
#include "LegendHelper.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/tools/ErrorBar.cxx b/main/chart2/source/tools/ErrorBar.cxx
index 48545493a9..98bc6e027c 100644
--- a/main/chart2/source/tools/ErrorBar.cxx
+++ b/main/chart2/source/tools/ErrorBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ErrorBar.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/ExplicitCategoriesProvider.cxx b/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 558e0bdf96..2663f736fd 100644
--- a/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ExplicitCategoriesProvider.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 26cd8f6c2b..6ed37ea869 100644
--- a/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ExponentialRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/FillProperties.cxx b/main/chart2/source/tools/FillProperties.cxx
index 687e599803..2339913307 100644
--- a/main/chart2/source/tools/FillProperties.cxx
+++ b/main/chart2/source/tools/FillProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "FillProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/FormattedStringHelper.cxx b/main/chart2/source/tools/FormattedStringHelper.cxx
index 36db14c1aa..dc345da866 100644
--- a/main/chart2/source/tools/FormattedStringHelper.cxx
+++ b/main/chart2/source/tools/FormattedStringHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "FormattedStringHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ImplOPropertySet.cxx b/main/chart2/source/tools/ImplOPropertySet.cxx
index e83152268a..408a7458be 100644
--- a/main/chart2/source/tools/ImplOPropertySet.cxx
+++ b/main/chart2/source/tools/ImplOPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ImplOPropertySet.hxx"
#include "CloneHelper.hxx"
diff --git a/main/chart2/source/tools/InternalData.cxx b/main/chart2/source/tools/InternalData.cxx
index 0f7cb48c26..6a80e19a76 100644
--- a/main/chart2/source/tools/InternalData.cxx
+++ b/main/chart2/source/tools/InternalData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "InternalData.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/tools/InternalDataProvider.cxx b/main/chart2/source/tools/InternalDataProvider.cxx
index b89d8f1c24..4779e8431d 100644
--- a/main/chart2/source/tools/InternalDataProvider.cxx
+++ b/main/chart2/source/tools/InternalDataProvider.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include <rtl/math.hxx>
#include <valarray>
diff --git a/main/chart2/source/tools/LabeledDataSequence.cxx b/main/chart2/source/tools/LabeledDataSequence.cxx
index 491b0bd958..2863a68c85 100644
--- a/main/chart2/source/tools/LabeledDataSequence.cxx
+++ b/main/chart2/source/tools/LabeledDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LabeledDataSequence.hxx"
#include "ModifyListenerHelper.hxx"
diff --git a/main/chart2/source/tools/LegendHelper.cxx b/main/chart2/source/tools/LegendHelper.cxx
index 779a7a90c4..94cf127130 100644
--- a/main/chart2/source/tools/LegendHelper.cxx
+++ b/main/chart2/source/tools/LegendHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LegendHelper.hxx"
#include "macros.hxx"
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
diff --git a/main/chart2/source/tools/LifeTime.cxx b/main/chart2/source/tools/LifeTime.cxx
index 61580d2a94..bffa1344ce 100644
--- a/main/chart2/source/tools/LifeTime.cxx
+++ b/main/chart2/source/tools/LifeTime.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LifeTime.hxx"
#include "macros.hxx"
#include <osl/diagnose.h>
diff --git a/main/chart2/source/tools/LineProperties.cxx b/main/chart2/source/tools/LineProperties.cxx
index 5c36d75338..db301632ea 100644
--- a/main/chart2/source/tools/LineProperties.cxx
+++ b/main/chart2/source/tools/LineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LineProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 918beedc5a..74405ade44 100644
--- a/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LinearRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 24bd95196f..4c3e80d152 100644
--- a/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LogarithmicRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 3a3b99ce8e..9bd76ac195 100644
--- a/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MeanValueRegressionCurveCalculator.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/MediaDescriptorHelper.cxx b/main/chart2/source/tools/MediaDescriptorHelper.cxx
index 9f085c1c03..095c5c2063 100644
--- a/main/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/main/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MediaDescriptorHelper.hxx"
using namespace ::com::sun::star;
diff --git a/main/chart2/source/tools/ModifyListenerCallBack.cxx b/main/chart2/source/tools/ModifyListenerCallBack.cxx
index 3d9d37f580..9ccb1e7577 100644
--- a/main/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/main/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ModifyListenerCallBack.hxx"
#include "MutexContainer.hxx"
diff --git a/main/chart2/source/tools/ModifyListenerHelper.cxx b/main/chart2/source/tools/ModifyListenerHelper.cxx
index cf02c2bd6f..8bb385a039 100644
--- a/main/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/main/chart2/source/tools/ModifyListenerHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ModifyListenerHelper.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/source/tools/MutexContainer.cxx
index d3fc6303b1..1ac94f6e88 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/source/tools/MutexContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MutexContainer.hxx"
namespace chart
diff --git a/main/chart2/source/tools/NameContainer.cxx b/main/chart2/source/tools/NameContainer.cxx
index d7428976eb..c8d2af3158 100644
--- a/main/chart2/source/tools/NameContainer.cxx
+++ b/main/chart2/source/tools/NameContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NameContainer.hxx"
diff --git a/main/chart2/source/tools/NamedFillProperties.cxx b/main/chart2/source/tools/NamedFillProperties.cxx
index 044813b984..1f12330d99 100644
--- a/main/chart2/source/tools/NamedFillProperties.cxx
+++ b/main/chart2/source/tools/NamedFillProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedFillProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NamedLineProperties.cxx b/main/chart2/source/tools/NamedLineProperties.cxx
index 2505ad675f..10a0f86ab1 100644
--- a/main/chart2/source/tools/NamedLineProperties.cxx
+++ b/main/chart2/source/tools/NamedLineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedLineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NamedProperties.cxx b/main/chart2/source/tools/NamedProperties.cxx
index 0c95340000..85442fe626 100644
--- a/main/chart2/source/tools/NamedProperties.cxx
+++ b/main/chart2/source/tools/NamedProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NumberFormatterWrapper.cxx b/main/chart2/source/tools/NumberFormatterWrapper.cxx
index a87aecc7b2..c64c74bbdf 100644
--- a/main/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/main/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NumberFormatterWrapper.hxx"
#include "macros.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/main/chart2/source/tools/OPropertySet.cxx b/main/chart2/source/tools/OPropertySet.cxx
index f13b831695..887fa2b62d 100644
--- a/main/chart2/source/tools/OPropertySet.cxx
+++ b/main/chart2/source/tools/OPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "OPropertySet.hxx"
#include "ImplOPropertySet.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/tools/ObjectIdentifier.cxx b/main/chart2/source/tools/ObjectIdentifier.cxx
index e38bb1d01f..5414c4eb7f 100644
--- a/main/chart2/source/tools/ObjectIdentifier.cxx
+++ b/main/chart2/source/tools/ObjectIdentifier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ObjectIdentifier.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 301080497d..7b7bd92606 100644
--- a/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "PotentialRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/PropertyHelper.cxx b/main/chart2/source/tools/PropertyHelper.cxx
index 85be4f2a95..70b2af41ff 100644
--- a/main/chart2/source/tools/PropertyHelper.cxx
+++ b/main/chart2/source/tools/PropertyHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "PropertyHelper.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/RangeHighlighter.cxx b/main/chart2/source/tools/RangeHighlighter.cxx
index 3271b8cb81..bd95026430 100644
--- a/main/chart2/source/tools/RangeHighlighter.cxx
+++ b/main/chart2/source/tools/RangeHighlighter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RangeHighlighter.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/ReferenceSizeProvider.cxx b/main/chart2/source/tools/ReferenceSizeProvider.cxx
index c0239c07a3..22c6badbee 100644
--- a/main/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/main/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ReferenceSizeProvider.hxx"
#include "RelativeSizeHelper.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveCalculator.cxx b/main/chart2/source/tools/RegressionCurveCalculator.cxx
index e5a44056d6..fb213939d3 100644
--- a/main/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveCalculator.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveHelper.cxx b/main/chart2/source/tools/RegressionCurveHelper.cxx
index 30d3ed7925..c3b2f92ddd 100644
--- a/main/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/main/chart2/source/tools/RegressionCurveHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveHelper.hxx"
#include "MeanValueRegressionCurveCalculator.hxx"
#include "LinearRegressionCurveCalculator.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveModel.cxx b/main/chart2/source/tools/RegressionCurveModel.cxx
index 7506628aa9..f6fbae27ac 100644
--- a/main/chart2/source/tools/RegressionCurveModel.cxx
+++ b/main/chart2/source/tools/RegressionCurveModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveModel.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/RegressionEquation.cxx b/main/chart2/source/tools/RegressionEquation.cxx
index 6167c7b11e..3eb0a10ce5 100644
--- a/main/chart2/source/tools/RegressionEquation.cxx
+++ b/main/chart2/source/tools/RegressionEquation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionEquation.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/RelativePositionHelper.cxx b/main/chart2/source/tools/RelativePositionHelper.cxx
index 19210d67b9..eebb0cfda9 100644
--- a/main/chart2/source/tools/RelativePositionHelper.cxx
+++ b/main/chart2/source/tools/RelativePositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RelativePositionHelper.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/tools/RelativeSizeHelper.cxx b/main/chart2/source/tools/RelativeSizeHelper.cxx
index ac43fc1320..0c9de339fe 100644
--- a/main/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/main/chart2/source/tools/RelativeSizeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RelativeSizeHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ResId.cxx b/main/chart2/source/tools/ResId.cxx
index a2048ad803..b3b52b84fe 100644
--- a/main/chart2/source/tools/ResId.cxx
+++ b/main/chart2/source/tools/ResId.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ResId.hxx"
#include "RessourceManager.hxx"
diff --git a/main/chart2/source/tools/RessourceManager.cxx b/main/chart2/source/tools/RessourceManager.cxx
index 4097e354ad..9aea4438b8 100644
--- a/main/chart2/source/tools/RessourceManager.cxx
+++ b/main/chart2/source/tools/RessourceManager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RessourceManager.hxx"
diff --git a/main/chart2/source/tools/Scaling.cxx b/main/chart2/source/tools/Scaling.cxx
index dbd96aea8d..7248fbc207 100644
--- a/main/chart2/source/tools/Scaling.cxx
+++ b/main/chart2/source/tools/Scaling.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "Scaling.hxx"
#include <rtl/math.hxx>
#include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/main/chart2/source/tools/SceneProperties.cxx b/main/chart2/source/tools/SceneProperties.cxx
index 4e88348666..a6c60a512e 100644
--- a/main/chart2/source/tools/SceneProperties.cxx
+++ b/main/chart2/source/tools/SceneProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "SceneProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/StatisticsHelper.cxx b/main/chart2/source/tools/StatisticsHelper.cxx
index 73b50e0d71..a8d0821556 100644
--- a/main/chart2/source/tools/StatisticsHelper.cxx
+++ b/main/chart2/source/tools/StatisticsHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "StatisticsHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "ErrorBar.hxx"
diff --git a/main/chart2/source/tools/ThreeDHelper.cxx b/main/chart2/source/tools/ThreeDHelper.cxx
index e0d794a918..b8f7398ce9 100644
--- a/main/chart2/source/tools/ThreeDHelper.cxx
+++ b/main/chart2/source/tools/ThreeDHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ThreeDHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/TitleHelper.cxx b/main/chart2/source/tools/TitleHelper.cxx
index 27def16744..607d277ecb 100644
--- a/main/chart2/source/tools/TitleHelper.cxx
+++ b/main/chart2/source/tools/TitleHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "TitleHelper.hxx"
#include "ChartModelHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/TrueGuard.cxx b/main/chart2/source/tools/TrueGuard.cxx
index 9bc662730d..42f1bf7eed 100644
--- a/main/chart2/source/tools/TrueGuard.cxx
+++ b/main/chart2/source/tools/TrueGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "TrueGuard.hxx"
diff --git a/main/chart2/source/tools/UncachedDataSequence.cxx b/main/chart2/source/tools/UncachedDataSequence.cxx
index 782dfb0b82..05fe8f9257 100644
--- a/main/chart2/source/tools/UncachedDataSequence.cxx
+++ b/main/chart2/source/tools/UncachedDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "UncachedDataSequence.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/UserDefinedProperties.cxx b/main/chart2/source/tools/UserDefinedProperties.cxx
index c47b373077..7ab7fc2663 100644
--- a/main/chart2/source/tools/UserDefinedProperties.cxx
+++ b/main/chart2/source/tools/UserDefinedProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "UserDefinedProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/WeakListenerAdapter.cxx b/main/chart2/source/tools/WeakListenerAdapter.cxx
index 167084d041..f0cc156a5b 100644
--- a/main/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/main/chart2/source/tools/WeakListenerAdapter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/WrappedDefaultProperty.cxx b/main/chart2/source/tools/WrappedDefaultProperty.cxx
index 1c89339cd6..de5dea8799 100644
--- a/main/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/main/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedDefaultProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedDirectStateProperty.cxx b/main/chart2/source/tools/WrappedDirectStateProperty.cxx
index e17b18922c..e6c9b6e4ae 100644
--- a/main/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/main/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedDirectStateProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedIgnoreProperty.cxx b/main/chart2/source/tools/WrappedIgnoreProperty.cxx
index 6a4baae017..97241c5b68 100644
--- a/main/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/main/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedIgnoreProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedProperty.cxx b/main/chart2/source/tools/WrappedProperty.cxx
index b8c3561efd..46f990ccf4 100644
--- a/main/chart2/source/tools/WrappedProperty.cxx
+++ b/main/chart2/source/tools/WrappedProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedPropertySet.cxx b/main/chart2/source/tools/WrappedPropertySet.cxx
index f978ebe2ae..67f997c552 100644
--- a/main/chart2/source/tools/WrappedPropertySet.cxx
+++ b/main/chart2/source/tools/WrappedPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedPropertySet.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/XMLRangeHelper.cxx b/main/chart2/source/tools/XMLRangeHelper.cxx
index ddd53262c5..8447224daa 100644
--- a/main/chart2/source/tools/XMLRangeHelper.cxx
+++ b/main/chart2/source/tools/XMLRangeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "XMLRangeHelper.hxx"
#include <unotools/charclass.hxx>
diff --git a/main/chart2/source/tools/_serviceregistration_tools.cxx b/main/chart2/source/tools/_serviceregistration_tools.cxx
index 999fffa12a..6e284c804c 100644
--- a/main/chart2/source/tools/_serviceregistration_tools.cxx
+++ b/main/chart2/source/tools/_serviceregistration_tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include <cppuhelper/implementationentry.hxx>
#include "LabeledDataSequence.hxx"
#include "CachedDataSequence.hxx"
diff --git a/main/chart2/source/view/axes/DateHelper.cxx b/main/chart2/source/view/axes/DateHelper.cxx
index d9de5e76c8..6f2b98cf62 100644
--- a/main/chart2/source/view/axes/DateHelper.cxx
+++ b/main/chart2/source/view/axes/DateHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "DateHelper.hxx"
#include "DateScaling.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/DateScaling.cxx b/main/chart2/source/view/axes/DateScaling.cxx
index bb79492788..d64cde9ce0 100644
--- a/main/chart2/source/view/axes/DateScaling.cxx
+++ b/main/chart2/source/view/axes/DateScaling.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "DateScaling.hxx"
#include <com/sun/star/chart/TimeUnit.hpp>
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 92d12b6056..029274fc51 100644
--- a/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "MinimumAndMaximumSupplier.hxx"
diff --git a/main/chart2/source/view/axes/ScaleAutomatism.cxx b/main/chart2/source/view/axes/ScaleAutomatism.cxx
index a2f909e0af..1b87685cad 100644
--- a/main/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/main/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ScaleAutomatism.hxx"
#include "macros.hxx"
#include "Tickmarks_Equidistant.hxx"
diff --git a/main/chart2/source/view/axes/TickmarkHelper.cxx b/main/chart2/source/view/axes/TickmarkHelper.cxx
index c8951c7db2..82f5aa1dc4 100644
--- a/main/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/main/chart2/source/view/axes/TickmarkHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "TickmarkHelper.hxx"
#include "ViewDefines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/Tickmarks.cxx b/main/chart2/source/view/axes/Tickmarks.cxx
index af69330ae7..cf9197961d 100644
--- a/main/chart2/source/view/axes/Tickmarks.cxx
+++ b/main/chart2/source/view/axes/Tickmarks.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks.hxx"
#include "Tickmarks_Equidistant.hxx"
#include "Tickmarks_Dates.hxx"
diff --git a/main/chart2/source/view/axes/Tickmarks_Dates.cxx b/main/chart2/source/view/axes/Tickmarks_Dates.cxx
index ed32adc5fa..5a93349321 100644
--- a/main/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/main/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks_Dates.hxx"
#include "DateScaling.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index bf26342dff..9cc50ab36d 100644
--- a/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks_Equidistant.hxx"
#include "ViewDefines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/VAxisBase.cxx b/main/chart2/source/view/axes/VAxisBase.cxx
index d1d864a999..6aa3169d0d 100644
--- a/main/chart2/source/view/axes/VAxisBase.cxx
+++ b/main/chart2/source/view/axes/VAxisBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisBase.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/axes/VAxisOrGridBase.cxx b/main/chart2/source/view/axes/VAxisOrGridBase.cxx
index 831091ff9d..c079569749 100644
--- a/main/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/main/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisOrGridBase.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/axes/VAxisProperties.cxx b/main/chart2/source/view/axes/VAxisProperties.cxx
index e89f3ce208..a196937679 100644
--- a/main/chart2/source/view/axes/VAxisProperties.cxx
+++ b/main/chart2/source/view/axes/VAxisProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisProperties.hxx"
#include "macros.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianAxis.cxx b/main/chart2/source/view/axes/VCartesianAxis.cxx
index addac858fc..be361f1523 100644
--- a/main/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/main/chart2/source/view/axes/VCartesianAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <basegfx/numeric/ftools.hxx>
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 7125bec78c..20a90c57fc 100644
--- a/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCartesianCoordinateSystem.hxx"
#include "VCartesianGrid.hxx"
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianGrid.cxx b/main/chart2/source/view/axes/VCartesianGrid.cxx
index f28cd9d092..91d0ec667b 100644
--- a/main/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/main/chart2/source/view/axes/VCartesianGrid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCartesianGrid.hxx"
#include "Tickmarks.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/axes/VCoordinateSystem.cxx b/main/chart2/source/view/axes/VCoordinateSystem.cxx
index b8d2ccf082..9d0d454c2e 100644
--- a/main/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCoordinateSystem.hxx"
#include "VCartesianCoordinateSystem.hxx"
#include "VPolarCoordinateSystem.hxx"
diff --git a/main/chart2/source/view/axes/VPolarAngleAxis.cxx b/main/chart2/source/view/axes/VPolarAngleAxis.cxx
index a85e91ebd2..3390c44b38 100644
--- a/main/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <basegfx/numeric/ftools.hxx>
#include "VPolarAngleAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarAxis.cxx b/main/chart2/source/view/axes/VPolarAxis.cxx
index d9de46d538..d25ecdbaea 100644
--- a/main/chart2/source/view/axes/VPolarAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarAxis.hxx"
#include "VPolarAngleAxis.hxx"
#include "VPolarRadiusAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 997e10c1d8..3d930976f5 100644
--- a/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarCoordinateSystem.hxx"
#include "VPolarGrid.hxx"
#include "VPolarAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarGrid.cxx b/main/chart2/source/view/axes/VPolarGrid.cxx
index 721a88de31..9048f39621 100644
--- a/main/chart2/source/view/axes/VPolarGrid.cxx
+++ b/main/chart2/source/view/axes/VPolarGrid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarGrid.hxx"
#include "VCartesianGrid.hxx"
#include "Tickmarks.hxx"
diff --git a/main/chart2/source/view/axes/VPolarRadiusAxis.cxx b/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 66cfff8d94..c9bd75c2fd 100644
--- a/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarRadiusAxis.hxx"
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/charttypes/AreaChart.cxx b/main/chart2/source/view/charttypes/AreaChart.cxx
index 94cdb1dd58..efa9fed819 100644
--- a/main/chart2/source/view/charttypes/AreaChart.cxx
+++ b/main/chart2/source/view/charttypes/AreaChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "AreaChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/BarChart.cxx b/main/chart2/source/view/charttypes/BarChart.cxx
index d1fe0dd344..8387123f4c 100644
--- a/main/chart2/source/view/charttypes/BarChart.cxx
+++ b/main/chart2/source/view/charttypes/BarChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BarChart.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/charttypes/BarPositionHelper.cxx b/main/chart2/source/view/charttypes/BarPositionHelper.cxx
index eb3f487db4..79494cff78 100644
--- a/main/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/main/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BarPositionHelper.hxx"
#include "Linear3DTransformation.hxx"
diff --git a/main/chart2/source/view/charttypes/BubbleChart.cxx b/main/chart2/source/view/charttypes/BubbleChart.cxx
index 53e118d195..ac25997ad0 100644
--- a/main/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/main/chart2/source/view/charttypes/BubbleChart.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BubbleChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/CandleStickChart.cxx b/main/chart2/source/view/charttypes/CandleStickChart.cxx
index bdf3b5a048..76068bb41c 100644
--- a/main/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/main/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "CandleStickChart.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 98f7dca9de..d582a742d2 100644
--- a/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "CategoryPositionHelper.hxx"
//.............................................................................
diff --git a/main/chart2/source/view/charttypes/PieChart.cxx b/main/chart2/source/view/charttypes/PieChart.cxx
index e588d03735..79f3893b8a 100644
--- a/main/chart2/source/view/charttypes/PieChart.cxx
+++ b/main/chart2/source/view/charttypes/PieChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PieChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/Splines.cxx b/main/chart2/source/view/charttypes/Splines.cxx
index d4e87cf596..3bbb66be52 100644
--- a/main/chart2/source/view/charttypes/Splines.cxx
+++ b/main/chart2/source/view/charttypes/Splines.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Splines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/charttypes/VSeriesPlotter.cxx b/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
index d0a43ae978..b0b1669104 100644
--- a/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VSeriesPlotter.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/diagram/VDiagram.cxx b/main/chart2/source/view/diagram/VDiagram.cxx
index a079f0d597..25c891f7fe 100644
--- a/main/chart2/source/view/diagram/VDiagram.cxx
+++ b/main/chart2/source/view/diagram/VDiagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VDiagram.hxx"
#include "PropertyMapper.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/ChartItemPool.cxx b/main/chart2/source/view/main/ChartItemPool.cxx
index 4ef1ba7dce..8a835e85c1 100644
--- a/main/chart2/source/view/main/ChartItemPool.cxx
+++ b/main/chart2/source/view/main/ChartItemPool.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ChartItemPool.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/ChartView.cxx b/main/chart2/source/view/main/ChartView.cxx
index 08df485a7e..bc38db3a25 100644
--- a/main/chart2/source/view/main/ChartView.cxx
+++ b/main/chart2/source/view/main/ChartView.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ChartView.hxx"
#include "chartview/DrawModelWrapper.hxx"
diff --git a/main/chart2/source/view/main/Clipping.cxx b/main/chart2/source/view/main/Clipping.cxx
index 939abe6ff5..178392c2b5 100644
--- a/main/chart2/source/view/main/Clipping.cxx
+++ b/main/chart2/source/view/main/Clipping.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Clipping.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/view/main/DataPointSymbolSupplier.cxx b/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
index 087f831dd7..ceae06734f 100644
--- a/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "chartview/DataPointSymbolSupplier.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/main/DrawModelWrapper.cxx b/main/chart2/source/view/main/DrawModelWrapper.cxx
index 5e5aef29bb..0dd1987cb4 100644
--- a/main/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/main/chart2/source/view/main/DrawModelWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/LabelPositionHelper.cxx b/main/chart2/source/view/main/LabelPositionHelper.cxx
index 25c7c96456..eab04ba702 100644
--- a/main/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/main/chart2/source/view/main/LabelPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "LabelPositionHelper.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/main/Linear3DTransformation.cxx b/main/chart2/source/view/main/Linear3DTransformation.cxx
index 547765be41..fef1ddd232 100644
--- a/main/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/main/chart2/source/view/main/Linear3DTransformation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Linear3DTransformation.hxx"
#include <algorithm>
diff --git a/main/chart2/source/view/main/PlotterBase.cxx b/main/chart2/source/view/main/PlotterBase.cxx
index 338551d4a1..2371f51227 100644
--- a/main/chart2/source/view/main/PlotterBase.cxx
+++ b/main/chart2/source/view/main/PlotterBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PlotterBase.hxx"
#include "PlottingPositionHelper.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/main/PlottingPositionHelper.cxx b/main/chart2/source/view/main/PlottingPositionHelper.cxx
index 52a075a501..27e33328a4 100644
--- a/main/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/main/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PlottingPositionHelper.hxx"
#include "CommonConverters.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/PolarLabelPositionHelper.cxx b/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
index 82b5f4ab94..af9dc5bbb4 100644
--- a/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PolarLabelPositionHelper.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/main/PropertyMapper.cxx b/main/chart2/source/view/main/PropertyMapper.cxx
index b21f6aae76..adfbffbf68 100644
--- a/main/chart2/source/view/main/PropertyMapper.cxx
+++ b/main/chart2/source/view/main/PropertyMapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PropertyMapper.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/ShapeFactory.cxx b/main/chart2/source/view/main/ShapeFactory.cxx
index b6ed6c9f65..af2be5fd15 100644
--- a/main/chart2/source/view/main/ShapeFactory.cxx
+++ b/main/chart2/source/view/main/ShapeFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ShapeFactory.hxx"
#include "ViewDefines.hxx"
#include "Stripe.hxx"
diff --git a/main/chart2/source/view/main/Stripe.cxx b/main/chart2/source/view/main/Stripe.cxx
index 9f69827b75..c2666f7bc2 100644
--- a/main/chart2/source/view/main/Stripe.cxx
+++ b/main/chart2/source/view/main/Stripe.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Stripe.hxx"
#include "CommonConverters.hxx"
#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
diff --git a/main/chart2/source/view/main/VDataSeries.cxx b/main/chart2/source/view/main/VDataSeries.cxx
index 53ff3ea5d3..556f2567e1 100644
--- a/main/chart2/source/view/main/VDataSeries.cxx
+++ b/main/chart2/source/view/main/VDataSeries.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VDataSeries.hxx"
#include "ObjectIdentifier.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/VLegend.cxx b/main/chart2/source/view/main/VLegend.cxx
index a9869be96d..2e7238ceba 100644
--- a/main/chart2/source/view/main/VLegend.cxx
+++ b/main/chart2/source/view/main/VLegend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLegend.hxx"
#include "macros.hxx"
#include "PropertyMapper.hxx"
diff --git a/main/chart2/source/view/main/VLegendSymbolFactory.cxx b/main/chart2/source/view/main/VLegendSymbolFactory.cxx
index 6addb7f3d5..77de5c2f81 100644
--- a/main/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/main/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLegendSymbolFactory.hxx"
#include "macros.hxx"
#include "PropertyMapper.hxx"
diff --git a/main/chart2/source/view/main/VLineProperties.cxx b/main/chart2/source/view/main/VLineProperties.cxx
index a582dba262..fcb132cf74 100644
--- a/main/chart2/source/view/main/VLineProperties.cxx
+++ b/main/chart2/source/view/main/VLineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/VPolarTransformation.cxx b/main/chart2/source/view/main/VPolarTransformation.cxx
index 9128eadf57..b73c2d8c8b 100644
--- a/main/chart2/source/view/main/VPolarTransformation.cxx
+++ b/main/chart2/source/view/main/VPolarTransformation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarTransformation.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/VTitle.cxx b/main/chart2/source/view/main/VTitle.cxx
index 41c85592ff..64cdc198ae 100644
--- a/main/chart2/source/view/main/VTitle.cxx
+++ b/main/chart2/source/view/main/VTitle.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VTitle.hxx"
#include "CommonConverters.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/_serviceregistration_view.cxx b/main/chart2/source/view/main/_serviceregistration_view.cxx
index a36afd8d84..8e4c273c87 100644
--- a/main/chart2/source/view/main/_serviceregistration_view.cxx
+++ b/main/chart2/source/view/main/_serviceregistration_view.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <cppuhelper/implementationentry.hxx>
#include "ChartView.hxx"
(openoffice) 18/27: Fix Win64 compatibility issues with the ADO database driver.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 24cfd890cd12252bfd1776fd49975d832b495337
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 14:47:50 2025 +0200
Fix Win64 compatibility issues with the ADO database driver.
Patch by: me
---
.../source/drivers/ado/APreparedStatement.cxx | 6 ++++--
main/connectivity/source/drivers/ado/AResultSet.cxx | 6 ++++--
main/connectivity/source/drivers/ado/AStatement.cxx | 12 +++++++-----
main/connectivity/source/drivers/ado/Awrapado.cxx | 20 ++++++++++----------
main/connectivity/source/inc/ado/Awrapado.hxx | 14 +++++++-------
5 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/main/connectivity/source/drivers/ado/APreparedStatement.cxx b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
index cd6dbec237..94630d6f94 100644
--- a/main/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -306,10 +306,12 @@ m_xMetaData.clear();
OLEVariant aCon;
aCon.setNoArg();
CHECK_RETURN(m_RecordSet.put_CacheSize(m_nFetchSize))
- CHECK_RETURN(m_RecordSet.put_MaxRecords(m_nMaxRows))
+ sal_IntPtr maxRows = m_nMaxRows;
+ CHECK_RETURN(m_RecordSet.put_MaxRecords(maxRows))
CHECK_RETURN(m_RecordSet.Open(aCmd,aCon,m_eCursorType,m_eLockType,adOpenUnspecified))
CHECK_RETURN(m_RecordSet.get_CacheSize(m_nFetchSize))
- CHECK_RETURN(m_RecordSet.get_MaxRecords(m_nMaxRows))
+ CHECK_RETURN(m_RecordSet.get_MaxRecords(maxRows))
+ m_nMaxRows = maxRows;
CHECK_RETURN(m_RecordSet.get_CursorType(m_eCursorType))
CHECK_RETURN(m_RecordSet.get_LockType(m_eLockType))
diff --git a/main/connectivity/source/drivers/ado/AResultSet.cxx b/main/connectivity/source/drivers/ado/AResultSet.cxx
index 5bd22c8c90..58d574831c 100644
--- a/main/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSet.cxx
@@ -274,7 +274,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException)
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- PositionEnum aPos;
+ sal_IntPtr aPos;
m_pRecordSet->get_AbsolutePosition(&aPos);
return (aPos > 0) ? aPos : m_nRowPos;
// return the rowcount from driver if the driver doesn't support this return our count
@@ -447,7 +447,9 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException)
sal_Bool bRet = SUCCEEDED(m_pRecordSet->MoveLast());
if(bRet)
{
- m_pRecordSet->get_RecordCount(&m_nRowPos);
+ sal_IntPtr rowPos;
+ m_pRecordSet->get_RecordCount(&rowPos);
+ m_nRowPos = rowPos;
m_bOnFirstAfterOpen = sal_False;
}
return bRet;
diff --git a/main/connectivity/source/drivers/ado/AStatement.cxx b/main/connectivity/source/drivers/ado/AStatement.cxx
index 8371a713b0..5faebd565f 100644
--- a/main/connectivity/source/drivers/ado/AStatement.cxx
+++ b/main/connectivity/source/drivers/ado/AStatement.cxx
@@ -304,12 +304,14 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUS
OLEVariant aCon;
aCon.setNoArg();
CHECK_RETURN(aSet.put_CacheSize(m_nFetchSize))
- CHECK_RETURN(aSet.put_MaxRecords(m_nMaxRows))
+ sal_IntPtr maxRows = m_nMaxRows;
+ CHECK_RETURN(aSet.put_MaxRecords(maxRows))
CHECK_RETURN(aSet.Open(aCmd,aCon,m_eCursorType,m_eLockType,adOpenUnspecified))
CHECK_RETURN(aSet.get_CacheSize(m_nFetchSize))
- CHECK_RETURN(aSet.get_MaxRecords(m_nMaxRows))
+ CHECK_RETURN(aSet.get_MaxRecords(maxRows))
+ m_nMaxRows = maxRows;
CHECK_RETURN(aSet.get_CursorType(m_eCursorType))
CHECK_RETURN(aSet.get_LockType(m_eLockType))
@@ -385,7 +387,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException,
{
assignRecordSet( pSet );
- sal_Int32 nValue;
+ sal_IntPtr nValue;
if(m_RecordSet.get_RecordCount(nValue))
pArray[j] = nValue;
}
@@ -438,7 +440,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- sal_Int32 nRet;
+ sal_IntPtr nRet;
if(m_RecordSet.IsValid() && m_RecordSet.get_RecordCount(nRet))
return nRet;
return -1;
@@ -507,7 +509,7 @@ sal_Int32 OStatement_Base::getQueryTimeOut() const throw(SQLException, RuntimeE
//------------------------------------------------------------------------------
sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException)
{
- sal_Int32 nRet=-1;
+ sal_IntPtr nRet=-1;
if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet)))
::dbtools::throwFunctionSequenceException(NULL);
return nRet;
diff --git a/main/connectivity/source/drivers/ado/Awrapado.cxx b/main/connectivity/source/drivers/ado/Awrapado.cxx
index 47846c88c6..9539061da2 100644
--- a/main/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/main/connectivity/source/drivers/ado/Awrapado.cxx
@@ -476,10 +476,10 @@ WpADOProperties WpADOField::get_Properties()
return aProps;
}
- sal_Int32 WpADOField::GetActualSize() const
+sal_IntPtr WpADOField::GetActualSize() const
{
OSL_ENSURE(pInterface,"Interface is null!");
- sal_Int32 nActualSize=0;
+ ADO_LONGPTR nActualSize=0;
pInterface->get_ActualSize(&nActualSize);
return nActualSize;
}
@@ -500,10 +500,10 @@ sal_Int32 WpADOField::GetStatus() const
return eADOSFieldAttributes;
}
-sal_Int32 WpADOField::GetDefinedSize() const
+sal_IntPtr WpADOField::GetDefinedSize() const
{
OSL_ENSURE(pInterface,"Interface is null!");
- sal_Int32 nDefinedSize=0;
+ ADO_LONGPTR nDefinedSize=0;
pInterface->get_DefinedSize(&nDefinedSize);
return nDefinedSize;
}
@@ -629,7 +629,7 @@ OLEVariant WpADOField::GetUnderlyingValue() const
pInterface->put_Type(eType);
}
- sal_Bool WpADOField::PutDefinedSize(sal_Int32 _nDefSize)
+ sal_Bool WpADOField::PutDefinedSize(sal_IntPtr _nDefSize)
{
OSL_ENSURE(pInterface,"Interface is null!");
return (SUCCEEDED(pInterface->put_DefinedSize(_nDefSize)));
@@ -770,10 +770,10 @@ void WpADORecordset::Close()
return bSupports == VARIANT_TRUE;
}
-PositionEnum WpADORecordset::get_AbsolutePosition()
+ sal_IntPtr WpADORecordset::get_AbsolutePosition()
{
OSL_ENSURE(pInterface,"Interface is null!");
- PositionEnum aTemp=adPosUnknown;
+ sal_IntPtr aTemp=adPosUnknown;
pInterface->get_AbsolutePosition(&aTemp);
return aTemp;
}
@@ -892,19 +892,19 @@ WpADOProperties WpADORecordset::get_Properties() const
return SUCCEEDED(pInterface->NextRecordset(&RecordsAffected,ppiRset));
}
- sal_Bool WpADORecordset::get_RecordCount(sal_Int32 &_nRet) const
+ sal_Bool WpADORecordset::get_RecordCount(sal_IntPtr &_nRet) const
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->get_RecordCount(&_nRet));
}
- sal_Bool WpADORecordset::get_MaxRecords(sal_Int32 &_nRet) const
+ sal_Bool WpADORecordset::get_MaxRecords(sal_IntPtr &_nRet) const
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->get_MaxRecords(&_nRet));
}
- sal_Bool WpADORecordset::put_MaxRecords(sal_Int32 _nRet)
+ sal_Bool WpADORecordset::put_MaxRecords(sal_IntPtr _nRet)
{
OSL_ENSURE(pInterface,"Interface is null!");
return SUCCEEDED(pInterface->put_MaxRecords(_nRet));
diff --git a/main/connectivity/source/inc/ado/Awrapado.hxx b/main/connectivity/source/inc/ado/Awrapado.hxx
index bf0654beb8..aa368f07b4 100644
--- a/main/connectivity/source/inc/ado/Awrapado.hxx
+++ b/main/connectivity/source/inc/ado/Awrapado.hxx
@@ -244,10 +244,10 @@ namespace connectivity
//////////////////////////////////////////////////////////////////////
WpADOProperties get_Properties();
- sal_Int32 GetActualSize() const ;
+ sal_IntPtr GetActualSize() const ;
sal_Int32 GetAttributes() const ;
sal_Int32 GetStatus() const ;
- sal_Int32 GetDefinedSize() const ;
+ sal_IntPtr GetDefinedSize() const ;
// gibt den Namen des Feldes zur"ueck
::rtl::OUString GetName() const ;
DataTypeEnum GetADOType() const ;
@@ -271,7 +271,7 @@ namespace connectivity
void PutADOType(DataTypeEnum eType) ;
- sal_Bool PutDefinedSize(sal_Int32 _nDefSize);
+ sal_Bool PutDefinedSize(sal_IntPtr _nDefSize);
sal_Bool PutAttributes(sal_Int32 _nDefSize);
};
@@ -331,7 +331,7 @@ namespace connectivity
sal_Bool Cancel() const;
sal_Int32 get_State( );
sal_Bool Supports( /* [in] */ CursorOptionEnum CursorOptions);
- PositionEnum get_AbsolutePosition();
+ sal_IntPtr get_AbsolutePosition();
void GetDataSource(IUnknown** pIUnknown) const ;
void PutRefDataSource(IUnknown* pIUnknown);
void GetBookmark(VARIANT& var);
@@ -353,9 +353,9 @@ namespace connectivity
sal_Bool CancelUpdate();
WpADOProperties get_Properties() const;
sal_Bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset);
- sal_Bool get_RecordCount(sal_Int32 &_nRet) const;
- sal_Bool get_MaxRecords(sal_Int32 &_nRet) const;
- sal_Bool put_MaxRecords(sal_Int32 _nRet);
+ sal_Bool get_RecordCount(sal_IntPtr &_nRet) const;
+ sal_Bool get_MaxRecords(sal_IntPtr &_nRet) const;
+ sal_Bool put_MaxRecords(sal_IntPtr _nRet);
sal_Bool get_CursorType(CursorTypeEnum &_nRet) const;
sal_Bool put_CursorType(CursorTypeEnum _nRet);
sal_Bool get_LockType(LockTypeEnum &_nRet) const;
(openoffice) 27/27: Remove unused files.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6fa359a043b90569f8b4d6c175776323209b426b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Jan 8 08:45:25 2025 +0200
Remove unused files.
Patch by: me
---
main/connectivity/Configuration.mk | 86 --------------------------------
main/connectivity/Jar_sdbc_hsqldb.mk | 59 ----------------------
main/connectivity/Module_connectivity.mk | 3 --
3 files changed, 148 deletions(-)
diff --git a/main/connectivity/Configuration.mk b/main/connectivity/Configuration.mk
deleted file mode 100644
index e38d819061..0000000000
--- a/main/connectivity/Configuration.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-#########
-# Inputs:
-#########
-
-PACKAGE := org.openoffice.Office.DataAccess
-COMPONENT_CONFIG_DATA := \
- $(SRCDIR)/source/drivers/ado/ado.xcu \
- $(SRCDIR)/source/drivers/adabas/adabas.xcu \
- $(SRCDIR)/source/drivers/mysql/mysql.xcu \
- $(SRCDIR)/source/drivers/hsqldb/hsqldb.xcu \
- $(SRCDIR)/source/drivers/macab/macab.xcu \
- $(SRCDIR)/source/drivers/evoab2/evoab2.xcu \
- $(SRCDIR)/source/drivers/jdbc/jdbc.xcu \
- $(SRCDIR)/source/drivers/dbase/dbase.xcu \
- $(SRCDIR)/source/drivers/flat/flat.xcu \
- $(SRCDIR)/source/drivers/calc/calc.xcu \
- $(SRCDIR)/source/drivers/odbc/odbc.xcu
-
-LOCALIZEDFILES = $(COMPONENT_CONFIG_DATA)
-XCUFILES = $(COMPONENT_CONFIG_DATA)
-
-
-
-##############################################
-# Processing and output.
-# From dmake's main/solenv/inc/tg_config.mk:
-##############################################
-
-PACKAGEDIR = $(subst .,/,$(PACKAGE))
-XSLTPACKAGEDIR = $(PACKAGEDIR)
-
-XCSROOTURL = $(WORKDIR)/CustomTarget/connectivity
-ifeq ($(GUI),WNT)
-XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
-endif
-ifeq ($(GUI),OS2)
-XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
-endif
-
-XCU_DEFAULT = $(foreach file,$(XCUFILES),\
- $(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/$(file))
-XCU_LANG = $(foreach file,$(LOCALIZEDFILES),\
- $(foreach lang,$(gb_AllLangResTarget_LANGS),\
- $(WORKDIR)/CustomTarget/connectivity/registry/res/$(lang)/$(PACKAGEDIR)/$(file)))
-
-$(XCU_DEFAULT) : $(OUTPUTDIR)/xml/registry/component-update.dtd \
- $(OUTPUTDIR)/xml/processing/data_val.xsl \
- $(OUTPUTDIR)/xml/processing/alllang.xsl
-
-$(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
- mkdir -p $(dir $@) && \
- $(gb_XSLTPROC) --nonet -o $*.val \
- --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
- --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
- --path $(OUTPUTDIR)/xml/registry \
- $(OUTPUTDIR)/xml/processing/data_val.xsl $< && \
- $(gb_XSLTPROC) --nonet -o $@ \
- --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
- --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
- --path $(OUTPUTDIR)/xml/registry \
- $(OUTPUTDIR)/xml/processing/alllang.xsl $< && \
- rm $*.val
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
deleted file mode 100644
index 4bae2ec6ce..0000000000
--- a/main/connectivity/Jar_sdbc_hsqldb.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-###############################################################
-
-
-
-$(eval $(call gb_Jar_Jar,sdbc_hsqldb,SRCDIR))
-
-ifeq ($(SYSTEM_HSQLDB),YES)
-# FIXME: not used anywhere else in AOO! Test!
-$(eval $(call gb_Jar_add_system_jars,sdbc_hsqldb,\
- $(HSQLDB_JAR) \
-))
-else
-$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
- $(OUTDIR)/bin/hsqldb.jar \
-))
-endif
-
-$(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com org))
-
-$(eval $(call gb_Jar_set_manifest,sdbc_hsqldb,$(SRCDIR)/connectivity/com/sun/star/sdbcx/comp/hsqldb/manifest))
-
-$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
- hsqldb.jar \
- .. \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
- connectivity/org/hsqldb/lib/FileSystemRuntimeException \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Module_connectivity.mk b/main/connectivity/Module_connectivity.mk
index 70b15d10b4..b42691097f 100644
--- a/main/connectivity/Module_connectivity.mk
+++ b/main/connectivity/Module_connectivity.mk
@@ -28,9 +28,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
AllLangResTarget_hsqldb \
AllLangResTarget_sdbcl \
AllLangResTarget_sdberr \
- Configuration \
- Connectivity \
- Jar_sdbc_hsqldb \
Library_adabas \
Library_calc \
Library_dbase \
(openoffice) 10/27: More fpicker Win64 fixes.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b077179428dfa5125ee813e8c67931625572ae9d
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 01:46:53 2025 +0200
More fpicker Win64 fixes.
Patch by: me
---
.../source/win32/filepicker/WinFileOpenImpl.cxx | 20 ++++++++++----------
.../source/win32/filepicker/WinFileOpenImpl.hxx | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 21aa7966c8..b79eae9b87 100644
--- a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -508,7 +508,7 @@ inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPIN
LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)
{
- unsigned int lResult = 0;
+ LRESULT lResult = 0;
CWinFileOpenImpl* pImpl = dynamic_cast<CWinFileOpenImpl*>(getCurrentInstance(hWnd));
@@ -523,7 +523,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
else
lResult = CallWindowProc(
reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
- hWnd,wMessage,wParam,lParam);
+ hWnd,wMessage,wParam,lParam);
}
break;
@@ -553,8 +553,8 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
case WM_NCDESTROY:
// restore the old window proc
- SetWindowLong(hWnd, GWL_WNDPROC,
- reinterpret_cast<LONG>(pImpl->m_pfnOldDlgProc));
+ SetWindowLongPtr(hWnd, GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(pImpl->m_pfnOldDlgProc));
lResult = CallWindowProc(
reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc),
@@ -654,7 +654,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
//
//-----------------------------------------------------------------
-sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()
+UINT_PTR SAL_CALL CWinFileOpenImpl::onFileOk()
{
m_NonExecuteFilePickerState->reset();
@@ -832,7 +832,7 @@ void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)
// onMessageCommand handler
//-----------------------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(
+UINT_PTR SAL_CALL CWinFileOpenImpl::onCtrlCommand(
HWND, sal_uInt16 ctrlId, sal_uInt16)
{
SetDefaultExtension();
@@ -903,10 +903,10 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)
{
// subclass the dialog window
- m_pfnOldDlgProc =
- reinterpret_cast<WNDPROC>(
- SetWindowLong( hwndDlg, GWL_WNDPROC,
- reinterpret_cast<LONG>(SubClassFunc)));
+ m_pfnOldDlgProc =
+ reinterpret_cast<WNDPROC>(
+ SetWindowLongPtr( hwndDlg, GWLP_WNDPROC,
+ reinterpret_cast<LONG_PTR>(SubClassFunc)));
}
//-----------------------------------------------------------------------------------------
diff --git a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index ed71ef0f93..8022ac2822 100644
--- a/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/main/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -170,7 +170,7 @@ protected:
virtual bool SAL_CALL preModal( );
virtual void SAL_CALL postModal( sal_Int16 nDialogResult );
- virtual sal_uInt32 SAL_CALL onFileOk();
+ virtual UINT_PTR SAL_CALL onFileOk();
virtual void SAL_CALL onSelChanged( HWND hwndListBox );
// only called back if OFN_EXPLORER is set
@@ -181,7 +181,7 @@ protected:
// call base class method first when overloading
virtual void SAL_CALL onInitDialog( HWND hwndDlg );
- virtual sal_uInt32 SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode );
+ virtual UINT_PTR SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode );
void onWMSize();
(openoffice) 05/27: Reduce ImplPreparePolyDraw() pPoints to sal_uInt32.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d038565f1507e39b539df0e8c912e3d136cd48a3
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:59:02 2025 +0200
Reduce ImplPreparePolyDraw() pPoints to sal_uInt32.
Patch by: me
---
main/vcl/win/source/gdi/salgdi.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/vcl/win/source/gdi/salgdi.cxx b/main/vcl/win/source/gdi/salgdi.cxx
index ce403202b6..9db2ba4253 100644
--- a/main/vcl/win/source/gdi/salgdi.cxx
+++ b/main/vcl/win/source/gdi/salgdi.cxx
@@ -622,7 +622,7 @@ void ImplClearHDCCache( SalData* pData )
// Make sure pWinPointAry and pWinFlagAry are big enough
void ImplPreparePolyDraw( bool bCloseFigures,
sal_uLong nPoly,
- const sal_uLong* pPoints,
+ const sal_uInt32* pPoints,
const SalPoint* const* pPtAry,
const BYTE* const* pFlgAry,
POINT* pWinPointAry,
@@ -633,9 +633,9 @@ void ImplPreparePolyDraw( bool bCloseFigures,
{
const POINT* pCurrPoint = reinterpret_cast<const POINT*>( *pPtAry++ );
const BYTE* pCurrFlag = *pFlgAry++;
- const sal_uLong nCurrPoints = *pPoints++;
+ const sal_uInt32 nCurrPoints = *pPoints++;
const bool bHaveFlagArray( pCurrFlag );
- sal_uLong nCurrPoint;
+ sal_uInt32 nCurrPoint;
if( nCurrPoints )
{
@@ -1601,7 +1601,7 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt
"WinSalGraphics::DrawPolyPolygonBezier(): POINT != SalPoint" );
sal_uLong nCurrPoly, nTotalPoints;
- const sal_uLong* pCurrPoints = pPoints;
+ const sal_uInt32* pCurrPoints = pPoints;
for( nCurrPoly=0, nTotalPoints=0; nCurrPoly<nPoly; ++nCurrPoly )
nTotalPoints += *pCurrPoints++;
(openoffice) 06/27: wParam is already a UINT_PTR, no need to use a bad conversion function.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c2ec84c8f75d3e9bad2becd6fd18de8df407712a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 22:14:16 2025 +0200
wParam is already a UINT_PTR, no need to use a bad conversion function.
Patch by: me
---
main/vcl/win/source/window/salframe.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/vcl/win/source/window/salframe.cxx b/main/vcl/win/source/window/salframe.cxx
index ef036cbd14..d86a16c401 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -6255,12 +6255,12 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
break;
#if WINVER >= 0x0500
case WM_IME_REQUEST:
- if ( PtrToInt( wParam ) == IMR_RECONVERTSTRING )
+ if ( wParam == IMR_RECONVERTSTRING )
{
nRet = ImplHandleIMEReconvertString( hWnd, lParam );
rDef = FALSE;
}
- else if( PtrToInt( wParam ) == IMR_CONFIRMRECONVERTSTRING )
+ else if( wParam == IMR_CONFIRMRECONVERTSTRING )
{
nRet = ImplHandleIMEConfirmReconvertString( hWnd, lParam );
rDef = FALSE;
(openoffice) 21/27: Add needed types for unixODBC on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d2e7baabf82959e1a28c82b23f3bc32a777a29d8
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 19:05:01 2025 +0200
Add needed types for unixODBC on Win64.
Patch by: me
---
main/dbaccess/source/ui/dlg/odbcconfig.cxx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/main/dbaccess/source/ui/dlg/odbcconfig.cxx b/main/dbaccess/source/ui/dlg/odbcconfig.cxx
index 3af17334e7..74fc890a7c 100644
--- a/main/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/main/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -84,6 +84,10 @@
#pragma warning(push)
#pragma warning(disable: 4005)
#endif
+#if _WIN64
+typedef long long INT64;
+typedef unsigned long long UINT64;
+#endif // _WIN64
#endif // defined(WNT)
#if defined(OS2)
(openoffice) 22/27: Fix a 0 vs NULL pointer ambiguity on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 93b3eead64a4d12f2a16a4dbf761f11f776827bd
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 19:31:21 2025 +0200
Fix a 0 vs NULL pointer ambiguity on Win64.
Patch by: me
---
main/cui/source/options/optdict.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/cui/source/options/optdict.cxx b/main/cui/source/options/optdict.cxx
index 4df2d2f7c2..406dace551 100644
--- a/main/cui/source/options/optdict.cxx
+++ b/main/cui/source/options/optdict.cxx
@@ -548,8 +548,8 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
if (aWordsLB.GetEntryCount())
{
- aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) );
- aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) );
+ aWordED .SetText( aWordsLB.GetEntryText(sal_uLong(0LU), 0) );
+ aReplaceED.SetText( aWordsLB.GetEntryText(sal_uLong(0LU), 1) );
}
LeaveWait();
(openoffice) 17/27: Add additional types unixODBC needs on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7a44928a829e261b91f476fa50e3de7b60bc3d83
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 11:10:51 2025 +0200
Add additional types unixODBC needs on Win64.
Patch by: me
---
main/connectivity/source/inc/odbc/OFunctiondefs.hxx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main/connectivity/source/inc/odbc/OFunctiondefs.hxx b/main/connectivity/source/inc/odbc/OFunctiondefs.hxx
index d312dddd77..124d8564c2 100644
--- a/main/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/main/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -34,6 +34,11 @@
// just to go with calling convention of windows
#define SQL_API __stdcall
+// On Win64, we need additional types predefined:
+#if _WIN64
+typedef long long INT64;
+typedef unsigned long long UINT64;
+#endif
#include <odbc/sqlext.h>
#undef SQL_API
#define SQL_API __stdcall
(openoffice) 01/27: Replace the 32 bit only SetClassLong()/GetClassLong() Windows API calls with SetClassLongPtr()/GetClassLongPtr() which work on Win64 too.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 870859ad651ba416b1c7094176893d5945e043d0
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:01:12 2025 +0200
Replace the 32 bit only SetClassLong()/GetClassLong() Windows API calls
with SetClassLongPtr()/GetClassLongPtr() which work on Win64 too.
Patch by: me
---
main/vcl/inc/win/wincomp.hxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/vcl/inc/win/wincomp.hxx b/main/vcl/inc/win/wincomp.hxx
index abbb76af0e..c173a0bd82 100644
--- a/main/vcl/inc/win/wincomp.hxx
+++ b/main/vcl/inc/win/wincomp.hxx
@@ -146,32 +146,32 @@ inline HFONT GetWindowFont( HWND hWnd )
inline void SetClassCursor( HWND hWnd, HCURSOR hCursor )
{
- SetClassLong( hWnd, GCL_HCURSOR, (DWORD)hCursor );
+ SetClassLongPtr( hWnd, GCLP_HCURSOR, (LONG_PTR)hCursor );
}
inline HCURSOR GetClassCursor( HWND hWnd )
{
- return (HCURSOR)GetClassLong( hWnd, GCL_HCURSOR );
+ return (HCURSOR)GetClassLongPtr( hWnd, GCLP_HCURSOR );
}
inline void SetClassIcon( HWND hWnd, HICON hIcon )
{
- SetClassLong( hWnd, GCL_HICON, (DWORD)hIcon );
+ SetClassLongPtr( hWnd, GCLP_HICON, (LONG_PTR)hIcon );
}
inline HICON GetClassIcon( HWND hWnd )
{
- return (HICON)GetClassLong( hWnd, GCL_HICON );
+ return (HICON)GetClassLongPtr( hWnd, GCLP_HICON );
}
inline HBRUSH SetClassBrush( HWND hWnd, HBRUSH hBrush )
{
- return (HBRUSH)SetClassLong( hWnd, GCL_HBRBACKGROUND, (DWORD)hBrush );
+ return (HBRUSH)SetClassLongPtr( hWnd, GCLP_HBRBACKGROUND, (LONG_PTR)hBrush );
}
inline HBRUSH GetClassBrush( HWND hWnd )
{
- return (HBRUSH)GetClassLong( hWnd, GCL_HBRBACKGROUND );
+ return (HBRUSH)GetClassLongPtr( hWnd, GCLP_HBRBACKGROUND );
}
inline HINSTANCE GetWindowInstance( HWND hWnd )
(openoffice) 23/27: Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 59efa0e13c6a467efe3824f24532619bb230dc9a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 19:49:58 2025 +0200
Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
Patch by: me
---
main/scripting/java/build.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml
index c521d0a560..bf36bbf5b9 100644
--- a/main/scripting/java/build.xml
+++ b/main/scripting/java/build.xml
@@ -124,12 +124,10 @@
debug="${debug}" optimize="${optimize}" deprecation="off">
<exclude name="**/provider/javascript/*.java" unless="with_rhino" />
<exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
<javac srcdir="Framework/" destdir="${jardir}"
includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
optimize="${optimize}" deprecation="off" includeantruntime="false">
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
</target>
(openoffice) 26/27: Disable building testtools for now, as its tests break the Win64 build.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 57e08e4bf065d356442a241ce6ea54a955de853a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Jan 8 08:39:41 2025 +0200
Disable building testtools for now, as its tests
break the Win64 build.
Patch by: me
---
main/testtools/prj/build.lst | 7 -------
1 file changed, 7 deletions(-)
diff --git a/main/testtools/prj/build.lst b/main/testtools/prj/build.lst
index a76ac598f9..a95ecbd5a5 100644
--- a/main/testtools/prj/build.lst
+++ b/main/testtools/prj/build.lst
@@ -1,8 +1 @@
tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
-tt testtools\inc nmake - all tt_inc NULL
-tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL
-tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest tt_inc NULL
-tt testtools\source\cliversioning nmake - all tt_cliver NULL
(openoffice) 08/27: Use the right entrypoint name for X86-64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f3e0634fae43008830654395f335e36c2dc3f4d2
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 00:44:19 2025 +0200
Use the right entrypoint name for X86-64.
Patch by: me
---
main/vcl/Library_vcl.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/main/vcl/Library_vcl.mk b/main/vcl/Library_vcl.mk
index f31f503005..6e4e511bd2 100644
--- a/main/vcl/Library_vcl.mk
+++ b/main/vcl/Library_vcl.mk
@@ -514,10 +514,17 @@ endif
ifeq ($(OS),WNT)
ifeq ($(USE_MINGW),)
+ifeq ($(CPUNAME),INTEL)
$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
+ifeq ($(CPUNAME),X86-64)
+$(eval $(call gb_Library_add_ldflags,vcl,\
+ /ENTRY:LibMain@16 \
+))
+endif
+endif
$(eval $(call gb_Library_add_linked_libs,vcl,\
advapi32 \
gdi32 \