include/tools/wintypes.hxx | 1 - vcl/source/filter/wmf/wmf.cxx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit 7462288deca02b8a9054ff657bad970246c352fa Author: Andrea Gelmini <andrea.gelm...@gelma.net> Date: Mon Aug 21 22:18:52 2017 +0200 WB_STDTABDIALOG no more used Since commit 6df2c90c08b6 Change-Id: I2862e7c415b9f0d0d1ca2ea1a07e416222d81fd9 Reviewed-on: https://gerrit.libreoffice.org/41405 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index a6b3826698fa..5e2e6b5cf8c7 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -241,7 +241,6 @@ WinBits const WB_STDFLOATWIN = WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE WinBits const WB_STDDIALOG = WB_MOVEABLE | WB_CLOSEABLE; WinBits const WB_STDMODELESS = WB_STDDIALOG; WinBits const WB_STDMODAL = WB_STDDIALOG; -WinBits const WB_STDTABDIALOG = WB_STDDIALOG; WinBits const WB_STDTABCONTROL = 0; WinBits const WB_STDPOPUP = WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL; commit ad6756527cd1272523536ec41f3a6cb74b7b673f Author: Andrea Gelmini <andrea.gelm...@gelma.net> Date: Mon Aug 21 22:06:22 2017 +0200 Fix typo Change-Id: Ife6c317187915ba8df0351b7b96d481345343df6 Reviewed-on: https://gerrit.libreoffice.org/41404 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index ac56c74810f4..4bc8d11a6a01 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -25,7 +25,7 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF ) { - // tdf#111484 Use new method to import Metafile. Take curent StreamPos + // tdf#111484 Use new method to import Metafile. Take current StreamPos // into account (used by SwWW8ImplReader::ReadGrafFile and by // SwWw6ReadMetaStream, so do *not* ignore. OTOH XclImpDrawing::ReadWmf // is nice enough to copy to an own MemStream to avoid that indirect _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits