Removed using basic (advanced) shapes for rectangle/ellipse

This is on master.

4 files changed, 0 insertions, 86 deletions

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 988d9b45e..307529189 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -154,11 +154,6 @@ buildfix-instsetoo_native-archive.diff, i#111617
 buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
 
 [ Fixes ]
-# use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
-sd-toolbar-advanced-shapes.diff, n#171052, rodo
-svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
-svx-honour-customshape-capabilities.diff, n#395372, thorsten
-
 # Fix for n#113235
 wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
 
diff --git a/patches/dev300/sd-toolbar-advanced-shapes.diff b/patches/dev300/sd-toolbar-advanced-shapes.diff
deleted file mode 100644
index c0c445abb..000000000
--- a/patches/dev300/sd-toolbar-advanced-shapes.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- sd/uiconfig/sdraw/toolbar/toolbar.xml    |    4 ++--
- sd/uiconfig/simpress/toolbar/toolbar.xml |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git sd/uiconfig/sdraw/toolbar/toolbar.xml sd/uiconfig/sdraw/toolbar/toolbar.xml
-index 5ac55e4..aa5d754 100644
---- sd/uiconfig/sdraw/toolbar/toolbar.xml
-+++ sd/uiconfig/sdraw/toolbar/toolbar.xml
-@@ -5,8 +5,8 @@
-  <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbarseparator/>
-diff --git sd/uiconfig/simpress/toolbar/toolbar.xml sd/uiconfig/simpress/toolbar/toolbar.xml
-index 62d33c1..25bffb7 100644
---- sd/uiconfig/simpress/toolbar/toolbar.xml
-+++ sd/uiconfig/simpress/toolbar/toolbar.xml
-@@ -5,8 +5,8 @@
-  <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbarseparator/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/svx-honour-customshape-capabilities.diff b/patches/dev300/svx-honour-customshape-capabilities.diff
deleted file mode 100644
index a9e9df4fe..000000000
--- a/patches/dev300/svx-honour-customshape-capabilities.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- svx/source/svdraw/svdoashp.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
-index 6beb3db..82066f9 100644
---- svx/source/svdraw/svdoashp.cxx
-+++ svx/source/svdraw/svdoashp.cxx
-@@ -1669,6 +1669,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
-                 {
-                     rInfo.bCanConvToContour = aInfo.bCanConvToContour;
-                 }
-+
-+                if( !rInfo.bShearAllowed )
-+                    rInfo.bShearAllowed=FALSE;
-+                if( !aInfo.bEdgeRadiusAllowed )
-+                    rInfo.bEdgeRadiusAllowed=FALSE;
-             }
-         }
-     }
--- 
-1.7.0.1
-
diff --git a/patches/dev300/svx-shapes-default-word-wrap-enable.diff b/patches/dev300/svx-shapes-default-word-wrap-enable.diff
deleted file mode 100644
index 5aac646fa..000000000
--- a/patches/dev300/svx-shapes-default-word-wrap-enable.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- svx/source/svdraw/svdattr.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdattr.cxx
-index 20af90e..2f5a0dd 100644
---- svx/source/svdraw/svdattr.cxx
-+++ svx/source/svdraw/svdattr.cxx
-@@ -149,7 +149,7 @@ SdrItemPool::SdrItemPool(
-     mppLocalPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem;
-     mppLocalPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES );
-     mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem;
--    mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP		   -SDRATTR_START]=new SdrTextWordWrapItem;
-+    mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP		   -SDRATTR_START]=new SdrTextWordWrapItem( FALSE );
-     mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWSIZE	   -SDRATTR_START]=new SdrTextAutoGrowSizeItem;
-     mppLocalPoolDefaults[SDRATTR_EDGEKIND         -SDRATTR_START]=new SdrEdgeKindItem;
-     mppLocalPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist);
--- 
-1.7.0.1
-