diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-26 12:17:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-28 16:16:24 +0100 |
commit | 5325ce6a3c791bd4a5ee6e71f95a403562ca811c (patch) | |
tree | 6ba582c0887875ceb039b617d1b9344801b2c69c /sc/inc | |
parent | 6a3e04abd653cb86550b911b62ca54e2942f957a (diff) |
weld calc navigator
note: non-standard dnd via parent so the treeview triggers the dnd but doesn't
itself strictly speaking drive the dnd, see copying a range from the navigator
where the calc main edit window shows the outline where the copy of the range
from the calc main window will go
Change-Id: Ideecbe779e3d9bb5b392357a93ec25f625180ba8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89597
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 8 | ||||
-rw-r--r-- | sc/inc/pch/precompiled_scfilt.hxx | 4 | ||||
-rw-r--r-- | sc/inc/strings.hrc | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 0fd221f2f845..ff3ca6da2b12 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.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-02-17 11:23:21 using: + Generated on 2020-02-26 17:29:13 using: ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -40,6 +40,7 @@ #include <math.h> #include <memory> #include <new> +#include <optional> #include <ostream> #include <set> #include <sstream> @@ -121,9 +122,7 @@ #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/dllapi.h> -#include <vcl/dndhelp.hxx> #include <vcl/dockwin.hxx> -#include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> #include <vcl/floatwin.hxx> @@ -144,7 +143,6 @@ #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/task.hxx> -#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> #include <vcl/transfer.hxx> #include <vcl/uitest/factory.hxx> @@ -329,7 +327,6 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> -#include <optional> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> @@ -438,7 +435,6 @@ #include <tools/gen.hxx> #include <tools/globname.hxx> #include <tools/helpers.hxx> -#include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index c22daa46f180..aaa986c9a8e5 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.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-02-01 10:57:51 using: + Generated on 2020-02-26 17:28:59 using: ./bin/update_pch sc scfilt --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -33,6 +33,7 @@ #include <math.h> #include <memory> #include <new> +#include <optional> #include <ostream> #include <set> #include <stack> @@ -179,7 +180,6 @@ #include <filter/msfilter/msocximex.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> -#include <optional> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index 9a44676ffbd3..a685c1ef9d28 100644 --- a/sc/inc/strings.hrc +++ b/sc/inc/strings.hrc @@ -154,8 +154,6 @@ #define SCSTR_CONTENT_NOTE NC_("SCSTR_CONTENT_NOTE", "Comments" ) #define SCSTR_CONTENT_AREALINK NC_("SCSTR_CONTENT_AREALINK", "Linked areas" ) #define SCSTR_CONTENT_DRAWING NC_("SCSTR_CONTENT_DRAWING", "Drawing objects") -#define SCSTR_DRAGMODE NC_("SCSTR_DRAGMODE", "Drag Mode" ) -#define SCSTR_DISPLAY NC_("SCSTR_DISPLAY", "Display" ) #define SCSTR_ACTIVE NC_("SCSTR_ACTIVE", "active" ) #define SCSTR_NOTACTIVE NC_("SCSTR_NOTACTIVE", "inactive" ) #define SCSTR_HIDDEN NC_("SCSTR_HIDDEN", "hidden" ) |