Undoing previously manual adoption of OdfPackage.java after code generation due to missing - now added encryptionDataElement.newKeyDerivationElement(..) constructors

Author: svanteschubert

odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java

@@ -1984,9 +1984,7 @@ private byte[] encryptData(byte[] data, OdfFileEntry fileEntry) {
       if (keyDerivationElement != null) {
         encryptionDataElement.removeChild(keyDerivationElement);
       }
-      keyDerivationElement = encryptionDataElement.newKeyDerivationElement("PBKDF2");
-      keyDerivationElement.setIterationCountAttribute(1024);
-      keyDerivationElement.setSaltAttribute(saltStr);
+      keyDerivationElement = encryptionDataElement.newKeyDerivationElement(1024, "PBKDF2", saltStr);
 
       StartKeyGenerationElement startKeyGenerationElement =
           OdfElement.findFirstChildNode(StartKeyGenerationElement.class, encryptionDataElement);