From c798e3b7a5d4ee5b21eb697fb0f260dd04894d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 20 Oct 2015 10:13:59 +0100 Subject: [PATCH] use far simpler size group --- ...-control-over-enhanced-shape-control.patch | 81 ++++++++----------- 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/0001-implement-dialog-control-over-enhanced-shape-control.patch b/0001-implement-dialog-control-over-enhanced-shape-control.patch index 19f0a6d..b71c7b3 100644 --- a/0001-implement-dialog-control-over-enhanced-shape-control.patch +++ b/0001-implement-dialog-control-over-enhanced-shape-control.patch @@ -1,4 +1,4 @@ -From 5181f093a8792b17fb4192770f2e968849e6f015 Mon Sep 17 00:00:00 2001 +From e9680d99c4403bd07ab4d50939a5d7791bceb98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Oct 2015 13:16:31 +0100 Subject: [PATCH] implement dialog control over enhanced shape control points @@ -10,10 +10,10 @@ Change-Id: I7e6a4db0699076950adf5869a61825159766c46a (cherry picked from commit b859d84e471fdb70b61607d2d919a7907d074bd0) --- cui/source/inc/transfrm.hxx | 6 + - cui/source/tabpages/transfrm.cxx | 137 +++++++++++++- - cui/uiconfig/ui/slantcornertabpage.ui | 334 +++++++++++++++++++++++++++++----- + cui/source/tabpages/transfrm.cxx | 137 ++++++++++++++- + cui/uiconfig/ui/slantcornertabpage.ui | 310 ++++++++++++++++++++++++++++++---- include/svx/EnhancedCustomShape2d.hxx | 1 + - 4 files changed, 429 insertions(+), 49 deletions(-) + 4 files changed, 416 insertions(+), 38 deletions(-) diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 2945d28..2fe2524 100644 @@ -225,24 +225,13 @@ index 950a4b2..43375c2 100644 get(m_pMtrPosX, "MTR_FLD_POS_X"); get(m_pMtrPosY, "MTR_FLD_POS_Y"); diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui -index 37b7b0e..27814a5 100644 +index 37b7b0e..b3ce646 100644 --- a/cui/uiconfig/ui/slantcornertabpage.ui +++ b/cui/uiconfig/ui/slantcornertabpage.ui -@@ -2,23 +2,132 @@ - - - -- -- 500 -- 10 -- 10 -- -- -- -89 -- 89 -- 1 -- 10 -- +@@ -13,12 +13,132 @@ + 1 + 10 + - + True @@ -375,7 +364,7 @@ index 37b7b0e..27814a5 100644 True -@@ -32,37 +141,36 @@ +@@ -32,37 +152,36 @@ 6 12 @@ -422,7 +411,7 @@ index 37b7b0e..27814a5 100644 -@@ -73,8 +181,8 @@ +@@ -73,8 +192,8 @@ True False @@ -432,7 +421,7 @@ index 37b7b0e..27814a5 100644 -@@ -82,9 +190,8 @@ +@@ -82,9 +201,8 @@ @@ -444,7 +433,7 @@ index 37b7b0e..27814a5 100644 -@@ -100,37 +207,36 @@ +@@ -100,37 +218,36 @@ 6 12 @@ -491,7 +480,7 @@ index 37b7b0e..27814a5 100644 -@@ -141,8 +247,128 @@ +@@ -141,8 +258,128 @@ True False @@ -621,7 +610,7 @@ index 37b7b0e..27814a5 100644 -@@ -150,12 +376,36 @@ +@@ -150,16 +387,19 @@ @@ -633,34 +622,30 @@ index 37b7b0e..27814a5 100644 -+ -+ + + + + -+ -+ -+ -+ -+ -+ + + + + + + + +@@ -168,4 +408,12 @@ + + + ++ ++ ++ ++ ++ ++ + + -+ -+ 500 -+ 10 -+ 10 -+ -+ -+ -89 -+ 89 -+ 1 -+ 10 -+ - - - + diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index b9ed6f2..b1cc1b7 100644 --- a/include/svx/EnhancedCustomShape2d.hxx