From b9d1006ebb3c97e398d4bb31075fd2577f3ac858 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Oct 2012 16:08:38 +0100 Subject: re-base on ALv2 code. Includes: #i118662# remove berkeleyDB from module l10tools Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1213189 reportdesign: remove extra items from Help menu Patch contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1201215 --- reportdesign/uiconfig/dbreport/menubar/menubar.xml | 22 +++++++++++++++++----- .../uiconfig/dbreport/statusbar/statusbar.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/Formatting.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/alignmentbar.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/arrowshapes.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/basicshapes.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/calloutshapes.xml | 17 +++++++++++++++++ reportdesign/uiconfig/dbreport/toolbar/drawbar.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/flowchartshapes.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/reportcontrols.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/resizebar.xml | 17 +++++++++++++++++ .../dbreport/toolbar/sectionalignmentbar.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/sectionshrinkbar.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/starshapes.xml | 17 +++++++++++++++++ .../uiconfig/dbreport/toolbar/symbolshapes.xml | 17 +++++++++++++++++ reportdesign/uiconfig/dbreport/toolbar/toolbar.xml | 17 +++++++++++++++++ 16 files changed, 272 insertions(+), 5 deletions(-) (limited to 'reportdesign/uiconfig') diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 21bfb56ea042..832854bd62fa 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -1,4 +1,21 @@ + @@ -416,12 +433,7 @@ - - - - - diff --git a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml index 7e50780b633d..d5e90ae3fd96 100644 --- a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml +++ b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml b/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml index 2fc8494938d4..ff8ed77c1ff1 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml index 1c4a05228a07..49466fc35a17 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml index 62f2e5e2d534..442fb1095ab4 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml index e26df54f29ab..0d37be099cf9 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml index 5a37c8de0301..288fa8302a40 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml b/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml index 07778059053a..8eabfafdc464 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml index d3e649930942..11998f275b9e 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml index ac460a3ba77c..8c13265ed8a6 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml b/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml index 864f588b976b..886e7ff0df86 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml index fc21516735a5..6caba27aa39f 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml index 0064ce8501b3..de02e1b6ee28 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml index 820e9c07434d..ba860b469145 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml index 4269c1d42e08..deeeab639f3d 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml index 55d77cb75f97..ae4bb6afdd58 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml @@ -1,5 +1,22 @@ + -- cgit