Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2015-134 Hanging Indent with Hard Returns was not being saved

Browse Source
This commit is contained in:
Rich 2016-07-20 12:43:40 +00:00
parent e19db72647
commit 2099596290
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
View File

@ -337,8 +337,9 @@ namespace VEPROMS.CSLA.Library
//text = text.Replace(@"\'99", @"\u8482?");
text = RtfTools.RTFConvertedSymbolsToUnicode(text);
text = text.Replace("\r\n", @"\line "); // replace a \r\n with a \line instead of a \par
text = text.Replace(@"\line", @"\pard\line");
text = text.Replace(@"\pard\pard\line", @"\pard\line");
// B2015-134 Hanging Indent with Hard Returns was not being saved
//text = text.Replace(@"\line", @"\pard\line");
//text = text.Replace(@"\pard\pard\line", @"\pard\line");
//if (text.IndexOf(@"\line") > -1)
// MessageBox.Show("Found rtf line");
//text = text.Replace(@"\line", @"\par"); // we don't want to replace the \line part of bug fix B2015-140

6
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@ -1096,7 +1096,7 @@ namespace Volian.Controls.Library
{
this.Invalidate();
base.WndProc(ref m);
// B2016-135 Don't Show Hanging Indent if MyItemInfo is null
// B2015-135 Don't Show Hanging Indent if MyItemInfo is null
if (MyItemInfo == null) return;
if ((FieldToEdit == E_FieldToEdit.StepText) && (SelectionHangingIndent > 0 || SelectionIndent > 0) && (ActiveMode || MyItemInfo.IsTable))
{
@ -1141,7 +1141,9 @@ namespace Volian.Controls.Library
selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;}"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing
selectedRtfSB.Append("\r\n");
// use styles to construct rtf commands to insert into next line (where \b, etc is)
selectedRtfSB.Append(@"\viewkind4\uc1\pard\sl-240\slmult0" + sbbeg.ToString() + @"\fs" + Convert.ToInt32(myFont.SizeInPoints * 2).ToString() + @" "); // \f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}";
// B2015-134 Hanging Indent with Hard Returns was not being saved- removed \sl-240\slmult0
selectedRtfSB.Append(@"\viewkind4\uc1\pard" + sbbeg.ToString() + @"\fs" + Convert.ToInt32(myFont.SizeInPoints * 2).ToString() + @" "); // \f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}";
//selectedRtfSB.Append(@"\viewkind4\uc1\pard\sl-240\slmult0" + sbbeg.ToString() + @"\fs" + Convert.ToInt32(myFont.SizeInPoints * 2).ToString() + @" "); // \f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}";
}
private bool FontIsFixed(Font myFont)