From e53b90b7197252819364fd3a51e9ac372e2b441c Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 3 Apr 2012 10:25:07 +0000
Subject: [PATCH] =?UTF-8?q?Arreglo=20en=20la=20exportaci=C3=B3n=20de=20con?=
 =?UTF-8?q?ceptos=20para=20que=20los=20texto=20en=20RTF=20aparezcan=20bien?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1059 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/GUIBase/uViewDetallesBase.dfm | 52 +++++++++++++---------------
 Source/GUIBase/uViewDetallesBase.pas | 13 ++++++-
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index e4773168..162dc38f 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Left = 0
     Top = 0
     Width = 451
-    Height = 68
+    Height = 73
     AutoSize = True
     ButtonWidth = 141
     Caption = 'ToolBar1'
@@ -42,24 +42,23 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = actSubir
       AutoSize = True
-      Wrap = True
     end
     object ToolButton4: TToolButton
-      Left = 0
-      Top = 22
+      Left = 184
+      Top = 0
       Action = actBajar
       AutoSize = True
     end
     object ToolButton14: TToolButton
-      Left = 56
-      Top = 22
+      Left = 240
+      Top = 0
       Action = FontEdit1
       AutoSize = True
       Wrap = True
     end
     object FontName: TJvFontComboBox
       Left = 0
-      Top = 44
+      Top = 22
       Width = 145
       Height = 22
       DroppedDownWidth = 145
@@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object FontSize: TEdit
       Left = 145
-      Top = 44
+      Top = 22
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object UpDown1: TUpDown
       Left = 171
-      Top = 44
+      Top = 22
       Width = 16
       Height = 22
       Associate = FontSize
@@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton13: TToolButton
       Left = 187
-      Top = 44
+      Top = 22
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
@@ -103,54 +102,55 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     end
     object ToolButton6: TToolButton
       Left = 195
-      Top = 44
+      Top = 22
       Action = RichEditBold1
       AutoSize = True
     end
     object ToolButton7: TToolButton
       Left = 261
-      Top = 44
+      Top = 22
       Action = RichEditItalic1
       AutoSize = True
     end
     object ToolButton8: TToolButton
       Left = 328
-      Top = 44
+      Top = 22
       Action = RichEditUnderline1
       AutoSize = True
     end
     object ToolButton12: TToolButton
-      Left = 411
-      Top = 44
+      Left = 0
+      Top = 22
       Width = 8
       Caption = 'ToolButton12'
       ImageIndex = 10
+      Wrap = True
       Style = tbsSeparator
     end
     object ToolButton9: TToolButton
-      Left = 419
-      Top = 44
+      Left = 0
+      Top = 49
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 564
-      Top = 44
+      Left = 145
+      Top = 49
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 689
-      Top = 44
+      Left = 270
+      Top = 49
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 94
+    Top = 99
     Width = 451
-    Height = 210
+    Height = 205
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -161,8 +161,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
-    ExplicitTop = 99
-    ExplicitHeight = 205
     object cxGridView: TcxGridDBTableView
       OnKeyDown = cxGridViewKeyDown
       NavigatorButtons.ConfirmDelete = False
@@ -300,6 +298,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Properties.AllowObjects = True
         Properties.SelectionBar = True
         Properties.WantReturns = False
+        OnGetDisplayText = cxGridViewDESCRIPCIONGetDisplayText
         Width = 237
       end
       object cxGridViewCANTIDAD: TcxGridDBColumn
@@ -346,12 +345,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 68
+    Top = 73
     Width = 451
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
-    ExplicitTop = 73
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 095cdff4..a82271e3 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -200,6 +200,9 @@ type
       APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord;
       ANewItemRecordFocusingChanged: Boolean);
     procedure actExportarExecute(Sender: TObject);
+    procedure cxGridViewDESCRIPCIONGetDisplayText(
+      Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+      var AText: string);
 
   private
     FController : IControllerDetallesBase;
@@ -254,7 +257,7 @@ implementation
 
 uses
   uDMBase, uCalculosUtils, dxOffice11, uSistemaFunc, uGridClipboardUtils,
-  Clipbrd, cxGridExportLink;
+  Clipbrd, cxGridExportLink, uRTFUtils;
 
 type
   TOnPaste = procedure(Sender: TObject; AText: string) of object;
@@ -603,6 +606,14 @@ begin
   CurEdit := Nil;
 end;
 
+procedure TfrViewDetallesBase.cxGridViewDESCRIPCIONGetDisplayText(
+  Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  var AText: string);
+begin
+  inherited;
+  AText := RtfToText(AText);
+end;
+
 procedure TfrViewDetallesBase.cxGridViewEditing(Sender: TcxCustomGridTableView;
   AItem: TcxCustomGridTableItem; var AAllow: Boolean);
 begin