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
459 lines
16 KiB
C++
459 lines
16 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: porfly.cxx,v $
|
|
* $Revision: 1.38 $
|
|
*
|
|
* 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 "dcontact.hxx" // SwDrawContact
|
|
#include "dflyobj.hxx" // SwVirtFlyDrawObj
|
|
#include "pam.hxx" // SwPosition
|
|
#include "flyfrm.hxx" // SwFlyInCntFrm
|
|
#include "frmfmt.hxx" // SwFrmFmt
|
|
#include "viewsh.hxx"
|
|
|
|
#ifndef _OUTDEV_HXX //autogen
|
|
#include <vcl/outdev.hxx>
|
|
#endif
|
|
#include <svx/lrspitem.hxx>
|
|
#include <svx/ulspitem.hxx>
|
|
#include <fmtanchr.hxx>
|
|
#include <fmtflcnt.hxx>
|
|
#include <fmtornt.hxx>
|
|
#include <frmatr.hxx>
|
|
#include "flyfrms.hxx"
|
|
#include "txatbase.hxx" // SwTxtAttr
|
|
#include "porfly.hxx"
|
|
#include "porlay.hxx" // SetFly
|
|
#include "inftxt.hxx" // SwTxtPaintInfo
|
|
|
|
// OD 2004-05-24 #i28701#
|
|
#include <sortedobjs.hxx>
|
|
|
|
/*************************************************************************
|
|
* class SwFlyPortion
|
|
*
|
|
* Wir erwarten ein framelokales SwRect !
|
|
*************************************************************************/
|
|
|
|
void SwFlyPortion::Paint( const SwTxtPaintInfo& ) const
|
|
{
|
|
}
|
|
|
|
/*************************************************************************
|
|
* virtual SwFlyPortion::Format()
|
|
*************************************************************************/
|
|
sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
|
|
{
|
|
ASSERT( Fix() >= rInf.X(), "SwFlyPortion::Format: rush hour" );
|
|
// 8537: Tabs muessen expandiert werden.
|
|
if( rInf.GetLastTab() )
|
|
((SwLinePortion*)rInf.GetLastTab())->FormatEOL( rInf );
|
|
|
|
// Der Glue wird aufgespannt.
|
|
rInf.GetLast()->FormatEOL( rInf );
|
|
PrtWidth( static_cast<USHORT>(Fix() - rInf.X() + PrtWidth()) );
|
|
if( !Width() )
|
|
{
|
|
ASSERT( Width(), "+SwFlyPortion::Format: a fly is a fly is a fly" );
|
|
Width(1);
|
|
}
|
|
|
|
// Restaurierung
|
|
rInf.SetFly( 0 );
|
|
rInf.Width( rInf.RealWidth() );
|
|
rInf.GetParaPortion()->SetFly( sal_True );
|
|
|
|
// trailing blank:
|
|
if( rInf.GetIdx() < rInf.GetTxt().Len() && 1 < rInf.GetIdx()
|
|
&& !rInf.GetRest()
|
|
&& ' ' == rInf.GetChar( rInf.GetIdx() )
|
|
&& ' ' != rInf.GetChar( rInf.GetIdx() - 1 )
|
|
&& ( !rInf.GetLast() || !rInf.GetLast()->IsBreakPortion() ) )
|
|
{
|
|
SetBlankWidth( rInf.GetTxtSize( ' ' ).Width() );
|
|
SetLen( 1 );
|
|
}
|
|
|
|
const USHORT nNewWidth = static_cast<USHORT>(rInf.X() + PrtWidth());
|
|
if( rInf.Width() <= nNewWidth )
|
|
{
|
|
Truncate();
|
|
if( nNewWidth > rInf.Width() )
|
|
{
|
|
PrtWidth( nNewWidth - rInf.Width() );
|
|
SetFixWidth( PrtWidth() );
|
|
}
|
|
return sal_True;
|
|
}
|
|
return sal_False;
|
|
}
|
|
|
|
/*************************************************************************
|
|
* virtual SwFlyCntPortion::Format()
|
|
*************************************************************************/
|
|
sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
|
|
{
|
|
sal_Bool bFull = rInf.Width() < rInf.X() + PrtWidth();
|
|
|
|
if( bFull )
|
|
{
|
|
// 3924: wenn die Zeile voll ist und der zeichengebundene Frame am
|
|
// Anfang der Zeile steht.
|
|
// 5157: nicht wenn einem Fly ausgewichen werden kann!
|
|
// "Begin of line" criteria ( ! rInf.X() ) has to be extended.
|
|
// KerningPortions at beginning of line, e.g., for grid layout
|
|
// must be considered.
|
|
const SwLinePortion* pLastPor = rInf.GetLast();
|
|
const USHORT nLeft = ( pLastPor &&
|
|
( pLastPor->IsKernPortion() ||
|
|
pLastPor->IsErgoSumPortion() ) ) ?
|
|
pLastPor->Width() :
|
|
0;
|
|
|
|
if( nLeft == rInf.X() && ! rInf.GetFly() )
|
|
{
|
|
Width( rInf.Width() );
|
|
bFull = sal_False; // Damit Notizen noch in dieser Zeile landen
|
|
}
|
|
else
|
|
{
|
|
if( !rInf.GetFly() )
|
|
rInf.SetNewLine( sal_True );
|
|
Width(0);
|
|
SetAscent(0);
|
|
SetLen(0);
|
|
if( rInf.GetLast() )
|
|
rInf.GetLast()->FormatEOL( rInf );
|
|
|
|
return bFull;
|
|
}
|
|
}
|
|
|
|
rInf.GetParaPortion()->SetFly( sal_True );
|
|
return bFull;
|
|
}
|
|
|
|
/*************************************************************************
|
|
* SwTxtFrm::MoveFlyInCnt() haengt jetzt die zeichengebundenen Objekte
|
|
* innerhalb des angegebenen Bereichs um, damit koennen diese vom Master
|
|
* zum Follow oder umgekehrt wandern.
|
|
*************************************************************************/
|
|
void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, xub_StrLen nStart, xub_StrLen nEnd )
|
|
{
|
|
SwSortedObjs *pObjs = 0L;
|
|
if ( 0 != (pObjs = GetDrawObjs()) )
|
|
{
|
|
for ( sal_uInt32 i = 0; GetDrawObjs() && i < pObjs->Count(); ++i )
|
|
{
|
|
// OD 2004-03-29 #i26791#
|
|
// --> OD 2004-07-06 #i28701# - consider changed type of
|
|
// <SwSortedList> entries
|
|
SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
|
|
const SwFmtAnchor& rAnch = pAnchoredObj->GetFrmFmt().GetAnchor();
|
|
if ( rAnch.GetAnchorId() == FLY_IN_CNTNT )
|
|
{
|
|
const SwPosition* pPos = rAnch.GetCntntAnchor();
|
|
xub_StrLen nIdx = pPos->nContent.GetIndex();
|
|
if ( nIdx >= nStart && nEnd > nIdx )
|
|
{
|
|
if ( pAnchoredObj->ISA(SwFlyFrm) )
|
|
{
|
|
RemoveFly( static_cast<SwFlyFrm*>(pAnchoredObj) );
|
|
pNew->AppendFly( static_cast<SwFlyFrm*>(pAnchoredObj) );
|
|
}
|
|
else if ( pAnchoredObj->ISA(SwAnchoredDrawObject) )
|
|
{
|
|
RemoveDrawObj( *pAnchoredObj );
|
|
pNew->AppendDrawObj( *pAnchoredObj );
|
|
}
|
|
--i;
|
|
}
|
|
}
|
|
// <--
|
|
}
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
* SwTxtFrm::CalcFlyPos()
|
|
*************************************************************************/
|
|
xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
|
|
{
|
|
SwpHints* pHints = GetTxtNode()->GetpSwpHints();
|
|
ASSERT( pHints, "CalcFlyPos: Why me?" );
|
|
if( !pHints )
|
|
return STRING_LEN;
|
|
SwTxtAttr* pFound = NULL;
|
|
for ( USHORT i = 0; i < pHints->Count(); i++)
|
|
{
|
|
SwTxtAttr *pHt = pHints->GetTextHint( i );
|
|
if( RES_TXTATR_FLYCNT == pHt->Which() )
|
|
{
|
|
SwFrmFmt* pFrmFmt = pHt->GetFlyCnt().GetFrmFmt();
|
|
if( pFrmFmt == pSearch )
|
|
pFound = pHt;
|
|
}
|
|
}
|
|
ASSERT( pHints, "CalcFlyPos: Not Found!" );
|
|
if( !pFound )
|
|
return STRING_LEN;
|
|
return *pFound->GetStart();
|
|
}
|
|
|
|
/*************************************************************************
|
|
* virtual SwFlyCntPortion::Paint()
|
|
*************************************************************************/
|
|
void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
|
|
{
|
|
if( bDraw )
|
|
{
|
|
if( !((SwDrawContact*)pContact)->GetAnchorFrm() )
|
|
{
|
|
// OD 2004-04-01 #i26791# - no direct positioning of the drawing
|
|
// object is needed.
|
|
SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(pContact);
|
|
pDrawContact->ConnectToLayout();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Baseline-Ausgabe !
|
|
// 7922: Bei CompletePaint alles painten
|
|
SwRect aRepaintRect( rInf.GetPaintRect() );
|
|
|
|
if ( rInf.GetTxtFrm()->IsRightToLeft() )
|
|
rInf.GetTxtFrm()->SwitchLTRtoRTL( aRepaintRect );
|
|
|
|
if ( rInf.GetTxtFrm()->IsVertical() )
|
|
rInf.GetTxtFrm()->SwitchHorizontalToVertical( aRepaintRect );
|
|
|
|
if( (GetFlyFrm()->IsCompletePaint() ||
|
|
GetFlyFrm()->Frm().IsOver( aRepaintRect )) &&
|
|
SwFlyFrm::IsPaint( (SdrObject*)GetFlyFrm()->GetVirtDrawObj(),
|
|
GetFlyFrm()->GetShell() ))
|
|
{
|
|
SwRect aRect( GetFlyFrm()->Frm() );
|
|
if( !GetFlyFrm()->IsCompletePaint() )
|
|
aRect._Intersection( aRepaintRect );
|
|
|
|
|
|
// GetFlyFrm() may change the layout mode at the output device.
|
|
{
|
|
SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
|
|
GetFlyFrm()->Paint( aRect );
|
|
}
|
|
((SwTxtPaintInfo&)rInf).GetRefDev()->SetLayoutMode(
|
|
rInf.GetOut()->GetLayoutMode() );
|
|
|
|
// Es hilft alles nichts, im zeichengebundenen Frame kann wer weiss
|
|
// was am OutputDevice eingestellt sein, wir muessen unseren Font
|
|
// wieder hineinselektieren. Dass wir im const stehen, soll uns
|
|
// daran nicht hindern:
|
|
((SwTxtPaintInfo&)rInf).SelectFont();
|
|
|
|
// I want to know if this can really happen. So here comes a new
|
|
ASSERT( ! rInf.GetVsh() || rInf.GetVsh()->GetOut() == rInf.GetOut(),
|
|
"SwFlyCntPortion::Paint: Outdev has changed" )
|
|
if( rInf.GetVsh() )
|
|
((SwTxtPaintInfo&)rInf).SetOut( rInf.GetVsh()->GetOut() );
|
|
}
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
* SwFlyCntPortion::SwFlyCntPortion()
|
|
*
|
|
* Es werden die Masze vom pFly->OutRect() eingestellt.
|
|
* Es erfolgt ein SetBase() !
|
|
*************************************************************************/
|
|
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
|
|
SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
|
|
SwFlyInCntFrm *pFly, const Point &rBase,
|
|
long nLnAscent, long nLnDescent,
|
|
long nFlyAsc, long nFlyDesc,
|
|
objectpositioning::AsCharFlags nFlags ) :
|
|
pContact( pFly ),
|
|
bDraw( sal_False ),
|
|
bMax( sal_False ),
|
|
nAlign( 0 )
|
|
{
|
|
ASSERT( pFly, "SwFlyCntPortion::SwFlyCntPortion: no SwFlyInCntFrm!" );
|
|
nLineLength = 1;
|
|
nFlags |= AS_CHAR_ULSPACE | AS_CHAR_INIT;
|
|
SetBase( rFrm, rBase, nLnAscent, nLnDescent, nFlyAsc, nFlyDesc, nFlags );
|
|
SetWhichPor( POR_FLYCNT );
|
|
}
|
|
|
|
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
|
|
SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
|
|
SwDrawContact *pDrawContact, const Point &rBase,
|
|
long nLnAscent, long nLnDescent,
|
|
long nFlyAsc, long nFlyDesc,
|
|
objectpositioning::AsCharFlags nFlags ) :
|
|
pContact( pDrawContact ),
|
|
bDraw( sal_True ),
|
|
bMax( sal_False ),
|
|
nAlign( 0 )
|
|
{
|
|
ASSERT( pDrawContact, "SwFlyCntPortion::SwFlyCntPortion: no SwDrawContact!" );
|
|
if( !pDrawContact->GetAnchorFrm() )
|
|
{
|
|
// OD 2004-04-01 #i26791# - no direct positioning needed any more
|
|
pDrawContact->ConnectToLayout();
|
|
// --> OD 2005-01-14 #i40333# - follow-up of #i35635#
|
|
// move object to visible layer
|
|
pDrawContact->MoveObjToVisibleLayer( pDrawContact->GetMaster() );
|
|
// <--
|
|
}
|
|
nLineLength = 1;
|
|
nFlags |= AS_CHAR_ULSPACE | AS_CHAR_INIT;
|
|
|
|
SetBase( rFrm, rBase, nLnAscent, nLnDescent, nFlyAsc, nFlyDesc, nFlags );
|
|
|
|
SetWhichPor( POR_FLYCNT );
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* SwFlyCntPortion::SetBase()
|
|
*
|
|
* Nach dem Setzen des RefPoints muss der Ascent neu berechnet werden,
|
|
* da er von der RelPos abhaengt.
|
|
* pFly->GetRelPos().Y() bezeichnet die relative Position zur Baseline.
|
|
* Bei 0 liegt der obere Rand des FlyCnt auf der Baseline der Zeile.
|
|
*************************************************************************/
|
|
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
|
|
void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
|
|
long nLnAscent, long nLnDescent,
|
|
long nFlyAsc, long nFlyDesc,
|
|
objectpositioning::AsCharFlags nFlags )
|
|
{
|
|
// Note: rBase have to be an absolute value
|
|
|
|
// OD 28.10.2003 #113049# - use new class to position object
|
|
// determine drawing object
|
|
SdrObject* pSdrObj = 0L;
|
|
if( bDraw )
|
|
{
|
|
// OD 20.06.2003 #108784# - determine drawing object ('master' or 'virtual')
|
|
// by frame.
|
|
pSdrObj = GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm );
|
|
if ( !pSdrObj )
|
|
{
|
|
ASSERT( false, "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
|
|
pSdrObj = GetDrawContact()->GetMaster();
|
|
}
|
|
// --> OD 2007-11-29 #i65798#
|
|
// call <SwAnchoredDrawObject::MakeObjPos()> to assure that flag at
|
|
// the <DrawFrmFmt> and at the <SwAnchoredDrawObject> instance are
|
|
// correctly set.
|
|
if ( pSdrObj )
|
|
{
|
|
GetDrawContact()->GetAnchoredObj( pSdrObj )->MakeObjPos();
|
|
}
|
|
// <--
|
|
}
|
|
else
|
|
{
|
|
pSdrObj = GetFlyFrm()->GetVirtDrawObj();
|
|
}
|
|
|
|
// position object
|
|
objectpositioning::SwAsCharAnchoredObjectPosition aObjPositioning(
|
|
*pSdrObj,
|
|
rBase, nFlags,
|
|
nLnAscent, nLnDescent, nFlyAsc, nFlyDesc );
|
|
|
|
// OD 2004-04-13 #i26791# - scope of local variable <aObjPosInProgress>
|
|
{
|
|
// OD 2004-04-13 #i26791#
|
|
SwObjPositioningInProgress aObjPosInProgress( *pSdrObj );
|
|
aObjPositioning.CalcPosition();
|
|
}
|
|
|
|
SetAlign( aObjPositioning.GetLineAlignment() );
|
|
|
|
aRef = aObjPositioning.GetAnchorPos();
|
|
if( nFlags & AS_CHAR_ROTATE )
|
|
SvXSize( aObjPositioning.GetObjBoundRectInclSpacing().SSize() );
|
|
else
|
|
SvLSize( aObjPositioning.GetObjBoundRectInclSpacing().SSize() );
|
|
if( Height() )
|
|
{
|
|
SwTwips nRelPos = aObjPositioning.GetRelPosY();
|
|
if ( nRelPos < 0 )
|
|
{
|
|
nAscent = static_cast<USHORT>(-nRelPos);
|
|
if( nAscent > Height() )
|
|
Height( nAscent );
|
|
}
|
|
else
|
|
{
|
|
nAscent = 0;
|
|
Height( Height() + static_cast<USHORT>(nRelPos) );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Height( 1 );
|
|
nAscent = 0;
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
* virtual SwFlyCntPortion::GetFlyCrsrOfst()
|
|
*************************************************************************/
|
|
|
|
xub_StrLen SwFlyCntPortion::GetFlyCrsrOfst( const KSHORT nOfst,
|
|
const Point &rPoint, SwPosition *pPos, SwCrsrMoveState* pCMS ) const
|
|
{
|
|
// Da die FlyCnt nicht an der Seite haengen, wird ihr
|
|
// GetCrsrOfst() nicht gerufen. Um die Layoutseite
|
|
// von unnoetiger Verwaltung zu entlasten, ruft der Absatz
|
|
// das GetCrsrOfst des FlyFrm, wenn es erforderlich ist.
|
|
Point aPoint( rPoint );
|
|
if( !pPos || bDraw || !( GetFlyFrm()->GetCrsrOfst( pPos, aPoint, pCMS ) ) )
|
|
return SwLinePortion::GetCrsrOfst( nOfst );
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/*************************************************************************
|
|
* virtual SwFlyCntPortion::GetCrsrOfst()
|
|
*************************************************************************/
|
|
|
|
xub_StrLen SwFlyCntPortion::GetCrsrOfst( const KSHORT nOfst ) const
|
|
{
|
|
// ASSERT( !this, "SwFlyCntPortion::GetCrsrOfst: use GetFlyCrsrOfst()" );
|
|
return SwLinePortion::GetCrsrOfst( nOfst );
|
|
}
|
|
|