Svetlana Kulikova 65d6644841 Merge remote-tracking branch 'origin/fix/pdf' into develop ...

# Conflicts:
#	DesktopEditor/graphics/pro/js/wasm/js/drawingfile_base.js
#	DesktopEditor/graphics/pro/js/wasm/src/drawingfile.h
#	DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp
#	PdfFile/PdfFile.h
#	PdfFile/PdfReader.cpp
#	PdfFile/PdfReader.h

2023-10-31 12:13:46 +03:00

..

lib

Fix getButtonIcons with base64 image

2023-10-30 13:03:27 +03:00

Resources

[copyright] Update address in Copyright

2023-03-01 23:21:57 +03:00

SrcReader

Merge remote-tracking branch 'origin/fix/pdf' into develop

2023-10-31 12:13:46 +03:00

SrcWriter

Fix DR and develop Actions

2023-10-24 17:58:13 +03:00

test

Widget Edit

2023-10-11 18:25:20 +03:00

OnlineOfficeBinToPdf.cpp

Fix bug #64554

2023-10-10 13:47:57 +03:00

OnlineOfficeBinToPdf.h

Add method for save added annotations

2023-10-05 10:30:03 +03:00

PdfFile.cpp

Fix getButtonIcons with base64 image

2023-10-30 13:03:27 +03:00

PdfFile.h

Fix getButtonIcons with base64 image

2023-10-30 13:03:27 +03:00

PdfFile.pro

Fix merge

2023-09-13 13:17:57 +03:00

PdfReader.cpp

Merge remote-tracking branch 'origin/fix/pdf' into develop

2023-10-31 12:13:46 +03:00

PdfReader.h

Fix getButtonIcons with base64 image

2023-10-30 13:03:27 +03:00

PdfWriter_empty.cpp

Fix empty writer realizaion

2023-09-14 00:59:57 +03:00

PdfWriter.cpp

Fix DR and develop Actions

2023-10-24 17:58:13 +03:00

PdfWriter.h

Fix bug #64554

2023-10-10 13:47:57 +03:00