Skip to content

Commit

Permalink
miscellaneous fixes / repo cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
j-dimension committed Oct 16, 2023
1 parent dd21ac3 commit 63872af
Show file tree
Hide file tree
Showing 7 changed files with 774 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,9 @@
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-emptyline-run.docx
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-scripts-run.odt
/j-lawyer-server/j-lawyer-server-ejb/test/data/template-scripts-run.docx
/j-lawyer-client/ksspt.jpg
/j-lawyer-client/ks.jpg.prd2
/j-lawyer-server/j-lawyer-server-ejb/src/java/org.docx
/j-lawyer-server/j-lawyer-server-ejb/src/java/body.docx
/j-lawyer-server/j-lawyer-server-ejb/src/java/header.docx
/j-lawyer-fax/test/org/jlawyer/tests/test.pdf
Binary file modified j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion j-lawyer-client/nbproject/configs/with-login.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
run.jvmargs=-Djava.net.preferIPv4Stack=true -Dswing.aatext=true -Dmail.imap.connectionpoolsize=2 -Dmail.imaps.connectionpoolsize=2 -Duser.language=de -Djavax.net.ssl.keyStore=ks.jpg
run.jvmargs=-Djava.net.preferIPv4Stack=true -Dswing.aatext=true -Dmail.imap.connectionpoolsize=2 -Dmail.imaps.connectionpoolsize=2 -Duser.language=de -Djavax.net.ssl.keyStore=ksspt.jpg
Binary file modified j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar
Binary file not shown.
Binary file modified j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar
Binary file not shown.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,24 @@ private static void mergeImage(org.odftoolkit.odfdom.dom.element.draw.DrawImageE

((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setTextAnchorTypeAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getTextAnchorTypeAttribute());

// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawCopyOfAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawCopyOfAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawIdAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawIdAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawLayerAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawLayerAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawNameAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawNameAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawStyleNameAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawStyleNameAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawTextStyleNameAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawTextStyleNameAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawTransformAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawTransformAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setDrawZIndexAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getDrawZIndexAttribute());
//
//// problematisch
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setStyleName(((OdfDrawFrame)drawImageElement.getParentNode()).getStyleName());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setStyleRelHeightAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getStyleRelHeightAttribute());
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setStyleRelWidthAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getStyleRelWidthAttribute());
//// problematisch Ende
//
// ((OdfDrawFrame)newImage.getOdfElement().getParentNode()).setTextAnchorPageNumberAttribute(((OdfDrawFrame)drawImageElement.getParentNode()).getTextAnchorPageNumberAttribute());

//newImage.getRectangle().setX(((OdfDrawFrame)drawImageElement.getParentNode()).get);

// newImage.getRectangle().setHeight(((DrawFrameElement)drawImageElement.getParentNode()).get;
//
Expand Down

0 comments on commit 63872af

Please sign in to comment.