office-gobmx/sd/source/ui/unoidl/DrawController.cxx
Release Engineers c12255822c CWS-TOOLING: integrate CWS odfmetadata2
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
2009-07-02 09:05:03 +00:00

933 lines
25 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: DrawController.cxx,v $
* $Revision: 1.27 $
*
* 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_sd.hxx"
#include "DrawController.hxx"
#include "DrawSubController.hxx"
#include "sdpage.hxx"
#include "ViewShellBase.hxx"
#include "ViewShellManager.hxx"
#include "FormShellManager.hxx"
#include "Window.hxx"
#include <comphelper/anytostring.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/stl_types.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/framework/ConfigurationController.hpp>
#include <com/sun/star/drawing/framework/ModuleController.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include "slideshow.hxx"
#include <svx/fmshell.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
using namespace ::std;
using ::rtl::OUString;
using namespace ::cppu;
using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
namespace {
static const ::com::sun::star::uno::Type saComponentTypeIdentifier (
::getCppuType( (Reference<lang::XEventListener > *)0 ));
static const ::com::sun::star::uno::Type saSelectionTypeIdentifier (
::getCppuType( (Reference<view::XSelectionChangeListener > *)0 ));
} // end of anonymous namespace
namespace sd {
DrawController::DrawController (ViewShellBase& rBase) throw()
: DrawControllerInterfaceBase(&rBase),
BroadcastHelperOwner(SfxBaseController::m_aMutex),
OPropertySetHelper( static_cast<OBroadcastHelperVar<
OMultiTypeInterfaceContainerHelper,
OMultiTypeInterfaceContainerHelper::keyType>& >(
BroadcastHelperOwner::maBroadcastHelper)),
mpBase(&rBase),
maLastVisArea(),
mpCurrentPage(NULL),
mbMasterPageMode(false),
mbLayerMode(false),
mbDisposing(false),
mpPropertyArrayHelper(NULL),
mxSubController(),
mxConfigurationController(),
mxModuleController()
{
ProvideFrameworkControllers();
}
DrawController::~DrawController (void) throw()
{
}
void DrawController::SetSubController (
const Reference<drawing::XDrawSubController>& rxSubController)
{
// Update the internal state.
mxSubController = rxSubController;
mpPropertyArrayHelper.reset();
maLastVisArea = Rectangle();
// Inform listeners about the changed state.
FireSelectionChangeListener();
}
// XInterface
IMPLEMENT_FORWARD_XINTERFACE2(
DrawController,
DrawControllerInterfaceBase,
OPropertySetHelper);
// XTypeProvider
Sequence<Type> SAL_CALL DrawController::getTypes (void)
throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed();
// OPropertySetHelper does not provide getTypes, so we have to
// implement this method manually and list its three interfaces.
OTypeCollection aTypeCollection (
::getCppuType (( const Reference<beans::XMultiPropertySet>*)NULL),
::getCppuType (( const Reference<beans::XFastPropertySet>*)NULL),
::getCppuType (( const Reference<beans::XPropertySet>*)NULL));
return ::comphelper::concatSequences(
SfxBaseController::getTypes(),
aTypeCollection.getTypes(),
DrawControllerInterfaceBase::getTypes());
}
IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController);
// XComponent
void SAL_CALL DrawController::dispose (void)
throw( RuntimeException )
{
if( !mbDisposing )
{
OGuard aGuard( Application::GetSolarMutex() );
if( !mbDisposing )
{
mbDisposing = true;
// When the controller has not been detached from its view
// shell, i.e. mpViewShell is not NULL, then tell PaneManager
// and ViewShellManager to clear the shell stack.
if (mxSubController.is() && mpBase!=NULL)
{
mpBase->DisconnectAllClients();
mpBase->GetViewShellManager()->Shutdown();
}
OPropertySetHelper::disposing();
DisposeFrameworkControllers();
SfxBaseController::dispose();
}
}
}
void SAL_CALL DrawController::addEventListener(
const Reference<lang::XEventListener >& xListener)
throw (RuntimeException)
{
ThrowIfDisposed();
SfxBaseController::addEventListener( xListener );
}
void SAL_CALL DrawController::removeEventListener (
const Reference<lang::XEventListener >& aListener)
throw (RuntimeException)
{
if(!rBHelper.bDisposed && !rBHelper.bInDispose && !mbDisposing)
SfxBaseController::removeEventListener( aListener );
}
// XController
::sal_Bool SAL_CALL DrawController::suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException)
{
if( Suspend )
{
ViewShellBase* pViewShellBase = GetViewShellBase();
if( pViewShellBase )
{
// do not allow suspend if a slideshow needs this controller!
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( *pViewShellBase ) );
if( xSlideShow.is() && xSlideShow->dependsOn(pViewShellBase) )
return sal_False;
}
}
return SfxBaseController::suspend( Suspend );
}
// XServiceInfo
OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeException)
{
// Do not throw an excepetion at the moment. This leads to a crash
// under Solaris on relead. See issue i70929 for details.
// ThrowIfDisposed();
return OUString( RTL_CONSTASCII_USTRINGPARAM( "DrawController" ) );
}
static OUString ssServiceName (OUString::createFromAscii(
"com.sun.star.drawing.DrawingDocumentDrawView"));
sal_Bool SAL_CALL DrawController::supportsService (
const OUString& rsServiceName)
throw(RuntimeException)
{
// Do not throw an excepetion at the moment. This leads to a crash
// under Solaris on relead. See issue i70929 for details.
// ThrowIfDisposed();
return rsServiceName.equals(ssServiceName);
}
Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames (void)
throw(RuntimeException)
{
ThrowIfDisposed();
Sequence<OUString> aSupportedServices (1);
OUString* pServices = aSupportedServices.getArray();
pServices[0] = ssServiceName;
return aSupportedServices;
}
//------ XSelectionSupplier --------------------------------------------
sal_Bool SAL_CALL DrawController::select (const Any& aSelection)
throw(lang::IllegalArgumentException, RuntimeException)
{
ThrowIfDisposed();
::vos::OGuard aGuard (Application::GetSolarMutex());
if (mxSubController.is())
return mxSubController->select(aSelection);
else
return false;
}
Any SAL_CALL DrawController::getSelection()
throw(RuntimeException)
{
ThrowIfDisposed();
::vos::OGuard aGuard (Application::GetSolarMutex());
if (mxSubController.is())
return mxSubController->getSelection();
else
return Any();
}
void SAL_CALL DrawController::addSelectionChangeListener(
const Reference< view::XSelectionChangeListener >& xListener)
throw(RuntimeException)
{
if( mbDisposing )
throw lang::DisposedException();
BroadcastHelperOwner::maBroadcastHelper.addListener (saSelectionTypeIdentifier, xListener);
}
void SAL_CALL DrawController::removeSelectionChangeListener(
const Reference< view::XSelectionChangeListener >& xListener )
throw(RuntimeException)
{
if (rBHelper.bDisposed)
throw lang::DisposedException();
BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
}
//===== lang::XEventListener ================================================
void SAL_CALL
DrawController::disposing (const lang::EventObject& )
throw (uno::RuntimeException)
{
}
//===== view::XSelectionChangeListener ======================================
void SAL_CALL
DrawController::selectionChanged (const lang::EventObject& rEvent)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
// Have to forward the event to our selection change listeners.
OInterfaceContainerHelper* pListeners = BroadcastHelperOwner::maBroadcastHelper.getContainer(
::getCppuType((Reference<view::XSelectionChangeListener>*)0));
if (pListeners)
{
// Re-send the event to all of our listeners.
OInterfaceIteratorHelper aIterator (*pListeners);
while (aIterator.hasMoreElements())
{
try
{
view::XSelectionChangeListener* pListener =
static_cast<view::XSelectionChangeListener*>(
aIterator.next());
if (pListener != NULL)
pListener->selectionChanged (rEvent);
}
catch (RuntimeException aException)
{
}
}
}
}
::awt::Rectangle DrawController::GetVisArea (void) const
{
return awt::Rectangle(
maLastVisArea.Left(),
maLastVisArea.Top(),
maLastVisArea.GetWidth(),
maLastVisArea.GetHeight());
}
// XDrawView
void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage )
throw(RuntimeException)
{
ThrowIfDisposed();
::vos::OGuard aGuard (Application::GetSolarMutex());
if (mxSubController.is())
mxSubController->setCurrentPage(xPage);
}
Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void)
throw(RuntimeException)
{
ThrowIfDisposed();
::vos::OGuard aGuard( Application::GetSolarMutex() );
Reference<drawing::XDrawPage> xPage;
// Get current page from sub controller.
if (mxSubController.is())
xPage = mxSubController->getCurrentPage();
// When there is not yet a sub controller (during initialization) then fall back
// to the current page in mpCurrentPage.
if ( ! xPage.is() && mpCurrentPage.is())
xPage = Reference<drawing::XDrawPage>(mpCurrentPage->getUnoPage(), UNO_QUERY);
return xPage;
}
void DrawController::FireVisAreaChanged (const Rectangle& rVisArea) throw()
{
if( maLastVisArea != rVisArea )
{
Any aNewValue;
aNewValue <<= awt::Rectangle(
rVisArea.Left(),
rVisArea.Top(),
rVisArea.GetWidth(),
rVisArea.GetHeight() );
Any aOldValue;
aOldValue <<= awt::Rectangle(
maLastVisArea.Left(),
maLastVisArea.Top(),
maLastVisArea.GetWidth(),
maLastVisArea.GetHeight() );
FirePropertyChange (PROPERTY_WORKAREA, aNewValue, aOldValue);
maLastVisArea = rVisArea;
}
}
void DrawController::FireSelectionChangeListener() throw()
{
OInterfaceContainerHelper * pLC = BroadcastHelperOwner::maBroadcastHelper.getContainer(
saSelectionTypeIdentifier);
if( pLC )
{
Reference< XInterface > xSource( (XWeak*)this );
const lang::EventObject aEvent( xSource );
// Ueber alle Listener iterieren und Events senden
OInterfaceIteratorHelper aIt( *pLC);
while( aIt.hasMoreElements() )
{
try
{
view::XSelectionChangeListener * pL =
static_cast<view::XSelectionChangeListener*>(aIt.next());
if (pL != NULL)
pL->selectionChanged( aEvent );
}
catch (RuntimeException aException)
{
}
}
}
}
void DrawController::FireChangeEditMode (bool bMasterPageMode) throw()
{
if (bMasterPageMode != mbMasterPageMode )
{
FirePropertyChange(
PROPERTY_MASTERPAGEMODE,
makeAny(bMasterPageMode),
makeAny(mbMasterPageMode));
mbMasterPageMode = bMasterPageMode;
}
}
void DrawController::FireChangeLayerMode (bool bLayerMode) throw()
{
if (bLayerMode != mbLayerMode)
{
FirePropertyChange(
PROPERTY_LAYERMODE,
makeAny(bLayerMode),
makeAny(mbLayerMode));
mbLayerMode = bLayerMode;
}
}
void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
{
SdrPage* pCurrentPage = mpCurrentPage.get();
if (pNewCurrentPage != pCurrentPage)
{
try
{
Any aNewValue (
makeAny(Reference<drawing::XDrawPage>(pNewCurrentPage->getUnoPage(), UNO_QUERY)));
Any aOldValue;
if (pCurrentPage != NULL)
{
Reference<drawing::XDrawPage> xOldPage (pCurrentPage->getUnoPage(), UNO_QUERY);
aOldValue <<= xOldPage;
}
FirePropertyChange(PROPERTY_CURRENTPAGE, aNewValue, aOldValue);
mpCurrentPage.reset(pNewCurrentPage);
}
catch( uno::Exception& e )
{
(void)e;
DBG_ERROR(
(::rtl::OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), "
"exception caught: ") +
::rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
}
}
}
void DrawController::FirePropertyChange (
sal_Int32 nHandle,
const Any& rNewValue,
const Any& rOldValue)
{
try
{
fire (&nHandle, &rNewValue, &rOldValue, 1, sal_False);
}
catch (RuntimeException aException)
{
// Ignore this exception. Exceptions should be handled in the
// fire() function so that all listeners are called. This is
// not the case at the moment, so we simply ignore the
// exception.
}
}
ViewShellBase* DrawController::GetViewShellBase (void)
{
return mpBase;
}
void DrawController::ReleaseViewShellBase (void)
{
DisposeFrameworkControllers();
mpBase = NULL;
}
//===== XControllerManager ==============================================================
Reference<XConfigurationController> SAL_CALL
DrawController::getConfigurationController (void)
throw (RuntimeException)
{
ThrowIfDisposed();
return mxConfigurationController;
}
Reference<XModuleController> SAL_CALL
DrawController::getModuleController (void)
throw (RuntimeException)
{
ThrowIfDisposed();
return mxModuleController;
}
//===== XUnoTunnel ============================================================
const Sequence<sal_Int8>& DrawController::getUnoTunnelId (void)
{
static ::com::sun::star::uno::Sequence<sal_Int8>* pSequence = NULL;
if (pSequence == NULL)
{
::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex());
if (pSequence == NULL)
{
static ::com::sun::star::uno::Sequence<sal_Int8> aSequence (16);
rtl_createUuid((sal_uInt8*)aSequence.getArray(), 0, sal_True);
pSequence = &aSequence;
}
}
return *pSequence;
}
sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId)
throw (RuntimeException)
{
sal_Int64 nResult = 0;
if (rId.getLength() == 16
&& rtl_compareMemory(getUnoTunnelId().getConstArray(), rId.getConstArray(), 16) == 0)
{
nResult = sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
}
return nResult;
}
//===== Properties ============================================================
void DrawController::FillPropertyTable (
::std::vector<beans::Property>& rProperties)
{
rProperties.push_back(
beans::Property(
OUString( RTL_CONSTASCII_USTRINGPARAM("VisibleArea") ),
PROPERTY_WORKAREA,
::getCppuType((const ::com::sun::star::awt::Rectangle*)0),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY));
rProperties.push_back(
beans::Property(
OUString( RTL_CONSTASCII_USTRINGPARAM("SubController") ),
PROPERTY_SUB_CONTROLLER,
::getCppuType((const Reference<drawing::XDrawSubController>*)0),
beans::PropertyAttribute::BOUND));
rProperties.push_back(
beans::Property(
OUString( RTL_CONSTASCII_USTRINGPARAM("CurrentPage") ),
PROPERTY_CURRENTPAGE,
::getCppuType((const Reference< drawing::XDrawPage > *)0),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("IsLayerMode") ),
PROPERTY_LAYERMODE,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode") ),
PROPERTY_MASTERPAGEMODE,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveLayer") ),
PROPERTY_ACTIVE_LAYER,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomValue") ),
PROPERTY_ZOOMVALUE,
::getCppuType((const sal_Int16*)0),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomType") ),
PROPERTY_ZOOMTYPE,
::getCppuType((const sal_Int16*)0),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOffset") ),
PROPERTY_VIEWOFFSET,
::getCppuType((const ::com::sun::star::awt::Point*)0),
beans::PropertyAttribute::BOUND ));
}
IPropertyArrayHelper & DrawController::getInfoHelper()
{
OGuard aGuard( Application::GetSolarMutex() );
if (mpPropertyArrayHelper.get() == NULL)
{
::std::vector<beans::Property> aProperties;
FillPropertyTable (aProperties);
Sequence<beans::Property> aPropertySequence (aProperties.size());
for (unsigned int i=0; i<aProperties.size(); i++)
aPropertySequence[i] = aProperties[i];
mpPropertyArrayHelper.reset(new OPropertyArrayHelper(aPropertySequence, sal_False));
}
return *mpPropertyArrayHelper.get();
}
Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo()
throw ( ::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
static Reference < beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
uno::Reference< form::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException)
{
OGuard aGuard( Application::GetSolarMutex() );
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
SdrView* pSdrView = mpBase->GetDrawView();
::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL;
uno::Reference< form::XFormController > xController( NULL );
if ( pFormShell && pSdrView && pWindow )
xController = pFormShell->GetFormController( Form, *pSdrView, *pWindow );
return xController;
}
::sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeException)
{
OGuard aGuard( Application::GetSolarMutex() );
sal_Bool bIsDesignMode = sal_True;
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
if ( pFormShell )
bIsDesignMode = pFormShell->IsDesignMode();
return bIsDesignMode;
}
void SAL_CALL DrawController::setFormDesignMode( ::sal_Bool _DesignMode ) throw (uno::RuntimeException)
{
OGuard aGuard( Application::GetSolarMutex() );
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
if ( pFormShell )
pFormShell->SetDesignMode( _DesignMode );
}
uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) throw (container::NoSuchElementException, uno::RuntimeException)
{
OGuard aGuard( Application::GetSolarMutex() );
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
SdrView* pSdrView = mpBase->GetDrawView();
::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL;
uno::Reference< awt::XControl > xControl( NULL );
if ( pFormShell && pSdrView && pWindow )
pFormShell->GetFormControl( xModel, *pSdrView, *pWindow, xControl );
return xControl;
}
sal_Bool DrawController::convertFastPropertyValue (
Any & rConvertedValue,
Any & rOldValue,
sal_Int32 nHandle,
const Any& rValue)
throw ( com::sun::star::lang::IllegalArgumentException)
{
sal_Bool bResult = sal_False;
if (nHandle == PROPERTY_SUB_CONTROLLER)
{
rOldValue <<= mxSubController;
rConvertedValue <<= Reference<drawing::XDrawSubController>(rValue, UNO_QUERY);
bResult = (rOldValue != rConvertedValue);
}
else if (mxSubController.is())
{
rConvertedValue = rValue;
rOldValue = mxSubController->getFastPropertyValue(nHandle);
bResult = (rOldValue != rConvertedValue);
/* bResult = mpSubController->convertFastPropertyValue(
rConvertedValue,
rOldValue,
nHandle,
rValue);
*/
}
return bResult;
}
void DrawController::setFastPropertyValue_NoBroadcast (
sal_Int32 nHandle,
const Any& rValue)
throw ( com::sun::star::uno::Exception)
{
OGuard aGuard( Application::GetSolarMutex() );
if (nHandle == PROPERTY_SUB_CONTROLLER)
SetSubController(Reference<drawing::XDrawSubController>(rValue, UNO_QUERY));
else if (mxSubController.is())
mxSubController->setFastPropertyValue(nHandle, rValue);
}
void DrawController::getFastPropertyValue (
Any & rRet,
sal_Int32 nHandle ) const
{
OGuard aGuard( Application::GetSolarMutex() );
switch( nHandle )
{
case PROPERTY_WORKAREA:
rRet <<= awt::Rectangle(
maLastVisArea.Left(),
maLastVisArea.Top(),
maLastVisArea.GetWidth(),
maLastVisArea.GetHeight());
break;
case PROPERTY_SUB_CONTROLLER:
rRet <<= mxSubController;
break;
default:
if (mxSubController.is())
rRet = mxSubController->getFastPropertyValue(nHandle);
break;
}
}
//-----------------------------------------------------------------------------
void DrawController::ProvideFrameworkControllers (void)
{
::vos::OGuard aGuard (Application::GetSolarMutex());
try
{
Reference<XController> xController (this);
const Reference<XComponentContext> xContext (
::comphelper::getProcessComponentContext() );
mxConfigurationController = ConfigurationController::create(
xContext,
xController);
mxModuleController = ModuleController::create(
xContext,
xController);
}
catch (RuntimeException&)
{
mxConfigurationController = NULL;
mxModuleController = NULL;
}
}
void DrawController::DisposeFrameworkControllers (void)
{
Reference<XComponent> xComponent (mxModuleController, UNO_QUERY);
if (xComponent.is())
xComponent->dispose();
xComponent = Reference<XComponent>(mxConfigurationController, UNO_QUERY);
if (xComponent.is())
xComponent->dispose();
}
void DrawController::ThrowIfDisposed (void) const
throw (::com::sun::star::lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing)
{
OSL_TRACE ("Calling disposed DrawController object. Throwing exception:");
throw lang::DisposedException (
OUString(RTL_CONSTASCII_USTRINGPARAM(
"DrawController object has already been disposed")),
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
} // end of namespace sd