c12255822c
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
1219 lines
46 KiB
C++
1219 lines
46 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: frmview.cxx,v $
|
|
* $Revision: 1.38.108.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_sd.hxx"
|
|
|
|
#include "FrameView.hxx"
|
|
|
|
#ifndef _SVXIDS_HRC
|
|
#include <svx/svxids.hrc>
|
|
#endif
|
|
#include <sfx2/topfrm.hxx>
|
|
#include <com/sun/star/awt/Rectangle.hpp>
|
|
#include <com/sun/star/drawing/framework/ResourceId.hpp>
|
|
#include <rtl/ustrbuf.hxx>
|
|
#include "unokywds.hxx"
|
|
|
|
#include <vector>
|
|
#include "ViewShell.hxx"
|
|
#include "drawdoc.hxx"
|
|
#include "DrawDocShell.hxx"
|
|
#include "optsitem.hxx"
|
|
#include "ViewShellBase.hxx"
|
|
#include "DrawViewShell.hxx"
|
|
#include "OutlineViewShell.hxx"
|
|
#include "app.hxx"
|
|
#include "sdresid.hxx"
|
|
#include "pres.hxx"
|
|
#include "glob.hrc"
|
|
#include "sdiocmpt.hxx"
|
|
#include "framework/FrameworkHelper.hxx"
|
|
#include <comphelper/processfactory.hxx>
|
|
|
|
using namespace ::com::sun::star;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::beans;
|
|
using namespace ::std;
|
|
using ::rtl::OUString;
|
|
|
|
namespace sd {
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Ctor
|
|
|*
|
|
\************************************************************************/
|
|
|
|
FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK */)
|
|
: SdrView(pDrawDoc, (OutputDevice*) NULL),
|
|
mnRefCount(0),
|
|
mnPresViewShellId(SID_VIEWSHELL0),
|
|
mnSlotId(SID_OBJECT_SELECT),
|
|
mbIsNavigatorShowingAllShapes(false)
|
|
{
|
|
EndListening(*pDrawDoc);
|
|
|
|
EnableExtendedKeyInputDispatcher(FALSE);
|
|
EnableExtendedMouseEventDispatcher(FALSE);
|
|
EnableExtendedCommandEventDispatcher(FALSE);
|
|
|
|
SetGridFront( FALSE );
|
|
SetHlplFront( FALSE );
|
|
SetOConSnap( FALSE );
|
|
SetFrameDragSingles( TRUE );
|
|
SetSlidesPerRow(4);
|
|
|
|
if( NULL == pFrameView )
|
|
{
|
|
DrawDocShell* pDocShell = pDrawDoc->GetDocSh();
|
|
|
|
if ( pDocShell )
|
|
{
|
|
/**********************************************************************
|
|
* Das Dokument wurde geladen, ist eine FrameView vorhanden?
|
|
**********************************************************************/
|
|
ULONG nSdViewShellCount = 0;
|
|
ViewShellBase* pBase = NULL;
|
|
SfxViewShell* pSfxViewSh = NULL;
|
|
SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell,
|
|
TYPE(SfxTopViewFrame));
|
|
|
|
while (pSfxViewFrame)
|
|
{
|
|
// Count the FrameViews and remember the type of the main
|
|
// view shell.
|
|
pSfxViewSh = pSfxViewFrame->GetViewShell();
|
|
pBase = PTR_CAST(ViewShellBase, pSfxViewSh );
|
|
|
|
if (pBase != NULL)
|
|
{
|
|
nSdViewShellCount++;
|
|
|
|
::rtl::OUString sViewURL;
|
|
Reference<drawing::framework::XView> xView (
|
|
framework::FrameworkHelper::Instance(*pBase)->GetView(
|
|
drawing::framework::ResourceId::create(
|
|
::comphelper::getProcessComponentContext(),
|
|
framework::FrameworkHelper::msCenterPaneURL)));
|
|
if (xView.is())
|
|
sViewURL = xView->getResourceId()->getResourceURL();
|
|
|
|
switch (framework::FrameworkHelper::GetViewId(sViewURL))
|
|
{
|
|
default:
|
|
// case ViewShell::ST_IMPRESS:
|
|
// case ViewShell::ST_NOTES:
|
|
// case ViewShell::ST_HANDOUT:
|
|
mnPresViewShellId = SID_VIEWSHELL0;
|
|
break;
|
|
|
|
case ViewShell::ST_SLIDE_SORTER:
|
|
mnPresViewShellId = SID_VIEWSHELL1;
|
|
break;
|
|
|
|
case ViewShell::ST_OUTLINE:
|
|
mnPresViewShellId = SID_VIEWSHELL2;
|
|
break;
|
|
}
|
|
}
|
|
|
|
pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell,
|
|
TYPE(SfxTopViewFrame));
|
|
}
|
|
|
|
SdDrawDocument* pDoc = pDocShell->GetDoc();
|
|
pFrameView = pDoc->GetFrameView(nSdViewShellCount);
|
|
}
|
|
}
|
|
|
|
if (pFrameView)
|
|
{
|
|
/**********************************************************************
|
|
* FrameView mit der FrameView der DocShell initialisieren
|
|
**********************************************************************/
|
|
SetRuler( pFrameView->HasRuler() );
|
|
SetGridCoarse( pFrameView->GetGridCoarse() );
|
|
SetGridFine( pFrameView->GetGridFine() );
|
|
SetSnapGridWidth(pFrameView->GetSnapGridWidthX(), pFrameView->GetSnapGridWidthY());
|
|
SetGridVisible( pFrameView->IsGridVisible() );
|
|
SetGridFront( pFrameView->IsGridFront() );
|
|
SetSnapAngle( pFrameView->GetSnapAngle() );
|
|
SetGridSnap( pFrameView->IsGridSnap() );
|
|
SetBordSnap( pFrameView->IsBordSnap() );
|
|
SetHlplSnap( pFrameView->IsHlplSnap() );
|
|
SetOFrmSnap( pFrameView->IsOFrmSnap() );
|
|
SetOPntSnap( pFrameView->IsOPntSnap() );
|
|
SetOConSnap( pFrameView->IsOConSnap() );
|
|
SetHlplVisible( pFrameView->IsHlplVisible() );
|
|
SetDragStripes( pFrameView->IsDragStripes() );
|
|
SetPlusHandlesAlwaysVisible( pFrameView->IsPlusHandlesAlwaysVisible() );
|
|
SetFrameDragSingles( pFrameView->IsFrameDragSingles() );
|
|
SetSnapMagneticPixel( pFrameView->GetSnapMagneticPixel() );
|
|
SetMarkedHitMovesAlways( pFrameView->IsMarkedHitMovesAlways() );
|
|
SetMoveOnlyDragging( pFrameView->IsMoveOnlyDragging() );
|
|
SetCrookNoContortion( pFrameView->IsCrookNoContortion() );
|
|
SetSlantButShear( pFrameView->IsSlantButShear() );
|
|
SetNoDragXorPolys( pFrameView->IsNoDragXorPolys() );
|
|
SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() );
|
|
SetBigOrtho( pFrameView->IsBigOrtho() );
|
|
SetOrtho( pFrameView->IsOrtho() );
|
|
SetEliminatePolyPointLimitAngle( pFrameView->GetEliminatePolyPointLimitAngle() );
|
|
SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() );
|
|
// #110094#-7
|
|
// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() );
|
|
SetDesignMode( pFrameView->IsDesignMode() );
|
|
|
|
SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() );
|
|
SetSolidDragging( pFrameView->IsSolidDragging() );
|
|
|
|
maVisibleLayers = pFrameView->GetVisibleLayers();
|
|
maPrintableLayers = pFrameView->GetPrintableLayers();
|
|
maLockedLayers = pFrameView->GetLockedLayers();
|
|
maStandardHelpLines = pFrameView->GetStandardHelpLines();
|
|
maNotesHelpLines = pFrameView->GetNotesHelpLines();
|
|
maHandoutHelpLines = pFrameView->GetHandoutHelpLines();
|
|
SetActiveLayer( pFrameView->GetActiveLayer() );
|
|
mbNoColors = pFrameView->IsNoColors();
|
|
mbNoAttribs = pFrameView->IsNoAttribs() ;
|
|
maVisArea = pFrameView->GetVisArea();
|
|
mePageKind = pFrameView->GetPageKind();
|
|
mePageKindOnLoad = pFrameView->GetPageKindOnLoad();
|
|
mnSelectedPage = pFrameView->GetSelectedPage();
|
|
mnSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad();
|
|
meStandardEditMode = pFrameView->GetViewShEditMode(PK_STANDARD);
|
|
meNotesEditMode = pFrameView->GetViewShEditMode(PK_NOTES);
|
|
meHandoutEditMode = pFrameView->GetViewShEditMode(PK_HANDOUT);
|
|
SetViewShEditModeOnLoad(pFrameView->GetViewShEditModeOnLoad());
|
|
mbLayerMode = pFrameView->IsLayerMode();
|
|
mbQuickEdit = pFrameView->IsQuickEdit();
|
|
|
|
// #i26631#
|
|
SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() );
|
|
|
|
SetDragWithCopy( pFrameView->IsDragWithCopy() );
|
|
mbBigHandles = pFrameView->IsBigHandles();
|
|
mbDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit();
|
|
mbClickChangeRotation = pFrameView->IsClickChangeRotation();
|
|
mnSlidesPerRow = pFrameView->GetSlidesPerRow();
|
|
mnDrawMode = pFrameView->GetDrawMode();
|
|
mnTabCtrlPercent = pFrameView->GetTabCtrlPercent();
|
|
mbIsNavigatorShowingAllShapes = pFrameView->IsNavigatorShowingAllShapes();
|
|
SetPreviousViewShellType (pFrameView->GetPreviousViewShellType());
|
|
SetViewShellTypeOnLoad (pFrameView->GetViewShellTypeOnLoad());
|
|
}
|
|
else
|
|
{
|
|
/**********************************************************************
|
|
* FrameView mit den Applikationsdaten initialisieren
|
|
**********************************************************************/
|
|
maVisibleLayers.SetAll();
|
|
maPrintableLayers.SetAll();
|
|
SetGridCoarse( Size( 1000, 1000 ) );
|
|
SetSnapGridWidth(Fraction(1000, 1), Fraction(1000, 1));
|
|
SetActiveLayer( String( SdResId(STR_LAYER_LAYOUT) ) );
|
|
mbNoColors = TRUE;
|
|
mbNoAttribs = FALSE;
|
|
maVisArea = Rectangle( Point(), Size(0, 0) );
|
|
mePageKind = PK_STANDARD;
|
|
mePageKindOnLoad = PK_STANDARD;
|
|
mnSelectedPage = 0;
|
|
mnSelectedPageOnLoad = 0;
|
|
meStandardEditMode = EM_PAGE;
|
|
meNotesEditMode = EM_PAGE;
|
|
meHandoutEditMode = EM_MASTERPAGE;
|
|
SetViewShEditModeOnLoad(EM_PAGE);
|
|
mbLayerMode = FALSE;
|
|
SetEliminatePolyPoints(FALSE);
|
|
mbBigHandles = FALSE;
|
|
mbDoubleClickTextEdit = FALSE;
|
|
mbClickChangeRotation = FALSE;
|
|
mnSlidesPerRow = 4;
|
|
|
|
{
|
|
bool bUseContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
|
|
mnDrawMode = bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR;
|
|
}
|
|
mnTabCtrlPercent = 0.0;
|
|
mbIsNavigatorShowingAllShapes = false;
|
|
SetPreviousViewShellType (ViewShell::ST_NONE);
|
|
SetViewShellTypeOnLoad (ViewShell::ST_IMPRESS);
|
|
|
|
// get default for design mode
|
|
sal_Bool bInitDesignMode = pDrawDoc->GetOpenInDesignMode();
|
|
if( pDrawDoc->OpenInDesignModeIsDefaulted() )
|
|
{
|
|
bInitDesignMode = sal_True;
|
|
}
|
|
|
|
SfxObjectShell* pObjShell = pDrawDoc->GetObjectShell();
|
|
if( pObjShell && pObjShell->IsReadOnly() )
|
|
bInitDesignMode = sal_False;
|
|
SetDesignMode( bInitDesignMode );
|
|
|
|
Update( SD_MOD()->GetSdOptions(pDrawDoc->GetDocumentType()) );
|
|
}
|
|
|
|
}
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Dtor
|
|
|*
|
|
\************************************************************************/
|
|
|
|
FrameView::~FrameView()
|
|
{
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Verbindung herstellen
|
|
|*
|
|
\************************************************************************/
|
|
|
|
void FrameView::Connect()
|
|
{
|
|
mnRefCount++;
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Verbindung loesen
|
|
|*
|
|
\************************************************************************/
|
|
|
|
void FrameView::Disconnect()
|
|
{
|
|
if (mnRefCount > 0)
|
|
{
|
|
mnRefCount--;
|
|
}
|
|
|
|
if (mnRefCount == 0)
|
|
{
|
|
delete this;
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Update mit Daten der SdOptions
|
|
|*
|
|
\************************************************************************/
|
|
|
|
void FrameView::Update(SdOptions* pOptions)
|
|
{
|
|
if (pOptions)
|
|
{
|
|
mbRuler = pOptions->IsRulerVisible();
|
|
SetGridVisible( pOptions->IsGridVisible() );
|
|
SetSnapAngle( pOptions->GetAngle() );
|
|
SetGridSnap( pOptions->IsUseGridSnap() );
|
|
SetBordSnap( pOptions->IsSnapBorder() );
|
|
SetHlplSnap( pOptions->IsSnapHelplines() );
|
|
SetOFrmSnap( pOptions->IsSnapFrame() );
|
|
SetOPntSnap( pOptions->IsSnapPoints() );
|
|
SetHlplVisible( pOptions->IsHelplines() );
|
|
SetDragStripes( pOptions->IsDragStripes() );
|
|
SetPlusHandlesAlwaysVisible( pOptions->IsHandlesBezier() );
|
|
SetSnapMagneticPixel( pOptions->GetSnapArea() );
|
|
SetMarkedHitMovesAlways( pOptions->IsMarkedHitMovesAlways() );
|
|
SetMoveOnlyDragging( pOptions->IsMoveOnlyDragging() );
|
|
SetSlantButShear( pOptions->IsMoveOnlyDragging() );
|
|
SetNoDragXorPolys ( !pOptions->IsMoveOutline() );
|
|
SetCrookNoContortion( pOptions->IsCrookNoContortion() );
|
|
SetAngleSnapEnabled( pOptions->IsRotate() );
|
|
SetBigOrtho( pOptions->IsBigOrtho() );
|
|
SetOrtho( pOptions->IsOrtho() );
|
|
SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() );
|
|
// #110094#-7
|
|
// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() );
|
|
GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() );
|
|
|
|
SetSolidMarkHdl( pOptions->IsSolidMarkHdl() );
|
|
SetSolidDragging( pOptions->IsSolidDragging() );
|
|
|
|
SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
|
|
SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) );
|
|
Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 ));
|
|
Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 ));
|
|
SetSnapGridWidth(aFractX, aFractY);
|
|
SetQuickEdit(pOptions->IsQuickEdit());
|
|
|
|
// #i26631#
|
|
SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() );
|
|
|
|
SetDragWithCopy(pOptions->IsDragWithCopy());
|
|
SetBigHandles( pOptions->IsBigHandles() );
|
|
SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() );
|
|
SetClickChangeRotation( pOptions->IsClickChangeRotation() );
|
|
}
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* EditMode (Page oder MasterPage) des Arbeitsmodus setzen
|
|
|*
|
|
\************************************************************************/
|
|
|
|
void FrameView::SetViewShEditMode(EditMode eMode, PageKind eKind)
|
|
{
|
|
if (eKind == PK_STANDARD)
|
|
{
|
|
meStandardEditMode = eMode;
|
|
}
|
|
else if (eKind == PK_NOTES)
|
|
{
|
|
meNotesEditMode = eMode;
|
|
}
|
|
else if (eKind == PK_HANDOUT)
|
|
{
|
|
meHandoutEditMode = eMode;
|
|
}
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* EditMode (Page oder MasterPage) des Arbeitsmodus zurueckgeben
|
|
|*
|
|
\************************************************************************/
|
|
|
|
EditMode FrameView::GetViewShEditMode(PageKind eKind)
|
|
{
|
|
EditMode eMode = EM_PAGE;
|
|
|
|
if (eKind == PK_STANDARD)
|
|
{
|
|
eMode = meStandardEditMode;
|
|
}
|
|
else if (eKind == PK_NOTES)
|
|
{
|
|
eMode = meNotesEditMode;
|
|
}
|
|
else if (eKind == PK_HANDOUT)
|
|
{
|
|
eMode = meHandoutEditMode;
|
|
}
|
|
|
|
return (eMode);
|
|
}
|
|
|
|
|
|
|
|
|
|
void FrameView::SetViewShEditModeOnLoad (EditMode eMode)
|
|
{
|
|
meEditModeOnLoad = eMode;
|
|
}
|
|
|
|
|
|
|
|
|
|
EditMode FrameView::GetViewShEditModeOnLoad (void) const
|
|
{
|
|
return meEditModeOnLoad;
|
|
}
|
|
|
|
|
|
|
|
|
|
static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
|
|
{
|
|
::rtl::OUStringBuffer aLines;
|
|
|
|
const USHORT nCount = rHelpLines.GetCount();
|
|
for( USHORT nHlpLine = 0; nHlpLine < nCount; nHlpLine++ )
|
|
{
|
|
const SdrHelpLine& rHelpLine = rHelpLines[nHlpLine];
|
|
const Point& rPos = rHelpLine.GetPos();
|
|
|
|
switch( rHelpLine.GetKind() )
|
|
{
|
|
case SDRHELPLINE_POINT:
|
|
aLines.append( (sal_Unicode)'P' );
|
|
aLines.append( (sal_Int32)rPos.X() );
|
|
aLines.append( (sal_Unicode)',' );
|
|
aLines.append( (sal_Int32)rPos.Y() );
|
|
break;
|
|
case SDRHELPLINE_VERTICAL:
|
|
aLines.append( (sal_Unicode)'V' );
|
|
aLines.append( (sal_Int32)rPos.X() );
|
|
break;
|
|
case SDRHELPLINE_HORIZONTAL:
|
|
aLines.append( (sal_Unicode)'H' );
|
|
aLines.append( (sal_Int32)rPos.Y() );
|
|
break;
|
|
default:
|
|
DBG_ERROR( "Unsupported helpline Kind!" );
|
|
}
|
|
}
|
|
|
|
return aLines.makeStringAndClear();
|
|
}
|
|
|
|
#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( RTL_CONSTASCII_USTRINGPARAM( n ) ), v ) )
|
|
void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, sal_Bool )
|
|
{
|
|
std::vector< std::pair< OUString, Any > > aUserData;
|
|
|
|
aUserData.addValue( sUNO_View_GridIsVisible, makeAny( (sal_Bool)IsGridVisible() ) );
|
|
aUserData.addValue( sUNO_View_GridIsFront, makeAny( (sal_Bool)IsGridFront() ) );
|
|
aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( (sal_Bool)IsGridSnap() ) );
|
|
aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( (sal_Bool)IsBordSnap() ) );
|
|
aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( (sal_Bool)IsHlplSnap() ) );
|
|
aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) );
|
|
aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) );
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) );
|
|
// pValue->Value <<= (sal_Bool)IsHlplVisible();
|
|
// pValue++;nIndex++;
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) );
|
|
// pValue->Value <<= (sal_Bool)IsDragStripes();
|
|
// pValue++;nIndex++;
|
|
|
|
aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) );
|
|
aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) );
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) );
|
|
// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways();
|
|
// pValue++;nIndex++;
|
|
|
|
aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) );
|
|
aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) );
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) );
|
|
// pValue->Value <<= (sal_Bool)IsLineDraft();
|
|
// pValue++;nIndex++;
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) );
|
|
// pValue->Value <<= (sal_Bool)IsFillDraft();
|
|
// pValue++;nIndex++;
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) );
|
|
// pValue->Value <<= (sal_Bool)IsTextDraft();
|
|
// pValue++;nIndex++;
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) );
|
|
// pValue->Value <<= (sal_Bool)IsGrafDraft();
|
|
// pValue++;nIndex++;
|
|
|
|
Any aAny;
|
|
GetVisibleLayers().QueryValue( aAny );
|
|
aUserData.addValue( sUNO_View_VisibleLayers, aAny );
|
|
|
|
GetPrintableLayers().QueryValue( aAny );
|
|
aUserData.addValue( sUNO_View_PrintableLayers, aAny );
|
|
|
|
GetLockedLayers().QueryValue( aAny );
|
|
aUserData.addValue( sUNO_View_LockedLayers, aAny );
|
|
|
|
aUserData.addValue( sUNO_View_NoAttribs, makeAny( (sal_Bool)IsNoAttribs() ) );
|
|
aUserData.addValue( sUNO_View_NoColors, makeAny( (sal_Bool)IsNoColors() ) );
|
|
|
|
if( GetStandardHelpLines().GetCount() )
|
|
aUserData.addValue( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) );
|
|
|
|
if( GetNotesHelpLines().GetCount() )
|
|
aUserData.addValue( sUNO_View_SnapLinesNotes, makeAny( createHelpLinesString( GetNotesHelpLines() ) ) );
|
|
|
|
if( GetHandoutHelpLines().GetCount() )
|
|
aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) );
|
|
|
|
aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( (sal_Bool)HasRuler() ) );
|
|
aUserData.addValue( sUNO_View_PageKind, makeAny( (sal_Int16)GetPageKind() ) );
|
|
aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) );
|
|
aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) );
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) );
|
|
// pValue->Value <<= (sal_Bool)IsQuickEdit();
|
|
// pValue++;nIndex++;
|
|
|
|
aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) );
|
|
aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) );
|
|
aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) );
|
|
|
|
// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) );
|
|
// pValue->Value <<= (sal_Bool)IsDragWithCopy();
|
|
// pValue++;nIndex++;
|
|
|
|
aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) );
|
|
/* #107128# Product managment decided to not make this persistent
|
|
aUserData.addValue( sUNO_View_DrawMode, makeAny( (sal_Int32)GetDrawMode() ) );
|
|
aUserData.addValue( sUNO_View_PreviewDrawMode, makeAny( (sal_Int32)GetPreviewDrawMode() ) );
|
|
*/
|
|
aUserData.addValue( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode( PK_STANDARD ) ) );
|
|
aUserData.addValue( sUNO_View_EditModeNotes, makeAny( (sal_Int32)GetViewShEditMode( PK_NOTES ) ) );
|
|
aUserData.addValue( sUNO_View_EditModeHandout, makeAny( (sal_Int32)GetViewShEditMode( PK_HANDOUT ) ) );
|
|
|
|
{
|
|
const Rectangle aVisArea = GetVisArea();
|
|
|
|
aUserData.addValue( sUNO_View_VisibleAreaTop, makeAny( (sal_Int32)aVisArea.Top() ) );
|
|
aUserData.addValue( sUNO_View_VisibleAreaLeft, makeAny( (sal_Int32)aVisArea.Left() ) );
|
|
aUserData.addValue( sUNO_View_VisibleAreaWidth, makeAny( (sal_Int32)aVisArea.GetWidth() ) );
|
|
aUserData.addValue( sUNO_View_VisibleAreaHeight, makeAny( (sal_Int32)aVisArea.GetHeight() ) );
|
|
}
|
|
|
|
aUserData.addValue( sUNO_View_GridCoarseWidth, makeAny( (sal_Int32)GetGridCoarse().Width() ) );
|
|
aUserData.addValue( sUNO_View_GridCoarseHeight, makeAny( (sal_Int32)GetGridCoarse().Height() ) );
|
|
aUserData.addValue( sUNO_View_GridFineWidth, makeAny( (sal_Int32)GetGridFine().Width() ) );
|
|
aUserData.addValue( sUNO_View_GridFineHeight, makeAny( (sal_Int32)GetGridFine().Height() ) );
|
|
aUserData.addValue( sUNO_View_GridSnapWidthXNumerator, makeAny( (sal_Int32)GetSnapGridWidthX().GetNumerator() ) );
|
|
aUserData.addValue( sUNO_View_GridSnapWidthXDenominator, makeAny( (sal_Int32)GetSnapGridWidthX().GetDenominator() ) );
|
|
aUserData.addValue( sUNO_View_GridSnapWidthYNumerator, makeAny( (sal_Int32)GetSnapGridWidthY().GetNumerator() ) );
|
|
aUserData.addValue( sUNO_View_GridSnapWidthYDenominator, makeAny( (sal_Int32)GetSnapGridWidthY().GetDenominator() ) );
|
|
aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( (sal_Bool)IsAngleSnapEnabled() ) );
|
|
aUserData.addValue( sUNO_View_SnapAngle, makeAny( (sal_Int32)GetSnapAngle() ) );
|
|
|
|
const sal_Int32 nOldLength = rValues.getLength();
|
|
rValues.realloc( nOldLength + aUserData.size() );
|
|
|
|
PropertyValue* pValue = &(rValues.getArray()[nOldLength]);
|
|
|
|
std::vector< std::pair< OUString, Any > >::iterator aIter( aUserData.begin() );
|
|
for( ; aIter != aUserData.end(); aIter++, pValue++ )
|
|
{
|
|
pValue->Name = (*aIter).first;
|
|
pValue->Value = (*aIter).second;
|
|
}
|
|
}
|
|
#undef addValue
|
|
|
|
static void createHelpLinesFromString( const rtl::OUString& rLines, SdrHelpLineList& rHelpLines )
|
|
{
|
|
const sal_Unicode * pStr = rLines.getStr();
|
|
SdrHelpLine aNewHelpLine;
|
|
rtl::OUStringBuffer sBuffer;
|
|
|
|
while( *pStr )
|
|
{
|
|
Point aPoint;
|
|
|
|
switch( *pStr )
|
|
{
|
|
case (sal_Unicode)'P':
|
|
aNewHelpLine.SetKind( SDRHELPLINE_POINT );
|
|
break;
|
|
case (sal_Unicode)'V':
|
|
aNewHelpLine.SetKind( SDRHELPLINE_VERTICAL );
|
|
break;
|
|
case (sal_Unicode)'H':
|
|
aNewHelpLine.SetKind( SDRHELPLINE_HORIZONTAL );
|
|
break;
|
|
default:
|
|
DBG_ERROR( "syntax error in snap lines settings string" );
|
|
return;
|
|
}
|
|
|
|
pStr++;
|
|
|
|
while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
|
|
{
|
|
sBuffer.append( *pStr++ );
|
|
}
|
|
|
|
sal_Int32 nValue = sBuffer.makeStringAndClear().toInt32();
|
|
|
|
if( aNewHelpLine.GetKind() == SDRHELPLINE_HORIZONTAL )
|
|
{
|
|
aPoint.Y() = nValue;
|
|
}
|
|
else
|
|
{
|
|
aPoint.X() = nValue;
|
|
|
|
if( aNewHelpLine.GetKind() == SDRHELPLINE_POINT )
|
|
{
|
|
if( *pStr++ != ',' )
|
|
return;
|
|
|
|
while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
|
|
{
|
|
sBuffer.append( *pStr++ );
|
|
}
|
|
|
|
aPoint.Y() = sBuffer.makeStringAndClear().toInt32();
|
|
|
|
}
|
|
}
|
|
|
|
aNewHelpLine.SetPos( aPoint );
|
|
rHelpLines.Insert( aNewHelpLine );
|
|
}
|
|
}
|
|
|
|
void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool )
|
|
{
|
|
const sal_Int32 nLength = rSequence.getLength();
|
|
if (nLength)
|
|
{
|
|
const bool bImpress = dynamic_cast< SdDrawDocument* >(GetModel())->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
|
|
|
|
sal_Bool bBool = sal_False;
|
|
sal_Int32 nInt32 = 0;
|
|
sal_Int16 nInt16 = 0;
|
|
rtl::OUString aString;
|
|
|
|
sal_Int32 aSnapGridWidthXNum = GetSnapGridWidthX().GetNumerator();
|
|
sal_Int32 aSnapGridWidthXDom = GetSnapGridWidthX().GetDenominator();
|
|
|
|
sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator();
|
|
sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator();
|
|
|
|
EditMode eStandardEditMode;
|
|
EditMode eNotesEditMode;
|
|
EditMode eHandoutEditMode;
|
|
|
|
const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
|
|
for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
|
|
{
|
|
if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ViewId ) ) )
|
|
{
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesDrawing ) ) )
|
|
{
|
|
if( pValue->Value >>= aString )
|
|
{
|
|
SdrHelpLineList aHelpLines;
|
|
createHelpLinesFromString( aString, aHelpLines );
|
|
SetStandardHelpLines( aHelpLines );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesNotes ) ) )
|
|
{
|
|
if( pValue->Value >>= aString )
|
|
{
|
|
SdrHelpLineList aHelpLines;
|
|
createHelpLinesFromString( aString, aHelpLines );
|
|
SetNotesHelpLines( aHelpLines );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesHandout ) ) )
|
|
{
|
|
if( pValue->Value >>= aString )
|
|
{
|
|
SdrHelpLineList aHelpLines;
|
|
createHelpLinesFromString( aString, aHelpLines );
|
|
SetHandoutHelpLines( aHelpLines );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_RulerIsVisible ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetRuler( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PageKind ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt16 )
|
|
{
|
|
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
|
|
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
|
|
SetPageKind( (PageKind)nInt16 );
|
|
|
|
SetPageKindOnLoad( (PageKind)nInt16 );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SelectedPage ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt16 )
|
|
{
|
|
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
|
|
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
|
|
SetSelectedPage( (USHORT)nInt16 );
|
|
|
|
SetSelectedPageOnLoad( (USHORT)nInt16 );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLayerMode ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetLayerMode( bBool );
|
|
}
|
|
}
|
|
/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetQuickEdit( bBool );
|
|
}
|
|
}
|
|
*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetBigHandles( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDoubleClickTextEdit ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetDoubleClickTextEdit( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsClickChangeRotation ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetClickChangeRotation( bBool );
|
|
}
|
|
}
|
|
/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetDragWithCopy( bBool );
|
|
}
|
|
}
|
|
*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt16 )
|
|
{
|
|
SetSlidesPerRow( (USHORT)nInt16 );
|
|
}
|
|
}
|
|
/* #107128# Product managment decided to not make this persistent
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_DrawMode ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
|
|
if( rStyleSettings.GetHighContrastMode() )
|
|
continue;
|
|
SetDrawMode( (ULONG)nInt32 );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PreviewDrawMode ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
|
|
SvtAccessibilityOptions aAccOptions;
|
|
if( rStyleSettings.GetHighContrastMode() && aAccOptions.GetIsForPagePreviews() )
|
|
continue;
|
|
SetPreviewDrawMode( (ULONG)nInt32 );
|
|
}
|
|
}
|
|
*/
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeStandard ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
|
|
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
|
|
SetViewShEditMode( (EditMode)nInt32, PK_STANDARD );
|
|
eStandardEditMode = (EditMode)nInt32;
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeNotes ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
|
|
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
|
|
SetViewShEditMode( (EditMode)nInt32, PK_NOTES );
|
|
eNotesEditMode = (EditMode)nInt32;
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeHandout ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
|
|
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
|
|
SetViewShEditMode( (EditMode)nInt32, PK_HANDOUT );
|
|
eHandoutEditMode = (EditMode)nInt32;
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaTop ) ) )
|
|
{
|
|
sal_Int32 nTop = 0;
|
|
if( pValue->Value >>= nTop )
|
|
{
|
|
Rectangle aVisArea( GetVisArea() );
|
|
aVisArea.nBottom += nTop - aVisArea.nTop;
|
|
aVisArea.nTop = nTop;
|
|
SetVisArea( aVisArea );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaLeft ) ) )
|
|
{
|
|
sal_Int32 nLeft = 0;
|
|
if( pValue->Value >>= nLeft )
|
|
{
|
|
Rectangle aVisArea( GetVisArea() );
|
|
aVisArea.nRight += nLeft - aVisArea.nLeft;
|
|
aVisArea.nLeft = nLeft;
|
|
SetVisArea( aVisArea );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaWidth ) ) )
|
|
{
|
|
sal_Int32 nWidth = 0;
|
|
if( pValue->Value >>= nWidth )
|
|
{
|
|
Rectangle aVisArea( GetVisArea() );
|
|
aVisArea.nRight = aVisArea.nLeft + nWidth - 1;
|
|
SetVisArea( aVisArea );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaHeight ) ) )
|
|
{
|
|
sal_Int32 nHeight = 0;
|
|
if( pValue->Value >>= nHeight )
|
|
{
|
|
Rectangle aVisArea( GetVisArea() );
|
|
aVisArea.nBottom = nHeight + aVisArea.nTop - 1;
|
|
SetVisArea( aVisArea );
|
|
}
|
|
}
|
|
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridIsVisible ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetGridVisible( bBool );
|
|
}
|
|
}
|
|
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToGrid ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetGridSnap( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridIsFront ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetGridFront( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToPageMargins ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetBordSnap( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToSnapLines ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetHlplSnap( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToObjectFrame ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetOFrmSnap( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToObjectPoints ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetOPntSnap( bBool );
|
|
}
|
|
}
|
|
/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetHlplVisible( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragStripes ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetDragStripes( bBool );
|
|
}
|
|
}
|
|
*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetPlusHandlesAlwaysVisible( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsFrameDragSingles ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetFrameDragSingles( bBool );
|
|
}
|
|
}
|
|
/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetMarkedHitMovesAlways( bBool );
|
|
}
|
|
}
|
|
*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
SetEliminatePolyPointLimitAngle( nInt32 );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsEliminatePolyPoints ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetEliminatePolyPoints( bBool );
|
|
}
|
|
}
|
|
/*
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLineDraft ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetLineDraft( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsFillDraft ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetFillDraft( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsTextDraft ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetTextDraft( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsGrafDraft ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetGrafDraft( bBool );
|
|
}
|
|
}
|
|
*/
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ActiveLayer ) ) )
|
|
{
|
|
if( pValue->Value >>= aString )
|
|
{
|
|
SetActiveLayer( aString );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_NoAttribs ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetNoAttribs( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_NoColors ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetNoColors( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridCoarseWidth ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const Size aCoarse( nInt32, GetGridCoarse().Height() );
|
|
SetGridCoarse( aCoarse );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridCoarseHeight ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const Size aCoarse( GetGridCoarse().Width(), nInt32 );
|
|
SetGridCoarse( aCoarse );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridFineWidth ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const Size aCoarse( nInt32, GetGridFine().Height() );
|
|
SetGridFine( aCoarse );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridFineHeight ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
const Size aCoarse( GetGridFine().Width(), nInt32 );
|
|
SetGridFine( aCoarse );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsAngleSnapEnabled ) ) )
|
|
{
|
|
if( pValue->Value >>= bBool )
|
|
{
|
|
SetAngleSnapEnabled( bBool );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapAngle ) ) )
|
|
{
|
|
if( pValue->Value >>= nInt32 )
|
|
{
|
|
SetSnapAngle( nInt32 );
|
|
}
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthXNumerator ) ) )
|
|
{
|
|
pValue->Value >>= aSnapGridWidthXNum;
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthXDenominator ) ) )
|
|
{
|
|
pValue->Value >>= aSnapGridWidthXDom;
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthYNumerator ) ) )
|
|
{
|
|
pValue->Value >>= aSnapGridWidthYNum;
|
|
}
|
|
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthYDenominator ) ) )
|
|
{
|
|
pValue->Value >>= aSnapGridWidthYDom;
|
|
}
|
|
else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleLayers ) ) )
|
|
{
|
|
SetOfByte aSetOfBytes;
|
|
aSetOfBytes.PutValue( pValue->Value );
|
|
SetVisibleLayers( aSetOfBytes );
|
|
}
|
|
else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PrintableLayers ) ) )
|
|
{
|
|
SetOfByte aSetOfBytes;
|
|
aSetOfBytes.PutValue( pValue->Value );
|
|
SetPrintableLayers( aSetOfBytes );
|
|
}
|
|
else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_LockedLayers ) ) )
|
|
{
|
|
SetOfByte aSetOfBytes;
|
|
aSetOfBytes.PutValue( pValue->Value );
|
|
SetLockedLayers( aSetOfBytes );
|
|
}
|
|
}
|
|
|
|
switch (GetPageKindOnLoad())
|
|
{
|
|
case PK_STANDARD: SetViewShEditModeOnLoad(meStandardEditMode); break;
|
|
case PK_NOTES: SetViewShEditModeOnLoad(meNotesEditMode); break;
|
|
case PK_HANDOUT: SetViewShEditModeOnLoad(meHandoutEditMode); break;
|
|
default: SetViewShEditModeOnLoad(EM_PAGE); break;
|
|
}
|
|
|
|
const Fraction aSnapGridWidthX( aSnapGridWidthXNum, aSnapGridWidthXDom );
|
|
const Fraction aSnapGridWidthY( aSnapGridWidthYNum, aSnapGridWidthYDom );
|
|
|
|
SetSnapGridWidth( aSnapGridWidthX, aSnapGridWidthY );
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
void FrameView::SetPreviousViewShellType (ViewShell::ShellType eType)
|
|
{
|
|
mePreviousViewShellType = eType;
|
|
}
|
|
|
|
|
|
|
|
|
|
ViewShell::ShellType FrameView::GetPreviousViewShellType (void) const
|
|
{
|
|
return mePreviousViewShellType;
|
|
}
|
|
|
|
|
|
|
|
|
|
void FrameView::SetViewShellTypeOnLoad (ViewShell::ShellType eType)
|
|
{
|
|
meViewShellTypeOnLoad = eType;
|
|
}
|
|
|
|
|
|
|
|
|
|
ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const
|
|
{
|
|
return meViewShellTypeOnLoad;
|
|
}
|
|
|
|
|
|
|
|
|
|
void FrameView::SetSelectedPage(USHORT nPage)
|
|
{
|
|
mnSelectedPage = nPage;
|
|
}
|
|
|
|
|
|
|
|
|
|
USHORT FrameView::GetSelectedPage (void) const
|
|
{
|
|
return mnSelectedPage;
|
|
}
|
|
|
|
|
|
|
|
|
|
void FrameView::SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes)
|
|
{
|
|
mbIsNavigatorShowingAllShapes = bIsNavigatorShowingAllShapes;
|
|
}
|
|
|
|
|
|
|
|
|
|
bool FrameView::IsNavigatorShowingAllShapes (void) const
|
|
{
|
|
return mbIsNavigatorShowingAllShapes;
|
|
}
|
|
|
|
|
|
} // end of namespace sd
|