From 5db9e728f5033b0281b1a8c7e6788dfa577b0c4f Mon Sep 17 00:00:00 2001 From: Emina Ahmetovic Date: Thu, 30 Jul 2020 19:33:51 +0200 Subject: rename signature profile --- pdf-as-lib/src/configuration/cfg/config.properties | 2 +- .../src/configuration/cfg/profiles/BASE_LOGO | 26 --------------------- .../cfg/profiles/BASE_LOGO.properties | 26 +++++++++++++++++++++ pdf-as-lib/src/main/resources/config/config.zip | Bin 1276718 -> 1277230 bytes .../lib/impl/pdfbox2/positioning/Positioning.java | 5 ++-- 5 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO create mode 100644 pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO.properties diff --git a/pdf-as-lib/src/configuration/cfg/config.properties b/pdf-as-lib/src/configuration/cfg/config.properties index 42193ec5..ff9df42f 100644 --- a/pdf-as-lib/src/configuration/cfg/config.properties +++ b/pdf-as-lib/src/configuration/cfg/config.properties @@ -71,7 +71,7 @@ include.advancedconfig = advancedconfig.properties # Standard-Profile include.01 = profiles/*.properties -#include.01 = profiles/INVISIBLE.properties +#include.02 = profiles/BASE_LOGO.properties #include.02 = profiles/SIGNATURBLOCK_DE.properties #include.03 = profiles/SIGNATURBLOCK_DE_NOTE.properties #include.04 = profiles/SIGNATURBLOCK_DE_PDFA.properties diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO b/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO deleted file mode 100644 index 4d15488d..00000000 --- a/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################################### -# PROFIL: Signature block with logo - -sig_obj.types.BASE_LOGO=on - -sig_obj.BASE_LOGO.description= Signature block with logo -sig_obj.BASE_LOGO.key.SIG_META=Pr\u00fcfinformation - -sig_obj.BASE_LOGO.pos=w:230.0;f:80 -sig_obj.BASE_LOGO.adobeSignFieldValue=PDF-AS Signatur -sig_obj.BASE_LOGO.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at -sig_obj.BASE_LOGO.verifyURL=http://www.signaturpruefung.gv.at - -sig_obj.BASE_LOGO.value.SIG_LABEL=./images/signatur-logo_de.png -sig_obj.BASE_LOGO.table.main.Style.imagescaletofit=65.0;65.0 - -# WAI -sig_obj.BASE_LOGO.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke. - -#---------------------- MAIN TABLE ------------------------- -sig_obj.BASE_LOGO.table.main.1=SIG_LABEL-i - -sig_obj.BASE_LOGO.table.main.Style.bgcolor=255 255 255 -sig_obj.BASE_LOGO.table.main.Style.border=0 -sig_obj.BASE_LOGO.table.main.Style.halign=center -sig_obj.BASE_LOGO.table.main.Style.valign=middle diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO.properties new file mode 100644 index 00000000..4d15488d --- /dev/null +++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_LOGO.properties @@ -0,0 +1,26 @@ +################################################################################################### +# PROFIL: Signature block with logo + +sig_obj.types.BASE_LOGO=on + +sig_obj.BASE_LOGO.description= Signature block with logo +sig_obj.BASE_LOGO.key.SIG_META=Pr\u00fcfinformation + +sig_obj.BASE_LOGO.pos=w:230.0;f:80 +sig_obj.BASE_LOGO.adobeSignFieldValue=PDF-AS Signatur +sig_obj.BASE_LOGO.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at +sig_obj.BASE_LOGO.verifyURL=http://www.signaturpruefung.gv.at + +sig_obj.BASE_LOGO.value.SIG_LABEL=./images/signatur-logo_de.png +sig_obj.BASE_LOGO.table.main.Style.imagescaletofit=65.0;65.0 + +# WAI +sig_obj.BASE_LOGO.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke. + +#---------------------- MAIN TABLE ------------------------- +sig_obj.BASE_LOGO.table.main.1=SIG_LABEL-i + +sig_obj.BASE_LOGO.table.main.Style.bgcolor=255 255 255 +sig_obj.BASE_LOGO.table.main.Style.border=0 +sig_obj.BASE_LOGO.table.main.Style.halign=center +sig_obj.BASE_LOGO.table.main.Style.valign=middle diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip index 865662e7..666b61a6 100644 Binary files a/pdf-as-lib/src/main/resources/config/config.zip and b/pdf-as-lib/src/main/resources/config/config.zip differ diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/positioning/Positioning.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/positioning/Positioning.java index 8aaa51ac..52a865b1 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/positioning/Positioning.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/positioning/Positioning.java @@ -162,7 +162,7 @@ public class Positioning { public static PositioningInstruction adjustSignatureTableandCalculatePosition( final PDDocument pdfDataSource, IPDFVisualObject pdf_table, TablePos pos, ISettings settings) throws PdfAsException { - List pdSignatureFieldList = new ArrayList<>(); + List pdSignatureFieldList; PdfBoxUtils.checkPDFPermissions(pdfDataSource); int counter = 0; @@ -326,8 +326,9 @@ public class Positioning { // we do have text take SIGNATURE_MARGIN pos_y = page_height - page_length - SIGNATURE_MARGIN_VERTICAL; if (pos_y - footer_line <= table_height) { - if(counter!=0) + if(counter!=0){ make_new_page = false; + } else{ make_new_page = true; page++; -- cgit v1.2.3