diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-27 11:00:04 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-27 11:00:04 +0000 |
| commit | cb5c73b6eb8732a85ec91a48199ac01a966111cc (patch) | |
| tree | e17303bf1702fa467374063e0bdd03fb4cb91e4c /reportdesign | |
| parent | 2bb0c1ccfa05fbd07d9d72b5322f3cf1e7813c60 (diff) | |
INTEGRATION: CWS dba24lms (1.2.56); FILE MERGED
2007/11/09 09:45:18 oj 1.2.56.1: #i83469# insert strings
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/uiconfig/dbreport/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml | 7 | ||||
| -rw-r--r-- | reportdesign/util/makefile.pmk | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 1b0890fd0b1a..0b84d9bcd326 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -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"> diff --git a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml index 7de592943b43..7f5040428309 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml @@ -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"/> diff --git a/reportdesign/util/makefile.pmk b/reportdesign/util/makefile.pmk index 285156437cbe..f3a91fbc31f5 100644 --- a/reportdesign/util/makefile.pmk +++ b/reportdesign/util/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2007-07-09 11:56:41 $ +# last change: $Author: ihi $ $Date: 2007-11-27 12:00:04 $ # # 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 |