summaryrefslogtreecommitdiff
path: root/dbaccess/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-07 11:11:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-08-09 21:43:35 +0200
commit72aeda11bd1acbe5d9224eae0d22265630ebb0b8 (patch)
treeb445410cae8acf1984869fdd949720a076f51ce7 /dbaccess/inc
parent7614efb59d948ca07c16e32523831b81922ac8f9 (diff)
weld OTasksWindow
moving the InterimItemWindow one layer higher Change-Id: I500da55f4d4bf4dd31583c9c055564cf299a2166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100304 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/inc')
-rw-r--r--dbaccess/inc/pch/precompiled_dba.hxx6
-rw-r--r--dbaccess/inc/pch/precompiled_dbu.hxx4
-rw-r--r--dbaccess/inc/strings.hrc1
3 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index d3d1a3fdc511..a09675bc8cdf 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-07-09 17:06:21 using:
+ Generated on 2020-08-07 11:34:54 using:
./bin/update_pch dbaccess dba --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -68,14 +68,12 @@
#include <rtl/math.h>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
-#include <rtl/strbuf.h>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/stringconcat.hxx>
#include <rtl/stringutils.hxx>
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
-#include <rtl/unload.h>
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.h>
#include <rtl/ustrbuf.hxx>
@@ -182,7 +180,6 @@
#include <com/sun/star/uno/genfunc.h>
#include <com/sun/star/uno/genfunc.hxx>
#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
#include <comphelper/IdPropArrayHelper.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -240,7 +237,6 @@
#include <svl/hint.hxx>
#include <svl/lstner.hxx>
#include <svl/svldllapi.h>
-#include <tools/UnitConversion.hxx>
#include <tools/color.hxx>
#include <tools/diagnose_ex.h>
#include <tools/gen.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 7464063da918..41a2c2b08bcc 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-07-09 17:06:22 using:
+ Generated on 2020-08-07 11:35:01 using:
./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -78,6 +78,7 @@
#include <vcl/font.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
+#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/metaactiontypes.hxx>
@@ -202,6 +203,7 @@
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#include <FieldDescriptions.hxx>
+#include <IClipBoardTest.hxx>
#include <QEnumTypes.hxx>
#include <TableConnectionData.hxx>
#include <TableFieldDescription.hxx>
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 16b1ad7b3ab5..2ccc5a666717 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -180,7 +180,6 @@
#define RID_STR_VIEWS_HELP_TEXT_DESIGN NC_("RID_STR_VIEWS_HELP_TEXT_DESIGN", "Create a view by specifying the tables and field names you would like to have visible." )
#define STR_DATABASE NC_("STR_DATABASE", "Database" )
#define STR_TASKS NC_("STR_TASKS", "Tasks" )
-#define STR_DESCRIPTION NC_("STR_DESCRIPTION", "Description" )
#define STR_PREVIEW NC_("STR_PREVIEW", "Preview" )
#define STR_QUERY_CLOSEDOCUMENTS NC_("STR_QUERY_CLOSEDOCUMENTS", "The connection type has been altered.\n" \
"For the changes to take effect, all forms, reports, queries and tables must be closed.\n\n" \