[Libreoffice-commits] .: Branch 'feature/mork' - 193 commits - basctl/source basic/source boost/boost.4127.warnings.patch boost/makefile.mk cairo/cairo comphelper/inc comphelper/Package_inc.mk config_host.mk.in config_host.mk.source configure.in connectivity/Configuration_mork.mk connectivity/Executable_mork_helper.mk connectivity/Library_mork.mk connectivity/Module_connectivity.mk connectivity/Package_xml.mk connectivity/registry connectivity/source cppu/source cross_toolset/prj cui/source desktop/inc desktop/Library_sofficeapp.mk desktop/source editeng/inc editeng/source filter/inc filter/Library_msfilter.mk filter/Package_inc.mk filter/source formula/inc formula/source fpicker/source framework/source hwpfilter/Library_hwp.mk hwpfilter/source i18npool/qa i18npool/source idlc/prj instsetoo_native/util libvisio/libvisio-0.0.18.patch libvisio/makefile.mk lingucomponent/source Makefile.top mdds/makefile.mk mdds/mdds_0.6.0-unreachable-code.patch mdds/mdds_0.6.0-unused-parameter.patch o3tl/in c officecfg/registry oowintool oox/inc oox/source pango/pango-1.28.3.patch README.cross reportbuilder/Extension_reportbuilder.mk reportdesign/source sal/inc sal/osl sc/inc scp2/source sc/source sc/uiconfig setup_native/prj setup_native/source sfx2/inc sfx2/Library_sfx.mk sfx2/sdi sfx2/source shell/source solenv/bin solenv/gbuild solenv/inc starmath/inc starmath/Library_sm.mk starmath/source stoc/source svl/inc svl/Package_inc.mk svl/source svtools/source svx/inc svx/source svx/workben sw/inc sw/sdi sw/source sw/uiconfig tubes/inc tubes/Library_tubes.mk tubes/Package_inc.mk tubes/prj tubes/source unusedcode.easy vcl/aqua vcl/inc vcl/source vcl/unx writerfilter/inc writerfilter/qa writerfilter/source writerfilter/unocomponent xmloff/source
David Ostrovsky
davido at kemper.freedesktop.org
Wed Jul 25 13:07:02 PDT 2012
Makefile.top | 22
README.cross | 10
basctl/source/basicide/baside2.cxx | 91
basctl/source/basicide/baside2.hxx | 22
basctl/source/basicide/baside2b.cxx | 51
basctl/source/basicide/baside3.cxx | 15
basctl/source/basicide/basides1.cxx | 28
basctl/source/basicide/basidesh.cxx | 8
basctl/source/basicide/brkdlg.cxx | 1
basctl/source/basicide/objdlg.cxx | 7
basctl/source/basicide/objdlg.hxx | 2
basctl/source/inc/baside3.hxx | 4
basctl/source/inc/basidesh.hxx | 4
basic/source/runtime/methods.cxx | 1
boost/boost.4127.warnings.patch | 21
boost/makefile.mk | 2
cairo/cairo/makefile.mk | 2
comphelper/Package_inc.mk | 1
comphelper/inc/comphelper/newarray.hxx | 51
config_host.mk.in | 2
config_host.mk.source | 3
configure.in | 211
connectivity/Configuration_mork.mk | 20
connectivity/Executable_mork_helper.mk | 3
connectivity/Library_mork.mk | 4
connectivity/Module_connectivity.mk | 45
connectivity/Package_xml.mk | 3
connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu | 66
connectivity/source/drivers/mork/MDriver.cxx | 8
connectivity/source/drivers/mork/MDriver.hxx | 12
connectivity/source/drivers/mork/MNSProfileDiscover.cxx | 2
connectivity/source/drivers/mork/MNSProfileDiscover.hxx | 14
connectivity/source/drivers/mork/mork_helper.cxx | 5
cppu/source/typelib/typelib.cxx | 6
cppu/source/uno/constr.hxx | 4
cppu/source/uno/eq.hxx | 12
cppu/source/uno/lbenv.cxx | 11
cppu/source/uno/sequence.cxx | 21
cross_toolset/prj/build.lst | 2
cui/source/customize/cfgutil.cxx | 1
cui/source/customize/macropg.cxx | 1
cui/source/customize/selector.cxx | 1
cui/source/dialogs/cuigrfflt.cxx | 1
cui/source/dialogs/insdlg.cxx | 1
cui/source/dialogs/linkdlg.cxx | 1
cui/source/inc/acccfg.hxx | 1
cui/source/inc/autocdlg.hxx | 4
cui/source/inc/cfgutil.hxx | 1
cui/source/inc/cuifmsearch.hxx | 1
cui/source/inc/cuisrchdlg.hxx | 1
cui/source/options/optcolor.cxx | 2182 ++++------
cui/source/options/optcolor.hrc | 30
cui/source/options/optcolor.hxx | 4
cui/source/options/optcolor.src | 22
cui/source/tabpages/autocdlg.cxx | 85
cui/source/tabpages/macroass.cxx | 1
cui/source/tabpages/numfmt.cxx | 1
desktop/Library_sofficeapp.mk | 8
desktop/inc/app.hxx | 6
desktop/source/app/app.cxx | 13
desktop/source/app/sofficemain.cxx | 22
editeng/inc/editeng/svxacorr.hxx | 22
editeng/inc/editeng/swafopt.hxx | 44
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 3
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 3
editeng/source/misc/svxacorr.cxx | 43
editeng/source/misc/swafopt.cxx | 4
filter/Library_msfilter.mk | 1
filter/Package_inc.mk | 1
filter/inc/filter/msfilter/msdffimp.hxx | 14
filter/inc/filter/msfilter/rtfutil.hxx | 54
filter/inc/filter/msfilter/svdfppt.hxx | 12
filter/source/msfilter/rtfutil.cxx | 151
filter/source/msfilter/svdfppt.cxx | 8
formula/inc/formula/FormulaCompiler.hxx | 2
formula/source/core/api/FormulaCompiler.cxx | 122
formula/source/ui/dlg/funcutl.cxx | 4
fpicker/source/odma/ODMAFolderPicker.cxx | 1
fpicker/source/office/OfficeFilePicker.cxx | 1
fpicker/source/office/OfficeFolderPicker.cxx | 1
fpicker/source/office/iodlg.cxx | 1
fpicker/source/office/iodlgimp.cxx | 1
framework/source/inc/loadenv/loadenv.hxx | 24
framework/source/loadenv/loadenv.cxx | 55
hwpfilter/Library_hwp.mk | 1
hwpfilter/source/drawdef.h | 2
hwpfilter/source/drawing.h | 7
hwpfilter/source/formula.cxx | 25
hwpfilter/source/hbox.cxx | 56
hwpfilter/source/hbox.h | 50
hwpfilter/source/hcode.cxx | 196
hwpfilter/source/hcode.h | 10
hwpfilter/source/himgutil.cxx | 163
hwpfilter/source/himgutil.h | 60
hwpfilter/source/hpara.cxx | 10
hwpfilter/source/hstyle.cxx | 4
hwpfilter/source/htags.cxx | 6
hwpfilter/source/hwplib.h | 5
hwpfilter/source/hwpread.cxx | 41
hwpfilter/source/hwpreader.cxx | 323 -
hwpfilter/source/hwpreader.hxx | 4
hwpfilter/source/mapping.h | 28
i18npool/qa/cppunit/test_breakiterator.cxx | 287 +
i18npool/source/breakiterator/data/README | 617 ++
i18npool/source/breakiterator/data/dict_word_ca.txt | 21
i18npool/source/localedata/data/ak_GH.xml | 1
i18npool/source/localedata/data/ar_DZ.xml | 1
i18npool/source/localedata/data/ar_EG.xml | 1
i18npool/source/localedata/data/ar_OM.xml | 1
i18npool/source/localedata/data/ast_ES.xml | 1
i18npool/source/localedata/data/ee_GH.xml | 1
i18npool/source/localedata/data/el_GR.xml | 1
i18npool/source/localedata/data/en_AU.xml | 1
i18npool/source/localedata/data/en_GH.xml | 1
i18npool/source/localedata/data/en_JM.xml | 1
i18npool/source/localedata/data/en_NA.xml | 1
i18npool/source/localedata/data/en_ZA.xml | 1
i18npool/source/localedata/data/es_AR.xml | 1
i18npool/source/localedata/data/es_BO.xml | 1
i18npool/source/localedata/data/es_CO.xml | 1
i18npool/source/localedata/data/es_CR.xml | 1
i18npool/source/localedata/data/es_DO.xml | 1
i18npool/source/localedata/data/es_EC.xml | 1
i18npool/source/localedata/data/es_GT.xml | 1
i18npool/source/localedata/data/es_PE.xml | 1
i18npool/source/localedata/data/eu.xml | 1
i18npool/source/localedata/data/fa_IR.xml | 1
i18npool/source/localedata/data/fur_IT.xml | 1
i18npool/source/localedata/data/gl_ES.xml | 1
i18npool/source/localedata/data/gug_PY.xml | 1
i18npool/source/localedata/data/ha_GH.xml | 1
i18npool/source/localedata/data/haw_US.xml | 1
i18npool/source/localedata/data/he_IL.xml | 1
i18npool/source/localedata/data/hil_PH.xml | 1
i18npool/source/localedata/data/ht_HT.xml | 1
i18npool/source/localedata/data/hy_AM.xml | 1
i18npool/source/localedata/data/ia.xml | 1
i18npool/source/localedata/data/id_ID.xml | 1
i18npool/source/localedata/data/jbo.xml | 1
i18npool/source/localedata/data/ka_GE.xml | 1
i18npool/source/localedata/data/km_KH.xml | 1
i18npool/source/localedata/data/ko_KR.xml | 1
i18npool/source/localedata/data/ku_TR.xml | 1
i18npool/source/localedata/data/la_VA.xml | 1
i18npool/source/localedata/data/lg_UG.xml | 1
i18npool/source/localedata/data/lif_NP.xml | 1
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 151
i18npool/source/localedata/data/lo_LA.xml | 1
i18npool/source/localedata/data/mt_MT.xml | 1
i18npool/source/localedata/data/my_MM.xml | 1
i18npool/source/localedata/data/myv_RU.xml | 1
i18npool/source/localedata/data/ne_NP.xml | 1
i18npool/source/localedata/data/om_ET.xml | 1
i18npool/source/localedata/data/or_IN.xml | 1
i18npool/source/localedata/data/pjt_AU.xml | 1
i18npool/source/localedata/data/rue_SK.xml | 1
i18npool/source/localedata/data/rw_RW.xml | 1
i18npool/source/localedata/data/sc_IT.xml | 1
i18npool/source/localedata/data/sg_CF.xml | 1
i18npool/source/localedata/data/so_SO.xml | 1
i18npool/source/localedata/data/sw_TZ.xml | 1
i18npool/source/localedata/data/th_TH.xml | 1
i18npool/source/localedata/data/ti_ER.xml | 1
i18npool/source/localedata/data/tpi_PG.xml | 1
i18npool/source/localedata/data/uk_UA.xml | 1
i18npool/source/localedata/data/ur_PK.xml | 1
i18npool/source/localedata/data/vi_VN.xml | 1
i18npool/source/localedata/data/wa_BE.xml | 1
i18npool/source/localedata/data/zh_HK.xml | 1
i18npool/source/localedata/data/zh_SG.xml | 1
idlc/prj/build.lst | 2
instsetoo_native/util/makefile.mk | 9
libvisio/libvisio-0.0.18.patch | 10
libvisio/makefile.mk | 3
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 33
mdds/makefile.mk | 3
mdds/mdds_0.6.0-unreachable-code.patch | 28
mdds/mdds_0.6.0-unused-parameter.patch | 11
o3tl/inc/o3tl/sorted_vector.hxx | 7
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 8
oowintool | 11
oox/inc/oox/mathml/export.hxx | 4
oox/inc/oox/mathml/importutils.hxx | 7
oox/source/dump/dumperbase.cxx | 2
oox/source/mathml/importutils.cxx | 16
pango/pango-1.28.3.patch | 14
reportbuilder/Extension_reportbuilder.mk | 18
reportdesign/source/ui/report/propbrw.cxx | 7
sal/inc/rtl/string.hxx | 7
sal/inc/rtl/ustring.hxx | 7
sal/osl/unx/system.c | 25
sal/osl/unx/util.c | 18
sc/inc/calcconfig.hxx | 1
sc/inc/chartlis.hxx | 2
sc/inc/dpobject.hxx | 2
sc/inc/dptabsrc.hxx | 2
sc/inc/formulaopt.hxx | 8
sc/source/core/data/documen4.cxx | 2
sc/source/core/data/documen8.cxx | 1
sc/source/core/data/dpobject.cxx | 18
sc/source/core/data/dptabsrc.cxx | 17
sc/source/core/data/table2.cxx | 2
sc/source/core/tool/calcconfig.cxx | 6
sc/source/core/tool/chartlis.cxx | 34
sc/source/core/tool/compiler.cxx | 6
sc/source/core/tool/formulaopt.cxx | 47
sc/source/core/tool/interpr4.cxx | 29
sc/source/filter/excel/excrecds.cxx | 1
sc/source/filter/html/htmlexp.cxx | 1
sc/source/ui/app/inputhdl.cxx | 6
sc/source/ui/collab/contacts.cxx | 98
sc/source/ui/collab/sendfunc.cxx | 18
sc/source/ui/collab/sendfunc.hxx | 7
sc/source/ui/condformat/condformathelper.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 18
sc/source/ui/docshell/docsh6.cxx | 4
sc/source/ui/docshell/olinefun.cxx | 10
sc/source/ui/inc/docfunc.hxx | 4
sc/source/ui/inc/olinefun.hxx | 2
sc/source/ui/inc/output.hxx | 24
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/optdlg/calcoptionsdlg.cxx | 169
sc/source/ui/optdlg/calcoptionsdlg.hrc | 9
sc/source/ui/optdlg/calcoptionsdlg.hxx | 11
sc/source/ui/optdlg/calcoptionsdlg.src | 34
sc/source/ui/optdlg/tpformula.cxx | 6
sc/source/ui/src/globstr.src | 4
sc/source/ui/undo/undoblk.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 4
sc/source/ui/view/dbfunc3.cxx | 2
sc/source/ui/view/editsh.cxx | 12
sc/source/ui/view/gridwin.cxx | 10
sc/source/ui/view/gridwin2.cxx | 2
sc/source/ui/view/output.cxx | 344 -
sc/source/ui/view/output2.cxx | 622 +-
sc/source/ui/view/output3.cxx | 48
sc/source/ui/view/select.cxx | 1
sc/source/ui/view/tabcont.cxx | 3
sc/source/ui/view/tabvwshe.cxx | 1
sc/source/ui/view/viewfun2.cxx | 7
sc/source/ui/view/viewfun3.cxx | 4
sc/source/ui/view/viewfun6.cxx | 47
sc/source/ui/view/viewfunc.cxx | 2
sc/uiconfig/scalc/menubar/menubar.xml | 1
scp2/source/ooo/vc_redist.scp | 8
setup_native/prj/build.lst | 5
setup_native/prj/d.lst | 6
setup_native/source/win32/wintools/makecab/makecab.c | 5
setup_native/source/win32/wintools/makecab/makefile.mk | 35
setup_native/source/win32/wintools/makecab/parseddf.c | 2
setup_native/source/win32/wintools/makecab/parseddf.h | 2
setup_native/source/win32/wintools/msidb/makefile.mk | 36
setup_native/source/win32/wintools/msidb/msidb.c | 2
setup_native/source/win32/wintools/msiinfo/makefile.mk | 35
setup_native/source/win32/wintools/msiinfo/msiinfo.c | 18
setup_native/source/win32/wintools/msimsp/makefile.mk | 35
setup_native/source/win32/wintools/msimsp/msimsp.c | 2
setup_native/source/win32/wintools/msitran/makefile.mk | 35
setup_native/source/win32/wintools/msitran/msitran.c | 2
sfx2/Library_sfx.mk | 1
sfx2/inc/bluthsndapi.hxx | 54
sfx2/inc/sfx2/appuno.hxx | 1
sfx2/inc/sfx2/mailmodelapi.hxx | 13
sfx2/inc/sfx2/sfxbasemodel.hxx | 3
sfx2/inc/sfx2/sfxsids.hrc | 3
sfx2/sdi/sfx.sdi | 28
sfx2/sdi/viwslots.sdi | 5
sfx2/source/appl/app.cxx | 1
sfx2/source/appl/appopen.cxx | 1
sfx2/source/appl/linkmgr2.cxx | 1
sfx2/source/appl/sfxhelp.cxx | 1
sfx2/source/dialog/bluthsnd.cxx | 70
sfx2/source/dialog/filedlgimpl.hxx | 1
sfx2/source/dialog/templdlg.cxx | 1
sfx2/source/dialog/versdlg.cxx | 1
sfx2/source/doc/docfile.cxx | 1
sfx2/source/doc/docinsert.cxx | 1
sfx2/source/doc/docvor.cxx | 1
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/menu/mnumgr.cxx | 1
sfx2/source/view/viewsh.cxx | 21
shell/source/unix/misc/senddoc.sh | 2
solenv/bin/make_installer.pl | 9
solenv/bin/modules/installer/control.pm | 16
solenv/bin/modules/installer/globals.pm | 2
solenv/bin/modules/installer/windows/admin.pm | 17
solenv/bin/modules/installer/windows/msiglobal.pm | 47
solenv/gbuild/platform/macosx.mk | 1
solenv/gbuild/platform/unxgcc.mk | 2
solenv/inc/unxmacx.mk | 2
starmath/Library_sm.mk | 1
starmath/inc/document.hxx | 2
starmath/inc/unomodel.hxx | 1
starmath/source/commands.src | 2
starmath/source/document.cxx | 11
starmath/source/rtfexport.cxx | 420 +
starmath/source/rtfexport.hxx | 70
starmath/source/unomodel.cxx | 5
stoc/source/invocation_adapterfactory/iafactory.cxx | 7
svl/Package_inc.mk | 1
svl/inc/svl/svarray.hxx | 1
svl/inc/svl/svstdarr.hxx | 45
svl/source/items/style.cxx | 1
svl/source/memtools/svarray.cxx | 50
svl/source/numbers/zforlist.cxx | 1
svtools/source/brwbox/editbrowsebox.cxx | 6
svtools/source/contnr/fileview.cxx | 3
svtools/source/contnr/svlbitm.cxx | 2
svtools/source/contnr/svtreebx.cxx | 1
svtools/source/control/inettbc.cxx | 1
svtools/source/control/tabbar.cxx | 6
svtools/source/edit/textview.cxx | 9
svtools/source/graphic/grfmgr2.cxx | 137
svtools/source/misc/langtab.cxx | 7
svtools/source/svrtf/svparser.cxx | 1
svx/inc/globlmn_tmpl.hrc | 5
svx/inc/svx/compressgraphicdialog.hxx | 6
svx/inc/svx/fmsearch.hxx | 1
svx/inc/svx/fmtools.hxx | 1
svx/inc/svx/gallery1.hxx | 3
svx/inc/svx/numfmtsh.hxx | 1
svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx | 1
svx/inc/svx/sdr/attribute/sdrtextattribute.hxx | 1
svx/inc/svx/srchdlg.hxx | 1
svx/inc/svx/svditer.hxx | 6
svx/source/dialog/compressgraphicdialog.cxx | 101
svx/source/dialog/fntctrl.cxx | 4
svx/source/fmcomp/fmgridcl.cxx | 1
svx/source/fmcomp/gridctrl.cxx | 1
svx/source/form/fmexch.cxx | 1
svx/source/form/tbxform.cxx | 1
svx/source/gallery2/gallery1.cxx | 26
svx/source/inc/fmshimp.hxx | 1
svx/source/items/clipfmtitem.cxx | 1
svx/source/items/numfmtsh.cxx | 12
svx/source/sdr/attribute/sdrformtextattribute.cxx | 5
svx/source/sdr/attribute/sdrtextattribute.cxx | 5
svx/source/tbxctrls/linectrl.cxx | 5
svx/source/tbxctrls/tbcontrl.cxx | 18
svx/workben/edittest.cxx | 15
sw/inc/IDocumentMarkAccess.hxx | 3
sw/inc/IDocumentRedlineAccess.hxx | 10
sw/inc/acmplwrd.hxx | 20
sw/inc/authfld.hxx | 1
sw/inc/bparr.hxx | 26
sw/inc/breakit.hxx | 4
sw/inc/calbck.hxx | 11
sw/inc/cellatr.hxx | 2
sw/inc/cellfml.hxx | 20
sw/inc/chpfld.hxx | 10
sw/inc/crsrsh.hxx | 91
sw/inc/crstate.hxx | 82
sw/inc/cshtyp.hxx | 10
sw/inc/doc.hxx | 1
sw/inc/docstyle.hxx | 1
sw/inc/expfld.hxx | 22
sw/inc/ftnidx.hxx | 2
sw/inc/ndarr.hxx | 13
sw/inc/shellres.hxx | 1
sw/inc/swtable.hxx | 5
sw/inc/tblsel.hxx | 1
sw/sdi/wviewsh.sdi | 4
sw/source/core/bastyp/swcache.cxx | 1
sw/source/core/crsr/crstrvl.cxx | 12
sw/source/core/doc/SwStyleNameMapper.cxx | 1
sw/source/core/doc/acmplwrd.cxx | 86
sw/source/core/doc/dbgoutsw.cxx | 7
sw/source/core/doc/doc.cxx | 8
sw/source/core/doc/docdde.cxx | 4
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docglbl.cxx | 26
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 4
sw/source/core/doc/docnum.cxx | 18
sw/source/core/doc/doctxm.cxx | 3
sw/source/core/doc/ftnidx.cxx | 10
sw/source/core/doc/tblcpy.cxx | 4
sw/source/core/doc/tblrwcl.cxx | 52
sw/source/core/docnode/ndcopy.cxx | 2
sw/source/core/docnode/ndnum.cxx | 63
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 28
sw/source/core/docnode/node.cxx | 6
sw/source/core/docnode/nodes.cxx | 22
sw/source/core/edit/edattr.cxx | 3
sw/source/core/edit/edglss.cxx | 2
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/edit/edtab.cxx | 1
sw/source/core/fields/authfld.cxx | 1
sw/source/core/fields/cellfml.cxx | 32
sw/source/core/fields/ddetbl.cxx | 14
sw/source/core/fields/expfld.cxx | 21
sw/source/core/fields/fldlst.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/fetab.cxx | 4
sw/source/core/inc/UndoCore.hxx | 8
sw/source/core/inc/scriptinfo.hxx | 8
sw/source/core/inc/swcache.hxx | 3
sw/source/core/layout/layhelp.hxx | 9
sw/source/core/layout/paintfrm.cxx | 39
sw/source/core/table/swtable.cxx | 22
sw/source/core/text/itratr.hxx | 1
sw/source/core/txtnode/atrftn.cxx | 1
sw/source/core/txtnode/ndtxt.cxx | 1
sw/source/core/undo/undobj.cxx | 38
sw/source/core/undo/unredln.cxx | 4
sw/source/core/undo/untbl.cxx | 23
sw/source/core/unocore/swunohelper.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 1
sw/source/core/unocore/unofield.cxx | 1
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/unocore/unoobj2.cxx | 1
sw/source/core/unocore/unoparagraph.cxx | 1
sw/source/core/unocore/unotbl.cxx | 22
sw/source/filter/ascii/ascatr.cxx | 1
sw/source/filter/basflt/fltini.cxx | 5
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlbas.cxx | 1
sw/source/filter/html/htmlfly.cxx | 2
sw/source/filter/html/htmlplug.cxx | 1
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/swhtml.hxx | 3
sw/source/filter/rtf/rtftbl.cxx | 6
sw/source/filter/rtf/swparrtf.cxx | 16
sw/source/filter/ww8/docxattributeoutput.cxx | 5
sw/source/filter/ww8/docxexport.cxx | 3
sw/source/filter/ww8/docxexportfilter.cxx | 1
sw/source/filter/ww8/rtfattributeoutput.cxx | 68
sw/source/filter/ww8/rtfattributeoutput.hxx | 2
sw/source/filter/ww8/rtfexport.cxx | 134
sw/source/filter/ww8/rtfexport.hxx | 3
sw/source/filter/ww8/rtfexportfilter.cxx | 1
sw/source/filter/ww8/rtfimportfilter.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 11
sw/source/filter/ww8/wrtw8esh.cxx | 1
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par.hxx | 16
sw/source/filter/ww8/ww8par5.cxx | 26
sw/source/filter/xml/xmltbli.hxx | 1
sw/source/filter/xml/xmltexte.cxx | 1
sw/source/ui/app/apphdl.cxx | 1
sw/source/ui/app/appopt.cxx | 1
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 15
sw/source/ui/chrdlg/drpcps.cxx | 1
sw/source/ui/chrdlg/pardlg.cxx | 1
sw/source/ui/config/optpage.cxx | 1
sw/source/ui/config/uinums.cxx | 10
sw/source/ui/dbui/dbmgr.cxx | 1
sw/source/ui/dbui/mmconfigitem.cxx | 1
sw/source/ui/dialog/macassgn.cxx | 1
sw/source/ui/fldui/fldref.cxx | 3
sw/source/ui/fmtui/tmpdlg.cxx | 1
sw/source/ui/inc/basesh.hxx | 1
sw/source/ui/inc/edtwin.hxx | 1
sw/source/ui/inc/fldmgr.hxx | 1
sw/source/ui/inc/label.hxx | 1
sw/source/ui/inc/redlndlg.hxx | 1
sw/source/ui/inc/uinums.hxx | 6
sw/source/ui/index/idxmrk.cxx | 1
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/lingu/olmenu.cxx | 1
sw/source/ui/misc/glosbib.cxx | 1
sw/source/ui/misc/glosdoc.cxx | 1
sw/source/ui/misc/glossary.cxx | 1
sw/source/ui/misc/redlndlg.cxx | 8
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 1
sw/source/ui/shells/grfshex.cxx | 1
sw/source/ui/shells/langhelper.cxx | 1
sw/source/ui/uiview/view2.cxx | 1
sw/source/ui/uiview/viewling.cxx | 1
sw/source/ui/uiview/viewprt.cxx | 1
sw/source/ui/uno/unoatxt.cxx | 1
sw/source/ui/uno/unotxdoc.cxx | 6
sw/source/ui/utlui/bookctrl.cxx | 1
sw/source/ui/utlui/content.cxx | 7
sw/source/ui/utlui/glbltree.cxx | 1
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swxform/menubar/menubar.xml | 1
tubes/Library_tubes.mk | 1
tubes/Package_inc.mk | 5
tubes/inc/tubes/conference.hxx | 66
tubes/inc/tubes/contact-list.hxx | 12
tubes/inc/tubes/manager.hxx | 23
tubes/inc/tubes/packet.hxx | 83
tubes/prj/build.lst | 2
tubes/source/conference.cxx | 157
tubes/source/contact-list.cxx | 15
tubes/source/manager.cxx | 49
tubes/source/packet.cxx | 33
unusedcode.easy | 75
vcl/aqua/source/gdi/atsui/salatslayout.cxx | 31
vcl/inc/vcl/bitmap.hxx | 112
vcl/inc/vcl/bitmapex.hxx | 5
vcl/source/app/settings.cxx | 2
vcl/source/app/sound.cxx | 12
vcl/source/app/vclevent.cxx | 9
vcl/source/components/rasterizer_rsvg.cxx | 17
vcl/source/control/field2.cxx | 7
vcl/source/gdi/bitmap3.cxx | 406 +
vcl/source/gdi/bitmapex.cxx | 42
vcl/source/window/menu.cxx | 13
vcl/source/window/toolbox.cxx | 6
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 1
writerfilter/inc/dmapper/DomainMapper.hxx | 4
writerfilter/inc/doctok/WW8Document.hxx | 4
writerfilter/inc/ooxml/OOXMLDocument.hxx | 18
writerfilter/inc/resourcemodel/LoggedResources.hxx | 2
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/inc/resourcemodel/TagLogger.hxx | 4
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 4
writerfilter/qa/cppunittests/doctok/testdoctok.cxx | 6
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 4
writerfilter/source/dmapper/ConversionHelper.cxx | 14
writerfilter/source/dmapper/ConversionHelper.hxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 50
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 18
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 324 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 54
writerfilter/source/dmapper/FFDataHandler.cxx | 10
writerfilter/source/dmapper/FFDataHandler.hxx | 22
writerfilter/source/dmapper/FontTable.cxx | 4
writerfilter/source/dmapper/FontTable.hxx | 10
writerfilter/source/dmapper/FormControlHelper.cxx | 20
writerfilter/source/dmapper/FormControlHelper.hxx | 4
writerfilter/source/dmapper/GraphicHelpers.cxx | 6
writerfilter/source/dmapper/GraphicHelpers.hxx | 6
writerfilter/source/dmapper/GraphicImport.cxx | 8
writerfilter/source/dmapper/MeasureHandler.cxx | 4
writerfilter/source/dmapper/NumberingManager.cxx | 6
writerfilter/source/dmapper/NumberingManager.hxx | 20
writerfilter/source/dmapper/OLEHandler.cxx | 14
writerfilter/source/dmapper/OLEHandler.hxx | 14
writerfilter/source/dmapper/PropertyIds.cxx | 8
writerfilter/source/dmapper/PropertyIds.hxx | 2
writerfilter/source/dmapper/PropertyMap.cxx | 40
writerfilter/source/dmapper/PropertyMap.hxx | 22
writerfilter/source/dmapper/SettingsTable.cxx | 24
writerfilter/source/dmapper/StyleSheetTable.cxx | 76
writerfilter/source/dmapper/StyleSheetTable.hxx | 28
writerfilter/source/dmapper/ThemeTable.cxx | 30
writerfilter/source/dmapper/ThemeTable.hxx | 2
writerfilter/source/dmapper/genclass.xsl | 4
writerfilter/source/doctok/DffImpl.cxx | 8
writerfilter/source/doctok/WW8Annotation.cxx | 2
writerfilter/source/doctok/WW8DocumentImpl.cxx | 18
writerfilter/source/doctok/WW8DocumentImpl.hxx | 10
writerfilter/source/doctok/WW8FontTable.cxx | 8
writerfilter/source/doctok/WW8ListTable.cxx | 2
writerfilter/source/doctok/WW8Picture.cxx | 12
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 12
writerfilter/source/doctok/WW8ResourceModelImpl.hxx | 12
writerfilter/source/doctok/WW8StreamImpl.cxx | 8
writerfilter/source/doctok/WW8StreamImpl.hxx | 4
writerfilter/source/doctok/WW8StructBase.cxx | 8
writerfilter/source/doctok/WW8StructBase.hxx | 4
writerfilter/source/doctok/WW8Sttbf.cxx | 2
writerfilter/source/doctok/WW8Sttbf.hxx | 2
writerfilter/source/doctok/WW8StyleSheet.cxx | 10
writerfilter/source/doctok/resources.xsl | 6
writerfilter/source/doctok/resourcesimpl.xsl | 6
writerfilter/source/doctok/resourcetools.xsl | 2
writerfilter/source/filter/RtfFilter.hxx | 12
writerfilter/source/filter/WriterFilter.hxx | 14
writerfilter/source/filter/WriterFilterDetection.hxx | 14
writerfilter/source/ooxml/Handler.cxx | 2
writerfilter/source/ooxml/Handler.hxx | 10
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 16
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 16
writerfilter/source/ooxml/OOXMLFactory.cxx | 14
writerfilter/source/ooxml/OOXMLFactory.hxx | 6
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 70
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 64
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 14
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 14
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 12
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx | 10
writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx | 4
writerfilter/source/ooxml/OOXMLParserState.cxx | 2
writerfilter/source/ooxml/OOXMLParserState.hxx | 4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 16
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 18
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 58
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 16
writerfilter/source/ooxml/factory_ns.xsl | 2
writerfilter/source/ooxml/factory_values.xsl | 4
writerfilter/source/ooxml/factoryimpl_ns.xsl | 2
writerfilter/source/ooxml/factoryimpl_values.xsl | 4
writerfilter/source/resourcemodel/LoggedResources.cxx | 8
writerfilter/source/resourcemodel/Protocol.cxx | 6
writerfilter/source/resourcemodel/TagLogger.cxx | 8
writerfilter/source/resourcemodel/resourcemodel.cxx | 4
writerfilter/source/resourcemodel/util.cxx | 2
writerfilter/source/rtftok/README | 12
writerfilter/source/rtftok/rtfcontrolwords.cxx | 4
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 378 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 63
writerfilter/source/rtftok/rtfvalue.cxx | 25
writerfilter/source/rtftok/rtfvalue.hxx | 5
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 44
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx | 8
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx | 22
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx | 6
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 44
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx | 8
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx | 22
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx | 6
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 52
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx | 8
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx | 30
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx | 8
xmloff/source/style/styleexp.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 1
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/style/xmltabi.cxx | 1
xmloff/source/text/XMLTextColumnsContext.cxx | 1
xmloff/source/text/txtimp.cxx | 2
624 files changed, 8305 insertions(+), 5917 deletions(-)
New commits:
commit 951727f05d00554c8461d850f4d36c8863b8d89a
Author: David Ostrovsky <david at ostrovsky.org>
Date: Wed Jul 25 21:47:06 2012 +0200
mork driver: fix some problems
Change-Id: I10b989829d555a0a46195400d768da640cf69809
diff --git a/connectivity/Configuration_mork.mk b/connectivity/Configuration_mork.mk
new file mode 100644
index 0000000..dc36ca8
--- /dev/null
+++ b/connectivity/Configuration_mork.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Configuration_Configuration,driver_mork))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_mork,connectivity/registry/mork,\
+ org/openoffice/Office/DataAccess/Drivers-mork.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_mork,connectivity/registry/mork,\
+ org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Executable_mork_helper.mk b/connectivity/Executable_mork_helper.mk
index e26e6b6..27b8685 100644
--- a/connectivity/Executable_mork_helper.mk
+++ b/connectivity/Executable_mork_helper.mk
@@ -17,7 +17,10 @@ $(eval $(call gb_Executable_set_include,mork_helper,\
$(eval $(call gb_Executable_use_sdk_api,mork_helper))
$(eval $(call gb_Executable_use_libraries,mork_helper,\
+ cppu \
+ cppuhelper \
mork \
+ sal \
))
$(eval $(call gb_Executable_add_exception_objects,mork_helper,\
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 4a6621f..b4130a9 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Library_Library,mork))
$(eval $(call gb_Library_set_componentfile,mork,connectivity/source/drivers/mork/mork))
+$(eval $(call gb_Library_add_defs,mork,\
+ -DLO_DLLIMPLEMENTATION_MORK \
+))
+
$(eval $(call gb_Library_set_include,mork,\
-I$(SRCDIR)/connectivity/source/inc \
$$(INCLUDE) \
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index c3d7c2d..96f59a6 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_calc \
Configuration_dbase \
Configuration_flat \
+ Configuration_mork \
Configuration_mysql \
Configuration_odbc \
Executable_mork_helper \
@@ -118,28 +119,28 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES)
-$(eval $(call gb_Module_add_targets,connectivity,\
- Library_mozbootstrap \
-))
-else
-
-$(eval $(call gb_Module_add_targets,connectivity,\
- Library_mozab \
- Library_mozabdrv \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,connectivity,\
- Configuration_mozab \
-))
-else
-$(eval $(call gb_Module_add_targets,connectivity,\
- Configuration_mozab2 \
-))
-endif
-
-endif
+#ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES)
+#$(eval $(call gb_Module_add_targets,connectivity,\
+# Library_mozbootstrap \
+#))
+#else
+
+#$(eval $(call gb_Module_add_targets,connectivity,\
+# Library_mozab \
+# Library_mozabdrv \
+#))
+
+#ifeq ($(OS),WNT)
+#$(eval $(call gb_Module_add_targets,connectivity,\
+# Configuration_mozab \
+#))
+#else
+#$(eval $(call gb_Module_add_targets,connectivity,\
+# Configuration_mozab2 \
+#))
+#endif
+
+#endif
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
diff --git a/connectivity/Package_xml.mk b/connectivity/Package_xml.mk
index 5d6c0e9..d3a0050 100644
--- a/connectivity/Package_xml.mk
+++ b/connectivity/Package_xml.mk
@@ -31,7 +31,8 @@ $(eval $(call gb_Package_add_file,connectivity_xml,xml/evoab.xml,drivers/evoab2/
$(eval $(call gb_Package_add_file,connectivity_xml,xml/odbc.xml,drivers/odbc/odbc.xml))
$(eval $(call gb_Package_add_file,connectivity_xml,xml/dbase.xml,drivers/dbase/dbase.xml))
$(eval $(call gb_Package_add_file,connectivity_xml,xml/kab.xml,drivers/kab/kab.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/mozab.xml,drivers/mozab/mozab.xml))
+$(eval $(call gb_Package_add_file,connectivity_xml,xml/mork.xml,drivers/mork/mork.xml))
+#$(eval $(call gb_Package_add_file,connectivity_xml,xml/mozab.xml,drivers/mozab/mozab.xml))
$(eval $(call gb_Package_add_file,connectivity_xml,xml/mysql.xml,drivers/mysql/mysql.xml))
$(eval $(call gb_Package_add_file,connectivity_xml,xml/flat.xml,drivers/flat/flat.xml))
$(eval $(call gb_Package_add_file,connectivity_xml,xml/file.xml,drivers/file/file.xml))
diff --git a/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu
new file mode 100644
index 0000000..408b005
--- /dev/null
+++ b/connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="mork">
+ <node oor:name="sdbc:address:mozilla:" oor:op="replace">
+ <prop oor:name="Driver">
+ <value>com.sun.star.comp.sdbc.MozabDriver</value>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
+ <value xml:lang="en-US">SeaMonkey Address Book</value>
+ </prop>
+ <node oor:name="Features">
+ <node oor:name="EscapeDateTime" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ <node oor:name="MetaData">
+ <node oor:name="SupportsBrowsing" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="sdbc:address:thunderbird:" oor:op="replace">
+ <prop oor:name="Driver">
+ <value>com.sun.star.comp.sdbc.MorkDriver</value>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
+ <value xml:lang="en-US">Thunderbird/Icedove Address Book</value>
+ </prop>
+ <node oor:name="Features">
+ <node oor:name="EscapeDateTime" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ <node oor:name="MetaData">
+ <node oor:name="SupportsBrowsing" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 1bc336d..5961a0e 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -12,7 +12,6 @@
#include "MNSProfileDiscover.hxx"
using namespace connectivity::mork;
-using namespace connectivity::mozab;
namespace connectivity
{
@@ -77,8 +76,11 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect(
throw (css::sdbc::SQLException, css::uno::RuntimeException)
{
(void) url; (void) info; // avoid warnings
- // return static_cast< cppu::OWeakObject * >(new MConnection(this));
- return NULL;
+ css::uno::Reference< css::sdbc::XConnection > xCon;
+ OConnection* pCon = new OConnection(this);
+ xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0)
+ pCon->construct(url, info);
+ return xCon;
}
sal_Bool MorkDriver::acceptsURL(rtl::OUString const & url)
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index 74bb556..112aa36 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -40,16 +40,8 @@ namespace com { namespace sun { namespace star {
} } }
namespace rtl { class OUString; }
-namespace connectivity
-{
- namespace mozab
- {
- class ProfileAccess;
- }
-}
-
namespace connectivity { namespace mork {
-
+class ProfileAccess;
namespace css = com::sun::star;
css::uno::Reference< css::uno::XInterface > SAL_CALL
@@ -67,7 +59,7 @@ public:
throw (css::uno::RuntimeException);
private:
- connectivity::mozab::ProfileAccess* m_ProfileAccess;
+ ProfileAccess* m_ProfileAccess;
virtual ~MorkDriver() {}
virtual rtl::OUString SAL_CALL getImplementationName()
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
index ec9eb0a..014e17c 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
@@ -28,7 +28,7 @@
namespace connectivity
{
- namespace mozab
+ namespace mork
{
ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
const ::rtl::OUString& aProfilePath
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
index ce9865e..3e1468b 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
@@ -31,18 +31,24 @@
#include <vector>
#include <map>
+#if defined LO_DLLIMPLEMENTATION_MORK
+#define LO_DLLPUBLIC_MORK SAL_DLLPUBLIC_EXPORT
+#else
+#define LO_DLLPUBLIC_MORK SAL_DLLPUBLIC_IMPORT
+#endif
+
using namespace com::sun::star::mozilla;
namespace connectivity
{
- namespace mozab
+ namespace mork
{
class ProfileStruct;
}
}
-typedef ::std::map < ::rtl::OUString, ::connectivity::mozab::ProfileStruct* > ProfileList;
+typedef ::std::map < ::rtl::OUString, ::connectivity::mork::ProfileStruct* > ProfileList;
namespace connectivity
{
- namespace mozab
+ namespace mork
{
class ProfileStruct
{
@@ -70,7 +76,7 @@ namespace connectivity
};
//Used to query profiles information
- class ProfileAccess
+ class LO_DLLPUBLIC_MORK ProfileAccess
{
public:
diff --git a/connectivity/source/drivers/mork/mork_helper.cxx b/connectivity/source/drivers/mork/mork_helper.cxx
index 9853d8c..560592b 100644
--- a/connectivity/source/drivers/mork/mork_helper.cxx
+++ b/connectivity/source/drivers/mork/mork_helper.cxx
@@ -1,9 +1,12 @@
#include "MNSProfileDiscover.hxx"
-using namespace connectivity::mozab;
+using namespace connectivity::mork;
int main( int argc, const char* argv[] )
{
+ int x = argc;
+ x++;
+ argv++;
ProfileAccess* access = new ProfileAccess();
::rtl::OUString profile = access->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird);
}
commit 22edf6e392afb5b7f1541dd95b46acae80e124a1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 25 17:30:14 2012 +0200
More helpful error message.
Change-Id: I009fc8a8b84355a35adc60b7008ebe8b96965c8e
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 30fe348..97edc40 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -988,7 +988,7 @@ sub write_summary_into_msi_database
if ($returnvalue)
{
- $infoline = "ERROR: Could not execute $msiinfo!\n";
+ $infoline = "ERROR: Could not execute $systemcall\n";
push( @installer::globals::logfileinfo, $infoline);
}
else
commit a8e52a116b29b9f03ffd8b6efc3c2e41d887c550
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 25 15:00:02 2012 +0200
More full paths for cross msi* tools.
Change-Id: I813d22bc5081a0cc5f1af9fbc6661a970eb16b86
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 194a65f..e088caf 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -48,6 +48,11 @@ sub unpack_cabinet_file
push( @installer::globals::logfileinfo, $infoline);
my $expandfile = "expand.exe"; # Has to be in the path
+ if ( $installer::globals::isunix )
+ {
+ $infoline = "ERROR: We need to change this to use cabextract instead of expand.exe\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
# expand.exe has to be located in the system directory.
# Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
@@ -104,6 +109,10 @@ sub include_tables_into_pcpfile
my ($fullmsidatabasepath, $workdir, $tables) = @_;
my $msidb = "msidb.exe"; # Has to be in the path
+ if ( $installer::globals::isunix )
+ {
+ $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+ }
my $infoline = "";
my $systemcall = "";
my $returnvalue = "";
@@ -159,6 +168,10 @@ sub extract_tables_from_pcpfile
my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
my $msidb = "msidb.exe"; # Has to be in the path
+ if ( $installer::globals::isunix )
+ {
+ $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+ }
my $infoline = "";
my $systemcall = "";
my $returnvalue = "";
@@ -699,6 +712,10 @@ sub write_sis_info
if ( ! -f $msidatabase ) { installer::exiter::exit_program("ERROR: Cannot find file $msidatabase", "write_sis_info"); }
my $msiinfo = "msiinfo.exe"; # Has to be in the path
+ if ( $installer::globals::isunix )
+ {
+ $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe";
+ }
my $infoline = "";
my $systemcall = "";
my $returnvalue = "";
commit f521f33b98d051ef3eadcbdb5e40bbb8e980be0e
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 25 14:50:14 2012 +0200
Avoid a crash.
Change-Id: I2ce8be599c9285bd0da039e1ff9c0649a118a8a1
diff --git a/setup_native/source/win32/wintools/msiinfo/msiinfo.c b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
index f2d388b..2ba88df 100644
--- a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
+++ b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
@@ -204,7 +204,7 @@ int wmain(int argc, WCHAR *argv[])
argv++; argc--;
}
- if (strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
+ if (!dbfile || strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
{
usage();
return 0;
commit 8672e7a9692e26e1946aa67f4a23d1e4e90858b0
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Jul 25 17:00:45 2012 +0200
export RTF_MLIM and related keywords
Change-Id: I533807168fea34216bfd2a7cf64d13bca4815d25
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index dbce7ed..493a483 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -41,7 +41,7 @@ SmRtfExport::SmRtfExport(const SmNode* pIn)
bool SmRtfExport::ConvertFromStarMath(OStringBuffer& rBuffer)
{
- if (m_pTree == NULL)
+ if (!m_pTree)
return false;
m_pBuffer = &rBuffer;
m_pBuffer->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE "\\moMath");
@@ -68,6 +68,9 @@ void SmRtfExport::HandleNode(const SmNode* pNode, int nLevel)
case NBRACE:
HandleBrace( static_cast< const SmBraceNode* >( pNode ), nLevel );
break;
+ case NOPER:
+ HandleOperator(static_cast<const SmOperNode*>(pNode), nLevel);
+ break;
case NBINHOR:
HandleBinaryOperation(static_cast<const SmBinHorNode*>(pNode), nLevel);
break;
@@ -275,9 +278,78 @@ OString mathSymbolToString(const SmNode* node)
}
}
-void SmRtfExport::HandleOperator(const SmOperNode* /*pNode*/, int /*nLevel*/)
+void SmRtfExport::HandleOperator(const SmOperNode* pNode, int nLevel)
{
- SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("starmath.rtf", "Operator: " << int(pNode->GetToken().eType));
+ switch (pNode->GetToken().eType)
+ {
+ case TINT:
+ case TIINT:
+ case TIIINT:
+ case TLINT:
+ case TLLINT:
+ case TLLLINT:
+ case TPROD:
+ case TCOPROD:
+ case TSUM:
+ {
+ const SmSubSupNode* subsup = pNode->GetSubNode(0)->GetType() == NSUBSUP ? static_cast<const SmSubSupNode*>(pNode->GetSubNode(0)) : 0;
+ const SmNode* operation = subsup ? subsup->GetBody() : pNode->GetSubNode(0);
+ m_pBuffer->append("{\\mnary ");
+ m_pBuffer->append("{\\mnaryPr ");
+ m_pBuffer->append("{\\mchr ");
+ m_pBuffer->append(mathSymbolToString(operation));
+ m_pBuffer->append("}"); // mchr
+ if (!subsup || !subsup->GetSubSup(CSUB))
+ m_pBuffer->append("{\\msubHide 1}");
+ if (!subsup || !subsup->GetSubSup(CSUP))
+ m_pBuffer->append("{\\msupHide 1}");
+ m_pBuffer->append("}"); // mnaryPr
+ if (!subsup || !subsup->GetSubSup(CSUB))
+ m_pBuffer->append("{\\msub }");
+ else
+ {
+ m_pBuffer->append("{\\msub ");
+ HandleNode(subsup->GetSubSup(CSUB), nLevel + 1);
+ m_pBuffer->append("}"); // msub
+ }
+ if (!subsup || !subsup->GetSubSup( CSUP ))
+ m_pBuffer->append("{\\msup }");
+ else
+ {
+ m_pBuffer->append("{\\msup ");
+ HandleNode(subsup->GetSubSup(CSUP), nLevel + 1);
+ m_pBuffer->append("}"); // msup
+ }
+ m_pBuffer->append("{\\me ");
+ HandleNode(pNode->GetSubNode(1), nLevel + 1); // body
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("}"); // mnary
+ break;
+ }
+ case TLIM:
+ m_pBuffer->append("{\\mfunc ");
+ m_pBuffer->append("{\\mfName ");
+ m_pBuffer->append("{\\mlimLow ");
+ m_pBuffer->append("{\\me ");
+ HandleNode(pNode->GetSymbol(), nLevel + 1);
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("{\\mlim ");
+ if (const SmSubSupNode* subsup = pNode->GetSubNode(0)->GetType() == NSUBSUP ? static_cast<const SmSubSupNode*>( pNode->GetSubNode(0)) : 0)
+ if (subsup->GetSubSup(CSUB))
+ HandleNode(subsup->GetSubSup(CSUB), nLevel + 1);
+ m_pBuffer->append("}"); // mlim
+ m_pBuffer->append("}"); // mlimLow
+ m_pBuffer->append("}"); // mfName
+ m_pBuffer->append("{\\me ");
+ HandleNode(pNode->GetSubNode(1), nLevel + 1); // body
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("}"); // mfunc
+ break;
+ default:
+ SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC << " unhandled oper type");
+ break;
+ }
}
void SmRtfExport::HandleSubSupScript(const SmSubSupNode* /*pNode*/, int /*nLevel*/)
commit 2481f0805bbfe2f63a4f22de4e9709483dd9a273
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Jul 25 16:25:55 2012 +0200
escape output properly inside RTF_MR
Change-Id: I93ea57e6bd5f93c9a5d256a11f91ec260f96c223
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 32c1cc5..dbce7ed 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -130,8 +130,8 @@ void SmRtfExport::HandleText(const SmNode* pNode, int /*nLevel*/)
for (xub_StrLen i = 0; i < pTemp->GetText().Len(); i++)
{
sal_uInt16 nChar = pTemp->GetText().GetChar(i);
- // TODO special/non-ascii chars?
- m_pBuffer->append(OUStringToOString(OUString(SmTextNode::ConvertSymbolToUnicode(nChar)), RTL_TEXTENCODING_UTF8));
+ OUString aValue(SmTextNode::ConvertSymbolToUnicode(nChar));
+ m_pBuffer->append(msfilter::rtfutil::OutString(aValue, RTL_TEXTENCODING_MS_1252));
}
m_pBuffer->append("}");
commit 114c3a439cd86d3cfe39fc18dcd443657609968f
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Jul 25 16:20:33 2012 +0200
export RTF_MD and related keywords
Change-Id: Ib97ce01e738714d2df9b30f0c7c0069c6957335b
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index fa8b816..32c1cc5 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -65,6 +65,9 @@ void SmRtfExport::HandleNode(const SmNode* pNode, int nLevel)
case NTEXT:
HandleText(pNode,nLevel);
break;
+ case NBRACE:
+ HandleBrace( static_cast< const SmBraceNode* >( pNode ), nLevel );
+ break;
case NBINHOR:
HandleBinaryOperation(static_cast<const SmBinHorNode*>(pNode), nLevel);
break;
@@ -260,6 +263,18 @@ void SmRtfExport::HandleRoot(const SmRootNode* /*pNode*/, int /*nLevel*/)
SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
}
+namespace {
+OString mathSymbolToString(const SmNode* node)
+{
+ assert(node->GetType() == NMATH);
+ const SmTextNode* txtnode = static_cast<const SmTextNode*>(node);
+ assert(txtnode->GetText().Len() == 1);
+ sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode(txtnode->GetText().GetChar(0));
+ OUString aValue(chr);
+ return msfilter::rtfutil::OutString(aValue, RTL_TEXTENCODING_MS_1252);
+}
+}
+
void SmRtfExport::HandleOperator(const SmOperNode* /*pNode*/, int /*nLevel*/)
{
SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
@@ -280,9 +295,49 @@ void SmRtfExport::HandleMatrix(const SmMatrixNode* /*pNode*/, int /*nLevel*/)
SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
}
-void SmRtfExport::HandleBrace(const SmBraceNode* /*pNode*/, int /*nLevel*/)
+void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int nLevel)
{
- SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
+ m_pBuffer->append("{\\md ");
+ m_pBuffer->append("{\\mdPr ");
+ m_pBuffer->append("{\\mbegChr ");
+ m_pBuffer->append(mathSymbolToString(pNode->OpeningBrace()));
+ m_pBuffer->append("}"); // mbegChr
+ std::vector< const SmNode* > subnodes;
+ if (pNode->Body()->GetType() == NBRACEBODY)
+ {
+ const SmBracebodyNode* body = static_cast<const SmBracebodyNode*>( pNode->Body());
+ bool separatorWritten = false; // assume all separators are the same
+ for (int i = 0; i < body->GetNumSubNodes(); ++i)
+ {
+ const SmNode* subnode = body->GetSubNode(i);
+ if (subnode->GetType() == NMATH)
+ { // do not write, but write what separator it is
+ const SmMathSymbolNode* math = static_cast<const SmMathSymbolNode*>(subnode);
+ if(!separatorWritten)
+ {
+ m_pBuffer->append("{\\msepChr ");
+ m_pBuffer->append(mathSymbolToString(math));
+ m_pBuffer->append("}"); // msepChr
+ separatorWritten = true;
+ }
+ }
+ else
+ subnodes.push_back(subnode);
+ }
+ }
+ else
+ subnodes.push_back(pNode->Body());
+ m_pBuffer->append("{\\mendChr ");
+ m_pBuffer->append(mathSymbolToString(pNode->ClosingBrace()));
+ m_pBuffer->append("}"); // mendChr
+ m_pBuffer->append("}"); // mdPr
+ for (unsigned int i = 0; i < subnodes.size(); ++i)
+ {
+ m_pBuffer->append("{\\me ");
+ HandleNode(subnodes[ i ], nLevel + 1);
+ m_pBuffer->append("}"); // me
+ }
+ m_pBuffer->append("}"); // md
}
void SmRtfExport::HandleVerticalBrace(const SmVerticalBraceNode* /*pNode*/, int /*nLevel*/)
commit 9e8d64935b955e192ddc4b3beb043666eb0b353a
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Jul 25 14:51:39 2012 +0200
export RTF_MACC and related keywords
Change-Id: I862f008f2a8b4972be1b33ec45128bbfeeb9fb99
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index f4e560f..fa8b816 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -31,6 +31,7 @@
#include <rtl/oustringostreaminserter.hxx>
#include <svtools/rtfkeywd.hxx>
+#include <filter/msfilter/rtfutil.hxx>
SmRtfExport::SmRtfExport(const SmNode* pIn)
: m_pTree(pIn)
@@ -58,6 +59,9 @@ void SmRtfExport::HandleNode(const SmNode* pNode, int nLevel)
switch(pNode->GetType())
{
+ case NATTRIBUT:
+ HandleAttribute( static_cast< const SmAttributNode* >( pNode ), nLevel );
+ break;
case NTEXT:
HandleText(pNode,nLevel);
break;
@@ -170,9 +174,70 @@ void SmRtfExport::HandleBinaryOperation(const SmBinHorNode* pNode, int nLevel)
}
}
-void SmRtfExport::HandleAttribute(const SmAttributNode* /*pNode*/, int /*nLevel*/)
+void SmRtfExport::HandleAttribute(const SmAttributNode* pNode, int nLevel)
{
- SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
+ switch (pNode->Attribute()->GetToken().eType)
+ {
+ case TCHECK:
+ case TACUTE:
+ case TGRAVE:
+ case TBREVE:
+ case TCIRCLE:
+ case TVEC:
+ case TTILDE:
+ case THAT:
+ case TDOT:
+ case TDDOT:
+ case TDDDOT:
+ case TWIDETILDE:
+ case TWIDEHAT:
+ case TWIDEVEC:
+ case TBAR:
+ {
+ m_pBuffer->append("{\\macc ");
+ m_pBuffer->append("{\\maccPr ");
+ m_pBuffer->append("{\\mchr ");
+ OUString aValue(pNode->Attribute()->GetToken().cMathChar);
+ m_pBuffer->append(msfilter::rtfutil::OutString(aValue, RTL_TEXTENCODING_MS_1252));
+ m_pBuffer->append("}"); // mchr
+ m_pBuffer->append("}"); // maccPr
+ m_pBuffer->append("{\\me ");
+ HandleNode( pNode->Body(), nLevel + 1 );
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("}"); // macc
+ break;
+ }
+ case TOVERLINE:
+ case TUNDERLINE:
+ m_pBuffer->append("{\\mbar ");
+ m_pBuffer->append("{\\mbarPr ");
+ m_pBuffer->append("{\\mpos ");
+ m_pBuffer->append((pNode->Attribute()->GetToken().eType == TUNDERLINE ) ? "bot" : "top");
+ m_pBuffer->append("}"); // mpos
+ m_pBuffer->append("}"); // mbarPr
+ m_pBuffer->append("{\\me ");
+ HandleNode( pNode->Body(), nLevel + 1 );
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("}"); // mbar
+ break;
+ case TOVERSTRIKE:
+ m_pBuffer->append("{\\mborderBox ");
+ m_pBuffer->append("{\\mborderBoxPr ");
+ m_pBuffer->append("{\\mhideTop 1}");
+ m_pBuffer->append("{\\mhideBot 1}");
+ m_pBuffer->append("{\\mhideLeft 1}");
+ m_pBuffer->append("{\\mhideRight 1}");
+ m_pBuffer->append("{\\mstrikeH 1}");
+ m_pBuffer->append("}"); // mborderBoxPr
+ m_pBuffer->append("{\\me ");
+ HandleNode( pNode->Body(), nLevel + 1 );
+ m_pBuffer->append("}"); // me
+ m_pBuffer->append("}"); // mborderBox
+ break;
+ default:
+ HandleAllSubNodes( pNode, nLevel );
+ break;
+ }
}
void SmRtfExport::HandleMath(const SmNode* pNode, int nLevel)
commit cf533f44535b35e914577af57c18e4d8dac572ff
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Jul 25 15:43:54 2012 +0200
move rtf escaping functions to msfilter, so starmath can use them as well
Change-Id: Ib847f5207f3f36585427313c1454b0fba730c503
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index a592fbf..c7eebae 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\
filter/source/msfilter/services \
filter/source/msfilter/svdfppt \
filter/source/msfilter/svxmsbas2 \
+ filter/source/msfilter/rtfutil \
filter/source/msfilter/util \
))
diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk
index 141cc29..578fe96 100644
--- a/filter/Package_inc.mk
+++ b/filter/Package_inc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,f
$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msvbahelper.hxx,filter/msfilter/msvbahelper.hxx))
$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svdfppt.hxx,filter/msfilter/svdfppt.hxx))
$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svxmsbas.hxx,filter/msfilter/svxmsbas.hxx))
+$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/rtfutil.hxx,filter/msfilter/rtfutil.hxx))
$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/util.hxx,filter/msfilter/util.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/filter/inc/filter/msfilter/rtfutil.hxx b/filter/inc/filter/msfilter/rtfutil.hxx
new file mode 100644
index 0000000..6f5d82c
--- /dev/null
+++ b/filter/inc/filter/msfilter/rtfutil.hxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2012 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_MSFILTER_RTFUTIL_HXX
+#define INCLUDED_MSFILTER_RTFUTIL_HXX
+
+#include "filter/msfilter/msfilterdllapi.h"
+#include <rtl/string.hxx>
+#include <rtl/textenc.h>
+#include <tools/string.hxx>
+
+namespace msfilter {
+namespace rtfutil {
+
+/// Outputs a single character in hex form.
+MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen);
+
+/// Handles correct unicode and legacy export of a single character.
+MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc);
+
+/// Handles correct unicode and legacy export of a string.
+MSFILTER_DLLPUBLIC OString OutString(const String &rStr, rtl_TextEncoding eDestEnc);
+
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
new file mode 100644
index 0000000..ebb72bd
--- /dev/null
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Miklos Vajna <vmiklos at suse.cz> (SUSE, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2012 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <filter/msfilter/rtfutil.hxx>
+#include <rtl/strbuf.hxx>
+#include <svtools/rtfkeywd.hxx>
+
+namespace msfilter {
+namespace rtfutil {
+
+OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
+{
+ sal_Char aNToABuf[] = "0000000000000000";
+
+ OSL_ENSURE( nLen < sizeof(aNToABuf), "nLen is too big" );
+ if( nLen >= sizeof(aNToABuf) )
+ nLen = (sizeof(aNToABuf)-1);
+
+ // Set pointer to the buffer end
+ sal_Char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
+ for( sal_uInt8 n = 0; n < nLen; ++n )
+ {
+ *(--pStr) = (sal_Char)(nHex & 0xf ) + 48;
+ if( *pStr > '9' )
+ *pStr += 39;
+ nHex >>= 4;
+ }
+ return OString(pStr);
+}
+
+OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc)
+{
+ OStringBuffer aBuf;
+ const sal_Char* pStr = 0;
+ // 0x0b instead of \n, etc because of the replacements in SwWW8AttrIter::GetSnippet()
+ switch (c)
+ {
+ case 0x0b:
+ // hard line break
+ pStr = OOO_STRING_SVTOOLS_RTF_LINE;
+ break;
+ case '\t':
+ pStr = OOO_STRING_SVTOOLS_RTF_TAB;
+ break;
+ case '\\':
+ case '}':
+ case '{':
+ aBuf.append('\\');
+ aBuf.append((sal_Char)c);
+ break;
+ case 0xa0:
+ // non-breaking space
+ pStr = "\\~";
+ break;
+ case 0x1e:
+ // non-breaking hyphen
+ pStr = "\\_";
+ break;
+ case 0x1f:
+ // optional hyphen
+ pStr = "\\-";
+ break;
+ default:
+ if (c >= ' ' && c <= '~')
+ aBuf.append((sal_Char)c);
+ else {
+ OUString sBuf(&c, 1);
+ OString sConverted;
+ sBuf.convertToString(&sConverted, eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS);
+ const sal_Int32 nLen = sConverted.getLength();
+
+ if (pUCMode)
+ {
+ if (*pUCMode != nLen)
+ {
+ aBuf.append("\\uc");
+ aBuf.append((sal_Int32)nLen);
+ // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.
+ aBuf.append(' ');
+ *pUCMode = nLen;
+ }
+ aBuf.append("\\u");
+ aBuf.append((sal_Int32)c);
+ }
+
+ for (sal_Int32 nI = 0; nI < nLen; ++nI)
+ {
+ aBuf.append("\\'");
+ aBuf.append(OutHex(sConverted.getStr()[nI], 2));
+ }
+ }
+ }
+ if (pStr) {
+ aBuf.append(pStr);
+ switch (c)
+ {
+ case 0xa0:
+ case 0x1e:
+ case 0x1f:
+ break;
+ default:
+ aBuf.append(' ');
+ }
+ }
+ return aBuf.makeStringAndClear();
+}
+
+OString OutString(const String &rStr, rtl_TextEncoding eDestEnc)
+{
+ SAL_INFO("filter.ms", OSL_THIS_FUNC << ", rStr = '" << OUString(rStr) << "'");
+ OStringBuffer aBuf;
+ int nUCMode = 1;
+ for (xub_StrLen n = 0; n < rStr.Len(); ++n)
+ aBuf.append(OutChar(rStr.GetChar(n), &nUCMode, eDestEnc));
+ if (nUCMode != 1) {
+ aBuf.append(OOO_STRING_SVTOOLS_RTF_UC);
+ aBuf.append((sal_Int32)1);
+ aBuf.append(" "); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
+ }
+ return aBuf.makeStringAndClear();
+}
+
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3328ff0..c804ee8 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -78,6 +78,7 @@
#include <svx/fmglob.hxx>
#include <svx/svdouno.hxx>
#include <filter/msfilter/msoleexp.hxx>
+#include <filter/msfilter/rtfutil.hxx>
#include <svtools/miscopt.hxx>
#include <docufld.hxx>
@@ -439,7 +440,7 @@ OStringBuffer& RtfAttributeOutput::Styles()
void RtfAttributeOutput::RawText( const String& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_aRunText->append(m_rExport.OutString(rText, eCharSet));
+ m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet));
}
void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, xub_StrLen /*nPos*/, const SwFmtRuby& /*rRuby*/ )
@@ -467,14 +468,14 @@ bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
if( sURL.Len() )
{
m_aStyles.append("\"");
- m_aStyles.append(m_rExport.OutString( sURL, m_rExport.eCurrentEncoding));
+ m_aStyles.append(msfilter::rtfutil::OutString( sURL, m_rExport.eCurrentEncoding));
m_aStyles.append("\" ");
}
if( rTarget.Len() )
{
m_aStyles.append("\\\\t \"");
- m_aStyles.append(m_rExport.OutString( rTarget, m_rExport.eCurrentEncoding));
+ m_aStyles.append(msfilter::rtfutil::OutString( rTarget, m_rExport.eCurrentEncoding));
m_aStyles.append("\" ");
}
@@ -1106,7 +1107,7 @@ void RtfAttributeOutput::EndStyle()
m_rExport.InsStyle(m_nStyleId, aStyles);
m_aStylesheet.append(aStyles);
m_aStylesheet.append(' ');
- m_aStylesheet.append(m_rExport.OutString(m_rStyleName, m_rExport.eCurrentEncoding));
+ m_aStylesheet.append(msfilter::rtfutil::OutString(m_rStyleName, m_rExport.eCurrentEncoding));
m_aStylesheet.append(";}");
m_aStylesheet.append(m_rExport.sNewLine);
}
@@ -1389,8 +1390,8 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
}
else
{
- m_rExport.Strm() << "\\'" << m_rExport.OutHex( rNumberingString.Len(), 2 ).getStr();
- m_rExport.Strm() << m_rExport.OutString( rNumberingString, m_rExport.eDefaultEncoding ).getStr();
+ m_rExport.Strm() << "\\'" << msfilter::rtfutil::OutHex( rNumberingString.Len(), 2 ).getStr();
+ m_rExport.Strm() << msfilter::rtfutil::OutString( rNumberingString, m_rExport.eDefaultEncoding ).getStr();
}
m_rExport.Strm() << ";}";
@@ -1399,7 +1400,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
m_rExport.Strm() << "{" << OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS;
for( sal_uInt8 i = 0; i <= nLevel && pNumLvlPos[ i ]; ++i )
{
- m_rExport.Strm() << "\\'" << m_rExport.OutHex(pNumLvlPos[ i ], 2).getStr();
+ m_rExport.Strm() << "\\'" << msfilter::rtfutil::OutHex(pNumLvlPos[ i ], 2).getStr();
}
m_rExport.Strm() << ";}";
@@ -1433,11 +1434,11 @@ void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eTyp
{
m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_FIELD);
m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST " ");
- m_aRunText->append(m_rExport.OutString(rFldCmd, m_rExport.eCurrentEncoding));
+ m_aRunText->append(msfilter::rtfutil::OutString(rFldCmd, m_rExport.eCurrentEncoding));
m_aRunText->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
}
if (pFld)
- m_aRunText->append(m_rExport.OutString(pFld->ExpandField(true), m_rExport.eDefaultEncoding));
+ m_aRunText->append(msfilter::rtfutil::OutString(pFld->ExpandField(true), m_rExport.eDefaultEncoding));
if (bHasInstructions)
m_aRunText->append("}}");
}
@@ -1447,7 +1448,7 @@ void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< rtl::OUString >& rSta
for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it != end; ++it )
{
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_BKMKSTART " ");
- m_aRun->append(m_rExport.OutString(*it, m_rExport.eCurrentEncoding));
+ m_aRun->append(msfilter::rtfutil::OutString(*it, m_rExport.eCurrentEncoding));
m_aRun->append('}');
}
rStarts.clear();
@@ -1455,7 +1456,7 @@ void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< rtl::OUString >& rSta
for ( std::vector< OUString >::const_iterator it = rEnds.begin(), end = rEnds.end(); it != end; ++it )
{
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_BKMKEND " ");
- m_aRun->append(m_rExport.OutString(*it, m_rExport.eCurrentEncoding));
+ m_aRun->append(msfilter::rtfutil::OutString(*it, m_rExport.eCurrentEncoding));
m_aRun->append('}');
}
rEnds.clear();
@@ -1676,7 +1677,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
aStr = aBuf.makeStringAndClear();
pStr = aStr.getStr();
for (int i = 0; i < aStr.getLength(); i++, pStr++)
- m_aRun->append(m_rExport.OutHex(*pStr, 2));
+ m_aRun->append(msfilter::rtfutil::OutHex(*pStr, 2));
m_aRun->append('}');
m_aRun->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
xPropSet->getPropertyValue("Text") >>= aTmp;
@@ -2312,7 +2313,7 @@ void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote)
if (!rFootnote.GetNumStr().Len())
m_aRun->append(OOO_STRING_SVTOOLS_RTF_CHFTN);
else
- m_aRun->append(m_rExport.OutString(rFootnote.GetNumStr(), m_rExport.eCurrentEncoding));
+ m_aRun->append(msfilter::rtfutil::OutString(rFootnote.GetNumStr(), m_rExport.eCurrentEncoding));
}
void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
@@ -2524,7 +2525,7 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
if (sTxt.Len())
{
m_aStyles.append(' ');
- m_aStyles.append(m_rExport.OutString(sTxt, m_rExport.eDefaultEncoding));
+ m_aStyles.append(msfilter::rtfutil::OutString(sTxt, m_rExport.eDefaultEncoding));
}
if( bExportNumRule )
@@ -3249,7 +3250,7 @@ void lcl_AppendSP( OStringBuffer& rBuffer,
rBuffer.append( cName ); //"PropName"
rBuffer.append( "}{" OOO_STRING_SVTOOLS_RTF_SV " " );
// "}{ \sv "
- rBuffer.append( rExport.OutString( rValue, rExport.eCurrentEncoding ) );
+ rBuffer.append( msfilter::rtfutil::OutString( rValue, rExport.eCurrentEncoding ) );
rBuffer.append( "}}" );
}
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index b09345a..2876a52 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -64,6 +64,7 @@
#include <comphelper/string.hxx>
#include <rtl/oustringostreaminserter.hxx>
#include <svtools/rtfkeywd.hxx>
+#include <filter/msfilter/rtfutil.hxx>
#include <unotools/configmgr.hxx>
#if OSL_DEBUG_LEVEL > 1
@@ -271,7 +272,7 @@ void RtfExport::WriteRevTab()
const String* pAuthor = GetRedline(i);
Strm() << '{';
if (pAuthor)
- Strm() << OutString(*pAuthor, eDefaultEncoding).getStr();
+ Strm() << msfilter::rtfutil::OutString(*pAuthor, eDefaultEncoding).getStr();
Strm() << ";}";
}
Strm() << '}' << sNewLine;
@@ -348,14 +349,14 @@ void RtfExport::DoFormText(const SwInputField* pFld )
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT "0" );
if( !sName.isEmpty() )
- m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" );
+ m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( msfilter::rtfutil::OutString( sName, eDefaultEncoding )).append( "}" );
if( !sHelp.isEmpty() )
- m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ").append( OutString( sHelp, eDefaultEncoding )).append( "}" );
- m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFDEFTEXT " ").append( OutString( sResult, eDefaultEncoding )).append( "}" );
+ m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ").append( msfilter::rtfutil::OutString( sHelp, eDefaultEncoding )).append( "}" );
+ m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFDEFTEXT " ").append( msfilter::rtfutil::OutString( sResult, eDefaultEncoding )).append( "}" );
if( !sStatus.isEmpty() )
- m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ").append( OutString( sStatus, eDefaultEncoding )).append( "}");
+ m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ").append( msfilter::rtfutil::OutString( sStatus, eDefaultEncoding )).append( "}");
m_pAttrOutput->RunText().append( "}}}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " " );
- m_pAttrOutput->RunText().append( OutString( sResult, eDefaultEncoding )).append( "}}" );
+ m_pAttrOutput->RunText().append( msfilter::rtfutil::OutString( sResult, eDefaultEncoding )).append( "}}" );
}
sal_uLong RtfExport::ReplaceCr( sal_uInt8 )
@@ -455,7 +456,7 @@ void RtfExport::WritePageDescTable()
break;
Strm() << OOO_STRING_SVTOOLS_RTF_PGDSCNXT;
OutULong( i ) << ' ';
- Strm() << OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() << ";}";
+ Strm() << msfilter::rtfutil::OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() << ";}";
}
Strm() << '}' << sNewLine;
bOutPageDescs = sal_False;
@@ -816,123 +817,11 @@ void RtfExport::OutUnicode(const sal_Char *pToken, const String &rContent)
if (rContent.Len())
{
Strm() << '{' << pToken << ' ';
- Strm() << OutString( rContent, eCurrentEncoding ).getStr();
+ Strm() << msfilter::rtfutil::OutString( rContent, eCurrentEncoding ).getStr();
Strm() << '}';
}
}
-OString RtfExport::OutHex(sal_uLong nHex, sal_uInt8 nLen)
-{
- sal_Char aNToABuf[] = "0000000000000000";
-
- OSL_ENSURE( nLen < sizeof(aNToABuf), "nLen is too big" );
- if( nLen >= sizeof(aNToABuf) )
- nLen = (sizeof(aNToABuf)-1);
-
- // Set pointer to the buffer end
- sal_Char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
- for( sal_uInt8 n = 0; n < nLen; ++n )
- {
- *(--pStr) = (sal_Char)(nHex & 0xf ) + 48;
- if( *pStr > '9' )
- *pStr += 39;
- nHex >>= 4;
- }
- return OString(pStr);
-}
-
-OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc)
-{
- OStringBuffer aBuf;
- const sal_Char* pStr = 0;
- // 0x0b instead of \n, etc because of the replacements in SwWW8AttrIter::GetSnippet()
- switch (c)
- {
- case 0x0b:
- // hard line break
- pStr = OOO_STRING_SVTOOLS_RTF_LINE;
- break;
- case '\t':
- pStr = OOO_STRING_SVTOOLS_RTF_TAB;
- break;
- case '\\':
- case '}':
- case '{':
- aBuf.append('\\');
- aBuf.append((sal_Char)c);
- break;
- case 0xa0:
- // non-breaking space
- pStr = "\\~";
- break;
- case 0x1e:
- // non-breaking hyphen
- pStr = "\\_";
- break;
- case 0x1f:
- // optional hyphen
- pStr = "\\-";
- break;
- default:
- if (c >= ' ' && c <= '~')
- aBuf.append((sal_Char)c);
- else {
- OUString sBuf(&c, 1);
- OString sConverted;
- sBuf.convertToString(&sConverted, eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS);
- const sal_Int32 nLen = sConverted.getLength();
-
- if (pUCMode)
- {
- if (*pUCMode != nLen)
- {
- aBuf.append("\\uc");
- aBuf.append((sal_Int32)nLen);
- // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.
- aBuf.append(' ');
- *pUCMode = nLen;
- }
- aBuf.append("\\u");
- aBuf.append((sal_Int32)c);
- }
-
- for (sal_Int32 nI = 0; nI < nLen; ++nI)
- {
- aBuf.append("\\'");
- aBuf.append(OutHex(sConverted.getStr()[nI], 2));
- }
- }
- }
- if (pStr) {
- aBuf.append(pStr);
- switch (c)
- {
- case 0xa0:
- case 0x1e:
- case 0x1f:
- break;
- default:
- aBuf.append(' ');
- }
- }
- return aBuf.makeStringAndClear();
-}
-
-OString RtfExport::OutString(const String &rStr, rtl_TextEncoding eDestEnc)
-{
- SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rStr = '" << OUString(rStr) << "'");
- OStringBuffer aBuf;
- int nUCMode = 1;
- for (xub_StrLen n = 0; n < rStr.Len(); ++n)
- aBuf.append(OutChar(rStr.GetChar(n), &nUCMode, eDestEnc));
- if (nUCMode != 1) {
- aBuf.append(OOO_STRING_SVTOOLS_RTF_UC);
- aBuf.append((sal_Int32)1);
- aBuf.append(" "); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
- }
- return aBuf.makeStringAndClear();
-}
-
void RtfExport::OutDateTime(const sal_Char* pStr, const util::DateTime& rDT )
{
Strm() << '{' << pStr << OOO_STRING_SVTOOLS_RTF_YR;
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 75feb92..8c0f02e 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -168,9 +168,6 @@ public:
SvStream& OutLong( long nVal );
void OutUnicode(const sal_Char *pToken, const String &rContent);
void OutDateTime(const sal_Char* pStr, const util::DateTime& rDT );
- static rtl::OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc);
- static rtl::OString OutString(const String &rStr, rtl_TextEncoding eDestEnc);
- static rtl::OString OutHex(sal_uLong nHex, sal_uInt8 nLen);
void OutPageDescription( const SwPageDesc& rPgDsc, sal_Bool bWriteReset, sal_Bool bCheckForFirstPage );
sal_uInt16 GetColor( const Color& rColor ) const;
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 5970fb6..c8040e5 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -32,6 +32,7 @@
#include "rtfexportfilter.hxx"
#include <svtools/rtfkeywd.hxx>
+#include <filter/msfilter/rtfutil.hxx>
#include <editeng/editobj.hxx>
#include <svx/svdotext.hxx>
#include <svx/unoapi.hxx>
@@ -475,8 +476,8 @@ sal_Int32 RtfSdrExport::StartShape()
for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); ++i)
lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first.getStr(), (*i).second );
- lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding));
- lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
+ lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", msfilter::rtfutil::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding));
+ lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", msfilter::rtfutil::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
// now check if we have some text
const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
@@ -549,7 +550,7 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
if( !bTxtAtr )
{
String aOut( aStr.Copy( nAktPos, nNextAttr - nAktPos ) );
- m_rAttrOutput.RunText().append( m_rExport.OutString( aOut, eChrSet ) );
+ m_rAttrOutput.RunText().append( msfilter::rtfutil::OutString( aOut, eChrSet ) );
}
m_rAttrOutput.RunText().append('}');
commit 500792fc7bac3f8d1fab92c2c8a8c8cb28ea2abc
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jul 25 15:56:12 2012 +0200
fdo#52240 added M/D date acceptance pattern to locales with M/D/Y edit format
Change-Id: Ic45b89d5cc1238bb58a29ed0e5fe967e23caefd5
diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml
index d765e29..be6a4b1 100644
--- a/i18npool/source/localedata/data/ak_GH.xml
+++ b/i18npool/source/localedata/data/ak_GH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₵-62F]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml
index 7f1ced1..376b0dc 100644
--- a/i18npool/source/localedata/data/ee_GH.xml
+++ b/i18npool/source/localedata/data/ee_GH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₵-637]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ha_GH.xml b/i18npool/source/localedata/data/ha_GH.xml
index 6f46c86..92c3f49 100644
--- a/i18npool/source/localedata/data/ha_GH.xml
+++ b/i18npool/source/localedata/data/ha_GH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₵-8068]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/hil_PH.xml b/i18npool/source/localedata/data/hil_PH.xml
index 21ed475..62de260 100644
--- a/i18npool/source/localedata/data/hil_PH.xml
+++ b/i18npool/source/localedata/data/hil_PH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₱-63D]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ku_TR.xml b/i18npool/source/localedata/data/ku_TR.xml
index ea2fafd..53f19ed 100644
--- a/i18npool/source/localedata/data/ku_TR.xml
+++ b/i18npool/source/localedata/data/ku_TR.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>US</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$TL-626]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ti_ER.xml b/i18npool/source/localedata/data/ti_ER.xml
index bba3059..2b5ff93 100644
--- a/i18npool/source/localedata/data/ti_ER.xml
+++ b/i18npool/source/localedata/data/ti_ER.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>US</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ናቕá‹-873]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
commit ab93f1c9b5d13b24e661a4ef5d801e98459bf9a3
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jul 25 15:53:19 2012 +0200
fdo#52240 added D/M date acceptance pattern to locales with D/M/Y edit format
Change-Id: I6194d6649983e1be075e39ac106b87e4a235b105
diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml
index 9838b9d..7c2649a 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$د.ج.â€-1401]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml
index 7261c19..09ce368 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ج.Ù….â€-C01]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml
index 358446f..a31b967 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ر.ع-2001]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml
index cabb5d4..09c0090 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-64A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/el_GR.xml b/i18npool/source/localedata/data/el_GR.xml
index ad7c3c1..2ed64d4 100644
--- a/i18npool/source/localedata/data/el_GR.xml
+++ b/i18npool/source/localedata/data/el_GR.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml
index 021f08f..c116dc5 100644
--- a/i18npool/source/localedata/data/en_AU.xml
+++ b/i18npool/source/localedata/data/en_AU.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-C09]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml
index c24b733..83773c1 100644
--- a/i18npool/source/localedata/data/en_JM.xml
+++ b/i18npool/source/localedata/data/en_JM.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_AR.xml b/i18npool/source/localedata/data/es_AR.xml
index fb9a1b5..cca8279 100644
--- a/i18npool/source/localedata/data/es_AR.xml
+++ b/i18npool/source/localedata/data/es_AR.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-2C0A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandar</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_BO.xml b/i18npool/source/localedata/data/es_BO.xml
index 4efe920..f4e13b3 100644
--- a/i18npool/source/localedata/data/es_BO.xml
+++ b/i18npool/source/localedata/data/es_BO.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Bs-400A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandar</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_CO.xml b/i18npool/source/localedata/data/es_CO.xml
index 9c2ef15..4817607 100644
--- a/i18npool/source/localedata/data/es_CO.xml
+++ b/i18npool/source/localedata/data/es_CO.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandar</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml
index 7fccdd8..2513623 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -30,6 +30,7 @@
</LC_INFO>
<LC_CTYPE ref="es_ES"/>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/MM/AA</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_DO.xml b/i18npool/source/localedata/data/es_DO.xml
index ddfa14d..cd3fa86 100644
--- a/i18npool/source/localedata/data/es_DO.xml
+++ b/i18npool/source/localedata/data/es_DO.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$RD$-1C0A] ">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/MM/AA</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_EC.xml b/i18npool/source/localedata/data/es_EC.xml
index 57d5133..98927d4 100644
--- a/i18npool/source/localedata/data/es_EC.xml
+++ b/i18npool/source/localedata/data/es_EC.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandar</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_GT.xml b/i18npool/source/localedata/data/es_GT.xml
index 0a12556..6106237 100644
--- a/i18npool/source/localedata/data/es_GT.xml
+++ b/i18npool/source/localedata/data/es_GT.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Q-100A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/MM/AA</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml
index 3127588..2f75eb7 100644
--- a/i18npool/source/localedata/data/es_PE.xml
+++ b/i18npool/source/localedata/data/es_PE.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$S/-280A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/MM/AA</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/fur_IT.xml b/i18npool/source/localedata/data/fur_IT.xml
index 5e3aaf8..71fb6f9 100644
--- a/i18npool/source/localedata/data/fur_IT.xml
+++ b/i18npool/source/localedata/data/fur_IT.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-631]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/gl_ES.xml b/i18npool/source/localedata/data/gl_ES.xml
index df19c00..01fe4bd 100644
--- a/i18npool/source/localedata/data/gl_ES.xml
+++ b/i18npool/source/localedata/data/gl_ES.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₧-456]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/gug_PY.xml b/i18npool/source/localedata/data/gug_PY.xml
index d4ead82..51723ff 100644
--- a/i18npool/source/localedata/data/gug_PY.xml
+++ b/i18npool/source/localedata/data/gug_PY.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Gs-474]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml
index 6c3eb3d..378b489 100644
--- a/i18npool/source/localedata/data/he_IL.xml
+++ b/i18npool/source/localedata/data/he_IL.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/M/YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ht_HT.xml b/i18npool/source/localedata/data/ht_HT.xml
index 79afbe6..acd8a53 100644
--- a/i18npool/source/localedata/data/ht_HT.xml
+++ b/i18npool/source/localedata/data/ht_HT.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$G-65A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/hy_AM.xml b/i18npool/source/localedata/data/hy_AM.xml
index 7a5da4f..50cd7b4 100644
--- a/i18npool/source/localedata/data/hy_AM.xml
+++ b/i18npool/source/localedata/data/hy_AM.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ia.xml b/i18npool/source/localedata/data/ia.xml
index 9581f7a..4207231 100644
--- a/i18npool/source/localedata/data/ia.xml
+++ b/i18npool/source/localedata/data/ia.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-612]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>DD/MM/YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/id_ID.xml b/i18npool/source/localedata/data/id_ID.xml
index f133f59..0031ea6 100644
--- a/i18npool/source/localedata/data/id_ID.xml
+++ b/i18npool/source/localedata/data/id_ID.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/jbo.xml b/i18npool/source/localedata/data/jbo.xml
index 1927f36..3b6e9fe 100644
--- a/i18npool/source/localedata/data/jbo.xml
+++ b/i18npool/source/localedata/data/jbo.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-658]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ka_GE.xml b/i18npool/source/localedata/data/ka_GE.xml
index 5a0f0bb..84bacfc 100644
--- a/i18npool/source/localedata/data/ka_GE.xml
+++ b/i18npool/source/localedata/data/ka_GE.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml
index a8839b2..898098c 100644
--- a/i18npool/source/localedata/data/km_KH.xml
+++ b/i18npool/source/localedata/data/km_KH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$៛-453]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/la_VA.xml b/i18npool/source/localedata/data/la_VA.xml
index f03ba27..bc96673 100644
--- a/i18npool/source/localedata/data/la_VA.xml
+++ b/i18npool/source/localedata/data/la_VA.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml
index 546c282..f8da3f4 100644
--- a/i18npool/source/localedata/data/lo_LA.xml
+++ b/i18npool/source/localedata/data/lo_LA.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$â‚-454]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/mt_MT.xml b/i18npool/source/localedata/data/mt_MT.xml
index b7fb50d..299ac1b 100644
--- a/i18npool/source/localedata/data/mt_MT.xml
+++ b/i18npool/source/localedata/data/mt_MT.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-043A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/my_MM.xml b/i18npool/source/localedata/data/my_MM.xml
index 0b1fdd2..cbe0687 100644
--- a/i18npool/source/localedata/data/my_MM.xml
+++ b/i18npool/source/localedata/data/my_MM.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>US</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ကျပ်-455]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>[NatNum1]General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/om_ET.xml b/i18npool/source/localedata/data/om_ET.xml
index e5a093f..8b41fd5 100644
--- a/i18npool/source/localedata/data/om_ET.xml
+++ b/i18npool/source/localedata/data/om_ET.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Qar-0472]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/or_IN.xml b/i18npool/source/localedata/data/or_IN.xml
index bb5e031..57a67bc 100644
--- a/i18npool/source/localedata/data/or_IN.xml
+++ b/i18npool/source/localedata/data/or_IN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₹-448]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/pjt_AU.xml b/i18npool/source/localedata/data/pjt_AU.xml
index aa3e457..b81ab61 100644
--- a/i18npool/source/localedata/data/pjt_AU.xml
+++ b/i18npool/source/localedata/data/pjt_AU.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-66B]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/rue_SK.xml b/i18npool/source/localedata/data/rue_SK.xml
index 89441a8..f6bf49b 100644
--- a/i18npool/source/localedata/data/rue_SK.xml
+++ b/i18npool/source/localedata/data/rue_SK.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-8256]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/rw_RW.xml b/i18npool/source/localedata/data/rw_RW.xml
index 301feb8..700746b 100644
--- a/i18npool/source/localedata/data/rw_RW.xml
+++ b/i18npool/source/localedata/data/rw_RW.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/MM/YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/sc_IT.xml b/i18npool/source/localedata/data/sc_IT.xml
index e4ce36c..328b196 100644
--- a/i18npool/source/localedata/data/sc_IT.xml
+++ b/i18npool/source/localedata/data/sc_IT.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-627]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/sg_CF.xml b/i18npool/source/localedata/data/sg_CF.xml
index e28ad90..6108722 100644
--- a/i18npool/source/localedata/data/sg_CF.xml
+++ b/i18npool/source/localedata/data/sg_CF.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$CFA-63A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/so_SO.xml b/i18npool/source/localedata/data/so_SO.xml
index 8fda62d..8a4fd49 100644
--- a/i18npool/source/localedata/data/so_SO.xml
+++ b/i18npool/source/localedata/data/so_SO.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Ssh-477]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/sw_TZ.xml b/i18npool/source/localedata/data/sw_TZ.xml
index a5078e2..87db679 100644
--- a/i18npool/source/localedata/data/sw_TZ.xml
+++ b/i18npool/source/localedata/data/sw_TZ.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$TSh-8041]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/th_TH.xml b/i18npool/source/localedata/data/th_TH.xml
index 4e8e635..d7f71da 100644
--- a/i18npool/source/localedata/data/th_TH.xml
+++ b/i18npool/source/localedata/data/th_TH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>[~buddhist]D/M/YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/tpi_PG.xml b/i18npool/source/localedata/data/tpi_PG.xml
index d9685a8..63009fe 100644
--- a/i18npool/source/localedata/data/tpi_PG.xml
+++ b/i18npool/source/localedata/data/tpi_PG.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$K-647]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/uk_UA.xml b/i18npool/source/localedata/data/uk_UA.xml
index 5e88879..6b6951b 100644
--- a/i18npool/source/localedata/data/uk_UA.xml
+++ b/i18npool/source/localedata/data/uk_UA.xml
@@ -55,6 +55,7 @@
<MeasurementSystem>Metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>D/M/YY</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ur_PK.xml b/i18npool/source/localedata/data/ur_PK.xml
index 899c971..94b1633 100644
--- a/i18npool/source/localedata/data/ur_PK.xml
+++ b/i18npool/source/localedata/data/ur_PK.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₨-420]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/vi_VN.xml b/i18npool/source/localedata/data/vi_VN.xml
index 6b28281..5410363 100644
--- a/i18npool/source/localedata/data/vi_VN.xml
+++ b/i18npool/source/localedata/data/vi_VN.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$â‚«-42A]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/wa_BE.xml b/i18npool/source/localedata/data/wa_BE.xml
index 2b44299..bfe36d7 100644
--- a/i18npool/source/localedata/data/wa_BE.xml
+++ b/i18npool/source/localedata/data/wa_BE.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$FB-633]">
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml
index 1fb2d11..94d447e 100644
--- a/i18npool/source/localedata/data/zh_HK.xml
+++ b/i18npool/source/localedata/data/zh_HK.xml
@@ -30,6 +30,7 @@
</LC_INFO>
<LC_CTYPE ref="zh_TW"/>
<LC_FORMAT>
+ <DateAcceptancePattern>D/M</DateAcceptancePattern>
<!-- Fixed number formats. Index range is 0 - 5. -->
<FormatElement msgid="NumberFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
commit 9be2cba7c15493657a0aa2d9fc9fa273bb592e82
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jul 25 15:35:11 2012 +0200
fdo#52240 added M/D date acceptance pattern to locales with Y/M/D edit format
Change-Id: I6648adb99f2d67d24951d72b9fc13628d42dec51
diff --git a/i18npool/source/localedata/data/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml
index 07138a1..aa24bc2 100644
--- a/i18npool/source/localedata/data/fa_IR.xml
+++ b/i18npool/source/localedata/data/fa_IR.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ï·¼-429]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>عادی</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ne_NP.xml b/i18npool/source/localedata/data/ne_NP.xml
index 5986390..89e4c68 100644
--- a/i18npool/source/localedata/data/ne_NP.xml
+++ b/i18npool/source/localedata/data/ne_NP.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$रू-461]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
commit 17208c0a47daefb815fc5d9438b82acc22d7367b
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jul 25 15:21:07 2012 +0200
fdo#52240 added M/D date acceptance pattern to locales with Y/M/D edit format
Change-Id: I2c4d752677eeaa210242f37a54ecd20cb5703bb7
diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml
index 3b48682..d55fd54 100644
--- a/i18npool/source/localedata/data/en_GH.xml
+++ b/i18npool/source/localedata/data/en_GH.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₵-8409]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml
index 5271dee..ec1cee8 100644
--- a/i18npool/source/localedata/data/en_NA.xml
+++ b/i18npool/source/localedata/data/en_NA.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-8009]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml
index 5a829b3..7851841 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ b/i18npool/source/localedata/data/en_ZA.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$R-1C09]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/eu.xml b/i18npool/source/localedata/data/eu.xml
index f86d4ec..9ae85ec 100644
--- a/i18npool/source/localedata/data/eu.xml
+++ b/i18npool/source/localedata/data/eu.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₧-42D]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Estandarra</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/haw_US.xml b/i18npool/source/localedata/data/haw_US.xml
index 90a5021..8f43c53 100644
--- a/i18npool/source/localedata/data/haw_US.xml
+++ b/i18npool/source/localedata/data/haw_US.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-475]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml
index fba9a62..0c840fe 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT>
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="NumberFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/lg_UG.xml b/i18npool/source/localedata/data/lg_UG.xml
index 0b72e67..5a88539 100644
--- a/i18npool/source/localedata/data/lg_UG.xml
+++ b/i18npool/source/localedata/data/lg_UG.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$USh-63B]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/lif_NP.xml b/i18npool/source/localedata/data/lif_NP.xml
index 9be521a..7e42359 100644
--- a/i18npool/source/localedata/data/lif_NP.xml
+++ b/i18npool/source/localedata/data/lif_NP.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$रू-657]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/myv_RU.xml b/i18npool/source/localedata/data/myv_RU.xml
index 6e2f725..d6732cc 100644
--- a/i18npool/source/localedata/data/myv_RU.xml
+++ b/i18npool/source/localedata/data/myv_RU.xml
@@ -52,6 +52,7 @@
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$цел-66C]">
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
</FormatElement>
diff --git a/i18npool/source/localedata/data/zh_SG.xml b/i18npool/source/localedata/data/zh_SG.xml
index a8a0301..bfb1c84 100644
--- a/i18npool/source/localedata/data/zh_SG.xml
+++ b/i18npool/source/localedata/data/zh_SG.xml
@@ -30,6 +30,7 @@
</LC_INFO>
<LC_CTYPE ref="zh_CN"/>
<LC_FORMAT>
+ <DateAcceptancePattern>M/D</DateAcceptancePattern>
<!-- Fixed number formats. Index range is 0-5. -->
<FormatElement msgid="NumberFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
commit c69fad095f0e08114216505fffa4e33ab65ae4d5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 16:21:05 2012 +0200
sorted_vector: MSVC doesn't know which erase to call
Change-Id: Ib81388db2f93db662bb5439565f311835b08073e
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b2923f8..b770c8c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1540,7 +1540,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
if( !lcl_FindInArray(rArrays.aDoubleCapsStrings, *pString))
{
delete (*pWrdList)[ i ];
- pWrdList->erase( pWrdList->begin() + i );
+ pWrdList->erase(i);
}
}
@@ -1565,7 +1565,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
if( !lcl_FindInArray(rArrays.aAbbrevStrings, *pString))
{
delete (*pCplList)[ i ];
- pCplList->erase( pCplList->begin() + i );
+ pCplList->erase(i);
}
}
@@ -1594,7 +1594,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
if( USHRT_MAX == aDoubleCapsLB.GetEntryPos(*pString) )
{
delete (*pWrdList)[ i ];
- pWrdList->erase( pWrdList->begin() + i );
+ pWrdList->erase(i);
}
}
nCount = aDoubleCapsLB.GetEntryCount();
@@ -1619,7 +1619,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
if( USHRT_MAX == aAbbrevLB.GetEntryPos(*pString) )
{
delete (*pCplList)[ i ];
- pCplList->erase( pCplList->begin() + i );
+ pCplList->erase(i);
}
}
nCount = aAbbrevLB.GetEntryCount();
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index bf1cca5..48ad0bc 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -68,11 +68,6 @@ public:
}
// hack: public erase with const_iterator, should not change sort order
- void erase(const_iterator const& position)
- {
- base_t::erase(begin_nonconst() + (position - begin()));
- }
-
void erase(const_iterator const& first, const_iterator const& last)
{
base_t::erase(begin_nonconst() + (first - begin()),
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 20a43ad..f7ff984 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -320,7 +320,7 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
m_WordList.find(aLRULst[ nLRUIndex++ ]);
OSL_ENSURE( m_WordList.end() != it, "String not found" );
editeng::IAutoCompleteString *const pDel = *it;
- m_WordList.erase(it);
+ m_WordList.erase(it - m_WordList.begin());
delete pDel;
}
aLRULst.erase( aLRULst.begin() + nNewMax - 1, aLRULst.end() );
@@ -383,7 +383,6 @@ void SwAutoCompleteWord::CheckChangedList(
SwAutoCompleteString *const pDel =
dynamic_cast<SwAutoCompleteString*>(m_WordList[nMyPos]);
m_WordList.erase(nMyPos);
-
SwAutoCompleteStringPtrDeque::iterator it = std::find( aLRULst.begin(), aLRULst.end(), pDel );
OSL_ENSURE( aLRULst.end() != it, "String not found" );
aLRULst.erase( it );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index a8ae938..6f1fdf6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2191,7 +2191,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld )
if( &rFld == (*pFldSortLst)[ n ]->GetPointer() )
{
delete (*pFldSortLst)[n];
- pFldSortLst->erase( pFldSortLst->begin() + n );
+ pFldSortLst->erase(n);
n--; // one field can occur multiple times
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index d8d53e5..400fe2d 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1226,7 +1226,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
{
// loesche die Gliederungs-Indizies.
- pOutlineNds->erase( pOutlineNds->begin() + nIdxPos );
+ pOutlineNds->erase(nIdxPos);
bUpdateOutline = sal_True;
}
pTxtNode->InvalidateNumRule();
@@ -1528,7 +1528,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
sal_uInt16 nIdxPos;
if( pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
{
- pOutlineNds->erase( pOutlineNds->begin() + nIdxPos );
+ pOutlineNds->erase(nIdxPos);
bUpdateNum = 1;
}
}
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 5485b11..30eb909 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -212,7 +212,7 @@ void SwInputFieldList::RemoveUnselectedFlds()
{
// Feld innerhalb der Selektion
pNewLst->insert( (*pSrtLst)[i] );
- pSrtLst->erase( pSrtLst->begin() + i );
+ pSrtLst->erase(i);
}
else
i++;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 066f732..d75dc52 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -401,7 +401,7 @@ sal_Bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, xub_StrLen nCntntIdx, sal_uI
// Erst entfernen ist wichtig, weil in tieferen
// Rekursionen evtl. weitere Eintraege oder das
// ganze Array geloscht werden koennte.
- pHTMLPosFlyFrms->erase( pHTMLPosFlyFrms->begin() + i );
+ pHTMLPosFlyFrms->erase(i);
i--;
if( pHTMLPosFlyFrms->empty() )
{
commit 2f41be8d0a0d0a9616de34fd4682273cd31928f8
Author: Uray M. János <uray.janos at gmail.com>
Date: Wed Jul 25 09:42:12 2012 +0200
fdo#40152 replace with empty string in Basic IDE
Change-Id: I2ee41160e5cb10694ccdb5a1cdaf7d4abfeb23bb
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list