[PATCH] [PUSHED] more STL work in tools module (6)

Tor Lillqvist tml at iki.fi
Wed Aug 8 01:57:51 PDT 2012


>> Would you mind reviewing the other 5 patches that I posted in the beginning
>> of this thread?

Sorry, they don't seem to all apply cleanly any more:

$ patch --dry-run -p1
</cygdrive/c/tmp/downloads/0001-Convert-HashedEntryList-to-boost-ptr_vector.patch
patching file svtools/source/contnr/fileview.cxx

tml at hemulen /cygdrive/c/ooo/git/master/core
$ patch --dry-run -p1
</cygdrive/c/tmp/downloads/0002-STL-ify-CustomShowList.patch
patching file sd/inc/customshowlist.hxx
patching file sd/inc/drawdoc.hxx
patching file sd/inc/sdabstdlg.hxx
Hunk #2 FAILED at 202.
1 out of 2 hunks FAILED -- saving rejects to file sd/inc/sdabstdlg.hxx.rej
patching file sd/source/core/drawdoc.cxx
patching file sd/source/core/drawdoc3.cxx
patching file sd/source/core/drawdoc_animations.cxx
patching file sd/source/filter/ppt/pptin.cxx
patching file sd/source/ui/dlg/custsdlg.cxx
patching file sd/source/ui/dlg/present.cxx
patching file sd/source/ui/dlg/sddlgfact.cxx
patching file sd/source/ui/dlg/sddlgfact.hxx
Hunk #1 FAILED at 275.
1 out of 1 hunk FAILED -- saving rejects to file
sd/source/ui/dlg/sddlgfact.hxx.rej
patching file sd/source/ui/dlg/sdtreelb.cxx
patching file sd/source/ui/func/fusldlg.cxx
patching file sd/source/ui/inc/custsdlg.hxx
patching file sd/source/ui/inc/present.hxx
patching file sd/source/ui/slideshow/slideshow.cxx
patching file sd/source/ui/slideshow/slideshowimpl.cxx
patching file sd/source/ui/unoidl/unocpres.cxx
patching file sd/source/ui/unoidl/unocpres.hxx

tml at hemulen /cygdrive/c/ooo/git/master/core
$ patch --dry-run -p1
</cygdrive/c/tmp/downloads/0003-Expand-the-only-use-of-the-SV_DECL_IMPL_REF_LIST-mac.patch
patching file cui/source/dialogs/linkdlg.cxx
patching file tools/inc/tools/ref.hxx

tml at hemulen /cygdrive/c/ooo/git/master/core
$ patch --dry-run -p1
</cygdrive/c/tmp/downloads/0004-Convert-SV_DECL_REF_LIST-SvBaseLink-to-std-vector.patch
patching file cui/source/dialogs/linkdlg.cxx
Hunk #1 FAILED at 56.
Hunk #2 succeeded at 441 (offset -1 lines).
1 out of 2 hunks FAILED -- saving rejects to file
cui/source/dialogs/linkdlg.cxx.rej

tml at hemulen /cygdrive/c/ooo/git/master/core
$ patch --dry-run -p1
</cygdrive/c/tmp/downloads/0005-Remove-unused-SV_DECL_REF_LIST-SvRefBase-SvRefBase.patch
patching file tools/inc/tools/ref.hxx
Hunk #1 succeeded at 370 (offset 5 lines).
patching file tools/source/ref/ref.cxx


More information about the LibreOffice mailing list