From 4a1e0760920e0a2b17c99e1a51b14e4110e03894 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 18 Dec 2012 20:21:24 +0000 Subject: [PATCH] =?UTF-8?q?B2012-378=20=20fixed=20=20on=20empty?= =?UTF-8?q?=20table=20cell=20null=20string=20error=20=E2=80=93=20now=20jus?= =?UTF-8?q?t=20return=20without=20trying=20to=20process=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 6c3fc2e4..fa55aa45 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1049,7 +1049,9 @@ namespace Volian.Controls.Library else if (ctrl is ComboBox) { ComboBox cmb = ctrl as ComboBox; - if (myDO.GetDataPresent(DataFormats.Text)) + if (myDO.GetDataPresent(DataFormats.UnicodeText)) + cmb.SelectedText = myDO.GetData(DataFormats.UnicodeText).ToString(); + else if (myDO.GetDataPresent(DataFormats.Text)) cmb.SelectedText = myDO.GetData(DataFormats.Text).ToString(); _PastePlainText = false; return; @@ -1137,6 +1139,8 @@ namespace Volian.Controls.Library Control ctrl = FindActiveControl(); if (ctrl == null) return; // null if on property page for procedure & section number/title Clipboard.Clear(); + if (_MyStepRTB.SelectedText == null || _MyStepRTB.SelectedText == "") + return; // nothing to copy onto clipboard, just return DataObject myDO = new DataObject(); ; if (ctrl is RichTextBox) {