Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Minor refact (Logic/SubtitleFormats/SubtitleFormat)

Browse Source
This commit is contained in:
Waldi Ravens 2015-05-31 15:53:02 +02:00
parent 393dc2c0e9
commit 7259bdcef7
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Logic/SubtitleFormats/SubtitleFormat.cs
View File

@ -301,7 +301,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public int ErrorCount
{
get { return _errorCount; }
get
{
return _errorCount;
}
}
abstract public bool IsMine(List<string> lines, string fileName);
@ -312,7 +315,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public bool IsVobSubIndexFile
{
get { return string.CompareOrdinal(Extension, ".idx") == 0; }
get
{
return string.CompareOrdinal(Extension, ".idx") == 0;
}
}
public virtual void RemoveNativeFormatting(Subtitle subtitle, SubtitleFormat newFormat)
@ -363,35 +369,21 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public bool BatchMode { get; set; }
public static string ToUtf8XmlString(XmlDocument xml, bool omitXmlDeclaration)
public static string ToUtf8XmlString(XmlDocument xml, bool omitXmlDeclaration = false)
{
XmlWriterSettings settings = new XmlWriterSettings();
settings.Encoding = new UnicodeEncoding(false, false); // no BOM in a .NET string
settings.Indent = true;
settings.OmitXmlDeclaration = omitXmlDeclaration;
StringWriter textWriter = null;
try
var settings = new XmlWriterSettings
{
Indent = true,
OmitXmlDeclaration = omitXmlDeclaration,
};
var result = new StringBuilder();
using (var xmlWriter = XmlWriter.Create(result, settings))
{
textWriter = new StringWriter();
var xmlWriter = XmlWriter.Create(textWriter, settings);
xml.Save(xmlWriter);
xmlWriter.Flush();
return textWriter.ToString().Replace(" encoding=\"utf-16\"", " encoding=\"utf-8\"").Trim();
}
finally
{
if (textWriter != null)
{
textWriter.Dispose();
textWriter = null;
}
}
}
public static string ToUtf8XmlString(XmlDocument xml)
{
return ToUtf8XmlString(xml, false);
return result.ToString().Replace(" encoding=\"utf-16\"", " encoding=\"utf-8\"").Trim();
}
public virtual bool IsTextBased