From 1a9e4d94ca1688c9a18907c0b5c565cfe2a7dbc3 Mon Sep 17 00:00:00 2001
From: Fabien Bodard <gambas.fr@gmail.com>
Date: Mon, 21 May 2012 09:02:51 +0000
Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: Another bug removed, on the
 ReportBOrder dialog, about the sync.

git-svn-id: svn://localhost/gambas/trunk@4750 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 .../gambas3/.src/Dialog/Report/FReportBorderChooser.class   | 4 +++-
 app/src/gambas3/.src/Editor/Form/FForm.class                | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/gambas3/.src/Dialog/Report/FReportBorderChooser.class b/app/src/gambas3/.src/Dialog/Report/FReportBorderChooser.class
index 3d4e547bf..1822f8581 100644
--- a/app/src/gambas3/.src/Dialog/Report/FReportBorderChooser.class
+++ b/app/src/gambas3/.src/Dialog/Report/FReportBorderChooser.class
@@ -236,7 +236,9 @@ Public Sub Form_Open()
       If aScan.Count = 2 Then
         Try $aCoordBox[iBorder].Value = aScan[0]
         Try $aCoordBox[iBorder + 1].Value = aScan[1]
-        achkSynchro[iBorder].Value = $aCoordBox[iBorder].Value = $aCoordBox[iBorder + 1].Value
+        If [TOPLEFTCORNER, TOPRIGHTCORNER, BOTTOMRIGHTCORNER, BOTTOMLEFTCORNER].Exist(iBorder) Then 
+          achkSynchro[iBorder - 4].Value = $aCoordBox[iBorder].Value = $aCoordBox[iBorder + 1].Value
+        Endif
       Else
         Try $aCoordBox[iBorder].Value = aScan[0]
         achkSynchro[iBorder - 4].Value = True
diff --git a/app/src/gambas3/.src/Editor/Form/FForm.class b/app/src/gambas3/.src/Editor/Form/FForm.class
index 055ac6896..bf47b02a7 100644
--- a/app/src/gambas3/.src/Editor/Form/FForm.class
+++ b/app/src/gambas3/.src/Editor/Form/FForm.class
@@ -353,7 +353,7 @@ Private Sub FromString(sData As String, Optional hParent As CControl)
 
           If Left$(sValue, 1) = Chr$(34) Then
             If sProperty = "Name" Then Continue
-            vValue = Unquote(Mid$(sValue, 2, -1))
+            vValue = UnQuote(Mid$(sValue, 2, -1))
             If sClass = "ComboBox" Or sClass = "ListBox" Then
               If sProperty = "List" Then
                 vValue = Split(vValue, "\n")
@@ -376,7 +376,7 @@ Private Sub FromString(sData As String, Optional hParent As CControl)
                 If iPos3 = 0 Or If iPos3 > iPos2 Then Break
                 iPos2 = iPos3 + 1
               Loop
-              aVal.Add(Unquote(Mid$(sValue, iPos + 1, iPos2 - iPos - 1)))
+              aVal.Add(UnQuote(Mid$(sValue, iPos + 1, iPos2 - iPos - 1)))
               iPos = iPos2 + 1
             Loop
             vValue = aVal '.Join("\n")
@@ -391,7 +391,7 @@ Private Sub FromString(sData As String, Optional hParent As CControl)
             For Each sProp In CControl.COMPLEX_STRING_PROPERTIES
 
               If sValue Begins sProp Then
-                vValue = Unquote$(Mid$(sValue, Len(sProp) + 2, -2))
+                vValue = UnQuote$(Mid$(sValue, Len(sProp) + 2, -2))
                 sProp = ""
                 Break
               Endif