Merge branch 'master' into GxPropertiesFix

Author: claudiamurialdo

android/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxandroid</artifactId>

android/src/main/java/com/genexus/specific/android/Connect.java

@@ -31,6 +31,10 @@ public static void init()
 		SpecificImplementation.NativeFunctions = new NativeFunctions();
 		SpecificImplementation.PictureFormatter = new PictureFormatter();
 		SpecificImplementation.Algorithms = new CryptoAlghorithms();
+		// connect GXSilentTrn
+		SpecificImplementation.GXSilentTrnSdt = new GXSilentTrnSdt();
+		SpecificImplementation.SdtMessages_Message = new SdtMessages_Message();
+
 		SpecificImplementation.KeepDecimals = true;
 		SpecificImplementation.MillisecondMask = "SSS";
 		SpecificImplementation.SupportPending = true;

android/src/main/java/com/genexus/specific/android/GxSilentTrnSdt.java renamed to android/src/main/java/com/genexus/specific/android/GXSilentTrnSdt.java

@@ -5,7 +5,7 @@
 import com.genexus.common.interfaces.IExtensionGXSilentTrnSdt;
 import com.genexus.common.interfaces.IPendingEventHelper;
 
-public class GxSilentTrnSdt implements IExtensionGXSilentTrnSdt {
+public class GXSilentTrnSdt implements IExtensionGXSilentTrnSdt {
 
 	@Override
 	public IPendingEventHelper CreatePendingEventHelper() {

androidreports/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxandroidreports</artifactId>

androidreports/src/main/java/com/genexus/reports/PDFReportItext.java

@@ -1717,32 +1717,13 @@ else if(output.equalsIgnoreCase("PRN"))
             //System.err.println("Invalid page Margin... Resetting to defaults");
         //}
 
-		//com.itextpdf.text.Rectangle pageSize2 = computePageSize(leftMargin, topMargin, pageWidth, pageLength-4000, props.getBooleanGeneralProperty(Const.MARGINS_INSIDE_BORDER, false));
-		
-		this.pageSize = computePageSize(leftMargin, topMargin, pageWidth, pageLength-4000, props.getBooleanGeneralProperty(Const.MARGINS_INSIDE_BORDER, false));
-	    
+
 		document = new Document(this.pageSize,0,0,0,0);
+
         init();
 
         //if(DEBUG)DEBUG_STREAM.println("GxPrintInit ---> Size:" + this.pageSize + " Orientation: " + (pageOrientation == PDFPage.PORTRAIT ? "Portrait" : "Landscape"));
 
-        // INIT AGAIN :
-        // Close de docuemnte
-        GxEndDocument();
-        
-        // create a new document to draw
-        try
-        {
-            setOutputStream(new FileOutputStream(docName));
-        }catch(IOException accessError)
-        { // Si no se puede generar el archivo, muestro el stackTrace y seteo el stream como NullOutputStream
-            accessError.printStackTrace(System.err);
-            outputStream = new com.genexus.util.NullOutputStream();
-            outputType = Const.OUTPUT_FILE; // Hago esto para no tener lios con el Acrobat
-        }
-        document = new Document(this.pageSize,0,0,0,0);
-        init();
-        
         return true;
     }
 
@@ -1829,12 +1810,6 @@ public void GxEndPage()
 
     public void GxEndDocument()
     {
-    	//cambio el tamanio a lo que se imprimio
-    	//Se ignora el parametro orientation para el calculo del pageSize, los valores de alto y ancho ya vienen invertidos si Orientation=2=landscape.
-        //this.pageSize = computePageSize(leftMargin, topMargin, 10304, 12500, props.getBooleanGeneralProperty(Const.MARGINS_INSIDE_BORDER, false));
-        //document.setPageSize(pageSize);
-    	
-    	
       if(document.getPageNumber() == 0)
       { // Si no hay ninguna página en el documento, agrego una vacia}
         writer.setPageEmpty(false);

apacheandroid/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>apacheandroid</artifactId>

common/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.genexus</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gxcommon</artifactId>