OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-18 14:27:39 +03:00
Code Activity

0022573: Extend the range of status values returned by the method TDocStd_Application::SaveAs

Browse Source
This commit is contained in:
MSV
2011-09-15 06:32:58 +00:00
committed by bugmaster
parent c345d68b3a
commit 15e8b08292
24 changed files with 305 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cdl
View File

@@ -45,8 +45,6 @@ is
AddNamespace (me:mutable; thePrefix, theURI: AsciiString)
is protected;
IsError (me) returns Boolean from Standard;
AttributeDrivers (me : mutable; theMsgDriver: MessageDriver from CDM)
returns ADriverTable from XmlMDF
is virtual;
@@ -60,6 +58,5 @@ fields
mySeqOfNS : SequenceOfNamespaceDef from XmlLDrivers;
myCopyright : ExtendedString from TCollection;
myRelocTable: SRelocationTable from XmlObjMgt is protected;
myIsError : Boolean from Standard is protected;
end DocumentStorageDriver;

22
src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
View File

@@ -120,7 +120,7 @@ void XmlLDrivers_DocumentStorageDriver::Write
::take_time (0, " +++++ Fin formatting to XML : ", aMessageDriver);
}else{
myIsError = Standard_True;
SetIsError (Standard_True);
TCollection_ExtendedString aMsg =
TCollection_ExtendedString("Error: the file ") + aFileName +
" cannot be opened for writing";
@@ -143,7 +143,7 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument
XmlObjMgt_Element& theElement,
const TCollection_ExtendedString& theFileName)
{
myIsError = Standard_False;
SetIsError(Standard_False);
Handle(CDM_MessageDriver) aMessageDriver =
theDocument -> Application() -> MessageDriver();
// 1. Write header information
@@ -289,13 +289,13 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument
}
catch (Standard_Failure)
{
myIsError = Standard_True;
SetIsError (Standard_True);
TCollection_ExtendedString anErrorString (Standard_Failure::Caught()->GetMessageString());
aMessageDriver -> Write (anErrorString.ToExtString());
}
}
if (anObjNb <= 0 && myIsError == Standard_False) {
myIsError = Standard_True;
if (anObjNb <= 0 && IsError() == Standard_False) {
SetIsError (Standard_True);
TCollection_ExtendedString anErrorString ("error occurred");
aMessageDriver -> Write (anErrorString.ToExtString());
}
@@ -311,7 +311,7 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument
// 4. Write Shapes section
if(WriteShapeSection(theElement))
::take_time (0, " +++ Fin DOM data for Shapes : ", aMessageDriver);
return myIsError;
return IsError();
}
//=======================================================================
@@ -353,16 +353,6 @@ Standard_Integer XmlLDrivers_DocumentStorageDriver::MakeDocument
return -1; // error
}
//=======================================================================
//function : IsError
//purpose :
//=======================================================================
Standard_Boolean XmlLDrivers_DocumentStorageDriver::IsError () const
{
return myIsError;
}
//=======================================================================
//function : AttributeDrivers
//purpose :