diff options
| author | Ruediger Timm <rt@openoffice.org> | 2010-05-28 13:55:18 +0200 |
|---|---|---|
| committer | Ruediger Timm <rt@openoffice.org> | 2010-05-28 13:55:18 +0200 |
| commit | 49e2eaef859dc12f7e99be3721971457b2f7bb21 (patch) | |
| tree | 6162299a9da7a28a1b01c7b69aa5b6f755c43154 | |
| parent | f145f28fcc05b132f45f8cfa792e80180b5a99d7 (diff) | |
| parent | 44772ea52b51ee8737a5e9ef60fd255efa849b84 (diff) | |
Merge CWS rt38 to DEV300 m79
| -rw-r--r-- | packimages/pack/image-sort.lst | 6 | ||||
| -rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 3 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 1 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst index 43202b8..d7a615b 100644 --- a/packimages/pack/image-sort.lst +++ b/packimages/pack/image-sort.lst @@ -89,7 +89,13 @@ uiconfig/modules/dbquery/toolbar/toolbar.xml uiconfig/modules/dbrelation/toolbar/toolbar.xml uiconfig/modules/dbtable/toolbar/toolbar.xml uiconfig/modules/StartModule/toolbar/standardbar.xml +uiconfig/modules/schart/toolbar/arrowshapes.xml +uiconfig/modules/schart/toolbar/basicshapes.xml +uiconfig/modules/schart/toolbar/calloutshapes.xml +uiconfig/modules/schart/toolbar/flowchartshapes.xml uiconfig/modules/schart/toolbar/standardbar.xml +uiconfig/modules/schart/toolbar/starshapes.xml +uiconfig/modules/schart/toolbar/symbolshapes.xml uiconfig/modules/schart/toolbar/toolbar.xml uiconfig/modules/scalc/toolbar/alignmentbar.xml uiconfig/modules/scalc/toolbar/arrowshapes.xml diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl index d01d24a..b4d6f79 100644 --- a/postprocess/checkdeliver/checkdeliver.pl +++ b/postprocess/checkdeliver/checkdeliver.pl @@ -95,9 +95,6 @@ sub get_globals if ( ! ( $platform && $srcrootdir && $solverdir ) ) { die "Error: please set environment\n"; } - if ( ! -d $srcrootdir ) { - die "Error: cannot find source directory '$srcrootdir'\n"; - } if ( ! -d $solverdir ) { die "Error: cannot find solver directory '$solverdir'\n"; } diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 1f33001..863c316 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -283,7 +283,6 @@ MY_FILES_main = \ $(MY_MOD)/fcfg_internalgraphics_filters.xcu \ $(MY_MOD)/fcfg_internalgraphics_types.xcu \ $(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \ - $(MY_MOD)/org/openoffice/Office/Writer-javamail.xcu \ $(MY_MOD)/org/openoffice/Setup-start.xcu \ $(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \ $(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 28b3dcd..3a0839f 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL +po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL |