Tag: cws_dev300_dba31a User: fs Date: 2008-07-30 12:08:33+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/util/makefile.mk dba/reportdesign/util/description.xml
Log: RESYNC: (1.18-1.19); FILE MERGED File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.14.24.9&r2=1.14.24.10 Delta lines: +5 -3 ------------------- --- ReportController.cxx 2008-07-15 08:38:56+0000 1.14.24.9 +++ ReportController.cxx 2008-07-30 12:08:21+0000 1.14.24.10 @@ -757,9 +757,11 @@ aReturn.bEnabled = isConnected() && isEditable(); break; case SID_EDITDOC: - case SID_PAGEDIALOG: aReturn.bChecked = isEditable(); break; + case SID_PAGEDIALOG: + aReturn.bEnabled = isEditable(); + break; case SID_BACKGROUND_COLOR: impl_fillState_nothrow(PROPERTY_CONTROLBACKGROUND,aReturn); break; Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.18.20.3&r2=1.18.20.4 Delta lines: +10 -3 -------------------- --- makefile.mk 2008-07-18 07:46:30+0000 1.18.20.3 +++ makefile.mk 2008-07-30 12:08:25+0000 1.18.20.4 @@ -231,6 +231,9 @@ COMPONENT_JARFILES = \ $(EXTENSIONDIR)$/sun-report-builder.jar +COMPONENT_HELP= \ + $(EXTENSIONDIR)$/help$/component.txt + # .jar files from solver COMPONENT_EXTJARFILES = \ $(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar \ @@ -251,7 +254,7 @@ COMPONENT_MANIFEST_SEARCHDIR:=registry # make sure to add your custom files here -EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) +EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) # --- Targets ---------------------------------- @@ -277,6 +280,10 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(COMPONENT_HELP) : $$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + .ELSE # "$(SOLAR_JAVA)"!="" .INCLUDE : target.mk .ENDIF # "$(SOLAR_JAVA)"!="" Directory: /dba/reportdesign/util/ ================================== File [changed]: description.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/description.xml?r1=1.4.22.2&r2=1.4.22.3 Delta lines: +3 -0 ------------------- --- description.xml 2008-07-16 06:16:26+0000 1.4.22.2 +++ description.xml 2008-07-30 12:08:28+0000 1.4.22.3 @@ -16,4 +16,7 @@ <dependencies> <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/> </dependencies> + <publisher> + <name xlink:href="http://www.sun.com/staroffice"; lang="en">Sun Microsystems, Inc.</name> + </publisher> </description> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
