neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup ahead of 1.1.0.3

This commit is contained in:
Gerald Schmidt 2007-10-14 18:12:55 +00:00
parent 50da3b134b
commit 9a5e1b16ec
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.in
View File

@ -220,7 +220,7 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
xmlassociatexsl.cpp xmlctrl.cpp xmldoc.cpp xmlencodinghandler.cpp xmlfilterreader.cpp \ xmlassociatexsl.cpp xmlctrl.cpp xmldoc.cpp xmlencodinghandler.cpp xmlfilterreader.cpp \
xmlpromptgenerator.cpp xmlrulereader.cpp xmlschemalocator.cpp xmlutf8reader.cpp xsllocator.cpp \ xmlpromptgenerator.cpp xmlrulereader.cpp xmlschemalocator.cpp xmlutf8reader.cpp xsllocator.cpp \
wrapexpat.cpp mypropertysheet.cpp rule.cpp housestylewriter.cpp myipc.cpp aboutdialog.cpp pathresolver.cpp mynotebook.cpp \ wrapexpat.cpp mypropertysheet.cpp rule.cpp housestylewriter.cpp myipc.cpp aboutdialog.cpp pathresolver.cpp mynotebook.cpp \
insertpanel.cpp mytoolbar.cpp mymenubar.cpp xmlwordcount.cpp getword.cpp locationpanel.cpp catalogresolver.cpp getlinuxappdir.cpp \ insertpanel.cpp xmlwordcount.cpp getword.cpp locationpanel.cpp catalogresolver.cpp getlinuxappdir.cpp \
xmlparseschemans.cpp xmlshallowvalidator.cpp wrapxerces.cpp \ xmlparseschemans.cpp xmlshallowvalidator.cpp wrapxerces.cpp \
findreplacepanel.cpp xmlschemaparser.cpp commandpanel.cpp \ findreplacepanel.cpp xmlschemaparser.cpp commandpanel.cpp \
binaryfile.cpp xmlencodingspy.cpp \ binaryfile.cpp xmlencodingspy.cpp \
@ -350,10 +350,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mymenubar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypropertysheet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypropertysheet.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mytoolbar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nocasecompare.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nocasecompare.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathresolver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathresolver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readfile.Po@am__quote@

7
src/xmlcopyeditor.cpp
View File

@ -4760,7 +4760,10 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified
doc->SetSavePoint(); doc->SetSavePoint();
if ( properties.validateAsYouType && isXml ) if ( properties.validateAsYouType && isXml )
{
doc->clearErrorIndicators();
doc->shallowValidate ( utf8Buffer.c_str(), utf8Buffer.size() ); doc->shallowValidate ( utf8Buffer.c_str(), utf8Buffer.size() );
}
if ( !unlimitedUndo ) if ( !unlimitedUndo )
doc->EmptyUndoBuffer(); doc->EmptyUndoBuffer();
@ -4895,8 +4898,6 @@ wxMenuBar *MyFrame::getMenuBar()
new wxMenuItem ( NULL, ID_GOTO, _ ( "G&o To...\tCtrl+G" ), _ ( "Go To..." ) ); new wxMenuItem ( NULL, ID_GOTO, _ ( "G&o To...\tCtrl+G" ), _ ( "Go To..." ) );
gotoItem->SetBitmap ( wxNullBitmap ); gotoItem->SetBitmap ( wxNullBitmap );
editMenu->Append ( undoItem ); editMenu->Append ( undoItem );
editMenu->Append ( redoItem ); editMenu->Append ( redoItem );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
@ -5169,9 +5170,9 @@ wxMenuBar *MyFrame::getMenuBar()
toolsMenu->Append ( wordCountItem ); toolsMenu->Append ( wordCountItem );
toolsMenu->AppendSeparator(); toolsMenu->AppendSeparator();
toolsMenu->Append ( commandItem ); toolsMenu->Append ( commandItem );
toolsMenu->AppendSeparator();
#ifdef __WXMSW__ #ifdef __WXMSW__
toolsMenu->AppendSeparator();
wxMenuItem *optionsItem = wxMenuItem *optionsItem =
new wxMenuItem ( new wxMenuItem (
NULL, NULL,

29
src/xmlctrl.cpp
View File

@ -59,8 +59,8 @@ XmlCtrl::XmlCtrl (
basePath ( basePathParameter ), basePath ( basePathParameter ),
auxPath ( auxPathParameter ) auxPath ( auxPathParameter )
{ {
SetEOLMode ( wxSTC_EOL_LF ); //SetEOLMode ( wxSTC_EOL_LF );
SetPasteConvertEndings ( true ); // essential to avoid double-spaced paste //SetPasteConvertEndings ( true );
currentMaxLine = 1; currentMaxLine = 1;
validationRequired = dtdFound = false; validationRequired = dtdFound = false;
@ -1969,7 +1969,7 @@ bool XmlCtrl::shallowValidate ( int maxLine, bool segmentOnly )
parentStartAngleBracket, parentStartAngleBracket,
memory; memory;
current = GetCurrentPos(); current = GetCurrentPos();
line = LineFromPosition ( current );//PositionFromLine(current); line = LineFromPosition ( current );
// try to include next line // try to include next line
lineEnd = GetLineEndPosition ( line + 1 ); lineEnd = GetLineEndPosition ( line + 1 );
@ -2022,29 +2022,6 @@ bool XmlCtrl::shallowValidate ( int maxLine, bool segmentOnly )
return shallowValidate ( bufferUtf8.c_str(), bufferUtf8.size(), startLine, return shallowValidate ( bufferUtf8.c_str(), bufferUtf8.size(), startLine,
maxLine, columnOffset, segmentOnly ); maxLine, columnOffset, segmentOnly );
/*
bool res = validator->parse(bufferUtf8, (segmentOnly) ? false : true);
if (!validator->getOverrideFailure() && (!res || !validator->isValid()))
{
std::vector<std::pair<int, int> > positionVector = validator->getPositionVector();
if (res == XML_STATUS_ERROR)
{
positionVector.push_back(validator->getErrorPosition());
}
std::vector<std::pair<int, int> >::iterator it;
for (it = positionVector.begin(); it != positionVector.end(); it++)
{
int line, column;
line = (it->first - 1) + startLine;
column = it->second + columnOffset;
setErrorIndicator(line, column);
}
return false;
}
return true;
*/
} }
bool XmlCtrl::shallowValidate ( const char *buffer, bool XmlCtrl::shallowValidate ( const char *buffer,