You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/21 03:53:05 UTC

svn commit: r1448495 [1/6] - in /openoffice/branches/ia2: ./ ext_libraries/ratscan/scan/ extras/l10n/source/rw/ extras/l10n/source/te/ extras/l10n/source/uz/ main/ main/autodoc/source/display/html/ main/automation/packimages/ main/automation/prj/ main/...

Author: steve_y
Date: Thu Feb 21 02:52:59 2013
New Revision: 1448495

URL: http://svn.apache.org/r1448495
Log:
Updated to rev. 1148491

Added:
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/processor2dtools.hxx
      - copied unchanged from r1448058, openoffice/trunk/main/drawinglayer/inc/drawinglayer/processor2d/processor2dtools.hxx
    openoffice/branches/ia2/main/drawinglayer/source/processor2d/processor2dtools.cxx
      - copied unchanged from r1448058, openoffice/trunk/main/drawinglayer/source/processor2d/processor2dtools.cxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlayrectangle.hxx
      - copied unchanged from r1448058, openoffice/trunk/main/svx/inc/svx/sdr/overlay/overlayrectangle.hxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayrectangle.cxx
      - copied unchanged from r1448058, openoffice/trunk/main/svx/source/sdr/overlay/overlayrectangle.cxx
Removed:
    openoffice/branches/ia2/main/automation/packimages/
    openoffice/branches/ia2/main/automation/source/miniapp/
    openoffice/branches/ia2/main/automation/source/testtool/
    openoffice/branches/ia2/main/svx/inc/svx/sdr/contact/objectcontacttools.hxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
    openoffice/branches/ia2/main/svx/source/sdr/contact/objectcontacttools.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayhatchrect.cxx
Modified:
    openoffice/branches/ia2/   (props changed)
    openoffice/branches/ia2/ext_libraries/ratscan/scan/makefile.mk
    openoffice/branches/ia2/ext_libraries/ratscan/scan/rat-scan.xml
    openoffice/branches/ia2/extras/l10n/source/rw/localize.sdf
    openoffice/branches/ia2/extras/l10n/source/te/localize.sdf
    openoffice/branches/ia2/extras/l10n/source/uz/localize.sdf
    openoffice/branches/ia2/main/autodoc/source/display/html/cfrstd.cxx
    openoffice/branches/ia2/main/autodoc/source/display/html/outfile.cxx
    openoffice/branches/ia2/main/automation/prj/build.lst
    openoffice/branches/ia2/main/automation/util/makefile.mk
    openoffice/branches/ia2/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
    openoffice/branches/ia2/main/chart2/source/view/main/VDataSeries.cxx
    openoffice/branches/ia2/main/comphelper/inc/comphelper/stl_types.hxx
    openoffice/branches/ia2/main/configure.in
    openoffice/branches/ia2/main/connectivity/source/manager/mdrivermanager.cxx
    openoffice/branches/ia2/main/connectivity/source/manager/mdrivermanager.hxx
    openoffice/branches/ia2/main/cppu/inc/com/sun/star/uno/Reference.hxx
    openoffice/branches/ia2/main/cui/source/options/optcolor.cxx
    openoffice/branches/ia2/main/desktop/source/deployment/dp_persmap.cxx
    openoffice/branches/ia2/main/desktop/source/deployment/inc/dp_persmap.h
    openoffice/branches/ia2/main/desktop/source/deployment/manager/dp_extensionmanager.cxx
    openoffice/branches/ia2/main/desktop/source/migration/services/jvmfwk.cxx
    openoffice/branches/ia2/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
    openoffice/branches/ia2/main/drawinglayer/Library_drawinglayer.mk
    openoffice/branches/ia2/main/drawinglayer/Package_inc.mk
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
    openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
    openoffice/branches/ia2/main/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
    openoffice/branches/ia2/main/drawinglayer/source/tools/converters.cxx
    openoffice/branches/ia2/main/extensions/source/activex/main/makefile.mk
    openoffice/branches/ia2/main/filter/source/graphicfilter/ieps/ieps.cxx
    openoffice/branches/ia2/main/hwpfilter/source/drawdef.h
    openoffice/branches/ia2/main/hwpfilter/source/drawing.h
    openoffice/branches/ia2/main/hwpfilter/source/formula.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hbox.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hbox.h
    openoffice/branches/ia2/main/hwpfilter/source/hcode.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hcode.h
    openoffice/branches/ia2/main/hwpfilter/source/hfont.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hinfo.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hiodev.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hiodev.h
    openoffice/branches/ia2/main/hwpfilter/source/hpara.h
    openoffice/branches/ia2/main/hwpfilter/source/hwpeq.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hwpfile.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hwpfile.h
    openoffice/branches/ia2/main/hwpfilter/source/hwplib.h
    openoffice/branches/ia2/main/hwpfilter/source/hwpread.cpp
    openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx
    openoffice/branches/ia2/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
    openoffice/branches/ia2/main/i18npool/source/localedata/saxparser.cxx
    openoffice/branches/ia2/main/i18npool/source/textconversion/textconversion.cxx
    openoffice/branches/ia2/main/i18npool/source/transliteration/textToPronounce_zh.cxx
    openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst
    openoffice/branches/ia2/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
    openoffice/branches/ia2/main/jvmfwk/source/elements.cxx
    openoffice/branches/ia2/main/more_fonts/fonts/fc_local.conf
    openoffice/branches/ia2/main/odk/cfgWin.js
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
    openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
    openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml
    openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in
    openoffice/branches/ia2/main/odk/setsdkenv_windows.template
    openoffice/branches/ia2/main/odk/util/makefile.pmk
    openoffice/branches/ia2/main/offapi/com/sun/star/awt/PrinterServer.idl
    openoffice/branches/ia2/main/offapi/com/sun/star/ui/XStatusbarItem.idl
    openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx
    openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx
    openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.hxx
    openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp
    openoffice/branches/ia2/main/scripting/java/build.xml
    openoffice/branches/ia2/main/scripting/workben/build.xml
    openoffice/branches/ia2/main/sd/source/ui/view/sdview2.cxx
    openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx
    openoffice/branches/ia2/main/sdext/source/minimizer/description.xml
    openoffice/branches/ia2/main/sdext/source/pdfimport/config/description.xml
    openoffice/branches/ia2/main/sdext/source/presenter/description.xml
    openoffice/branches/ia2/main/set_soenv.in
    openoffice/branches/ia2/main/solenv/gbuild/platform/windows.mk
    openoffice/branches/ia2/main/solenv/inc/minor.mk
    openoffice/branches/ia2/main/solenv/inc/set_wntx64.mk
    openoffice/branches/ia2/main/solenv/inc/version.lst
    openoffice/branches/ia2/main/svx/Library_svxcore.mk
    openoffice/branches/ia2/main/svx/Package_inc.mk
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlayobject.hxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/overlay/overlaytools.hxx
    openoffice/branches/ia2/main/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdview.hxx
    openoffice/branches/ia2/main/svx/source/engine3d/dragmt3d.cxx
    openoffice/branches/ia2/main/svx/source/engine3d/view3d.cxx
    openoffice/branches/ia2/main/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
    openoffice/branches/ia2/main/svx/source/sdr/contact/objectcontactofpageview.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlaymanager.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayobject.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlaypolypolygon.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlayrollingrectangle.cxx
    openoffice/branches/ia2/main/svx/source/sdr/overlay/overlaytools.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdcrtv.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svddrgmt.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdedxv.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdhdl.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdmrkv.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdobj.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdview.cxx
    openoffice/branches/ia2/main/svx/source/table/svdotable.cxx
    openoffice/branches/ia2/main/svx/source/table/tablehandles.cxx
    openoffice/branches/ia2/main/svx/source/table/tablehandles.hxx
    openoffice/branches/ia2/main/sw/source/core/doc/notxtfrm.cxx
    openoffice/branches/ia2/main/sw/source/core/frmedt/fecopy.cxx
    openoffice/branches/ia2/main/sw/source/ui/dochdl/swdtflvr.cxx
    openoffice/branches/ia2/main/sw/source/ui/inc/swdtflvr.hxx
    openoffice/branches/ia2/main/swext/mediawiki/src/description.xml
    openoffice/branches/ia2/main/sysui/desktop/debian/makefile.mk
    openoffice/branches/ia2/main/sysui/desktop/productversion.mk
    openoffice/branches/ia2/main/sysui/desktop/slackware/makefile.mk
    openoffice/branches/ia2/main/tools/inc/tools/diagnose_ex.h
    openoffice/branches/ia2/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
    openoffice/branches/ia2/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
    openoffice/branches/ia2/main/unotools/source/config/bootstrap.cxx
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/airbrush_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/airbrush_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/ase_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/ase_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asn_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asn_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asne_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asne_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asns_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asns_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asnswe_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asnswe_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asnw_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asnw_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/ass_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/ass_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asse_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asse_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/assw_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/assw_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asw_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/asw_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/aswe_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/aswe_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chain_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chain_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chainnot_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chainnot_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chart_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/chart_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copydata_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copydata_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copydlnk_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copydlnk_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyfile_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyfile_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyfiles_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyfiles_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyflnk_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/copyflnk_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/crook_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/crook_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/crop_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/crop_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/detective_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/detective_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawarc_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawarc_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawbezier_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawbezier_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcaption_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcaption_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawconnect_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawconnect_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcrook_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcrook_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcrop_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawcrop_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawellipse_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawellipse_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawfreehand_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawfreehand_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawline_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawline_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawmirror_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawmirror_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawpie_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawpie_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawpolygon_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawpolygon_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawrect_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawrect_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawtext_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/drawtext_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/fill_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/fill_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/hshear_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/hshear_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/invert50.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkdata_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/linkfile_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/magnify_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/mirror_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedata_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movedlnk_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefile_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movefiles_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/moveflnk_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/movepoint_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/nodrop_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/null_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/paintbrush_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotcol_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotdel_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotfld_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/pivotrow_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/rotate_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsele_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblsels_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselse_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselsw_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/tblselw_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timemove_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/timesize_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vertcurs_mask.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_curs.h
    openoffice/branches/ia2/main/vcl/inc/unx/x11_cursors/vshear_mask.h
    openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx
    openoffice/branches/ia2/main/vcl/source/window/printdlg.cxx
    openoffice/branches/ia2/main/vcl/unx/generic/app/saldisp.cxx
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/X11_selection.cxx
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_curs.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/copydata_mask.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_curs.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/linkdata_mask.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_curs.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/movedata_mask.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_curs.h
    openoffice/branches/ia2/main/vcl/unx/generic/dtrans/nodrop_mask.h
    openoffice/branches/ia2/main/vcl/unx/gtk/app/gtkdata.cxx
    openoffice/branches/ia2/main/vigra/vigra1.6.0.patch
    openoffice/branches/ia2/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
    openoffice/branches/ia2/main/xmerge/workben/build.xml
    openoffice/branches/ia2/main/xml2cmp/source/xcd/filebuff.cxx
    openoffice/branches/ia2/main/xmloff/source/chart/PropertyMap.hxx
    openoffice/branches/ia2/main/xmloff/source/draw/sdpropls.cxx
    openoffice/branches/ia2/main/xmloff/source/forms/controlpropertymap.cxx
    openoffice/branches/ia2/main/xmloff/source/style/PageMasterStyleMap.cxx
    openoffice/branches/ia2/main/xmloff/source/text/txtprmap.cxx
    openoffice/branches/ia2/main/xmloff/source/transform/TransformerActionInit.hxx
    openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
    openoffice/branches/ia2/test/   (props changed)
    openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/Run.help
    openoffice/branches/ia2/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
    openoffice/branches/ia2/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java

Propchange: openoffice/branches/ia2/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1439795-1448058

Modified: openoffice/branches/ia2/ext_libraries/ratscan/scan/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/ext_libraries/ratscan/scan/makefile.mk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/ext_libraries/ratscan/scan/makefile.mk (original)
+++ openoffice/branches/ia2/ext_libraries/ratscan/scan/makefile.mk Thu Feb 21 02:52:59 2013
@@ -23,7 +23,7 @@ PRJ=..
 
 .INCLUDE :	settings.mk
 
-version=3.5
+version=4.0
 
 .IF "$(RAT_JAR_HOME)"=="BUILD"
 rat_jar_home=$(CLASSDIR)

Modified: openoffice/branches/ia2/ext_libraries/ratscan/scan/rat-scan.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/ext_libraries/ratscan/scan/rat-scan.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/ext_libraries/ratscan/scan/rat-scan.xml (original)
+++ openoffice/branches/ia2/ext_libraries/ratscan/scan/rat-scan.xml Thu Feb 21 02:52:59 2013
@@ -25,7 +25,7 @@
   <description>
     Check over Apache OpenOffice source files for license headers.
   </description>
-  <property name="version" value="AOO 3.5"/>
+  <property name="version" value="AOO 4.0"/>
   <property environment="env"/>
   <property name="src-dir" location="${env.SRC_ROOT}/.."/>
 

Modified: openoffice/branches/ia2/extras/l10n/source/rw/localize.sdf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/rw/localize.sdf?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/extras/l10n/source/rw/localize.sdf (original)
+++ openoffice/branches/ia2/extras/l10n/source/rw/localize.sdf Thu Feb 21 02:52:59 2013
@@ -52366,21 +52366,21 @@ scp2	source\ooo\module_headless.ulf	0	Ln
 scp2	source\ooo\module_headless.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_HEADLESS				0	rw	Ubufasha bwa porogaramu nta mutwe				2002-02-02 02:02:02
 scp2	source\ooo\module_java.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_JAVA				0	rw	Ikigize cyo gushyiraho Ibikikije Java				2002-02-02 02:02:02
 scp2	source\ooo\module_java.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_JAVA				0	rw	Java Runtime Environment (%JAVAVERSION)				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AF				0	rw	Yinjiza ubufasha bw'Icyafurikanzi muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AR				0	rw	Yinjiza ubufasha bw'Icyarabu muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AR_SA				0	rw	Yinjiza ubufasha bw'Icyarabu muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AS_IN				0	rw	Yinjiza ubufasha bw'Ikinyasamu muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BE_BY				0	rw	Yinjiza ubufasha bw'Ikibelarusiya muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BG				0	rw	Yinjiza ubufasha bw'Ikibuligariya muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN				0	rw	Yinjiza ubufasha bw'Ikibengali muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN_BD				0	rw	Yinjiza ubufasha bw'Ikibengali (Bangaladeshi) muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN_IN				0	rw	Yinjiza ubufasha bw'Ikibengali muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BR				0	rw	Yinjiza ubufasha bw'Ikibureto muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BS				0	rw	Yinjiza ubufasha bw'Ikibosiniya muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_CA				0	rw	Yinjiza ubufasha bw'Igikatala muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_CS				0	rw	Yinjiza ubufasha bw'Igiceki muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AF				0	rw	Yinjiza ubufasha bw'Icyafurikanzi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AR				0	rw	Yinjiza ubufasha bw'Icyarabu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AR_SA				0	rw	Yinjiza ubufasha bw'Icyarabu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_AS_IN				0	rw	Yinjiza ubufasha bw'Ikinyasamu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BE_BY				0	rw	Yinjiza ubufasha bw'Ikibelarusiya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BG				0	rw	Yinjiza ubufasha bw'Ikibuligariya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN				0	rw	Yinjiza ubufasha bw'Ikibengali muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN_BD				0	rw	Yinjiza ubufasha bw'Ikibengali (Bangaladeshi) muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BN_IN				0	rw	Yinjiza ubufasha bw'Ikibengali muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BR				0	rw	Yinjiza ubufasha bw'Ikibureto muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_BS				0	rw	Yinjiza ubufasha bw'Ikibosiniya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_CA				0	rw	Yinjiza ubufasha bw'Igikatala muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_CS				0	rw	Yinjiza ubufasha bw'Igiceki muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_CY				0	rw	Yinjiza ubufasha bw'Ikigaluwa muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_DA				0	rw	Yinjiza ubufasha bw'Ikidanimariki muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_DA				0	rw	Yinjiza ubufasha bw'Ikidanimariki muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_DE				0	rw	Yinjiza ubufasha bw'Ikidage muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_DZ				0	rw	Yinjiza ubufasha bw'Ikizongoka muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_EL				0	rw	Yinjiza ubufasha bw'Ikigereki muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
@@ -52388,7 +52388,7 @@ scp2	source\ooo\module_langpack.ulf	0	Ln
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_EO				0	rw	Yinjiza Ifasha rya Esperanto muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ES				0	rw	Yinjiza ubufasha bw'Ikesipanypli muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ET				0	rw	Yinjiza ubufasha bw'Icyesitoniya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_EU				0	rw	Yinjiza ubufasha bw'Ikibasiki muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_EU				0	rw	Yinjiza ubufasha bw'Ikibasiki muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_FA				0	rw	Yinjiza ubufasha bw'Igifarisi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_FI				0	rw	Yinjiza ubufasha bw'Igifinilande muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_FO				0	rw	Yinjiza ubufasha bw'Igiferowe muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
@@ -52399,9 +52399,9 @@ scp2	source\ooo\module_langpack.ulf	0	Ln
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HE				0	rw	Yinjiza ubufasha bw'Igihebureyi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HI				0	rw	Yinjiza ubufasha bw'Igihindi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HI_IN				0	rw	Yinjiza ubufasha bw'Igihindi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HR				0	rw	Yinjiza ubufasha bw'Igikorowasi muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HR				0	rw	Yinjiza ubufasha bw'Igikorowasi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HU				0	rw	Yinjiza ubufasha bw'Igihungariya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HY				0	rw	Yinjiza ubufasha bw'Icyarumeniya muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_HY				0	rw	Yinjiza ubufasha bw'Icyarumeniya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ID				0	rw	Yinjiza ubufasha bw'Ikinyendoneziya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_IS				0	rw	Yinjiza ubufasha bw'Ikinyeyisilandi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_IT				0	rw	Yinjiza ubufasha bw'Igitaliyani muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
@@ -52440,7 +52440,7 @@ scp2	source\ooo\module_langpack.ulf	0	Ln
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SH_YU				0	rw	Yinjiza ubufasha bw'Igiseribiya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SK				0	rw	Yinjiza ubufasha bw'Igisilovaki muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SL				0	rw	Yinjiza ubufasha bw'Igisiloveniya muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SQ				0	rw	Yinjiza ubufasha bw'Icyalubaniya %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SQ				0	rw	Yinjiza ubufasha bw'Icyalubaniya %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SR_CS				0	rw	Yinjiza ubufasha bw'Igiseribiya(sisirike) muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_SS				0	rw	Yinjiza ubufasha bw'Igiswazilandi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ST				0	rw	Yinjiza ubufasha bw'Igisutu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
@@ -52461,8 +52461,8 @@ scp2	source\ooo\module_langpack.ulf	0	Ln
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_VI				0	rw	Yinjiza ubufasha bw'Ikiviyetinamu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_XH				0	rw	Yinjiza ubufasha bw'Ikizosa muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_YI				0	rw	Yinjiza ubufasha bw'Ikiyidi muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ZH_CN				0	rw	Yinjiza ubufasha bw'Igishinwa (cy'ubu) muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
-scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ZH_TW				0	rw	Yinjiza ubufasha bw'Igishinwa (cya kera) muri %PRODUCTNAME %%PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ZH_CN				0	rw	Yinjiza ubufasha bw'Igishinwa (cy'ubu) muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
+scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ZH_TW				0	rw	Yinjiza ubufasha bw'Igishinwa (cya kera) muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_LANGPACK_ZU				0	rw	Yinjiza ubufasha bw'Ikizulu muri %PRODUCTNAME %PRODUCTVERSION				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_DESC_MODULE_ROOT_LANGPACK				0	rw	Additional language packs    				2002-02-02 02:02:02
 scp2	source\ooo\module_langpack.ulf	0	LngText	STR_NAME_MODULE_LANGPACK_AF				0	rw	Icyafurikanzi				2002-02-02 02:02:02
@@ -64489,7 +64489,7 @@ wizards	source\formwizard\dbwizres.src	0
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 19				0	rw	Dosiye isanzwemo. Wifuza kuyisimbura? 				2002-02-02 02:02:02
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 2				0	rw	Ntibyashobotse kurema urupapurotuzu. <BR>Reba ko igice 'PRODUCTNAME Calc' cyinjijwe.				2002-02-02 02:02:02
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 20				0	rw	Modeli yakozwe uhereye ku <izina_nyobora> ku <itariki_igezweho>.				2002-02-02 02:02:02
-wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 21				0	rw	Nyobora ntishobora gutangizwa, kubera ko dosiye za ngombwa zitabonwe. \nHasi 'Ibikoresho - Amahitamo - %%PRODUCTNAME - Inzira' kandi buto 'Gisanzweho' mu gutangiza bushya inzira ku magenamiterere asanzweho mwimerere.\nNoneho utangize nyobora nanone.				2002-02-02 02:02:02
+wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 21				0	rw	Nyobora ntishobora gutangizwa, kubera ko dosiye za ngombwa zitabonwe. \nHasi 'Ibikoresho - Amahitamo - %PRODUCTNAME - Inzira' kandi buto 'Gisanzweho' mu gutangiza bushya inzira ku magenamiterere asanzweho mwimerere.\nNoneho utangize nyobora nanone.				2002-02-02 02:02:02
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 3				0	rw	Ntibyashobotse kurema iyerekana.<BR>Reba ko igice  'PRODUCTNAME Gucapa' cyinjijwe.				2002-02-02 02:02:02
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 4				0	rw	Ntibyashobotse kurema igishushanyo.<BR>Reba ko igice 'PRODUCTNAME Gushushanya' cyinjijwe.				2002-02-02 02:02:02
 wizards	source\formwizard\dbwizres.src	0	string	RID_COMMON_START + 5				0	rw	Ntibyashoboshe kurema inzira.<BR>Reba ko igice  'PRODUCTNAME Mibare' cyinjijwe.				2002-02-02 02:02:02

Modified: openoffice/branches/ia2/extras/l10n/source/te/localize.sdf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/te/localize.sdf?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/extras/l10n/source/te/localize.sdf (original)
+++ openoffice/branches/ia2/extras/l10n/source/te/localize.sdf Thu Feb 21 02:52:59 2013
@@ -13740,7 +13740,7 @@ scp2	source\impress\folderitem_impress.u
 scp2	source\impress\module_impress.ulf	0	LngText	STR_NAME_MODULE_PRG_IMPRESS				0	te	%PRODUCTNAME ఇంప్రెస్				2002-02-02 02:02:02
 scp2	source\impress\module_impress.ulf	0	LngText	STR_DESC_MODULE_PRG_IMPRESS				0	te	పుటలప్రదర్శనలు,సమావేశములు,మహాతల పుటల కొరకు ప్రదర్శనలను  %PRODUCTNAME ముద్రను వినియోగించి సృష్టించు మరియు సరిచేయి				2002-02-02 02:02:02
 scp2	source\impress\module_impress.ulf	0	LngText	STR_NAME_MODULE_PRG_IMPRESS_BIN				0	te	కార్యక్రమం అధిభాగం				2002-02-02 02:02:02
-scp2	source\impress\module_impress.ulf	0	LngText	STR_DESC_MODULE_PRG_IMPRESS_BIN				0	te	%%PRODUCTNAME ముద్ర కార్యక్షేత్రము				2002-02-02 02:02:02
+scp2	source\impress\module_impress.ulf	0	LngText	STR_DESC_MODULE_PRG_IMPRESS_BIN				0	te	%PRODUCTNAME ముద్ర కార్యక్షేత్రము				2002-02-02 02:02:02
 scp2	source\impress\module_impress.ulf	0	LngText	STR_NAME_MODULE_PRG_IMPRESS_HELP				0	te	%PRODUCTNAME ముద్ర సహాయము				2002-02-02 02:02:02
 scp2	source\impress\module_impress.ulf	0	LngText	STR_DESC_MODULE_PRG_IMPRESS_HELP				0	te	%PRODUCTNAME ముద్ర గురించి సహాయము				2002-02-02 02:02:02
 scp2	source\impress\module_ogltrans.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_OGLTRANS				0	te	%PRODUCTNAME ఇంప్రెస్ కొరకు OpenGL స్లైడ్ ట్రాన్సిషన్				2002-02-02 02:02:02

Modified: openoffice/branches/ia2/extras/l10n/source/uz/localize.sdf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/uz/localize.sdf?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/extras/l10n/source/uz/localize.sdf (original)
+++ openoffice/branches/ia2/extras/l10n/source/uz/localize.sdf Thu Feb 21 02:52:59 2013
@@ -54352,7 +54352,7 @@ scp2	source\writer\registryitem_writer.u
 scp2	source\writer\registryitem_writer.ulf	0	LngText	STR_REG_VAL_MS_WORD_TEMPLATE				0	uz	Microsoft Word shabloni				2002-02-02 02:02:02
 scp2	source\writer\registryitem_writer.ulf	0	LngText	STR_REG_VAL_MS_RTF_DOCUMENT				0	uz	RTF hujjat				2002-02-02 02:02:02
 scp2	source\writer\module_writer.ulf	0	LngText	STR_NAME_MODULE_PRG_WRT				0	uz	%PRODUCTNAME Writer				2002-02-02 02:02:02
-scp2	source\writer\module_writer.ulf	0	LngText	STR_DESC_MODULE_PRG_WRT				0	uz	%PRODUCTNAM Writer yordamida xatlar uchun matnlar, hisobotlar, hujjatlar yoki veb sahifalar yaratish.				2002-02-02 02:02:02
+scp2	source\writer\module_writer.ulf	0	LngText	STR_DESC_MODULE_PRG_WRT				0	uz	%PRODUCTNAME Writer yordamida xatlar uchun matnlar, hisobotlar, hujjatlar yoki veb sahifalar yaratish.				2002-02-02 02:02:02
 scp2	source\writer\module_writer.ulf	0	LngText	STR_NAME_MODULE_PRG_WRT_BIN				0	uz	Dastur moduli				2002-02-02 02:02:02
 scp2	source\writer\module_writer.ulf	0	LngText	STR_DESC_MODULE_PRG_WRT_BIN				0	uz	%PRODUCTNAME Writer dasturi				2002-02-02 02:02:02
 scp2	source\writer\module_writer.ulf	0	LngText	STR_NAME_MODULE_PRG_WRT_HELP				0	uz	%PRODUCTNAME Writer uchun qoʻllanma				2002-02-02 02:02:02

Modified: openoffice/branches/ia2/main/autodoc/source/display/html/cfrstd.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/autodoc/source/display/html/cfrstd.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/autodoc/source/display/html/cfrstd.cxx (original)
+++ openoffice/branches/ia2/main/autodoc/source/display/html/cfrstd.cxx Thu Feb 21 02:52:59 2013
@@ -98,136 +98,136 @@ bool            bUse_OOoFrameDiv = true;
 //***************   These are used for IDL currently only!   ********************
 
 const char * const C_sStdStyle =
-    "/*See bottom of file for explanations.*/"CRLF
+    "/*See bottom of file for explanations.*/" CRLF
     CRLF
-    "body { background-color:#ffffff; }"CRLF
+    "body { background-color:#ffffff; }" CRLF
     CRLF
-	"h3             { font-size:13pt; font-weight:bold;"CRLF
-	"                 margin-top:3pt; margin-bottom:1pt; }"CRLF
-    "p, dt, dd, pre { font-size:11pt;"CRLF
-    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
-	"pre            { font-family:monospace; }"CRLF
-    CRLF
-    "table.navimain { background-color:#eeeeff; }"CRLF
-    "table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
-    CRLF
-	"td             {                     font-size:11pt; }"CRLF
-    "td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
-    "                 line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
-    "td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
-    "                 line-height:20pt;   background-color:#ccccff; }"CRLF
-    "td.crosstitle  {                     font-size:12pt; font-weight:bold;"CRLF
-    "                 line-height:15pt;   background-color:#eeeeff; }"CRLF
-    "td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
-    CRLF
-    "td.imsum_left  { width:30%;  }"CRLF
-    "td.imsum_right { width:70%;  }"CRLF
-    CRLF
-    "td.navimain, a.navimain"CRLF
-    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
-    "                     color:#ffffff; background-color:#2222ad; }"CRLF
-    "td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
-    "td.navisub, a.navisub"CRLF
-    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
-    "td.navimain, td.navisub"CRLF
-    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
-    CRLF
-    "a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
-    "a.navimain, a.navisub  { color:#000000; }"CRLF
-    ".dt            { font-weight:bold; }"CRLF
-	".namechain     { font-size:13pt; font-weight:bold;"CRLF
-	"                 margin-top:3pt; margin-bottom:6pt; }"CRLF
-	".title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+	"h3             { font-size:13pt; font-weight:bold;" CRLF
+	"                 margin-top:3pt; margin-bottom:1pt; }" CRLF
+    "p, dt, dd, pre { font-size:11pt;" CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }" CRLF
+	"pre            { font-family:monospace; }" CRLF
+    CRLF
+    "table.navimain { background-color:#eeeeff; }" CRLF
+    "table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
+    CRLF
+	"td             {                     font-size:11pt; }" CRLF
+    "td.title       { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
+    "                 line-height:30pt;   background-color:#ccccff; text-align:center; }" CRLF
+    "td.subtitle    { font-family: Arial; font-size:13pt;" CRLF
+    "                 line-height:20pt;   background-color:#ccccff; }" CRLF
+    "td.crosstitle  {                     font-size:12pt; font-weight:bold;" CRLF
+    "                 line-height:15pt;   background-color:#eeeeff; }" CRLF
+    "td.imdetail    { width:100%;         background-color:#eeeeff; }" CRLF
+    CRLF
+    "td.imsum_left  { width:30%;  }" CRLF
+    "td.imsum_right { width:70%;  }" CRLF
+    CRLF
+    "td.navimain, a.navimain" CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
+    "                     color:#ffffff; background-color:#2222ad; }" CRLF
+    "td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
+    "td.navisub, a.navisub" CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
+    "td.navimain, td.navisub" CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }" CRLF
+    CRLF
+    "a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
+    "a.navimain, a.navisub  { color:#000000; }" CRLF
+    ".dt            { font-weight:bold; }" CRLF
+	".namechain     { font-size:13pt; font-weight:bold;" CRLF
+	"                 margin-top:3pt; margin-bottom:6pt; }" CRLF
+	".title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
     ;
 
 
 const char * const C_sCssExplanations =
-    "/* Explanation of CSS classes:"CRLF
+    "/* Explanation of CSS classes:" CRLF
     CRLF
-    ".navimain          Text in main navigation bar."CRLF
-    ".navisub           Text in lower navigation bar."CRLF
-    "td.navimainself    Cell in main navigation bar with \"selected\" shadow: You are here."CRLF
-    "td.navimainnone    Cell in main navigation bar with no link."CRLF
-    CRLF
-	".namechain         Line with current module path."CRLF
-    CRLF
-    "td.crosstitle      Comment box for bases (base interfaces etc.)"CRLF
-    "td.imsum_left      Left part of such boxes."CRLF
-    "td.imsum_right     Right part of such boxes."CRLF
-    CRLF
-    "td.title           Main title of the page like \"interface XYz\""CRLF
-    ".subtitle          Tables, and head cells of those, which list members"CRLF
-    "                   like \"method summary\" and \"method details\"."CRLF
-    CRLF
-    "td.imdetail        Background table of method's detail description."CRLF
-    "a.membertitle      Method name (as jump label) in method's detail"CRLF
-    "                   description."CRLF
-	".title2            smaller font prefixes to page titles"CRLF
-    "*/"CRLF
+    ".navimain          Text in main navigation bar." CRLF
+    ".navisub           Text in lower navigation bar." CRLF
+    "td.navimainself    Cell in main navigation bar with \"selected\" shadow: You are here." CRLF
+    "td.navimainnone    Cell in main navigation bar with no link." CRLF
+    CRLF
+	".namechain         Line with current module path." CRLF
+    CRLF
+    "td.crosstitle      Comment box for bases (base interfaces etc.)" CRLF
+    "td.imsum_left      Left part of such boxes." CRLF
+    "td.imsum_right     Right part of such boxes." CRLF
+    CRLF
+    "td.title           Main title of the page like \"interface XYz\"" CRLF
+    ".subtitle          Tables, and head cells of those, which list members" CRLF
+    "                   like \"method summary\" and \"method details\"." CRLF
+    CRLF
+    "td.imdetail        Background table of method's detail description." CRLF
+    "a.membertitle      Method name (as jump label) in method's detail" CRLF
+    "                   description." CRLF
+	".title2            smaller font prefixes to page titles" CRLF
+    "*/" CRLF
     ;
 
 const char * const C_sStdStyle_withDivFrame =
-    "/*See bottom of file for explanations.*/"CRLF
+    "/*See bottom of file for explanations.*/" CRLF
     CRLF
-    "body { background-color:#ffffff; }"CRLF
+    "body { background-color:#ffffff; }" CRLF
     CRLF
-	"#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF
-	"                 margin-top:3pt; margin-bottom:1pt; }"CRLF
-    "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF
-    "               { font-size:11pt;"CRLF
-    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
-	"#adc-idlref pre    { font-family:monospace; }"CRLF
-    CRLF
-    "#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF
-    "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
-    CRLF
-	"#adc-idlref td             { font-size:11pt; }"CRLF
-    "#adc-idlref td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
-    "                             line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
-    "#adc-idlref td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
-    "                             line-height:20pt;   background-color:#ccccff; }"CRLF
-    "#adc-idlref td.crosstitle  { font-size:12pt; font-weight:bold;"CRLF
-    "                             line-height:15pt;   background-color:#eeeeff; }"CRLF
-    "#adc-idlref td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
-    CRLF
-    "#adc-idlref td.imsum_left  { width:30%;  }"CRLF
-    "#adc-idlref td.imsum_right { width:70%;  }"CRLF
-    CRLF
-    "#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF
-    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "#adc-idlref td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
-    "                                 color:#ffffff; background-color:#2222ad; }"CRLF
-    "#adc-idlref td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
-    "#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF
-    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
-    "#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF
-    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
-    CRLF
-    "#adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
-    "#adc-idlref a.navimain, #adc-idlref a.navisub  { color:#000000; }"CRLF
-    "#adc-idlref .dt            { font-weight:bold; }"CRLF
-	"#adc-idlref .namechain     { font-size:13pt; font-weight:bold;"CRLF
-	"                             margin-top:3pt; margin-bottom:6pt; }"CRLF
-	"#adc-idlref .title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
-    ""CRLF
-    "#adc-idlref table { empty-cells:show; }"CRLF
-    ""CRLF
-	"#adc-idlref .childlist td, "CRLF
-	"#adc-idlref .commentedlinks td, "CRLF
-	"#adc-idlref .memberlist td, "CRLF
-	"#adc-idlref .subtitle td, "CRLF
-	"#adc-idlref .crosstitle td  { border: .1pt solid #000000; }"CRLF
-    ""CRLF
-	"#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF
-    ""CRLF
-	"#adc-idlref .title-table td, "CRLF
-	"#adc-idlref .table-in-method td, "CRLF
-	"#adc-idlref .table-in-data td, "CRLF
-	"#adc-idlref .navimain td, "CRLF
-	"#adc-idlref .navisub td, "CRLF
-	"#adc-idlref .expl-table td, "CRLF
-	"#adc-idlref .param-table td  { border: none; }"CRLF
+	"#adc-idlref h3 { font-size:13pt; font-weight:bold;" CRLF
+	"                 margin-top:3pt; margin-bottom:1pt; }" CRLF
+    "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre" CRLF
+    "               { font-size:11pt;" CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }" CRLF
+	"#adc-idlref pre    { font-family:monospace; }" CRLF
+    CRLF
+    "#adc-idlref table.navimain { background-color:#eeeeff; }" CRLF
+    "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
+    CRLF
+	"#adc-idlref td             { font-size:11pt; }" CRLF
+    "#adc-idlref td.title       { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
+    "                             line-height:30pt;   background-color:#ccccff; text-align:center; }" CRLF
+    "#adc-idlref td.subtitle    { font-family: Arial; font-size:13pt;" CRLF
+    "                             line-height:20pt;   background-color:#ccccff; }" CRLF
+    "#adc-idlref td.crosstitle  { font-size:12pt; font-weight:bold;" CRLF
+    "                             line-height:15pt;   background-color:#eeeeff; }" CRLF
+    "#adc-idlref td.imdetail    { width:100%;         background-color:#eeeeff; }" CRLF
+    CRLF
+    "#adc-idlref td.imsum_left  { width:30%;  }" CRLF
+    "#adc-idlref td.imsum_right { width:70%;  }" CRLF
+    CRLF
+    "#adc-idlref td.navimain, #adc-idlref a.navimain" CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "#adc-idlref td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
+    "                                 color:#ffffff; background-color:#2222ad; }" CRLF
+    "#adc-idlref td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
+    "#adc-idlref td.navisub, #adc-idlref a.navisub" CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
+    "#adc-idlref td.navimain, #adc-idlref td.navisub" CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }" CRLF
+    CRLF
+    "#adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
+    "#adc-idlref a.navimain, #adc-idlref a.navisub  { color:#000000; }" CRLF
+    "#adc-idlref .dt            { font-weight:bold; }" CRLF
+	"#adc-idlref .namechain     { font-size:13pt; font-weight:bold;" CRLF
+	"                             margin-top:3pt; margin-bottom:6pt; }" CRLF
+	"#adc-idlref .title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
+    "" CRLF
+    "#adc-idlref table { empty-cells:show; }" CRLF
+    "" CRLF
+	"#adc-idlref .childlist td, " CRLF
+	"#adc-idlref .commentedlinks td, " CRLF
+	"#adc-idlref .memberlist td, " CRLF
+	"#adc-idlref .subtitle td, " CRLF
+	"#adc-idlref .crosstitle td  { border: .1pt solid #000000; }" CRLF
+    "" CRLF
+	"#adc-idlref .flag-table td { border: .1pt solid #cccccc; } " CRLF
+    "" CRLF
+	"#adc-idlref .title-table td, " CRLF
+	"#adc-idlref .table-in-method td, " CRLF
+	"#adc-idlref .table-in-data td, " CRLF
+	"#adc-idlref .navimain td, " CRLF
+	"#adc-idlref .navisub td, " CRLF
+	"#adc-idlref .expl-table td, " CRLF
+	"#adc-idlref .param-table td  { border: none; }" CRLF
     ;
 
 

Modified: openoffice/branches/ia2/main/autodoc/source/display/html/outfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/autodoc/source/display/html/outfile.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/autodoc/source/display/html/outfile.cxx (original)
+++ openoffice/branches/ia2/main/autodoc/source/display/html/outfile.cxx Thu Feb 21 02:52:59 2013
@@ -45,176 +45,176 @@ using csi::xml::AnAttribute;
 
 const char * const
     C_sStdStyle =
-    "body   { background-color:#ffffff; }"CRLF
-    "h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
-    "h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
-    "h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
-    "h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-	"dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
-	"dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
-    "dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
-    "dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
-    "p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
-    "pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
-    "tr     { font-size:10pt; }"CRLF
-    "td     { font-size:10pt; }"CRLF
-    CRLF
-    "dt.attention   { color:#dd0000; }"CRLF
-    CRLF
-    "div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
-    ".subtitle      { background-color:#ccccff; }"CRLF
-    CRLF
-    "td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    "td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    "td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
-    "td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    CRLF
-    "td.navimain, td.navimain a"CRLF
-    "               { background-color:#eeeeff; color:#000000;"CRLF
-    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "td.navimainself"CRLF
-    "               { background-color:#2222ad; color:#ffffff;"CRLF
-    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "td.navimainnone"CRLF
-    "               { background-color:#eeeeff; color:#000000;"CRLF
-    "                 font-family:Arial; font-size:12pt; }"CRLF
-    CRLF
-    "div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
-    CRLF
-    ".nqclass       { color:#008800; }"CRLF
-    CRLF
-    "h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
-    CRLF
-    ".btpubl        { color:#33ff33; }"CRLF
-    ".btprot        { color:#cc9933; }"CRLF
-    ".btpriv        { color:#ff6666; }"CRLF
-    ".btvpubl       { color:#33ff33; font-style:italic; }"CRLF
-    ".btvprot       { color:#cc9933; font-style:italic; }"CRLF
-    ".btvpriv       { color:#ff6666; font-style:italic; }"CRLF
-    ".btself        { font-weight:bold; }"CRLF
+    "body   { background-color:#ffffff; }" CRLF
+    "h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
+    "h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
+    "h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
+    "h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+	"dl     { margin-top:1pt; margin-bottom:1pt; }" CRLF
+	"dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
+    "dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+    "dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
+    "p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
+    "pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+    "tr     { font-size:10pt; }" CRLF
+    "td     { font-size:10pt; }" CRLF
+    CRLF
+    "dt.attention   { color:#dd0000; }" CRLF
+    CRLF
+    "div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }" CRLF
+    ".subtitle      { background-color:#ccccff; }" CRLF
+    CRLF
+    "td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    "td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    "td.flagno      { font-family:Arial; font-size:8pt; }" CRLF
+    "td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    CRLF
+    "td.navimain, td.navimain a" CRLF
+    "               { background-color:#eeeeff; color:#000000;" CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "td.navimainself" CRLF
+    "               { background-color:#2222ad; color:#ffffff;" CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "td.navimainnone" CRLF
+    "               { background-color:#eeeeff; color:#000000;" CRLF
+    "                 font-family:Arial; font-size:12pt; }" CRLF
+    CRLF
+    "div.define     { font-family:Arial; background-color:#ccccff; }" CRLF
+    CRLF
+    ".nqclass       { color:#008800; }" CRLF
+    CRLF
+    "h3.help        { background-color:#eeeeff; margin-top:12pt; }" CRLF
+    CRLF
+    ".btpubl        { color:#33ff33; }" CRLF
+    ".btprot        { color:#cc9933; }" CRLF
+    ".btpriv        { color:#ff6666; }" CRLF
+    ".btvpubl       { color:#33ff33; font-style:italic; }" CRLF
+    ".btvprot       { color:#cc9933; font-style:italic; }" CRLF
+    ".btvpriv       { color:#ff6666; font-style:italic; }" CRLF
+    ".btself        { font-weight:bold; }" CRLF
     ;
 
 
 const char * const
     C_sCssExplanations =
-    "/* Explanation of CSS classes:"CRLF
+    "/* Explanation of CSS classes:" CRLF
     CRLF
-    "dl.member       provides coloured frame for function descriptions."CRLF
-    "dd.member       makes the content of this frame white"CRLF
+    "dl.member       provides coloured frame for function descriptions." CRLF
+    "dd.member       makes the content of this frame white" CRLF
     CRLF
-    "dt.attention    special colour for @attention remarks"CRLF
+    "dt.attention    special colour for @attention remarks" CRLF
     CRLF
-    "div.title       HTML page headline"CRLF
-    ".subtitle       headline of lists of members and similar"CRLF
+    "div.title       HTML page headline" CRLF
+    ".subtitle       headline of lists of members and similar" CRLF
     CRLF
-    "                These are for the flagtables in classes:"CRLF
-    "td.flagname     Flag name."CRLF
-    "td.flagyes      flag value \"yes\""CRLF
-    "td.flagno       flag value \"no\""CRLF
-    "td.flagtext     other flag value"CRLF
+    "                These are for the flagtables in classes:" CRLF
+    "td.flagname     Flag name." CRLF
+    "td.flagyes      flag value \"yes\"" CRLF
+    "td.flagno       flag value \"no\"" CRLF
+    "td.flagtext     other flag value" CRLF
     CRLF
     CRLF
-    "                These are for the main navigationbar:"CRLF
-    "td.navimain, td.navimain a"CRLF
-    "                Links in navibar."CRLF
-    "td.navimainself Text in navibar which refers to current page."CRLF
-    "td.navimainnone Text which links to nothing."CRLF
+    "                These are for the main navigationbar:" CRLF
+    "td.navimain, td.navimain a" CRLF
+    "                Links in navibar." CRLF
+    "td.navimainself Text in navibar which refers to current page." CRLF
+    "td.navimainnone Text which links to nothing." CRLF
     CRLF
     CRLF
-    "div.define      Subtitles on the #define/macro descriptions page"CRLF
+    "div.define      Subtitles on the #define/macro descriptions page" CRLF
     CRLF
-    ".nqclass        special color for classes in the qualification"CRLF
-    "                on top of type pages like in:"CRLF
-    "                ::nsp1::nsp2::_ClassXY_::"CRLF
+    ".nqclass        special color for classes in the qualification" CRLF
+    "                on top of type pages like in:" CRLF
+    "                ::nsp1::nsp2::_ClassXY_::" CRLF
     CRLF
-    "h3.help         Subtitles on the help page"CRLF
+    "h3.help         Subtitles on the help page" CRLF
     CRLF
-    "                These are for the base class tree on class pages:"CRLF
-    ".btpubl         public base class"CRLF
-    ".btprot         protected"CRLF
-    ".btpriv         private"CRLF
-    ".btvpubl        virtual public"CRLF
-    ".btvprot        virtual protected"CRLF
-    ".btvpriv        virtual private"CRLF
-    ".btself         placeholder for currently displayed class"CRLF
+    "                These are for the base class tree on class pages:" CRLF
+    ".btpubl         public base class" CRLF
+    ".btprot         protected" CRLF
+    ".btpriv         private" CRLF
+    ".btvpubl        virtual public" CRLF
+    ".btvprot        virtual protected" CRLF
+    ".btvpriv        virtual private" CRLF
+    ".btself         placeholder for currently displayed class" CRLF
     CRLF
-    "*/"CRLF
+    "*/" CRLF
     ;
 
 
 const char * const
     C_sStdStyle_withDivFrame =
-    "body   { background-color:#ffffff; }"CRLF
-    "#adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
-    "#adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
-    "#adc-cppref h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
-    "#adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-	"#adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
-	"#adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
-    "#adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
-    "#adc-cppref p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
-    "#adc-cppref tr     { font-size:10pt; }"CRLF
-    "#adc-cppref td     { font-size:10pt; }"CRLF
-    CRLF
-    "#adc-cppref dt.attention   { color:#dd0000; }"CRLF
-    CRLF
-    "#adc-cppref div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
-    "#adc-cppref .subtitle      { background-color:#ccccff; }"CRLF
-    CRLF
-    "#adc-cppref td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    "#adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    "#adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
-    "#adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
-    CRLF
-    "#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF
-    "               { background-color:#eeeeff; color:#000000;"CRLF
-    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "#adc-cppref td.navimainself"CRLF
-    "               { background-color:#2222ad; color:#ffffff;"CRLF
-    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
-    "#adc-cppref td.navimainnone"CRLF
-    "               { background-color:#eeeeff; color:#000000;"CRLF
-    "                 font-family:Arial; font-size:12pt; }"CRLF
-    CRLF
-    "#adc-cppref div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
-    CRLF
-    "#adc-cppref .nqclass       { color:#008800; }"CRLF
-    CRLF
-    "#adc-cppref h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
-    CRLF
-    "#adc-cppref .btpubl        { color:#33ff33; }"CRLF
-    "#adc-cppref .btprot        { color:#cc9933; }"CRLF
-    "#adc-cppref .btpriv        { color:#ff6666; }"CRLF
-    "#adc-cppref .btvpubl       { color:#33ff33; font-style:italic; }"CRLF
-    "#adc-cppref .btvprot       { color:#cc9933; font-style:italic; }"CRLF
-    "#adc-cppref .btvpriv       { color:#ff6666; font-style:italic; }"CRLF
-    "#adc-cppref .btself        { font-weight:bold; }"CRLF
-    ""CRLF
-    "#adc-cppref table { empty-cells:show; }"CRLF
-    ""CRLF
-	"#adc-cppref .childlist td, "CRLF
-	"#adc-cppref .commentedlinks td, "CRLF
-	"#adc-cppref .memberlist td, "CRLF
-	"#adc-cppref .subtitle td, "CRLF
-	"#adc-cppref .crosstitle td  { border: .1pt solid #000000; }"CRLF
-    ""CRLF
-	"#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF
-    ""CRLF
-	"#adc-cppref .title-table td, "CRLF
-	"#adc-cppref .table-in-method td, "CRLF
-	"#adc-cppref .table-in-data td, "CRLF
-	"#adc-cppref .navimain td, "CRLF
-	"#adc-cppref .navisub td, "CRLF
-	"#adc-cppref .expl-table td, "CRLF
-	"#adc-cppref .param-table td  { border: none; }"CRLF
+    "body   { background-color:#ffffff; }" CRLF
+    "#adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
+    "#adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
+    "#adc-cppref h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
+    "#adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+	"#adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }" CRLF
+	"#adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
+    "#adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
+    "#adc-cppref p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+    "#adc-cppref tr     { font-size:10pt; }" CRLF
+    "#adc-cppref td     { font-size:10pt; }" CRLF
+    CRLF
+    "#adc-cppref dt.attention   { color:#dd0000; }" CRLF
+    CRLF
+    "#adc-cppref div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }" CRLF
+    "#adc-cppref .subtitle      { background-color:#ccccff; }" CRLF
+    CRLF
+    "#adc-cppref td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    "#adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    "#adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }" CRLF
+    "#adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+    CRLF
+    "#adc-cppref td.navimain, #adc-cppref td.navimain a" CRLF
+    "               { background-color:#eeeeff; color:#000000;" CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "#adc-cppref td.navimainself" CRLF
+    "               { background-color:#2222ad; color:#ffffff;" CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+    "#adc-cppref td.navimainnone" CRLF
+    "               { background-color:#eeeeff; color:#000000;" CRLF
+    "                 font-family:Arial; font-size:12pt; }" CRLF
+    CRLF
+    "#adc-cppref div.define     { font-family:Arial; background-color:#ccccff; }" CRLF
+    CRLF
+    "#adc-cppref .nqclass       { color:#008800; }" CRLF
+    CRLF
+    "#adc-cppref h3.help        { background-color:#eeeeff; margin-top:12pt; }" CRLF
+    CRLF
+    "#adc-cppref .btpubl        { color:#33ff33; }" CRLF
+    "#adc-cppref .btprot        { color:#cc9933; }" CRLF
+    "#adc-cppref .btpriv        { color:#ff6666; }" CRLF
+    "#adc-cppref .btvpubl       { color:#33ff33; font-style:italic; }" CRLF
+    "#adc-cppref .btvprot       { color:#cc9933; font-style:italic; }" CRLF
+    "#adc-cppref .btvpriv       { color:#ff6666; font-style:italic; }" CRLF
+    "#adc-cppref .btself        { font-weight:bold; }" CRLF
+    "" CRLF
+    "#adc-cppref table { empty-cells:show; }" CRLF
+    "" CRLF
+	"#adc-cppref .childlist td, " CRLF
+	"#adc-cppref .commentedlinks td, " CRLF
+	"#adc-cppref .memberlist td, " CRLF
+	"#adc-cppref .subtitle td, " CRLF
+	"#adc-cppref .crosstitle td  { border: .1pt solid #000000; }" CRLF
+    "" CRLF
+	"#adc-cppref .flag-table td { border: .1pt solid #cccccc; } " CRLF
+    "" CRLF
+	"#adc-cppref .title-table td, " CRLF
+	"#adc-cppref .table-in-method td, " CRLF
+	"#adc-cppref .table-in-data td, " CRLF
+	"#adc-cppref .navimain td, " CRLF
+	"#adc-cppref .navisub td, " CRLF
+	"#adc-cppref .expl-table td, " CRLF
+	"#adc-cppref .param-table td  { border: none; }" CRLF
     ;
 
 

Modified: openoffice/branches/ia2/main/automation/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/automation/prj/build.lst?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/automation/prj/build.lst (original)
+++ openoffice/branches/ia2/main/automation/prj/build.lst Thu Feb 21 02:52:59 2013
@@ -5,8 +5,4 @@ au	automation\source\simplecm				nmake	-
 au	automation\source\communi				nmake	-	all	au_comm au_inc NULL
 au	automation\source\app					nmake	-	all	au_app au_inc NULL
 au	automation\source\server				nmake	-	all	au_server au_inc NULL
-#au	automation\source\testtool				nmake	-	all	au_tt au_inc NULL
-#au	automation\source\miniapp				nmake	-	all	au_mini au_inc NULL
-#au	automation\packimages					nmake	-	all	au_pack NULL
 au	automation\util							nmake	-	all	au_util au_scom au_comm au_app au_server NULL
-#au	automation\util							nmake	-	all	au_util au_scom au_comm au_app au_mini au_server au_tt NULL

Modified: openoffice/branches/ia2/main/automation/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/automation/util/makefile.mk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/automation/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/automation/util/makefile.mk Thu Feb 21 02:52:59 2013
@@ -128,117 +128,6 @@ DEF3DEPN        =       \
 DEFLIB3NAME     =communi
 DEF3DES         =Communication
 
-# --- TESTTOOL IDE ------------------------------------------------------
-
-#APP1TARGET=testtool
-
-#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-#APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
-#.ELSE
-#APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
-#.ENDIF
-#APP1STDLIBS= \
-		$(APP3RDLIB) \
-		$(SAMPLE3RDLIB)
-
-#APP1STDLIBS+= \
-			$(CPPUHELPERLIB) \
-			$(TOOLSLIB) \
-            $(UNOTOOLSLIB) \
-			$(SVTOOLLIB) \
-			$(SVLLIB) \
-			$(VCLLIB) \
-			$(SALLIB) \
-			$(VOSLIB) \
-			$(UCBHELPERLIB) \
-			$(COMPHELPERLIB) \
-            $(BASICLIB) \
-            $(SIMPLECMLIB) \
-            $(COMMUNILIB)
-
-#.IF "$(GUI)"=="UNX"
-#APP1STDLIBS+= \
-			$(VOSLIB) $(SALLIB) $(BASICLIB)
-#APP1STDLIBS+=$(CPPULIB)
-#.ENDIF
-#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-#APP1STDLIBS+=$(CPPULIB)
-#.ENDIF
-
-#.IF "$(GUI)"=="WNT"
-#APP1STDLIBS += \
-		$(SHELL32LIB) \
-		$(ADVAPI32LIB)
-#.ENDIF # "$(GUI)"=="WNT"
-
-
-
-#.IF "$(OS)" == "SOLARIS"
-#APP1STDLIBS+= -lXm
-#.ENDIF
-
-#.IF "$(GUI)" == "UNX"
-#.IF "$(OS)" == "LINUX"
-#APP1STDLIBS+= -lXext -lX11 -lSM -lICE
-#.ENDIF
-#.IF "$(OS)"=="MACOSX"
-#APP1STDLIBS+= -lapp -lsample
-#.ENDIF
-#.ENDIF
-
-
-
-#APP1LIBS=\
-		$(LB)$/testtool.lib
-
-#APP1OBJS=       $(OBJ)$/testbasi.obj \
-                $(OBJ)$/cmdbasestream.obj \
-                $(OBJ)$/svcommstream.obj
-
-# --- TESTTOOL MINIAPP ------------------------------------------------------
-# ressources are linked here
-
-#RESLIB1NAME=tma
-#RESLIB1SRSFILES= \
-                $(SRS)$/miniapp.srs
-
-#APP3TARGET=miniapp
-#APP3STDLIBS= \
-			$(CPPULIB) \
-			$(CPPUHELPERLIB) \
-			$(UCBHELPERLIB) \
-			$(COMPHELPERLIB) \
-			$(AUTOMATIONLIB) \
-			$(SALLIB) \
-			$(TOOLSLIB) \
-			$(SVTOOLLIB) \
-			$(VCLLIB)
-
-#.IF "$(GUI)"=="UNX"
-#.IF "$(OS)"=="MACOSX"
-#APP3STDLIBS+= \
-			$(VOSLIB) $(SALLIB) $(LIBSTLPORT)
-#.ELSE
-#APP3STDLIBS+= \
-			$(VOSLIB) $(SALLIB)
-#.ENDIF
-#.ENDIF
-# $(AUTOMATIONLIB) is build in SHL1TARGET
-#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-#APP3DEPN=$(SHL1TARGETN)
-#.ELSE
-#APP3DEPN=$(SHL1IMPLIBN)
-#.ENDIF
-
-#APP3LIBS= \
-		$(LB)$/miniapp.lib
-
-#.IF "$(GUI)" != "UNX"
-#.IF "$(COM)" != "GCC"
-#		win16 braucht ein appobj
-#APP3OBJS=		$(OBJ)$/testapp.obj
-#.ENDIF
-#.ENDIF
 
 # --- Targets -----------------------------------------------------------
 

Modified: openoffice/branches/ia2/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx (original)
+++ openoffice/branches/ia2/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx Thu Feb 21 02:52:59 2013
@@ -223,7 +223,8 @@ void DragMethod_RotateDiagram::CreateOve
 		// transform to 2D view coordinates
 		aPolyPolygon.transform(rVCScene.getObjectTransformation());
 
-		sdr::overlay::OverlayPolyPolygonStriped* pNew = new ::sdr::overlay::OverlayPolyPolygonStriped(aPolyPolygon);
+		sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+            aPolyPolygon);
 		rOverlayManager.add(*pNew);
 		addToOverlayObjectList(*pNew);
 	}

Modified: openoffice/branches/ia2/main/chart2/source/view/main/VDataSeries.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/chart2/source/view/main/VDataSeries.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/chart2/source/view/main/VDataSeries.cxx (original)
+++ openoffice/branches/ia2/main/chart2/source/view/main/VDataSeries.cxx Thu Feb 21 02:52:59 2013
@@ -309,7 +309,7 @@ void VDataSeries::doSortByXValues()
         }
 
         //do sort
-        std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
+        std::stable_sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
 
         //fill the sorted points back to the mambers
         m_aValues_X.Doubles.realloc( m_nPointCount );

Modified: openoffice/branches/ia2/main/comphelper/inc/comphelper/stl_types.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/comphelper/inc/comphelper/stl_types.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/comphelper/inc/comphelper/stl_types.hxx (original)
+++ openoffice/branches/ia2/main/comphelper/inc/comphelper/stl_types.hxx Thu Feb 21 02:52:59 2013
@@ -52,10 +52,10 @@ namespace comphelper
 //.........................................................................
 
 //========================================================================
-// comparisation functions
+// comparison functors
 
 //------------------------------------------------------------------------
-	struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
 {
     bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const { return x < y ? true : false;}      // construct prevents a MSVC6 warning
 };

Modified: openoffice/branches/ia2/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/configure.in?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/configure.in (original)
+++ openoffice/branches/ia2/main/configure.in Thu Feb 21 02:52:59 2013
@@ -268,6 +268,12 @@ AC_ARG_ENABLE(cl-standard,
                           options and therefore removes a lot of warnings when
                           using the cheaper standard compiler. )
 ],,)
+AC_ARG_ENABLE(win-x64-shellext,
+[  --enable-win-x64-shellext    Enable the build/usage of Windows 64bit shell extensions.
+                          These extension are used for the system integration on a 
+			  Windows 64bit systems. For example supporting the search 
+			  in ODF files with the standard Windows search feature.
+],,)
 AC_ARG_ENABLE(gtk,
 [  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
@@ -1292,6 +1298,21 @@ if test "$_os" = "WINNT"; then
    AC_SUBST(VC_STANDARD)
 fi
 
+if test "$_os" = "WINNT"; then
+   dnl ===================================================================
+   dnl Set the BUILD_X64 variable. 
+   dnl ===================================================================
+   AC_MSG_CHECKING([whether to build/use the Windows 64bit shell extensions])
+   if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" = "no"; then
+      BUILD_X64=""
+      AC_MSG_RESULT([no])
+   else
+      BUILD_X64="TRUE"
+      AC_MSG_RESULT([yes])
+   fi
+   AC_SUBST(BUILD_X64)
+fi
+
 dnl ===================================================================
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===================================================================
@@ -4576,7 +4597,8 @@ SYSTEM_SERF=NO
 SERF_CFLAGS=
 SERF_LIBS=
 AC_MSG_CHECKING([which libserf to use])
-if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
+if test -n "$with_system_serf" -o -n "$with_system_libs" && \
+  test "$with_system_serf" != "no"; then
     AC_MSG_RESULT([system])
     PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
     SYSTEM_SERF=YES
@@ -5766,8 +5788,10 @@ if test \( "$_os" = "WINNT" \) ; then
         fi
         if test -z "$with_atl_lib_dir"; then
             ATL_LIB=$COMPATH/atlmfc/lib
+	    ATL_LIB_X64=$COMPATH/atlmfc/lib/amd64
         else
             ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
+            ATL_LIB_X64=$ATL_LIB/../amd64
         fi
         if test -z "$with_mfc_include_dir"; then
             MFC_INCLUDE=$COMPATH/atlmfc/include
@@ -5782,6 +5806,7 @@ if test \( "$_os" = "WINNT" \) ; then
 
         ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
         ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
+        ATL_LIB_X64=`echo $ATL_LIB_X64 | $SED 's/\/$//'`
         MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
         MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
 
@@ -5827,6 +5852,7 @@ if test \( "$_os" = "WINNT" \) ; then
         if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o "$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
             ATL_INCLUDE=
             ATL_LIB=
+            ATL_LIB_X64=
             MFC_INCLUDE=
             MFC_LIB=
             HAVE_ATL_LIB=
@@ -5837,6 +5863,7 @@ if test \( "$_os" = "WINNT" \) ; then
         else
             ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
             ATL_LIB=`cygpath -dm "$ATL_LIB"`
+            ATL_LIB_X64=`cygpath -dm "$ATL_LIB_X64"`
             MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
             MFC_LIB=`cygpath -dm "$MFC_LIB"`
             AC_MSG_RESULT([ATL/MFC enabled])
@@ -5845,6 +5872,7 @@ if test \( "$_os" = "WINNT" \) ; then
 fi
 AC_SUBST(ATL_INCLUDE)
 AC_SUBST(ATL_LIB)
+AC_SUBST(ATL_LIB_X64)
 AC_SUBST(HAVE_ATLTHUNK)
 AC_SUBST(MFC_INCLUDE)
 AC_SUBST(MFC_LIB)