2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx: + add "include ustrbuf.hxx" to work around warning caused by solaris <sys/kstat.h> declaring a global "long l ;" 2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp: + fix MinGW build 2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk: + disable parsers that do not build on MinGW (thanks for patch by tono) 2009-05-15 17:31:07 +0200 mst r271957 : fix typos 2009-05-15 17:28:57 +0200 mst r271956 : #i101965# - offapi/com/sun/star/text/TextPortion: + add missing properties: SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField + fix read-only status of properties: Bookmark, IsStart, IsCollapsed - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb 2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx}, sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx}, sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx, sw/source/ui/fldui/fldref.cxx: + fix warning ... the hard way + also fix signature of SwDoc::SetCurFtn 2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx: + make some members const 2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx: + make some members const 2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx}, sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}: + fix rebase merge error + rename SwHstryBookmark to SwHistoryBookmark + clean up SwUndoBookmark 2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx: + fix annoying assertion 2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47) 2009-05-04 12:37:01 +0200 mst r271444 : trivial 2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx: + trivial change 2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx: + introduce some predicates for the various hints, and use them 2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx, sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx}, sw/source/core/undo/{unattr.cxx,unins.cxx}: + clean up unattr.cxx: remove/fix casts, prefix members, use auto_ptr, etc. 2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx}, sw/source/core/doc/docfmt.cxx, sw/source/core/txtnode/{thints.cxx,txtedt.cxx}, sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx, unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}: + clean up SwHistory, SwRegHistory and SwHistoryHint etc.: remove/fix casts, prefix members, remove wrong const annotations, use auto_ptr, remove unused members, etc. 2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx, sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx, txtfrm.cxx,txtdrop.cxx,frmform.cxx}, sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx}, sw/source/core/edit/acorrect.cxx, sw/source/core/doc/{docedt.cxx,docfmt.cxx}, sw/source/filter/html/swhtml.cxx: + clean up SwHintsArray and its subclasses: remove/fix casts, prefix members 2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx, sw/source/core/undo/rolbck.cxx: + remove JP_NEWCORE dead code 2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx: + silence unxlngi warning (debug=t) 2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx: + trivial cleanups 2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx, sfx2/source/doc/objserv.cxx: + fix bug: replaying a macro with a DocumentInfoItem removes all user-defined properties 2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx: + add missing SolarMutex guards 2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx: + never free rdf_world because that would call libxm2 xmlCleanupParser (and, to add insult to injury, other libxml2 functions later...) 2009-03-06 19:02:44 +0100 mst r269041 : argh! undo... 2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931# - sw/source/ui/uno/unomod.cxx: + SwXViewSettings::_getSingleValue returns uninitialized memory for the ZoomType property if the value is PAGE_WIDTH_EXACT 2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx, sw/source/core/unocore/unoportenum.cxx: + fix some more wntmsci12 warnings... 2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx: + work around spurious warning on unxsoli4 debug=t 2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx: + back to c-style casts, they also compile on wntmsci12... 2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + revert change of return type of comphelper_getProcessComponentContext to Reference: does not build on wntmsci12 2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}: + fix initialization 2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk: + fix CLASSPATH so complex tests run (fix by sb) 2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx, sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}: + SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr + move SwParaSelection into unoparagraph.cxx, as it is only used there + bugfix: replace SwUnoCrsrs on stack with SwCursors 2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx, sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx, sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx: + clean up SwPaM: prefix members + new constructor SwPosition(SwCntntNode&, xub_StrLen) + fix several broken SwPosition and SwPaM constructors + SwPam::DeleteMark now actually resets the unused position to default 2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx: + fix annoying warning (gcc 4) 2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java: + rename module from FieldMaster to fieldmaster 2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst, sfx2/source/doc/{Metadatable.cxx,makefile.mk}, sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx}, sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx}, sw/source/core/undo/{untbl.cxx,unins.cxx}, sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx: + move Metadatable implementation from sw to sfx2 2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx, sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}: + CreateUndo now returns an opaque MetadatableUndo object 2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx, sw/source/core/text/{itratr.cxx,porlay.cxx}, sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}: + clean up SwTxtNode: fix casts, prefix members + factor out inline function SwTxtNode::TryDeleteSwpHints() 2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx: + fix borken header guard 2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx: + fix use of compiler specific macro 2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx, txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx}, sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx, txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx}, sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx, sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx: + clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members + SwTxtINetFmt: remove unused member bColor - sw/source/core/text/txtfld.cxx: + move SwTxtFld methods to atrfld.cxx 2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx: + don't privately inherit BaseMutex, ScModelObj wants to access it 2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}: + arrrgh!!! someone thought it would be a good idea to have 2 different versions of boost in external! and they're NOT compatible!!! insert an ugly fragile hack that maybe works with both... 2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx. sfx2/source/doc/DocumentMetadataAccess.cxx: + someone made IsValidZipEntryFileName a static method and didn't tell me 2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches 2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw #i95863# - sw/inc/segdefs{,_}.hxx: + remove obsolete files - sw/source/ui/inc/itemdef.hxx: + remove itemdef.hxx - sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx, sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx: + use sfx2/msg.hxx instead of itemdef.hxx - sw/source/core/edit/eddel.cxx: + @ JP: SwEditShell::Replace: you're right, deleting the text to be replaced first, and then inserting a space, and then replacing that space is unnecessary. whew, i'm so happy that we finally answered that question after 11 years. - sw/inc/edimp.hxx: + remove FOREACHCURSOR_START, FOREACHCURSOR_END - sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx}, sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx, unocrsr.cxx,viscrs.cxx}, sw/source/core/doc/{docbm.cxx,doccorr.cxx}, sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx}, sw/source/core/edit/editsh.cxx, sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx}, sw/source/core/layout/trvlfrm.cxx, sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx, unoportenum.cxx,unotbl.cxx}, sw/source/core/view/vprint.cxx: + remove the hideous virtual operator SwFooCursor* + make SwCursor::IsReadOnlyAvailable() virtual + make SwUnoCrsr::Clone() virtual + refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable(): replace dynamic_cast<...>(this) with new virtual methods 2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw - sw/source/filter/xml/swxml.cxx: + XMLReader::Read: load RDF metadata of the ODF document - sw/source/filter/xml/wrtxml.cxx: + SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2 #i90620#: import xml:id in text tables (does not actually work yet) - sw/source/filter/xml/xmltbli{.hxx,.cxx}: + SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID + SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id + SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id + SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id + SwXMLTableContext::SwXMLTableContext: attribute xml:id fix #i98530# - sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx: + SwXTextPortion: make constructor params const& - sw/source/core/unocore/unoportenum.cxx: + refactor to remove some code duplication + fix bug: paragraph w/out hints: bookmark before frame gets lost #i97274# handle invalid tables - sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx: + SwXMLTableContext::MakeTable(): check that the table actually contains cells, and abort (removing the inserted table nodes) if not 2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw refactor SwXTextRange and SwXParagraph - sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx: + remove 3 constructors of SwXTextRange + new method SwXTextRange::CreateParentXText + refactor SwXTextRange::CreateTextRangeFromPosition and SwXTextRange::getText - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode + replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode - sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx: + adapt to new SwXParagraph #i90620# - sw/inc/SwMetadatable.hxx, sw/source/core/doc/SwMetadatable.cxx: + new files: base classes sw::Metadatable and sw::MetadatableMixin; also, 2 implementations of IXmlIdRegistry: sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard + setMetadataReference: handle empty stream name as auto-detect - sw/source/core/doc/makefile.mk: + add SwMetadatable add a XmlIdRegistry to SwDoc - sw/inc/doc.hxx: + SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry() - sw/source/core/doc/docnew.cxx: + initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor, because the constructor is not told whether the SwDoc is a clipboard - sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx: + SwDocShell: override GetXmlIdRegistry() #i91563#: make the SwTxtNode metadatable - sw/inc/ndtxt.hxx + SwTxtNode inherits sw::Metadatable - sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx: + SwXParagraph inherits sw::MetadatableMixin #i91563#: handle SwTxtNode's metadata for delete - sw/source/core/txtnode/ndtxt.cxx: + SwTxtNode::SplitCntntNode: handle XmlId + SwTxtNode::JoinNext: merge XmlIds - sw/source/core/doc/docedt.cxx: + lcl_GetJoinFlags: document postcondition + SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty #i91563#: handle SwTxtNode's metadata for delete with undo - sw/inc/undobj.hxx + SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd - sw/source/core/undo/undel.cxx: + SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode + SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty + SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndcopy.cxx: + SwTxtNode::MakeCopy: register copy at XmlIdRegistry #i91563#: handle SwTxtNode's metadata for find/replace with undo - sw/source/core/undo/unins.cxx: + _UnReplaceData: rename members: add prefix m_ + _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode + _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode #i91563#: handle SwTxtNode's metadata for table-to-text with undo - sw/source/core/undo/untbl.cxx: + SwTblToTxtSave: rename members: add prefix m_ + SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd + SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode + SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText: always store the index of the first SwTxtNode in the cell, instead of the index of the first SwTxtNode in case of the first cell in a row, and the cell start node in other cases + SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode - sw/source/core/docnode/ndtbl.cxx: + lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave 2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd - sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx: + remove invocations of SFX_DECL_TYPE - sd/source/ui/slideshow/SlideShowRestarter.cxx, sd/source/ui/toolpanel/LayoutMenu.cxx, sd/source/ui/unoidl/DrawController.cxx, sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}: + fix abuses of comphelper_getProcessComponentContext (missing release) 2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath - starmath/source/document.cxx: + don't touch SfxObjectShell's privates 2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2 #i90620# - sfx2/inc/sfx2/XmlIdRegistry.hxx: + new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier and a couple of utility functions - sfx2/inc/sfx2/DocumentMetadataAccess.hxx, sfx2/source/doc/DocumentMetadataAccess.cxx: + new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess + the URI of the DocumentMetadataAccess is now the URI from which the document was loaded; for a new document, use a vnd.sun.star.tdoc URI + add new function sfx2::createBaseURI() + prevent using reserved file names + try not to recurse into embedded subdocuments - sfx2/source/doc/makefile.mk: + add DocumentMetadataAccess - sfx2/util/makefile.mk: + link libsfx2 against libxml2 (needed for xmlValidateNCName) - sfx2/source/doc/makefile.mk: + add LIBXML_CFLAGS to CFLAGS - sfx2/prj/build.lst: + add dependence on libxml2 - sfx2/prj/d.lst: + add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx - sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx: + make SfxObjectShell's members private + new method SfxObjectShell::GetAutoStyleFilterIndex + SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier - sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx: + don't touch SfxObjectShell's privates - sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx: + SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer + SfxBaseModel implements additional interface XDocumentMetadataAccess + IMPL_SfxBaseModel_DataContainer has new member: a sfx2::DocumentMetadataAccess + implementation of XDocumentMetadataAccess forwards to the sfx2::DocumentMetadataAccess member - sfx2/qa/complex/DocumentMetadataAccessTest.java, sfx2/qa/complex/{tests.sce,makefile.mk}, sfx2/qa/complex/testdocuments/TESTRDFA.odt: + add complex test: DocumentMetadataAccessTest + add RDFa test document #i95863# - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx: + refactor SfxDocumentItem so it no longer requires a XDocumentInfo + move struct CustomProperty to implementation file + remove class SfxDocumentUserPage + QueryValue,PutValue: remove MID_DOCINFO_FIELD* - sfx2/source/doc/objserv.cxx: + adapt to SfxDocumentItem change - sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx: + remove MID_DOCINFO_FIELD* + put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE - sfx2/source/doc/objxtor.cxx: + fix abuses of comphelper_getProcessComponentContext (missing release) - sfx2/source/doc/docfile.cxx: + SfxMedium::SfxMedium: don't dereference NULL, throw exception instead - sfx2/source/doc/objstor.cxx: + SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized 2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff #i90620#: implement RDFa import (interface change) - xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx: + make SvXMLImport::GetAbsoluteReference() const + add SvXMLImport::GetComponentContext() + SvXMLImport::_InitCtor(): add RDFa namespace + add SvXMLImport::AddRDFa() + SvXMLImport::endDocument() inserts RDFa into document repository - xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx: + new tokens for RDFa: XML_ABOUT, XML_DATATYPE - xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx: + new class RDFaImportHelper + adapt the code to the bleak reality of broken C++ implementations + handle empty xhtml:about attributes properly, which are actually valid relative URIs + work around broken SvXMLImport::GetAbsoluteReference - xmloff/source/core/makefile.mk: + add RDFaImportHelper.cxx #i90620#: implement RDFa export - xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + add SvXMLExport::EnsureNamespace(), and a stack of namespace maps + add SvXMLExport::GetComponentContext() + add SvXMLExport::AddAttributesRDFa() - xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx: + new class RDFaExportHelper + don't use std::map::data_type, which is actually called std::map::mapped_type by libstdc++ - xmloff/source/core/makefile.mk: + add RDFaExportHelper.cxx #i91563# - xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx: + XMLTextPAttrTokens: add RDFa tokens - xmloff/source/text/txtparai{.hxx,.cxx}: + import RDFa for text:p - xmloff/source/text/txtparae.cxx: + export RDFa for text:p interface change: use XHTML namespace instead of RDFA - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx}, xmloff/source/text/txtimp.cxx: + use XHTML namespace instead of RDFA #i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field - xmloff/source/text/txtparai.cxx: + new class XMLMetaImportContextBase with subclasses to import text:meta and text:meta-field - xmloff/source/text/XMLTextMarkImportContext.cxx: + change XMLTextMarkImportContext::CreateAndInsertMark to handle marks with no name (text:meta) #i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field - xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx: + add FIELD_ID_META to FieldIdEnum + new method XMLTextFieldExport::ExportMetaField() + change XMLTextFieldExport::ExportField{,AutoStyle,Helper} to take additional parameter for progress bar - xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx: + make XMLTextParagraphExport::exportTextRangeEnumeration() public + new method XMLTextParagraphExport::exportMeta() #i90620# - xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx, xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx: + rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName() + fix xml:id {im,ex}port for embedded documents and non-packages + adapt to API change: XMetadatable #i90620# GRDDL - xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}: + add GRDDL namespace + add token XML_TRANSFORMATION + add grddl:transformation attribute to root elements for meta.xml, content.xml and styles.xml 2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml #i90620# - unoxml/source/rdf/librdf_repository.cxx: + librdf_Repository::importGraph: allocate buffer sized length of stream + switch from one librdf_world per repository to a single static world because redland has global variables with a brain-damaged life-cycle... + exportGraph: use new raptor 1.4.18 feature to disable writing an xml:base attribute in RDF/XML files - unoxml/source/rdf/librdf_repository.cxx: unoxml/qa/complex/RDFRepositoryTest.java: + adapt to predicate is URI change + adapt to RDFa API change + adapt to API change: RDFa has multiple predicates... + adapt to API change: XMetadatable derives from XURI + allow xhtml:datatype without xhtml:content + adapt to API change: attribute MetadataReference is StringPair - unoxml/source/rdf/CURI.cxx: + add some more URI constants 2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package - package/inc/ImplValidCharacters.hxx: + remove (moved to comphelper) 2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper - comphelper/inc/comphelper/processfactory.hxx, comphelper/source/processfactory/processfactory.cxx: + add getProcessComponentContext() + change return type of comphelper_getProcessComponentContext to Reference - comphelper/inc/comphelper/stl_types.hxx: + add OUStringBufferAppender + add algorithm intersperse - comphelper/source/misc/string.cxx: + rewrite convertCommaSeparated with intersperse and OUStringBufferAppender - comphelper/inc/comphelper/stlunosequence.hxx: + fix bug: begin() on empty sequence != end() 2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi #i96209# - offapi/com/sun/star/text/fieldmaster/*.idl: + rename module from FieldMaster to fieldmaster - offapi/type_reference/{typelibrary_history.txt,types.rdb}: + update reference types.rdb #i90620# - offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}: + API change: XMetadatable derives from XURI + API change: replace XmlId (string) with MetadataReference (StringPair) - offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl, XNamedGraph.idl,XRepository.idl}: + the predicate of a statement is a URI, not a Resource - offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl: + rename: s/Package/Document/ + remove uuid + remove everything related to mapping + graph names are now generated from base URI and file names + load methods: improve error handling with XInteractionHandler - offapi/com/sun/star/rdf/XDocumentRepository.idl: + change: RDFa permits using multiple predicates in one attribute + setStatementRDFa: subject is now XResource, object is now XMetadatable - offapi/com/sun/star/rdf/URIs.idl: + add some more URI constants - offapi/com/sun/star/rdf: + fix @since tags and replace <method> with <member> 2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland fix #i93768# - redland/raptor-1.4.17.patch, redland/raptor/makefile.mk: + disable GRDDL parser to prevent call to libxslt xsltSetDefaultSecurityPrefs, which breaks xmlhelp - redland/raptor/makefile.mk, redland/raptor-1.4.17.patch, redland/raptor-1.4.18.patch: + upgrade raptor to 1.4.18 + deactivate serializer for RSS/Atom (does not build) - redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch, redland/rasqal-0.9.16.patch, + upgrade rasqal to 0.9.16 - redland/redland/makefile.mk, redland/redland-1.0.7.patch, redland/redland-1.0.8.patch: + upgrade redland to 1.0.8 - redland/redlandversion.mk: + the librasqal SONAME has changed
981 lines
32 KiB
C++
981 lines
32 KiB
C++
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* $RCSfile: srcview.cxx,v $
|
|
* $Revision: 1.59 $
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_sw.hxx"
|
|
|
|
#include <hintids.hxx>
|
|
#include <com/sun/star/util/SearchOptions.hpp>
|
|
#include <com/sun/star/util/SearchFlags.hpp>
|
|
#include <com/sun/star/i18n/TransliterationModules.hpp>
|
|
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
|
|
#include <unotools/tempfile.hxx>
|
|
#include <tools/urlobj.hxx>
|
|
#include <vcl/print.hxx>
|
|
#include <vcl/msgbox.hxx>
|
|
#include <vcl/wrkwin.hxx>
|
|
#include <vcl/metric.hxx>
|
|
#include <svtools/ctrltool.hxx>
|
|
#include <svtools/intitem.hxx>
|
|
#include <svtools/stritem.hxx>
|
|
#include <svtools/pathoptions.hxx>
|
|
#include <svtools/undo.hxx>
|
|
#include <svtools/txtcmp.hxx>
|
|
#include <svtools/eitem.hxx>
|
|
#include <svtools/whiter.hxx>
|
|
#include <svtools/saveopt.hxx>
|
|
#include <svtools/transfer.hxx>
|
|
|
|
#include <svx/htmlcfg.hxx>
|
|
#include <sfx2/app.hxx>
|
|
#include <sfx2/objface.hxx>
|
|
#include <sfx2/viewfrm.hxx>
|
|
#include <sfx2/docfilt.hxx>
|
|
#include <sfx2/fcontnr.hxx>
|
|
#include <sfx2/request.hxx>
|
|
#include <sfx2/prnmon.hxx>
|
|
#include <sfx2/docfile.hxx>
|
|
#include <svx/fhgtitem.hxx>
|
|
#include <svx/srchdlg.hxx>
|
|
#include <svx/srchitem.hxx>
|
|
#include <svx/fontitem.hxx>
|
|
#include <svx/flstitem.hxx>
|
|
#include "svx/unolingu.hxx"
|
|
#include <sfx2/sfxhtml.hxx>
|
|
#include <swtypes.hxx>
|
|
#include <swmodule.hxx>
|
|
#include <docsh.hxx>
|
|
#include <wdocsh.hxx>
|
|
#include <srcview.hxx>
|
|
#include <viewfunc.hxx>
|
|
#include <doc.hxx>
|
|
#include <sfx2/msg.hxx>
|
|
#include <shellio.hxx>
|
|
|
|
#include <cmdid.h> // FN_ ...
|
|
#include <helpid.h>
|
|
#include <globals.hrc>
|
|
#include <shells.hrc>
|
|
#include <popup.hrc>
|
|
#include <web.hrc>
|
|
#include <view.hrc>
|
|
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
|
|
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
|
|
#include <sfx2/filedlghelper.hxx>
|
|
#define SwSrcView
|
|
#define SearchSettings
|
|
#define _ExecSearch Execute
|
|
#define _StateSearch GetState
|
|
#include <svx/svxslots.hxx>
|
|
#include "swslots.hxx"
|
|
|
|
#include <unomid.h>
|
|
|
|
#include <com/sun/star/document/XDocumentProperties.hpp>
|
|
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
|
|
|
|
using namespace ::com::sun::star;
|
|
using namespace ::com::sun::star::i18n;
|
|
using namespace ::com::sun::star::lang;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::ui::dialogs;
|
|
using namespace ::com::sun::star::i18n;
|
|
using namespace ::com::sun::star::lang;
|
|
using namespace ::sfx2;
|
|
using ::rtl::OUString;
|
|
using ::com::sun::star::util::SearchOptions;
|
|
|
|
|
|
#define SWSRCVIEWFLAGS ( SFX_VIEW_MAXIMIZE_FIRST| \
|
|
SFX_VIEW_OBJECTSIZE_EMBEDDED| \
|
|
SFX_VIEW_CAN_PRINT|\
|
|
SFX_VIEW_NO_NEWWINDOW )
|
|
|
|
#define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL))
|
|
|
|
// Druckraender -> wie Basic - Ide
|
|
#define LMARGPRN 1700
|
|
#define RMARGPRN 900
|
|
#define TMARGPRN 2000
|
|
#define BMARGPRN 1000
|
|
#define BORDERPRN 300
|
|
|
|
|
|
|
|
SFX_IMPL_VIEWFACTORY(SwSrcView, SW_RES(STR_NONAME))
|
|
{
|
|
SFX_VIEW_REGISTRATION(SwWebDocShell);
|
|
}
|
|
|
|
|
|
SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
|
|
{
|
|
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
|
|
SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
|
|
SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
|
|
SW_RES(RID_WEBTOOLS_TOOLBOX) );
|
|
SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
|
|
}
|
|
|
|
TYPEINIT1(SwSrcView, SfxViewShell)
|
|
|
|
/*-----------------18.11.96 08.05-------------------
|
|
|
|
--------------------------------------------------*/
|
|
|
|
|
|
void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle )
|
|
{
|
|
short nLeftMargin = LMARGPRN;
|
|
Size aSz = pPrinter->GetOutputSize();
|
|
short nBorder = BORDERPRN;
|
|
|
|
Color aOldFillColor( pPrinter->GetFillColor() );
|
|
Font aOldFont( pPrinter->GetFont() );
|
|
|
|
pPrinter->SetFillColor( Color(COL_TRANSPARENT) );
|
|
|
|
Font aFont( aOldFont );
|
|
aFont.SetWeight( WEIGHT_BOLD );
|
|
aFont.SetAlign( ALIGN_BOTTOM );
|
|
pPrinter->SetFont( aFont );
|
|
|
|
long nFontHeight = pPrinter->GetTextHeight();
|
|
|
|
// 1.Border => Strich, 2+3 Border = Freiraum.
|
|
long nYTop = TMARGPRN-3*nBorder-nFontHeight;
|
|
|
|
long nXLeft = nLeftMargin-nBorder;
|
|
long nXRight = aSz.Width()-RMARGPRN+nBorder;
|
|
|
|
pPrinter->DrawRect( Rectangle(
|
|
Point( nXLeft, nYTop ),
|
|
Size( nXRight-nXLeft, aSz.Height() - nYTop - BMARGPRN + nBorder ) ) );
|
|
|
|
|
|
long nY = TMARGPRN-2*nBorder;
|
|
Point aPos( nLeftMargin, nY );
|
|
pPrinter->DrawText( aPos, rTitle );
|
|
if ( nPages != 1 )
|
|
{
|
|
aFont.SetWeight( WEIGHT_NORMAL );
|
|
pPrinter->SetFont( aFont );
|
|
String aPageStr( C2S(" [") );
|
|
aPageStr += String( SW_RES( STR_PAGE ) );
|
|
aPageStr += ' ';
|
|
aPageStr += String::CreateFromInt32( nCurPage );
|
|
aPageStr += ']';
|
|
aPos.X() += pPrinter->GetTextWidth( rTitle );
|
|
pPrinter->DrawText( aPos, aPageStr );
|
|
}
|
|
|
|
|
|
nY = TMARGPRN-nBorder;
|
|
|
|
pPrinter->DrawLine( Point( nXLeft, nY ), Point( nXRight, nY ) );
|
|
|
|
pPrinter->SetFont( aOldFont );
|
|
pPrinter->SetFillColor( aOldFillColor );
|
|
}
|
|
/* -----------------13.11.2003 16:24-----------------
|
|
|
|
--------------------------------------------------*/
|
|
rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding)
|
|
{
|
|
rtl_TextEncoding eRet = eLoadEncoding;
|
|
if(RTL_TEXTENCODING_DONTKNOW == eRet)
|
|
{
|
|
SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
|
|
const sal_Char *pCharSet =
|
|
rtl_getBestMimeCharsetFromTextEncoding( pHtmlOptions->GetTextEncoding() );
|
|
eRet = rtl_getTextEncodingFromMimeCharset( pCharSet );
|
|
}
|
|
return eRet;
|
|
}
|
|
/*-----------------18.11.96 08.21-------------------
|
|
|
|
--------------------------------------------------*/
|
|
|
|
void lcl_ConvertTabsToSpaces( String& rLine )
|
|
{
|
|
if ( rLine.Len() )
|
|
{
|
|
USHORT nPos = 0;
|
|
USHORT nMax = rLine.Len();
|
|
while ( nPos < nMax )
|
|
{
|
|
if ( rLine.GetChar(nPos) == '\t' )
|
|
{
|
|
// Nicht 4 Blanks, sondern an 4er TabPos:
|
|
String aBlanker;
|
|
aBlanker.Fill( ( 4 - ( nPos % 4 ) ), ' ' );
|
|
rLine.Erase( nPos, 1 );
|
|
rLine.Insert( aBlanker, nPos );
|
|
nMax = rLine.Len();
|
|
}
|
|
nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
|
|
}
|
|
}
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
|
|
SfxViewShell( pViewFrame, SWSRCVIEWFLAGS ),
|
|
aEditWin( &pViewFrame->GetWindow(), this ),
|
|
pSearchItem(0),
|
|
bSourceSaved(FALSE),
|
|
eLoadEncoding(RTL_TEXTENCODING_DONTKNOW)
|
|
{
|
|
Init();
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
SwSrcView::~SwSrcView()
|
|
{
|
|
SwDocShell* pDocShell = GetDocShell();
|
|
DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?");
|
|
const TextSelection& rSel = aEditWin.GetTextView()->GetSelection();
|
|
((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< USHORT >( rSel.GetStart().GetPara() ) );
|
|
|
|
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
|
|
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
|
|
uno::Reference<document::XDocumentProperties> xDocProps
|
|
= xDPS->getDocumentProperties();
|
|
::rtl::OUString url = xDocProps->getAutoloadURL();
|
|
sal_Int32 delay = xDocProps->getAutoloadSecs();
|
|
pDocShell->SetAutoLoad(INetURLObject(url), delay,
|
|
(delay != 0) || !url.equalsAscii(""));
|
|
// EndListening(*GetViewFrame());
|
|
EndListening(*pDocShell);
|
|
delete pSearchItem;
|
|
}
|
|
|
|
/*-----------------24.04.97 10:37-------------------
|
|
|
|
--------------------------------------------------*/
|
|
void SwSrcView::SaveContentTo(SfxMedium& rMed)
|
|
{
|
|
SvStream* pOutStream = rMed.GetOutStream();
|
|
pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
|
|
aEditWin.Write( *pOutStream );//, EE_FORMAT_TEXT);
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::Init()
|
|
{
|
|
SetHelpId(SW_SRC_VIEWSHELL);
|
|
SetName(C2S("Source"));
|
|
SetWindow( &aEditWin );
|
|
SwDocShell* pDocShell = GetDocShell();
|
|
// wird das Doc noch geladen, dann muss die DocShell das Load
|
|
// anwerfen, wenn das Laden abgeschlossen ist
|
|
if(!pDocShell->IsLoading())
|
|
Load(pDocShell);
|
|
else
|
|
{
|
|
aEditWin.SetReadonly(TRUE);
|
|
}
|
|
|
|
// StartListening(*GetViewFrame());
|
|
StartListening(*pDocShell,TRUE);
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
SwDocShell* SwSrcView::GetDocShell()
|
|
{
|
|
SfxObjectShell* pObjShell = GetViewFrame()->GetObjectShell();
|
|
return PTR_CAST(SwDocShell, pObjShell);
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::SaveContent(const String& rTmpFile)
|
|
{
|
|
SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE);
|
|
SvStream* pOutStream = aMedium.GetOutStream();
|
|
pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) );
|
|
aEditWin.Write(*pOutStream);//, EE_FORMAT_TEXT);
|
|
aMedium.Commit();
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::Execute(SfxRequest& rReq)
|
|
{
|
|
USHORT nSlot = rReq.GetSlot();
|
|
TextView* pTextView = aEditWin.GetTextView();
|
|
switch( nSlot )
|
|
{
|
|
case SID_SAVEASDOC:
|
|
{
|
|
SvtPathOptions aPathOpt;
|
|
// filesave dialog with autoextension
|
|
FileDialogHelper aDlgHelper(
|
|
TemplateDescription::FILESAVE_AUTOEXTENSION,
|
|
TemplateDescription::FILESAVE_SIMPLE );
|
|
uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
|
|
// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW);
|
|
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
|
|
|
|
// search for an html filter for export
|
|
SfxFilterContainer* pFilterCont = GetObjectShell()->GetFactory().GetFilterContainer();
|
|
const SfxFilter* pFilter =
|
|
pFilterCont->GetFilter4Extension( C2S("html"), SFX_FILTER_EXPORT );
|
|
if ( pFilter )
|
|
{
|
|
// filter found -> use its uiname and wildcard
|
|
const String& rUIName = pFilter->GetUIName();
|
|
const WildCard& rCard = pFilter->GetWildcard();
|
|
xFltMgr->appendFilter( rUIName, rCard() );
|
|
xFltMgr->setCurrentFilter( rUIName ) ;
|
|
}
|
|
else
|
|
{
|
|
// filter not found
|
|
String sHtml(C2S("HTML"));
|
|
xFltMgr->appendFilter( sHtml, C2S("*.html;*.htm") );
|
|
xFltMgr->setCurrentFilter( sHtml ) ;
|
|
}
|
|
|
|
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
|
|
if( aDlgHelper.Execute() == ERRCODE_NONE)
|
|
{
|
|
SfxMedium aMedium( xFP->getFiles().getConstArray()[0],
|
|
STREAM_WRITE | STREAM_SHARE_DENYNONE,
|
|
FALSE );
|
|
SvStream* pOutStream = aMedium.GetOutStream();
|
|
pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
|
|
aEditWin.Write( *pOutStream );
|
|
aMedium.Commit();
|
|
}
|
|
}
|
|
break;
|
|
case SID_SAVEDOC:
|
|
{
|
|
SwDocShell* pDocShell = GetDocShell();
|
|
SfxMedium* pMed = 0;
|
|
if(pDocShell->HasName())
|
|
pMed = pDocShell->GetMedium();
|
|
else
|
|
{
|
|
SfxBoolItem* pItem = (SfxBoolItem*)pDocShell->ExecuteSlot(rReq, pDocShell->GetInterface());
|
|
if(pItem && pItem->GetValue())
|
|
pMed = pDocShell->GetMedium();
|
|
}
|
|
if(pMed)
|
|
{
|
|
SvStream* pOutStream = pMed->GetOutStream();
|
|
pOutStream->Seek(0);
|
|
pOutStream->SetStreamSize(0);
|
|
pOutStream->SetStreamCharSet(lcl_GetStreamCharSet(eLoadEncoding));
|
|
aEditWin.Write( *pOutStream );
|
|
pMed->CloseOutStream();
|
|
pMed->Commit();
|
|
pDocShell->GetDoc()->ResetModified();
|
|
SourceSaved();
|
|
aEditWin.ClearModifyFlag();
|
|
}
|
|
}
|
|
break;
|
|
case FID_SEARCH_NOW:
|
|
{
|
|
const SfxItemSet* pTmpArgs = rReq.GetArgs();
|
|
|
|
USHORT nWhich = pTmpArgs->GetWhichByPos( 0 );
|
|
DBG_ASSERT( nWhich, "Wich fuer SearchItem ?" );
|
|
const SfxPoolItem& rItem = pTmpArgs->Get( nWhich );
|
|
SetSearchItem( (const SvxSearchItem&)rItem);
|
|
StartSearchAndReplace( (const SvxSearchItem&)rItem, FALSE, rReq.IsAPI() );
|
|
if(aEditWin.IsModified())
|
|
GetDocShell()->GetDoc()->SetModified();
|
|
}
|
|
break;
|
|
case FN_REPEAT_SEARCH:
|
|
{
|
|
SvxSearchItem* pSrchItem = GetSearchItem();
|
|
if(pSrchItem)
|
|
{
|
|
StartSearchAndReplace( *pSrchItem, FALSE, rReq.IsAPI() );
|
|
if(aEditWin.IsModified())
|
|
GetDocShell()->GetDoc()->SetModified();
|
|
}
|
|
}
|
|
break;
|
|
case SID_PRINTDOC:
|
|
case SID_PRINTDOCDIRECT:
|
|
{
|
|
SfxViewShell::ExecuteSlot( rReq, SfxViewShell::GetInterface() );
|
|
}
|
|
break;
|
|
case SID_UNDO:
|
|
pTextView->Undo();
|
|
break;
|
|
case SID_REDO:
|
|
pTextView->Redo();
|
|
break;
|
|
case SID_REPEAT:
|
|
break;
|
|
case SID_CUT:
|
|
pTextView->Cut();
|
|
break;
|
|
case SID_COPY:
|
|
pTextView->Copy();
|
|
break;
|
|
case SID_PASTE:
|
|
pTextView->Paste();
|
|
break;
|
|
case SID_SELECTALL:
|
|
pTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
|
|
break;
|
|
}
|
|
aEditWin.Invalidate();
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::GetState(SfxItemSet& rSet)
|
|
{
|
|
SfxWhichIter aIter(rSet);
|
|
USHORT nWhich = aIter.FirstWhich();
|
|
TextView* pTextView = aEditWin.GetTextView();
|
|
|
|
while(nWhich)
|
|
{
|
|
switch(nWhich)
|
|
{
|
|
case SID_SAVEASDOC:
|
|
rSet.Put(SfxStringItem(nWhich, String(SW_RES(STR_SAVEAS_SRC))));
|
|
break;
|
|
case SID_SAVEDOC:
|
|
{
|
|
SwDocShell* pDocShell = GetDocShell();
|
|
if(!pDocShell->IsModified())
|
|
rSet.DisableItem(nWhich);
|
|
}
|
|
break;
|
|
case SID_PRINTDOC:
|
|
case SID_PRINTDOCDIRECT:
|
|
break;
|
|
case SID_TABLE_CELL:
|
|
{
|
|
String aPos( SW_RES(STR_SRCVIEW_ROW) );
|
|
TextSelection aSel = pTextView->GetSelection();
|
|
aPos += String::CreateFromInt32( aSel.GetEnd().GetPara()+1 );
|
|
aPos +=C2S(" : ");
|
|
aPos += String(SW_RES(STR_SRCVIEW_COL));
|
|
aPos += String::CreateFromInt32( aSel.GetEnd().GetIndex()+1 );
|
|
SfxStringItem aItem( nWhich, aPos );
|
|
rSet.Put( aItem );
|
|
}
|
|
break;
|
|
case SID_SEARCH_OPTIONS:
|
|
{
|
|
USHORT nOpt = SRC_SEARCHOPTIONS;
|
|
if(GetDocShell()->IsReadOnly())
|
|
nOpt &= ~(SEARCH_OPTIONS_REPLACE|SEARCH_OPTIONS_REPLACE_ALL);
|
|
|
|
rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, nOpt) );
|
|
}
|
|
break;
|
|
case SID_SEARCH_ITEM:
|
|
{
|
|
String sSelected;
|
|
if ( !pTextView->HasSelection() )
|
|
{
|
|
const TextSelection& rSel = pTextView->GetSelection();
|
|
sSelected = aEditWin.GetTextEngine()->GetWord( rSel.GetStart());
|
|
}
|
|
else
|
|
{
|
|
sSelected = pTextView->GetSelected();
|
|
}
|
|
SvxSearchItem * pSrchItem = GetSearchItem();
|
|
pSrchItem->SetSearchString( sSelected );
|
|
rSet.Put( *pSrchItem );
|
|
}
|
|
break;
|
|
case FN_REPEAT_SEARCH:
|
|
{
|
|
if(!GetSearchItem())
|
|
rSet.DisableItem(nWhich);
|
|
};
|
|
break;
|
|
case SID_UNDO:
|
|
case SID_REDO:
|
|
{
|
|
SfxUndoManager& rMgr = pTextView->GetTextEngine()->GetUndoManager();
|
|
USHORT nCount = 0;
|
|
if(nWhich == SID_UNDO)
|
|
{
|
|
nCount = rMgr.GetUndoActionCount();
|
|
if(nCount)
|
|
{
|
|
String aStr(ResId( STR_UNDO, *SFX_APP()->GetSfxResManager() ));;
|
|
aStr += rMgr.GetUndoActionComment(--nCount);
|
|
rSet.Put(SfxStringItem(nWhich, aStr));
|
|
}
|
|
else
|
|
rSet.DisableItem(nWhich);
|
|
}
|
|
else
|
|
{
|
|
nCount = rMgr.GetRedoActionCount();
|
|
if(nCount)
|
|
{
|
|
String aStr(ResId( STR_REDO, *SFX_APP()->GetSfxResManager() ));;
|
|
aStr += rMgr.GetRedoActionComment(--nCount);
|
|
rSet.Put(SfxStringItem(nWhich,aStr));
|
|
}
|
|
else
|
|
rSet.DisableItem(nWhich);
|
|
}
|
|
}
|
|
break;
|
|
case SID_MAIL_SENDDOCASPDF:
|
|
case SID_MAIL_SENDDOC :
|
|
case SID_EXPORTDOCASPDF:
|
|
case SID_DIRECTEXPORTDOCASPDF:
|
|
case SID_EXPORTDOC:
|
|
case SID_REPEAT:
|
|
rSet.DisableItem(nWhich);
|
|
break;
|
|
case SID_CUT:
|
|
case SID_COPY:
|
|
if(!pTextView->HasSelection())
|
|
rSet.DisableItem(nWhich);
|
|
break;
|
|
case SID_PASTE:
|
|
{
|
|
BOOL bDisable = 0 == SW_MOD()->pClipboard;
|
|
if( bDisable )
|
|
{
|
|
TransferableDataHelper aDataHelper(
|
|
TransferableDataHelper::CreateFromSystemClipboard(
|
|
&aEditWin) );
|
|
bDisable = !aDataHelper.GetXTransferable().is() ||
|
|
0 == aDataHelper.GetFormatCount();
|
|
}
|
|
if( bDisable )
|
|
rSet.DisableItem(nWhich);
|
|
}
|
|
break;
|
|
}
|
|
nWhich = aIter.NextWhich();
|
|
}
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
SvxSearchItem* SwSrcView::GetSearchItem()
|
|
{
|
|
if(!pSearchItem)
|
|
{
|
|
pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
|
|
}
|
|
return pSearchItem;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
|
|
{
|
|
delete pSearchItem;
|
|
pSearchItem = (SvxSearchItem*)rItem.Clone();
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
|
|
BOOL bFromStart,
|
|
BOOL bApi,
|
|
BOOL bRecursive)
|
|
{
|
|
ExtTextView* pTextView = aEditWin.GetTextView();
|
|
TextSelection aSel;
|
|
TextPaM aPaM;
|
|
|
|
BOOL bForward = !rSearchItem.GetBackward();
|
|
BOOL bAtStart = pTextView->GetSelection() == TextSelection( aPaM, aPaM );
|
|
|
|
if( !bForward )
|
|
aPaM = TextPaM( (ULONG)-1, (USHORT)-1 );
|
|
|
|
if( bFromStart )
|
|
{
|
|
aSel = pTextView->GetSelection();
|
|
pTextView->SetSelection( TextSelection( aPaM, aPaM ));
|
|
}
|
|
|
|
util::SearchOptions aSearchOpt( rSearchItem.GetSearchOptions() );
|
|
aSearchOpt.Locale = SvxCreateLocale(
|
|
static_cast< LanguageType >( GetAppLanguage() ) );
|
|
|
|
USHORT nFound;
|
|
BOOL bAll = FALSE;
|
|
switch( rSearchItem.GetCommand() )
|
|
{
|
|
case SVX_SEARCHCMD_FIND:
|
|
case SVX_SEARCHCMD_FIND_ALL:
|
|
nFound = pTextView->Search( aSearchOpt, bForward );
|
|
break;
|
|
|
|
case SVX_SEARCHCMD_REPLACE_ALL: bAll = TRUE;
|
|
case SVX_SEARCHCMD_REPLACE:
|
|
nFound = pTextView->Replace( aSearchOpt, bAll, bForward );
|
|
break;
|
|
|
|
default:
|
|
nFound = 0;
|
|
}
|
|
|
|
if( !nFound )
|
|
{
|
|
BOOL bNotFoundMessage = FALSE;
|
|
if(!bRecursive)
|
|
{
|
|
if(!bFromStart)
|
|
{
|
|
bNotFoundMessage = bAtStart;
|
|
}
|
|
else
|
|
{
|
|
bNotFoundMessage = TRUE;
|
|
pTextView->SetSelection( aSel );
|
|
}
|
|
}
|
|
else if(bAtStart)
|
|
{
|
|
bNotFoundMessage = TRUE;
|
|
}
|
|
|
|
|
|
if(!bApi)
|
|
if(bNotFoundMessage)
|
|
{
|
|
InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute();
|
|
}
|
|
else if(!bRecursive && RET_YES ==
|
|
QueryBox(0, SW_RES( bForward ? MSG_SEARCH_END
|
|
: MSG_SEARCH_START)).Execute())
|
|
{
|
|
pTextView->SetSelection( TextSelection( aPaM, aPaM ) );
|
|
StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE );
|
|
}
|
|
}
|
|
return nFound;
|
|
}
|
|
|
|
/*-----------------02.07.97 09:29-------------------
|
|
|
|
--------------------------------------------------*/
|
|
USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool )
|
|
{
|
|
SwDocShell* pDocSh = GetDocShell();
|
|
if ( (SFX_PRINTER_JOBSETUP | SFX_PRINTER_PRINTER) & nDiffFlags )
|
|
{
|
|
pDocSh->GetDoc()->setPrinter( pNew, true, true );
|
|
if ( nDiffFlags & SFX_PRINTER_PRINTER )
|
|
pDocSh->SetModified();
|
|
}
|
|
if ( nDiffFlags & SFX_PRINTER_OPTIONS )
|
|
::SetPrinter( pDocSh->getIDocumentDeviceAccess(), pNew, TRUE );
|
|
|
|
const BOOL bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ? TRUE : FALSE;
|
|
const BOOL bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE ? TRUE : FALSE;
|
|
if ( bChgOri || bChgSize )
|
|
{
|
|
pDocSh->SetModified();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
ErrCode SwSrcView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, BOOL bSilent, BOOL bIsAPI )
|
|
{
|
|
SfxPrintProgress *pProgress = new SfxPrintProgress( this, !bSilent );
|
|
SfxPrinter *pDocPrinter = GetPrinter(TRUE);
|
|
if ( !pPrinter )
|
|
pPrinter = pDocPrinter;
|
|
else if ( pDocPrinter != pPrinter )
|
|
{
|
|
pProgress->RestoreOnEndPrint( pDocPrinter->Clone() );
|
|
SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
|
|
}
|
|
pProgress->SetWaitMode(FALSE);
|
|
|
|
// Drucker starten
|
|
PreparePrint( pDlg );
|
|
|
|
SfxViewShell::Print(*pProgress, bIsAPI, pDlg ); //???
|
|
|
|
MapMode eOldMapMode( pPrinter->GetMapMode() );
|
|
Font aOldFont( pPrinter->Printer::GetFont() );
|
|
|
|
TextEngine* pTextEngine = aEditWin.GetTextEngine();
|
|
pPrinter->SetMapMode(MAP_100TH_MM);
|
|
Font aFont(aEditWin.GetOutWin()->GetFont());
|
|
Size aSize(aFont.GetSize());
|
|
aSize = aEditWin.GetOutWin()->PixelToLogic(aSize, MAP_100TH_MM);
|
|
aFont.SetSize(aSize);
|
|
aFont.SetColor(COL_BLACK);
|
|
pPrinter->SetFont( aFont );
|
|
|
|
String aTitle( GetViewFrame()->GetWindow().GetText() );
|
|
|
|
USHORT nLineHeight = (USHORT) pPrinter->GetTextHeight(); // etwas mehr.
|
|
USHORT nParaSpace = 10;
|
|
|
|
Size aPaperSz = pPrinter->GetOutputSize();
|
|
aPaperSz.Width() -= (LMARGPRN+RMARGPRN);
|
|
aPaperSz.Height() -= (TMARGPRN+BMARGPRN);
|
|
|
|
// nLinepPage stimmt nicht, wenn Zeilen umgebrochen werden muessen...
|
|
USHORT nLinespPage = (USHORT) (aPaperSz.Height()/nLineHeight);
|
|
USHORT nCharspLine = (USHORT) (aPaperSz.Width() / pPrinter->GetTextWidth( 'X' ));
|
|
USHORT nParas = static_cast< USHORT >( pTextEngine->GetParagraphCount() );
|
|
|
|
USHORT nPages = (USHORT) (nParas/nLinespPage+1 );
|
|
USHORT nCurPage = 1;
|
|
|
|
BOOL bStartJob = pPrinter->StartJob( aTitle );
|
|
if( bStartJob )
|
|
{
|
|
pPrinter->StartPage();
|
|
// Header drucken...
|
|
lcl_PrintHeader( pPrinter, nPages, nCurPage, aTitle );
|
|
Point aPos( LMARGPRN, TMARGPRN );
|
|
for ( USHORT nPara = 0; nPara < nParas; nPara++ )
|
|
{
|
|
String aLine( pTextEngine->GetText( nPara ) );
|
|
lcl_ConvertTabsToSpaces( aLine );
|
|
USHORT nLines = aLine.Len()/nCharspLine+1;
|
|
for ( USHORT nLine = 0; nLine < nLines; nLine++ )
|
|
{
|
|
String aTmpLine( aLine, nLine*nCharspLine, nCharspLine );
|
|
aPos.Y() += nLineHeight;
|
|
if ( aPos.Y() > ( aPaperSz.Height()+TMARGPRN ) )
|
|
{
|
|
nCurPage++;
|
|
pPrinter->EndPage();
|
|
pPrinter->StartPage();
|
|
lcl_PrintHeader( pPrinter, nPages, nCurPage, aTitle );
|
|
aPos = Point( LMARGPRN, TMARGPRN+nLineHeight );
|
|
}
|
|
pPrinter->DrawText( aPos, aTmpLine );
|
|
}
|
|
aPos.Y() += nParaSpace;
|
|
}
|
|
pPrinter->EndPage();
|
|
}
|
|
|
|
pPrinter->SetFont( aOldFont );
|
|
pPrinter->SetMapMode( eOldMapMode );
|
|
|
|
if ( !bStartJob )
|
|
{
|
|
// Printer konnte nicht gestartet werden
|
|
delete pProgress;
|
|
return ERRCODE_IO_ABORT;
|
|
}
|
|
|
|
pProgress->Stop();
|
|
pProgress->DeleteOnEndPrint();
|
|
pPrinter->EndJob();
|
|
return pPrinter->GetError();
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate )
|
|
{
|
|
return GetDocShell()->GetDoc()->getPrinter( bCreate );
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
|
|
void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
|
|
{
|
|
if ( rHint.ISA(SfxSimpleHint) &&
|
|
(
|
|
((SfxSimpleHint&) rHint).GetId() == SFX_HINT_MODECHANGED ||
|
|
(
|
|
((SfxSimpleHint&) rHint).GetId() == SFX_HINT_TITLECHANGED &&
|
|
!GetDocShell()->IsReadOnly() && aEditWin.IsReadonly()
|
|
)
|
|
)
|
|
)
|
|
{
|
|
// Broadcast kommt nur einmal!
|
|
const SwDocShell* pDocSh = GetDocShell();
|
|
const BOOL bReadonly = pDocSh->IsReadOnly();
|
|
aEditWin.SetReadonly(bReadonly);
|
|
}
|
|
SfxViewShell::Notify(rBC, rHint);
|
|
}
|
|
|
|
/*-----------------19.04.97 10:19-------------------
|
|
|
|
--------------------------------------------------*/
|
|
void SwSrcView::Load(SwDocShell* pDocShell)
|
|
{
|
|
SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
|
|
const sal_Char *pCharSet =
|
|
rtl_getBestMimeCharsetFromTextEncoding( pHtmlOptions->GetTextEncoding() );
|
|
rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
|
|
|
|
aEditWin.SetReadonly(pDocShell->IsReadOnly());
|
|
aEditWin.SetTextEncoding(eDestEnc);
|
|
SfxMedium* pMedium = pDocShell->GetMedium();
|
|
|
|
const SfxFilter* pFilter = pMedium->GetFilter();
|
|
BOOL bHtml = pFilter && pFilter->GetUserData().EqualsAscii("HTML");
|
|
BOOL bDocModified = pDocShell->IsModified();
|
|
if(bHtml && !bDocModified && pDocShell->HasName())
|
|
{
|
|
SvStream* pStream = pMedium->GetInStream();
|
|
if(pStream && 0 == pStream->GetError() )
|
|
{
|
|
rtl_TextEncoding eHeaderEnc =
|
|
SfxHTMLParser::GetEncodingByHttpHeader(
|
|
pDocShell->GetHeaderAttributes() );
|
|
if( RTL_TEXTENCODING_DONTKNOW == eHeaderEnc )
|
|
{
|
|
const sal_Char *pTmpCharSet =
|
|
rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 );
|
|
eHeaderEnc = rtl_getTextEncodingFromMimeCharset( pTmpCharSet );
|
|
}
|
|
if( RTL_TEXTENCODING_DONTKNOW != eHeaderEnc &&
|
|
eDestEnc != eHeaderEnc )
|
|
{
|
|
eDestEnc = eHeaderEnc;
|
|
aEditWin.SetTextEncoding(eDestEnc);
|
|
}
|
|
pStream->SetStreamCharSet( eDestEnc );
|
|
pStream->Seek(0);
|
|
TextEngine* pTextEngine = aEditWin.GetTextEngine();
|
|
pTextEngine->EnableUndo(FALSE);
|
|
aEditWin.Read(*pStream);//, EE_FORMAT_TEXT);
|
|
pTextEngine->EnableUndo(TRUE);
|
|
}
|
|
else
|
|
{
|
|
Window *pTmpWindow = &GetViewFrame()->GetWindow();
|
|
InfoBox(pTmpWindow, SW_RES(MSG_ERR_SRCSTREAM)).Execute();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
utl::TempFile aTempFile;
|
|
aTempFile.EnableKillingFile();
|
|
String sFileURL( aTempFile.GetURL() );
|
|
SvtSaveOptions aOpt;
|
|
|
|
{
|
|
SfxMedium aMedium( sFileURL,STREAM_READWRITE, TRUE );
|
|
SwWriter aWriter( aMedium, *pDocShell->GetDoc() );
|
|
WriterRef xWriter;
|
|
::GetHTMLWriter(aEmptyStr, aMedium.GetBaseURL( true ), xWriter);
|
|
String sWriteName = pDocShell->HasName() ?
|
|
pMedium->GetName() :
|
|
(const String&) sFileURL;
|
|
ULONG nRes = aWriter.Write(xWriter, &sWriteName);
|
|
if(nRes)
|
|
{
|
|
ErrorHandler::HandleError(ErrCode(nRes));
|
|
aEditWin.SetReadonly(TRUE);
|
|
}
|
|
aMedium.Commit();
|
|
SvStream* pInStream = aMedium.GetInStream();
|
|
pInStream->Seek(0);
|
|
pInStream->SetStreamCharSet( eDestEnc );
|
|
|
|
|
|
aEditWin.Read(*pInStream);//, EE_FORMAT_TEXT);
|
|
}
|
|
}
|
|
aEditWin.ClearModifyFlag();
|
|
|
|
eLoadEncoding = eDestEnc;
|
|
|
|
if(bDocModified)
|
|
pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt
|
|
// AutoLoad abschalten
|
|
pDocShell->SetAutoLoad(INetURLObject(), 0, FALSE);
|
|
DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?");
|
|
USHORT nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara();
|
|
aEditWin.SetStartLine(nLine);
|
|
aEditWin.GetTextEngine()->ResetUndo();
|
|
aEditWin.GetOutWin()->GrabFocus();
|
|
}
|
|
|
|
|