diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 19 | ||||
| -rw-r--r-- | external/pdfium/inc/pch/precompiled_pdfium.hxx | 14 | ||||
| -rw-r--r-- | include/vcl/pdf/PDFAnnotationSubType.hxx | 3 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
5 files changed, 31 insertions, 15 deletions
diff --git a/download.lst b/download.lst index 48af3c5e9198..5b29fb7046fb 100644 --- a/download.lst +++ b/download.lst @@ -212,8 +212,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz -export PDFIUM_SHA256SUM := cc5e4d8bffa679af181b54c05a63404becfc7d40cc69117b053248f8fe4e485c -export PDFIUM_TARBALL := pdfium-4260.tar.bz2 +export PDFIUM_SHA256SUM := eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8 +export PDFIUM_TARBALL := pdfium-4306.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 4ff465593f23..f08ff51a31a3 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -98,6 +98,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textfield \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_button \ UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textobject \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_privatedata \ )) # fpdfapi @@ -430,7 +431,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/dib/cfx_imagetransformer \ UnpackedTarball/pdfium/core/fxge/dib/cfx_scanlinecompositor \ UnpackedTarball/pdfium/core/fxge/dib/cstretchengine \ - UnpackedTarball/pdfium/core/fxge/dib/fx_dib_main \ + UnpackedTarball/pdfium/core/fxge/dib/fx_dib \ UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitDingbats \ UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixed \ UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedBold \ @@ -493,7 +494,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_impl \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_icon \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_box \ - UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_impl \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cbbutton \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cblistbox \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_ctrl \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_scroll_bar \ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_special_button \ UnpackedTarball/pdfium/core/fxcrt/cfx_timer \ @@ -631,10 +634,14 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/win32/cfx_psrenderer \ UnpackedTarball/pdfium/core/fxge/win32/cpsoutput \ - UnpackedTarball/pdfium/core/fxge/win32/fx_win32_device \ - UnpackedTarball/pdfium/core/fxge/win32/fx_win32_dib \ - UnpackedTarball/pdfium/core/fxge/win32/fx_win32_gdipext \ - UnpackedTarball/pdfium/core/fxge/win32/fx_win32_print \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_device_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_display_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_plus_ext \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cps_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/ctext_only_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cwin32_platform \ + UnpackedTarball/pdfium/core/fxge/cfx_windowsrenderdevice \ UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \ UnpackedTarball/pdfium/third_party/base/win/win_util \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_windowsrenderdevice \ diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx index 0670af0aa0e2..cc82c4555e3a 100644 --- a/external/pdfium/inc/pch/precompiled_pdfium.hxx +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -364,9 +364,9 @@ #include <core/fxge/dib/cfx_imagetransformer.h> #include <core/fxge/dib/cfx_scanlinecompositor.h> #include <core/fxge/dib/cstretchengine.h> +#include <core/fxge/dib/fx_dib.h> #include <core/fxge/dib/scanlinecomposer_iface.h> #include <core/fxge/fontdata/chromefontdata/chromefontdata.h> -#include <core/fxge/fx_dib.h> #include <core/fxge/fx_font.h> #include <core/fxge/fx_freetype.h> #include <core/fxge/renderdevicedriver_iface.h> @@ -399,6 +399,7 @@ #include <fpdfsdk/formfiller/cffl_formfiller.h> #include <fpdfsdk/formfiller/cffl_interactiveformfiller.h> #include <fpdfsdk/formfiller/cffl_listbox.h> +#include <fpdfsdk/formfiller/cffl_privatedata.h> #include <fpdfsdk/formfiller/cffl_pushbutton.h> #include <fpdfsdk/formfiller/cffl_radiobutton.h> #include <fpdfsdk/formfiller/cffl_textfield.h> @@ -406,16 +407,19 @@ #include <fpdfsdk/ipdfsdk_annothandler.h> #include <fpdfsdk/pwl/cpwl_button.h> #include <fpdfsdk/pwl/cpwl_caret.h> +#include <fpdfsdk/pwl/cpwl_cbbutton.h> +#include <fpdfsdk/pwl/cpwl_cblistbox.h> #include <fpdfsdk/pwl/cpwl_combo_box.h> #include <fpdfsdk/pwl/cpwl_edit.h> #include <fpdfsdk/pwl/cpwl_edit_ctrl.h> #include <fpdfsdk/pwl/cpwl_edit_impl.h> #include <fpdfsdk/pwl/cpwl_icon.h> #include <fpdfsdk/pwl/cpwl_list_box.h> -#include <fpdfsdk/pwl/cpwl_list_impl.h> +#include <fpdfsdk/pwl/cpwl_list_ctrl.h> #include <fpdfsdk/pwl/cpwl_scroll_bar.h> #include <fpdfsdk/pwl/cpwl_special_button.h> #include <fpdfsdk/pwl/cpwl_wnd.h> +#include <fpdfsdk/pwl/ipwl_fillernotify.h> #include <fpdfsdk/pwl/ipwl_systemhandler.h> #include <fxjs/cjs_event_context_stub.h> #include <fxjs/cjs_runtimestub.h> @@ -440,6 +444,7 @@ #include <public/fpdf_text.h> #include <public/fpdf_transformpage.h> #include <public/fpdfview.h> +#include <third_party/agg23/agg_clip_liang_barsky.h> #include <third_party/agg23/agg_conv_dash.h> #include <third_party/agg23/agg_conv_stroke.h> #include <third_party/agg23/agg_curves.h> @@ -454,6 +459,7 @@ #include <third_party/base/allocator/partition_allocator/page_allocator.h> #include <third_party/base/allocator/partition_allocator/page_allocator_internal.h> #include <third_party/base/allocator/partition_allocator/partition_alloc.h> +#include <third_party/base/allocator/partition_allocator/partition_alloc_check.h> #include <third_party/base/allocator/partition_allocator/partition_alloc_constants.h> #include <third_party/base/allocator/partition_allocator/partition_bucket.h> #include <third_party/base/allocator/partition_allocator/partition_direct_map_extent.h> @@ -463,12 +469,14 @@ #include <third_party/base/allocator/partition_allocator/random.h> #include <third_party/base/allocator/partition_allocator/spin_lock.h> #include <third_party/base/bits.h> +#include <third_party/base/check.h> +#include <third_party/base/check_op.h> #include <third_party/base/compiler_specific.h> #include <third_party/base/containers/adapters.h> #include <third_party/base/debug/alias.h> -#include <third_party/base/logging.h> #include <third_party/base/memory/aligned_memory.h> #include <third_party/base/no_destructor.h> +#include <third_party/base/notreached.h> #include <third_party/base/numerics/safe_conversions.h> #include <third_party/base/numerics/safe_math.h> #include <third_party/base/optional.h> diff --git a/include/vcl/pdf/PDFAnnotationSubType.hxx b/include/vcl/pdf/PDFAnnotationSubType.hxx index bee1d82cd399..749100e36348 100644 --- a/include/vcl/pdf/PDFAnnotationSubType.hxx +++ b/include/vcl/pdf/PDFAnnotationSubType.hxx @@ -41,7 +41,8 @@ enum class PDFAnnotationSubType Watermark = 24, Threed = 25, Richmedia = 26, - XFAWidget = 27 + XFAWidget = 27, + Redact = 28 }; } // namespace vcl::pdf diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 40cb129b8490..c0d7eac66335 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -75,10 +75,10 @@ "type": "shell" }, { - "url": "https://dev-www.libreoffice.org/src/pdfium-4260.tar.bz2", - "sha256": "cc5e4d8bffa679af181b54c05a63404becfc7d40cc69117b053248f8fe4e485c", + "url": "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2", + "sha256": "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8", "type": "file", - "dest-filename": "external/tarballs/pdfium-4260.tar.bz2" + "dest-filename": "external/tarballs/pdfium-4306.tar.bz2" }, { "url": "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz", |