cui/source/customize/acccfg.cxx | 2
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 48
+++++-----
sc/source/core/data/drwlayer.cxx | 8 +
3 files changed, 32 insertions(+), 26 deletions(-)
New commits:
commit 89b671c4a4288f3058157da292b1275e5bfb8392
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Fri Apr 6 10:20:43 2018 +0200
tdf#116836 Don't move objects out of cell when shrinking cell
Change-Id: I8185f3501eb17a62ef4f55b2c8bb2d70f1895365
Reviewed-on: https://gerrit.libreoffice.org/52491
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 3a765e8965bd..e694fed7c25a 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -729,8 +729,12 @@ void ScDrawLayer::ResizeLastRectFromAnchor(const
SdrObject* pObj, ScDrawObjData&
// Reduce offset also when shrinking
if (!bIsGrowingLarger)
{
-
aRect.setX(rtl::math::round(static_cast<double>(aRect.getX()) * fWidthFactor));
-
aRect.setY(rtl::math::round(static_cast<double>(aRect.getY()) * fHeightFactor));
+ Point aAvailableSpaceInCell = Point(aRect.getX() -
aLastCellRect.TopLeft().X(),
+ aRect.getY() -
aLastCellRect.TopLeft().Y());
+
aRect.setX(rtl::math::round(static_cast<double>(aRect.getX())
+ + aAvailableSpaceInCell.X() *
fWidthFactor));
+
aRect.setY(rtl::math::round(static_cast<double>(aRect.getY())
+ + aAvailableSpaceInCell.Y() *
fHeightFactor));
}
}
}
commit 49a2ca259287173d86a303b5c75d25ce52a9e26c
Author: heiko tietze <tietze.he...@gmail.com>
Date: Wed Apr 4 16:31:03 2018 +0200
tdf#86404 - use Ctrl+TAB to switch between tabs/sheets
Introduced mod1+tab and mod1+shitf+tab and assigned it to next/prev sheet
in Calc
Change-Id: I49e4dee685bbf81595f24222907664a271a3f121
Reviewed-on: https://gerrit.libreoffice.org/52392
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 9f1c75341ace..46f42b400f3b 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -201,6 +201,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_MOD1 | KEY_POINT,
KEY_MOD1 | KEY_COMMA,
KEY_MOD1 | KEY_TILDE,
+ KEY_MOD1 | KEY_TAB,
KEY_MOD1 | KEY_F1,
KEY_MOD1 | KEY_F2,
@@ -281,6 +282,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
KEY_SHIFT | KEY_MOD1 | KEY_POINT,
KEY_SHIFT | KEY_MOD1 | KEY_COMMA,
KEY_SHIFT | KEY_MOD1 | KEY_TILDE,
+ KEY_SHIFT | KEY_MOD1 | KEY_TAB,
KEY_SHIFT | KEY_MOD1 | KEY_F1,
KEY_SHIFT | KEY_MOD1 | KEY_F2,
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 6e9182150a56..2e0c0d4ab9e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1029,12 +1029,6 @@
<value xml:lang="en-US">.uno:GoDownBlock</value>
</prop>
</node>
- <node oor:name="PAGEDOWN_MOD1" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="en-US">.uno:JumpToNextTable</value>
- </prop>
- </node>
<node oor:name="PAGEDOWN_SHIFT" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
@@ -1053,12 +1047,6 @@
<value xml:lang="en-US">.uno:GoUpBlock</value>
</prop>
</node>
- <node oor:name="PAGEUP_MOD1" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="en-US">.uno:JumpToPrevTable</value>
- </prop>
- </node>
<node oor:name="PAGEUP_SHIFT" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
@@ -1330,6 +1318,18 @@
<value xml:lang="en-US">.uno:InsertAnnotation</value>
</prop>
</node>
+ <node oor:name="TAB_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
+ <value xml:lang="en-US">.uno:JumpToNextTable</value>
+ </prop>
+ </node>
+ <node oor:name="TAB_SHIFT_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
+ <value xml:lang="en-US">.uno:JumpToPrevTable</value>
+ </prop>
+ </node>
</node>
<node oor:name="com.sun.star.chart2.ChartDocument" oor:op="replace">
<node oor:name="9_SHIFT_MOD1_MOD2" oor:op="replace">
@@ -7406,6 +7406,18 @@
<value xml:lang="en-US">.uno:Undo</value>
</prop>
</node>
+ <node oor:name="PAGEDOWN_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
+ <value xml:lang="en-US">.uno:JumpToNextTable</value>
+ </prop>
+ </node>
+ <node oor:name="PAGEUP_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
+ <value xml:lang="en-US">.uno:JumpToPrevTable</value>
+ </prop>
+ </node>
</node>
<node oor:name="com.sun.star.chart2.ChartDocument" oor:op="replace">
<node oor:name="BACKSPACE_MOD2" oor:op="replace">
@@ -7887,18 +7899,6 @@
<value xml:lang="en-US">.uno:Undo</value>
</prop>
</node>
- <node oor:name="TAB_MOD1" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="en-US">.uno:NextMark</value>
- </prop>
- </node>
- <node oor:name="TAB_SHIFT_MOD1" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="en-US">.uno:PrevMark</value>
- </prop>
- </node>
<node oor:name="SUBTRACT" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="en-US">.uno:CollapseSection</value>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
