[Castore-commits] FODTGraphicalObjectsConverter.java 1.2 1.3

[Céline BENOIT]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter
In directory adullact1:/tmp/cvs-serv28382/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter

Modified Files:
	FODTGraphicalObjectsConverter.java 
Log Message:
Utilisation de la variable openoffcie.port du fichier castor.properties pour l'initialisation du port 

Index: FODTGraphicalObjectsConverter.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/FODTGraphicalObjectsConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FODTGraphicalObjectsConverter.java	17 Nov 2006 15:23:21 -0000	1.2
--- FODTGraphicalObjectsConverter.java	1 Dec 2006 11:03:16 -0000	1.3
***************
*** 74,83 ****
  import com.sun.star.util.XCloseable;
  
  /**
! * 
! * @author  $Author$
! * @version $Revision$
! * 
! */
  public class FODTGraphicalObjectsConverter {
  
--- 74,85 ----
  import com.sun.star.util.XCloseable;
  
+ import fr.emn.castor.common.PropertiesHelper;
+ 
  /**
!  * 
!  * @author  $Author$
!  * @version $Revision$
!  * 
!  */
  public class FODTGraphicalObjectsConverter {
  
***************
*** 257,261 ****
  
      /** The default port to contact OpenOffice.org */
!     public String port = "2809";
  
      /** The default server on which OpenOffice.org is running in headless mode. */
--- 259,263 ----
  
      /** The default port to contact OpenOffice.org */
!     public String port = PropertiesHelper.getProperty("openoffice.port");
  
      /** The default server on which OpenOffice.org is running in headless mode. */
***************
*** 522,528 ****
              sDrawingObjectName = Normalizer.decompose(
                  sDrawingObjectName, false, 0).replaceAll(
!                 "\\p{InCombiningDiacriticalMarks}+", ""); 
!             sDrawingObjectName = sDrawingObjectName.replaceAll(
!                 "%20", "");
              drawingObject.addAttribute(new Attribute(
                  "draw:name", drawNamespace, sDrawingObjectName));
--- 524,529 ----
              sDrawingObjectName = Normalizer.decompose(
                  sDrawingObjectName, false, 0).replaceAll(
!                 "\\p{InCombiningDiacriticalMarks}+", "");
!             sDrawingObjectName = sDrawingObjectName.replaceAll("%20", "");
              drawingObject.addAttribute(new Attribute(
                  "draw:name", drawNamespace, sDrawingObjectName));
***************
*** 931,936 ****
              Element currentLinkedImage = new Element(linkedImage);
              currentLinkedImage
!             .getAttribute("href", xlinkNamespace).setValue(
!                 sImageFileName);
  
              // Link to the PNG image
--- 932,937 ----
              Element currentLinkedImage = new Element(linkedImage);
              currentLinkedImage
!                 .getAttribute("href", xlinkNamespace).setValue(
!                     sImageFileName);
  
              // Link to the PNG image