incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1386501 [1/10] - in /incubator/ooo/branches/writer001: ./ ext_libraries/ratscan/ ext_sources/ main/ main/autodoc/source/display/html/ main/basegfx/inc/basegfx/numeric/ main/basegfx/source/numeric/ main/basegfx/source/tools/ main/basic/sour...
Date Mon, 17 Sep 2012 08:06:23 GMT
Author: orw
Date: Mon Sep 17 08:06:09 2012
New Revision: 1386501

URL: http://svn.apache.org/viewvc?rev=1386501&view=rev
Log:
sync branch writer001 on trunk

Added:
    incubator/ooo/branches/writer001/ext_libraries/ratscan/
      - copied from r1386490, incubator/ooo/trunk/ext_libraries/ratscan/
    incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/gd_GB.xml
      - copied unchanged from r1386490, incubator/ooo/trunk/main/i18npool/source/localedata/data/gd_GB.xml
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/RangeScopeName.idl
      - copied unchanged from r1386490, incubator/ooo/trunk/main/offapi/com/sun/star/sheet/RangeScopeName.idl
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange2.idl
      - copied unchanged from r1386490, incubator/ooo/trunk/main/offapi/com/sun/star/sheet/XNamedRange2.idl
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges2.idl
      - copied unchanged from r1386490, incubator/ooo/trunk/main/offapi/com/sun/star/sheet/XNamedRanges2.idl
    incubator/ooo/branches/writer001/main/rat-excludes-solver
      - copied unchanged from r1386490, incubator/ooo/trunk/main/rat-excludes-solver
    incubator/ooo/branches/writer001/main/stax/download/README_stax-1.2.0.jar.txt
      - copied unchanged from r1386490, incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar.txt
    incubator/ooo/branches/writer001/test/   (props changed)
      - copied from r1386490, incubator/ooo/trunk/test/
Removed:
    incubator/ooo/branches/writer001/ext_sources/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
    incubator/ooo/branches/writer001/ext_sources/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
    incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01020400.xhp
    incubator/ooo/branches/writer001/main/jpeg/jpeg-6b.patch
    incubator/ooo/branches/writer001/main/qadevOOo/testdocs/qadevlibs/JobExecutor.jar
    incubator/ooo/branches/writer001/main/qadevOOo/testdocs/qadevlibs/MyPersistObjectImpl.jar
    incubator/ooo/branches/writer001/main/scp2/source/testtool/
    incubator/ooo/branches/writer001/main/stax/download/README_stax-1.2.0.jar
    incubator/ooo/branches/writer001/main/test/
    incubator/ooo/branches/writer001/main/testgraphical/ui/java/ConvwatchGUIProject/dist/
    incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/dist/README.TXT
    incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/dist/httpserv.jar
Modified:
    incubator/ooo/branches/writer001/   (props changed)
    incubator/ooo/branches/writer001/main/autodoc/source/display/html/cfrstd.cxx
    incubator/ooo/branches/writer001/main/basegfx/inc/basegfx/numeric/ftools.hxx
    incubator/ooo/branches/writer001/main/basegfx/source/numeric/ftools.cxx
    incubator/ooo/branches/writer001/main/basegfx/source/tools/gradienttools.cxx
    incubator/ooo/branches/writer001/main/basic/source/uno/namecont.cxx
    incubator/ooo/branches/writer001/main/boost/prj/d.lst
    incubator/ooo/branches/writer001/main/chart2/source/model/main/ChartModel.cxx
    incubator/ooo/branches/writer001/main/chart2/source/view/main/ChartView.cxx
    incubator/ooo/branches/writer001/main/configure.in
    incubator/ooo/branches/writer001/main/cui/source/inc/cuires.hrc
    incubator/ooo/branches/writer001/main/cui/source/options/optinet2.cxx
    incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hrc
    incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hxx
    incubator/ooo/branches/writer001/main/cui/source/options/optinet2.src
    incubator/ooo/branches/writer001/main/cui/source/options/treeopt.cxx
    incubator/ooo/branches/writer001/main/cui/source/options/treeopt.src
    incubator/ooo/branches/writer001/main/dbaccess/prj/build.lst
    incubator/ooo/branches/writer001/main/dbaccess/source/ui/dlg/admincontrols.cxx
    incubator/ooo/branches/writer001/main/desktop/source/app/appinit.cxx
    incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.cxx
    incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.hxx
    incubator/ooo/branches/writer001/main/desktop/source/app/cmdlinehelp.cxx
    incubator/ooo/branches/writer001/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
    incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/gridprimitive2d.cxx
    incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
    incubator/ooo/branches/writer001/main/editeng/inc/editeng/svxenum.hxx
    incubator/ooo/branches/writer001/main/editeng/source/editeng/editdoc.cxx
    incubator/ooo/branches/writer001/main/editeng/source/editeng/impedit3.cxx
    incubator/ooo/branches/writer001/main/editeng/source/misc/txtrange.cxx
    incubator/ooo/branches/writer001/main/editeng/source/outliner/outliner.cxx
    incubator/ooo/branches/writer001/main/editeng/source/uno/unonrule.cxx
    incubator/ooo/branches/writer001/main/embeddedobj/source/msole/olecomponent.cxx
    incubator/ooo/branches/writer001/main/extensions/prj/d.lst
    incubator/ooo/branches/writer001/main/external_deps.lst
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-10grey.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-1simple.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-2elegant.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-3modern.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-4classic.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-5blue.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-6orange.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-7red.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-8green.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-9colorful.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-bottle_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-fax_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-lines_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-marine_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-bottle_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-fax_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-lines_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-marine_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern-pri_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-bottle_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-fax_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-lines_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-marine_f.ott
    incubator/ooo/branches/writer001/main/extras/source/templates/wizard/report/lang/sk/cnt-01.ott
    incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/escherex.hxx
    incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/msocximex.hxx
    incubator/ooo/branches/writer001/main/filter/source/msfilter/escherex.cxx
    incubator/ooo/branches/writer001/main/filter/source/msfilter/eschesdo.cxx
    incubator/ooo/branches/writer001/main/filter/source/msfilter/msdffimp.cxx
    incubator/ooo/branches/writer001/main/filter/source/msfilter/msocximex.cxx
    incubator/ooo/branches/writer001/main/filter/source/msfilter/svdfppt.cxx
    incubator/ooo/branches/writer001/main/formula/inc/formula/compiler.hrc
    incubator/ooo/branches/writer001/main/formula/inc/formula/opcode.hxx
    incubator/ooo/branches/writer001/main/formula/source/core/resource/core_resource.src
    incubator/ooo/branches/writer001/main/formula/source/ui/dlg/parawin.cxx
    incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/05/00000001.xhp
    incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/guide/activex.xhp
    incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01030000.xhp
    incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/sbasic/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/scalc/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/schart/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/sdatabase/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/sdraw/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/simpress/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/smath/makefile.mk
    incubator/ooo/branches/writer001/main/helpcontent2/util/swriter/makefile.mk
    incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/localedata_euro.map
    incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/makefile.mk
    incubator/ooo/branches/writer001/main/i18npool/source/localedata/localedata.cxx
    incubator/ooo/branches/writer001/main/i18npool/source/search/textsearch.cxx
    incubator/ooo/branches/writer001/main/instsetoo_native/prj/build.lst
    incubator/ooo/branches/writer001/main/jpeg/makefile.mk
    incubator/ooo/branches/writer001/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
    incubator/ooo/branches/writer001/main/odk/docs/install.html
    incubator/ooo/branches/writer001/main/odk/docs/notsupported.html
    incubator/ooo/branches/writer001/main/odk/docs/tools.html
    incubator/ooo/branches/writer001/main/odk/examples/DevelopersGuide/examples.html
    incubator/ooo/branches/writer001/main/odk/examples/examples.html
    incubator/ooo/branches/writer001/main/odk/index.html
    incubator/ooo/branches/writer001/main/odk/pack/copying/dk.mk
    incubator/ooo/branches/writer001/main/odk/pack/copying/makefile.mk
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange.idl
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges.idl
    incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/makefile.mk
    incubator/ooo/branches/writer001/main/oovbaapi/ooo/vba/XApplicationBase.idl
    incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/chart/converterbase.hxx
    incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/table/tableproperties.hxx
    incubator/ooo/branches/writer001/main/oox/inc/oox/xls/defnamesbuffer.hxx
    incubator/ooo/branches/writer001/main/oox/inc/oox/xls/workbookhelper.hxx
    incubator/ooo/branches/writer001/main/oox/source/drawingml/chart/titleconverter.cxx
    incubator/ooo/branches/writer001/main/oox/source/drawingml/customshapegeometry.cxx
    incubator/ooo/branches/writer001/main/oox/source/drawingml/table/tableproperties.cxx
    incubator/ooo/branches/writer001/main/oox/source/drawingml/textparagraphpropertiescontext.cxx
    incubator/ooo/branches/writer001/main/oox/source/token/properties.txt
    incubator/ooo/branches/writer001/main/oox/source/xls/defnamesbuffer.cxx
    incubator/ooo/branches/writer001/main/oox/source/xls/formulabase.cxx
    incubator/ooo/branches/writer001/main/oox/source/xls/pivottablebuffer.cxx
    incubator/ooo/branches/writer001/main/oox/source/xls/sheetdatabuffer.cxx
    incubator/ooo/branches/writer001/main/oox/source/xls/workbookhelper.cxx
    incubator/ooo/branches/writer001/main/sc/inc/cell.hxx
    incubator/ooo/branches/writer001/main/sc/inc/column.hxx
    incubator/ooo/branches/writer001/main/sc/inc/compiler.hxx
    incubator/ooo/branches/writer001/main/sc/inc/document.hxx
    incubator/ooo/branches/writer001/main/sc/inc/dpglobal.hxx
    incubator/ooo/branches/writer001/main/sc/inc/dptablecache.hxx
    incubator/ooo/branches/writer001/main/sc/inc/helpids.h
    incubator/ooo/branches/writer001/main/sc/inc/nameuno.hxx
    incubator/ooo/branches/writer001/main/sc/inc/rangenam.hxx
    incubator/ooo/branches/writer001/main/sc/inc/sc.hrc
    incubator/ooo/branches/writer001/main/sc/inc/scmatrix.hxx
    incubator/ooo/branches/writer001/main/sc/inc/styleuno.hxx
    incubator/ooo/branches/writer001/main/sc/inc/table.hxx
    incubator/ooo/branches/writer001/main/sc/inc/unonames.hxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/column3.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/documen2.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/document.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/dptablecache.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/global.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/patattr.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/data/table2.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/inc/interpre.hxx
    incubator/ooo/branches/writer001/main/sc/source/core/inc/parclass.hxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/compiler.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/interpr1.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/interpr4.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/parclass.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/rangenam.cxx
    incubator/ooo/branches/writer001/main/sc/source/core/tool/scmatrix.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/excform.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/excform8.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/excimp8.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/impop.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/read.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xeformula.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xename.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xestyle.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xicontent.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xiescher.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xiname.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xipivot.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/excel/xlformula.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/inc/formel.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/inc/xestyle.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/inc/xipivot.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/inc/xlformula.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlbodyi.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlexprt.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlexprt.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlimprt.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlimprt.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlnexpi.cxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmlnexpi.hxx
    incubator/ooo/branches/writer001/main/sc/source/filter/xml/xmltabi.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/formdlg/dwfunctr.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/inc/namedlg.hrc
    incubator/ooo/branches/writer001/main/sc/source/ui/inc/namedlg.hxx
    incubator/ooo/branches/writer001/main/sc/source/ui/namedlg/namedlg.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/src/namedlg.src
    incubator/ooo/branches/writer001/main/sc/source/ui/src/scfuncs.src
    incubator/ooo/branches/writer001/main/sc/source/ui/unoobj/appluno.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/unoobj/docuno.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/unoobj/nameuno.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/unoobj/styleuno.cxx
    incubator/ooo/branches/writer001/main/sc/source/ui/vba/vbarange.cxx
    incubator/ooo/branches/writer001/main/sc/util/hidother.src
    incubator/ooo/branches/writer001/main/scp2/prj/build.lst
    incubator/ooo/branches/writer001/main/scp2/source/ooo/module_langpack.ulf
    incubator/ooo/branches/writer001/main/scp2/util/makefile.mk
    incubator/ooo/branches/writer001/main/sd/source/core/sdpage.cxx
    incubator/ooo/branches/writer001/main/sd/source/filter/eppt/eppt.cxx
    incubator/ooo/branches/writer001/main/sd/source/filter/eppt/eppt.hxx
    incubator/ooo/branches/writer001/main/sd/source/filter/eppt/epptso.cxx
    incubator/ooo/branches/writer001/main/sd/source/filter/eppt/pptexanimations.cxx
    incubator/ooo/branches/writer001/main/sd/source/filter/ppt/pptin.cxx
    incubator/ooo/branches/writer001/main/sd/source/ui/framework/tools/FrameworkHelper.cxx
    incubator/ooo/branches/writer001/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
    incubator/ooo/branches/writer001/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
    incubator/ooo/branches/writer001/main/sd/source/ui/unoidl/unomodel.cxx
    incubator/ooo/branches/writer001/main/set_soenv.in
    incubator/ooo/branches/writer001/main/sfx2/source/bastyp/fltfnc.cxx
    incubator/ooo/branches/writer001/main/slideshow/qa/tools/mktransitions.pl
    incubator/ooo/branches/writer001/main/slideshow/source/engine/activities/activitiesfactory.cxx
    incubator/ooo/branches/writer001/main/slideshow/source/engine/animationnodes/animationbasenode.cxx
    incubator/ooo/branches/writer001/main/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
    incubator/ooo/branches/writer001/main/solenv/bin/build.pl
    incubator/ooo/branches/writer001/main/svgio/source/svgreader/svgstyleattributes.cxx
    incubator/ooo/branches/writer001/main/svl/inc/svl/itemset.hxx
    incubator/ooo/branches/writer001/main/svl/source/items/itemset.cxx
    incubator/ooo/branches/writer001/main/svtools/source/misc/langtab.src
    incubator/ooo/branches/writer001/main/svx/inc/svx/msdffdef.hxx
    incubator/ooo/branches/writer001/main/svx/inc/svx/svdmodel.hxx
    incubator/ooo/branches/writer001/main/svx/source/core/coreservices.cxx
    incubator/ooo/branches/writer001/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
    incubator/ooo/branches/writer001/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
    incubator/ooo/branches/writer001/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
    incubator/ooo/branches/writer001/main/svx/source/form/fmundo.cxx
    incubator/ooo/branches/writer001/main/svx/source/svdraw/svdmodel.cxx
    incubator/ooo/branches/writer001/main/svx/source/svdraw/svdoedge.cxx
    incubator/ooo/branches/writer001/main/svx/source/tbxctrls/fontworkgallery.cxx
    incubator/ooo/branches/writer001/main/svx/util/svxcore.component
    incubator/ooo/branches/writer001/main/sw/inc/IDocumentContentOperations.hxx
    incubator/ooo/branches/writer001/main/sw/inc/doc.hxx
    incubator/ooo/branches/writer001/main/sw/inc/fmtclds.hxx
    incubator/ooo/branches/writer001/main/sw/inc/hintids.hxx
    incubator/ooo/branches/writer001/main/sw/inc/ndtxt.hxx
    incubator/ooo/branches/writer001/main/sw/inc/unomap.hxx
    incubator/ooo/branches/writer001/main/sw/inc/unoprnms.hxx
    incubator/ooo/branches/writer001/main/sw/source/core/bastyp/init.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/doc/docfmt.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/doc/docnew.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/doc/doctxm.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/doc/docxforms.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/docnode/ndsect.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/draw/dcontact.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/fields/chpfld.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/fields/docufld.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/inc/flyfrm.hxx
    incubator/ooo/branches/writer001/main/sw/source/core/inc/txtfrm.hxx
    incubator/ooo/branches/writer001/main/sw/source/core/layout/atrfrm.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/layout/fly.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/text/atrstck.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/text/itrform2.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/text/itrpaint.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/txtnode/ndtxt.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/txtnode/thints.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/txtnode/txtedt.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/unocore/unoframe.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/unocore/unomap.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/unocore/unoprnms.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/unocore/unosect.cxx
    incubator/ooo/branches/writer001/main/sw/source/core/unocore/unotext.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/inc/fltshell.hxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww1/fltshell.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/attributeoutputbase.hxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/rtfattributeoutput.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/rtfattributeoutput.hxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/wrtw8sty.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/wrtww8gr.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8atr.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8attributeoutput.hxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8graf.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8graf2.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par.hxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par3.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par6.cxx
    incubator/ooo/branches/writer001/main/sw/source/filter/xml/xmltbli.cxx
    incubator/ooo/branches/writer001/main/sw/source/ui/uno/unotxdoc.cxx
    incubator/ooo/branches/writer001/main/testgraphical/prj/build.lst
    incubator/ooo/branches/writer001/main/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk
    incubator/ooo/branches/writer001/main/testgraphical/ui/java/ConvwatchGUIProject/nbproject/project.properties
    incubator/ooo/branches/writer001/main/toolkit/prj/build.lst
    incubator/ooo/branches/writer001/main/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
    incubator/ooo/branches/writer001/main/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
    incubator/ooo/branches/writer001/main/vbahelper/source/vbahelper/vbaapplicationbase.cxx
    incubator/ooo/branches/writer001/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
    incubator/ooo/branches/writer001/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
    incubator/ooo/branches/writer001/main/vcl/inc/svdata.hxx
    incubator/ooo/branches/writer001/main/vcl/inc/vcl/svapp.hxx
    incubator/ooo/branches/writer001/main/vcl/source/app/svapp.cxx
    incubator/ooo/branches/writer001/main/vcl/source/gdi/bitmapex.cxx
    incubator/ooo/branches/writer001/main/vcl/source/gdi/pdfwriter_impl.cxx
    incubator/ooo/branches/writer001/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java
    incubator/ooo/branches/writer001/main/writerfilter/inc/resourcemodel/TableManager.hxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/ConversionHelper.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/DomainMapper.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/NumberingManager.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/NumberingManager.hxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyIds.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyIds.hxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.hxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.cxx
    incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.hxx
    incubator/ooo/branches/writer001/main/xmloff/source/draw/XMLNumberStyles.cxx
    incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
    incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
    incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/README.txt
    incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/build.xml
    incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
    incubator/ooo/branches/writer001/test/testcommon/   (props changed)
    incubator/ooo/branches/writer001/test/testcommon/source/org/openoffice/test/vcl/   (props changed)
    incubator/ooo/branches/writer001/test/testgui/   (props changed)
    incubator/ooo/branches/writer001/test/testuno/   (props changed)

Propchange: incubator/ooo/branches/writer001/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1374970-1386490

Modified: incubator/ooo/branches/writer001/main/autodoc/source/display/html/cfrstd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/autodoc/source/display/html/cfrstd.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/autodoc/source/display/html/cfrstd.cxx (original)
+++ incubator/ooo/branches/writer001/main/autodoc/source/display/html/cfrstd.cxx Mon Sep 17 08:06:09 2012
@@ -332,7 +332,7 @@ MakeCopyRight()
 
     cr  << "Copyright &copy; "
         << year
-        << ", The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.";
+        << ", The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.";
     return String(cr.c_str());
 
 }

Modified: incubator/ooo/branches/writer001/main/basegfx/inc/basegfx/numeric/ftools.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/basegfx/inc/basegfx/numeric/ftools.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/basegfx/inc/basegfx/numeric/ftools.hxx (original)
+++ incubator/ooo/branches/writer001/main/basegfx/inc/basegfx/numeric/ftools.hxx Mon Sep 17 08:06:09 2012
@@ -139,8 +139,38 @@ namespace basegfx
         return v / M_PI_2 * 90.0;
     }
 
+    /** Snap v to nearest multiple of fStep, from negative and
+		positive side.
 
-	class fTools
+		Examples:
+
+		snapToNearestMultiple(-0.1, 0.5) = 0.0
+		snapToNearestMultiple(0.1, 0.5) = 0.0
+		snapToNearestMultiple(0.25, 0.5) = 0.0
+		snapToNearestMultiple(0.26, 0.5) = 0.5
+     */
+	double snapToNearestMultiple(double v, const double fStep);
+
+    /** Snap v to the range [0.0 .. fWidth] using modulo
+     */
+	double snapToZeroRange(double v, double fWidth);
+
+    /** Snap v to the range [fLow .. fHigh] using modulo
+     */
+	double snapToRange(double v, double fLow, double fHigh);
+
+	/** return fValue with the sign of fSignCarrier, thus evtl. changed
+	*/
+	inline double copySign(double fValue, double fSignCarrier)
+	{
+#ifdef WNT
+		return _copysign(fValue, fSignCarrier);
+#else
+		return copysign(fValue, fSignCarrier);
+#endif
+	}
+
+    class fTools
 	{
         /// Threshold value for equalZero()
 		static double									mfSmallValue;

Modified: incubator/ooo/branches/writer001/main/basegfx/source/numeric/ftools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/basegfx/source/numeric/ftools.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/basegfx/source/numeric/ftools.cxx (original)
+++ incubator/ooo/branches/writer001/main/basegfx/source/numeric/ftools.cxx Mon Sep 17 08:06:09 2012
@@ -24,11 +24,88 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basegfx.hxx"
 #include <basegfx/numeric/ftools.hxx>
+#include <algorithm>
 
 namespace basegfx
 {
 	// init static member of class fTools
 	double ::basegfx::fTools::mfSmallValue = 0.000000001;
+
+	double snapToNearestMultiple(double v, const double fStep)
+	{
+		if(fTools::equalZero(fStep))
+		{
+			// with a zero step, all snaps to 0.0
+			return 0.0;
+		}
+		else
+		{
+			const double fHalfStep(fStep * 0.5);
+			const double fChange(fHalfStep - fmod(v + fHalfStep, fStep));
+
+            if(basegfx::fTools::equal(fabs(v), fabs(fChange)))
+            {
+                return 0.0;
+            }
+            else
+            {
+    			return v + fChange;
+            }
+		}
+	}
+
+	double snapToZeroRange(double v, double fWidth)
+	{
+		if(fTools::equalZero(fWidth))
+		{
+			// with no range all snaps to range bound
+			return 0.0;
+		}
+		else
+		{
+			if(v < 0.0 || v > fWidth)
+			{
+				double fRetval(fmod(v, fWidth));
+
+				if(fRetval < 0.0)
+				{
+					fRetval += fWidth;
+				}
+
+				return fRetval;
+			}
+			else
+			{
+				return v;
+			}
+		}
+	}
+
+	double snapToRange(double v, double fLow, double fHigh)
+	{
+		if(fTools::equal(fLow, fHigh))
+		{
+			// with no range all snaps to range bound
+			return 0.0;
+		}
+		else
+		{
+			if(fLow > fHigh)
+			{
+				// correct range order. Evtl. assert this (?)
+				std::swap(fLow, fHigh);
+			}
+
+			if(v < fLow || v > fHigh)
+			{
+				return snapToZeroRange(v - fLow, fHigh - fLow) + fLow;
+			}
+			else
+			{
+				return v;
+			}
+		}
+	}
 } // end of namespace basegfx
 
 // eof

Modified: incubator/ooo/branches/writer001/main/basegfx/source/tools/gradienttools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/basegfx/source/tools/gradienttools.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/basegfx/source/tools/gradienttools.cxx (original)
+++ incubator/ooo/branches/writer001/main/basegfx/source/tools/gradienttools.cxx Mon Sep 17 08:06:09 2012
@@ -200,11 +200,10 @@ namespace basegfx
         // add object expansion
         if(bSquare)
         {
-            const double fOriginalDiag(sqrt((fTargetSizeX * fTargetSizeX) + (fTargetSizeY * fTargetSizeY)));
-            fTargetOffsetX -= (fOriginalDiag - fTargetSizeX) / 2.0;
-            fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
-            fTargetSizeX = fOriginalDiag;
-            fTargetSizeY = fOriginalDiag;
+            const double fSquareWidth(std::max(fTargetSizeX, fTargetSizeY));
+            fTargetOffsetX -= (fSquareWidth - fTargetSizeX) / 2.0;
+            fTargetOffsetY -= (fSquareWidth - fTargetSizeY) / 2.0;
+            fTargetSizeX = fTargetSizeY = fSquareWidth;
         }    
 
         // add object expansion

Modified: incubator/ooo/branches/writer001/main/basic/source/uno/namecont.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/basic/source/uno/namecont.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/basic/source/uno/namecont.cxx (original)
+++ incubator/ooo/branches/writer001/main/basic/source/uno/namecont.cxx Mon Sep 17 08:06:09 2012
@@ -1816,8 +1816,10 @@ void SfxLibraryContainer::storeLibraries
 		    Any aLibAny = maNameContainer.getByName( aNames[0] );
 		    Reference< XNameAccess > xNameAccess;
 		    aLibAny >>= xNameAccess;
-            if ( !xNameAccess->hasElements() )
+            if ( !xNameAccess->hasElements() ){
+                delete pLibArray;
                 return;
+            }
         }
 
         // create the empty target storage

Modified: incubator/ooo/branches/writer001/main/boost/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/boost/prj/d.lst?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/boost/prj/d.lst (original)
+++ incubator/ooo/branches/writer001/main/boost/prj/d.lst Mon Sep 17 08:06:09 2012
@@ -310,3 +310,11 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\d
 ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
 ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
 ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+
+mkdir: %_DEST%\inc%_EXT%\boost\lambda
+..\%__SRC%\misc\build\boost-1.30.2\boost\lambda\*.*pp %_DEST%\inc%_EXT%\boost\lambda\*.*pp
+..\%__SRC%\misc\build\boost_1_39_0\boost\lambda\* %_DEST%\inc%_EXT%\boost\lambda
+mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail
+..\%__SRC%\misc\build\boost-1.30.2\boost\lambda\detail\*.*pp %_DEST%\inc%_EXT%\boost\lambda\detail\*.*pp
+..\%__SRC%\misc\build\boost_1_39_0\boost\lambda\detail\* %_DEST%\inc%_EXT%\boost\lambda\detail
+

Modified: incubator/ooo/branches/writer001/main/chart2/source/model/main/ChartModel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/chart2/source/model/main/ChartModel.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/chart2/source/model/main/ChartModel.cxx (original)
+++ incubator/ooo/branches/writer001/main/chart2/source/model/main/ChartModel.cxx Mon Sep 17 08:06:09 2012
@@ -565,6 +565,9 @@ void SAL_CALL ChartModel::dispose() thro
     m_pUndoManager.clear();
         // that's important, since the UndoManager implementation delegates its ref counting to ourself.
 
+    if( m_xOldModelAgg.is())  // #i120828#, to release cyclic reference to ChartModel object
+        m_xOldModelAgg->setDelegator( 0 );
+
     m_aControllers.disposeAndClear( lang::EventObject( static_cast< cppu::OWeakObject * >( this )));
     m_xCurrentController.clear();
 

Modified: incubator/ooo/branches/writer001/main/chart2/source/view/main/ChartView.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/chart2/source/view/main/ChartView.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/chart2/source/view/main/ChartView.cxx (original)
+++ incubator/ooo/branches/writer001/main/chart2/source/view/main/ChartView.cxx Mon Sep 17 08:06:09 2012
@@ -207,6 +207,12 @@ void SAL_CALL ChartView::initialize( con
 
 ChartView::~ChartView()
 {
+    // #i120831#. In ChartView::initialize(), m_xShapeFactory is created from SdrModel::getUnoModel() and indirectly
+    //   from SfxBaseModel, it needs call dispose() to make sure SfxBaseModel object is freed correctly.
+    uno::Reference< lang::XComponent > xComp( m_xShapeFactory, uno::UNO_QUERY);
+    if ( xComp.is() )
+        xComp->dispose();
+
     if( m_pDrawModelWrapper.get() )
     {
         EndListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bAllDups*/ );

Modified: incubator/ooo/branches/writer001/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/configure.in?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/configure.in (original)
+++ incubator/ooo/branches/writer001/main/configure.in Mon Sep 17 08:06:09 2012
@@ -909,15 +909,21 @@ AC_ARG_ENABLE(category-b,
                           Flags for individual libraries override this one.
 ],,)
 AC_ARG_WITH(arm-target,
-[  --arm-target        The minimal targeted arm processor
-                          used for the build environment.
-                          Cases :
-                            arm-target < 6 : armv4t compatibility
-                            arm-target = 6 : exact armv6 compatibility
-                    	    arm-target > 6 : armv7-a compatibility
+[  --arm-target            The minimal targeted arm processor
+                              used for the build environment.
+                              Cases :
+                                arm-target < 6 : armv4t compatibility
+                                arm-target = 6 : exact armv6 compatibility
+                                arm-target > 6 : armv7-a compatibility
 
-                          Usage: --with-arm-target=7
+                              Usage: --with-arm-target=7
 ],with_arm_target=$withval,with_arm_target=4)
+AC_ARG_WITH(rat-scan,
+[  --with-rat-scan         Scan source code for license headers.
+                          Use as --with-rat-scan to automatically download pre-built Rat binaries.
+                          Alternatively use as --with-rat-scan=<path-to-rat-direcetory> to use
+                          a separately installed library.
+],with_rat_scan=$withval,)
 
 BUILD_TYPE="OOo"
 ADDITIONAL_REPOSITORIES="../ext_libraries"
@@ -7077,6 +7083,34 @@ else
 fi
 AC_SUBST(SYSTEM_LIBJPEG)
 
+dnl ===================================================================
+dnl Test whether rat scan was requested and whether apache-rat is available
+dnl ===================================================================
+RAT_JAR=
+AC_MSG_CHECKING([whether to trigger rat scan])
+if test -z "$with_rat_scan" -o "$with_rat_scan" == "no"; then
+    AC_MSG_RESULT([no])
+else
+    if test "$WITH_JAVA" == "no"; then
+        AC_MSG_ERROR([no, java disabled, enable with --with-java])
+    elif test "$enable_saxon" == "no"; then
+        AC_MSG_ERROR([no, saxon disabled, enable with --enable-category-b])
+    elif test "$with_rat_scan" == "yes"; then
+        AC_MSG_RESULT([yes, use pre-built library])
+        RAT_JAR_HOME="BUILD"
+        BUILD_TYPE="$BUILD_TYPE RAT"
+    else
+        AC_MSG_RESULT([yes, use pre-installed library])
+        AC_MSG_CHECKING([whether apache-rat is available])
+        if test -d "$with_rat_scan"; then
+            RAT_JAR_HOME=$with_rat_scan
+        else
+            AC_MSG_ERROR([$with_rat_scan is not a directory])
+        fi
+    fi
+fi
+AC_SUBST(RAT_JAR_HOME)
+
 
 dnl ===================================================================
 dnl Test for the presence of Ant and that it works

Modified: incubator/ooo/branches/writer001/main/cui/source/inc/cuires.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/inc/cuires.hrc?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/inc/cuires.hrc (original)
+++ incubator/ooo/branches/writer001/main/cui/source/inc/cuires.hrc Mon Sep 17 08:06:09 2012
@@ -146,7 +146,6 @@
 #define RID_SVXPAGE_INET_SEARCH				(RID_SVX_START + 160)
 #define RID_SVXPAGE_INET_PROXY              (RID_SVX_START + 157)
 #define RID_SVXPAGE_INET_MAIL               (RID_SVX_START + 155)
-#define RID_SVXPAGE_INET_MOZPLUGIN			(RID_SVX_START + 2161)
 #define RID_OFAPAGE_HTMLOPT				(RID_OFA_START + 100)
 #define OFA_TP_LANGUAGES				(RID_OFA_START + 205)
 #define OFA_TP_MISC						(RID_OFA_START + 200)
@@ -434,7 +433,7 @@
 #define RID_SVXSTR_EVENT_RIGHTCLICK                         (RID_SVX_START + 1192)
 #define RID_SVXSTR_EVENT_CALCULATE                          (RID_SVX_START + 1193)
 #define RID_SVXSTR_EVENT_CONTENTCHANGED                     (RID_SVX_START + 1194)
-
-#define RID_CUI_DIALOG_COLORPICKER                          (RID_SVX_START + 3)
+
+#define RID_CUI_DIALOG_COLORPICKER                          (RID_SVX_START + 3)
 
 #endif

Modified: incubator/ooo/branches/writer001/main/cui/source/options/optinet2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/optinet2.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/optinet2.cxx (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/optinet2.cxx Mon Sep 17 08:06:09 2012
@@ -1505,199 +1505,6 @@ void SvxSecurityTabPage::Reset( const Sf
 	}
 }
 
-//added by jmeng begin
-MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-	: SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-	aMSWordGB		( this, CUI_RES( GB_MOZPLUGIN	    ) ),
-	aWBasicCodeCB	( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
-{
-	FreeResource();
-}
-
-MozPluginTabPage::~MozPluginTabPage()
-{
-}
-
-SfxTabPage*	MozPluginTabPage::Create( Window* pParent,
-										const SfxItemSet& rAttrSet )
-{
-	return new MozPluginTabPage( pParent, rAttrSet );
-}
-sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
-{
-	sal_Bool hasInstall = isInstalled();
-	sal_Bool hasChecked = aWBasicCodeCB.IsChecked();
-	if(hasInstall && (!hasChecked)){
-		//try to uninstall
-		uninstallPlugin();
-	}
-	else if((!hasInstall) && hasChecked){
-		//try to install
-		installPlugin();
-	}
-	else{
-		// do nothing
-	}
-	return sal_True;
-}
-void MozPluginTabPage::Reset( const SfxItemSet& )
-{
-		aWBasicCodeCB.Check( isInstalled());
-		aWBasicCodeCB.SaveValue();
-}
-
-#ifdef WNT
-extern "C" {
-	int lc_isInstalled(const  char* realFilePath);
-	int lc_installPlugin(const  char* realFilePath);
-	int lc_uninstallPlugin(const  char* realFilePath);
-}
-#endif
-
-#define NPP_PATH_MAX 2048
-inline bool getDllURL(rtl::OString * path)
-{
-    OSL_ASSERT(path != NULL);
-    ::rtl::OUString dirPath/*dllPath, */;
-    if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
-        return false;
-    }
-    dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
-//    osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
-    ::rtl::OUString sysDirPath;
-	osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
-    *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
-    return true;
-}
-
-sal_Bool MozPluginTabPage::isInstalled()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char lnkFilePath[NPP_PATH_MAX] = {0};
-    char lnkReferFilePath[NPP_PATH_MAX] = {0};
-    char* pHome = getpwuid(getuid())->pw_dir;
-	strcat(lnkFilePath, pHome);
-	strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-
-	struct stat sBuf;
-	if (0 > lstat(lnkFilePath, &sBuf))
-	    return false;
-    if (!S_ISLNK(sBuf.st_mode))
-		return false;
-    if (0 >= readlink(lnkFilePath, lnkReferFilePath, NPP_PATH_MAX))
-		return false;
-    // If the link is relative, then we regard it as non-standard
-    if (lnkReferFilePath[0] != '/')
-        return false;
-
-    // get the real file path
-    char realFilePath[NPP_PATH_MAX] = {0};
-    ::rtl::OString tempString;
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-	strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
-
-    if (0 != strcmp(lnkReferFilePath, realFilePath))
-        return false;
-    return true;
-#endif
-#ifdef WNT
-	// get the value from registry
-		sal_Bool ret = true;
-	::rtl::OString tempString;
-	char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)){
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-	if(! lc_isInstalled(realFilePath))
-		ret =true;
-	else
-		ret = false;
-	return ret;
-#endif
-}
-
-sal_Bool MozPluginTabPage::installPlugin()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char lnkFilePath[NPP_PATH_MAX] = {0};
-    char* pHome = getpwuid(getuid())->pw_dir;
-	strcat(lnkFilePath, pHome);
-    strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-    remove(lnkFilePath);
-
-    // create the dirs if necessary
-    struct stat buf;
-    char tmpDir[NPP_PATH_MAX] = {0};
-    sprintf(tmpDir, "%s/.mozilla", pHome);
-    if (0 > stat(lnkFilePath, &buf))
-    {
-        mkdir(tmpDir, 0755);
-        strcat(tmpDir, "/plugins");
-        mkdir(tmpDir, 0755);
-    }
-
-    // get the real file path
-    char realFilePath[NPP_PATH_MAX] = {0};
-    ::rtl::OString tempString;
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-	strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
-
-    // create the link
-    if (0 != symlink(realFilePath, lnkFilePath))
-        return false;
-    return true;
-#endif
-#ifdef WNT
-	::rtl::OString tempString;
-	char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-	if( !lc_installPlugin(realFilePath))
-		return true;
-	else
-		return false;
-#endif
-}
-
-sal_Bool MozPluginTabPage::uninstallPlugin()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char lnkFilePath[NPP_PATH_MAX] = {0};
-    char* pHome = getpwuid(getuid())->pw_dir;
-	strcat(lnkFilePath, pHome);
-	strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-
-	if(0 > remove(lnkFilePath))
-	    return false;
-	return true;
-#endif
-#ifdef WNT
-	::rtl::OString tempString;
-	char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-	if(!lc_uninstallPlugin(realFilePath))
-		return true;
-	else
-		return false;
-#endif
-}
-//added by jmeng end
-
 /* -------------------------------------------------------------------------*/
 
 class MailerProgramCfg_Impl : public utl::ConfigItem

Modified: incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hrc?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hrc (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hrc Mon Sep 17 08:06:09 2012
@@ -156,11 +156,6 @@
 #define PB_MAILERURL                5
 #define STR_DEFAULT_FILENAME        6
 
-// plugin
-#define GB_MOZPLUGIN	1
-#define CB_MOZPLUGIN_CODE	2
-
-
 #endif // #ifndef _SVX_OPTINET_HRC
 
 // ******************************************************************* EOF

Modified: incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hxx (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/optinet2.hxx Mon Sep 17 08:06:09 2012
@@ -273,29 +273,6 @@ public:
 	virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
-//added by jmeng begin
-class MozPluginTabPage : public SfxTabPage
-{
-    FixedLine       aMSWordGB;
-	CheckBox		aWBasicCodeCB;
-
-	sal_Bool isInstalled(void);
-	sal_Bool installPlugin(void);
-	sal_Bool uninstallPlugin(void);
-
-	MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
-	virtual ~MozPluginTabPage();
-
-public:
-
-	static SfxTabPage*	Create( Window* pParent,
-								const SfxItemSet& rAttrSet );
-
-	virtual	sal_Bool 		FillItemSet( SfxItemSet& rSet );
-	virtual	void 		Reset( const SfxItemSet& rSet );
-
-};
-//added by jmeng end
 #endif
 
 /* -----------------------------20.06.01 16:32--------------------------------

Modified: incubator/ooo/branches/writer001/main/cui/source/options/optinet2.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/optinet2.src?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/optinet2.src (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/optinet2.src Mon Sep 17 08:06:09 2012
@@ -33,34 +33,6 @@
 /*                                                                      */
 /************************************************************************/
 
-// added by jmeng begin
-
-TabPage RID_SVXPAGE_INET_MOZPLUGIN
-{
-    HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
-	OutputSize = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
-	SVLook = TRUE ;
-	Hide = TRUE ;
-
-    FixedLine GB_MOZPLUGIN
-	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT (  248 , 8  ) ;
-        Text[ en-US ] = "Browser Plug-in";
-	};
-	CheckBox CB_MOZPLUGIN_CODE
-	{
-	    HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
-		Pos = MAP_APPFONT ( 12 , 14 ) ;
-		Size = MAP_APPFONT (  236 , 10  ) ;
-		TabStop = TRUE ;
-        Text [ en-US ] = "~Display documents in browser" ;
-	};
-};
-
-//added by jmeng end
-
 TabPage RID_SVXPAGE_INET_PROXY
 {
 	HelpId = HID_OPTIONS_PROXY ;

Modified: incubator/ooo/branches/writer001/main/cui/source/options/treeopt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/treeopt.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/treeopt.cxx (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/treeopt.cxx Mon Sep 17 08:06:09 2012
@@ -363,9 +363,6 @@ SfxTabPage*	CreateGeneralTabPage( sal_uI
 		case RID_SVXPAGE_ACCESSIBILITYCONFIG:		fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
 		case RID_SVXPAGE_SSO:						fnCreate = GetSSOCreator(); break;
 		case RID_SVXPAGE_OPTIONS_CTL:				fnCreate = &SvxCTLOptionsPage::Create ; break;
-		//added by jmeng begin
-		case RID_SVXPAGE_INET_MOZPLUGIN:			fnCreate = &MozPluginTabPage::Create; break;
-		//added by jmeng end
 		case RID_SVXPAGE_OPTIONS_JAVA:				fnCreate = &SvxJavaOptionsPage::Create ; break;
         case RID_SVXPAGE_ONLINEUPDATE:				fnCreate = &SvxOnlineUpdateTabPage::Create; break;
         case RID_OPTPAGE_CHART_DEFCOLORS:			fnCreate = &SvxDefaultColorOptPage::Create; break;
@@ -413,7 +410,6 @@ static OptionsMapping_Impl __READONLY_DA
     { "Internet",           "Proxy",                RID_SVXPAGE_INET_PROXY },
     { "Internet",           "Search",               RID_SVXPAGE_INET_SEARCH },
     { "Internet",           "Email",                RID_SVXPAGE_INET_MAIL },
-    { "Internet",           "MozillaPlugin",        RID_SVXPAGE_INET_MOZPLUGIN },
     { "LoadSave",           NULL,                   SID_FILTER_DLG },
     { "LoadSave",           "General",              RID_SFXPAGE_SAVE },
     { "LoadSave",           "VBAProperties",        SID_OPTFILTER_MSOFFICE },
@@ -2178,33 +2174,6 @@ void OfaTreeOptionsDialog::Initialize( c
             if ( nPageId == RID_SVXPAGE_INET_MAIL )
                 continue;
 #endif
-#if defined MACOSX
-            // Disable Mozilla Plug-in tab-page on Mac
-            if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
-                continue;
-#endif
-#ifdef LINUX                                                                  
-            // Disable Mozilla Plug-in tab-page on Linux if we find a         
-            // globally installed plugin                                      
-            if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) {                     
-                struct stat sb;                                               
-                char *p;                                                       
-                bool bHaveSystemWidePlugin = false;                           
-                char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so";  
-                                                                               
-                p = strtok(mozpaths, ":");                                     
-                while (p != NULL) {                                            
-                    if (stat(p, &sb) != -1) {                                  
-                         bHaveSystemWidePlugin = true;                         
-                         break;                                                
-                    }                                                          
-                    p = strtok(NULL, ":");                                     
-                }                                                             
-                                                                               
-                if (bHaveSystemWidePlugin == true)                            
-                    continue;                                                  
-            }                                                                   
-#endif
             AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
         }
     }

Modified: incubator/ooo/branches/writer001/main/cui/source/options/treeopt.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/cui/source/options/treeopt.src?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/cui/source/options/treeopt.src (original)
+++ incubator/ooo/branches/writer001/main/cui/source/options/treeopt.src Mon Sep 17 08:06:09 2012
@@ -182,7 +182,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
 			< "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
 			< "Search" ;  RID_SVXPAGE_INET_SEARCH; > ;
 			< "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
-            < "Browser Plug-in" ;  RID_SVXPAGE_INET_MOZPLUGIN; > ;
 		};
 		//modified by jmeng end
 	};

Modified: incubator/ooo/branches/writer001/main/dbaccess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/dbaccess/prj/build.lst?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/dbaccess/prj/build.lst (original)
+++ incubator/ooo/branches/writer001/main/dbaccess/prj/build.lst Mon Sep 17 08:06:09 2012
@@ -1,4 +1,4 @@
-ba      dbaccess        :       L10N:l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL
+ba      dbaccess        :       L10N:l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt NULL
 ba	dbaccess								usr1	-	all	ba_mkout NULL
 ba	dbaccess\inc							nmake	-	all	ba_inc NULL
 ba	dbaccess\source\ui\inc					nmake	-	all	ba_uiinc ba_inc NULL

Modified: incubator/ooo/branches/writer001/main/dbaccess/source/ui/dlg/admincontrols.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/dbaccess/source/ui/dlg/admincontrols.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/dbaccess/source/ui/dlg/admincontrols.cxx (original)
+++ incubator/ooo/branches/writer001/main/dbaccess/source/ui/dlg/admincontrols.cxx Mon Sep 17 08:06:09 2012
@@ -166,6 +166,7 @@ namespace dbaui
         m_aDatabaseName.SetModifyHdl( _rControlModificationLink );
         m_aHostName.SetModifyHdl( _rControlModificationLink );
         m_aPort.SetModifyHdl( _rControlModificationLink );
+        m_aSocket.SetModifyHdl( _rControlModificationLink );
         m_aNamedPipe.SetModifyHdl( _rControlModificationLink );
         m_aSocketRadio.SetToggleHdl( _rControlModificationLink );
         m_aNamedPipeRadio.SetToggleHdl( _rControlModificationLink );

Modified: incubator/ooo/branches/writer001/main/desktop/source/app/appinit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/desktop/source/app/appinit.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/desktop/source/app/appinit.cxx (original)
+++ incubator/ooo/branches/writer001/main/desktop/source/app/appinit.cxx Mon Sep 17 08:06:09 2012
@@ -263,7 +263,11 @@ void Desktop::RegisterServices( Referenc
 	    if ( bHeadlessMode )
 		    Application::EnableHeadlessMode();
 
-	    if ( conDcp.getLength() > 0 )
+	    // ConversionMode
+	    if ( pCmdLine->IsConversionMode() )
+		    Application::EnableConversionMode();
+
+        if ( conDcp.getLength() > 0 )
 	    {
 		    // accept incoming connections (scripting and one rvp)
 		    RTL_LOGFILE_CONTEXT( aLog, "desktop (lo119109) desktop::Desktop::createAcceptor()" );

Modified: incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.cxx (original)
+++ incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.cxx Mon Sep 17 08:06:09 2012
@@ -416,6 +416,14 @@ sal_Bool CommandLineArgs::InterpretComma
         SetBoolParam_Impl( CMD_BOOLPARAM_INVISIBLE, sal_True );
         return sal_True;
     }
+    else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-conversionmode" )) == sal_True )
+    {
+        // ConversionMode means also headless and invisibile, so set these parameters to true!
+        SetBoolParam_Impl( CMD_BOOLPARAM_HEADLESS, sal_True );
+        SetBoolParam_Impl( CMD_BOOLPARAM_INVISIBLE, sal_True );
+        SetBoolParam_Impl( CMD_BOOLPARAM_CONVERSIONMODE, sal_True );
+        return sal_True;
+    }
     else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
     {
 #if defined(ENABLE_QUICKSTART_APPLET)
@@ -690,6 +698,12 @@ sal_Bool CommandLineArgs::IsHeadless() c
 	return m_aBoolParams[ CMD_BOOLPARAM_HEADLESS ];
 }
 
+sal_Bool CommandLineArgs::IsConversionMode() const
+{
+	osl::MutexGuard  aMutexGuard( m_aMutex );
+	return m_aBoolParams[ CMD_BOOLPARAM_CONVERSIONMODE ];
+}
+
 sal_Bool CommandLineArgs::IsQuickstart() const
 {
 	osl::MutexGuard  aMutexGuard( m_aMutex );

Modified: incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.hxx (original)
+++ incubator/ooo/branches/writer001/main/desktop/source/app/cmdlineargs.hxx Mon Sep 17 08:06:09 2012
@@ -43,6 +43,7 @@ class CommandLineArgs
             CMD_BOOLPARAM_PLUGIN,
             CMD_BOOLPARAM_SERVER,
             CMD_BOOLPARAM_HEADLESS,
+            CMD_BOOLPARAM_CONVERSIONMODE,
             CMD_BOOLPARAM_QUICKSTART,
             CMD_BOOLPARAM_NOQUICKSTART,
             CMD_BOOLPARAM_TERMINATEAFTERINIT,
@@ -129,6 +130,7 @@ class CommandLineArgs
         sal_Bool IsBean() const;
         sal_Bool IsServer() const;
         sal_Bool IsHeadless() const;
+        sal_Bool IsConversionMode() const;
         sal_Bool IsQuickstart() const;
         sal_Bool IsNoQuickstart() const;
         sal_Bool IsTerminateAfterInit() const;

Modified: incubator/ooo/branches/writer001/main/desktop/source/app/cmdlinehelp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/desktop/source/app/cmdlinehelp.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/desktop/source/app/cmdlinehelp.cxx (original)
+++ incubator/ooo/branches/writer001/main/desktop/source/app/cmdlinehelp.cxx Mon Sep 17 08:06:09 2012
@@ -56,25 +56,26 @@ namespace desktop
 		"\n"\
 		"Options:\n";
 	const char *aCmdLineHelp_left =
-		"-minimized    \n"\
-		"-invisible    \n"\
-		"-norestore    \n"\
-		"-quickstart   \n"\
-		"-nologo       \n"\
-		"-nolockcheck  \n"\
-		"-nodefault    \n"\
-		"-headless     \n"\
-		"-help/-h/-?   \n"\
-		"-writer       \n"\
-		"-calc         \n"\
-		"-draw         \n"\
-		"-impress      \n"\
-		"-base         \n"\
-		"-math         \n"\
-		"-global       \n"\
-		"-web          \n"\
-		"-o            \n"\
-		"-n            \n";
+		"-minimized      \n"\
+		"-invisible      \n"\
+		"-norestore      \n"\
+		"-quickstart     \n"\
+		"-nologo         \n"\
+		"-nolockcheck    \n"\
+		"-nodefault      \n"\
+		"-headless       \n"\
+		"-conversionmode \n"\
+		"-help/-h/-?     \n"\
+		"-writer         \n"\
+		"-calc           \n"\
+		"-draw           \n"\
+		"-impress        \n"\
+		"-base           \n"\
+		"-math           \n"\
+		"-global         \n"\
+		"-web            \n"\
+		"-o              \n"\
+		"-n              \n";
 	const char *aCmdLineHelp_right =
 		"keep startup bitmap minimized.\n"\
 		"no startup screen, no default document and no UI.\n"\
@@ -84,6 +85,7 @@ namespace desktop
 		"don't check for remote instances using the installation\n"\
 		"don't start with an empty document\n"\
 		"like invisible but no userinteraction at all.\n"\
+		"enable further optimization for document conversion, includes enabled headless mode.\n"\
 		"show this message and exit.\n"\
 		"create new text document.\n"\
 		"create new spreadsheet document.\n"\

Modified: incubator/ooo/branches/writer001/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx (original)
+++ incubator/ooo/branches/writer001/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx Mon Sep 17 08:06:09 2012
@@ -113,6 +113,11 @@ namespace drawinglayer
             bool                        mbSingleEntry : 1;
             bool                        mbFullyOpaque : 1;
 
+            // true = interpret in unit coordinate system -> object aspect ratio will scale result
+            // false = interpret in object coordinate system -> object aspect ratio will not scale result
+            // (related to SVG's gradientUnits (userSpaceOnUse|objectBoundingBox)
+            bool                        mbUseUnitCoordinates : 1;
+
         protected:
             /// local helpers
             Primitive2DSequence createSingleGradientEntryFill() const;
@@ -147,12 +152,14 @@ namespace drawinglayer
                 const basegfx::B2DPolyPolygon& rPolyPolygon,
                 const SvgGradientEntryVector& rGradientEntries,
                 const basegfx::B2DPoint& rStart,
+                bool bUseUnitCoordinates,
                 SpreadMethod aSpreadMethod = Spread_pad);
 
             /// data read access
             const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; }
             const SvgGradientEntryVector& getGradientEntries() const { return maGradientEntries; }
             const basegfx::B2DPoint& getStart() const { return maStart; }
+            bool getUseUnitCoordinates() const { return mbUseUnitCoordinates; }
             SpreadMethod getSpreadMethod() const { return maSpreadMethod; }
 
             /// compare operator
@@ -195,6 +202,7 @@ namespace drawinglayer
                 const SvgGradientEntryVector& rGradientEntries,
                 const basegfx::B2DPoint& rStart,
                 const basegfx::B2DPoint& rEnd,
+                bool bUseUnitCoordinates,
                 SpreadMethod aSpreadMethod = Spread_pad);
             virtual ~SvgLinearGradientPrimitive2D();
 
@@ -262,6 +270,7 @@ namespace drawinglayer
                 const SvgGradientEntryVector& rGradientEntries,
                 const basegfx::B2DPoint& rStart,
                 double fRadius,
+                bool bUseUnitCoordinates,
                 SpreadMethod aSpreadMethod = Spread_pad,
                 const basegfx::B2DPoint* pFocal = 0);
             virtual ~SvgRadialGradientPrimitive2D();

Modified: incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/gridprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/gridprimitive2d.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/gridprimitive2d.cxx (original)
+++ incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/gridprimitive2d.cxx Mon Sep 17 08:06:09 2012
@@ -129,97 +129,141 @@ namespace drawinglayer
 					nSmallStepsY = (sal_uInt32)(fStepY / fSmallStepY);
 				}
 
-				// prepare point vectors for point and cross markers
-				std::vector< basegfx::B2DPoint > aPositionsPoint;
-				std::vector< basegfx::B2DPoint > aPositionsCross;
+                // calculate extended viewport in which grid points may lie at all
+                basegfx::B2DRange aExtendedViewport;
 
-				for(double fX(0.0); fX < aScale.getX(); fX += fStepX)
-				{
-					const bool bXZero(basegfx::fTools::equalZero(fX));
+                if(rViewInformation.getDiscreteViewport().isEmpty())
+                {
+                    // not set, use logic size to travel over all potentioal grid points
+                    aExtendedViewport = basegfx::B2DRange(0.0, 0.0, aScale.getX(), aScale.getY());
+                }
+                else
+                {
+                    // transform unit range to discrete view
+                    aExtendedViewport = basegfx::B2DRange(0.0, 0.0, 1.0, 1.0);
+                    basegfx::B2DHomMatrix aTrans(rViewInformation.getObjectToViewTransformation() * getTransform());
+                    aExtendedViewport.transform(aTrans);
 
-					for(double fY(0.0); fY < aScale.getY(); fY += fStepY)
-					{
-						const bool bYZero(basegfx::fTools::equalZero(fY));
+                    // intersect with visible part
+                    aExtendedViewport.intersect(rViewInformation.getDiscreteViewport());
 
-                        if(!bXZero && !bYZero)
-                        {
-                            // get discrete position and test against 3x3 area surrounding it
-                            // since it's a cross
-                            const double fHalfCrossSize(3.0 * 0.5);
-    						const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fX, fY));
-                            const basegfx::B2DRange aDiscreteRangeCross(
-                                aViewPos.getX() - fHalfCrossSize, aViewPos.getY() - fHalfCrossSize,
-                                aViewPos.getX() + fHalfCrossSize, aViewPos.getY() + fHalfCrossSize);
-    						
-                            if(rViewInformation.getDiscreteViewport().overlaps(aDiscreteRangeCross))
+                    if(!aExtendedViewport.isEmpty())
+                    {
+                        // convert back and apply scale
+                        aTrans.invert();
+                        aTrans.scale(aScale.getX(), aScale.getY());
+                        aExtendedViewport.transform(aTrans);
+
+                        // crop start/end in X/Y to multiples of logical step width
+                        const double fHalfCrossSize((rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(3.0, 0.0)).getLength());
+                        const double fMinX(floor((aExtendedViewport.getMinX() - fHalfCrossSize) / fStepX) * fStepX);
+                        const double fMaxX(ceil((aExtendedViewport.getMaxX() + fHalfCrossSize) / fStepX) * fStepX);
+                        const double fMinY(floor((aExtendedViewport.getMinY() - fHalfCrossSize) / fStepY) * fStepY);
+                        const double fMaxY(ceil((aExtendedViewport.getMaxY() + fHalfCrossSize) / fStepY) * fStepY);
+
+                        // put to aExtendedViewport and crop on object logic size
+                        aExtendedViewport = basegfx::B2DRange(
+                            std::max(fMinX, 0.0), 
+                            std::max(fMinY, 0.0), 
+                            std::min(fMaxX, aScale.getX()), 
+                            std::min(fMaxY, aScale.getY()));
+                    }
+                }
+
+                if(!aExtendedViewport.isEmpty())
+                {
+				    // prepare point vectors for point and cross markers
+				    std::vector< basegfx::B2DPoint > aPositionsPoint;
+				    std::vector< basegfx::B2DPoint > aPositionsCross;
+
+				    for(double fX(aExtendedViewport.getMinX()); fX < aExtendedViewport.getMaxX(); fX += fStepX)
+				    {
+					    const bool bXZero(basegfx::fTools::equalZero(fX));
+
+					    for(double fY(aExtendedViewport.getMinY()); fY < aExtendedViewport.getMaxY(); fY += fStepY)
+					    {
+						    const bool bYZero(basegfx::fTools::equalZero(fY));
+
+                            if(!bXZero && !bYZero)
                             {
-							    const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
-							    aPositionsCross.push_back(aLogicPos);
+                                // get discrete position and test against 3x3 area surrounding it
+                                // since it's a cross
+                                const double fHalfCrossSize(3.0 * 0.5);
+    						    const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fX, fY));
+                                const basegfx::B2DRange aDiscreteRangeCross(
+                                    aViewPos.getX() - fHalfCrossSize, aViewPos.getY() - fHalfCrossSize,
+                                    aViewPos.getX() + fHalfCrossSize, aViewPos.getY() + fHalfCrossSize);
+    						
+                                if(rViewInformation.getDiscreteViewport().overlaps(aDiscreteRangeCross))
+                                {
+							        const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
+							        aPositionsCross.push_back(aLogicPos);
+                                }
                             }
-                        }
 
-						if(getSubdivisionsX() && !bYZero)
-						{
-							double fF(fX + fSmallStepX);
-
-							for(sal_uInt32 a(1L); a < nSmallStepsX && fF < aScale.getX(); a++, fF += fSmallStepX)
-							{
-								const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fF, fY));
-
-								if(rViewInformation.getDiscreteViewport().isInside(aViewPos))
-								{
-									const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
-									aPositionsPoint.push_back(aLogicPos);
-								}
-							}
-						}
-
-						if(getSubdivisionsY() && !bXZero)
-						{
-							double fF(fY + fSmallStepY);
-
-							for(sal_uInt32 a(1L); a < nSmallStepsY && fF < aScale.getY(); a++, fF += fSmallStepY)
-							{
-								const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fX, fF));
-
-								if(rViewInformation.getDiscreteViewport().isInside(aViewPos))
-								{
-									const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
-									aPositionsPoint.push_back(aLogicPos);
-								}
-							}
-						}
-					}
-				}
-
-				// prepare return value
-				const sal_uInt32 nCountPoint(aPositionsPoint.size());
-				const sal_uInt32 nCountCross(aPositionsCross.size());
-				const sal_uInt32 nRetvalCount((nCountPoint ? 1 : 0) + (nCountCross ? 1 : 0));
-				sal_uInt32 nInsertCounter(0);
+						    if(getSubdivisionsX() && !bYZero)
+						    {
+							    double fF(fX + fSmallStepX);
+
+							    for(sal_uInt32 a(1); a < nSmallStepsX && fF < aExtendedViewport.getMaxX(); a++, fF += fSmallStepX)
+							    {
+								    const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fF, fY));
+
+								    if(rViewInformation.getDiscreteViewport().isInside(aViewPos))
+								    {
+									    const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
+									    aPositionsPoint.push_back(aLogicPos);
+								    }
+							    }
+						    }
+
+						    if(getSubdivisionsY() && !bXZero)
+						    {
+							    double fF(fY + fSmallStepY);
+
+							    for(sal_uInt32 a(1); a < nSmallStepsY && fF < aExtendedViewport.getMaxY(); a++, fF += fSmallStepY)
+							    {
+								    const basegfx::B2DPoint aViewPos(aRST * basegfx::B2DPoint(fX, fF));
+
+								    if(rViewInformation.getDiscreteViewport().isInside(aViewPos))
+								    {
+									    const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos);
+									    aPositionsPoint.push_back(aLogicPos);
+								    }
+							    }
+						    }
+					    }
+				    }
+
+				    // prepare return value
+				    const sal_uInt32 nCountPoint(aPositionsPoint.size());
+				    const sal_uInt32 nCountCross(aPositionsCross.size());
+				    const sal_uInt32 nRetvalCount((nCountPoint ? 1 : 0) + (nCountCross ? 1 : 0));
+				    sal_uInt32 nInsertCounter(0);
 				
-				aRetval.realloc(nRetvalCount);
-
-				// add PointArrayPrimitive2D if point markers were added
-				if(nCountPoint)
-				{
-					aRetval[nInsertCounter++] = Primitive2DReference(new PointArrayPrimitive2D(aPositionsPoint, getBColor()));
-				}
+				    aRetval.realloc(nRetvalCount);
 
-				// add MarkerArrayPrimitive2D if cross markers were added
-				if(nCountCross)
-				{
-    				if(!getSubdivisionsX() && !getSubdivisionsY())
-                    {
-                        // no subdivisions, so fall back to points at grid positions, no need to
-                        // visualize a difference between divisions and sub-divisions
-    					aRetval[nInsertCounter++] = Primitive2DReference(new PointArrayPrimitive2D(aPositionsCross, getBColor()));
-                    }
-                    else
-                    {
-    					aRetval[nInsertCounter++] = Primitive2DReference(new MarkerArrayPrimitive2D(aPositionsCross, getCrossMarker()));
-                    }
-				}
+				    // add PointArrayPrimitive2D if point markers were added
+				    if(nCountPoint)
+				    {
+					    aRetval[nInsertCounter++] = Primitive2DReference(new PointArrayPrimitive2D(aPositionsPoint, getBColor()));
+				    }
+
+				    // add MarkerArrayPrimitive2D if cross markers were added
+				    if(nCountCross)
+				    {
+    				    if(!getSubdivisionsX() && !getSubdivisionsY())
+                        {
+                            // no subdivisions, so fall back to points at grid positions, no need to
+                            // visualize a difference between divisions and sub-divisions
+    					    aRetval[nInsertCounter++] = Primitive2DReference(new PointArrayPrimitive2D(aPositionsCross, getBColor()));
+                        }
+                        else
+                        {
+    					    aRetval[nInsertCounter++] = Primitive2DReference(new MarkerArrayPrimitive2D(aPositionsCross, getCrossMarker()));
+                        }
+				    }
+                }
 			}
 
 			return aRetval;



Mime
View raw message