summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-25 21:47:16 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-25 21:47:16 +0200
commitd381760a0bdbc403426db365fcdd79c48805a1f9 (patch)
tree969d1f2189bb9c5d73ea358016389539c1ef23c5 /reportbuilder
parente7e8d94bb6d31abc98bbeb4026481aa052f29278 (diff)
parentbbc5105d503634578685f235497b39965f528d1a (diff)
merge commit
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu11
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu33
-rw-r--r--reportbuilder/util/description.xml2
-rw-r--r--reportbuilder/util/makefile.mk10
4 files changed, 6 insertions, 50 deletions
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index f49ee9583c2a..a5c874b9d6e4 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -133,67 +133,56 @@
<node oor:name="EntryNames">
<node oor:name="SunReportBuilder" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Sun Report Builder</value>
<value xml:lang="en-US">Sun Report Builder</value>
</prop>
<node oor:name="Entries">
<node oor:name="ReportHeader" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Berichtskopf</value>
<value xml:lang="en-US">Report Header</value>
</prop>
</node>
<node oor:name="ReportFooter" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Berichtsfuß</value>
<value xml:lang="en-US">Report Footer</value>
</prop>
</node>
<node oor:name="PageHeader" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Seitenkopf</value>
<value xml:lang="en-US">Page Header</value>
</prop>
</node>
<node oor:name="PageFooter" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Seitenfuß</value>
<value xml:lang="en-US">Page Footer</value>
</prop>
</node>
<node oor:name="GroupHeader" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Gruppenkopf</value>
<value xml:lang="en-US">Group Header</value>
</prop>
</node>
<node oor:name="GroupFooter" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Gruppenfuß</value>
<value xml:lang="en-US">Group Footer</value>
</prop>
</node>
<node oor:name="ColumnHeader" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Spaltenkopf</value>
<value xml:lang="en-US">Column Header</value>
</prop>
</node>
<node oor:name="ColumnFooter" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Spaltenfuß</value>
<value xml:lang="en-US">Column Footer</value>
</prop>
</node>
<node oor:name="Detail" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Detail</value>
<value xml:lang="en-US">Detail</value>
</prop>
</node>
<node oor:name="OverlappedControl" oor:op="replace">
<prop oor:name="DisplayName">
- <value xml:lang="de">Überlappende Steuerelemente</value>
<value xml:lang="en-US">Overlapped Control</value>
</prop>
</node>
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index 0e2a8fb4be83..67eb82dd6729 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -33,25 +33,21 @@
<node oor:name="Commands">
<node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Berichtskopf, -fuß</value>
<value xml:lang="en-US">Report Header/Footer</value>
</prop>
</node>
<node oor:name=".uno:PageHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Kopf-, Fußzeile</value>
<value xml:lang="en-US">Page Header/Footer</value>
</prop>
</node>
<node oor:name=".uno:ShowRuler" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Lineal</value>
<value xml:lang="en-US">~Ruler</value>
</prop>
</node>
<node oor:name=".uno:DbSortingAndGrouping" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Sortierung and Grupierung</value>
<value xml:lang="en-US">~Sorting and Grouping</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -60,29 +56,24 @@
</node>
<node oor:name=".uno:ConditionalFormatting" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Bedindungsabhängige Formatierung...</value>
<value xml:lang="en-US">~Conditional Formatting...</value>
</prop>
</node>
<node oor:name=".uno:PageDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Seiteneinstellungen</value>
<value xml:lang="en-US">Page Settings</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="de">Seiteneinstellungen...</value>
<value xml:lang="en-US">~Page...</value>
</prop>
</node>
<node oor:name=".uno:ResetAttributes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Stan~dardformatierung</value>
<value xml:lang="en-US">~Default Formatting</value>
</prop>
</node>
<node oor:name=".uno:InsertPageNumberField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Seitenzahlen...</value>
<value xml:lang="en-US">~Page Numbers...</value>
</prop>
</node>
@@ -98,13 +89,11 @@
</node>
<node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Unterbericht im neuen Fenster...</value>
<value xml:lang="en-US">~Subreport in New Window...</value>
</prop>
</node>
<node oor:name=".uno:FontColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Zeichenfarbe</value>
<value xml:lang="en-US">Font Color</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -113,25 +102,21 @@
</node>
<node oor:name=".uno:GridMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Raster</value>
<value xml:lang="en-US">Gr~id</value>
</prop>
</node>
<node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Spalten Kopf-, Fußzeile</value>
<value xml:lang="en-US">~Column Header/Footer</value>
</prop>
</node>
<node oor:name=".uno:PasteSpecial" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">In~halte einfügen...</value>
<value xml:lang="en-US">Paste ~Special...</value>
</prop>
</node>
<node oor:name=".uno:ExecuteReport" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Bericht ausführen...</value>
<value xml:lang="en-US">Execute Report...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -140,25 +125,21 @@
</node>
<node oor:name=".uno:ImageControl" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Grafik</value>
<value xml:lang="en-US">Graphic...</value>
</prop>
</node>
<node oor:name=".uno:TextDocument" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Text Dokument</value>
<value xml:lang="en-US">Text Document</value>
</prop>
</node>
<node oor:name=".uno:Spreadsheet" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Tabellen Dokument</value>
<value xml:lang="en-US">Spreadsheet Document</value>
</prop>
</node>
<node oor:name=".uno:ReportNavigator" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Berichtsnavigator</value>
<value xml:lang="en-US">Report Navigator</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -167,7 +148,6 @@
</node>
<node oor:name=".uno:SmallestWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">HAS TO BE TARNSLATED: Fit to smallest width</value>
<value xml:lang="en-US">Fit to smallest width</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -176,7 +156,6 @@
</node>
<node oor:name=".uno:SmallestHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">HAS TO BE TARNSLATED: Fit to smallest height</value>
<value xml:lang="en-US">Fit to smallest height</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -185,7 +164,6 @@
</node>
<node oor:name=".uno:GreatestWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Fit to greatest width</value>
<value xml:lang="en-US">Fit to greatest width</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -194,7 +172,6 @@
</node>
<node oor:name=".uno:GreatestHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Fit to greatest height</value>
<value xml:lang="en-US">Fit to greatest height</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -203,7 +180,6 @@
</node>
<node oor:name=".uno:ControlProperties" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Eigenschaften</value>
<value xml:lang="en-US">Properties</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -212,19 +188,16 @@
</node>
<node oor:name=".uno:Distribution" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Verteilung...</value>
<value xml:lang="en-US">Distribution...</value>
</prop>
</node>
<node oor:name=".uno:SelectAllInSection" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">~Objekte im Bereich markieren</value>
<value xml:lang="en-US">~Select Objects in Section</value>
</prop>
</node>
<node oor:name=".uno:SectionAlignLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Linksbündig am Bereich</value>
<value xml:lang="en-US">Left Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -233,7 +206,6 @@
</node>
<node oor:name=".uno:SectionAlignRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Rechtsbündig am Bereich</value>
<value xml:lang="en-US">Right Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -242,7 +214,6 @@
</node>
<node oor:name=".uno:SectionAlignTop" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Oben am Bereich</value>
<value xml:lang="en-US">Top Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -404,25 +375,21 @@
<node oor:name="Popups">
<node oor:name=".uno:ExportReportTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Berichtsausgabeformat</value>
<value xml:lang="en-US">Report Output Format</value>
</prop>
</node>
<node oor:name=".uno:SnapLinesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">F�ührungslinien</value>
<value xml:lang="en-US">~Guides</value>
</prop>
</node>
<node oor:name=".uno:ObjectResize" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">Größenänderung</value>
<value xml:lang="en-US">Object Resizing</value>
</prop>
</node>
<node oor:name=".uno:ArrangeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="de">A~nordnung</value>
<value xml:lang="en-US">A~rrange</value>
</prop>
</node>
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 5a9bef4a5532..c254d5bd1a73 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -14,7 +14,7 @@
<version value="#VERSION#"/>
<identifier value="com.sun.reportdesigner"/>
<dependencies>
- <OpenOffice.org-minimal-version value="3.1" d:name="OpenOffice.org 3.1"/>
+ <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
</dependencies>
<publisher>
<name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems, Inc.</name>
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 6cb9d9808087..cd65b814abf9 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -32,7 +32,7 @@
PRJ=..
PRJNAME=reportbuilder
TARGET=rpt
-EXTENSION_VERSION_BASE=1.1.0
+EXTENSION_VERSION_BASE=1.2.0
.IF "$(CWS_WORK_STAMP)" == ""
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
@@ -42,7 +42,7 @@ EXTENSION_VERSION_BASE=1.1.0
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
-
+.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
# EXTENSIONNAME:=sun-report-builder
@@ -122,13 +122,13 @@ COMPONENT_MANIFEST_SEARCHDIR:=registry
# make sure to add your custom files here
EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
-
+.ENDIF
# --- Targets ----------------------------------
.INCLUDE : extension_pre.mk
.INCLUDE : target.mk
.INCLUDE : extension_post.mk
-
+.IF "$(L10N_framework)"==""
$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
@@ -152,7 +152,7 @@ $(COMPONENT_HELP) : $$(@:f)
$(DESCRIPTION_SRC): description.xml
+-$(RM) $@
$(TYPE) description.xml | $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" > $@
-
+.ENDIF
.ELSE # "$(SOLAR_JAVA)"!=""
.INCLUDE : target.mk
.ENDIF # "$(SOLAR_JAVA)"!=""