From 2afb0e766c741722ddd42b43e7ab9dd83f232359 Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Wed, 20 May 2009 19:13:01 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1038
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../siprp/planoactuacao/print/plano_actuacao.xsl | 16 ++++++----------
 .../print/plano_actuacao_alargado.xsl            | 15 +++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
index b09d117e..2e624a5e 100644
--- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
+++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
@@ -15,7 +15,7 @@
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
 				<fo:simple-page-master master-name="pm1_1" page-height="11.6902in" page-width="8.2701in" margin-top="0.2756in" margin-right="0.7874in" margin-left="1.1811in">
-					<fo:region-body margin-top="1in" margin-bottom="0.5902in" />
+					<fo:region-body margin-top="1.1in" margin-bottom="0.5902in" />
 					<fo:region-before extent="1in" margin-bottom="0in" />
 					<fo:region-after extent="0.5902in" margin-top="0.3902in" />
 				</fo:simple-page-master>
@@ -88,9 +88,6 @@
 					<fo:block font-size="16pt" color="#606060" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0in" margin-bottom="0in">Plano de Actuação  </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 					<!-- fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block-->
 					<fo:block font-size="12pt" text-align="center">
@@ -98,7 +95,7 @@
 						<!--							src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 						<!--							height="1.398cm" width="8.273cm" />-->
 						<xsl:variable name="logotipo" select="empresa/logotipo" />
-						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
@@ -108,7 +105,6 @@
 					<fo:block font-size="16pt" color="#000000" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/estabelecimento" />						 
 					</fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 				</fo:flow>
 			</fo:page-sequence>
 			<fo:page-sequence master-reference="Standard_1" initial-page-number="1" force-page-count="no-force">
@@ -126,7 +122,7 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="13pt" text-align="right">
 										<xsl:variable name="logotipo" select="empresa/logotipo" />
-										<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+										<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										<!--										<fo:external-graphic-->
 										<!--											src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 										<!--											height="2cm" />-->
@@ -134,7 +130,7 @@
 								</fo:table-cell>
 							</fo:table-row>
 						</fo:table-body>
-					</fo:table>
+					</fo:table>
 				</fo:static-content>
 				<fo:static-content flow-name="xsl-region-after">
 					<fo:block font-size="10pt" text-align="end">
@@ -940,7 +936,7 @@
 											<!--												src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 											<!--												height="2cm" />-->
 											<xsl:variable name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -1206,7 +1202,7 @@
 										<fo:block font-size="9pt" text-align="end" line-height="100%" margin-top="0in" margin-bottom="0in" margin-right="0in" text-indent="0in" margin-left="1.2307in">
 											 
 											<xsl:variable name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+											<fo:external-graphic src="url('{$logotipo}')"  content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
index b0401b61..e0a66b29 100644
--- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
+++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
@@ -15,7 +15,7 @@
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
 				<fo:simple-page-master master-name="pm1_1" page-height="11.6902in" page-width="8.2701in" margin-top="0.2756in" margin-right="0.7874in" margin-left="1.1811in">
-					<fo:region-body margin-top="1in" margin-bottom="0.5902in" />
+					<fo:region-body margin-top="1.1in" margin-bottom="0.5902in" />
 					<fo:region-before extent="1in" margin-bottom="0in" />
 					<fo:region-after extent="0.5902in" margin-top="0.3902in" />
 				</fo:simple-page-master>
@@ -88,9 +88,6 @@
 					<fo:block font-size="16pt" color="#606060" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0in" margin-bottom="0in">Plano de Actuação  </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 					<!-- fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block-->
 					<fo:block font-size="12pt" text-align="center">
@@ -98,7 +95,7 @@
 						<!--							src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 						<!--							height="1.398cm" width="8.273cm" />-->
 						<xsl:variable name="logotipo" select="empresa/logotipo" />
-						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
@@ -108,8 +105,6 @@
 					<fo:block font-size="16pt" color="#000000" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/estabelecimento" />						 
 					</fo:block>
-					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 				</fo:flow>
 			</fo:page-sequence>
 			<fo:page-sequence master-reference="Standard_1" initial-page-number="1" force-page-count="no-force">
@@ -127,7 +122,7 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="13pt" text-align="right">
 										<xsl:variable name="logotipo" select="empresa/logotipo" />
-										<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+										<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										<!--										<fo:external-graphic-->
 										<!--											src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 										<!--											height="2cm" />-->
@@ -944,7 +939,7 @@
 											<!--												src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 											<!--												height="2cm" />-->
 											<xsl:variable name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -1235,7 +1230,7 @@
 										<fo:block font-size="9pt" text-align="end" line-height="100%" margin-top="0in" margin-bottom="0in" margin-right="0in" text-indent="0in" margin-left="1.2307in">
 											 
 											<xsl:variable name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
+											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>