officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 8
sc/inc/viewopti.hxx | 1
sc/source/core/tool/viewopti.cxx | 43
sc/source/ui/drawfunc/fudraw.cxx | 7
sc/source/ui/inc/tpview.hxx | 2
sc/source/ui/inc/viewdata.hxx | 1
sc/source/ui/optdlg/tpview.cxx | 10
sc/source/ui/view/gridwin.cxx | 4
sc/source/ui/view/tabview5.cxx | 2
sc/uiconfig/scalc/ui/pastespecial.ui | 995 +++++++--------
sc/uiconfig/scalc/ui/tpviewpage.ui | 533 ++++----
11 files changed, 845 insertions(+), 761 deletions(-)
New commits:
commit c613eae96815e41a00b8dd63e4422c85ed849b71
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jun 15 10:01:29 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jun 15 15:04:11 2021 +0200
rework paste special a little
to avoid GtkButtonBox, it appears a little cramped under gtk
otherwise
Change-Id: Ie80a0474f6bc246de7b673e255434071bafcfbeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117243
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui
b/sc/uiconfig/scalc/ui/pastespecial.ui
index 12586b987a89..78573fecab81 100644
--- a/sc/uiconfig/scalc/ui/pastespecial.ui
+++ b/sc/uiconfig/scalc/ui/pastespecial.ui
@@ -95,439 +95,17 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <!-- n-columns=3 n-rows=3 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="row-spacing">6</property>
- <property name="column-spacing">6</property>
- <child>
- <object class="GtkFrame" id="frmPaste">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <!-- n-columns=2 n-rows=4 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
- <property name="column-spacing">3</property>
- <child>
- <object class="GtkCheckButton" id="paste_all">
- <property name="label" translatable="yes"
context="pastespecial|paste_all">_All</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="has-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="paste_all-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|paste_all">Pastes all
cell contents, comments, formats, and objects into the current
document.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="comments">
- <property name="label" translatable="yes"
context="pastespecial|comments">_Comments</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="comments-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|comments">Inserts
comments that are attached to cells. If you want to add the comments to the
existing cell content, select the "Add" operation.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="numbers">
- <property name="label" translatable="yes"
context="pastespecial|numbers">_Numbers</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="numbers-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|numbers">Inserts cells
containing numbers.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="text">
- <property name="label" translatable="yes"
context="pastespecial|text">Te_xt</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="text-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|text">Inserts cells
containing text.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="datetime">
- <property name="label" translatable="yes"
context="pastespecial|datetime">_Date & time</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="datetime-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|datetime">Inserts cells
containing date and time values.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="formats">
- <property name="label" translatable="yes"
context="pastespecial|formats">For_mats</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="formats-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|formats">Inserts cell
format attributes.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="objects">
- <property name="label" translatable="yes"
context="pastespecial|objects">Ob_jects</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="objects-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|objects">Inserts objects
contained within the selected cell range. These can be OLE objects, chart
objects, or drawing objects.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="formulas">
- <property name="label" translatable="yes"
context="pastespecial|formulas">F_ormulas</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="formulas-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|formulas">Inserts cells
containing formulae.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="pastespecial|label1">Paste</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frmOperations">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkRadioButton" id="none">
- <property name="label" translatable="yes"
context="pastespecial|none">Non_e</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="active">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="none-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|none">Does not apply an
operation when you insert the cell range from the clipboard. The contents of
the clipboard will replace existing cell contents.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="add">
- <property name="label" translatable="yes"
context="pastespecial|add">_Add</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="add-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|add">Adds the values in
the clipboard cells to the values in the target cells. Also, if the clipboard
only contains comments, adds the comments to the target cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="subtract">
- <property name="label" translatable="yes"
context="pastespecial|subtract">_Subtract</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="subtract-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|subtract">Subtracts the
values in the clipboard cells from the values in the target cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="multiply">
- <property name="label" translatable="yes"
context="pastespecial|multiply">_Multiply</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="multiply-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|multiply">Multiplies the
values in the clipboard cells with the values in the target cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="divide">
- <property name="label" translatable="yes"
context="pastespecial|divide">_Divide</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="divide-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|divide">Divides the
values in the target cells by the values in the clipboard cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="pastespecial|label2">Operations</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frmShift">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkRadioButton" id="no_shift">
- <property name="label" translatable="yes"
context="pastespecial|no_shift">Don't sh_ift</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="active">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="no_shift-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|no_shift">Inserted cells
replace the target cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="move_down">
- <property name="label" translatable="yes"
context="pastespecial|move_down">_Down</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">no_shift</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_down-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|move_down">Target cells
are shifted downward when you insert cells from the clipboard.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="move_right">
- <property name="label" translatable="yes"
context="pastespecial|move_right">_Right</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <property name="group">no_shift</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_right-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|move_right">Target cells
are shifted to the right when you insert cells from the clipboard.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="pastespecial|label4">Shift Cells</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
+ <!-- n-columns=2 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkFrame" id="frmPresets">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="valign">start</property>
+ <property name="vexpand">True</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
@@ -538,13 +116,14 @@
<property name="margin-top">3</property>
<property name="margin-bottom">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButtonBox">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<property name="homogeneous">True</property>
- <property name="layout-style">expand</property>
<child>
<object class="GtkButton" id="paste_values_only">
<property name="label" translatable="yes"
context="pastespecial|paste_values_only|label">_Values Only</property>
@@ -570,7 +149,6 @@
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes"
context="pastespecial|paste_values_formats|tooltip_text">Values &
Formats</property>
- <property name="vexpand">True</property>
<property
name="image">img_paste_values_formats</property>
<property name="use-underline">True</property>
<property name="image-position">top</property>
@@ -589,7 +167,6 @@
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes"
context="pastespecial|paste_format|tooltip_text">Formats Only</property>
- <property name="vexpand">True</property>
<property name="image">img_paste_formats</property>
<property name="use-underline">True</property>
<property name="image-position">top</property>
@@ -608,7 +185,6 @@
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes"
context="pastespecial|paste_transpose|tooltip_text">Transpose All</property>
- <property name="vexpand">True</property>
<property
name="image">img_paste_transpose</property>
<property name="use-underline">True</property>
<property name="image-position">top</property>
@@ -659,97 +235,534 @@
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
- <property name="height">3</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frmOptions">
+ <!-- n-columns=2 n-rows=3 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
+ <property name="vexpand">True</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">6</property>
<child>
- <!-- n-columns=1 n-rows=3 -->
- <object class="GtkGrid">
+ <object class="GtkFrame" id="frmPaste">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
- <property name="column-spacing">3</property>
+ <property name="vexpand">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkCheckButton" id="link">
- <property name="label" translatable="yes"
context="pastespecial|link">As _Link</property>
+ <!-- n-columns=2 n-rows=4 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="link-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|link">Inserts the cell
range as a link, so that changes made to the cells in the source file are
updated in the target file. To ensure that changes made to empty cells in the
source file are updated in the target file, ensure that the "Paste All" option
is also selected.</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">3</property>
+ <property name="margin-bottom">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="paste_all">
+ <property name="label" translatable="yes"
context="pastespecial|paste_all">_All</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="paste_all-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|paste_all">Pastes all cell contents,
comments, formats, and objects into the current document.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="comments">
+ <property name="label" translatable="yes"
context="pastespecial|comments">_Comments</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="comments-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|comments">Inserts comments that are attached
to cells. If you want to add the comments to the existing cell content, select
the "Add" operation.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="numbers">
+ <property name="label" translatable="yes"
context="pastespecial|numbers">_Numbers</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="numbers-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|numbers">Inserts cells containing
numbers.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="text">
+ <property name="label" translatable="yes"
context="pastespecial|text">Te_xt</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="text-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|text">Inserts cells containing
text.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="datetime">
+ <property name="label" translatable="yes"
context="pastespecial|datetime">_Date & time</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="datetime-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|datetime">Inserts cells containing date and
time values.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formats">
+ <property name="label" translatable="yes"
context="pastespecial|formats">For_mats</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="formats-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|formats">Inserts cell format
attributes.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="objects">
+ <property name="label" translatable="yes"
context="pastespecial|objects">Ob_jects</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="objects-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|objects">Inserts objects contained within
the selected cell range. These can be OLE objects, chart objects, or drawing
objects.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formulas">
+ <property name="label" translatable="yes"
context="pastespecial|formulas">F_ormulas</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="formulas-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|formulas">Inserts cells containing
formulae.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="pastespecial|label1">Paste</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frmOptions">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkCheckButton" id="transpose">
- <property name="label" translatable="yes"
context="pastespecial|transpose">Trans_pose</property>
+ <!-- n-columns=1 n-rows=3 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="transpose-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|transpose">The rows of
the range in the clipboard are pasted to become columns of the output range.
The columns of the range in the clipboard are pasted to become rows.</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">3</property>
+ <property name="margin-bottom">6</property>
+ <property name="row-spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="link">
+ <property name="label" translatable="yes"
context="pastespecial|link">As _Link</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="link-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|link">Inserts the cell range as a link, so
that changes made to the cells in the source file are updated in the target
file. To ensure that changes made to empty cells in the source file are updated
in the target file, ensure that the "Paste All" option is also
selected.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="transpose">
+ <property name="label" translatable="yes"
context="pastespecial|transpose">Trans_pose</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="transpose-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|transpose">The rows of the range in the
clipboard are pasted to become columns of the output range. The columns of the
range in the clipboard are pasted to become rows.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="skip_empty">
+ <property name="label" translatable="yes"
context="pastespecial|skip_empty">_Skip empty cells</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="pastespecial|skip_empty">If enabled, blank cells in source will not
override the target.</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="skip_empty-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|skip_empty">Empty cells from the clipboard
do not replace target cells. If you use this option in conjunction with the
"Multiply" or the "Divide" operation, the operation is not applied to the
target cell of an empty cell in the clipboard.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
</child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="pastespecial|OptionsFrame">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frmOperations">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkCheckButton" id="skip_empty">
- <property name="label" translatable="yes"
context="pastespecial|skip_empty">_Skip empty cells</property>
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes"
context="pastespecial|skip_empty">If enabled, blank cells in source will not
override the target.</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="skip_empty-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="pastespecial|extended_tip|skip_empty">Empty cells
from the clipboard do not replace target cells. If you use this option in
conjunction with the "Multiply" or the "Divide" operation, the operation is not
applied to the target cell of an empty cell in the clipboard.</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">3</property>
+ <property name="margin-bottom">6</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkRadioButton" id="none">
+ <property name="label" translatable="yes"
context="pastespecial|none">Non_e</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="none-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|none">Does not apply an operation when you
insert the cell range from the clipboard. The contents of the clipboard will
replace existing cell contents.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="add">
+ <property name="label" translatable="yes"
context="pastespecial|add">_Add</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="add-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|add">Adds the values in the clipboard cells
to the values in the target cells. Also, if the clipboard only contains
comments, adds the comments to the target cells.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="subtract">
+ <property name="label" translatable="yes"
context="pastespecial|subtract">_Subtract</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="subtract-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|subtract">Subtracts the values in the
clipboard cells from the values in the target cells.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="multiply">
+ <property name="label" translatable="yes"
context="pastespecial|multiply">_Multiply</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="multiply-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|multiply">Multiplies the values in the
clipboard cells with the values in the target cells.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="divide">
+ <property name="label" translatable="yes"
context="pastespecial|divide">_Divide</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="divide-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|divide">Divides the values in the target
cells by the values in the clipboard cells.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="pastespecial|label2">Operations</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ <property name="width">2</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel">
+ <child>
+ <object class="GtkFrame" id="frmShift">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="pastespecial|OptionsFrame">Options</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="vexpand">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">3</property>
+ <property name="margin-bottom">6</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkRadioButton" id="no_shift">
+ <property name="label" translatable="yes"
context="pastespecial|no_shift">Don't sh_ift</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="no_shift-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|no_shift">Inserted cells replace the target
cells.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="move_down">
+ <property name="label" translatable="yes"
context="pastespecial|move_down">_Down</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">no_shift</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="move_down-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|move_down">Target cells are shifted downward
when you insert cells from the clipboard.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="move_right">
+ <property name="label" translatable="yes"
context="pastespecial|move_right">_Right</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">no_shift</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="move_right-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="pastespecial|extended_tip|move_right">Target cells are shifted to the
right when you insert cells from the clipboard.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="pastespecial|label4">Shift Cells</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">2</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
commit 10ff27cc4f01693865599d24caf7ab80d95232e0
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Jun 8 18:12:49 2021 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Jun 15 15:03:24 2021 +0200
Resolves tdf#142499 - Make fat cross cursor optional
Change-Id: I9a9182f8783f951e49cdb8f897578f99281c25d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116858
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5b3a2043e63b..95c1aed3ab0b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -398,6 +398,14 @@
</info>
<value>true</value>
</prop>
+ <prop oor:name="ThemedCursor" oor:type="xs:boolean"
oor:nillable="false">
+ <!-- UIHints: Tools - Options -Spreadsheets - View - [Section]
Window -->
+ <info>
+ <desc>If true, a themed cursor is used (fat cross) otherwise the
system default (arrow).</desc>
+ <label>Themed cursor</label>
+ </info>
+ <value>false</value>
+ </prop>
</group>
<group oor:name="Other">
<info>
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 313a69ad278e..829fb451442c 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -44,6 +44,7 @@ enum ScViewOption
VOPT_ANCHOR,
VOPT_PAGEBREAKS,
VOPT_SUMMARY,
+ VOPT_THEMEDCURSOR,
VOPT_CLIPMARKS,
};
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 45b06b47a1fa..1658cfc65ef7 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -88,22 +88,23 @@ ScViewOptions::~ScViewOptions()
void ScViewOptions::SetDefaults()
{
- aOptArr[ VOPT_FORMULAS ] = false;
- aOptArr[ VOPT_SYNTAX ] = false;
- aOptArr[ VOPT_HELPLINES ] = false;
- aOptArr[ VOPT_GRID_ONTOP ] = false;
- aOptArr[ VOPT_NOTES ] = true;
- aOptArr[ VOPT_NULLVALS ] = true;
- aOptArr[ VOPT_VSCROLL ] = true;
- aOptArr[ VOPT_HSCROLL ] = true;
- aOptArr[ VOPT_TABCONTROLS ] = true;
- aOptArr[ VOPT_OUTLINER ] = true;
- aOptArr[ VOPT_HEADER ] = true;
- aOptArr[ VOPT_GRID ] = true;
- aOptArr[ VOPT_ANCHOR ] = true;
- aOptArr[ VOPT_PAGEBREAKS ] = true;
- aOptArr[ VOPT_CLIPMARKS ] = true;
- aOptArr[ VOPT_SUMMARY ] = true;
+ aOptArr[ VOPT_FORMULAS ] = false;
+ aOptArr[ VOPT_SYNTAX ] = false;
+ aOptArr[ VOPT_HELPLINES ] = false;
+ aOptArr[ VOPT_GRID_ONTOP ] = false;
+ aOptArr[ VOPT_NOTES ] = true;
+ aOptArr[ VOPT_NULLVALS ] = true;
+ aOptArr[ VOPT_VSCROLL ] = true;
+ aOptArr[ VOPT_HSCROLL ] = true;
+ aOptArr[ VOPT_TABCONTROLS ] = true;
+ aOptArr[ VOPT_OUTLINER ] = true;
+ aOptArr[ VOPT_HEADER ] = true;
+ aOptArr[ VOPT_GRID ] = true;
+ aOptArr[ VOPT_ANCHOR ] = true;
+ aOptArr[ VOPT_PAGEBREAKS ] = true;
+ aOptArr[ VOPT_CLIPMARKS ] = true;
+ aOptArr[ VOPT_SUMMARY ] = true;
+ aOptArr[ VOPT_THEMEDCURSOR ] = false;
aModeArr[VOBJ_TYPE_OLE ] = VOBJ_MODE_SHOW;
aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
@@ -198,6 +199,7 @@ ScTpViewItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCLAYOUTOPT_OUTLINE 8
#define SCLAYOUTOPT_GRID_ONCOLOR 9
#define SCLAYOUTOPT_SUMMARY 10
+#define SCLAYOUTOPT_THEMEDCURSOR 11
#define CFGPATH_DISPLAY "Office.Calc/Content/Display"
@@ -236,7 +238,8 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
"Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
"Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
"Line/GridOnColoredCells", // SCLAYOUTOPT_GRID_ONCOLOR;
- "Window/SearchSummary"}; // SCLAYOUTOPT_SUMMARY
+ "Window/SearchSummary", // SCLAYOUTOPT_SUMMARY
+ "Window/ThemedCursor"}; // SCLAYOUTOPT_THEMEDCURSOR
}
Sequence<OUString> ScViewCfg::GetDisplayPropertyNames()
@@ -330,6 +333,9 @@ ScViewCfg::ScViewCfg() :
case SCLAYOUTOPT_SUMMARY:
SetOption( VOPT_SUMMARY,
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
+ case SCLAYOUTOPT_THEMEDCURSOR:
+ SetOption( VOPT_THEMEDCURSOR,
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
+ break;
}
}
}
@@ -497,6 +503,9 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl,
ScLinkConfigItem&, void)
case SCLAYOUTOPT_SUMMARY:
pValues[nProp] <<= GetOption( VOPT_SUMMARY );
break;
+ case SCLAYOUTOPT_THEMEDCURSOR:
+ pValues[nProp] <<= GetOption( VOPT_THEMEDCURSOR );
+ break;
}
}
aLayoutItem.PutProperties(aNames, aValues);
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 81057be0feb4..318151b1d558 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -59,7 +59,7 @@ void collectUIInformation( const OUString& aevent )
FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, const SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pViewP, pDoc, rReq)
- , aNewPointer(PointerStyle::FatCross)
+ , aNewPointer(PointerStyle::Arrow)
, aOldPointer(PointerStyle::Arrow)
{
}
@@ -719,7 +719,10 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
else if ( IsDetectiveHit( aPnt ) )
rViewShell.SetActivePointer( PointerStyle::Detective );
else
- rViewShell.SetActivePointer( aNewPointer ); //! in Gridwin?
+ {
+ const bool bIsThemed = rViewShell.GetViewData().IsThemedCursor();
+ rViewShell.SetActivePointer( bIsThemed ? PointerStyle::FatCross :
PointerStyle::Arrow ); //! in Gridwin?
+ }
}
bool FuDraw::IsEditingANote() const
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0306044d4f9f..ee35ce6f6f77 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -54,6 +54,8 @@ class ScTpContentOptions : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xTblRegCB;
std::unique_ptr<weld::CheckButton> m_xOutlineCB;
std::unique_ptr<weld::CheckButton> m_xSummaryCB;
+ std::unique_ptr<weld::RadioButton> m_xThemedCursorRB;
+ std::unique_ptr<weld::RadioButton> m_xSystemCursorRB;
void InitGridOpt();
DECL_LINK( GridHdl, weld::ComboBox&, void );
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index b63b10f0a195..9906071f28ac 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -553,6 +553,7 @@ public:
bool IsVScrollMode () const { return
maOptions.GetOption(VOPT_VSCROLL); }
bool IsHScrollMode () const { return
maOptions.GetOption(VOPT_HSCROLL); }
bool IsOutlineMode () const { return
maOptions.GetOption(VOPT_OUTLINER); }
+ bool IsThemedCursor () const { return
maOptions.GetOption(VOPT_THEMEDCURSOR); }
/// Force page size for PgUp/PgDown to overwrite the computation based on
m_aVisArea.
void ForcePageUpDownOffset(tools::Long nTwips) { m_nLOKPageUpDownOffset =
nTwips; }
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 994e74822a8e..9af4e81d87e7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -57,6 +57,8 @@ ScTpContentOptions::ScTpContentOptions(weld::Container*
pPage, weld::DialogContr
, m_xTblRegCB(m_xBuilder->weld_check_button("tblreg"))
, m_xOutlineCB(m_xBuilder->weld_check_button("outline"))
, m_xSummaryCB(m_xBuilder->weld_check_button("cbSummary"))
+ , m_xThemedCursorRB(m_xBuilder->weld_radio_button("rbThemedCursor"))
+ , m_xSystemCursorRB(m_xBuilder->weld_radio_button("rbSystemCursor"))
{
SetExchangeSupport();
Link<weld::ComboBox&,void> aSelObjHdl(LINK( this, ScTpContentOptions,
SelLbObjHdl ) );
@@ -81,6 +83,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container*
pPage, weld::DialogContr
m_xGuideLineCB->connect_toggled(aCBHdl);
m_xRowColHeaderCB->connect_toggled(aCBHdl);
m_xSummaryCB->connect_toggled(aCBHdl);
+ m_xThemedCursorRB->connect_toggled(aCBHdl);
m_xColorLB->SetSlotId(SID_ATTR_CHAR_COLOR);
m_xColorLB->SetAutoDisplayColor(SC_STD_GRIDCOLOR);
@@ -118,6 +121,7 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet*
rCoreSet )
m_xColorLB->IsValueChangedFromSaved() ||
m_xBreakCB->get_state_changed_from_saved() ||
m_xSummaryCB->get_state_changed_from_saved() ||
+ m_xThemedCursorRB->get_state_changed_from_saved() ||
m_xGuideLineCB->get_state_changed_from_saved())
{
NamedColor aNamedColor = m_xColorLB->GetSelectedEntry();
@@ -169,6 +173,10 @@ void ScTpContentOptions::Reset( const SfxItemSet*
rCoreSet )
m_xTblRegCB ->set_active( m_xLocalOptions->GetOption(VOPT_TABCONTROLS) );
m_xOutlineCB->set_active( m_xLocalOptions->GetOption(VOPT_OUTLINER) );
m_xSummaryCB->set_active( m_xLocalOptions->GetOption(VOPT_SUMMARY) );
+ if ( m_xLocalOptions->GetOption(VOPT_THEMEDCURSOR) )
+ m_xThemedCursorRB->set_active( true );
+ else
+ m_xSystemCursorRB->set_active( true );
InitGridOpt();
@@ -202,6 +210,7 @@ void ScTpContentOptions::Reset( const SfxItemSet*
rCoreSet )
m_xBreakCB->save_state();
m_xGuideLineCB->save_state();
m_xSummaryCB->save_state();
+ m_xThemedCursorRB->save_state();
}
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -251,6 +260,7 @@ IMPL_LINK( ScTpContentOptions, CBHdl, weld::Toggleable&,
rBtn, void )
else if ( m_xGuideLineCB.get() == &rBtn ) eOption = VOPT_HELPLINES;
else if ( m_xRowColHeaderCB.get() == &rBtn ) eOption = VOPT_HEADER;
else if ( m_xSummaryCB.get() == &rBtn ) eOption = VOPT_SUMMARY;
+ else if ( m_xThemedCursorRB.get() == &rBtn ) eOption = VOPT_THEMEDCURSOR;
m_xLocalOptions->SetOption( eOption, bChecked );
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bc4d1006325e..3211e5af581d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2041,7 +2041,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
rMark.SetMarking(false);
- SetPointer( PointerStyle::FatCross );
+ SetPointer( mrViewData.IsThemedCursor() ? PointerStyle::FatCross :
PointerStyle::Arrow );
if (mrViewData.IsFillMode() ||
( mrViewData.GetFillMode() == ScFillMode::MATRIX && rMEvt.IsMod1() ))
@@ -2627,7 +2627,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
bool bAlt = rMEvt.IsMod2();
if (bEditMode) // First has to be
in edit mode!
- SetPointer( PointerStyle::FatCross );
+ SetPointer( mrViewData.IsThemedCursor() ?
PointerStyle::FatCross : PointerStyle::Arrow );
else if ( !bAlt && !nButtonDown && ScGlobal::ShouldOpenURL() &&
GetEditUrl(rMEvt.GetPosPixel()) )
SetPointer( PointerStyle::RefHand );
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index af7c3dfb19b7..3de36af347d2 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -648,7 +648,7 @@ void ScTabView::ResetBrushDocument()
if ( HasPaintBrush() )
{
SetBrushDocument( nullptr, false );
- SetActivePointer( PointerStyle::FatCross ); // switch pointers also
when ended with escape key
+ SetActivePointer( aViewData.IsThemedCursor() ? PointerStyle::FatCross
: PointerStyle::Arrow ); // switch pointers also when ended with escape key
}
}
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui
b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 7b409b747a85..0085a13d2ff6 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="TpViewPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=3 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">24</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">24</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=7 -->
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<child>
<object class="GtkCheckButton" id="formula">
<property name="label" translatable="yes"
context="tpviewpage|formula">_Formulas</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="formula-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|formula">Specifies whether to show
formulas instead of results in the cells.</property>
@@ -41,18 +41,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="nil">
<property name="label" translatable="yes"
context="tpviewpage|nil">Zero val_ues</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="nil-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|nil">Specifies whether to show numbers
with the value of 0.</property>
@@ -60,18 +60,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="annot">
<property name="label" translatable="yes"
context="tpviewpage|annot">_Comment indicator</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="annot-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|annot">Specifies that a small
rectangle in the top right corner of the cell indicates that a comment exists.
The comment will be shown only when you enable tips under %PRODUCTNAME -
General in the Options dialog box.</property>
@@ -79,18 +79,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="value">
<property name="label" translatable="yes"
context="tpviewpage|value">Value h_ighlighting</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="value-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|value">Mark the Value highlighting box
to show the cell contents in different colors, depending on type. Text cells
are formatted in black, formulas in green, number cells in blue, and protected
cells are shown with light grey background, no matter how their display is
formatted.</property>
@@ -98,18 +98,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="anchor">
<property name="label" translatable="yes"
context="tpviewpage|anchor">_Anchor</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="anchor-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|anchor">Specifies whether the anchor
icon is displayed when an inserted object, such as a graphic, is
selected.</property>
@@ -117,18 +117,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="clipmark">
<property name="label" translatable="yes"
context="tpviewpage|clipmark">Te_xt overflow</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="clipmark-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|clipmark">If a cell contains text that
is wider than the width of the cell, the text is displayed over empty
neighboring cells in the same row. If there is no empty neighboring cell, a
small triangle at the cell border indicates that the text continues.</property>
@@ -136,18 +136,18 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="rangefind">
<property name="label" translatable="yes"
context="tpviewpage|rangefind">_Show references in color</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="rangefind-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|rangefind">Specifies that each
reference is highlighted in color in the formula. The cell range is also
enclosed by a colored border as soon as the cell containing the reference is
selected for editing.</property>
@@ -155,8 +155,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
</object>
@@ -164,7 +164,7 @@
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="tpviewpage|label4">Display</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -173,31 +173,31 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=6 -->
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<child>
<object class="GtkCheckButton" id="rowcolheader">
<property name="label" translatable="yes"
context="tpviewpage|rowcolheader">Colu_mn/row headers</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
