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
1077 lines
35 KiB
C++
1077 lines
35 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: fldref.cxx,v $
|
|
* $Revision: 1.12.214.1 $
|
|
*
|
|
* 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"
|
|
|
|
#ifdef SW_DLLIMPLEMENTATION
|
|
#undef SW_DLLIMPLEMENTATION
|
|
#endif
|
|
|
|
|
|
|
|
#include "swtypes.hxx"
|
|
#include <view.hxx>
|
|
#include <IMark.hxx>
|
|
#include <expfld.hxx>
|
|
#include <swmodule.hxx>
|
|
#ifndef _FLDREF_HXX
|
|
#include <fldref.hxx>
|
|
#endif
|
|
#include <reffld.hxx>
|
|
#include <wrtsh.hxx>
|
|
|
|
#ifndef _FLDUI_HRC
|
|
#include <fldui.hrc>
|
|
#endif
|
|
#ifndef _FLDTDLG_HRC
|
|
#include <fldtdlg.hrc>
|
|
#endif
|
|
#ifndef _GLOBALS_HRC
|
|
#include <globals.hrc>
|
|
#endif
|
|
// --> OD 2007-11-14 #i83479#
|
|
#include <SwNodeNum.hxx>
|
|
#include <IDocumentMarkAccess.hxx>
|
|
#include <ndtxt.hxx>
|
|
// <--
|
|
|
|
// sw/inc/expfld.hxx
|
|
SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
|
|
|
|
#define REFFLDFLAG 0x4000
|
|
#define REFFLDFLAG_BOOKMARK 0x4800
|
|
#define REFFLDFLAG_FOOTNOTE 0x5000
|
|
#define REFFLDFLAG_ENDNOTE 0x6000
|
|
// --> OD 2007-11-09 #i83479#
|
|
#define REFFLDFLAG_HEADING 0x7100
|
|
#define REFFLDFLAG_NUMITEM 0x7200
|
|
// <--
|
|
|
|
USHORT nFldDlgFmtSel = 0;
|
|
|
|
#define USER_DATA_VERSION_1 "1"
|
|
#define USER_DATA_VERSION USER_DATA_VERSION_1
|
|
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
|
|
SwFldPage( pParent, SW_RES( TP_FLD_REF ), rCoreSet ),
|
|
|
|
aTypeFT (this, SW_RES(FT_REFTYPE)),
|
|
aTypeLB (this, SW_RES(LB_REFTYPE)),
|
|
aSelectionFT (this, SW_RES(FT_REFSELECTION)),
|
|
aSelectionLB (this, SW_RES(LB_REFSELECTION)),
|
|
// --> OD 2007-11-21 #i83479#
|
|
aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ),
|
|
// <--
|
|
aFormatFT (this, SW_RES(FT_REFFORMAT)),
|
|
aFormatLB (this, SW_RES(LB_REFFORMAT)),
|
|
aNameFT (this, SW_RES(FT_REFNAME)),
|
|
aNameED (this, SW_RES(ED_REFNAME)),
|
|
aValueFT (this, SW_RES(FT_REFVALUE)),
|
|
aValueED (this, SW_RES(ED_REFVALUE)),
|
|
|
|
sBookmarkTxt (SW_RES(STR_REFBOOKMARK)),
|
|
sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)),
|
|
sEndnoteTxt (SW_RES(STR_REFENDNOTE)),
|
|
// --> OD 2007-11-09 #i83479#
|
|
sHeadingTxt (SW_RES(STR_REFHEADING)),
|
|
sNumItemTxt (SW_RES(STR_REFNUMITEM)),
|
|
maOutlineNodes(),
|
|
maNumItems(),
|
|
mpSavedSelectedTxtNode( 0 ),
|
|
mnSavedSelectedPos( 0 )
|
|
// <--
|
|
{
|
|
FreeResource();
|
|
|
|
aNameED.SetModifyHdl(LINK(this, SwFldRefPage, ModifyHdl));
|
|
|
|
aTypeLB.SetDoubleClickHdl (LINK(this, SwFldRefPage, InsertHdl));
|
|
aTypeLB.SetSelectHdl (LINK(this, SwFldRefPage, TypeHdl));
|
|
aSelectionLB.SetSelectHdl (LINK(this, SwFldRefPage, SubTypeHdl));
|
|
aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldRefPage, InsertHdl));
|
|
aFormatLB.SetDoubleClickHdl (LINK(this, SwFldRefPage, InsertHdl));
|
|
|
|
// --> OD 2007-11-21 #i83479#
|
|
aSelectionToolTipLB.SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) );
|
|
aSelectionToolTipLB.SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) );
|
|
aSelectionToolTipLB.SetWindowBits( aSelectionToolTipLB.GetWindowBits() | WB_HSCROLL );
|
|
aSelectionToolTipLB.SetSpaceBetweenEntries(1);
|
|
aSelectionToolTipLB.SetHighlightRange();
|
|
// <--
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
SwFldRefPage::~SwFldRefPage()
|
|
{
|
|
}
|
|
|
|
// --> OD 2007-11-22 #i83479#
|
|
void SwFldRefPage::SaveSelectedTxtNode()
|
|
{
|
|
mpSavedSelectedTxtNode = 0;
|
|
mnSavedSelectedPos = 0;
|
|
if ( aSelectionToolTipLB.IsVisible() )
|
|
{
|
|
SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry();
|
|
if ( pEntry )
|
|
{
|
|
const USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
SwWrtShell *pSh = GetWrtShell();
|
|
if ( !pSh )
|
|
{
|
|
pSh = ::GetActiveWrtShell();
|
|
}
|
|
if ( nTypeId == REFFLDFLAG_HEADING )
|
|
{
|
|
mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData()));
|
|
if ( mnSavedSelectedPos < maOutlineNodes.size() )
|
|
{
|
|
mpSavedSelectedTxtNode = maOutlineNodes[mnSavedSelectedPos];
|
|
}
|
|
}
|
|
else if ( nTypeId == REFFLDFLAG_NUMITEM )
|
|
{
|
|
mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData()));
|
|
if ( mnSavedSelectedPos < maNumItems.size() )
|
|
{
|
|
mpSavedSelectedTxtNode = maNumItems[mnSavedSelectedPos]->GetTxtNode();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
const SwTxtNode* SwFldRefPage::GetSavedSelectedTxtNode() const
|
|
{
|
|
return mpSavedSelectedTxtNode;
|
|
}
|
|
|
|
sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const
|
|
{
|
|
return mnSavedSelectedPos;
|
|
}
|
|
|
|
// <--
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
void SwFldRefPage::Reset(const SfxItemSet& )
|
|
{
|
|
if (!IsFldEdit())
|
|
{
|
|
SavePos(&aTypeLB);
|
|
// --> OD 2007-11-22 #i83479#
|
|
SaveSelectedTxtNode();
|
|
// <--
|
|
}
|
|
SetSelectionSel(LISTBOX_ENTRY_NOTFOUND);
|
|
SetTypeSel(LISTBOX_ENTRY_NOTFOUND);
|
|
Init(); // Allgemeine initialisierung
|
|
|
|
// TypeListBox initialisieren
|
|
aTypeLB.SetUpdateMode(FALSE);
|
|
aTypeLB.Clear();
|
|
|
|
// Typ-Listbox fuellen
|
|
|
|
USHORT nPos;
|
|
// Referenz setzen / einfuegen
|
|
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
|
|
|
|
for (short i = rRg.nStart; i < rRg.nEnd; ++i)
|
|
{
|
|
const USHORT nTypeId = GetFldMgr().GetTypeId(i);
|
|
|
|
if (!IsFldEdit() || nTypeId != TYP_SETREFFLD)
|
|
{
|
|
nPos = aTypeLB.InsertEntry(GetFldMgr().GetTypeStr(i), i - rRg.nStart);
|
|
aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
|
|
}
|
|
}
|
|
|
|
// --> OD 2007-11-09 #i83479#
|
|
// entries for headings and numbered items
|
|
nPos = aTypeLB.InsertEntry(sHeadingTxt);
|
|
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_HEADING);
|
|
nPos = aTypeLB.InsertEntry(sNumItemTxt);
|
|
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_NUMITEM);
|
|
// <--
|
|
|
|
// mit den Sequence-Typen auffuellen
|
|
SwWrtShell *pSh = GetWrtShell();
|
|
if(!pSh)
|
|
pSh = ::GetActiveWrtShell();
|
|
|
|
USHORT nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD);
|
|
|
|
for (USHORT n = 0; n < nFldTypeCnt; ++n)
|
|
{
|
|
SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(n, RES_SETEXPFLD);
|
|
|
|
if ((nsSwGetSetExpType::GSE_SEQ & pType->GetType()) && pType->GetDepends() && pSh->IsUsed(*pType))
|
|
{
|
|
nPos = aTypeLB.InsertEntry(pType->GetName());
|
|
aTypeLB.SetEntryData(nPos, (void*)(REFFLDFLAG | n));
|
|
}
|
|
}
|
|
|
|
// Textmarken - jetzt immer (wegen Globaldokumenten)
|
|
nPos = aTypeLB.InsertEntry(sBookmarkTxt);
|
|
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_BOOKMARK);
|
|
|
|
// Fussnoten:
|
|
if( pSh->HasFtns() )
|
|
{
|
|
nPos = aTypeLB.InsertEntry(sFootnoteTxt);
|
|
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_FOOTNOTE);
|
|
}
|
|
|
|
// Endnoten:
|
|
if ( pSh->HasFtns(true) )
|
|
{
|
|
nPos = aTypeLB.InsertEntry(sEndnoteTxt);
|
|
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_ENDNOTE);
|
|
}
|
|
|
|
// alte Pos selektieren
|
|
if (!IsFldEdit())
|
|
RestorePos(&aTypeLB);
|
|
|
|
aTypeLB.SetUpdateMode(TRUE);
|
|
|
|
nFldDlgFmtSel = 0;
|
|
|
|
if( !IsRefresh() )
|
|
{
|
|
String sUserData = GetUserData();
|
|
if(!IsRefresh() && sUserData.GetToken(0, ';').
|
|
EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
|
|
{
|
|
String sVal = sUserData.GetToken(1, ';');
|
|
USHORT nVal = static_cast< USHORT >(sVal.ToInt32());
|
|
if(nVal != USHRT_MAX)
|
|
{
|
|
for(USHORT i = 0; i < aTypeLB.GetEntryCount(); i++)
|
|
if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i))
|
|
{
|
|
aTypeLB.SelectEntryPos(i);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
TypeHdl(0);
|
|
|
|
if (IsFldEdit())
|
|
{
|
|
aTypeLB.SaveValue();
|
|
aSelectionLB.SaveValue();
|
|
aFormatLB.SaveValue();
|
|
aNameED.SaveValue();
|
|
aValueED.SaveValue();
|
|
}
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
|
|
{
|
|
// Alte ListBoxPos sichern
|
|
const USHORT nOld = GetTypeSel();
|
|
|
|
// Aktuelle ListBoxPos
|
|
SetTypeSel(aTypeLB.GetSelectEntryPos());
|
|
|
|
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
|
|
{
|
|
if (IsFldEdit())
|
|
{
|
|
// Positionen selektieren
|
|
String sName;
|
|
USHORT nFlag = 0;
|
|
|
|
switch( GetCurField()->GetSubType() )
|
|
{
|
|
case REF_BOOKMARK:
|
|
{
|
|
// --> OD 2007-11-14 #i83479#
|
|
// sName = sBookmarkTxt;
|
|
// nFlag = REFFLDFLAG_BOOKMARK;
|
|
SwGetRefField* pRefFld = dynamic_cast<SwGetRefField*>(GetCurField());
|
|
if ( pRefFld &&
|
|
pRefFld->IsRefToHeadingCrossRefBookmark() )
|
|
{
|
|
sName = sHeadingTxt;
|
|
nFlag = REFFLDFLAG_HEADING;
|
|
}
|
|
else if ( pRefFld &&
|
|
pRefFld->IsRefToNumItemCrossRefBookmark() )
|
|
{
|
|
sName = sNumItemTxt;
|
|
nFlag = REFFLDFLAG_NUMITEM;
|
|
}
|
|
else
|
|
{
|
|
sName = sBookmarkTxt;
|
|
nFlag = REFFLDFLAG_BOOKMARK;
|
|
}
|
|
// <--
|
|
}
|
|
break;
|
|
|
|
case REF_FOOTNOTE:
|
|
sName = sFootnoteTxt;
|
|
nFlag = REFFLDFLAG_FOOTNOTE;
|
|
break;
|
|
|
|
case REF_ENDNOTE:
|
|
sName = sEndnoteTxt;
|
|
nFlag = REFFLDFLAG_ENDNOTE;
|
|
break;
|
|
|
|
case REF_SETREFATTR:
|
|
sName = SW_RESSTR(STR_GETREFFLD);
|
|
nFlag = REF_SETREFATTR;
|
|
break;
|
|
|
|
case REF_SEQUENCEFLD:
|
|
sName = ((SwGetRefField*)GetCurField())->GetSetRefName();
|
|
nFlag = REFFLDFLAG;
|
|
break;
|
|
}
|
|
|
|
if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke
|
|
{
|
|
USHORT nPos = aTypeLB.InsertEntry(sName);
|
|
aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag));
|
|
}
|
|
|
|
aTypeLB.SelectEntry(sName);
|
|
SetTypeSel(aTypeLB.GetSelectEntryPos());
|
|
}
|
|
else
|
|
{
|
|
SetTypeSel(0);
|
|
aTypeLB.SelectEntryPos(0);
|
|
}
|
|
}
|
|
|
|
if (nOld != GetTypeSel())
|
|
{
|
|
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
|
|
// Auswahl-Listbox fuellen
|
|
UpdateSubType();
|
|
|
|
BOOL bName = FALSE; nFldDlgFmtSel = 0;
|
|
|
|
if ( ( !IsFldEdit() || aSelectionLB.GetEntryCount() ) &&
|
|
nOld != LISTBOX_ENTRY_NOTFOUND )
|
|
{
|
|
aNameED.SetText(aEmptyStr);
|
|
aValueED.SetText(aEmptyStr);
|
|
}
|
|
|
|
switch (nTypeId)
|
|
{
|
|
case TYP_GETREFFLD:
|
|
if (REFFLDFLAG & (USHORT)(ULONG)aTypeLB.GetEntryData(nOld))
|
|
// dann bleibt die alte bestehen
|
|
nFldDlgFmtSel = aFormatLB.GetSelectEntryPos();
|
|
bName = TRUE;
|
|
break;
|
|
|
|
case TYP_SETREFFLD:
|
|
bName = TRUE;
|
|
break;
|
|
|
|
case REFFLDFLAG_BOOKMARK:
|
|
bName = TRUE;
|
|
// kein break!!!
|
|
default:
|
|
if( REFFLDFLAG & nTypeId )
|
|
{
|
|
USHORT nOldId = (USHORT)(ULONG)aTypeLB.GetEntryData(nOld);
|
|
if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD )
|
|
// dann bleibt die alte bestehen
|
|
nFldDlgFmtSel = aFormatLB.GetSelectEntryPos();
|
|
}
|
|
break;
|
|
}
|
|
|
|
aNameED.Enable(bName);
|
|
aNameFT.Enable(bName);
|
|
|
|
// Format-Listbox fuellen
|
|
USHORT nSize = FillFormatLB(nTypeId);
|
|
BOOL bFormat = nSize != 0;
|
|
aFormatLB.Enable(bFormat);
|
|
aFormatFT.Enable(bFormat);
|
|
|
|
SubTypeHdl();
|
|
ModifyHdl();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG )
|
|
{
|
|
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
|
|
switch(nTypeId)
|
|
{
|
|
case TYP_GETREFFLD:
|
|
if (!IsFldEdit() || aSelectionLB.GetSelectEntryCount())
|
|
{
|
|
aNameED.SetText(aSelectionLB.GetSelectEntry());
|
|
ModifyHdl(&aNameED);
|
|
}
|
|
break;
|
|
|
|
case TYP_SETREFFLD:
|
|
{
|
|
SwWrtShell *pSh = GetWrtShell();
|
|
if(!pSh)
|
|
pSh = ::GetActiveWrtShell();
|
|
if(pSh)
|
|
{
|
|
aValueED.SetText(pSh->GetSelTxt());
|
|
}
|
|
|
|
}
|
|
break;
|
|
// --> OD 2007-11-21 #i83479#
|
|
case REFFLDFLAG_HEADING:
|
|
case REFFLDFLAG_NUMITEM:
|
|
{
|
|
if ( aSelectionToolTipLB.GetCurEntry() )
|
|
{
|
|
aNameED.SetText( aSelectionToolTipLB.GetEntryText(
|
|
aSelectionToolTipLB.GetCurEntry() ) );
|
|
}
|
|
}
|
|
break;
|
|
// <--
|
|
|
|
default:
|
|
if (!IsFldEdit() || aSelectionLB.GetSelectEntryCount())
|
|
aNameED.SetText(aSelectionLB.GetSelectEntry());
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung: Typen in SelectionLB erneuern
|
|
--------------------------------------------------------------------*/
|
|
|
|
void SwFldRefPage::UpdateSubType()
|
|
{
|
|
SwWrtShell *pSh = GetWrtShell();
|
|
if(!pSh)
|
|
pSh = ::GetActiveWrtShell();
|
|
SwGetRefField* pRefFld = (SwGetRefField*)GetCurField();
|
|
const USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
|
|
String sOldSel;
|
|
// --> OD 2007-11-22 #i83479#
|
|
if ( aSelectionLB.IsVisible() )
|
|
{
|
|
const USHORT nSelectionSel = aSelectionLB.GetSelectEntryPos();
|
|
if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND)
|
|
{
|
|
sOldSel = aSelectionLB.GetEntry(nSelectionSel);
|
|
}
|
|
}
|
|
// <--
|
|
if (IsFldEdit() && !sOldSel.Len())
|
|
sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 );
|
|
|
|
aSelectionLB.SetUpdateMode(FALSE);
|
|
aSelectionLB.Clear();
|
|
// --> OD 2007-11-21 #i83479#
|
|
aSelectionToolTipLB.SetUpdateMode(FALSE);
|
|
aSelectionToolTipLB.Clear();
|
|
bool bShowSelectionToolTipLB( false );
|
|
// <--
|
|
|
|
if( REFFLDFLAG & nTypeId )
|
|
{
|
|
if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
|
|
{
|
|
aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
|
|
// alle Textmarken besorgen
|
|
IDocumentMarkAccess* const pMarkAccess = pSh->getIDocumentMarkAccess();
|
|
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
|
|
ppMark != pMarkAccess->getBookmarksEnd();
|
|
ppMark++)
|
|
{
|
|
const ::sw::mark::IMark* pBkmk = ppMark->get();
|
|
if(IDocumentMarkAccess::BOOKMARK == IDocumentMarkAccess::GetType(*pBkmk))
|
|
aSelectionLB.InsertEntry( pBkmk->GetName() );
|
|
}
|
|
if (IsFldEdit())
|
|
sOldSel = pRefFld->GetSetRefName();
|
|
}
|
|
else if (nTypeId == REFFLDFLAG_FOOTNOTE)
|
|
{
|
|
aSelectionLB.SetStyle(aSelectionLB.GetStyle() & ~WB_SORT);
|
|
SwSeqFldList aArr;
|
|
USHORT nCnt = pSh->GetSeqFtnList( aArr );
|
|
|
|
for( USHORT n = 0; n < nCnt; ++n )
|
|
{
|
|
aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry );
|
|
if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
|
|
sOldSel = aArr[n]->sDlgEntry;
|
|
}
|
|
}
|
|
else if (nTypeId == REFFLDFLAG_ENDNOTE)
|
|
{
|
|
aSelectionLB.SetStyle(aSelectionLB.GetStyle() & ~WB_SORT);
|
|
SwSeqFldList aArr;
|
|
USHORT nCnt = pSh->GetSeqFtnList( aArr, true );
|
|
|
|
for( USHORT n = 0; n < nCnt; ++n )
|
|
{
|
|
aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry );
|
|
if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
|
|
sOldSel = aArr[n]->sDlgEntry;
|
|
}
|
|
}
|
|
// --> OD 2007-11-14 #i83479#
|
|
else if ( nTypeId == REFFLDFLAG_HEADING )
|
|
{
|
|
bShowSelectionToolTipLB = true;
|
|
|
|
const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() );
|
|
pIDoc->getOutlineNodes( maOutlineNodes );
|
|
bool bCertainTxtNodeSelected( false );
|
|
SvLBoxEntry* pEntry = 0;
|
|
sal_uInt16 nOutlIdx = 0;
|
|
for ( nOutlIdx = 0; nOutlIdx < maOutlineNodes.size(); ++nOutlIdx )
|
|
{
|
|
pEntry = aSelectionToolTipLB.InsertEntry(
|
|
pIDoc->getOutlineText( nOutlIdx, true, true ) );
|
|
pEntry->SetUserData( reinterpret_cast<void*>(nOutlIdx) );
|
|
if ( ( IsFldEdit() &&
|
|
pRefFld->GetReferencedTxtNode() == maOutlineNodes[nOutlIdx] ) ||
|
|
GetSavedSelectedTxtNode() == maOutlineNodes[nOutlIdx] )
|
|
{
|
|
aSelectionToolTipLB.Select( pEntry );
|
|
sOldSel.Erase();
|
|
bCertainTxtNodeSelected = true;
|
|
}
|
|
else if ( !bCertainTxtNodeSelected &&
|
|
GetSavedSelectedPos() == nOutlIdx )
|
|
{
|
|
aSelectionToolTipLB.Select( pEntry );
|
|
sOldSel.Erase();
|
|
}
|
|
}
|
|
}
|
|
else if ( nTypeId == REFFLDFLAG_NUMITEM )
|
|
{
|
|
bShowSelectionToolTipLB = true;
|
|
|
|
const IDocumentListItems* pIDoc( pSh->getIDocumentListItemsAccess() );
|
|
pIDoc->getNumItems( maNumItems );
|
|
bool bCertainTxtNodeSelected( false );
|
|
SvLBoxEntry* pEntry = 0;
|
|
sal_uInt16 nNumItemIdx = 0;
|
|
for ( nNumItemIdx = 0; nNumItemIdx < maNumItems.size(); ++nNumItemIdx )
|
|
{
|
|
pEntry = aSelectionToolTipLB.InsertEntry(
|
|
pIDoc->getListItemText( *maNumItems[nNumItemIdx], true, true ) );
|
|
pEntry->SetUserData( reinterpret_cast<void*>(nNumItemIdx) );
|
|
if ( ( IsFldEdit() &&
|
|
pRefFld->GetReferencedTxtNode() == maNumItems[nNumItemIdx]->GetTxtNode() ) ||
|
|
GetSavedSelectedTxtNode() == maNumItems[nNumItemIdx]->GetTxtNode() )
|
|
{
|
|
aSelectionToolTipLB.Select( pEntry );
|
|
sOldSel.Erase();
|
|
bCertainTxtNodeSelected = true;
|
|
}
|
|
else if ( !bCertainTxtNodeSelected &&
|
|
GetSavedSelectedPos() == nNumItemIdx )
|
|
{
|
|
aSelectionToolTipLB.Select( pEntry );
|
|
sOldSel.Erase();
|
|
}
|
|
}
|
|
}
|
|
// <--
|
|
else
|
|
{
|
|
aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
|
|
// zum Seq-FeldTyp die Felder besorgen:
|
|
|
|
SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
|
|
nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
|
|
if( pType )
|
|
{
|
|
SwSeqFldList aArr;
|
|
// old selection should be kept in non-edit mode
|
|
if(IsFldEdit())
|
|
sOldSel.Erase();
|
|
|
|
USHORT nCnt = pType->GetSeqFldList( aArr );
|
|
for( USHORT n = 0; n < nCnt; ++n )
|
|
{
|
|
aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry );
|
|
if (IsFldEdit() && !sOldSel.Len() &&
|
|
aArr[ n ]->nSeqNo == pRefFld->GetSeqNo())
|
|
sOldSel = aArr[ n ]->sDlgEntry;
|
|
}
|
|
|
|
if (IsFldEdit() && !sOldSel.Len())
|
|
sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
SvStringsDtor aLst;
|
|
GetFldMgr().GetSubTypes(nTypeId, aLst);
|
|
for (USHORT i = 0; i < aLst.Count(); ++i)
|
|
aSelectionLB.InsertEntry(*aLst[i]);
|
|
|
|
if (IsFldEdit())
|
|
sOldSel = pRefFld->GetSetRefName();
|
|
}
|
|
|
|
// --> OD 2007-11-21 #i83479#
|
|
aSelectionToolTipLB.Show( bShowSelectionToolTipLB );
|
|
aSelectionLB.Show( !bShowSelectionToolTipLB );
|
|
if ( bShowSelectionToolTipLB )
|
|
{
|
|
aSelectionToolTipLB.SetUpdateMode(TRUE);
|
|
|
|
BOOL bEnable = aSelectionToolTipLB.GetEntryCount() != 0;
|
|
aSelectionToolTipLB.Enable( bEnable );
|
|
aSelectionFT.Enable( bEnable );
|
|
|
|
if ( aSelectionToolTipLB.GetCurEntry() != 0 )
|
|
{
|
|
aSelectionToolTipLB.MakeVisible( aSelectionToolTipLB.GetCurEntry() );
|
|
}
|
|
|
|
if ( IsFldEdit() && aSelectionToolTipLB.GetCurEntry() == 0 )
|
|
{
|
|
aNameED.SetText(sOldSel);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
aSelectionLB.SetUpdateMode(TRUE);
|
|
|
|
// Enable oder Disable
|
|
BOOL bEnable = aSelectionLB.GetEntryCount() != 0;
|
|
aSelectionLB.Enable( bEnable );
|
|
aSelectionFT.Enable( bEnable );
|
|
|
|
if ( bEnable )
|
|
{
|
|
aSelectionLB.SelectEntry(sOldSel);
|
|
if (!aSelectionLB.GetSelectEntryCount() && !IsFldEdit())
|
|
aSelectionLB.SelectEntryPos(0);
|
|
}
|
|
|
|
if (IsFldEdit() && !aSelectionLB.GetSelectEntryCount()) // Falls die Referenz schon geloescht wurde...
|
|
aNameED.SetText(sOldSel);
|
|
}
|
|
// <--
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
|
|
{
|
|
String sOldSel;
|
|
|
|
USHORT nFormatSel = aFormatLB.GetSelectEntryPos();
|
|
if (nFormatSel != LISTBOX_ENTRY_NOTFOUND)
|
|
sOldSel = aFormatLB.GetEntry(nFormatSel);
|
|
|
|
// Format-Listbox fuellen
|
|
aFormatLB.Clear();
|
|
|
|
// Referenz hat weniger als die Beschriftung
|
|
USHORT nSize( 0 );
|
|
bool bAddCrossRefFormats( false );
|
|
switch (nTypeId)
|
|
{
|
|
// --> OD 2007-11-16 #i83479#
|
|
case REFFLDFLAG_HEADING:
|
|
case REFFLDFLAG_NUMITEM:
|
|
bAddCrossRefFormats = true;
|
|
// intentional no break here
|
|
// <--
|
|
|
|
case TYP_GETREFFLD:
|
|
case REFFLDFLAG_BOOKMARK:
|
|
case REFFLDFLAG_FOOTNOTE:
|
|
case REFFLDFLAG_ENDNOTE:
|
|
nSize = FMT_REF_PAGE_PGDSC - FMT_REF_BEGIN + 1;
|
|
break;
|
|
|
|
default:
|
|
// --> OD 2007-11-16 #i83479#
|
|
// nSize = GetFldMgr().GetFormatCount( (REFFLDFLAG & nTypeId)
|
|
// ? (USHORT)TYP_GETREFFLD : nTypeId,
|
|
// FALSE, IsFldDlgHtmlMode() );
|
|
if ( REFFLDFLAG & nTypeId )
|
|
{
|
|
nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1;
|
|
}
|
|
else
|
|
{
|
|
nSize = GetFldMgr().GetFormatCount( nTypeId, FALSE, IsFldDlgHtmlMode() );
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (REFFLDFLAG & nTypeId)
|
|
nTypeId = TYP_GETREFFLD;
|
|
|
|
for (USHORT i = 0; i < nSize; i++)
|
|
{
|
|
USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, i ));
|
|
aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i )));
|
|
}
|
|
// --> OD 2007-11-16 #i83479#
|
|
if ( bAddCrossRefFormats )
|
|
{
|
|
USHORT nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN;
|
|
USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
|
|
aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
|
|
nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN;
|
|
nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
|
|
aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
|
|
nFormat = FMT_REF_NUMBER_FULL_CONTEXT - FMT_REF_BEGIN;
|
|
nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
|
|
aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
|
|
nSize += 3;
|
|
}
|
|
// <--
|
|
|
|
// select a certain entry
|
|
if (nSize)
|
|
{
|
|
if (!IsFldEdit())
|
|
aFormatLB.SelectEntry(sOldSel);
|
|
else
|
|
aFormatLB.SelectEntry(SW_RESSTR(FMT_REF_BEGIN + (USHORT)GetCurField()->GetFormat()));
|
|
|
|
if (!aFormatLB.GetSelectEntryCount())
|
|
{
|
|
aFormatLB.SelectEntryPos(nFldDlgFmtSel);
|
|
if (!aFormatLB.GetSelectEntryCount())
|
|
aFormatLB.SelectEntryPos(0);
|
|
}
|
|
}
|
|
|
|
return nSize;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung: Modify
|
|
--------------------------------------------------------------------*/
|
|
|
|
IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG )
|
|
{
|
|
String aName(aNameED.GetText());
|
|
const USHORT nLen = aName.Len();
|
|
|
|
BOOL bEnable = TRUE;
|
|
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
|
|
if ((nTypeId == TYP_SETREFFLD && !GetFldMgr().CanInsertRefMark(aName)) ||
|
|
(nLen == 0 && (nTypeId == TYP_GETREFFLD || nTypeId == TYP_SETREFFLD ||
|
|
nTypeId == REFFLDFLAG_BOOKMARK)))
|
|
bEnable = FALSE;
|
|
|
|
EnableInsert(bEnable);
|
|
|
|
aSelectionLB.SelectEntry(aName);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
|
|
{
|
|
BOOL bModified = FALSE;
|
|
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
|
|
|
|
USHORT nSubType = 0;
|
|
ULONG nFormat;
|
|
|
|
nFormat = aFormatLB.GetSelectEntryPos();
|
|
|
|
if(nFormat == LISTBOX_ENTRY_NOTFOUND)
|
|
nFormat = 0;
|
|
else
|
|
nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat);
|
|
|
|
String aVal(aValueED.GetText());
|
|
String aName(aNameED.GetText());
|
|
|
|
switch(nTypeId)
|
|
{
|
|
case TYP_GETREFFLD:
|
|
// aName = aSelectionLB.GetSelectEntry();
|
|
nSubType = REF_SETREFATTR;
|
|
break;
|
|
|
|
case TYP_SETREFFLD:
|
|
{
|
|
SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName);
|
|
|
|
if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt
|
|
{
|
|
aSelectionLB.InsertEntry(aName);
|
|
aSelectionLB.Enable();
|
|
aSelectionFT.Enable();
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
SwGetRefField* pRefFld = (SwGetRefField*)GetCurField();
|
|
|
|
if (REFFLDFLAG & nTypeId)
|
|
{
|
|
SwWrtShell *pSh = GetWrtShell();
|
|
if(!pSh)
|
|
{
|
|
pSh = ::GetActiveWrtShell();
|
|
}
|
|
if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
|
|
{
|
|
aName = aNameED.GetText();
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_BOOKMARK;
|
|
}
|
|
else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten
|
|
{
|
|
SwSeqFldList aArr;
|
|
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
|
|
|
|
USHORT nPos;
|
|
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_FOOTNOTE;
|
|
aName.Erase();
|
|
|
|
if (pSh->GetSeqFtnList(aArr) && aArr.SeekEntry(aElem, &nPos))
|
|
{
|
|
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
|
|
|
|
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
|
|
bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
|
|
}
|
|
else if (IsFldEdit())
|
|
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
|
|
}
|
|
else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten
|
|
{
|
|
SwSeqFldList aArr;
|
|
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
|
|
|
|
USHORT nPos;
|
|
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_ENDNOTE;
|
|
aName.Erase();
|
|
|
|
if (pSh->GetSeqFtnList(aArr, true) && aArr.SeekEntry(aElem, &nPos))
|
|
{
|
|
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
|
|
|
|
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
|
|
bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
|
|
}
|
|
else if (IsFldEdit())
|
|
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
|
|
}
|
|
// --> OD 2007-11-16 #i83479#
|
|
else if ( nTypeId == REFFLDFLAG_HEADING )
|
|
{
|
|
SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry();
|
|
ASSERT( pEntry,
|
|
"<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
|
|
if ( pEntry )
|
|
{
|
|
const sal_uInt16 nOutlIdx( static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())) );
|
|
pSh->getIDocumentOutlineNodesAccess()->getOutlineNodes( maOutlineNodes );
|
|
if ( nOutlIdx < maOutlineNodes.size() )
|
|
{
|
|
::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTxtNode(
|
|
*(maOutlineNodes[nOutlIdx]),
|
|
IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK);
|
|
aName = pMark->GetName();
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_BOOKMARK;
|
|
}
|
|
}
|
|
}
|
|
else if ( nTypeId == REFFLDFLAG_NUMITEM )
|
|
{
|
|
SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry();
|
|
ASSERT( pEntry,
|
|
"<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
|
|
if ( pEntry )
|
|
{
|
|
const sal_uInt16 nNumItemIdx( static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())) );
|
|
pSh->getIDocumentListItemsAccess()->getNumItems( maNumItems );
|
|
if ( nNumItemIdx < maNumItems.size() )
|
|
{
|
|
::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTxtNode(
|
|
*(maNumItems[nNumItemIdx]->GetTxtNode()),
|
|
IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK);
|
|
aName = pMark->GetName();
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_BOOKMARK;
|
|
}
|
|
}
|
|
}
|
|
// <--
|
|
else // SeqenceFelder
|
|
{
|
|
// zum Seq-FeldTyp die Felder besorgen:
|
|
SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
|
|
nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
|
|
if( pType )
|
|
{
|
|
SwSeqFldList aArr;
|
|
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
|
|
|
|
USHORT nPos;
|
|
|
|
nTypeId = TYP_GETREFFLD;
|
|
nSubType = REF_SEQUENCEFLD;
|
|
aName = pType->GetName();
|
|
|
|
if (pType->GetSeqFldList(aArr) && aArr.SeekEntry(aElem, &nPos))
|
|
{
|
|
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
|
|
|
|
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
|
|
bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
|
|
}
|
|
else if (IsFldEdit())
|
|
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
|
|
}
|
|
}
|
|
}
|
|
|
|
if (IsFldEdit() && nTypeId == TYP_GETREFFLD)
|
|
{
|
|
aVal.Insert('|', 0);
|
|
aVal.Insert(String::CreateFromInt32(nSubType), 0);
|
|
}
|
|
|
|
if (!IsFldEdit() || bModified ||
|
|
aNameED.GetSavedValue() != aNameED.GetText() ||
|
|
aValueED.GetSavedValue() != aValueED.GetText() ||
|
|
aTypeLB.GetSavedValue() != aTypeLB.GetSelectEntryPos() ||
|
|
aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() ||
|
|
aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos())
|
|
{
|
|
InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
|
|
}
|
|
|
|
ModifyHdl(); // Insert ggf enablen/disablen
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
SfxTabPage* SwFldRefPage::Create( Window* pParent,
|
|
const SfxItemSet& rAttrSet )
|
|
{
|
|
return ( new SwFldRefPage( pParent, rAttrSet ) );
|
|
}
|
|
|
|
/*--------------------------------------------------------------------
|
|
Beschreibung:
|
|
--------------------------------------------------------------------*/
|
|
|
|
USHORT SwFldRefPage::GetGroup()
|
|
{
|
|
return GRP_REF;
|
|
}
|
|
|
|
/* -----------------12.01.99 10:09-------------------
|
|
*
|
|
* --------------------------------------------------*/
|
|
void SwFldRefPage::FillUserData()
|
|
{
|
|
String sData( String::CreateFromAscii(
|
|
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
|
|
sData += ';';
|
|
USHORT nTypeSel = aTypeLB.GetSelectEntryPos();
|
|
if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
|
|
nTypeSel = USHRT_MAX;
|
|
else
|
|
nTypeSel = sal::static_int_cast< USHORT >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel )));
|
|
sData += String::CreateFromInt32( nTypeSel );
|
|
SetUserData(sData);
|
|
}
|
|
|