incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1293264 [1/4] - in /incubator/ooo/branches/alg/install: ./ ext_libraries/apr-util/ ext_libraries/apr-util/prj/ ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/serf/ ext_libraries/serf/prj/ main/ main/accessibility/workben/ main/acc...
Date Fri, 24 Feb 2012 14:14:39 GMT
Author: alg
Date: Fri Feb 24 14:14:33 2012
New Revision: 1293264

URL: http://svn.apache.org/viewvc?rev=1293264&view=rev
Log:
resync to trunk

Added:
    incubator/ooo/branches/alg/install/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
      - copied unchanged from r1293259, incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
    incubator/ooo/branches/alg/install/ext_libraries/apr-util/aprutil_version.mk
      - copied unchanged from r1293259, incubator/ooo/trunk/ext_libraries/apr-util/aprutil_version.mk
    incubator/ooo/branches/alg/install/ext_libraries/apr/apr_version.mk
      - copied unchanged from r1293259, incubator/ooo/trunk/ext_libraries/apr/apr_version.mk
    incubator/ooo/branches/alg/install/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch
      - copied unchanged from r1293259, incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch
    incubator/ooo/branches/alg/install/ext_libraries/serf/serf_version.mk
      - copied unchanged from r1293259, incubator/ooo/trunk/ext_libraries/serf/serf_version.mk
    incubator/ooo/branches/alg/install/main/README
      - copied unchanged from r1293259, incubator/ooo/trunk/main/README
    incubator/ooo/branches/alg/install/main/solenv/inc/svpm.h
      - copied unchanged from r1293259, incubator/ooo/trunk/main/solenv/inc/svpm.h
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/AprEnv.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/AprEnv.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfCallbacks.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfInputStream.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfInputStream.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfInputStream.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfInputStream.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfLockStore.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfLockStore.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfLockStore.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfLockStore.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfSession.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfSession.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfTypes.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfUri.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/SerfUri.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresponseparser.hxx
      - copied unchanged from r1293259, incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.hxx
Removed:
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LinkSequence.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LinkSequence.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LockEntrySequence.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LockEntrySequence.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LockSequence.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/LockSequence.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonHeadRequest.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonHeadRequest.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonInputStream.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonInputStream.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonLockStore.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonLockStore.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonSession.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonSession.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonTypes.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonUri.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/NeonUri.hxx
Modified:
    incubator/ooo/branches/alg/install/   (props changed)
    incubator/ooo/branches/alg/install/ext_libraries/apr-util/makefile.mk
    incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/build.lst
    incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/d.lst
    incubator/ooo/branches/alg/install/ext_libraries/apr/makefile.mk
    incubator/ooo/branches/alg/install/ext_libraries/apr/prj/d.lst
    incubator/ooo/branches/alg/install/ext_libraries/serf/makefile.mk
    incubator/ooo/branches/alg/install/ext_libraries/serf/prj/d.lst
    incubator/ooo/branches/alg/install/main/accessibility/workben/makefile
    incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/Makefile
    incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile
    incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
    incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
    incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
    incubator/ooo/branches/alg/install/main/automation/source/inc/rcontrol.hxx
    incubator/ooo/branches/alg/install/main/automation/source/server/server.cxx
    incubator/ooo/branches/alg/install/main/automation/source/server/statemnt.cxx
    incubator/ooo/branches/alg/install/main/basegfx/source/workbench/Makefile
    incubator/ooo/branches/alg/install/main/bridges/test/inter_libs_exc/share.h
    incubator/ooo/branches/alg/install/main/comphelper/inc/comphelper/comphelperdllapi.h
    incubator/ooo/branches/alg/install/main/configure.in
    incubator/ooo/branches/alg/install/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.cxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.hxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/eertfpar.cxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit.hxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit2.cxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit4.cxx
    incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit5.cxx
    incubator/ooo/branches/alg/install/main/extensions/source/update/check/makefile.mk
    incubator/ooo/branches/alg/install/main/helpauthoring/filter/xmlhelp.dtd
    incubator/ooo/branches/alg/install/main/helpcontent2/helpers/xmlhelp.dtd
    incubator/ooo/branches/alg/install/main/i18npool/prj/d.lst
    incubator/ooo/branches/alg/install/main/i18npool/source/breakiterator/data/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/source/collator/data/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/source/collator/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/source/indexentry/data/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/source/localedata/data/locale.dtd
    incubator/ooo/branches/alg/install/main/i18npool/source/search/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/source/search/textsearch.cxx
    incubator/ooo/branches/alg/install/main/i18npool/source/textconversion/data/makefile.mk
    incubator/ooo/branches/alg/install/main/i18npool/util/makefile.mk
    incubator/ooo/branches/alg/install/main/l10ntools/java/jpropex/jpropex
    incubator/ooo/branches/alg/install/main/migrationanalysis/src/resources/analysis.dtd
    incubator/ooo/branches/alg/install/main/nss/makefile.mk
    incubator/ooo/branches/alg/install/main/odk/setsdkenv_unix
    incubator/ooo/branches/alg/install/main/oowintool
    incubator/ooo/branches/alg/install/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/branches/alg/install/main/postprocess/packregistry/makefile.mk
    incubator/ooo/branches/alg/install/main/pyuno/source/module/pyuno
    incubator/ooo/branches/alg/install/main/rat-excludes
    incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme.dtd
    incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme/readme.xrm
    incubator/ooo/branches/alg/install/main/readlicense_oo/prj/d.lst
    incubator/ooo/branches/alg/install/main/sal/inc/rtl/tres.h
    incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/build_coverage
    incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/gcov_all
    incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/statistics
    incubator/ooo/branches/alg/install/main/sal/qa/rtl/process/rtl_Process_Const.h
    incubator/ooo/branches/alg/install/main/sal/rtl/source/hash.h
    incubator/ooo/branches/alg/install/main/sal/test/bootstrap
    incubator/ooo/branches/alg/install/main/sccomp/source/solver/makefile.mk
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/common_brand.scp
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/makefile.mk
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/ooo_brand.scp
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/shortcut_ooo.scp
    incubator/ooo/branches/alg/install/main/scp2/source/sdkoo/sdkoo.scp
    incubator/ooo/branches/alg/install/main/scp2/util/makefile.mk
    incubator/ooo/branches/alg/install/main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
    incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile
    incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
    incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
    incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
    incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
    incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
    incubator/ooo/branches/alg/install/main/set_soenv.in
    incubator/ooo/branches/alg/install/main/setup_native/scripts/deregister_extensions
    incubator/ooo/branches/alg/install/main/setup_native/scripts/register_extensions
    incubator/ooo/branches/alg/install/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
    incubator/ooo/branches/alg/install/main/setup_native/tests/opensolaris/bundledextensions/send_ooo
    incubator/ooo/branches/alg/install/main/solenv/bin/_mkout
    incubator/ooo/branches/alg/install/main/solenv/bin/createpdbrelocators
    incubator/ooo/branches/alg/install/main/solenv/bin/cws
    incubator/ooo/branches/alg/install/main/solenv/bin/cwsattach
    incubator/ooo/branches/alg/install/main/solenv/bin/cwscreate
    incubator/ooo/branches/alg/install/main/solenv/bin/cwstestresult
    incubator/ooo/branches/alg/install/main/solenv/bin/cwstouched
    incubator/ooo/branches/alg/install/main/solenv/bin/gsicheck
    incubator/ooo/branches/alg/install/main/solenv/bin/langwrap
    incubator/ooo/branches/alg/install/main/solenv/bin/localize
    incubator/ooo/branches/alg/install/main/solenv/bin/localize_sl
    incubator/ooo/branches/alg/install/main/solenv/bin/oochkpatch
    incubator/ooo/branches/alg/install/main/solenv/bin/pchdelta
    incubator/ooo/branches/alg/install/main/solenv/bin/receditor
    incubator/ooo/branches/alg/install/main/solenv/bin/srcrelease.xml
    incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk
    incubator/ooo/branches/alg/install/main/sw/inc/docsh.hxx
    incubator/ooo/branches/alg/install/main/sw/source/ui/app/docshini.cxx
    incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx
    incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst
    incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap
    incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postinstall
    incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postremove
    incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/demo/CurrentTime.ods.ps
    incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/singletest/eis-test.odt.ps
    incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/demo/CurrentTime.ods.ps
    incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/singletest/eis-test.odt.ps
    incubator/ooo/branches/alg/install/main/toolkit/workben/layout/TEST
    incubator/ooo/branches/alg/install/main/toolkit/workben/layout/ooo-patch
    incubator/ooo/branches/alg/install/main/toolkit/workben/layout/refresh
    incubator/ooo/branches/alg/install/main/toolkit/workben/layout/run-s2x
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListener.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVException.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResource.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSession.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVTypes.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/PropertyMap.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/makefile.mk
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.cxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.hxx
    incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavservices.cxx
    incubator/ooo/branches/alg/install/main/unoil/climaker/cli_oootypes_config
    incubator/ooo/branches/alg/install/main/ure/source/jvmfwk3rc
    incubator/ooo/branches/alg/install/main/ure/source/unorc
    incubator/ooo/branches/alg/install/main/vcl/inc/os2/salgdi.h
    incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi.cxx
    incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi2.cxx
    incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi3.cxx
    incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/cleanupresources
    incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/replacesprmids
    incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/modelcleanup
    incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/rngtocxx
    incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFactory.h
    incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFilter.h
    incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeSync.h
    incubator/ooo/branches/alg/install/main/xmerge/source/activesync/resource.h
    incubator/ooo/branches/alg/install/main/xmerge/source/activesync/stdafx.h
    incubator/ooo/branches/alg/install/main/xmerge/source/palmtests/bin/rd

Propchange: incubator/ooo/branches/alg/install/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 14:14:33 2012
@@ -1,3 +1,3 @@
 /incubator/ooo/branches/alg/linecap:1226811-1232461
 /incubator/ooo/branches/alg/svgreplacement:1205420-1220782
-/incubator/ooo/trunk:1244476-1291669
+/incubator/ooo/trunk:1244476-1293259

Modified: incubator/ooo/branches/alg/install/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/apr-util/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/apr-util/makefile.mk Fri Feb 24 14:14:33 2012
@@ -1,23 +1,23 @@
-#/**************************************************************
-# * 
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# * 
-# *   http://www.apache.org/licenses/LICENSE-2.0
-# * 
-# * Unless required by applicable law or agreed to in writing,
-# * software distributed under the License is distributed on an
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# * KIND, either express or implied.  See the License for the
-# * specific language governing permissions and limitations
-# * under the License.
-# * 
-# *************************************************************/
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
 
 PRJ=.
 
@@ -27,12 +27,15 @@ TARGET=aprutil
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :      aprutil_version.mk
 
 # --- Files --------------------------------------------------------
 
-APRVERSION=1.4.1
+# Assemble the full version number from the parts defined in aprutil_version.mk
+APRUTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
 
-TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
+
+TARFILE_NAME=$(PRJNAME)-$(APRUTIL_VERSION)
 TARFILE_MD5=666a5d56098a9debf998510e304c8095
 
 .IF "$(OS)"=="WNT"
@@ -56,13 +59,27 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 .ELSE
 
+
+
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=autoconf && .$/configure
 CONFIGURE_FLAGS=								\
 	--with-apr=$(OUTDIR)/bin/apr-1-config		\
 	--prefix=$(OUTDIR)							\
 	--includedir=$(OUTDIR)$/inc$/apr-util		\
-	--with-iconv="no"	
+	--with-iconv="no"				
+
+
+# Use our own expat on the Mac.  Maybe we should do this on Linux, too?
+.IF "$(OS)" == "MACOSX"
+
+CONFIGURE_FLAGS+= --with-expat=$(OUTDIR)
+# The non-standard names of our expat libraries (yes, plural) make 
+# a special handling in apr-utils configure necessary.
+PATCH_FILES+= $(TARFILE_NAME).mac.expat.patch
+
+.ENDIF
+
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)

Modified: incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/build.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/build.lst (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/build.lst Fri Feb 24 14:14:33 2012
@@ -1,3 +1,3 @@
-apru     apr-util :  apr NULL	
-apru     apr-util usr1    -	all	apru_mkout NULL
-apru     apr-util nmake	-	all	apru_apr-util NULL
+apru     apr-util :  apr EXPAT:expat NULL	
+apru     apr-util usr1    -	all	apru_mkout NULL
+apru     apr-util nmake	-	all	apru_apr-util NULL

Modified: incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/d.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/apr-util/prj/d.lst Fri Feb 24 14:14:33 2012
@@ -1,12 +1,14 @@
 mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\inc\apr-util\apr*.h %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\inc\apr-util\apu.h %_DEST%\inc%_EXT%\apr-util
+..\aprutil_version.mk %_DEST%\inc%_EXT%
 
 # Unixes
 ..\%__SRC%\bin\apu-1-config %_DEST%\bin%_EXT%
 
 # Linux
-..\%__SRC%\lib\libaprutil-1.so* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libaprutil-1.so.*.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

Modified: incubator/ooo/branches/alg/install/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/apr/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/apr/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/apr/makefile.mk Fri Feb 24 14:14:33 2012
@@ -1,23 +1,23 @@
-#/**************************************************************
-# * 
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# * 
-# *   http://www.apache.org/licenses/LICENSE-2.0
-# * 
-# * Unless required by applicable law or agreed to in writing,
-# * software distributed under the License is distributed on an
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# * KIND, either express or implied.  See the License for the
-# * specific language governing permissions and limitations
-# * under the License.
-# * 
-# *************************************************************/
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
 
 PRJ=.
 
@@ -27,10 +27,12 @@ TARGET=apr
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :      apr_version.mk
 
 # --- Files --------------------------------------------------------
 
-APRVERSION=1.4.5
+# Assemble the full version number from the parts defined in apr_version.mk
+APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
 TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1

Modified: incubator/ooo/branches/alg/install/ext_libraries/apr/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/apr/prj/d.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/apr/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/apr/prj/d.lst Fri Feb 24 14:14:33 2012
@@ -1,20 +1,22 @@
-mkdir: %_DEST%\inc%_EXT%\apr
-mkdir: %_DEST%\lib%_EXT%\apr
-
-# Includes
-..\%__SRC%\inc\apr\apr*.h %_DEST%\inc%_EXT%\apr
-
-# Windows
-..\%__SRC%\bin\libapr-1.dll %_DEST%\bin%_EXT%
-..\%__SRC%\lib\libapr-1.lib %_DEST%\lib%_EXT%
-
-# Unixes
-..\%__SRC%\bin\apr-1-config %_DEST%\bin%_EXT%
-..\%__SRC%\bin\libtool %_DEST%\lib%_EXT%\apr
-..\%__SRC%\bin\apr_rules.mk %_DEST%\lib%_EXT%\apr
-
-# Linux
-..\%__SRC%\lib\libapr-1.so* %_DEST%\lib%_EXT%
-
-# Mac
-..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
+mkdir: %_DEST%\inc%_EXT%\apr
+mkdir: %_DEST%\lib%_EXT%\apr
+
+# Includes
+..\%__SRC%\inc\apr\apr*.h %_DEST%\inc%_EXT%\apr
+..\apr_version.mk %_DEST%\inc%_EXT%
+
+# Windows
+..\%__SRC%\bin\libapr-1.dll %_DEST%\bin%_EXT%
+..\%__SRC%\lib\libapr-1.lib %_DEST%\lib%_EXT%
+
+# Unixes
+..\%__SRC%\bin\apr-1-config %_DEST%\bin%_EXT%
+..\%__SRC%\bin\libtool %_DEST%\lib%_EXT%\apr
+..\%__SRC%\bin\apr_rules.mk %_DEST%\lib%_EXT%\apr
+
+# Linux
+..\%__SRC%\lib\libapr-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libapr-1.so.*.*
+
+# Mac
+..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%

Modified: incubator/ooo/branches/alg/install/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/serf/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/serf/makefile.mk Fri Feb 24 14:14:33 2012
@@ -1,23 +1,23 @@
-#/**************************************************************
-# * 
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# * 
-# *   http://www.apache.org/licenses/LICENSE-2.0
-# * 
-# * Unless required by applicable law or agreed to in writing,
-# * software distributed under the License is distributed on an
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# * KIND, either express or implied.  See the License for the
-# * specific language governing permissions and limitations
-# * under the License.
-# * 
-# *************************************************************/
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
 
 PRJ=.
 
@@ -27,19 +27,24 @@ TARGET=so_serf
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :	serf_version.mk
 
 # --- Files --------------------------------------------------------
 
-LIBSERFVERSION=1.0.0
+# Assemble the full version number from the parts defined in serf_version.mk
+LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
 TARFILE_MD5=3b179ed18f65c43141528aa6d2440db4
 
+# disable default used Transfer-Encoding = chunked for sending requests.
+PATCH_FILES=$(TARFILE_NAME).nochunkedtransferencoding.patch
+
 .IF "$(OS)"=="WNT"
 
 ADDITIONAL_FILES=Makefile Module_serf.mk Library_serf.mk Package_inc.mk
 
-PATCH_FILES=$(TARFILE_NAME).makewin32.patch
+PATCH_FILES+=$(TARFILE_NAME).makewin32.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
@@ -54,10 +59,10 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
 # Do not link against expat.  It is not necessary (apr-util is already linked against it)
 # and does not work (we use a different expat library schema.)
-PATCH_FILES=$(TARFILE_NAME).mac.patch
+PATCH_FILES+=$(TARFILE_NAME).mac.patch
 .ELSE
 # Add -ldl as last library so that the linker has no trouble resolving dependencies.
-PATCH_FILES=$(TARFILE_NAME).ldl.patch
+PATCH_FILES+=$(TARFILE_NAME).ldl.patch
 .ENDIF
 
 CONFIGURE_DIR=
@@ -83,10 +88,8 @@ OUT2LIB=.libs/libserf-1.so*
 
 .ENDIF
 
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-

Modified: incubator/ooo/branches/alg/install/ext_libraries/serf/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/ext_libraries/serf/prj/d.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/ext_libraries/serf/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/ext_libraries/serf/prj/d.lst Fri Feb 24 14:14:33 2012
@@ -1,9 +1,11 @@
-mkdir: %_DEST%\inc%_EXT%\serf
-..\%__SRC%\inc\serf\serf*.h %_DEST%\inc%_EXT%\serf
-
-# Mac
-..\%__SRC%\lib\libserf-1.*dylib %_DEST%\lib%_EXT%
-
-# Linux, BSD, et al
-..\%__SRC%\lib\libserf-1.so* %_DEST%\lib%_EXT%
-
+mkdir: %_DEST%\inc%_EXT%\serf
+..\%__SRC%\inc\serf\serf*.h %_DEST%\inc%_EXT%\serf
+..\serf_version.mk %_DEST%\inc%_EXT%
+
+# Mac
+..\%__SRC%\lib\libserf-1.*dylib %_DEST%\lib%_EXT%
+
+# Linux, BSD, et al
+..\%__SRC%\lib\libserf-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libserf-1.so.*.*
+

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 all:
 	cd source/org/openoffice/accessibility ; $(MAKE) all
 

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/Makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 all : subdirs
 
 ROOT=../../../

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:18 af Exp $
 
 all : package

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:21 af Exp $
 
 all : package

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:34 af Exp $
 
 all : package

Modified: incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:41 af Exp $
 
 all : package

Modified: incubator/ooo/branches/alg/install/main/automation/source/inc/rcontrol.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/automation/source/inc/rcontrol.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/automation/source/inc/rcontrol.hxx (original)
+++ incubator/ooo/branches/alg/install/main/automation/source/inc/rcontrol.hxx Fri Feb 24 14:14:33 2012
@@ -288,6 +288,14 @@
 //#define M_SOFFICE           0x0800  // Command valid for Star/Open Office
 //#define M_MOZILLA           0x1000  // Command valid for Mozilla
 
+// Enhencement
+#define M_GetHelpText  ( M_WITH_RETURN |  90 )
+#define M_GetQuickHelpText  ( M_WITH_RETURN |  91 )
+#define M_GetScreenRectangle ( M_WITH_RETURN |  92 )
+#define M_HasFocus ( M_WITH_RETURN |  93 )
+#define M_GetItemHelpText ( M_WITH_RETURN |  94 )
+#define M_GetItemQuickHelpText ( M_WITH_RETURN |  95 )
+#define M_GetItemText2 ( M_WITH_RETURN |  96 )
 
 // RemoteCommands
 #define RC_AppAbort			( M_SOFFICE | M_MOZILLA | 1 )

Modified: incubator/ooo/branches/alg/install/main/automation/source/server/server.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/automation/source/server/server.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/automation/source/server/server.cxx (original)
+++ incubator/ooo/branches/alg/install/main/automation/source/server/server.cxx Fri Feb 24 14:14:33 2012
@@ -187,7 +187,20 @@ sal_uLong RemoteControlCommunicationMana
                 break;
             }
         }
-
+	// Get port from command line
+	if (bAutomate) 
+	{
+		for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+		{
+			if ( Application::GetCommandLineParam( i ).Copy(0,16).EqualsIgnoreCaseAscii("/automationport=") 
+				|| Application::GetCommandLineParam( i ).Copy(0,16).EqualsIgnoreCaseAscii("-automationport="))
+			{
+                		nPortIs = Application::GetCommandLineParam( i ).Copy(16).ToInt32();
+                		return nPortIs;
+			}
+           	}
+	}
+	//
 // if started within Portal determin location of testtool.ini/rc by analysing the commandline
 // /userid:demo1[/export/home/user/demo1]
 // -userid:demo1[/export/home/user/demo1]

Modified: incubator/ooo/branches/alg/install/main/automation/source/server/statemnt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/automation/source/server/statemnt.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/automation/source/server/statemnt.cxx (original)
+++ incubator/ooo/branches/alg/install/main/automation/source/server/statemnt.cxx Fri Feb 24 14:14:33 2012
@@ -3955,6 +3955,32 @@ sal_Bool StatementControl::HandleVisible
 					ValueOK(aUId, MethodString( nMethodId ),nNr1,CountWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True ) );
             }
 			break;
+		case M_HasFocus:
+			{
+				pRet->GenReturn ( RET_Value, aUId, pControl->HasFocus() );
+			break;
+			}
+		case M_GetScreenRectangle:
+			{
+				Rectangle aRect =  bBool1 ? pControl->GetClientWindowExtentsRelative(NULL) : pControl->GetWindowExtentsRelative( NULL );
+                pRet->GenReturn ( RET_Value, aUId, 
+					UniString::CreateFromInt32(aRect.Left()).
+					AppendAscii(",").Append(UniString::CreateFromInt32(aRect.Top())).
+					AppendAscii(",").Append(UniString::CreateFromInt32(aRect.GetWidth())).
+					AppendAscii(",").Append(UniString::CreateFromInt32(aRect.GetHeight()))
+					);
+			}
+			break;
+		case M_GetHelpText:
+			{
+				pRet->GenReturn ( RET_Value, aUId, pControl->GetHelpText());
+			}
+			break;
+		case M_GetQuickHelpText:
+			{
+				pRet->GenReturn ( RET_Value, aUId,pControl->GetQuickHelpText());
+			}
+			break;
 		default:
 			return sal_False;
 		}
@@ -5422,6 +5448,24 @@ sal_Bool StatementControl::Execute()
 								            case 3:
 									            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
 									            break;
+											case 11:
+												pRet->GenReturn ( RET_Value, aUId, (comm_ULONG) nItemPos + 1);
+												break;
+											case 12:
+												pRet->GenReturn ( RET_Value, aUId, Id2Str(pTB->GetHelpId())); // The toolbox's help id
+												break;
+											case 13:
+											{
+												Rectangle aRect = pTB->GetItemPosRect( nItemPos );
+												Rectangle aTBRect = pTB->GetWindowExtentsRelative( NULL );
+												pRet->GenReturn ( RET_Value, aUId, 
+												UniString::CreateFromInt32(aRect.Left()+aTBRect.Left()).
+													AppendAscii(",").Append(UniString::CreateFromInt32(aRect.Top()+aTBRect.Top())).
+													AppendAscii(",").Append(UniString::CreateFromInt32(aRect.GetWidth())).
+													AppendAscii(",").Append(UniString::CreateFromInt32(aRect.GetHeight()))
+												);
+												break;
+											}
 								            default:
 									            ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
                                                 pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
@@ -5430,6 +5474,18 @@ sal_Bool StatementControl::Execute()
 									}
 								}
 								break;
+							case M_GetItemHelpText :
+								if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pTB->GetItemCount() ))
+									pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetHelpText(pTB->GetItemId(nNr1-1)));
+								break;
+							case M_GetItemQuickHelpText :
+								if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pTB->GetItemCount() ))
+									pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetQuickHelpText(pTB->GetItemId(nNr1-1)));
+								break;
+							case M_GetItemText2:
+								if ( ValueOK( aUId, MethodString( nMethodId ), nNr1, pTB->GetItemCount() ))
+									pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetItemText(pTB->GetItemId(nNr1-1)));
+								break;
 							case M_GetItemText :
 								pRet->GenReturn ( RET_Value, aUId, (String)pTB->GetItemText(nNr1));
 								break;

Modified: incubator/ooo/branches/alg/install/main/basegfx/source/workbench/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/basegfx/source/workbench/Makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/basegfx/source/workbench/Makefile (original)
+++ incubator/ooo/branches/alg/install/main/basegfx/source/workbench/Makefile Fri Feb 24 14:14:33 2012
@@ -1,4 +1,64 @@
 # Testbuild
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 
 #test : bezierclip.cxx convexhull.cxx
 #	g++ -Wall -g \

Modified: incubator/ooo/branches/alg/install/main/bridges/test/inter_libs_exc/share.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/bridges/test/inter_libs_exc/share.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/bridges/test/inter_libs_exc/share.h (original)
+++ incubator/ooo/branches/alg/install/main/bridges/test/inter_libs_exc/share.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>

Modified: incubator/ooo/branches/alg/install/main/comphelper/inc/comphelper/comphelperdllapi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/comphelper/inc/comphelper/comphelperdllapi.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/comphelper/inc/comphelper/comphelperdllapi.h (original)
+++ incubator/ooo/branches/alg/install/main/comphelper/inc/comphelper/comphelperdllapi.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 #ifndef INCLUDED_COMPHELPERDLLAPI_H
 #define INCLUDED_COMPHELPERDLLAPI_H
                                                                                                                              

Modified: incubator/ooo/branches/alg/install/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/configure.in?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/configure.in (original)
+++ incubator/ooo/branches/alg/install/main/configure.in Fri Feb 24 14:14:33 2012
@@ -46,6 +46,9 @@ AC_ARG_ENABLE(graphite,
 AC_ARG_WITH(system-graphite,
 [  --with-system-graphite    use graphite library already installed on system
 ],,)
+AC_ARG_ENABLE(online-update,
+[  --disable-online-update Disables the Online Update feature.
+],,enable_online_update=yes)
 AC_ARG_ENABLE(ldap,
 [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
                           or OpenLDAP LDAP SDK
@@ -553,9 +556,6 @@ AC_ARG_ENABLE(Xaw,
 [  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
                            plugin
 ],,)
-AC_ARG_WITH(system-neon,
-[  --with-system-neon      Use neon already on system
-],,)
 AC_ARG_ENABLE(hunspell,
 [  --enable-hunspell       Determines whether to enable the Hunspell library.
                           If enabled, the library will be built unless you
@@ -1345,6 +1345,20 @@ fi
 
 # gstreamer is used only via pre-installed libraries: not a problem
 
+dnl ===================================================================
+dnl Online Update
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable the Online Update support])
+if test "$enable_online_update" = "yes" -o "$enable_online_update" = "TRUE"; then
+   ENABLE_ONLINE_UPDATE="YES"
+   SCPDEFS="$SCPDEFS -DENABLE_ONLINE_UPDATE"
+   AC_MSG_RESULT([yes])
+else
+   ENABLE_ONLINE_UPDATE=""
+   AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_ONLINE_UPDATE)
+
 
 AC_MSG_CHECKING([whether to enable native CUPS support])
 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
@@ -5134,23 +5148,6 @@ AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
 
 dnl ===================================================================
-dnl Check for system neon
-dnl ===================================================================
-AC_MSG_CHECKING([which neon is used])
-if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-	test "$with_system_neon" != "no"; then
-        AC_MSG_RESULT([external])
-        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
-        NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-        NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-        SYSTEM_NEON=YES
-fi	
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_VERSION)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
-
-dnl ===================================================================
 dnl Check for system openssl
 dnl ===================================================================
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then

Modified: incubator/ooo/branches/alg/install/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h (original)
+++ incubator/ooo/branches/alg/install/main/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 #ifndef INCLUDED_DRAWINGLAYERDLLAPI_H
 #define INCLUDED_DRAWINGLAYERDLLAPI_H
 

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.cxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.cxx Fri Feb 24 14:14:33 2012
@@ -1066,12 +1066,27 @@ void ContentNode::CreateDefFont()
 {
 	// Erst alle Informationen aus dem Style verwenden...
 	SfxStyleSheet* pS = aContentAttribs.GetStyleSheet();
-	if ( pS )
-		CreateFont( GetCharAttribs().GetDefFont(), pS->GetItemSet() );
-	
+	/* if ( pS ) //#115580#
+	CreateFont( GetCharAttribs().GetDefFont(), pS->GetItemSet() );
+
 	// ... dann die harte Absatzformatierung rueberbuegeln...
 	CreateFont( GetCharAttribs().GetDefFont(),
-		GetContentAttribs().GetItems(), pS == NULL );
+		GetContentAttribs().GetItems(), pS == NULL ); */
+
+	SvxFont& rFont = GetCharAttribs().GetDefFont();
+	SvxFont& rFontCJK = GetCharAttribs().GetDefFontCJK();
+	SvxFont& rFontCTL = GetCharAttribs().GetDefFontCTL();
+
+	if ( pS )
+	{
+		CreateFont( rFont, pS->GetItemSet(), sal_True, i18n::ScriptType::LATIN );
+		CreateFont( rFontCJK, pS->GetItemSet(), sal_True, i18n::ScriptType::ASIAN );
+		CreateFont( rFontCTL, pS->GetItemSet(), sal_True, i18n::ScriptType::COMPLEX );
+	}
+
+	CreateFont( rFont, GetContentAttribs().GetItems(), pS == NULL, i18n::ScriptType::LATIN );
+	CreateFont( rFontCJK, GetContentAttribs().GetItems(), pS == NULL, i18n::ScriptType::ASIAN );
+	CreateFont( rFontCTL, GetContentAttribs().GetItems(), pS == NULL, i18n::ScriptType::COMPLEX );
 }
 
 void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle )
@@ -1448,7 +1463,7 @@ sal_uLong EditDoc::GetTextLen() const
 	{
 		ContentNode* pNode = GetObject( nNode );
 		nLen += pNode->Len();
-		// Felder k�nnen laenger sein als der Platzhalter im Node.
+		// Felder k???nnen laenger sein als der Platzhalter im Node.
 		const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
 		for ( sal_uInt16 nAttr = rAttrs.Count(); nAttr; )
 		{
@@ -1560,6 +1575,9 @@ EditPaM EditDoc::InsertParaBreak( EditPa
 
 	// Den Default-Font kopieren
 	pNode->GetCharAttribs().GetDefFont() = aPaM.GetNode()->GetCharAttribs().GetDefFont();
+	//#115580# start
+	pNode->GetCharAttribs().GetDefFontCJK() = aPaM.GetNode()->GetCharAttribs().GetDefFontCJK();
+	pNode->GetCharAttribs().GetDefFontCTL() = aPaM.GetNode()->GetCharAttribs().GetDefFontCTL();
 	SfxStyleSheet* pStyle = aPaM.GetNode()->GetStyleSheet();
 	if ( pStyle )
 	{

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.hxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/editdoc.hxx Fri Feb 24 14:14:33 2012
@@ -202,7 +202,9 @@ class CharAttribList
 {
 private:
 	CharAttribArray	aAttribs;
-	SvxFont			aDefFont;				// schneller, als jedesmal vom Pool!
+	SvxFont			aDefFont;			// schneller, als jedesmal vom Pool!
+	SvxFont			aDefFontCJK;			//#115580#
+	SvxFont			aDefFontCTL;
 	sal_Bool			bHasEmptyAttribs;
 
 					CharAttribList( const CharAttribList& ) {;}
@@ -228,6 +230,8 @@ public:
 	void			InsertAttrib( EditCharAttrib* pAttrib );
 
 	SvxFont&		GetDefFont() 			{ return aDefFont; }
+	SvxFont&		GetDefFontCJK() 		{ return aDefFontCJK; } //#115580#
+	SvxFont&		GetDefFontCTL() 		{ return aDefFontCTL; }
 
 	sal_Bool			HasEmptyAttribs() const	{ return bHasEmptyAttribs; }
 	sal_Bool&			HasEmptyAttribs() 		{ return bHasEmptyAttribs; }

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/eertfpar.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/eertfpar.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/eertfpar.cxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/eertfpar.cxx Fri Feb 24 14:14:33 2012
@@ -108,7 +108,7 @@ SvParserState __EXPORT EditRTFParser::Ca
 	EditPaM aStart2PaM = aCurSel.Min();
 	// Sinnvoll oder nicht?:
 	aStart2PaM.GetNode()->GetContentAttribs().GetItems().ClearItem();
-    AddRTFDefaultValues( aStart2PaM, aStart2PaM );
+    //AddRTFDefaultValues( aStart2PaM, aStart2PaM ); //#115580#
 	EditPaM aEnd1PaM( pImpEditEngine->ImpInsertParaBreak( aCurSel.Max() ) );
 	// aCurCel zeigt jetzt auf den Zwischenraum
 
@@ -136,6 +136,47 @@ SvParserState __EXPORT EditRTFParser::Ca
 		aSel.Min() = EditPaM( pPrevNode, pPrevNode->Len() );
 		aSel.Max() = EditPaM( pCurNode, 0 );
 		aCurSel.Max() = pImpEditEngine->ImpDeleteSelection( aSel );
+		//#115580# added at 2011/11/28 start
+		sal_uInt16 nStart2 = pImpEditEngine->GetEditDoc().GetPos( aStart2PaM.GetNode() );
+		sal_uInt16 nEnd2 = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+		for ( sal_uInt16 n = nStart2; n <= nEnd2; n++ )
+		{
+			ContentNode* pTmpNode = pImpEditEngine->GetEditDoc().SaveGetObject( n );
+			if ( pTmpNode )
+			{
+				{//if ContentAttribs of node has no font info, add default font attribs into it.
+					Size aSz( 12, 0 );
+					MapMode aPntMode( MAP_POINT );
+					MapMode _aEditMapMode( pImpEditEngine->GetRefDevice()->GetMapMode().GetMapUnit() );
+					aSz = pImpEditEngine->GetRefDevice()->LogicToLogic( aSz, &aPntMode, &_aEditMapMode );
+
+					SfxItemSet& rSet = pTmpNode->GetContentAttribs().GetItems();
+					SvxFont& rFont = pTmpNode->GetCharAttribs().GetDefFont();
+					SvxFont& rFontCJK = pTmpNode->GetCharAttribs().GetDefFontCJK();
+					SvxFont& rFontCTL = pTmpNode->GetCharAttribs().GetDefFontCTL();
+
+					if ( rSet.GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), XubString(), 
+									rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+					if ( rSet.GetItemState( EE_CHAR_FONTINFO_CJK ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontItem( rFontCJK.GetFamily(), rFontCJK.GetName(), XubString(), 
+									rFontCJK.GetPitch(), rFontCJK.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
+					if ( rSet.GetItemState( EE_CHAR_FONTINFO_CTL ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontItem( rFontCTL.GetFamily(), rFontCTL.GetName(), XubString(), 
+									rFontCTL.GetPitch(), rFontCTL.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
+
+					if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT )  );
+					if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT_CJK ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT_CJK )  );
+					if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT_CTL ) != SFX_ITEM_ON )
+						rSet.Put( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT_CTL )  );
+				}
+
+				pImpEditEngine->AdjustParaAttribsByStyleSheet( pTmpNode );
+				pImpEditEngine->ParaAttribsToCharAttribs( pTmpNode );
+			}
+		}
 	}
 	EditPaM aEnd2PaM( aCurSel.Max() );
     //AddRTFDefaultValues( aStart2PaM, aEnd2PaM );
@@ -145,14 +186,16 @@ SvParserState __EXPORT EditRTFParser::Ca
 	// => Zeichenattribute machen.
 
 	sal_Bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? sal_False : sal_True;
-	if ( bOnlyOnePara || aStart1PaM.GetNode()->Len() )
-		pImpEditEngine->ParaAttribsToCharAttribs( aStart2PaM.GetNode() );
+	/* if ( bOnlyOnePara || aStart1PaM.GetNode()->Len() ) //#115580# 
+		pImpEditEngine->ParaAttribsToCharAttribs( aStart2PaM.GetNode() ); */
+	// end
 	aCurSel.Min() = pImpEditEngine->ImpConnectParagraphs(
 		aStart1PaM.GetNode(), aStart2PaM.GetNode(), bSpecialBackward );
 	bSpecialBackward = aEnd1PaM.GetNode()->Len() ? sal_True : sal_False;
 	// wenn bOnlyOnePara, dann ist der Node beim Connect verschwunden.
-	if ( !bOnlyOnePara && aEnd1PaM.GetNode()->Len() )
-		pImpEditEngine->ParaAttribsToCharAttribs( aEnd2PaM.GetNode() );
+	/* if ( !bOnlyOnePara && aEnd1PaM.GetNode()->Len() )	//#115580# 
+		pImpEditEngine->ParaAttribsToCharAttribs( aEnd2PaM.GetNode() ); */
+	// end
 	aCurSel.Max() = pImpEditEngine->ImpConnectParagraphs(
 		( bOnlyOnePara ? aStart1PaM.GetNode() : aEnd2PaM.GetNode() ),
 			aEnd1PaM.GetNode(), bSpecialBackward );

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit.hxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit.hxx Fri Feb 24 14:14:33 2012
@@ -479,6 +479,7 @@ private:
 	sal_Bool			bFormatted;
 	sal_Bool			bInSelection;
 	sal_Bool			bIsInUndo;
+	sal_Bool			bIsPasting; //#115580#	
 	sal_Bool			bUpdate;
 	sal_Bool			bUndoEnabled;
 	sal_Bool			bOwnerOfRefDev;
@@ -543,6 +544,7 @@ private:
 	void				SetParaAttrib( sal_uInt8 nFunc, EditSelection aSel, sal_uInt16 nValue );
 	sal_uInt16			GetParaAttrib( sal_uInt8 nFunc, EditSelection aSel );
 	void				SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem );
+	void 				AdjustParaAttribsByStyleSheet( ContentNode* pNode ); //#115580#
 	void				ParaAttribsToCharAttribs( ContentNode* pNode );
 	void				GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit2.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit2.cxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit2.cxx Fri Feb 24 14:14:33 2012
@@ -133,6 +133,7 @@ ImpEditEngine::ImpEditEngine( EditEngine
 	bOwnerOfRefDev 		= sal_False;
 	bDowning 			= sal_False;
 	bIsInUndo 			= sal_False;
+	bIsPasting 			= sal_False; //#115580#	
 	bIsFormatting 		= sal_False;
 	bFormatted			= sal_False;
 	bUpdate 			= sal_True;
@@ -3701,6 +3702,7 @@ EditSelection ImpEditEngine::InsertText(
 
 	if ( rxDataObj.is() )
 	{
+		bIsPasting = sal_True; //#115580#		
 		datatransfer::DataFlavor aFlavor;
 		sal_Bool bDone = sal_False;
 
@@ -3791,6 +3793,7 @@ EditSelection ImpEditEngine::InsertText(
 				}
 			}
 		}
+		bIsPasting = sal_False; //#115580#		
 	}
 
 	return aNewSelection;

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit4.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit4.cxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit4.cxx Fri Feb 24 14:14:33 2012
@@ -1241,6 +1241,13 @@ EditSelection ImpEditEngine::InsertBinTe
 	EditSelection aSel( aPaM, aPaM );
 	DBG_ASSERT( !aSel.DbgIsBuggy( aEditDoc ), "InsertBibTextObject: Selektion kaput!(1)" );
 
+	//#115580#
+	EditPaM aStart1PaM( aSel.Min().GetNode(), aSel.Min().GetIndex() );
+	aSel = ImpInsertParaBreak( aSel );
+	EditPaM aStart2PaM = aSel.Min();
+	EditPaM aEnd1PaM( ImpInsertParaBreak( aSel.Max() ) );
+	aEnd1PaM.GetNode()->SetStyleSheet( aStart1PaM.GetNode()->GetStyleSheet(), sal_False );
+
 	sal_Bool bUsePortionInfo = sal_False;
 //	sal_Bool bFields = sal_False;
 	XParaPortionList* pPortionInfo = rTextObject.GetPortionInfo();
@@ -1270,6 +1277,17 @@ EditSelection ImpEditEngine::InsertBinTe
 	for ( sal_uInt16 n = 0; n < nContents; n++, nPara++ )
 	{
 		ContentInfo* pC = rTextObject.GetContents().GetObject( n );
+
+		if ( bIsPasting ) 	//#115580#
+		{
+			if ( !n )
+				aPaM = aStart2PaM;
+			//init node
+			aPaM.GetNode()->SetStyleSheet( aStart1PaM.GetNode()->GetStyleSheet(), sal_False );
+			aPaM.GetNode()->GetContentAttribs().GetItems().ClearItem();
+			aPaM.GetNode()->GetCharAttribs().Clear();
+		}
+
 		sal_Bool bNewContent = aPaM.GetNode()->Len() ? sal_False: sal_True;
 		sal_uInt16 nStartPos = aPaM.GetIndex();
 
@@ -1340,6 +1358,18 @@ EditSelection ImpEditEngine::InsertBinTe
 			    // nur dann Style und ParaAttribs, wenn neuer Absatz, oder
 			    // komplett inneliegender...
 			    bParaAttribs = pC->GetParaAttribs().Count() ? sal_True : sal_False;
+
+			    if ( bIsPasting )	//#115580#
+			    {
+				    nPara = aEditDoc.GetPos( aPaM.GetNode() );
+				    if ( GetStyleSheetPool() && pC->GetStyle().Len() )
+				    {
+					SfxStyleSheet* pStyle = (SfxStyleSheet*)GetStyleSheetPool()->Find( pC->GetStyle(), pC->GetFamily() );
+					DBG_ASSERT( pStyle, "InsertBinTextObject - Style not found!" );
+					SetStyleSheet( nPara, pStyle );
+				    }
+			    }
+			    else
 			    if ( GetStyleSheetPool() && pC->GetStyle().Len() )
 			    {
 				    SfxStyleSheet* pStyle = (SfxStyleSheet*)GetStyleSheetPool()->Find( pC->GetStyle(), pC->GetFamily() );
@@ -1412,6 +1442,12 @@ EditSelection ImpEditEngine::InsertBinTe
 		}
 #endif // !SVX_LIGHT
 
+		if ( bIsPasting )	//#115580#
+		{
+			AdjustParaAttribsByStyleSheet( aPaM.GetNode() );
+			ParaAttribsToCharAttribs( aPaM.GetNode() );
+		}
+	
 		// Zeilenumbruch, wenn weitere folgen...
 		if ( n < ( nContents-1) )
 		{
@@ -1422,7 +1458,23 @@ EditSelection ImpEditEngine::InsertBinTe
 		}
 	}
 
-	aSel.Max() = aPaM;
+	/* aSel.Max() = aPaM; */	//#115580#
+
+	if ( bIsPasting )
+	{
+		EditPaM aEnd2PaM( aPaM );
+
+		sal_Bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? sal_False : sal_True;
+
+		aSel.Min() = ImpConnectParagraphs( aStart1PaM.GetNode(), aStart2PaM.GetNode(), bSpecialBackward );
+		bSpecialBackward = aEnd1PaM.GetNode()->Len() ? sal_True : sal_False;
+
+		aSel.Max() = ImpConnectParagraphs( ( ( nContents == 1 ) ? aStart1PaM.GetNode() : aEnd2PaM.GetNode() ),
+																		aEnd1PaM.GetNode(), bSpecialBackward );
+	}
+	else
+		aSel.Max() = aPaM;
+	
 	DBG_ASSERT( !aSel.DbgIsBuggy( aEditDoc ), "InsertBibTextObject: Selektion kaput!(1)" );
 	return aSel;
 }

Modified: incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit5.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit5.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit5.cxx (original)
+++ incubator/ooo/branches/alg/install/main/editeng/source/editeng/impedit5.cxx Fri Feb 24 14:14:33 2012
@@ -813,6 +813,23 @@ void ImpEditEngine::GetCharAttribs( sal_
 	}
 }
 
+void ImpEditEngine::AdjustParaAttribsByStyleSheet( ContentNode* pNode ) //#115580#
+{
+	if ( !pNode )
+		return;
+
+	SfxStyleSheet* pStyle = pNode->GetStyleSheet();
+	for ( sal_uInt16 nWhich = EE_PARA_START; nWhich < EE_CHAR_START && pStyle; nWhich++ )
+	{
+		if ( pNode->GetContentAttribs().GetItems().GetItemState( nWhich ) == SFX_ITEM_ON   )
+		{
+			const SfxItemSet& rStyleAttribs = pStyle->GetItemSet();
+			if ( rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON )
+				pNode->GetContentAttribs().GetItems().ClearItem( nWhich );	
+		}
+	}
+}
+
 void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
 {
 	pNode->GetCharAttribs().DeleteEmptyAttribs( GetEditDoc().GetItemPool() );
@@ -841,6 +858,8 @@ void ImpEditEngine::ParaAttribsToCharAtt
 	}
 	bFormatted = sal_False;
 	// Portion braucht hier nicht invalidiert werden, geschieht woanders.
+	if ( bIsPasting )	//#115580#
+		pNode->GetContentAttribs().GetItems().ClearItem();
 }
 
 IdleFormattter::IdleFormattter()

Modified: incubator/ooo/branches/alg/install/main/extensions/source/update/check/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/extensions/source/update/check/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/extensions/source/update/check/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/extensions/source/update/check/makefile.mk Fri Feb 24 14:14:33 2012
@@ -26,6 +26,12 @@ PRJNAME=extensions
 TARGET=updchk
 PACKAGE=org.openoffice.Office
 
+
+.IF "$(ENABLE_ONLINE_UPDATE)" != "YES"
+@all:
+	@echo "Online Update disabled."
+.ELSE
+
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
@@ -140,3 +146,5 @@ $(MISC)/updchk.uno.component .ERRREMOVE 
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
+
+.ENDIF # "$(ENABLE_ONLINE_UPDATE)" == "YES"

Modified: incubator/ooo/branches/alg/install/main/helpauthoring/filter/xmlhelp.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/helpauthoring/filter/xmlhelp.dtd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/helpauthoring/filter/xmlhelp.dtd (original)
+++ incubator/ooo/branches/alg/install/main/helpauthoring/filter/xmlhelp.dtd Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
 <!-- 
 Version 03-Feb-2006
   added optional localize attribute to images

Modified: incubator/ooo/branches/alg/install/main/helpcontent2/helpers/xmlhelp.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/helpcontent2/helpers/xmlhelp.dtd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/helpcontent2/helpers/xmlhelp.dtd (original)
+++ incubator/ooo/branches/alg/install/main/helpcontent2/helpers/xmlhelp.dtd Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
 <!-- 
 Version 03-Feb-2006
   added optional localize attribute to images

Modified: incubator/ooo/branches/alg/install/main/i18npool/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/prj/d.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/prj/d.lst Fri Feb 24 14:14:33 2012
@@ -37,11 +37,13 @@ mkdir: %_DEST%\inc%_EXT%\i18npool
 ..\version.mk  %_DEST%\inc%_EXT%\i18npool\version.mk
 
 ..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib%_EXT%\ii18nisolang*.lib
+..\%__SRC%\lib\i18nisolang*.lib %_DEST%\lib%_EXT%\i18nisolang*.lib
 ..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
 ..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
 ..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
 
 ..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
+..\%__SRC%\lib\i18npaper*.lib %_DEST%\lib%_EXT%\i18npaper*.lib
 ..\%__SRC%\bin\i18npape*.dll %_DEST%\bin%_EXT%\i18npape*.dll
 ..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
 ..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/breakiterator/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/breakiterator/data/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/breakiterator/data/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/breakiterator/data/makefile.mk Fri Feb 24 14:14:33 2012
@@ -74,5 +74,7 @@ $(MISC)$/dict_%.cxx : %.dic
 	$(AUGMENT_LIBRARY_PATH) $(BIN)$/gendict $< $@
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
+.ENDIF
 



Mime
View raw message