Tag: cws_src680_dba24lms User: oj Date: 2007-11-09 09:45:21+0000 Modified: dba/reportdesign/uiconfig/dbreport/menubar/menubar.xml dba/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml dba/reportdesign/util/makefile.mk dba/reportdesign/util/makefile.pmk dba/reportdesign/util/manifest.xml
Log: #i83469# insert strings File Changes: Directory: /dba/reportdesign/uiconfig/dbreport/menubar/ ======================================================= File [changed]: menubar.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/uiconfig/dbreport/menubar/menubar.xml?r1=1.2&r2=1.2.56.1 Delta lines: +1 -0 ------------------- --- menubar.xml 2007-07-09 11:56:39+0000 1.2 +++ menubar.xml 2007-11-09 09:45:18+0000 1.2.56.1 @@ -10,6 +10,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:CloseDoc"/> <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:SaveAs"/> <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuseparator/> <menu:menu menu:id=".uno:ExportReportTo"> Directory: /dba/reportdesign/uiconfig/dbreport/toolbar/ ======================================================= File [changed]: reportcontrols.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml?r1=1.2&r2=1.2.56.1 Delta lines: +0 -7 ------------------- --- reportcontrols.xml 2007-07-09 11:56:40+0000 1.2 +++ reportcontrols.xml 2007-11-09 09:45:18+0000 1.2.56.1 @@ -12,13 +12,6 @@ <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:helpid="helpid:10928" toolbar:style="radio" /> <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:helpid="helpid:10929" toolbar:style="radio" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007" toolbar:style="dropdown"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:helpid="helpid:27322" toolbar:style="radio auto" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:helpid="helpid:27154" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:helpid="helpid:27153" toolbar:visible="false"/> Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.8&r2=1.8.22.1 Delta lines: +20 -7 -------------------- --- makefile.mk 2007-09-26 14:25:36+0000 1.8 +++ makefile.mk 2007-11-09 09:45:18+0000 1.8.22.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.22.1 $ # -# last change: $Author: hr $ $Date: 2007/09/26 14:25:36 $ +# last change: $Author: oj $ $Date: 2007/11/09 09:45:18 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,6 @@ .INCLUDE : settings.mk # ------------------------------------------------------------------ - # --- reportdesign core (rpt) ----------------------------------- LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -213,6 +212,9 @@ XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml +XCU_FILES := $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess.xcu \ + $(ZIP1DIR)$/merge$/org$/openoffice$/Office$/DataAccess.xcu + HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ $(ZIP1DIR)$/readme_en-US.html \ $(ZIP1DIR)$/readme_en-US.txt @@ -246,6 +248,9 @@ $(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" +$(MISC)$/update_report.flag : $(XCU_FILES) + $(TOUCH) $@ + $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml @@ -265,6 +270,14 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/%.xcu : $(MISC)$/registry$/data$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/merge$/org$/openoffice$/Office$/%.xcu : $(MISC)$/merge$/org$/openoffice$/Office$/%.xcu + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(ZIP1DIR)$/%.jar : $(SOLARBINDIR)$/%.jar @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ @@ -273,9 +286,9 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/META-INF$/%.xml : %.xml +$(ZIP1DIR)$/META-INF$/manifest.xml : manifest.xml $(MISC)$/update_report.flag @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ + $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(ZIP1DIR) registry $(@:d:d) $(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) File [changed]: makefile.pmk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.pmk?r1=1.2&r2=1.2.56.1 Delta lines: +6 -2 ------------------- --- makefile.pmk 2007-07-09 11:56:41+0000 1.2 +++ makefile.pmk 2007-11-09 09:45:18+0000 1.2.56.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.56.1 $ # -# last change: $Author: rt $ $Date: 2007/07/09 11:56:41 $ +# last change: $Author: oj $ $Date: 2007/11/09 09:45:18 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,10 +35,14 @@ XSLDIR=$(SOLARXMLDIR)$/processing XCSROOT=$(SOLARXMLDIR) +ABSXCSROOT=$(SOLARXMLDIR) DTDDIR=$(SOLARXMLDIR) PROCESSOUT=$(MISC) PROCESSORDIR=$(SOLARBINDIR) +# no validation by inspector class +NO_INSPECTION=TRUE + JAVAPREPRO= .IF "$(JDK_VERSION)" == "110" JAVAPREPRO=-jdk11 File [changed]: manifest.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/manifest.xml?r1=1.3&r2=1.3.48.1 Delta lines: +0 -1 ------------------- --- manifest.xml 2007-08-02 14:42:53+0000 1.3 +++ manifest.xml 2007-11-09 09:45:18+0000 1.3.48.1 @@ -2,4 +2,3 @@ <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";> <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" manifest:full-path="sun-report-builder.jar"/> -</manifest:manifest> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
