2000-09-18 16:07:07 +00:00
/*************************************************************************
*
2008-04-11 12:13:03 +00:00
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER .
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* Copyright 2008 by Sun Microsystems , Inc .
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* OpenOffice . org - a multi - platform office productivity suite
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* $ RCSfile : sfxbasemodel . cxx , v $
2008-10-16 06:57:26 +00:00
* $ Revision : 1.139 .2 .5 $
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* This file is part of OpenOffice . org .
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* 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 .
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* 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 ) .
2000-09-18 16:07:07 +00:00
*
2008-04-11 12:13:03 +00:00
* 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 .
2000-09-18 16:07:07 +00:00
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2006-09-17 15:45:28 +00:00
// MARKER(update_precomp.py): autogen include statement, do not remove
# include "precompiled_sfx2.hxx"
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// my own includes
//________________________________________________________________________________________________________
2007-06-27 22:24:53 +00:00
# include <sfx2/sfxbasemodel.hxx>
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// include of other projects
//________________________________________________________________________________________________________
2004-04-22 12:25:05 +00:00
# include <com/sun/star/task/XInteractionHandler.hpp>
# include <com/sun/star/task/ErrorCodeRequest.hpp>
2000-09-18 16:07:07 +00:00
# include <com/sun/star/view/XSelectionSupplier.hpp>
2007-07-18 05:53:49 +00:00
# include <com/sun/star/view/XPrintJobListener.hpp>
2000-09-18 16:07:07 +00:00
# include <com/sun/star/lang/DisposedException.hpp>
# include <com/sun/star/lang/IllegalArgumentException.hpp>
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
# include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
2002-04-03 10:51:03 +00:00
# include <com/sun/star/frame/IllegalArgumentIOException.hpp>
2008-04-04 14:26:02 +00:00
# include <com/sun/star/frame/XUntitledNumbers.hpp>
# include <com/sun/star/frame/UntitledNumbersConst.hpp>
2004-02-25 14:46:43 +00:00
# include <com/sun/star/embed/XTransactionBroadcaster.hpp>
2004-10-04 19:57:20 +00:00
# include <com/sun/star/embed/XStorage.hpp>
# include <com/sun/star/embed/EmbedMapUnits.hpp>
# include <com/sun/star/document/XStorageChangeListener.hpp>
2005-04-18 13:39:50 +00:00
# include <com/sun/star/document/XActionLockable.hpp>
2004-02-25 14:46:43 +00:00
# include <com/sun/star/beans/XPropertySet.hpp>
2001-04-06 14:27:20 +00:00
# include <com/sun/star/container/XIndexContainer.hpp>
2004-10-22 13:40:46 +00:00
# include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
# include <com/sun/star/script/provider/XScriptProvider.hpp>
2005-03-01 19:02:00 +00:00
# include <com/sun/star/ui/XUIConfigurationStorage.hpp>
2005-03-23 13:25:16 +00:00
# include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
2008-03-06 18:56:03 +00:00
# include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
2004-02-25 14:46:43 +00:00
# include <com/sun/star/embed/ElementModes.hpp>
2004-10-04 19:57:20 +00:00
# include <com/sun/star/embed/Aspects.hpp>
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
# include <com/sun/star/document/XDocumentProperties.hpp>
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
# include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
2007-07-18 05:53:49 +00:00
# include <comphelper/enumhelper.hxx> // can be removed when this is a "real" service
2007-04-16 15:57:05 +00:00
2007-07-18 05:53:49 +00:00
# include <cppuhelper/interfacecontainer.hxx>
2008-03-06 18:56:03 +00:00
# include <cppuhelper/exc_hlp.hxx>
2007-07-18 05:53:49 +00:00
# include <comphelper/processfactory.hxx> // can be removed when this is a "real" service
2008-03-06 18:56:03 +00:00
# include <comphelper/componentcontext.hxx>
2009-11-25 09:34:02 +01:00
# include <comphelper/namedvaluecollection.hxx>
2000-09-18 16:07:07 +00:00
# include <svtools/itemset.hxx>
# include <svtools/stritem.hxx>
# include <svtools/eitem.hxx>
2005-04-13 11:41:28 +00:00
# include <basic/sbx.hxx>
2001-12-19 17:02:03 +00:00
# include <basic/sbuno.hxx>
2002-06-28 08:15:06 +00:00
# include <tools/urlobj.hxx>
2008-03-06 18:56:03 +00:00
# include <tools/diagnose_ex.h>
2002-06-28 08:15:06 +00:00
# include <unotools/tempfile.hxx>
# include <vos/mutex.hxx>
2003-04-04 18:24:37 +00:00
# include <vcl/salctype.hxx>
2003-09-19 07:02:02 +00:00
# include <sot/clsids.hxx>
2004-04-13 10:50:23 +00:00
# include <sot/storinfo.hxx>
2004-10-04 19:57:20 +00:00
# include <comphelper/storagehelper.hxx>
# include <toolkit/helper/vclunohelper.hxx>
# include <svtools/transfer.hxx>
2007-04-19 08:29:27 +00:00
# include <svtools/ehdl.hxx>
# include <svtools/sfxecode.hxx>
2005-02-16 15:35:35 +00:00
# include <rtl/logfile.hxx>
2005-03-23 13:25:16 +00:00
# include <framework/configimporter.hxx>
2007-07-18 05:53:49 +00:00
# include <framework/interaction.hxx>
2008-04-04 14:26:02 +00:00
# include <framework/titlehelper.hxx>
# include <comphelper/numberedcollection.hxx>
2008-01-29 14:29:24 +00:00
# include <unotools/ucbstreamhelper.hxx>
2002-06-28 08:15:06 +00:00
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// includes of my own project
//________________________________________________________________________________________________________
2009-12-03 09:29:45 +01:00
# include <sfx2/sfxbasecontroller.hxx>
# include "viewfac.hxx"
2007-11-21 15:49:53 +00:00
# include <sfx2/signaturestate.hxx>
2007-06-27 22:24:53 +00:00
# include <sfx2/sfxuno.hxx>
2000-09-18 16:07:07 +00:00
# include <objshimp.hxx>
2007-06-27 22:24:53 +00:00
# include <sfx2/viewfrm.hxx>
# include <sfx2/viewsh.hxx>
# include <sfx2/docfile.hxx>
# include <sfx2/dispatch.hxx>
# include <sfx2/request.hxx>
# include <sfx2/objuno.hxx>
# include <sfx2/printer.hxx>
2000-11-27 14:16:00 +00:00
# include <basmgr.hxx>
2007-06-27 22:24:53 +00:00
# include <sfx2/event.hxx>
2001-02-09 11:49:32 +00:00
# include <eventsupplier.hxx>
2007-06-27 22:24:53 +00:00
# include <sfx2/evntconf.hxx>
# include <sfx2/sfx.hrc>
# include <sfx2/app.hxx>
2009-11-30 12:56:04 +01:00
# include <sfx2/viewfrm.hxx>
2001-12-19 17:02:03 +00:00
# include "appdata.hxx"
2007-06-27 22:24:53 +00:00
# include <sfx2/docfac.hxx>
# include <sfx2/fcontnr.hxx>
2008-03-06 18:56:03 +00:00
# include "sfx2/docstoragemodifylistener.hxx"
2004-04-22 12:25:05 +00:00
# include "brokenpackageint.hxx"
2004-06-11 08:47:05 +00:00
# include "graphhelp.hxx"
2007-07-19 14:29:47 +00:00
# include <sfx2/msgpool.hxx>
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
# include <sfx2/DocumentMetadataAccess.hxx>
2008-04-24 18:16:08 +00:00
# include <sfxresid.hxx>
2001-04-06 14:27:20 +00:00
2008-04-04 14:26:02 +00:00
//________________________________________________________________________________________________________
// const
static const : : rtl : : OUString SERVICENAME_DESKTOP = : : rtl : : OUString : : createFromAscii ( " com.sun.star.frame.Desktop " ) ;
2004-10-04 19:57:20 +00:00
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// namespaces
//________________________________________________________________________________________________________
2008-04-04 14:26:02 +00:00
namespace css = : : com : : sun : : star ;
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
using namespace : : com : : sun : : star ;
2002-10-24 11:12:32 +00:00
using namespace : : com : : sun : : star : : uno ;
2009-12-03 09:29:45 +01:00
using : : com : : sun : : star : : beans : : PropertyValue ;
using : : com : : sun : : star : : frame : : XFrame ;
using : : com : : sun : : star : : frame : : XController ;
using : : com : : sun : : star : : frame : : XController2 ;
using : : com : : sun : : star : : lang : : IllegalArgumentException ;
2000-09-18 16:07:07 +00:00
2009-09-08 04:57:32 +00:00
/** This Listener is used to get notified when the XDocumentProperties of the
XModel change .
If several changes are done the " bQuiet " member can be used to
temporarily suppress notifications .
*/
class SfxDocInfoListener_Impl : public : : cppu : : WeakImplHelper1 <
: : com : : sun : : star : : util : : XModifyListener >
{
public :
SfxObjectShell & m_rShell ;
bool bQuiet ;
bool bGotModified ;
SfxDocInfoListener_Impl ( SfxObjectShell & i_rDoc )
: m_rShell ( i_rDoc )
, bQuiet ( false )
{ } ;
~ SfxDocInfoListener_Impl ( ) ;
virtual void SAL_CALL disposing ( const lang : : EventObject & )
throw ( uno : : RuntimeException ) ;
virtual void SAL_CALL modified ( const lang : : EventObject & )
throw ( uno : : RuntimeException ) ;
} ;
SfxDocInfoListener_Impl : : ~ SfxDocInfoListener_Impl ( )
{
}
void SAL_CALL SfxDocInfoListener_Impl : : modified ( const lang : : EventObject & )
throw ( uno : : RuntimeException )
{
: : vos : : OGuard aSolarGuard ( Application : : GetSolarMutex ( ) ) ;
bGotModified = true ;
// notify changes to the SfxObjectShell
if ( ! bQuiet ) {
m_rShell . FlushDocInfo ( ) ;
}
}
void SAL_CALL SfxDocInfoListener_Impl : : disposing ( const lang : : EventObject & )
throw ( uno : : RuntimeException )
{
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// impl. declarations
//________________________________________________________________________________________________________
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
2008-03-06 18:56:03 +00:00
struct IMPL_SfxBaseModel_DataContainer : public : : sfx2 : : IModifiableDocument
2000-09-18 16:07:07 +00:00
{
2004-04-13 10:50:23 +00:00
// counter for SfxBaseModel instances created.
2007-07-18 05:53:49 +00:00
static sal_Int64 g_nInstanceCounter ;
SfxObjectShellRef m_pObjectShell ;
: : rtl : : OUString m_sURL ;
: : rtl : : OUString m_sRuntimeUID ;
: : rtl : : OUString m_aPreusedFilterName ;
: : cppu : : OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ;
uno : : Reference < uno : : XInterface > m_xParent ;
uno : : Reference < frame : : XController > m_xCurrent ;
uno : : Reference < document : : XDocumentInfo > m_xDocumentInfo ;
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
uno : : Reference < document : : XDocumentProperties > m_xDocumentProperties ;
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > m_xStarBasicAccess ;
uno : : Reference < container : : XNameReplace > m_xEvents ;
uno : : Sequence < beans : : PropertyValue > m_seqArguments ;
uno : : Sequence < uno : : Reference < frame : : XController > > m_seqControllers ;
uno : : Reference < container : : XIndexAccess > m_contViewData ;
sal_uInt16 m_nControllerLockCount ;
sal_Bool m_bClosed ;
sal_Bool m_bClosing ;
sal_Bool m_bSaving ;
sal_Bool m_bSuicide ;
uno : : Reference < com : : sun : : star : : view : : XPrintable > m_xPrintable ;
uno : : Reference < script : : provider : : XScriptProvider > m_xScriptProvider ;
uno : : Reference < ui : : XUIConfigurationManager > m_xUIConfigurationManager ;
2008-03-06 18:56:03 +00:00
: : rtl : : Reference < : : sfx2 : : DocumentStorageModifyListener > m_pStorageModifyListen ;
2007-04-16 15:57:05 +00:00
: : rtl : : OUString m_sModuleIdentifier ;
2008-04-04 14:26:02 +00:00
css : : uno : : Reference < css : : frame : : XTitle > m_xTitleHelper ;
css : : uno : : Reference < css : : frame : : XUntitledNumbers > m_xNumberedControllers ;
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
uno : : Reference < rdf : : XDocumentMetadataAccess > m_xDocumentMetadata ;
2000-09-18 16:07:07 +00:00
2008-04-15 09:27:10 +00:00
IMPL_SfxBaseModel_DataContainer ( : : osl : : Mutex & rMutex , SfxObjectShell * pObjectShell )
: m_pObjectShell ( pObjectShell )
, m_aInterfaceContainer ( rMutex )
2000-09-18 16:07:07 +00:00
, m_nControllerLockCount ( 0 )
2008-03-06 18:56:03 +00:00
, m_bClosed ( sal_False )
, m_bClosing ( sal_False )
2005-07-12 13:27:05 +00:00
, m_bSaving ( sal_False )
, m_bSuicide ( sal_False )
2004-11-09 14:38:24 +00:00
, m_pStorageModifyListen ( NULL )
2008-04-04 14:26:02 +00:00
, m_xTitleHelper ( )
, m_xNumberedControllers ( )
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
, m_xDocumentMetadata ( ) // lazy
2000-09-18 16:07:07 +00:00
{
2004-04-13 10:50:23 +00:00
// increase global instance counter.
+ + g_nInstanceCounter ;
// set own Runtime UID
m_sRuntimeUID = rtl : : OUString : : valueOf ( g_nInstanceCounter ) ;
2000-09-18 16:07:07 +00:00
}
2008-03-06 18:56:03 +00:00
virtual ~ IMPL_SfxBaseModel_DataContainer ( )
{
}
// ::sfx2::IModifiableDocument
virtual void storageIsModified ( )
{
if ( m_pObjectShell . Is ( ) & & ! m_pObjectShell - > IsModified ( ) )
m_pObjectShell - > SetModified ( sal_True ) ;
}
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
uno : : Reference < rdf : : XDocumentMetadataAccess > GetDMA ( )
{
if ( ! m_xDocumentMetadata . is ( ) )
{
OSL_ENSURE ( m_pObjectShell , " GetDMA: no object shell? " ) ;
if ( ! m_pObjectShell )
{
return 0 ;
}
const uno : : Reference < uno : : XComponentContext > xContext (
: : comphelper : : getProcessComponentContext ( ) ) ;
: : rtl : : OUString uri ;
const uno : : Reference < frame : : XModel > xModel (
m_pObjectShell - > GetModel ( ) ) ;
const uno : : Reference < lang : : XMultiComponentFactory > xMsf (
xContext - > getServiceManager ( ) ) ;
const uno : : Reference < frame : :
XTransientDocumentsDocumentContentFactory > xTDDCF (
xMsf - > createInstanceWithContext (
: : rtl : : OUString : : createFromAscii ( " com.sun.star.frame. "
" TransientDocumentsDocumentContentFactory " ) ,
xContext ) ,
uno : : UNO_QUERY_THROW ) ;
const uno : : Reference < ucb : : XContent > xContent (
xTDDCF - > createDocumentContent ( xModel ) ) ;
OSL_ENSURE ( xContent . is ( ) , " GetDMA: cannot create DocumentContent " ) ;
if ( ! xContent . is ( ) )
{
return 0 ;
}
uri = xContent - > getIdentifier ( ) - > getContentIdentifier ( ) ;
OSL_ENSURE ( uri . getLength ( ) , " GetDMA: empty uri? " ) ;
if ( uri . getLength ( ) & & ! uri . endsWithAsciiL ( " / " , 1 ) )
{
uri = uri + : : rtl : : OUString : : createFromAscii ( " / " ) ;
}
m_xDocumentMetadata = new : : sfx2 : : DocumentMetadataAccess (
xContext , * m_pObjectShell , uri ) ;
}
return m_xDocumentMetadata ;
}
uno : : Reference < rdf : : XDocumentMetadataAccess > CreateDMAUninitialized ( )
{
return ( m_pObjectShell )
? new : : sfx2 : : DocumentMetadataAccess (
: : comphelper : : getProcessComponentContext ( ) , * m_pObjectShell )
: 0 ;
}
2008-03-06 18:56:03 +00:00
} ;
2000-09-18 16:07:07 +00:00
2004-04-13 10:50:23 +00:00
// static member initialization.
sal_Int64 IMPL_SfxBaseModel_DataContainer : : g_nInstanceCounter = 0 ;
2007-07-18 05:53:49 +00:00
// =======================================================================================================
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
// Listener that forwards notifications from the PrintHelper to the "real" listeners
class SfxPrintHelperListener_Impl : public : : cppu : : WeakImplHelper1 < : : com : : sun : : star : : view : : XPrintJobListener >
2003-03-27 10:29:38 +00:00
{
public :
2007-07-18 05:53:49 +00:00
IMPL_SfxBaseModel_DataContainer * m_pData ;
SfxPrintHelperListener_Impl ( IMPL_SfxBaseModel_DataContainer * pData )
: m_pData ( pData )
{ }
2003-03-27 10:29:38 +00:00
2007-07-18 05:53:49 +00:00
virtual void SAL_CALL disposing ( const lang : : EventObject & aEvent ) throw ( uno : : RuntimeException ) ;
virtual void SAL_CALL printJobEvent ( const view : : PrintJobEvent & rEvent ) throw ( uno : : RuntimeException ) ;
} ;
2003-03-27 10:29:38 +00:00
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxPrintHelperListener_Impl : : disposing ( const lang : : EventObject & ) throw ( uno : : RuntimeException )
2003-03-27 10:29:38 +00:00
{
2007-07-18 05:53:49 +00:00
m_pData - > m_xPrintable = 0 ;
2003-03-27 10:29:38 +00:00
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxPrintHelperListener_Impl : : printJobEvent ( const view : : PrintJobEvent & rEvent ) throw ( uno : : RuntimeException )
2003-03-27 10:29:38 +00:00
{
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceContainerHelper * pContainer = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < view : : XPrintJobListener > * ) NULL ) ) ;
if ( pContainer ! = NULL )
2004-05-10 10:56:52 +00:00
{
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceIteratorHelper pIterator ( * pContainer ) ;
while ( pIterator . hasMoreElements ( ) )
( ( view : : XPrintJobListener * ) pIterator . next ( ) ) - > printJobEvent ( rEvent ) ;
2004-05-10 10:56:52 +00:00
}
2003-04-04 16:36:59 +00:00
}
2005-04-18 13:39:50 +00:00
// SfxOwnFramesLocker ====================================================================================
// allows to lock all the frames related to the provided SfxObjectShell
class SfxOwnFramesLocker
{
uno : : Sequence < uno : : Reference < frame : : XFrame > > m_aLockedFrames ;
Window * GetVCLWindow ( const uno : : Reference < frame : : XFrame > & xFrame ) ;
public :
SfxOwnFramesLocker ( SfxObjectShell * ObjechShell ) ;
~ SfxOwnFramesLocker ( ) ;
void UnlockFrames ( ) ;
} ;
SfxOwnFramesLocker : : SfxOwnFramesLocker ( SfxObjectShell * pObjectShell )
{
if ( ! pObjectShell )
return ;
2009-11-30 12:56:04 +01:00
for ( SfxViewFrame * pFrame = SfxViewFrame : : GetFirst ( pObjectShell ) ;
pFrame ;
pFrame = SfxViewFrame : : GetNext ( * pFrame , pObjectShell )
)
2005-04-18 13:39:50 +00:00
{
SfxFrame * pSfxFrame = pFrame - > GetFrame ( ) ;
if ( pSfxFrame )
{
try
{
// get vcl window related to the frame and lock it if it is still not locked
uno : : Reference < frame : : XFrame > xFrame = pSfxFrame - > GetFrameInterface ( ) ;
Window * pWindow = GetVCLWindow ( xFrame ) ;
if ( ! pWindow )
throw uno : : RuntimeException ( ) ;
if ( pWindow - > IsEnabled ( ) )
{
pWindow - > Disable ( ) ;
try
{
sal_Int32 nLen = m_aLockedFrames . getLength ( ) ;
m_aLockedFrames . realloc ( nLen + 1 ) ;
m_aLockedFrames [ nLen ] = xFrame ;
}
catch ( uno : : Exception & )
{
pWindow - > Enable ( ) ;
throw ;
}
}
}
catch ( uno : : Exception & )
{
OSL_ENSURE ( sal_False , " Not possible to lock the frame window! \n " ) ;
}
}
}
}
SfxOwnFramesLocker : : ~ SfxOwnFramesLocker ( )
{
UnlockFrames ( ) ;
}
Window * SfxOwnFramesLocker : : GetVCLWindow ( const uno : : Reference < frame : : XFrame > & xFrame )
{
Window * pWindow = NULL ;
if ( xFrame . is ( ) )
{
uno : : Reference < awt : : XWindow > xWindow = xFrame - > getContainerWindow ( ) ;
if ( xWindow . is ( ) )
pWindow = VCLUnoHelper : : GetWindow ( xWindow ) ;
}
return pWindow ;
}
void SfxOwnFramesLocker : : UnlockFrames ( )
{
for ( sal_Int32 nInd = 0 ; nInd < m_aLockedFrames . getLength ( ) ; nInd + + )
{
try
{
if ( m_aLockedFrames [ nInd ] . is ( ) )
{
// get vcl window related to the frame and unlock it
Window * pWindow = GetVCLWindow ( m_aLockedFrames [ nInd ] ) ;
if ( ! pWindow )
throw uno : : RuntimeException ( ) ;
pWindow - > Enable ( ) ;
m_aLockedFrames [ nInd ] = uno : : Reference < frame : : XFrame > ( ) ;
}
}
catch ( uno : : Exception & )
{
OSL_ENSURE ( sal_False , " Can't unlock the frame window! \n " ) ;
}
}
}
2005-07-12 13:27:05 +00:00
// SfxSaveGuard ====================================================================================
class SfxSaveGuard
{
private :
2007-07-18 05:53:49 +00:00
uno : : Reference < frame : : XModel > m_xModel ;
2005-07-12 13:27:05 +00:00
IMPL_SfxBaseModel_DataContainer * m_pData ;
SfxOwnFramesLocker * m_pFramesLock ;
public :
2007-07-18 05:53:49 +00:00
SfxSaveGuard ( const uno : : Reference < frame : : XModel > & xModel ,
2005-07-12 13:27:05 +00:00
IMPL_SfxBaseModel_DataContainer * pData ,
sal_Bool bRejectConcurrentSaveRequest ) ;
~ SfxSaveGuard ( ) ;
} ;
2007-07-18 05:53:49 +00:00
SfxSaveGuard : : SfxSaveGuard ( const uno : : Reference < frame : : XModel > & xModel ,
2005-07-12 13:27:05 +00:00
IMPL_SfxBaseModel_DataContainer * pData ,
sal_Bool bRejectConcurrentSaveRequest )
: m_xModel ( xModel )
, m_pData ( pData )
, m_pFramesLock ( 0 )
{
static : : rtl : : OUString MSG_1 = : : rtl : : OUString : : createFromAscii ( " Object already disposed. " ) ;
static : : rtl : : OUString MSG_2 = : : rtl : : OUString : : createFromAscii ( " Concurrent save requests on the same document are not possible. " ) ;
2005-10-19 11:47:00 +00:00
if ( m_pData - > m_bClosed )
2005-07-12 13:27:05 +00:00
throw : : com : : sun : : star : : lang : : DisposedException (
MSG_1 ,
: : com : : sun : : star : : uno : : Reference < : : com : : sun : : star : : uno : : XInterface > ( ) ) ;
if (
bRejectConcurrentSaveRequest & &
m_pData - > m_bSaving
)
throw : : com : : sun : : star : : io : : IOException (
MSG_2 ,
: : com : : sun : : star : : uno : : Reference < : : com : : sun : : star : : uno : : XInterface > ( ) ) ;
m_pData - > m_bSaving = sal_True ;
m_pFramesLock = new SfxOwnFramesLocker ( m_pData - > m_pObjectShell ) ;
}
SfxSaveGuard : : ~ SfxSaveGuard ( )
{
SfxOwnFramesLocker * pFramesLock = m_pFramesLock ;
m_pFramesLock = 0 ;
delete pFramesLock ;
m_pData - > m_bSaving = sal_False ;
// m_bSuicide was set e.g. in case somewhere tried to close a document, while it was used for
// storing at the same time. Further m_bSuicide was set to TRUE only if close(TRUE) was called.
// So the owner ship was delegated to the place where a veto exception was thrown.
// Now we have to call close() again and delegate the owner ship to the next one, which
// cant accept that. Close(FALSE) cant work in this case. Because then the document will may be never closed ...
if ( m_pData - > m_bSuicide )
{
// Reset this state. In case the new close() request is not accepted by somehwere else ...
// it's not a good idea to have two "owners" for close .-)
m_pData - > m_bSuicide = sal_False ;
try
{
2007-07-18 05:53:49 +00:00
uno : : Reference < util : : XCloseable > xClose ( m_xModel , uno : : UNO_QUERY ) ;
2005-07-12 13:27:05 +00:00
if ( xClose . is ( ) )
xClose - > close ( sal_True ) ;
}
2007-07-18 05:53:49 +00:00
catch ( const util : : CloseVetoException & )
2005-07-12 13:27:05 +00:00
{ }
}
}
2005-04-18 13:39:50 +00:00
// =======================================================================================================
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// constructor
//________________________________________________________________________________________________________
2007-08-03 09:24:13 +00:00
DBG_NAME ( sfx2_SfxBaseModel )
2003-04-04 18:24:37 +00:00
SfxBaseModel : : SfxBaseModel ( SfxObjectShell * pObjectShell )
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
: BaseMutex ( )
2003-04-04 18:24:37 +00:00
, m_pData ( new IMPL_SfxBaseModel_DataContainer ( m_aMutex , pObjectShell ) )
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
, m_bSupportEmbeddedScripts ( pObjectShell & & pObjectShell - > Get_Impl ( ) ? ! pObjectShell - > Get_Impl ( ) - > m_bNoBasicCapabilities : false )
2000-09-18 16:07:07 +00:00
{
2007-08-03 09:24:13 +00:00
DBG_CTOR ( sfx2_SfxBaseModel , NULL ) ;
2000-09-18 16:07:07 +00:00
if ( pObjectShell ! = NULL )
{
StartListening ( * pObjectShell ) ;
}
}
//________________________________________________________________________________________________________
// destructor
//________________________________________________________________________________________________________
SfxBaseModel : : ~ SfxBaseModel ( )
{
2007-08-03 09:24:13 +00:00
DBG_DTOR ( sfx2_SfxBaseModel , NULL ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XInterface
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Any SAL_CALL SfxBaseModel : : queryInterface ( const UNOTYPE & rType ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2008-03-06 18:56:03 +00:00
if ( ! m_bSupportEmbeddedScripts & & rType . equals ( XEMBEDDEDSCRIPTS : : static_type ( ) ) )
return Any ( ) ;
2004-10-04 19:57:20 +00:00
2008-03-06 18:56:03 +00:00
return SfxBaseModel_Base : : queryInterface ( rType ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XInterface
//________________________________________________________________________________________________________
2001-10-11 10:40:42 +00:00
void SAL_CALL SfxBaseModel : : acquire ( ) throw ( )
2000-09-18 16:07:07 +00:00
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
// Forward to baseclass
OWeakObject : : acquire ( ) ;
}
//________________________________________________________________________________________________________
// XInterface
//________________________________________________________________________________________________________
2001-10-11 10:40:42 +00:00
void SAL_CALL SfxBaseModel : : release ( ) throw ( )
2000-09-18 16:07:07 +00:00
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
// Forward to baseclass
OWeakObject : : release ( ) ;
}
//________________________________________________________________________________________________________
// XTypeProvider
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Sequence < UNOTYPE > SAL_CALL SfxBaseModel : : getTypes ( ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2008-03-06 18:56:03 +00:00
uno : : Sequence < UNOTYPE > aTypes ( SfxBaseModel_Base : : getTypes ( ) ) ;
if ( ! m_bSupportEmbeddedScripts )
2000-09-18 16:07:07 +00:00
{
2008-03-06 18:56:03 +00:00
// remove XEmbeddedScripts type from the sequence
Sequence < UNOTYPE > aStrippedTypes ( aTypes . getLength ( ) - 1 ) ;
: : std : : remove_copy_if (
aTypes . getConstArray ( ) ,
aTypes . getConstArray ( ) + aTypes . getLength ( ) ,
aStrippedTypes . getArray ( ) ,
: : std : : bind2nd ( : : std : : equal_to < UNOTYPE > ( ) , XEMBEDDEDSCRIPTS : : static_type ( ) )
) ;
aTypes = aStrippedTypes ;
2000-09-18 16:07:07 +00:00
}
2008-03-06 18:56:03 +00:00
return aTypes ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XTypeProvider
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Sequence < sal_Int8 > SAL_CALL SfxBaseModel : : getImplementationId ( ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// Create one Id for all instances of this class.
// Use ethernet address to do this! (sal_True)
// Optimize this method
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pID is NULL - for the second call pID is different from NULL!
2007-07-18 05:53:49 +00:00
static : : cppu : : OImplementationId * pID = NULL ;
2000-09-18 16:07:07 +00:00
if ( pID = = NULL )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
2007-07-18 05:53:49 +00:00
: : osl : : MutexGuard aGuard ( MUTEX : : getGlobalMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
// Control these pointer again ... it can be, that another instance will be faster then these!
if ( pID = = NULL )
{
// Create a new static ID ...
2007-07-18 05:53:49 +00:00
static : : cppu : : OImplementationId aID ( sal_False ) ;
2000-09-18 16:07:07 +00:00
// ... and set his address to static pointer!
pID = & aID ;
}
}
return pID - > getImplementationId ( ) ;
}
2000-11-13 11:50:43 +00:00
//________________________________________________________________________________________________________
// XStarBasicAccess
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > implGetStarBasicAccess ( SfxObjectShell * pObjectShell )
2000-11-27 14:16:00 +00:00
{
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > xRet ;
2000-11-27 14:16:00 +00:00
if ( pObjectShell )
{
BasicManager * pMgr = pObjectShell - > GetBasicManager ( ) ;
xRet = getStarBasicAccess ( pMgr ) ;
}
return xRet ;
}
2007-07-18 05:53:49 +00:00
uno : : Reference < XNAMECONTAINER > SAL_CALL SfxBaseModel : : getLibraryContainer ( ) throw ( uno : : RuntimeException )
2000-11-13 11:50:43 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > & rxAccess = m_pData - > m_xStarBasicAccess ;
2004-05-10 10:56:52 +00:00
if ( ! rxAccess . is ( ) & & m_pData - > m_pObjectShell . Is ( ) )
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess ( m_pData - > m_pObjectShell ) ;
2007-07-18 05:53:49 +00:00
uno : : Reference < XNAMECONTAINER > xRet ;
2000-11-27 14:16:00 +00:00
if ( rxAccess . is ( ) )
xRet = rxAccess - > getLibraryContainer ( ) ;
2000-11-13 11:50:43 +00:00
return xRet ;
}
/**___________________________________________________________________________________________________
@ seealso XStarBasicAccess
*/
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : createLibrary ( const : : rtl : : OUString & LibName , const : : rtl : : OUString & Password ,
const : : rtl : : OUString & ExternalSourceURL , const : : rtl : : OUString & LinkTargetURL )
throw ( ELEMENTEXISTEXCEPTION , uno : : RuntimeException )
2000-11-13 11:50:43 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > & rxAccess = m_pData - > m_xStarBasicAccess ;
2004-05-10 10:56:52 +00:00
if ( ! rxAccess . is ( ) & & m_pData - > m_pObjectShell . Is ( ) )
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess ( m_pData - > m_pObjectShell ) ;
if ( rxAccess . is ( ) )
rxAccess - > createLibrary ( LibName , Password , ExternalSourceURL , LinkTargetURL ) ;
2000-11-13 11:50:43 +00:00
}
/**___________________________________________________________________________________________________
@ seealso XStarBasicAccess
*/
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addModule ( const : : rtl : : OUString & LibraryName , const : : rtl : : OUString & ModuleName ,
const : : rtl : : OUString & Language , const : : rtl : : OUString & Source )
throw ( NOSUCHELEMENTEXCEPTION , uno : : RuntimeException )
2000-11-13 11:50:43 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > & rxAccess = m_pData - > m_xStarBasicAccess ;
2004-05-10 10:56:52 +00:00
if ( ! rxAccess . is ( ) & & m_pData - > m_pObjectShell . Is ( ) )
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess ( m_pData - > m_pObjectShell ) ;
if ( rxAccess . is ( ) )
rxAccess - > addModule ( LibraryName , ModuleName , Language , Source ) ;
2000-11-13 11:50:43 +00:00
}
/**___________________________________________________________________________________________________
@ seealso XStarBasicAccess
*/
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addDialog ( const : : rtl : : OUString & LibraryName , const : : rtl : : OUString & DialogName ,
2000-11-13 11:50:43 +00:00
const : : com : : sun : : star : : uno : : Sequence < sal_Int8 > & Data )
2007-07-18 05:53:49 +00:00
throw ( NOSUCHELEMENTEXCEPTION , uno : : RuntimeException )
2000-11-13 11:50:43 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : XStarBasicAccess > & rxAccess = m_pData - > m_xStarBasicAccess ;
2004-05-10 10:56:52 +00:00
if ( ! rxAccess . is ( ) & & m_pData - > m_pObjectShell . Is ( ) )
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess ( m_pData - > m_pObjectShell ) ;
if ( rxAccess . is ( ) )
rxAccess - > addDialog ( LibraryName , DialogName , Data ) ;
2000-11-13 11:50:43 +00:00
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < uno : : XInterface > SAL_CALL SfxBaseModel : : getParent ( ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2000-09-18 16:07:07 +00:00
return m_pData - > m_xParent ;
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : setParent ( const uno : : Reference < uno : : XInterface > & Parent ) throw ( NOSUPPORTEXCEPTION , uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
m_pData - > m_xParent = Parent ;
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel : : dispose ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-04-04 18:24:37 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
// object already disposed?
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-05-05 15:27:50 +00:00
if ( ! m_pData - > m_bClosed )
{
// gracefully accept wrong dispose calls instead of close call
// and try to make it work (may be really disposed later!)
try
{
close ( sal_True ) ;
}
catch ( com : : sun : : star : : util : : CloseVetoException & )
{
}
return ;
}
2008-03-06 18:56:03 +00:00
if ( m_pData - > m_pStorageModifyListen . is ( ) )
2004-11-09 14:38:24 +00:00
{
2008-03-06 18:56:03 +00:00
m_pData - > m_pStorageModifyListen - > dispose ( ) ;
2004-11-09 14:38:24 +00:00
m_pData - > m_pStorageModifyListen = NULL ;
}
2004-02-25 14:46:43 +00:00
2007-07-18 05:53:49 +00:00
lang : : EventObject aEvent ( ( frame : : XModel * ) this ) ;
2000-09-18 16:07:07 +00:00
m_pData - > m_aInterfaceContainer . disposeAndClear ( aEvent ) ;
2007-07-18 05:53:49 +00:00
if ( m_pData - > m_xDocumentInfo . is ( ) )
2000-09-18 16:07:07 +00:00
{
2007-07-18 05:53:49 +00:00
// as long as an SfxObjectShell is assigned to an SfxBaseModel it is still existing here
// so we can't dispose the shared DocumentInfoObject here
// uno::Reference < lang::XComponent > xComp( m_pData->m_xDocumentInfo, uno::UNO_QUERY );
// xComp->dispose();
m_pData - > m_xDocumentInfo = 0 ;
2000-09-18 16:07:07 +00:00
}
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
m_pData - > m_xDocumentProperties . clear ( ) ;
m_pData - > m_xDocumentMetadata . clear ( ) ;
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
2007-07-18 05:53:49 +00:00
EndListening ( * m_pData - > m_pObjectShell ) ;
m_pData - > m_xCurrent = uno : : Reference < frame : : XController > ( ) ;
m_pData - > m_seqControllers = uno : : Sequence < uno : : Reference < frame : : XController > > ( ) ;
2003-04-24 12:20:39 +00:00
2007-08-02 12:32:40 +00:00
// m_pData member must be set to zero before 0delete is called to
// force disposed exception whenever someone tries to access our
// instance while in the dtor.
IMPL_SfxBaseModel_DataContainer * pData = m_pData ;
m_pData = 0 ;
delete pData ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addEventListener ( const uno : : Reference < XEVENTLISTENER > & aListener )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2001-02-09 11:49:32 +00:00
return ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . addInterface ( : : getCppuType ( ( const uno : : Reference < XEVENTLISTENER > * ) 0 ) , aListener ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : removeEventListener ( const uno : : Reference < XEVENTLISTENER > & aListener )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2001-02-09 11:49:32 +00:00
return ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XEVENTLISTENER > * ) 0 ) , aListener ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// document::XDocumentInfoSupplier
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < document : : XDocumentInfo > SAL_CALL SfxBaseModel : : getDocumentInfo ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
if ( ! m_pData - > m_xDocumentInfo . is ( ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
// WARNING: this will only work if (when loading a document) the
// document meta-data has already been read and completely written
// into the XDocumentProperties at this point
// ==> DO NOT call getDocumentInfo before document info has been read!
uno : : Reference < document : : XDocumentInfo > xDocInfo =
new SfxDocumentInfoObject ;
uno : : Reference < document : : XDocumentProperties > xDocProps =
getDocumentProperties ( ) ;
uno : : Sequence < uno : : Any > args ( 1 ) ;
args [ 0 ] < < = xDocProps ;
uno : : Reference < lang : : XInitialization > xInit (
xDocInfo , uno : : UNO_QUERY_THROW ) ;
try {
xInit - > initialize ( args ) ;
( ( SfxBaseModel * ) this ) - > m_pData - > m_xDocumentInfo = xDocInfo ;
} catch ( uno : : RuntimeException & ) {
throw ;
} catch ( uno : : Exception & e ) {
throw lang : : WrappedTargetRuntimeException ( : : rtl : : OUString : : createFromAscii (
" SfxBaseModel::getDocumentInfo: cannot initialize " ) , * this ,
uno : : makeAny ( e ) ) ;
}
try {
rtl : : OUString aName = rtl : : OUString : : createFromAscii ( " MediaType " ) ;
uno : : Reference < beans : : XPropertySet > xSet (
getDocumentStorage ( ) , uno : : UNO_QUERY ) ;
uno : : Any aMediaType = xSet - > getPropertyValue ( aName ) ;
uno : : Reference < beans : : XPropertySet > xDocSet (
m_pData - > m_xDocumentInfo , uno : : UNO_QUERY ) ;
xDocSet - > setPropertyValue ( aName , aMediaType ) ;
} catch ( uno : : Exception & ) {
//ignore
}
2007-07-18 05:53:49 +00:00
}
2000-09-18 16:07:07 +00:00
return m_pData - > m_xDocumentInfo ;
}
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
// document::XDocumentPropertiesSupplier:
uno : : Reference < document : : XDocumentProperties > SAL_CALL
SfxBaseModel : : getDocumentProperties ( )
throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
if ( ! m_pData - > m_xDocumentProperties . is ( ) )
{
uno : : Reference < lang : : XInitialization > xDocProps (
: : comphelper : : getProcessServiceFactory ( ) - > createInstance (
DEFINE_CONST_UNICODE ( " com.sun.star.document.DocumentProperties " ) ) ,
uno : : UNO_QUERY_THROW ) ;
// xDocProps->initialize(uno::Sequence<uno::Any>());
m_pData - > m_xDocumentProperties . set ( xDocProps , uno : : UNO_QUERY_THROW ) ;
2009-09-08 04:57:32 +00:00
uno : : Reference < util : : XModifyBroadcaster > xMB ( m_pData - > m_xDocumentProperties , uno : : UNO_QUERY_THROW ) ;
xMB - > addModifyListener ( new SfxDocInfoListener_Impl ( * m_pData - > m_pObjectShell ) ) ;
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
}
return m_pData - > m_xDocumentProperties ;
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XEVENTLISTENER
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : disposing ( const lang : : EventObject & aObject )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
uno : : Reference < XMODIFYLISTENER > xMod ( aObject . Source , uno : : UNO_QUERY ) ;
uno : : Reference < XEVENTLISTENER > xListener ( aObject . Source , uno : : UNO_QUERY ) ;
uno : : Reference < XDOCEVENTLISTENER > xDocListener ( aObject . Source , uno : : UNO_QUERY ) ;
2001-09-27 09:44:57 +00:00
2000-09-18 16:07:07 +00:00
if ( xMod . is ( ) )
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XMODIFYLISTENER > * ) 0 ) , xMod ) ;
2000-09-18 16:07:07 +00:00
else if ( xListener . is ( ) )
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XEVENTLISTENER > * ) 0 ) , xListener ) ;
2001-02-09 11:49:32 +00:00
else if ( xDocListener . is ( ) )
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) , xListener ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
sal_Bool SAL_CALL SfxBaseModel : : attachResource ( const : : rtl : : OUString & rURL ,
const uno : : Sequence < beans : : PropertyValue > & rArgs )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-04-24 12:20:39 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-05-02 14:30:49 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-03-27 10:29:38 +00:00
2003-04-04 18:24:37 +00:00
if ( rURL . getLength ( ) = = 0 & & rArgs . getLength ( ) = = 1 & & rArgs [ 0 ] . Name . equalsAscii ( " SetEmbedded " ) )
2003-03-27 10:29:38 +00:00
{
2003-04-04 18:24:37 +00:00
// allows to set a windowless document to EMBEDDED state
// but _only_ before load() or initNew() methods
if ( m_pData - > m_pObjectShell . Is ( ) & & ! m_pData - > m_pObjectShell - > GetMedium ( ) )
{
2006-08-29 10:16:40 +00:00
sal_Bool bEmb = sal_Bool ( ) ;
2003-04-04 18:24:37 +00:00
if ( ( rArgs [ 0 ] . Value > > = bEmb ) & & bEmb )
m_pData - > m_pObjectShell - > SetCreateMode_Impl ( SFX_CREATE_MODE_EMBEDDED ) ;
}
return sal_True ;
}
if ( m_pData - > m_pObjectShell . Is ( ) )
{
m_pData - > m_sURL = rURL ;
2009-11-25 09:34:02 +01:00
SfxObjectShell * pObjectShell = m_pData - > m_pObjectShell ;
: : comphelper : : NamedValueCollection aArgs ( rArgs ) ;
Sequence < sal_Int32 > aWinExtent ;
if ( ( aArgs . get ( " WinExtent " ) > > = aWinExtent ) & & ( aWinExtent . getLength ( ) = = 4 ) )
2004-06-10 12:32:28 +00:00
{
2009-11-25 09:34:02 +01:00
Rectangle aVisArea ( aWinExtent [ 0 ] , aWinExtent [ 1 ] , aWinExtent [ 2 ] , aWinExtent [ 3 ] ) ;
aVisArea = OutputDevice : : LogicToLogic ( aVisArea , MAP_100TH_MM , pObjectShell - > GetMapUnit ( ) ) ;
pObjectShell - > SetVisArea ( aVisArea ) ;
2004-06-10 12:32:28 +00:00
}
2009-11-25 09:34:02 +01:00
sal_Bool bBreakMacroSign = sal_False ;
if ( aArgs . get ( " BreakMacroSignature " ) > > = bBreakMacroSign )
{
pObjectShell - > BreakMacroSign_Impl ( bBreakMacroSign ) ;
}
aArgs . remove ( " WinExtent " ) ;
aArgs . remove ( " BreakMacroSignature " ) ;
aArgs . remove ( " Stream " ) ;
aArgs . remove ( " InputStream " ) ;
// TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be removed here
2006-11-07 13:53:52 +00:00
2009-11-25 09:34:02 +01:00
m_pData - > m_seqArguments = aArgs . getPropertyValues ( ) ;
2004-06-10 12:32:28 +00:00
2009-11-25 09:34:02 +01:00
SfxMedium * pMedium = pObjectShell - > GetMedium ( ) ;
if ( pMedium )
2003-04-04 18:24:37 +00:00
{
2009-11-25 09:34:02 +01:00
SfxAllItemSet aSet ( pObjectShell - > GetPool ( ) ) ;
2003-04-04 18:24:37 +00:00
TransformParameters ( SID_OPENDOC , rArgs , aSet ) ;
2005-01-21 16:34:23 +00:00
2009-11-25 09:34:02 +01:00
pMedium - > GetItemSet ( ) - > Put ( aSet ) ;
2003-04-04 18:24:37 +00:00
SFX_ITEMSET_ARG ( & aSet , pItem , SfxStringItem , SID_FILTER_NAME , sal_False ) ;
if ( pItem )
2009-11-25 09:34:02 +01:00
pMedium - > SetFilter (
pObjectShell - > GetFactory ( ) . GetFilterContainer ( ) - > GetFilter4FilterName ( pItem - > GetValue ( ) ) ) ;
2005-01-21 16:34:23 +00:00
SFX_ITEMSET_ARG ( & aSet , pTitleItem , SfxStringItem , SID_DOCINFO_TITLE , sal_False ) ;
if ( pTitleItem )
{
2009-11-25 09:34:02 +01:00
SfxViewFrame * pFrame = SfxViewFrame : : GetFirst ( pObjectShell ) ;
2005-01-21 16:34:23 +00:00
if ( pFrame )
pFrame - > UpdateTitle ( ) ;
}
2003-04-04 18:24:37 +00:00
}
2003-03-27 10:29:38 +00:00
}
2000-09-18 16:07:07 +00:00
return sal_True ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
: : rtl : : OUString SAL_CALL SfxBaseModel : : getURL ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2000-09-18 16:07:07 +00:00
return m_pData - > m_sURL ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Sequence < beans : : PropertyValue > SAL_CALL SfxBaseModel : : getArgs ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-03-27 10:29:38 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2003-03-27 10:29:38 +00:00
{
2007-07-18 05:53:49 +00:00
uno : : Sequence < beans : : PropertyValue > seqArgsNew ;
uno : : Sequence < beans : : PropertyValue > seqArgsOld ;
2003-03-27 10:29:38 +00:00
SfxAllItemSet aSet ( m_pData - > m_pObjectShell - > GetPool ( ) ) ;
// we need to know which properties are supported by the transformer
// hopefully it is a temporary solution, I guess nonconvertable properties
// should not be supported so then there will be only ItemSet from medium
TransformItems ( SID_OPENDOC , * ( m_pData - > m_pObjectShell - > GetMedium ( ) - > GetItemSet ( ) ) , seqArgsNew ) ;
TransformParameters ( SID_OPENDOC , m_pData - > m_seqArguments , aSet ) ;
TransformItems ( SID_OPENDOC , aSet , seqArgsOld ) ;
sal_Int32 nOrgLength = m_pData - > m_seqArguments . getLength ( ) ;
sal_Int32 nOldLength = seqArgsOld . getLength ( ) ;
sal_Int32 nNewLength = seqArgsNew . getLength ( ) ;
2003-04-04 18:24:37 +00:00
// "WinExtent" property should be updated always.
// We can store it now to overwrite an old value
// since it is not from ItemSet
2004-10-04 19:57:20 +00:00
Rectangle aTmpRect = m_pData - > m_pObjectShell - > GetVisArea ( ASPECT_CONTENT ) ;
aTmpRect = OutputDevice : : LogicToLogic ( aTmpRect , m_pData - > m_pObjectShell - > GetMapUnit ( ) , MAP_100TH_MM ) ;
2003-04-04 18:24:37 +00:00
2006-06-19 21:31:31 +00:00
Sequence < sal_Int32 > aRectSeq ( 4 ) ;
aRectSeq [ 0 ] = aTmpRect . Left ( ) ;
aRectSeq [ 1 ] = aTmpRect . Top ( ) ;
aRectSeq [ 2 ] = aTmpRect . Right ( ) ;
aRectSeq [ 3 ] = aTmpRect . Bottom ( ) ;
2003-04-04 18:24:37 +00:00
2004-10-04 19:57:20 +00:00
seqArgsNew . realloc ( + + nNewLength ) ;
seqArgsNew [ nNewLength - 1 ] . Name = : : rtl : : OUString : : createFromAscii ( " WinExtent " ) ;
2006-06-19 21:31:31 +00:00
seqArgsNew [ nNewLength - 1 ] . Value < < = aRectSeq ;
2004-10-04 19:57:20 +00:00
if ( m_pData - > m_aPreusedFilterName . getLength ( ) )
{
2003-04-04 18:24:37 +00:00
seqArgsNew . realloc ( + + nNewLength ) ;
2004-10-04 19:57:20 +00:00
seqArgsNew [ nNewLength - 1 ] . Name = : : rtl : : OUString : : createFromAscii ( " PreusedFilterName " ) ;
seqArgsNew [ nNewLength - 1 ] . Value < < = m_pData - > m_aPreusedFilterName ;
2003-04-04 18:24:37 +00:00
}
2004-07-06 12:36:40 +00:00
SfxViewFrame * pFrame = SfxViewFrame : : GetFirst ( m_pData - > m_pObjectShell ) ;
if ( pFrame )
{
SvBorder aBorder = pFrame - > GetBorderPixelImpl ( pFrame - > GetViewShell ( ) ) ;
2006-06-19 21:31:31 +00:00
Sequence < sal_Int32 > aBorderSeq ( 4 ) ;
aBorderSeq [ 0 ] = aBorder . Left ( ) ;
aBorderSeq [ 1 ] = aBorder . Top ( ) ;
aBorderSeq [ 2 ] = aBorder . Right ( ) ;
aBorderSeq [ 3 ] = aBorder . Bottom ( ) ;
2004-07-06 12:36:40 +00:00
seqArgsNew . realloc ( + + nNewLength ) ;
seqArgsNew [ nNewLength - 1 ] . Name = : : rtl : : OUString : : createFromAscii ( " DocumentBorder " ) ;
2006-06-19 21:31:31 +00:00
seqArgsNew [ nNewLength - 1 ] . Value < < = aBorderSeq ;
2004-07-06 12:36:40 +00:00
}
2004-10-04 19:57:20 +00:00
// only the values that are not supported by the ItemSet must be cached here
uno : : Sequence < beans : : PropertyValue > aFinalCache ;
sal_Int32 nFinalLength = 0 ;
2003-03-27 10:29:38 +00:00
for ( sal_Int32 nOrg = 0 ; nOrg < nOrgLength ; nOrg + + )
{
sal_Int32 nOldInd = 0 ;
while ( nOldInd < nOldLength )
{
if ( m_pData - > m_seqArguments [ nOrg ] . Name . equals ( seqArgsOld [ nOldInd ] . Name ) )
break ;
nOldInd + + ;
}
if ( nOldInd = = nOldLength )
{
// the entity with this name should be new for seqArgsNew
// since it is not supported by transformer
seqArgsNew . realloc ( + + nNewLength ) ;
2004-10-04 19:57:20 +00:00
seqArgsNew [ nNewLength - 1 ] = m_pData - > m_seqArguments [ nOrg ] ;
2003-03-27 10:29:38 +00:00
2004-10-04 19:57:20 +00:00
aFinalCache . realloc ( + + nFinalLength ) ;
aFinalCache [ nFinalLength - 1 ] = m_pData - > m_seqArguments [ nOrg ] ;
}
2003-03-27 10:29:38 +00:00
}
2004-10-04 19:57:20 +00:00
m_pData - > m_seqArguments = aFinalCache ;
return seqArgsNew ;
2003-03-27 10:29:38 +00:00
}
2004-10-04 19:57:20 +00:00
return m_pData - > m_seqArguments ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : connectController ( const uno : : Reference < frame : : XController > & xController )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2000-09-18 16:07:07 +00:00
sal_uInt32 nOldCount = m_pData - > m_seqControllers . getLength ( ) ;
2007-07-18 05:53:49 +00:00
uno : : Sequence < uno : : Reference < frame : : XController > > aNewSeq ( nOldCount + 1 ) ;
2000-09-18 16:07:07 +00:00
for ( sal_uInt32 n = 0 ; n < nOldCount ; n + + )
aNewSeq . getArray ( ) [ n ] = m_pData - > m_seqControllers . getConstArray ( ) [ n ] ;
aNewSeq . getArray ( ) [ nOldCount ] = xController ;
m_pData - > m_seqControllers = aNewSeq ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : disconnectController ( const uno : : Reference < frame : : XController > & xController ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2000-09-18 16:07:07 +00:00
sal_uInt32 nOldCount = m_pData - > m_seqControllers . getLength ( ) ;
2001-04-27 09:20:41 +00:00
if ( ! nOldCount )
return ;
2007-07-18 05:53:49 +00:00
uno : : Sequence < uno : : Reference < frame : : XController > > aNewSeq ( nOldCount - 1 ) ;
2000-09-18 16:07:07 +00:00
for ( sal_uInt32 nOld = 0 , nNew = 0 ; nOld < nOldCount ; + + nOld )
2001-09-27 09:44:57 +00:00
{
2000-09-18 16:07:07 +00:00
if ( xController ! = m_pData - > m_seqControllers . getConstArray ( ) [ nOld ] )
{
aNewSeq . getArray ( ) [ nNew ] = m_pData - > m_seqControllers . getConstArray ( ) [ nOld ] ;
+ + nNew ;
}
2001-09-27 09:44:57 +00:00
}
2000-09-18 16:07:07 +00:00
m_pData - > m_seqControllers = aNewSeq ;
if ( xController = = m_pData - > m_xCurrent )
2007-07-18 05:53:49 +00:00
m_pData - > m_xCurrent = uno : : Reference < frame : : XController > ( ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel : : lockControllers ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
+ + m_pData - > m_nControllerLockCount ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel : : unlockControllers ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
- - m_pData - > m_nControllerLockCount ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel : : hasControllersLocked ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
return ( m_pData - > m_nControllerLockCount ! = 0 ) ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < frame : : XController > SAL_CALL SfxBaseModel : : getCurrentController ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2000-10-19 16:04:52 +00:00
// get the last active controller of this model
2000-09-18 16:07:07 +00:00
if ( m_pData - > m_xCurrent . is ( ) )
return m_pData - > m_xCurrent ;
// get the first controller of this model
return m_pData - > m_seqControllers . getLength ( ) ? m_pData - > m_seqControllers . getConstArray ( ) [ 0 ] : m_pData - > m_xCurrent ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : setCurrentController ( const uno : : Reference < frame : : XController > & xCurrentController )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : container : : NoSuchElementException , : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
m_pData - > m_xCurrent = xCurrentController ;
}
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
// frame::XModel
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < uno : : XInterface > SAL_CALL SfxBaseModel : : getCurrentSelection ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < uno : : XInterface > xReturn ;
uno : : Reference < frame : : XController > xController = getCurrentController ( ) ;
2000-09-18 16:07:07 +00:00
if ( xController . is ( ) )
{
2007-07-18 05:53:49 +00:00
uno : : Reference < view : : XSelectionSupplier > xDocView ( xController , uno : : UNO_QUERY ) ;
2000-09-18 16:07:07 +00:00
if ( xDocView . is ( ) )
{
2007-07-18 05:53:49 +00:00
uno : : Any xSel = xDocView - > getSelection ( ) ;
2000-09-18 16:07:07 +00:00
xSel > > = xReturn ;
}
}
return xReturn ;
}
2007-06-26 15:10:07 +00:00
//________________________________________________________________________________________________________
// XModifiable2
//________________________________________________________________________________________________________
sal_Bool SAL_CALL SfxBaseModel : : disableSetModified ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw DISPOSEDEXCEPTION ( ) ;
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : RuntimeException ( ) ;
sal_Bool bResult = m_pData - > m_pObjectShell - > IsEnableSetModified ( ) ;
m_pData - > m_pObjectShell - > EnableSetModified ( sal_False ) ;
return bResult ;
}
sal_Bool SAL_CALL SfxBaseModel : : enableSetModified ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw DISPOSEDEXCEPTION ( ) ;
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : RuntimeException ( ) ;
sal_Bool bResult = m_pData - > m_pObjectShell - > IsEnableSetModified ( ) ;
m_pData - > m_pObjectShell - > EnableSetModified ( sal_True ) ;
return bResult ;
}
sal_Bool SAL_CALL SfxBaseModel : : isSetModifiedEnabled ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw DISPOSEDEXCEPTION ( ) ;
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : RuntimeException ( ) ;
return m_pData - > m_pObjectShell - > IsEnableSetModified ( ) ;
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel : : isModified ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
return m_pData - > m_pObjectShell . Is ( ) ? m_pData - > m_pObjectShell - > IsModified ( ) : sal_False ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
void SAL_CALL SfxBaseModel : : setModified ( sal_Bool bModified )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : beans : : PropertyVetoException , : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2000-09-18 16:07:07 +00:00
m_pData - > m_pObjectShell - > SetModified ( bModified ) ;
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addModifyListener ( const uno : : Reference < XMODIFYLISTENER > & xListener ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2001-02-12 10:52:32 +00:00
return ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . addInterface ( : : getCppuType ( ( const uno : : Reference < XMODIFYLISTENER > * ) 0 ) , xListener ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : removeModifyListener ( const uno : : Reference < XMODIFYLISTENER > & xListener ) throw ( uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2001-02-12 10:52:32 +00:00
return ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XMODIFYLISTENER > * ) 0 ) , xListener ) ;
2000-09-18 16:07:07 +00:00
}
2002-04-08 10:28:17 +00:00
//____________________________________________________________________________________________________
// XCloseable
//____________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : close ( sal_Bool bDeliverOwnership ) throw ( util : : CloseVetoException , uno : : RuntimeException )
2002-04-08 10:28:17 +00:00
{
2005-07-12 13:27:05 +00:00
static : : rtl : : OUString MSG_1 = : : rtl : : OUString : : createFromAscii ( " Cant close while saving. " ) ;
2003-04-04 18:24:37 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-05-05 15:27:50 +00:00
if ( ! m_pData | | m_pData - > m_bClosed | | m_pData - > m_bClosing )
2003-04-04 18:24:37 +00:00
return ;
2002-10-24 11:12:32 +00:00
uno : : Reference < uno : : XInterface > xSelfHold ( static_cast < : : cppu : : OWeakObject * > ( this ) ) ;
lang : : EventObject aSource ( static_cast < : : cppu : : OWeakObject * > ( this ) ) ;
: : cppu : : OInterfaceContainerHelper * pContainer = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < util : : XCloseListener > * ) NULL ) ) ;
if ( pContainer ! = NULL )
{
: : cppu : : OInterfaceIteratorHelper pIterator ( * pContainer ) ;
while ( pIterator . hasMoreElements ( ) )
{
try
{
( ( util : : XCloseListener * ) pIterator . next ( ) ) - > queryClosing ( aSource , bDeliverOwnership ) ;
}
catch ( uno : : RuntimeException & )
{
pIterator . remove ( ) ;
}
}
}
2005-07-12 13:27:05 +00:00
if ( m_pData - > m_bSaving )
{
if ( bDeliverOwnership )
m_pData - > m_bSuicide = sal_True ;
2007-07-18 05:53:49 +00:00
throw util : : CloseVetoException (
2005-07-12 13:27:05 +00:00
MSG_1 ,
static_cast < : : com : : sun : : star : : util : : XCloseable * > ( this ) ) ;
}
2002-10-24 11:12:32 +00:00
// no own objections against closing!
2003-05-05 15:27:50 +00:00
m_pData - > m_bClosing = sal_True ;
2002-10-24 11:12:32 +00:00
pContainer = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < util : : XCloseListener > * ) NULL ) ) ;
if ( pContainer ! = NULL )
{
: : cppu : : OInterfaceIteratorHelper pCloseIterator ( * pContainer ) ;
while ( pCloseIterator . hasMoreElements ( ) )
{
try
{
( ( util : : XCloseListener * ) pCloseIterator . next ( ) ) - > notifyClosing ( aSource ) ;
}
catch ( uno : : RuntimeException & )
{
pCloseIterator . remove ( ) ;
}
}
}
2003-04-04 18:24:37 +00:00
m_pData - > m_bClosed = sal_True ;
2003-05-05 15:27:50 +00:00
m_pData - > m_bClosing = sal_False ;
2003-04-04 18:24:37 +00:00
2002-10-24 11:12:32 +00:00
dispose ( ) ;
2002-04-08 10:28:17 +00:00
}
//____________________________________________________________________________________________________
// XCloseBroadcaster
//____________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addCloseListener ( const uno : : Reference < XCLOSELISTENER > & xListener ) throw ( uno : : RuntimeException )
2002-04-08 10:28:17 +00:00
{
2002-10-24 11:12:32 +00:00
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2002-10-24 11:12:32 +00:00
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . addInterface ( : : getCppuType ( ( const uno : : Reference < XCLOSELISTENER > * ) 0 ) , xListener ) ;
2002-04-08 10:28:17 +00:00
}
//____________________________________________________________________________________________________
// XCloseBroadcaster
//____________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : removeCloseListener ( const uno : : Reference < XCLOSELISTENER > & xListener ) throw ( uno : : RuntimeException )
2002-04-08 10:28:17 +00:00
{
2002-10-24 11:12:32 +00:00
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2002-10-24 11:12:32 +00:00
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XCLOSELISTENER > * ) 0 ) , xListener ) ;
2002-04-08 10:28:17 +00:00
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XPrintable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Sequence < beans : : PropertyValue > SAL_CALL SfxBaseModel : : getPrinter ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper ( ) )
return m_pData - > m_xPrintable - > getPrinter ( ) ;
else
return uno : : Sequence < beans : : PropertyValue > ( ) ;
2003-04-24 13:33:42 +00:00
}
2002-07-19 14:52:12 +00:00
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : setPrinter ( const uno : : Sequence < beans : : PropertyValue > & rPrinter )
2003-04-24 13:33:42 +00:00
throw ( : : com : : sun : : star : : lang : : IllegalArgumentException , : : com : : sun : : star : : uno : : RuntimeException )
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper ( ) )
m_pData - > m_xPrintable - > setPrinter ( rPrinter ) ;
2000-09-18 16:07:07 +00:00
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : print ( const uno : : Sequence < beans : : PropertyValue > & rOptions )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : lang : : IllegalArgumentException , : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper ( ) )
m_pData - > m_xPrintable - > print ( rOptions ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel : : hasLocation ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
return m_pData - > m_pObjectShell . Is ( ) ? m_pData - > m_pObjectShell - > HasName ( ) : sal_False ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
: : rtl : : OUString SAL_CALL SfxBaseModel : : getLocation ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2008-04-15 13:35:55 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
{
// TODO/LATER: is it correct that the shared document returns shared file location?
if ( m_pData - > m_pObjectShell - > IsDocShared ( ) )
return m_pData - > m_pObjectShell - > GetSharedFileURL ( ) ;
else
return : : rtl : : OUString ( m_pData - > m_pObjectShell - > GetMedium ( ) - > GetName ( ) ) ;
}
return m_pData - > m_sURL ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel : : isReadonly ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
return m_pData - > m_pObjectShell . Is ( ) ? m_pData - > m_pObjectShell - > IsReadOnly ( ) : sal_True ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
2004-11-26 15:16:51 +00:00
// XStorable2
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : storeSelf ( const uno : : Sequence < beans : : PropertyValue > & aSeqArgs )
2004-11-26 15:16:51 +00:00
throw ( : : com : : sun : : star : : lang : : IllegalArgumentException ,
: : com : : sun : : star : : io : : IOException ,
: : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2005-04-22 10:27:19 +00:00
RTL_LOGFILE_PRODUCT_CONTEXT ( aPerfLog , " PERFORMANCE - SfxBaseModel::storeSelf " ) ;
2005-02-16 15:35:35 +00:00
2000-09-18 16:07:07 +00:00
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2000-09-18 16:07:07 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " storeSelf " ) ) ) ;
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard ( this , m_pData , sal_False ) ;
2005-04-18 13:39:50 +00:00
2004-11-26 15:16:51 +00:00
for ( sal_Int32 nInd = 0 ; nInd < aSeqArgs . getLength ( ) ; nInd + + )
{
// check that only acceptable parameters are provided here
if ( ! aSeqArgs [ nInd ] . Name . equals ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " VersionComment " ) ) )
& & ! aSeqArgs [ nInd ] . Name . equals ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Author " ) ) )
& & ! aSeqArgs [ nInd ] . Name . equals ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " InteractionHandler " ) ) )
& & ! aSeqArgs [ nInd ] . Name . equals ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " StatusIndicator " ) ) ) )
2008-04-15 13:35:55 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " unexpected parameter for storeSelf, might be no problem if SaveAs is executed. " ) ) ) ;
m_pData - > m_pObjectShell - > StoreLog ( ) ;
2008-04-15 13:35:55 +00:00
: : rtl : : OUString aMessage ( RTL_CONSTASCII_USTRINGPARAM ( " Unexpected MediaDescriptor parameter: " ) ) ;
aMessage + = aSeqArgs [ nInd ] . Name ;
throw lang : : IllegalArgumentException ( aMessage , uno : : Reference < uno : : XInterface > ( ) , 1 ) ;
}
2004-11-26 15:16:51 +00:00
}
SfxAllItemSet * pParams = new SfxAllItemSet ( SFX_APP ( ) - > GetPool ( ) ) ;
TransformParameters ( SID_SAVEDOC , aSeqArgs , * pParams ) ;
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( SFX_EVENT_SAVEDOC , GlobalEventConfig : : GetEventName ( STR_EVENT_SAVEDOC ) , m_pData - > m_pObjectShell ) ) ;
2004-10-04 19:57:20 +00:00
sal_Bool bRet = sal_False ;
// TODO/LATER: let the embedded case of saving be handled more careful
2002-11-05 07:10:15 +00:00
if ( m_pData - > m_pObjectShell - > GetCreateMode ( ) = = SFX_CREATE_MODE_EMBEDDED )
{
2004-10-04 19:57:20 +00:00
// If this is an embedded object that has no URL based location it should be stored to own storage.
// An embedded object can have a location based on URL in case it is a link, then it should be
// stored in normal way.
if ( ! hasLocation ( ) | | getLocation ( ) . compareToAscii ( " private: " , 8 ) = = 0 )
{
2004-11-26 15:16:51 +00:00
// actually in this very rare case only UI parameters have sence
// TODO/LATER: should be done later, after integration of sb19
2006-10-12 14:56:47 +00:00
bRet = m_pData - > m_pObjectShell - > DoSave ( )
& & m_pData - > m_pObjectShell - > DoSaveCompleted ( ) ;
2004-10-04 19:57:20 +00:00
}
else
{
2004-11-26 15:16:51 +00:00
bRet = m_pData - > m_pObjectShell - > Save_Impl ( pParams ) ;
2004-10-04 19:57:20 +00:00
}
2002-11-05 07:10:15 +00:00
}
else
2004-11-26 15:16:51 +00:00
bRet = m_pData - > m_pObjectShell - > Save_Impl ( pParams ) ;
DELETEZ ( pParams ) ;
2004-10-04 19:57:20 +00:00
sal_uInt32 nErrCode = m_pData - > m_pObjectShell - > GetError ( ) ? m_pData - > m_pObjectShell - > GetError ( )
: ERRCODE_IO_CANTWRITE ;
m_pData - > m_pObjectShell - > ResetError ( ) ;
if ( bRet )
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " successful saving. " ) ) ) ;
2004-10-04 19:57:20 +00:00
m_pData - > m_aPreusedFilterName = GetMediumFilterName_Impl ( ) ;
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( SFX_EVENT_SAVEDOCDONE , GlobalEventConfig : : GetEventName ( STR_EVENT_SAVEDOCDONE ) , m_pData - > m_pObjectShell ) ) ;
2004-10-04 19:57:20 +00:00
}
else
2005-07-12 13:27:05 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Storing failed! " ) ) ) ;
m_pData - > m_pObjectShell - > StoreLog ( ) ;
// write the contents of the logger to the file
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( SFX_EVENT_SAVEDOCFAILED , GlobalEventConfig : : GetEventName ( STR_EVENT_SAVEDOCFAILED ) , m_pData - > m_pObjectShell ) ) ;
2005-07-12 13:27:05 +00:00
2004-10-04 19:57:20 +00:00
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) , uno : : Reference < uno : : XInterface > ( ) , nErrCode ) ;
2005-07-12 13:27:05 +00:00
}
2000-09-18 16:07:07 +00:00
}
2004-11-26 15:16:51 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
void SAL_CALL SfxBaseModel : : store ( ) throw ( : : com : : sun : : star : : io : : IOException , : : com : : sun : : star : : uno : : RuntimeException )
{
storeSelf ( uno : : Sequence < beans : : PropertyValue > ( ) ) ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : storeAsURL ( const : : rtl : : OUString & rURL ,
const uno : : Sequence < beans : : PropertyValue > & rArgs )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : io : : IOException , : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
2005-04-22 10:27:19 +00:00
RTL_LOGFILE_PRODUCT_CONTEXT ( aPerfLog , " PERFORMANCE - SfxBaseModel::storeAsURL " ) ;
2005-02-16 15:35:35 +00:00
2000-09-18 16:07:07 +00:00
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2000-09-18 16:07:07 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " storeAsURL " ) ) ) ;
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard ( this , m_pData , sal_False ) ;
2004-10-04 19:57:20 +00:00
impl_store ( rURL , rArgs , sal_False ) ;
2000-09-18 16:07:07 +00:00
2007-07-18 05:53:49 +00:00
uno : : Sequence < beans : : PropertyValue > aSequence ;
2000-09-18 16:07:07 +00:00
TransformItems ( SID_OPENDOC , * m_pData - > m_pObjectShell - > GetMedium ( ) - > GetItemSet ( ) , aSequence ) ;
attachResource ( rURL , aSequence ) ;
}
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : storeToURL ( const : : rtl : : OUString & rURL ,
const uno : : Sequence < beans : : PropertyValue > & rArgs )
2001-09-12 15:12:30 +00:00
throw ( : : com : : sun : : star : : io : : IOException , : : com : : sun : : star : : uno : : RuntimeException )
2000-09-18 16:07:07 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2000-09-18 16:07:07 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2000-09-18 16:07:07 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " storeToURL " ) ) ) ;
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard ( this , m_pData , sal_False ) ;
2004-10-04 19:57:20 +00:00
impl_store ( rURL , rArgs , sal_True ) ;
2000-09-18 16:07:07 +00:00
}
}
2003-04-04 18:24:37 +00:00
//________________________________________________________________________________________________________
// XLoadable
//________________________________________________________________________________________________________
void SAL_CALL SfxBaseModel : : initNew ( )
throw ( : : com : : sun : : star : : frame : : DoubleInitializationException ,
: : com : : sun : : star : : io : : IOException ,
: : com : : sun : : star : : uno : : RuntimeException ,
: : com : : sun : : star : : uno : : Exception )
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-04-04 18:24:37 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-04-04 18:24:37 +00:00
// the object shell should exist always
DBG_ASSERT ( m_pData - > m_pObjectShell . Is ( ) , " Model is useless without an ObjectShell " ) ;
if ( m_pData - > m_pObjectShell . Is ( ) )
{
if ( m_pData - > m_pObjectShell - > GetMedium ( ) )
throw DOUBLEINITIALIZATIONEXCEPTION ( ) ;
sal_Bool bRes = m_pData - > m_pObjectShell - > DoInitNew ( NULL ) ;
sal_uInt32 nErrCode = m_pData - > m_pObjectShell - > GetError ( ) ?
m_pData - > m_pObjectShell - > GetError ( ) : ERRCODE_IO_CANTCREATE ;
m_pData - > m_pObjectShell - > ResetError ( ) ;
if ( ! bRes )
2004-10-04 19:57:20 +00:00
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) , uno : : Reference < uno : : XInterface > ( ) , nErrCode ) ;
2003-04-04 18:24:37 +00:00
}
}
//________________________________________________________________________________________________________
// XLoadable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : load ( const uno : : Sequence < beans : : PropertyValue > & seqArguments )
2003-04-04 18:24:37 +00:00
throw ( : : com : : sun : : star : : frame : : DoubleInitializationException ,
: : com : : sun : : star : : io : : IOException ,
: : com : : sun : : star : : uno : : RuntimeException ,
: : com : : sun : : star : : uno : : Exception )
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-04-04 18:24:37 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-04-04 18:24:37 +00:00
// the object shell should exist always
DBG_ASSERT ( m_pData - > m_pObjectShell . Is ( ) , " Model is useless without an ObjectShell " ) ;
if ( m_pData - > m_pObjectShell . Is ( ) )
{
if ( m_pData - > m_pObjectShell - > GetMedium ( ) )
2004-04-22 12:25:05 +00:00
// if a Medium is present, the document is already initialized
2003-04-04 18:24:37 +00:00
throw DOUBLEINITIALIZATIONEXCEPTION ( ) ;
2007-07-18 05:53:49 +00:00
SfxMedium * pMedium = new SfxMedium ( seqArguments ) ;
String aFilterName ;
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pFilterNameItem , SfxStringItem , SID_FILTER_NAME , sal_False ) ;
2003-04-04 18:24:37 +00:00
if ( pFilterNameItem )
aFilterName = pFilterNameItem - > GetValue ( ) ;
2004-02-03 17:10:05 +00:00
if ( ! m_pData - > m_pObjectShell - > GetFactory ( ) . GetFilterContainer ( ) - > GetFilter4FilterName ( aFilterName ) )
2004-04-22 12:25:05 +00:00
{
// filtername is not valid
2007-07-18 05:53:49 +00:00
delete pMedium ;
throw frame : : IllegalArgumentIOException ( ) ;
2005-11-11 08:06:33 +00:00
}
2004-04-22 12:25:05 +00:00
// !TODO: currently not working
//SFX_ITEMSET_ARG( pParams, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE );
//if( pFrameItem && pFrameItem->GetFrame() )
//{
// SfxFrame* pFrame = pFrameItem->GetFrame();
// pMedium->SetLoadTargetFrame( pFrame );
//}
2003-04-04 18:24:37 +00:00
2007-07-18 05:53:49 +00:00
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pSalvageItem , SfxStringItem , SID_DOC_SALVAGE , sal_False ) ;
sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False ;
2008-01-29 14:29:24 +00:00
// SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False);
// sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
//
2007-07-18 05:53:49 +00:00
// does already happen in DoLoad call
//m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC );
2003-04-04 18:24:37 +00:00
2004-04-22 12:25:05 +00:00
// load document
sal_uInt32 nError = ERRCODE_NONE ;
if ( ! m_pData - > m_pObjectShell - > DoLoad ( pMedium ) )
nError = ERRCODE_IO_GENERAL ;
2007-07-18 05:53:49 +00:00
// QUESTION: if the following happens outside of DoLoad, something important is missing there!
2004-04-22 12:25:05 +00:00
: : com : : sun : : star : : uno : : Reference < : : com : : sun : : star : : task : : XInteractionHandler > xHandler = pMedium - > GetInteractionHandler ( ) ;
if ( m_pData - > m_pObjectShell - > GetErrorCode ( ) )
{
nError = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
if ( nError = = ERRCODE_IO_BROKENPACKAGE & & xHandler . is ( ) )
{
: : rtl : : OUString aDocName = pMedium - > GetURLObject ( ) . getName ( INetURLObject : : LAST_SEGMENT , true , INetURLObject : : DECODE_WITH_CHARSET ) ;
2007-07-18 05:53:49 +00:00
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pRepairItem , SfxBoolItem , SID_REPAIRPACKAGE , FALSE ) ;
2004-04-22 12:25:05 +00:00
if ( ! pRepairItem | | ! pRepairItem - > GetValue ( ) )
{
RequestPackageReparation * pRequest = new RequestPackageReparation ( aDocName ) ;
com : : sun : : star : : uno : : Reference < com : : sun : : star : : task : : XInteractionRequest > xRequest ( pRequest ) ;
xHandler - > handle ( xRequest ) ;
if ( pRequest - > isApproved ( ) )
{
// broken package: try second loading and allow repair
pMedium - > GetItemSet ( ) - > Put ( SfxBoolItem ( SID_REPAIRPACKAGE , sal_True ) ) ;
pMedium - > GetItemSet ( ) - > Put ( SfxBoolItem ( SID_TEMPLATE , sal_True ) ) ;
pMedium - > GetItemSet ( ) - > Put ( SfxStringItem ( SID_DOCINFO_TITLE , aDocName ) ) ;
2005-02-25 08:36:50 +00:00
2005-03-15 10:48:29 +00:00
// the error must be reset and the storage must be reopened in new mode
pMedium - > ResetError ( ) ;
pMedium - > CloseStorage ( ) ;
m_pData - > m_pObjectShell - > PrepareSecondTryLoad_Impl ( ) ;
2004-04-22 12:25:05 +00:00
if ( ! m_pData - > m_pObjectShell - > DoLoad ( pMedium ) )
nError = ERRCODE_IO_GENERAL ;
nError = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
}
}
if ( nError = = ERRCODE_IO_BROKENPACKAGE )
{
// repair either not allowed or not successful
NotifyBrokenPackage * pNotifyRequest = new NotifyBrokenPackage ( aDocName ) ;
com : : sun : : star : : uno : : Reference < com : : sun : : star : : task : : XInteractionRequest > xRequest ( pNotifyRequest ) ;
xHandler - > handle ( xRequest ) ;
}
}
}
if ( m_pData - > m_pObjectShell - > IsAbortingImport ( ) )
nError = ERRCODE_ABORT ;
2008-02-05 11:32:29 +00:00
if ( bSalvage )
2004-04-22 12:25:05 +00:00
{
2008-02-05 11:32:29 +00:00
// file recovery: restore original filter
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pFilterItem , SfxStringItem , SID_FILTER_NAME , sal_False ) ;
SfxFilterMatcher & rMatcher = SFX_APP ( ) - > GetFilterMatcher ( ) ;
const SfxFilter * pSetFilter = rMatcher . GetFilter4FilterName ( pFilterItem - > GetValue ( ) ) ;
pMedium - > SetFilter ( pSetFilter ) ;
m_pData - > m_pObjectShell - > SetModified ( sal_True ) ;
}
2004-10-04 19:57:20 +00:00
2008-02-05 11:32:29 +00:00
// TODO/LATER: may be the mode should be retrieved from outside and the preused filter should not be set
if ( m_pData - > m_pObjectShell - > GetCreateMode ( ) = = SFX_CREATE_MODE_EMBEDDED )
{
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pFilterItem , SfxStringItem , SID_FILTER_NAME , sal_False ) ;
if ( pFilterItem )
m_pData - > m_aPreusedFilterName = pFilterItem - > GetValue ( ) ;
2004-04-22 12:25:05 +00:00
}
if ( ! nError )
nError = pMedium - > GetError ( ) ;
2008-02-05 11:32:29 +00:00
m_pData - > m_pObjectShell - > ResetError ( ) ;
2004-04-22 12:25:05 +00:00
if ( nError )
{
BOOL bSilent = FALSE ;
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pSilentItem , SfxBoolItem , SID_SILENT , sal_False ) ;
if ( pSilentItem )
bSilent = pSilentItem - > GetValue ( ) ;
2004-11-15 15:43:10 +00:00
BOOL bWarning = ( ( nError & ERRCODE_WARNING_MASK ) = = ERRCODE_WARNING_MASK ) ;
2004-04-22 12:25:05 +00:00
if ( nError ! = ERRCODE_IO_BROKENPACKAGE & & ! bSilent )
{
// broken package was handled already
2007-04-19 08:29:27 +00:00
if ( SfxObjectShell : : UseInteractionToHandleError ( xHandler , nError ) & & ! bWarning )
2004-04-22 12:25:05 +00:00
{
2007-04-19 08:29:27 +00:00
// abort loading (except for warnings)
nError = ERRCODE_IO_ABORT ;
2004-04-22 12:25:05 +00:00
}
}
if ( m_pData - > m_pObjectShell - > GetMedium ( ) ! = pMedium )
{
// for whatever reason document now has another medium
DBG_ERROR ( " Document has rejected the medium?! " ) ;
delete pMedium ;
}
2004-11-15 15:43:10 +00:00
if ( ! bWarning ) // #i30711# don't abort loading if it's only a warning
{
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) ,
uno : : Reference < uno : : XInterface > ( ) ,
nError ? nError : ERRCODE_IO_CANTREAD ) ;
}
2004-04-22 12:25:05 +00:00
}
2009-11-26 11:18:19 +01:00
BOOL bHidden = FALSE ;
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pHidItem , SfxBoolItem , SID_HIDDEN , sal_False ) ;
if ( pHidItem )
bHidden = pHidItem - > GetValue ( ) ;
// !TODO: will be done by Framework!
pMedium - > SetUpdatePickList ( ! bHidden ) ;
2003-04-04 18:24:37 +00:00
}
}
//________________________________________________________________________________________________________
// XTransferable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Any SAL_CALL SfxBaseModel : : getTransferData ( const DATAFLAVOR & aFlavor )
2003-04-04 18:24:37 +00:00
throw ( : : com : : sun : : star : : datatransfer : : UnsupportedFlavorException ,
: : com : : sun : : star : : io : : IOException ,
: : com : : sun : : star : : uno : : RuntimeException )
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-04-04 18:24:37 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-04-04 18:24:37 +00:00
2007-07-18 05:53:49 +00:00
uno : : Any aAny ;
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
{
2004-10-04 19:57:20 +00:00
if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-objectdescriptor-xml;windows_formatname= \" Star Object Descriptor (XML) \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
TransferableObjectDescriptor aDesc ;
aDesc . maClassName = m_pData - > m_pObjectShell - > GetClassName ( ) ;
aDesc . maTypeName = aFlavor . HumanPresentableName ;
// TODO/LATER: ViewAspect needs to be sal_Int64
2006-06-19 21:31:31 +00:00
aDesc . mnViewAspect = sal : : static_int_cast < sal_uInt16 > ( embed : : Aspects : : MSOLE_CONTENT ) ;
2004-10-04 19:57:20 +00:00
//TODO/LATER: status needs to become sal_Int64
aDesc . mnOle2Misc = m_pData - > m_pObjectShell - > GetMiscStatus ( ) ;
Size aSize = m_pData - > m_pObjectShell - > GetVisArea ( ) . GetSize ( ) ;
MapUnit aMapUnit = m_pData - > m_pObjectShell - > GetMapUnit ( ) ;
aDesc . maSize = OutputDevice : : LogicToLogic ( aSize , aMapUnit , MAP_100TH_MM ) ;
aDesc . maDragStartPos = Point ( ) ;
aDesc . maDisplayName = String ( ) ;
aDesc . mbCanLink = FALSE ;
SvMemoryStream aMemStm ( 1024 , 1024 ) ;
aMemStm < < aDesc ;
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( aMemStm . GetData ( ) ) , aMemStm . Tell ( ) ) ;
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2004-10-04 19:57:20 +00:00
}
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-embed-source;windows_formatname= \" Star EMBS \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
try
{
utl : : TempFile aTmp ;
aTmp . EnableKillingFile ( TRUE ) ;
2007-07-18 05:53:49 +00:00
storeToURL ( aTmp . GetURL ( ) , uno : : Sequence < beans : : PropertyValue > ( ) ) ;
2004-10-04 19:57:20 +00:00
SvStream * pStream = aTmp . GetStream ( STREAM_READ ) ;
const sal_uInt32 nLen = pStream - > Seek ( STREAM_SEEK_TO_END ) ;
: : com : : sun : : star : : uno : : Sequence < sal_Int8 > aSeq ( nLen ) ;
pStream - > Seek ( STREAM_SEEK_TO_BEGIN ) ;
pStream - > Read ( aSeq . getArray ( ) , nLen ) ;
delete pStream ;
if ( aSeq . getLength ( ) )
aAny < < = aSeq ;
}
catch ( uno : : Exception & )
{
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2004-10-04 19:57:20 +00:00
}
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
SvMemoryStream aMemStm ( 65535 , 65535 ) ;
2004-10-04 19:57:20 +00:00
aMemStm . SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
2003-04-04 18:24:37 +00:00
pMetaFile - > Write ( aMemStm ) ;
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( aMemStm . GetData ( ) ) ,
aMemStm . Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2003-04-04 18:24:37 +00:00
}
2006-03-24 12:17:41 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-highcontrast-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > CreatePreviewMetaFile_Impl ( sal_True , sal_True ) ;
2006-03-24 12:17:41 +00:00
if ( pMetaFile )
{
SvMemoryStream aMemStm ( 65535 , 65535 ) ;
aMemStm . SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
pMetaFile - > Write ( aMemStm ) ;
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( aMemStm . GetData ( ) ) ,
aMemStm . Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2006-03-24 12:17:41 +00:00
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-emf;windows_formatname= \" Image EMF \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < SvMemoryStream > pStream (
GraphicHelper : : getFormatStrFromGDI_Impl (
pMetaFile . get ( ) , CVT_EMF ) ) ;
2003-04-04 18:24:37 +00:00
if ( pStream )
{
2005-01-21 16:34:23 +00:00
pStream - > SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
2003-04-04 18:24:37 +00:00
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( pStream - > GetData ( ) ) ,
pStream - > Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
}
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper : : supportsMetaFileHandle_Impl ( )
2003-04-04 18:24:37 +00:00
& & aFlavor . DataType = = getCppuType ( ( const sal_uInt64 * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
aAny < < = reinterpret_cast < const sal_uInt64 > (
GraphicHelper : : getEnhMetaFileFromGDI_Impl ( pMetaFile . get ( ) ) ) ;
2003-04-04 18:24:37 +00:00
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2003-04-04 18:24:37 +00:00
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-wmf;windows_formatname= \" Image WMF \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < SvMemoryStream > pStream (
GraphicHelper : : getFormatStrFromGDI_Impl (
pMetaFile . get ( ) , CVT_WMF ) ) ;
2003-04-04 18:24:37 +00:00
if ( pStream )
{
2005-01-21 16:34:23 +00:00
pStream - > SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
2003-04-04 18:24:37 +00:00
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( pStream - > GetData ( ) ) ,
pStream - > Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
}
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper : : supportsMetaFileHandle_Impl ( )
2003-04-04 18:24:37 +00:00
& & aFlavor . DataType = = getCppuType ( ( const sal_uInt64 * ) 0 ) )
{
// means HGLOBAL handler to memory storage containing METAFILEPICT structure
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
Size aMetaSize = pMetaFile - > GetPrefSize ( ) ;
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
aAny < < = reinterpret_cast < const sal_uInt64 > (
GraphicHelper : : getWinMetaFileFromGDI_Impl (
pMetaFile . get ( ) , aMetaSize ) ) ;
2003-04-04 18:24:37 +00:00
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2003-04-04 18:24:37 +00:00
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-bitmap;windows_formatname= \" Bitmap \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2004-10-04 19:57:20 +00:00
if ( pMetaFile )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < SvMemoryStream > pStream (
GraphicHelper : : getFormatStrFromGDI_Impl (
pMetaFile . get ( ) , CVT_BMP ) ) ;
2004-10-04 19:57:20 +00:00
if ( pStream )
{
2005-01-21 16:34:23 +00:00
pStream - > SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
2004-10-04 19:57:20 +00:00
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( pStream - > GetData ( ) ) ,
pStream - > Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2004-10-04 19:57:20 +00:00
}
2004-02-26 09:41:27 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " image/png " ) )
2004-01-06 07:58:48 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < GDIMetaFile > pMetaFile =
m_pData - > m_pObjectShell - > GetPreviewMetaFile ( sal_True ) ;
2004-01-06 07:58:48 +00:00
if ( pMetaFile )
{
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
: : boost : : shared_ptr < SvMemoryStream > pStream (
GraphicHelper : : getFormatStrFromGDI_Impl (
pMetaFile . get ( ) , CVT_PNG ) ) ;
2004-01-06 07:58:48 +00:00
if ( pStream )
{
2005-01-21 16:34:23 +00:00
pStream - > SetVersion ( SOFFICE_FILEFORMAT_CURRENT ) ;
2004-01-06 07:58:48 +00:00
aAny < < = Sequence < sal_Int8 > ( reinterpret_cast < const sal_Int8 * > ( pStream - > GetData ( ) ) ,
pStream - > Seek ( STREAM_SEEK_TO_END ) ) ;
}
}
}
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2004-01-06 07:58:48 +00:00
}
2003-04-04 18:24:37 +00:00
else
2007-07-18 05:53:49 +00:00
throw datatransfer : : UnsupportedFlavorException ( ) ;
2003-04-04 18:24:37 +00:00
}
return aAny ;
}
//________________________________________________________________________________________________________
// XTransferable
//________________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Sequence < DATAFLAVOR > SAL_CALL SfxBaseModel : : getTransferDataFlavors ( )
2003-04-04 18:24:37 +00:00
throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2006-03-24 12:17:41 +00:00
sal_Int32 nSuppFlavors = GraphicHelper : : supportsMetaFileHandle_Impl ( ) ? 10 : 8 ;
2007-07-18 05:53:49 +00:00
uno : : Sequence < DATAFLAVOR > aFlavorSeq ( nSuppFlavors ) ;
2003-04-04 18:24:37 +00:00
aFlavorSeq [ 0 ] . MimeType =
2004-10-04 19:57:20 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) ) ;
2003-04-04 18:24:37 +00:00
aFlavorSeq [ 0 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " GDIMetaFile " ) ) ;
aFlavorSeq [ 0 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
aFlavorSeq [ 1 ] . MimeType =
2006-03-24 12:17:41 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-highcontrast-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) ) ;
aFlavorSeq [ 1 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " GDIMetaFile " ) ) ;
2003-04-04 18:24:37 +00:00
aFlavorSeq [ 1 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
aFlavorSeq [ 2 ] . MimeType =
2006-03-24 12:17:41 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-emf;windows_formatname= \" Image EMF \" " ) ) ;
aFlavorSeq [ 2 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Enhanced Windows MetaFile " ) ) ;
2003-04-04 18:24:37 +00:00
aFlavorSeq [ 2 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
2004-10-04 19:57:20 +00:00
aFlavorSeq [ 3 ] . MimeType =
2006-03-24 12:17:41 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-wmf;windows_formatname= \" Image WMF \" " ) ) ;
aFlavorSeq [ 3 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Windows MetaFile " ) ) ;
2004-10-04 19:57:20 +00:00
aFlavorSeq [ 3 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
aFlavorSeq [ 4 ] . MimeType =
2006-03-24 12:17:41 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-objectdescriptor-xml;windows_formatname= \" Star Object Descriptor (XML) \" " ) ) ;
aFlavorSeq [ 4 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Star Object Descriptor (XML) " ) ) ;
2004-10-04 19:57:20 +00:00
aFlavorSeq [ 4 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
2006-03-24 12:17:41 +00:00
aFlavorSeq [ 5 ] . MimeType =
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-embed-source-xml;windows_formatname= \" Star Embed Source (XML) \" " ) ) ;
aFlavorSeq [ 5 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Star Embed Source (XML) " ) ) ;
aFlavorSeq [ 5 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
aFlavorSeq [ 6 ] . MimeType =
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-bitmap;windows_formatname= \" Bitmap \" " ) ) ;
aFlavorSeq [ 6 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Bitmap " ) ) ;
aFlavorSeq [ 6 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
aFlavorSeq [ 7 ] . MimeType =
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " image/png " ) ) ;
aFlavorSeq [ 7 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " PNG " ) ) ;
aFlavorSeq [ 7 ] . DataType = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) ;
if ( nSuppFlavors = = 10 )
2003-04-04 18:24:37 +00:00
{
2006-03-24 12:17:41 +00:00
aFlavorSeq [ 8 ] . MimeType =
2004-10-04 19:57:20 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-emf;windows_formatname= \" Image EMF \" " ) ) ;
2006-03-24 12:17:41 +00:00
aFlavorSeq [ 8 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Enhanced Windows MetaFile " ) ) ;
aFlavorSeq [ 8 ] . DataType = getCppuType ( ( const sal_uInt64 * ) 0 ) ;
2004-10-04 19:57:20 +00:00
2006-03-24 12:17:41 +00:00
aFlavorSeq [ 9 ] . MimeType =
2004-10-04 19:57:20 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " application/x-openoffice-wmf;windows_formatname= \" Image WMF \" " ) ) ;
2006-03-24 12:17:41 +00:00
aFlavorSeq [ 9 ] . HumanPresentableName = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Windows MetaFile " ) ) ;
aFlavorSeq [ 9 ] . DataType = getCppuType ( ( const sal_uInt64 * ) 0 ) ;
2003-04-04 18:24:37 +00:00
}
return aFlavorSeq ;
}
//________________________________________________________________________________________________________
// XTransferable
//________________________________________________________________________________________________________
sal_Bool SAL_CALL SfxBaseModel : : isDataFlavorSupported ( const DATAFLAVOR & aFlavor )
throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2004-10-04 19:57:20 +00:00
if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
2006-03-24 12:17:41 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-highcontrast-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-emf;windows_formatname= \" Image EMF \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper : : supportsMetaFileHandle_Impl ( )
2003-04-04 18:24:37 +00:00
& & aFlavor . DataType = = getCppuType ( ( const sal_uInt64 * ) 0 ) )
return sal_True ;
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-wmf;windows_formatname= \" Image WMF \" " ) )
2003-04-04 18:24:37 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper : : supportsMetaFileHandle_Impl ( )
2003-04-04 18:24:37 +00:00
& & aFlavor . DataType = = getCppuType ( ( const sal_uInt64 * ) 0 ) )
return sal_True ;
}
2004-10-04 19:57:20 +00:00
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-objectdescriptor-xml;windows_formatname= \" Star Object Descriptor (XML) \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-embed-source;windows_formatname= \" Star EMBS \" " ) )
2006-03-24 12:17:41 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
else if ( aFlavor . MimeType . equalsAscii ( " application/x-openoffice-bitmap;windows_formatname= \" Bitmap \" " ) )
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
else if ( aFlavor . MimeType . equalsAscii ( " image/png " ) )
2004-10-04 19:57:20 +00:00
{
if ( aFlavor . DataType = = getCppuType ( ( const Sequence < sal_Int8 > * ) 0 ) )
return sal_True ;
}
2003-04-04 18:24:37 +00:00
return sal_False ;
}
2001-02-09 11:49:32 +00:00
//--------------------------------------------------------------------------------------------------------
// XEventsSupplier
//--------------------------------------------------------------------------------------------------------
2007-07-18 05:53:49 +00:00
uno : : Reference < container : : XNameReplace > SAL_CALL SfxBaseModel : : getEvents ( ) throw ( uno : : RuntimeException )
2001-02-09 11:49:32 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2001-02-09 11:49:32 +00:00
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2001-02-09 11:49:32 +00:00
if ( ! m_pData - > m_xEvents . is ( ) )
{
m_pData - > m_xEvents = new SfxEvents_Impl ( m_pData - > m_pObjectShell , this ) ;
}
return m_pData - > m_xEvents ;
}
2007-10-09 14:32:54 +00:00
//--------------------------------------------------------------------------------------------------------
// XEmbeddedScripts
//--------------------------------------------------------------------------------------------------------
uno : : Reference < script : : XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel : : getBasicLibraries ( ) throw ( RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
uno : : Reference < script : : XStorageBasedLibraryContainer > xBasicLibraries ;
if ( m_pData - > m_pObjectShell )
xBasicLibraries . set ( m_pData - > m_pObjectShell - > GetBasicContainer ( ) , UNO_QUERY_THROW ) ;
return xBasicLibraries ;
}
uno : : Reference < script : : XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel : : getDialogLibraries ( ) throw ( RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
uno : : Reference < script : : XStorageBasedLibraryContainer > xDialogLibraries ;
if ( m_pData - > m_pObjectShell )
xDialogLibraries . set ( m_pData - > m_pObjectShell - > GetDialogContainer ( ) , UNO_QUERY_THROW ) ;
return xDialogLibraries ;
}
: : sal_Bool SAL_CALL SfxBaseModel : : getAllowMacroExecution ( ) throw ( RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
if ( m_pData - > m_pObjectShell )
2008-01-29 14:29:24 +00:00
return m_pData - > m_pObjectShell - > AdjustMacroMode ( String ( ) , false ) ;
2007-10-09 14:32:54 +00:00
return sal_False ;
}
2008-03-06 18:56:03 +00:00
//--------------------------------------------------------------------------------------------------------
// XScriptInvocationContext
//--------------------------------------------------------------------------------------------------------
Reference < document : : XEmbeddedScripts > SAL_CALL SfxBaseModel : : getScriptContainer ( ) throw ( RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
Reference < document : : XEmbeddedScripts > xDocumentScripts ;
try
{
Reference < frame : : XModel > xDocument ( this ) ;
xDocumentScripts . set ( xDocument , uno : : UNO_QUERY ) ;
while ( ! xDocumentScripts . is ( ) & & xDocument . is ( ) )
{
Reference < container : : XChild > xDocAsChild ( xDocument , uno : : UNO_QUERY ) ;
if ( ! xDocAsChild . is ( ) )
{
xDocument = NULL ;
break ;
}
xDocument . set ( xDocAsChild - > getParent ( ) , uno : : UNO_QUERY ) ;
xDocumentScripts . set ( xDocument , uno : : UNO_QUERY ) ;
}
}
catch ( const Exception & )
{
DBG_UNHANDLED_EXCEPTION ( ) ;
xDocumentScripts = NULL ;
}
return xDocumentScripts ;
}
2001-02-09 11:49:32 +00:00
//--------------------------------------------------------------------------------------------------------
// XEventBroadcaster
//--------------------------------------------------------------------------------------------------------
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addEventListener ( const uno : : Reference < XDOCEVENTLISTENER > & aListener ) throw ( uno : : RuntimeException )
2001-02-09 11:49:32 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2001-02-09 11:49:32 +00:00
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . addInterface ( : : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) , aListener ) ;
2001-02-09 11:49:32 +00:00
}
//--------------------------------------------------------------------------------------------------------
// XEventBroadcaster
//--------------------------------------------------------------------------------------------------------
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : removeEventListener ( const uno : : Reference < XDOCEVENTLISTENER > & aListener ) throw ( uno : : RuntimeException )
2001-02-09 11:49:32 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2001-02-09 11:49:32 +00:00
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
m_pData - > m_aInterfaceContainer . removeInterface ( : : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) , aListener ) ;
2001-02-09 11:49:32 +00:00
}
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// SfxListener
//________________________________________________________________________________________________________
2001-12-17 10:10:21 +00:00
void addTitle_Impl ( Sequence < : : com : : sun : : star : : beans : : PropertyValue > & rSeq , const : : rtl : : OUString & rTitle )
{
sal_Int32 nCount = rSeq . getLength ( ) ;
2003-12-01 17:24:28 +00:00
sal_Int32 nArg ;
for ( nArg = 0 ; nArg < nCount ; nArg + + )
2001-12-17 10:10:21 +00:00
{
: : com : : sun : : star : : beans : : PropertyValue & rProp = rSeq [ nArg ] ;
if ( rProp . Name . equalsAscii ( " Title " ) )
{
rProp . Value < < = rTitle ;
break ;
}
}
if ( nArg = = nCount )
{
rSeq . realloc ( nCount + 1 ) ;
rSeq [ nCount ] . Name = : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Title " ) ) ;
rSeq [ nCount ] . Value < < = rTitle ;
}
}
2004-10-04 19:57:20 +00:00
void SfxBaseModel : : NotifyStorageListeners_Impl ( )
{
uno : : Reference < uno : : XInterface > xSelfHold ( static_cast < : : cppu : : OWeakObject * > ( this ) ) ;
if ( m_pData - > m_pObjectShell )
{
: : cppu : : OInterfaceContainerHelper * pContainer =
m_pData - > m_aInterfaceContainer . getContainer (
: : getCppuType ( ( const uno : : Reference < document : : XStorageChangeListener > * ) NULL ) ) ;
if ( pContainer ! = NULL )
{
uno : : Reference < embed : : XStorage > xNewStorage = m_pData - > m_pObjectShell - > GetStorage ( ) ;
: : cppu : : OInterfaceIteratorHelper pIterator ( * pContainer ) ;
while ( pIterator . hasMoreElements ( ) )
{
try
{
( ( document : : XStorageChangeListener * ) pIterator . next ( ) ) - > notifyStorageChange (
xSelfHold ,
xNewStorage ) ;
}
catch ( uno : : RuntimeException & )
{
pIterator . remove ( ) ;
}
}
}
}
}
2000-09-18 16:07:07 +00:00
void SfxBaseModel : : Notify ( SfxBroadcaster & rBC ,
const SfxHint & rHint )
{
2003-04-28 12:31:20 +00:00
if ( ! m_pData )
return ;
2000-09-18 16:07:07 +00:00
if ( & rBC = = m_pData - > m_pObjectShell )
{
2001-02-09 11:49:32 +00:00
SfxSimpleHint * pSimpleHint = PTR_CAST ( SfxSimpleHint , & rHint ) ;
if ( pSimpleHint & & pSimpleHint - > GetId ( ) = = SFX_HINT_DOCCHANGED )
2000-09-18 16:07:07 +00:00
changing ( ) ;
2001-04-24 15:38:13 +00:00
2001-12-17 10:10:21 +00:00
SfxEventHint * pNamedHint = PTR_CAST ( SfxEventHint , & rHint ) ;
if ( pNamedHint )
2001-10-11 11:31:39 +00:00
{
2004-12-07 12:37:15 +00:00
2004-10-04 19:57:20 +00:00
if ( SFX_EVENT_STORAGECHANGED = = pNamedHint - > GetEventId ( ) )
{
2004-12-07 12:37:15 +00:00
// for now this event is sent only on creation of a new storage for new document
// and in case of reload of medium without document reload
2004-11-09 14:38:24 +00:00
// other events are used to detect storage change
// NotifyStorageListeners_Impl();
2004-12-07 12:37:15 +00:00
2005-01-31 08:15:48 +00:00
if ( m_pData - > m_xUIConfigurationManager . is ( )
& & m_pData - > m_pObjectShell - > GetCreateMode ( ) ! = SFX_CREATE_MODE_EMBEDDED )
2004-12-07 12:37:15 +00:00
{
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xConfigStorage ;
2004-12-07 12:37:15 +00:00
rtl : : OUString aUIConfigFolderName ( RTL_CONSTASCII_USTRINGPARAM ( " Configurations2 " ) ) ;
xConfigStorage = getDocumentSubStorage ( aUIConfigFolderName , com : : sun : : star : : embed : : ElementModes : : READWRITE ) ;
if ( ! xConfigStorage . is ( ) )
xConfigStorage = getDocumentSubStorage ( aUIConfigFolderName , com : : sun : : star : : embed : : ElementModes : : READ ) ;
if ( xConfigStorage . is ( ) | | ! m_pData - > m_pObjectShell - > GetStorage ( ) - > hasByName ( aUIConfigFolderName ) )
{
// the storage is different, since otherwise it could not be opened, so it must be exchanged
2007-07-18 05:53:49 +00:00
Reference < ui : : XUIConfigurationStorage > xUIConfigStorage ( m_pData - > m_xUIConfigurationManager , uno : : UNO_QUERY ) ;
2004-12-07 12:37:15 +00:00
xUIConfigStorage - > setStorage ( xConfigStorage ) ;
}
2006-02-01 18:11:59 +00:00
else
{
OSL_ENSURE ( sal_False , " Unexpected scenario! \n " ) ;
}
2004-12-07 12:37:15 +00:00
}
2004-11-09 14:38:24 +00:00
ListenForStorage_Impl ( m_pData - > m_pObjectShell - > GetStorage ( ) ) ;
}
else if ( SFX_EVENT_LOADFINISHED = = pNamedHint - > GetEventId ( ) )
{
2009-04-23 12:23:13 +00:00
impl_getPrintHelper ( ) ;
2004-11-09 14:38:24 +00:00
ListenForStorage_Impl ( m_pData - > m_pObjectShell - > GetStorage ( ) ) ;
2004-10-04 19:57:20 +00:00
}
2004-02-25 14:46:43 +00:00
else if ( SFX_EVENT_SAVEASDOCDONE = = pNamedHint - > GetEventId ( ) )
2001-10-11 11:31:39 +00:00
{
2001-12-17 10:10:21 +00:00
m_pData - > m_sURL = m_pData - > m_pObjectShell - > GetMedium ( ) - > GetName ( ) ;
2008-04-04 14:26:02 +00:00
2001-12-17 10:10:21 +00:00
SfxItemSet * pSet = m_pData - > m_pObjectShell - > GetMedium ( ) - > GetItemSet ( ) ;
: : com : : sun : : star : : uno : : Sequence < : : com : : sun : : star : : beans : : PropertyValue > aArgs ;
: : rtl : : OUString aTitle = m_pData - > m_pObjectShell - > GetTitle ( ) ;
TransformItems ( SID_SAVEASDOC , * pSet , aArgs ) ;
addTitle_Impl ( aArgs , aTitle ) ;
attachResource ( m_pData - > m_pObjectShell - > GetMedium ( ) - > GetName ( ) , aArgs ) ;
2001-10-11 11:31:39 +00:00
}
2009-04-23 12:23:13 +00:00
else if ( SFX_EVENT_DOCCREATED = = pNamedHint - > GetEventId ( ) )
{
impl_getPrintHelper ( ) ;
}
2001-10-11 11:31:39 +00:00
2009-09-18 10:15:03 +00:00
postEvent_Impl ( pNamedHint - > GetEventName ( ) ) ;
2001-10-11 11:31:39 +00:00
}
2003-04-04 18:24:37 +00:00
if ( pSimpleHint )
{
if ( pSimpleHint - > GetId ( ) = = SFX_HINT_TITLECHANGED )
{
: : rtl : : OUString aTitle = m_pData - > m_pObjectShell - > GetTitle ( ) ;
addTitle_Impl ( m_pData - > m_seqArguments , aTitle ) ;
2009-09-18 10:15:03 +00:00
postEvent_Impl ( GlobalEventConfig : : GetEventName ( STR_EVENT_TITLECHANGED ) ) ;
2003-04-04 18:24:37 +00:00
}
2007-10-09 14:32:54 +00:00
if ( pSimpleHint - > GetId ( ) = = SFX_HINT_MODECHANGED )
{
2009-09-18 10:15:03 +00:00
postEvent_Impl ( GlobalEventConfig : : GetEventName ( STR_EVENT_MODECHANGED ) ) ;
2007-10-09 14:32:54 +00:00
}
2003-05-02 14:30:49 +00:00
/*
2003-04-04 18:24:37 +00:00
else if ( pSimpleHint - > GetId ( ) = = SFX_HINT_DYING
| | pSimpleHint - > GetId ( ) = = SFX_HINT_DEINITIALIZING )
{
SfxObjectShellLock pShellLock = m_pData - > m_pObjectShellLock ;
m_pData - > m_pObjectShellLock = SfxObjectShellLock ( ) ;
}
2003-05-02 14:30:49 +00:00
*/
2003-04-04 18:24:37 +00:00
}
2000-09-18 16:07:07 +00:00
}
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
void SfxBaseModel : : changing ( )
{
// object already disposed?
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2000-09-18 16:07:07 +00:00
if ( impl_isDisposed ( ) )
return ;
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
// the notification should not be sent if the document can not be modified
if ( ! m_pData - > m_pObjectShell . Is ( ) | | ! m_pData - > m_pObjectShell - > IsEnableSetModified ( ) )
return ;
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceContainerHelper * pIC = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < XMODIFYLISTENER > * ) 0 ) ) ;
2000-09-18 16:07:07 +00:00
if ( pIC )
{
2007-07-18 05:53:49 +00:00
lang : : EventObject aEvent ( ( frame : : XModel * ) this ) ;
: : cppu : : OInterfaceIteratorHelper aIt ( * pIC ) ;
2000-09-18 16:07:07 +00:00
while ( aIt . hasMoreElements ( ) )
2002-05-24 10:57:54 +00:00
{
try
{
( ( XMODIFYLISTENER * ) aIt . next ( ) ) - > modified ( aEvent ) ;
}
2007-07-18 05:53:49 +00:00
catch ( uno : : RuntimeException & )
2002-05-24 10:57:54 +00:00
{
aIt . remove ( ) ;
}
}
2000-09-18 16:07:07 +00:00
}
}
void SfxBaseModel : : impl_change ( )
{
// object already disposed?
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceContainerHelper * pIC = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < XMODIFYLISTENER > * ) 0 ) ) ;
2000-09-18 16:07:07 +00:00
if ( pIC )
{
2007-07-18 05:53:49 +00:00
lang : : EventObject aEvent ( ( frame : : XModel * ) this ) ;
: : cppu : : OInterfaceIteratorHelper aIt ( * pIC ) ;
2000-09-18 16:07:07 +00:00
while ( aIt . hasMoreElements ( ) )
2002-05-24 10:57:54 +00:00
{
try
{
( ( XMODIFYLISTENER * ) aIt . next ( ) ) - > modified ( aEvent ) ;
}
2007-07-18 05:53:49 +00:00
catch ( uno : : RuntimeException & )
2002-05-24 10:57:54 +00:00
{
aIt . remove ( ) ;
}
}
2000-09-18 16:07:07 +00:00
}
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
SfxObjectShell * SfxBaseModel : : GetObjectShell ( ) const
{
2003-06-12 08:42:59 +00:00
return m_pData ? ( SfxObjectShell * ) m_pData - > m_pObjectShell : 0 ;
2000-09-18 16:07:07 +00:00
}
SfxObjectShell * SfxBaseModel : : impl_getObjectShell ( ) const
{
2003-06-12 08:42:59 +00:00
return m_pData ? ( SfxObjectShell * ) m_pData - > m_pObjectShell : 0 ;
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
sal_Bool SfxBaseModel : : IsDisposed ( ) const
{
return ( m_pData = = NULL ) ;
}
sal_Bool SfxBaseModel : : impl_isDisposed ( ) const
{
return ( m_pData = = NULL ) ;
}
//________________________________________________________________________________________________________
// private impl.
//________________________________________________________________________________________________________
2004-10-04 19:57:20 +00:00
: : rtl : : OUString SfxBaseModel : : GetMediumFilterName_Impl ( )
{
const SfxFilter * pFilter = NULL ;
SfxMedium * pMedium = m_pData - > m_pObjectShell - > GetMedium ( ) ;
if ( pMedium )
pFilter = pMedium - > GetFilter ( ) ;
if ( pFilter )
return pFilter - > GetName ( ) ;
return : : rtl : : OUString ( ) ;
}
2007-07-18 05:53:49 +00:00
void SfxBaseModel : : impl_store ( const : : rtl : : OUString & sURL ,
const uno : : Sequence < beans : : PropertyValue > & seqArguments ,
2000-09-18 16:07:07 +00:00
sal_Bool bSaveTo )
{
2002-03-26 15:29:12 +00:00
if ( ! sURL . getLength ( ) )
2007-07-18 05:53:49 +00:00
throw frame : : IllegalArgumentIOException ( ) ;
2002-03-26 15:29:12 +00:00
//sal_Bool aSaveAsTemplate = sal_False;
2008-04-15 13:35:55 +00:00
sal_Bool bSaved = sal_False ;
if ( ! bSaveTo & & m_pData - > m_pObjectShell & & sURL . getLength ( )
& & sURL . compareToAscii ( " private:stream " , 14 ) ! = COMPARE_EQUAL
& & SfxMedium : : EqualURLs ( getLocation ( ) , sURL ) )
{
// this is the same file URL as the current document location, try to use storeOwn if possible
: : comphelper : : SequenceAsHashMap aArgHash ( seqArguments ) ;
: : rtl : : OUString aFilterString ( RTL_CONSTASCII_USTRINGPARAM ( " FilterName " ) ) ;
: : rtl : : OUString aFilterName = aArgHash . getUnpackedValueOrDefault ( aFilterString , : : rtl : : OUString ( ) ) ;
if ( aFilterName . getLength ( ) )
{
SfxMedium * pMedium = m_pData - > m_pObjectShell - > GetMedium ( ) ;
if ( pMedium )
{
const SfxFilter * pFilter = pMedium - > GetFilter ( ) ;
if ( pFilter & & aFilterName . equals ( pFilter - > GetFilterName ( ) ) )
{
aArgHash . erase ( aFilterString ) ;
aArgHash . erase ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " URL " ) ) ) ;
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
// if the password is changed SaveAs should be done
// no password for encrypted document is also a change here
sal_Bool bPassChanged = sal_False ;
: : comphelper : : SequenceAsHashMap : : iterator aNewPassIter
= aArgHash . find ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Password " ) ) ) ;
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pPasswordItem , SfxStringItem , SID_PASSWORD , sal_False ) ;
if ( pPasswordItem & & aNewPassIter ! = aArgHash . end ( ) )
2008-04-15 13:35:55 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
: : rtl : : OUString aNewPass ;
aNewPassIter - > second > > = aNewPass ;
bPassChanged = ! aNewPass . equals ( pPasswordItem - > GetValue ( ) ) ;
2008-04-15 13:35:55 +00:00
}
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
else if ( pPasswordItem | | aNewPassIter ! = aArgHash . end ( ) )
bPassChanged = sal_True ;
if ( ! bPassChanged )
2008-04-15 13:35:55 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
try
{
storeSelf ( aArgHash . getAsConstPropertyValueList ( ) ) ;
bSaved = sal_True ;
}
catch ( const lang : : IllegalArgumentException & )
{
// some additional arguments do not allow to use saving, SaveAs should be done
// but only for normal documents, the shared documents would be overwritten in this case
// that would mean an information loss
// TODO/LATER: need a new interaction for this case
if ( m_pData - > m_pObjectShell - > IsDocShared ( ) )
{
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Can't store shared document! " ) ) ) ;
m_pData - > m_pObjectShell - > StoreLog ( ) ;
throw ;
}
}
}
else if ( m_pData - > m_pObjectShell - > IsDocShared ( ) )
{
// if the password is changed a special error should be used in case of shared document
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " Cant change password for shared document. " ) ) , uno : : Reference < uno : : XInterface > ( ) , ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ) ;
2008-04-15 13:35:55 +00:00
}
}
}
}
}
if ( ! bSaved & & m_pData - > m_pObjectShell )
2004-10-04 19:57:20 +00:00
{
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( bSaveTo ? SFX_EVENT_SAVETODOC : SFX_EVENT_SAVEASDOC , GlobalEventConfig : : GetEventName ( bSaveTo ? STR_EVENT_SAVETODOC : STR_EVENT_SAVEASDOC ) ,
2004-11-09 14:38:24 +00:00
m_pData - > m_pObjectShell ) ) ;
2000-09-18 16:07:07 +00:00
2004-10-04 19:57:20 +00:00
SfxAllItemSet * aParams = new SfxAllItemSet ( SFX_APP ( ) - > GetPool ( ) ) ;
aParams - > Put ( SfxStringItem ( SID_FILE_NAME , String ( sURL ) ) ) ;
if ( bSaveTo )
aParams - > Put ( SfxBoolItem ( SID_SAVETO , sal_True ) ) ;
2002-03-26 15:29:12 +00:00
2004-10-04 19:57:20 +00:00
TransformParameters ( SID_SAVEASDOC , seqArguments , * aParams ) ;
2006-03-27 08:36:54 +00:00
SFX_ITEMSET_ARG ( aParams , pCopyStreamItem , SfxBoolItem , SID_COPY_STREAM_IF_POSSIBLE , sal_False ) ;
2006-11-01 15:22:21 +00:00
2006-03-27 08:36:54 +00:00
if ( pCopyStreamItem & & pCopyStreamItem - > GetValue ( ) & & ! bSaveTo )
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
{
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Misuse of CopyStreamIfPossible! " ) ) ) ;
m_pData - > m_pObjectShell - > StoreLog ( ) ;
2007-07-18 05:53:49 +00:00
throw frame : : IllegalArgumentIOException (
2006-03-27 08:36:54 +00:00
: : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " CopyStreamIfPossible parameter is not acceptable for storeAsURL() call! " ) ) ,
uno : : Reference < uno : : XInterface > ( ) ) ;
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
}
2006-03-27 08:36:54 +00:00
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
// since saving a document modifies its DocumentInfo, the current
// DocumentInfo must be saved on "SaveTo", so it can be restored
// after saving
sal_Bool bCopyTo = bSaveTo | |
m_pData - > m_pObjectShell - > GetCreateMode ( ) = = SFX_CREATE_MODE_EMBEDDED ;
uno : : Reference < document : : XDocumentProperties > xOldDocProps ;
uno : : Reference < document : : XDocumentInfo > xOldDocInfo ;
if ( bCopyTo )
{
xOldDocProps = getDocumentProperties ( ) ;
2009-01-21 15:28:14 +00:00
if ( m_pData - > m_xDocumentInfo . is ( ) )
{
xOldDocInfo = getDocumentInfo ( ) ;
const Reference < util : : XCloneable > xCloneable ( xOldDocInfo ,
UNO_QUERY_THROW ) ;
const Reference < document : : XDocumentInfo > xNewDocInfo (
xCloneable - > createClone ( ) , UNO_QUERY_THROW ) ;
const Reference < document : : XDocumentPropertiesSupplier > xDPS (
xNewDocInfo , UNO_QUERY_THROW ) ;
const Reference < document : : XDocumentProperties > xNewDocProps (
xDPS - > getDocumentProperties ( ) ) ;
m_pData - > m_xDocumentProperties = xNewDocProps ;
m_pData - > m_xDocumentInfo = xNewDocInfo ;
}
else // try not to create DocumentInfo if it does not exist...
{
const Reference < util : : XCloneable > xCloneable ( xOldDocProps ,
UNO_QUERY_THROW ) ;
const Reference < document : : XDocumentProperties > xNewDocProps (
xCloneable - > createClone ( ) , UNO_QUERY_THROW ) ;
m_pData - > m_xDocumentProperties = xNewDocProps ;
}
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
}
2004-10-04 19:57:20 +00:00
sal_Bool bRet = m_pData - > m_pObjectShell - > APISaveAs_Impl ( sURL , aParams ) ;
2005-02-21 16:05:15 +00:00
INTEGRATION: CWS custommeta (1.129.50); FILE MERGED
2008/02/26 10:41:29 mst 1.129.50.9: RESYNC: (1.134-1.135); FILE MERGED
2008/02/01 16:23:33 mst 1.129.50.8: interface change: SfxObjectShell::GetPreviewMetaFile
- sfx2/inc/sfx2/objsh.hxx,
sfx2/source/doc/{objcont.cxx,objstor.cxx,sfxbasemodel.cxx}:
+ SfxObjectShell::GetPreviewMetaFile returns a boost::shared_ptr;
likewise SfxObjectShell::CreatePreviewMetaFile_Impl
- sfx2/source/inc/preview.hxx, sfx2/source/doc/new.cxx:
+ SfxPreviewBase_Impl stores its GDIMetaFile member in a boost::shared_ptr
2008/02/01 10:39:14 mst 1.129.50.7: RESYNC: (1.131-1.134); FILE MERGED
2008/01/29 17:26:59 mst 1.129.50.6: interface change: SfxObjectShell
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objmisc.cxx,
sfx2/source/doc/sfxbasemodel.cxx, sfx2/source/appl/appopen.cxx,
sfx2/source/appl/sfxpicklist.cxx, sfx2/source/view/viewprn.cxx:
+ new template method SfxObjectShell::DoFlushDocInfo
+ remove broadcast of SfxDocumentInfoHint
+ remove superfluous calls to FlushDocInfo
2008/01/25 16:13:43 mst 1.129.50.5: interface change: SfxObjectShell::GetDocInfo
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/inc/objshimp.hxx,
sfx2/source/doc/{objcont.cxx,objmisc.cxx,objserv.cxx,objxtor.cxx}:
+ remove SfxDocumentInfo member
+ remove method SfxObjectShell::GetDocInfo
+ add method SfxObjectShell::getDocProperties
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to new SfxDocumentInfoItem
- sfx2/source/doc/sfxbasemodel.cxx:
+ move creation of backup of document meta-data in case of
saveTo from SfxObjectShell::APISaveAs_Impl to SfxBaseModel::impl_store
+ adapt to new SfxDocumentInfoItem
2008/01/16 15:34:09 mst 1.129.50.4: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/11 12:56:47 mst 1.129.50.3: - sfx2/source/doc/sfxbasemodel.cxx:
msci10 warning fixes
2007/12/10 10:32:45 mst 1.129.50.2: RESYNC: (1.129-1.131); FILE MERGED
2007/12/07 16:39:13 mst 1.129.50.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
2008-02-26 14:11:32 +00:00
if ( bCopyTo )
{
// restore DocumentInfo if a copy was created
m_pData - > m_xDocumentProperties = xOldDocProps ;
m_pData - > m_xDocumentInfo = xOldDocInfo ;
}
2005-02-21 16:05:15 +00:00
uno : : Reference < task : : XInteractionHandler > xHandler ;
SFX_ITEMSET_ARG ( aParams , pItem , SfxUnoAnyItem , SID_INTERACTIONHANDLER , sal_False ) ;
if ( pItem )
pItem - > GetValue ( ) > > = xHandler ;
2004-10-04 19:57:20 +00:00
DELETEZ ( aParams ) ;
2002-03-26 15:29:12 +00:00
2005-02-21 16:05:15 +00:00
sal_uInt32 nErrCode = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
if ( ! bRet & & ! nErrCode )
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
{
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Storing has failed, no error is set! " ) ) ) ;
2005-02-21 16:05:15 +00:00
nErrCode = ERRCODE_IO_CANTWRITE ;
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
}
2004-10-04 19:57:20 +00:00
m_pData - > m_pObjectShell - > ResetError ( ) ;
if ( bRet )
{
2005-02-21 16:05:15 +00:00
if ( nErrCode )
{
// must be a warning - use Interactionhandler if possible or abandone
if ( xHandler . is ( ) )
{
2007-04-19 08:29:27 +00:00
// TODO/LATER: a general way to set the error context should be available
SfxErrorContext aEc ( ERRCTX_SFX_SAVEASDOC , m_pData - > m_pObjectShell - > GetTitle ( ) ) ;
2005-02-21 16:05:15 +00:00
: : com : : sun : : star : : task : : ErrorCodeRequest aErrorCode ;
aErrorCode . ErrCode = nErrCode ;
2009-09-17 13:53:54 +00:00
SfxMedium : : CallApproveHandler ( xHandler , uno : : makeAny ( aErrorCode ) , sal_False ) ;
2005-02-21 16:05:15 +00:00
}
}
2004-10-04 19:57:20 +00:00
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Storing succeeded! " ) ) ) ;
2004-11-09 14:38:24 +00:00
if ( ! bSaveTo )
2005-02-21 16:05:15 +00:00
{
m_pData - > m_aPreusedFilterName = GetMediumFilterName_Impl ( ) ;
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( SFX_EVENT_SAVEASDOCDONE , GlobalEventConfig : : GetEventName ( STR_EVENT_SAVEASDOCDONE ) , m_pData - > m_pObjectShell ) ) ;
2005-02-21 16:05:15 +00:00
}
2005-07-12 13:27:05 +00:00
else
{
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( SFX_EVENT_SAVETODOCDONE , GlobalEventConfig : : GetEventName ( STR_EVENT_SAVETODOCDONE ) , m_pData - > m_pObjectShell ) ) ;
2005-07-12 13:27:05 +00:00
}
2004-10-04 19:57:20 +00:00
}
else
2005-07-12 13:27:05 +00:00
{
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
// let the logring be stored to the related file
m_pData - > m_pObjectShell - > AddLog ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX " Storing failed! " ) ) ) ;
m_pData - > m_pObjectShell - > StoreLog ( ) ;
2009-09-18 10:15:03 +00:00
SFX_APP ( ) - > NotifyEvent ( SfxEventHint ( bSaveTo ? SFX_EVENT_SAVETODOCFAILED : SFX_EVENT_SAVEASDOCFAILED , GlobalEventConfig : : GetEventName ( bSaveTo ? STR_EVENT_SAVETODOCFAILED : STR_EVENT_SAVEASDOCFAILED ) ,
2005-07-12 13:27:05 +00:00
m_pData - > m_pObjectShell ) ) ;
2004-10-04 19:57:20 +00:00
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) , uno : : Reference < uno : : XInterface > ( ) , nErrCode ) ;
2005-07-12 13:27:05 +00:00
}
2002-03-26 15:29:12 +00:00
}
2000-09-18 16:07:07 +00:00
}
2001-02-09 11:49:32 +00:00
//********************************************************************************************************
2009-09-18 10:15:03 +00:00
void SfxBaseModel : : postEvent_Impl ( : : rtl : : OUString aName )
2001-02-09 11:49:32 +00:00
{
// object already disposed?
if ( impl_isDisposed ( ) )
return ;
2009-09-18 10:15:03 +00:00
DBG_ASSERT ( aName . getLength ( ) , " Empty event name! " ) ;
if ( ! aName . getLength ( ) )
return ;
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceContainerHelper * pIC = m_pData - > m_aInterfaceContainer . getContainer (
: : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) ) ;
2001-02-09 11:49:32 +00:00
if ( pIC )
{
2009-09-18 10:15:03 +00:00
# ifdef DBG_UTIL
ByteString aTmp ( " SfxEvent: " ) ;
aTmp + = ByteString ( String ( aName ) , RTL_TEXTENCODING_UTF8 ) ;
DBG_TRACE ( aTmp . GetBuffer ( ) ) ;
# endif
2007-07-18 05:53:49 +00:00
document : : EventObject aEvent ( ( frame : : XModel * ) this , aName ) ;
: : cppu : : OInterfaceContainerHelper aIC ( m_aMutex ) ;
uno : : Sequence < uno : : Reference < uno : : XInterface > > aElements = pIC - > getElements ( ) ;
2004-02-03 18:58:43 +00:00
for ( sal_Int32 nElem = 0 ; nElem < aElements . getLength ( ) ; nElem + + )
aIC . addInterface ( aElements [ nElem ] ) ;
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceIteratorHelper aIt ( aIC ) ;
2001-02-09 11:49:32 +00:00
while ( aIt . hasMoreElements ( ) )
2002-05-24 10:57:54 +00:00
{
try
{
( ( XDOCEVENTLISTENER * ) aIt . next ( ) ) - > notifyEvent ( aEvent ) ;
}
2007-07-18 05:53:49 +00:00
catch ( uno : : RuntimeException & )
2002-05-24 10:57:54 +00:00
{
aIt . remove ( ) ;
}
}
2001-02-09 11:49:32 +00:00
}
}
2001-03-28 15:50:15 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < container : : XIndexAccess > SAL_CALL SfxBaseModel : : getViewData ( ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2001-03-28 15:50:15 +00:00
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2003-04-04 18:24:37 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) & & ! m_pData - > m_contViewData . is ( ) )
2001-04-06 14:27:20 +00:00
{
SfxViewFrame * pActFrame = SfxViewFrame : : Current ( ) ;
if ( ! pActFrame | | pActFrame - > GetObjectShell ( ) ! = m_pData - > m_pObjectShell )
2009-11-30 12:56:04 +01:00
pActFrame = SfxViewFrame : : GetFirst ( m_pData - > m_pObjectShell ) ;
2001-04-06 14:27:20 +00:00
2005-02-21 16:05:15 +00:00
if ( ! pActFrame | | ! pActFrame - > GetViewShell ( ) )
// currently no frame for this document at all or View is under construction
2007-07-18 05:53:49 +00:00
return uno : : Reference < container : : XIndexAccess > ( ) ;
2001-04-06 14:27:20 +00:00
2007-07-18 05:53:49 +00:00
m_pData - > m_contViewData = Reference < container : : XIndexAccess > (
2001-04-06 14:27:20 +00:00
: : comphelper : : getProcessServiceFactory ( ) - > createInstance (
DEFINE_CONST_UNICODE ( " com.sun.star.document.IndexedPropertyValues " ) ) ,
2007-07-18 05:53:49 +00:00
uno : : UNO_QUERY ) ;
2001-04-06 14:27:20 +00:00
if ( ! m_pData - > m_contViewData . is ( ) )
{
// error: no container class available!
2007-07-18 05:53:49 +00:00
return uno : : Reference < container : : XIndexAccess > ( ) ;
2001-04-06 14:27:20 +00:00
}
2007-07-18 05:53:49 +00:00
uno : : Reference < container : : XIndexContainer > xCont ( m_pData - > m_contViewData , uno : : UNO_QUERY ) ;
2001-04-06 14:27:20 +00:00
sal_Int32 nCount = 0 ;
2007-07-18 05:53:49 +00:00
uno : : Sequence < beans : : PropertyValue > aSeq ;
2001-04-06 14:27:20 +00:00
: : com : : sun : : star : : uno : : Any aAny ;
2009-11-30 12:56:04 +01:00
for ( SfxViewFrame * pFrame = SfxViewFrame : : GetFirst ( m_pData - > m_pObjectShell ) ; pFrame ;
pFrame = SfxViewFrame : : GetNext ( * pFrame , m_pData - > m_pObjectShell ) )
2001-04-06 14:27:20 +00:00
{
BOOL bIsActive = ( pFrame = = pActFrame ) ;
pFrame - > GetViewShell ( ) - > WriteUserDataSequence ( aSeq ) ;
aAny < < = aSeq ;
xCont - > insertByIndex ( bIsActive ? 0 : nCount , aAny ) ;
nCount + + ;
}
}
return m_pData - > m_contViewData ;
2001-03-28 15:50:15 +00:00
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : setViewData ( const uno : : Reference < container : : XIndexAccess > & aData ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
2001-03-28 15:50:15 +00:00
{
2003-05-02 14:30:49 +00:00
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-05-02 14:30:49 +00:00
2001-04-06 14:27:20 +00:00
m_pData - > m_contViewData = aData ;
2001-03-28 15:50:15 +00:00
}
2002-01-28 09:46:55 +00:00
/** calls all XEventListeners */
void SfxBaseModel : : notifyEvent ( const : : com : : sun : : star : : document : : EventObject & aEvent ) const
{
// object already disposed?
if ( impl_isDisposed ( ) )
return ;
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceContainerHelper * pIC = m_pData - > m_aInterfaceContainer . getContainer (
: : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) ) ;
2002-01-28 09:46:55 +00:00
if ( pIC )
{
2007-07-18 05:53:49 +00:00
: : cppu : : OInterfaceIteratorHelper aIt ( * pIC ) ;
2002-01-28 09:46:55 +00:00
while ( aIt . hasMoreElements ( ) )
2002-05-24 10:57:54 +00:00
{
try
{
( ( XDOCEVENTLISTENER * ) aIt . next ( ) ) - > notifyEvent ( aEvent ) ;
}
2007-07-18 05:53:49 +00:00
catch ( uno : : RuntimeException & )
2002-05-24 10:57:54 +00:00
{
aIt . remove ( ) ;
}
}
2002-01-28 09:46:55 +00:00
}
}
/** returns true if someone added a XEventListener to this XEventBroadcaster */
sal_Bool SfxBaseModel : : hasEventListeners ( ) const
{
2007-07-18 05:53:49 +00:00
return ! impl_isDisposed ( ) & & ( NULL ! = m_pData - > m_aInterfaceContainer . getContainer ( : : getCppuType ( ( const uno : : Reference < XDOCEVENTLISTENER > * ) 0 ) ) ) ;
2002-01-28 09:46:55 +00:00
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : addPrintJobListener ( const uno : : Reference < view : : XPrintJobListener > & xListener ) throw ( uno : : RuntimeException )
2003-03-27 10:29:38 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-03-27 10:29:38 +00:00
if ( impl_isDisposed ( ) )
return ;
2008-05-21 07:33:43 +00:00
if ( impl_getPrintHelper ( ) )
{
uno : : Reference < view : : XPrintJobBroadcaster > xPJB ( m_pData - > m_xPrintable , uno : : UNO_QUERY ) ;
if ( xPJB . is ( ) )
xPJB - > addPrintJobListener ( xListener ) ;
}
// else
// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
2003-03-27 10:29:38 +00:00
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : removePrintJobListener ( const uno : : Reference < view : : XPrintJobListener > & xListener ) throw ( uno : : RuntimeException )
2003-03-27 10:29:38 +00:00
{
// object already disposed?
2003-05-02 14:30:49 +00:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
2003-03-27 10:29:38 +00:00
if ( impl_isDisposed ( ) )
return ;
2008-05-21 07:33:43 +00:00
if ( impl_getPrintHelper ( ) )
{
uno : : Reference < view : : XPrintJobBroadcaster > xPJB ( m_pData - > m_xPrintable , uno : : UNO_QUERY ) ;
if ( xPJB . is ( ) )
xPJB - > removePrintJobListener ( xListener ) ;
}
// else
// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
2003-03-27 10:29:38 +00:00
}
2005-06-14 15:46:02 +00:00
// simple declaration of class SvObject is enough
// the corresponding <so3/iface.hxx> cannon be included because it provides
// declaration of class SvBorder that conflicts with ../../inc/viewfrm.hxx
class SvObject ;
2003-09-19 07:02:02 +00:00
sal_Int64 SAL_CALL SfxBaseModel : : getSomething ( const : : com : : sun : : star : : uno : : Sequence < sal_Int8 > & aIdentifier ) throw ( : : com : : sun : : star : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( ! impl_isDisposed ( ) & & GetObjectShell ( ) )
{
2004-10-04 19:57:20 +00:00
SvGlobalName aName ( aIdentifier ) ;
2003-09-19 07:02:02 +00:00
if ( aName = = SvGlobalName ( SO3_GLOBAL_CLASSID ) )
2005-10-06 10:15:09 +00:00
return ( sal_Int64 ) ( sal_IntPtr ) ( SvObject * ) GetObjectShell ( ) ;
2003-09-19 07:02:02 +00:00
else if ( aName = = SvGlobalName ( SFX_GLOBAL_CLASSID ) )
2005-10-06 10:15:09 +00:00
return ( sal_Int64 ) ( sal_IntPtr ) ( SfxObjectShell * ) GetObjectShell ( ) ;
2003-09-19 07:02:02 +00:00
}
return 0 ;
}
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XDocumentSubStorageSupplier
//____________________________________________________________________________________________________
2004-11-09 14:38:24 +00:00
void SfxBaseModel : : ListenForStorage_Impl ( const uno : : Reference < embed : : XStorage > & xStorage )
{
uno : : Reference < util : : XModifiable > xModifiable ( xStorage , uno : : UNO_QUERY ) ;
if ( xModifiable . is ( ) )
{
2008-03-06 18:56:03 +00:00
if ( ! m_pData - > m_pStorageModifyListen . is ( ) )
2004-11-09 14:38:24 +00:00
{
2008-10-16 06:57:26 +00:00
m_pData - > m_pStorageModifyListen = new : : sfx2 : : DocumentStorageModifyListener ( * m_pData , Application : : GetSolarMutex ( ) ) ;
2004-11-09 14:38:24 +00:00
}
2004-10-04 19:57:20 +00:00
2004-11-09 14:38:24 +00:00
// no need to deregister the listening for old storage since it should be disposed automatically
2008-03-06 18:56:03 +00:00
xModifiable - > addModifyListener ( m_pData - > m_pStorageModifyListen . get ( ) ) ;
2004-11-09 14:38:24 +00:00
}
}
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > SAL_CALL SfxBaseModel : : getDocumentSubStorage ( const : : rtl : : OUString & aStorageName , sal_Int32 nMode )
throw ( uno : : RuntimeException )
2003-11-18 15:49:01 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2003-11-18 15:49:01 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xResult ;
2004-04-13 10:50:23 +00:00
if ( m_pData - > m_pObjectShell . Is ( ) )
2003-11-18 15:49:01 +00:00
{
2004-10-04 19:57:20 +00:00
uno : : Reference < embed : : XStorage > xStorage = m_pData - > m_pObjectShell - > GetStorage ( ) ;
if ( xStorage . is ( ) )
2004-02-25 14:46:43 +00:00
{
2004-10-04 19:57:20 +00:00
try
2004-02-25 14:46:43 +00:00
{
2004-10-04 19:57:20 +00:00
xResult = xStorage - > openStorageElement ( aStorageName , nMode ) ;
}
catch ( uno : : Exception & )
{
2004-02-25 14:46:43 +00:00
}
}
2003-11-18 15:49:01 +00:00
}
return xResult ;
}
2004-04-13 10:50:23 +00:00
Sequence < : : rtl : : OUString > SAL_CALL SfxBaseModel : : getDocumentSubStoragesNames ( )
throw ( io : : IOException ,
RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-04-13 10:50:23 +00:00
Sequence < : : rtl : : OUString > aResult ;
sal_Int32 nResultSize = 0 ;
sal_Bool bSuccess = sal_False ;
if ( m_pData - > m_pObjectShell . Is ( ) )
{
2004-10-04 19:57:20 +00:00
uno : : Reference < embed : : XStorage > xStorage = m_pData - > m_pObjectShell - > GetStorage ( ) ;
uno : : Reference < container : : XNameAccess > xAccess ( xStorage , uno : : UNO_QUERY ) ;
if ( xAccess . is ( ) )
2004-04-13 10:50:23 +00:00
{
2004-10-04 19:57:20 +00:00
Sequence < : : rtl : : OUString > aTemp = xAccess - > getElementNames ( ) ;
for ( sal_Int32 n = 0 ; n < aTemp . getLength ( ) ; n + + )
2004-04-13 10:50:23 +00:00
{
2004-10-04 19:57:20 +00:00
if ( xStorage - > isStorageElement ( aTemp [ n ] ) )
2004-04-13 10:50:23 +00:00
{
aResult . realloc ( + + nResultSize ) ;
2004-10-04 19:57:20 +00:00
aResult [ nResultSize - 1 ] = aTemp [ n ] ;
2004-04-13 10:50:23 +00:00
}
}
bSuccess = sal_True ;
}
}
if ( ! bSuccess )
throw io : : IOException ( ) ;
return aResult ;
}
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XScriptProviderSupplier
//____________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
uno : : Reference < script : : provider : : XScriptProvider > SAL_CALL SfxBaseModel : : getScriptProvider ( )
throw ( uno : : RuntimeException )
2003-11-18 15:49:01 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-05-19 07:35:17 +00:00
2008-03-06 18:56:03 +00:00
uno : : Reference < script : : provider : : XScriptProvider > xScriptProvider ;
2003-11-18 15:49:01 +00:00
2008-03-06 18:56:03 +00:00
: : comphelper : : ComponentContext aContext ( : : comphelper : : getProcessServiceFactory ( ) ) ;
Reference < script : : provider : : XScriptProviderFactory > xScriptProviderFactory (
aContext . getSingleton ( " com.sun.star.script.provider.theMasterScriptProviderFactory " ) , uno : : UNO_QUERY_THROW ) ;
2004-05-19 07:35:17 +00:00
2008-03-06 18:56:03 +00:00
try
2003-11-18 15:49:01 +00:00
{
2008-03-06 18:56:03 +00:00
Reference < XScriptInvocationContext > xScriptContext ( this ) ;
xScriptProvider . set ( xScriptProviderFactory - > createScriptProvider ( makeAny ( xScriptContext ) ) , uno : : UNO_SET_THROW ) ;
2003-11-18 15:49:01 +00:00
}
2008-03-06 18:56:03 +00:00
catch ( const uno : : RuntimeException & )
{
throw ;
}
catch ( const lang : : IllegalArgumentException & )
{
throw lang : : WrappedTargetRuntimeException (
: : rtl : : OUString ( ) ,
* this ,
: : cppu : : getCaughtException ( )
) ;
}
return xScriptProvider ;
2003-11-18 15:49:01 +00:00
}
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XUIConfigurationManagerSupplier
//____________________________________________________________________________________________________
2004-04-13 10:50:23 +00:00
rtl : : OUString SfxBaseModel : : getRuntimeUID ( ) const
{
OSL_ENSURE ( m_pData - > m_sRuntimeUID . getLength ( ) > 0 ,
" SfxBaseModel::getRuntimeUID - ID is empty! " ) ;
return m_pData - > m_sRuntimeUID ;
}
2006-03-27 08:36:54 +00:00
sal_Bool SfxBaseModel : : hasValidSignatures ( ) const
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( m_pData - > m_pObjectShell . Is ( ) )
return ( m_pData - > m_pObjectShell - > ImplGetSignatureState ( sal_False ) = = SIGNATURESTATE_SIGNATURES_OK ) ;
return sal_False ;
}
2005-03-23 13:25:16 +00:00
static void GetCommandFromSequence ( rtl : : OUString & rCommand , sal_Int32 & nIndex , const uno : : Sequence < beans : : PropertyValue > & rSeqPropValue )
{
rtl : : OUString aCommand ;
nIndex = - 1 ;
for ( sal_Int32 i = 0 ; i < rSeqPropValue . getLength ( ) ; i + + )
{
if ( rSeqPropValue [ i ] . Name . equalsAsciiL ( " Command " , 7 ) )
{
rSeqPropValue [ i ] . Value > > = rCommand ;
nIndex = i ;
return ;
}
}
}
2007-07-18 05:53:49 +00:00
static void ConvertSlotsToCommands ( SfxObjectShell * pDoc , uno : : Reference < container : : XIndexContainer > & rToolbarDefinition )
2005-03-23 13:25:16 +00:00
{
if ( pDoc )
{
Any aAny ;
SfxModule * pModule ( pDoc - > GetFactory ( ) . GetModule ( ) ) ;
rtl : : OUString aSlotCmd ( RTL_CONSTASCII_USTRINGPARAM ( " slot: " ) ) ;
rtl : : OUString aUnoCmd ( RTL_CONSTASCII_USTRINGPARAM ( " .uno: " ) ) ;
uno : : Sequence < beans : : PropertyValue > aSeqPropValue ;
for ( sal_Int32 i = 0 ; i < rToolbarDefinition - > getCount ( ) ; i + + )
{
sal_Int32 nIndex ( - 1 ) ;
rtl : : OUString aCommand ;
if ( rToolbarDefinition - > getByIndex ( i ) > > = aSeqPropValue )
{
GetCommandFromSequence ( aCommand , nIndex , aSeqPropValue ) ;
if ( nIndex > = 0 & & ( aCommand . indexOf ( aSlotCmd ) = = 0 ) )
{
rtl : : OUString aSlot ( aCommand . copy ( 5 ) ) ;
// We have to replace the old "slot-Command" with our new ".uno:-Command"
const SfxSlot * pSlot = pModule - > GetSlotPool ( ) - > GetSlot ( USHORT ( aSlot . toInt32 ( ) ) ) ;
if ( pSlot )
{
rtl : : OUStringBuffer aStrBuf ( aUnoCmd ) ;
aStrBuf . appendAscii ( pSlot - > GetUnoName ( ) ) ;
aCommand = aStrBuf . makeStringAndClear ( ) ;
aSeqPropValue [ nIndex ] . Value < < = aCommand ;
rToolbarDefinition - > replaceByIndex ( i , Any ( aSeqPropValue ) ) ;
}
}
}
}
}
}
2007-07-18 05:53:49 +00:00
uno : : Reference < ui : : XUIConfigurationManager > SAL_CALL SfxBaseModel : : getUIConfigurationManager ( )
throw ( uno : : RuntimeException )
2004-02-25 14:46:43 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-02-25 14:46:43 +00:00
if ( ! m_pData - > m_xUIConfigurationManager . is ( ) )
{
2007-07-18 05:53:49 +00:00
uno : : Reference < ui : : XUIConfigurationManager > xNewUIConfMan (
2004-02-25 14:46:43 +00:00
: : comphelper : : getProcessServiceFactory ( ) - > createInstance (
2005-03-01 19:02:00 +00:00
: : rtl : : OUString : : createFromAscii ( " com.sun.star.ui.UIConfigurationManager " ) ) ,
2007-07-18 05:53:49 +00:00
uno : : UNO_QUERY ) ;
2004-02-25 14:46:43 +00:00
2007-07-18 05:53:49 +00:00
Reference < ui : : XUIConfigurationStorage > xUIConfigStorage ( xNewUIConfMan , uno : : UNO_QUERY ) ;
2004-02-25 14:46:43 +00:00
if ( xUIConfigStorage . is ( ) )
{
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xConfigStorage ;
2004-02-25 14:46:43 +00:00
2008-03-06 18:56:03 +00:00
rtl : : OUString aUIConfigFolderName ( RTL_CONSTASCII_USTRINGPARAM ( " Configurations2 " ) ) ;
// First try to open with READWRITE and then READ
xConfigStorage = getDocumentSubStorage ( aUIConfigFolderName , embed : : ElementModes : : READWRITE ) ;
if ( xConfigStorage . is ( ) )
2004-02-25 14:46:43 +00:00
{
2008-03-06 18:56:03 +00:00
rtl : : OUString aMediaTypeProp ( RTL_CONSTASCII_USTRINGPARAM ( " MediaType " ) ) ;
rtl : : OUString aUIConfigMediaType (
RTL_CONSTASCII_USTRINGPARAM ( " application/vnd.sun.xml.ui.configuration " ) ) ;
rtl : : OUString aMediaType ;
uno : : Reference < beans : : XPropertySet > xPropSet ( xConfigStorage , uno : : UNO_QUERY ) ;
Any a = xPropSet - > getPropertyValue ( aMediaTypeProp ) ;
if ( ! ( a > > = aMediaType ) | | ( aMediaType . getLength ( ) = = 0 ) )
2004-02-25 14:46:43 +00:00
{
2008-03-06 18:56:03 +00:00
a < < = aUIConfigMediaType ;
xPropSet - > setPropertyValue ( aMediaTypeProp , a ) ;
2004-02-25 14:46:43 +00:00
}
}
2008-03-06 18:56:03 +00:00
else
xConfigStorage = getDocumentSubStorage ( aUIConfigFolderName , embed : : ElementModes : : READ ) ;
2004-02-25 14:46:43 +00:00
// initialize ui configuration manager with document substorage
xUIConfigStorage - > setStorage ( xConfigStorage ) ;
2005-03-23 13:25:16 +00:00
2008-03-06 18:56:03 +00:00
// embedded objects did not support local configuration data until OOo 3.0, so there's nothing to
// migrate
2005-03-23 13:25:16 +00:00
if ( m_pData - > m_pObjectShell - > GetCreateMode ( ) ! = SFX_CREATE_MODE_EMBEDDED )
{
// Import old UI configuration from OOo 1.x
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xOOo1ConfigStorage ;
2005-03-23 13:25:16 +00:00
rtl : : OUString aOOo1UIConfigFolderName ( RTL_CONSTASCII_USTRINGPARAM ( " Configurations " ) ) ;
// Try to open with READ
xOOo1ConfigStorage = getDocumentSubStorage ( aOOo1UIConfigFolderName , embed : : ElementModes : : READ ) ;
if ( xOOo1ConfigStorage . is ( ) )
{
uno : : Reference < lang : : XMultiServiceFactory > xServiceMgr ( : : comphelper : : getProcessServiceFactory ( ) ) ;
uno : : Sequence < uno : : Reference < container : : XIndexContainer > > rToolbars ;
sal_Bool bImported = UIConfigurationImporterOOo1x : : ImportCustomToolbars (
xNewUIConfMan , rToolbars , xServiceMgr , xOOo1ConfigStorage ) ;
if ( bImported )
{
SfxObjectShell * pObjShell = SfxBaseModel : : GetObjectShell ( ) ;
char aNum [ ] = " private:resource/toolbar/custom_OOo1x_0 " ;
char aTitle [ ] = " Toolbar 0 " ;
sal_Int32 nNumIndex = strlen ( aNum ) - 1 ;
sal_Int32 nTitleIndex = strlen ( aTitle ) - 1 ;
for ( sal_Int32 i = 0 ; i < rToolbars . getLength ( ) ; i + + )
{
aNum [ nNumIndex ] + + ;
aTitle [ nTitleIndex ] + + ;
rtl : : OUString aCustomTbxName ( RTL_CONSTASCII_USTRINGPARAM ( aNum ) ) ;
rtl : : OUString aCustomTbxTitle ( RTL_CONSTASCII_USTRINGPARAM ( aTitle ) ) ;
2007-07-18 05:53:49 +00:00
uno : : Reference < container : : XIndexContainer > xToolbar = rToolbars [ i ] ;
2005-03-23 13:25:16 +00:00
ConvertSlotsToCommands ( pObjShell , xToolbar ) ;
if ( ! xNewUIConfMan - > hasSettings ( aCustomTbxName ) )
{
// Set UIName for the toolbar with container property
uno : : Reference < beans : : XPropertySet > xPropSet ( xToolbar , UNO_QUERY ) ;
if ( xPropSet . is ( ) )
{
try
{
rtl : : OUString aPropName ( RTL_CONSTASCII_USTRINGPARAM ( " UIName " ) ) ;
Any aAny ( aCustomTbxTitle ) ;
xPropSet - > setPropertyValue ( aPropName , aAny ) ;
}
catch ( beans : : UnknownPropertyException & )
{
}
}
uno : : Reference < container : : XIndexAccess > xToolbarData ( xToolbar , uno : : UNO_QUERY ) ;
xNewUIConfMan - > insertSettings ( aCustomTbxName , xToolbarData ) ;
uno : : Reference < ui : : XUIConfigurationPersistence > xPersist ( xNewUIConfMan , uno : : UNO_QUERY ) ;
xPersist - > store ( ) ;
}
}
}
}
}
2004-02-25 14:46:43 +00:00
}
2004-12-07 12:37:15 +00:00
m_pData - > m_xUIConfigurationManager = xNewUIConfMan ;
2004-02-25 14:46:43 +00:00
}
return m_pData - > m_xUIConfigurationManager ;
}
2004-05-10 16:33:10 +00:00
//____________________________________________________________________________________________________
// XVisualObject
//____________________________________________________________________________________________________
void SAL_CALL SfxBaseModel : : setVisualAreaSize ( sal_Int64 nAspect , const awt : : Size & aSize )
throw ( lang : : IllegalArgumentException ,
embed : : WrongStateException ,
uno : : Exception ,
uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-05-10 16:33:10 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : Exception ( ) ; // TODO: error handling
2009-11-30 12:56:04 +01:00
SfxViewFrame * pViewFrm = SfxViewFrame : : GetFirst ( m_pData - > m_pObjectShell , sal_False ) ;
2005-01-31 07:53:54 +00:00
if ( pViewFrm & & m_pData - > m_pObjectShell - > GetCreateMode ( ) = = SFX_CREATE_MODE_EMBEDDED & & ! pViewFrm - > GetFrame ( ) - > IsInPlace ( ) )
2004-10-04 19:57:20 +00:00
{
2005-01-31 07:53:54 +00:00
Window * pWindow = VCLUnoHelper : : GetWindow ( pViewFrm - > GetFrame ( ) - > GetFrameInterface ( ) - > getContainerWindow ( ) ) ;
Size aWinSize = pWindow - > GetSizePixel ( ) ;
awt : : Size aCurrent = getVisualAreaSize ( nAspect ) ;
Size aDiff ( aSize . Width - aCurrent . Width , aSize . Height - aCurrent . Height ) ;
Size aWrongDiff = OutputDevice : : LogicToLogic ( aDiff , m_pData - > m_pObjectShell - > GetMapUnit ( ) , pWindow - > GetMapMode ( ) ) ;
aDiff = pViewFrm - > GetViewShell ( ) - > GetWindow ( ) - > LogicToPixel ( aDiff ) ;
aWinSize . Width ( ) + = aDiff . Width ( ) ;
aWinSize . Height ( ) + = aDiff . Height ( ) ;
pWindow - > SetSizePixel ( aWinSize ) ;
2004-10-04 19:57:20 +00:00
}
else
2005-01-31 07:53:54 +00:00
{
Rectangle aTmpRect = m_pData - > m_pObjectShell - > GetVisArea ( ASPECT_CONTENT ) ;
2004-10-04 19:57:20 +00:00
aTmpRect . SetSize ( Size ( aSize . Width , aSize . Height ) ) ;
2005-01-31 07:53:54 +00:00
m_pData - > m_pObjectShell - > SetVisArea ( aTmpRect ) ;
}
2004-05-10 16:33:10 +00:00
}
2006-06-19 21:31:31 +00:00
awt : : Size SAL_CALL SfxBaseModel : : getVisualAreaSize ( sal_Int64 /*nAspect*/ )
2004-05-10 16:33:10 +00:00
throw ( lang : : IllegalArgumentException ,
embed : : WrongStateException ,
uno : : Exception ,
uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-05-10 16:33:10 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : Exception ( ) ; // TODO: error handling
2004-10-04 19:57:20 +00:00
Rectangle aTmpRect = m_pData - > m_pObjectShell - > GetVisArea ( ASPECT_CONTENT ) ;
2004-05-10 16:33:10 +00:00
2004-10-04 19:57:20 +00:00
#if 0
Window * pWindow = NULL ;
SfxViewFrame * pViewFrm = m_pData - > m_pObjectShell . Is ( ) ?
SfxViewFrame : : GetFirst ( m_pData - > m_pObjectShell , 0 , sal_False ) : 0 ;
if ( pWindow )
{
MapMode aInternalMapMode ( pViewFrm - > GetWindow ( ) . GetMapMode ( ) ) ;
MapMode aExternalMapMode ( m_pData - > m_pObjectShell - > GetMapUnit ( ) ) ;
aTmpRect = OutputDevice : : LogicToLogic ( aTmpRect , aInternalMapMode , aExternalMapMode ) ;
}
# endif
2004-05-10 16:33:10 +00:00
return awt : : Size ( aTmpRect . GetWidth ( ) , aTmpRect . GetHeight ( ) ) ;
}
2006-06-19 21:31:31 +00:00
sal_Int32 SAL_CALL SfxBaseModel : : getMapUnit ( sal_Int64 /*nAspect*/ )
2004-05-10 16:33:10 +00:00
throw ( uno : : Exception ,
uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-05-10 16:33:10 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw uno : : Exception ( ) ; // TODO: error handling
2004-10-04 19:57:20 +00:00
return VCLUnoHelper : : VCL2UnoEmbedMapUnit ( m_pData - > m_pObjectShell - > GetMapUnit ( ) ) ;
}
2006-06-19 21:31:31 +00:00
embed : : VisualRepresentation SAL_CALL SfxBaseModel : : getPreferredVisualRepresentation ( : : sal_Int64 /*nAspect*/ )
2004-10-04 19:57:20 +00:00
throw ( lang : : IllegalArgumentException ,
embed : : WrongStateException ,
uno : : Exception ,
uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-10-04 19:57:20 +00:00
datatransfer : : DataFlavor aDataFlavor (
: : rtl : : OUString : : createFromAscii ( " application/x-openoffice-gdimetafile;windows_formatname= \" GDIMetaFile \" " ) ,
: : rtl : : OUString : : createFromAscii ( " GDIMetaFile " ) ,
: : getCppuType ( ( const uno : : Sequence < sal_Int8 > * ) NULL ) ) ;
embed : : VisualRepresentation aVisualRepresentation ;
aVisualRepresentation . Data = getTransferData ( aDataFlavor ) ;
aVisualRepresentation . Flavor = aDataFlavor ;
return aVisualRepresentation ;
}
//____________________________________________________________________________________________________
// XStorageBasedDocument
//____________________________________________________________________________________________________
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : loadFromStorage ( const uno : : Reference < XSTORAGE > & xStorage ,
const uno : : Sequence < beans : : PropertyValue > & aMediaDescriptor )
throw ( lang : : IllegalArgumentException ,
2004-10-04 19:57:20 +00:00
DOUBLEINITIALIZATIONEXCEPTION ,
IOEXCEPTION ,
EXCEPTION ,
2007-07-18 05:53:49 +00:00
uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-10-04 19:57:20 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw IOEXCEPTION ( ) ; // TODO:
if ( m_pData - > m_pObjectShell . Is ( ) )
{
if ( m_pData - > m_pObjectShell - > GetMedium ( ) )
// if a Medium is present, the document is already initialized
throw DOUBLEINITIALIZATIONEXCEPTION ( ) ;
2004-10-27 14:14:16 +00:00
// after i36090 is fixed the pool from object shell can be used
// SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() );
SfxAllItemSet aSet ( SFX_APP ( ) - > GetPool ( ) ) ;
2004-10-04 19:57:20 +00:00
2005-01-11 12:32:15 +00:00
// the BaseURL is part of the ItemSet
SfxMedium * pMedium = new SfxMedium ( xStorage , String ( ) ) ;
2004-10-04 19:57:20 +00:00
TransformParameters ( SID_OPENDOC , aMediaDescriptor , aSet ) ;
pMedium - > GetItemSet ( ) - > Put ( aSet ) ;
// allow to use an interactionhandler (if there is one)
pMedium - > UseInteractionHandler ( TRUE ) ;
SFX_ITEMSET_ARG ( & aSet , pTemplateItem , SfxBoolItem , SID_TEMPLATE , sal_False ) ;
BOOL bTemplate = pTemplateItem & & pTemplateItem - > GetValue ( ) ;
m_pData - > m_pObjectShell - > SetActivateEvent_Impl ( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ) ;
m_pData - > m_pObjectShell - > Get_Impl ( ) - > bOwnsStorage = FALSE ;
// load document
if ( ! m_pData - > m_pObjectShell - > DoLoad ( pMedium ) )
{
sal_uInt32 nError = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) ,
uno : : Reference < uno : : XInterface > ( ) ,
nError ? nError : ERRCODE_IO_CANTREAD ) ;
}
}
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : storeToStorage ( const uno : : Reference < XSTORAGE > & xStorage ,
const uno : : Sequence < beans : : PropertyValue > & aMediaDescriptor )
throw ( lang : : IllegalArgumentException ,
2004-10-04 19:57:20 +00:00
IOEXCEPTION ,
EXCEPTION ,
2007-07-18 05:53:49 +00:00
uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-10-04 19:57:20 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xResult ;
2004-10-04 19:57:20 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw IOEXCEPTION ( ) ; // TODO:
SfxAllItemSet aSet ( m_pData - > m_pObjectShell - > GetPool ( ) ) ;
TransformParameters ( SID_SAVEASDOC , aMediaDescriptor , aSet ) ;
// TODO/LATER: may be a special URL "private:storage" should be used
SFX_ITEMSET_ARG ( & aSet , pItem , SfxStringItem , SID_FILTER_NAME , sal_False ) ;
sal_Int32 nVersion = SOFFICE_FILEFORMAT_CURRENT ;
if ( pItem )
{
String aFilterName = pItem - > GetValue ( ) ;
const SfxFilter * pFilter = SFX_APP ( ) - > GetFilterMatcher ( ) . GetFilter4FilterName ( aFilterName ) ;
if ( pFilter & & pFilter - > UsesStorage ( ) )
nVersion = pFilter - > GetVersion ( ) ;
}
2004-12-09 15:00:39 +00:00
sal_Bool bSuccess = sal_False ;
if ( xStorage = = m_pData - > m_pObjectShell - > GetStorage ( ) )
{
// storing to the own storage
bSuccess = m_pData - > m_pObjectShell - > DoSave ( ) ;
}
else
{
2006-02-01 18:11:59 +00:00
// TODO/LATER: if the provided storage has some data inside the storing might fail, probably the storage must be truncated
2005-02-07 13:49:32 +00:00
// TODO/LATER: is it possible to have a template here?
m_pData - > m_pObjectShell - > SetupStorage ( xStorage , nVersion , sal_False ) ;
2005-01-11 12:32:15 +00:00
// BaseURL is part of the ItemSet
SfxMedium aMedium ( xStorage , String ( ) , & aSet ) ;
aMedium . CanDisposeStorage_Impl ( FALSE ) ;
2006-02-09 13:08:00 +00:00
if ( aMedium . GetFilter ( ) )
{
// storing without a valid filter will often crash
bSuccess = m_pData - > m_pObjectShell - > DoSaveObjectAs ( aMedium , TRUE ) ;
m_pData - > m_pObjectShell - > DoSaveCompleted ( NULL ) ;
}
2004-12-09 15:00:39 +00:00
}
2008-01-14 16:28:41 +00:00
sal_uInt32 nError = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
m_pData - > m_pObjectShell - > ResetError ( ) ;
// the warnings are currently not transported
2004-12-09 15:00:39 +00:00
if ( ! bSuccess )
2004-10-04 19:57:20 +00:00
{
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) ,
uno : : Reference < uno : : XInterface > ( ) ,
nError ? nError : ERRCODE_IO_GENERAL ) ;
}
}
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel : : switchToStorage ( const uno : : Reference < XSTORAGE > & xStorage )
throw ( lang : : IllegalArgumentException ,
2004-10-04 19:57:20 +00:00
IOEXCEPTION ,
EXCEPTION ,
2007-07-18 05:53:49 +00:00
uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-10-04 19:57:20 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xResult ;
2004-10-04 19:57:20 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw IOEXCEPTION ( ) ; // TODO:
2006-02-01 18:11:59 +00:00
// the persistence should be switched only if the storage is different
if ( xStorage ! = m_pData - > m_pObjectShell - > GetStorage ( )
& & ! m_pData - > m_pObjectShell - > SwitchPersistance ( xStorage ) )
2004-10-04 19:57:20 +00:00
{
sal_uInt32 nError = m_pData - > m_pObjectShell - > GetErrorCode ( ) ;
throw task : : ErrorCodeIOException ( : : rtl : : OUString ( ) ,
uno : : Reference < uno : : XInterface > ( ) ,
nError ? nError : ERRCODE_IO_GENERAL ) ;
}
m_pData - > m_pObjectShell - > Get_Impl ( ) - > bOwnsStorage = FALSE ;
}
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > SAL_CALL SfxBaseModel : : getDocumentStorage ( )
2004-10-04 19:57:20 +00:00
throw ( IOEXCEPTION ,
EXCEPTION ,
2007-07-18 05:53:49 +00:00
uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
2007-07-18 05:53:49 +00:00
throw lang : : DisposedException ( ) ;
2004-10-04 19:57:20 +00:00
2007-07-18 05:53:49 +00:00
uno : : Reference < XSTORAGE > xResult ;
2004-10-04 19:57:20 +00:00
if ( ! m_pData - > m_pObjectShell . Is ( ) )
throw IOEXCEPTION ( ) ; // TODO
return m_pData - > m_pObjectShell - > GetStorage ( ) ;
}
void SAL_CALL SfxBaseModel : : addStorageChangeListener (
2007-07-18 05:53:49 +00:00
const uno : : Reference < document : : XStorageChangeListener > & xListener )
throw ( uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
m_pData - > m_aInterfaceContainer . addInterface (
2007-07-18 05:53:49 +00:00
: : getCppuType ( ( const uno : : Reference < document : : XStorageChangeListener > * ) 0 ) , xListener ) ;
2004-10-04 19:57:20 +00:00
}
void SAL_CALL SfxBaseModel : : removeStorageChangeListener (
2007-07-18 05:53:49 +00:00
const uno : : Reference < document : : XStorageChangeListener > & xListener )
throw ( uno : : RuntimeException )
2004-10-04 19:57:20 +00:00
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
m_pData - > m_aInterfaceContainer . removeInterface (
2007-07-18 05:53:49 +00:00
: : getCppuType ( ( const uno : : Reference < document : : XStorageChangeListener > * ) 0 ) , xListener ) ;
2004-05-10 16:33:10 +00:00
}
2007-07-18 05:53:49 +00:00
# include "printhelper.hxx"
bool SfxBaseModel : : impl_getPrintHelper ( )
{
if ( m_pData - > m_xPrintable . is ( ) )
return true ;
m_pData - > m_xPrintable = new SfxPrintHelper ( ) ;
uno : : Reference < lang : : XInitialization > xInit ( m_pData - > m_xPrintable , uno : : UNO_QUERY ) ;
uno : : Sequence < uno : : Any > aValues ( 1 ) ;
aValues [ 0 ] < < = uno : : Reference < frame : : XModel > ( static_cast < frame : : XModel * > ( this ) , uno : : UNO_QUERY ) ;
xInit - > initialize ( aValues ) ;
uno : : Reference < view : : XPrintJobBroadcaster > xBrd ( m_pData - > m_xPrintable , uno : : UNO_QUERY ) ;
xBrd - > addPrintJobListener ( new SfxPrintHelperListener_Impl ( m_pData ) ) ;
return true ;
}
2004-05-10 16:33:10 +00:00
2008-04-04 14:26:02 +00:00
//=============================================================================
2007-04-16 15:57:05 +00:00
// css.frame.XModule
void SAL_CALL SfxBaseModel : : setIdentifier ( const : : rtl : : OUString & Identifier )
throw ( css : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
m_pData - > m_sModuleIdentifier = Identifier ;
}
//=============================================================================
// css.frame.XModule
: : rtl : : OUString SAL_CALL SfxBaseModel : : getIdentifier ( )
throw ( css : : uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return : : rtl : : OUString ( ) ;
if ( m_pData - > m_sModuleIdentifier . getLength ( ) > 0 )
return m_pData - > m_sModuleIdentifier ;
if ( m_pData - > m_pObjectShell )
return m_pData - > m_pObjectShell - > GetFactory ( ) . GetDocumentServiceName ( ) ;
return : : rtl : : OUString ( ) ;
}
2008-04-04 14:26:02 +00:00
//=============================================================================
css : : uno : : Reference < css : : frame : : XTitle > SfxBaseModel : : impl_getTitleHelper ( )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return css : : uno : : Reference < css : : frame : : XTitle > ( ) ;
if ( ! m_pData - > m_xTitleHelper . is ( ) )
{
css : : uno : : Reference < css : : lang : : XMultiServiceFactory > xSMGR = : : comphelper : : getProcessServiceFactory ( ) ;
css : : uno : : Reference < css : : frame : : XUntitledNumbers > xDesktop ( xSMGR - > createInstance ( SERVICENAME_DESKTOP ) , css : : uno : : UNO_QUERY_THROW ) ;
css : : uno : : Reference < css : : frame : : XModel > xThis ( static_cast < css : : frame : : XModel * > ( this ) , css : : uno : : UNO_QUERY_THROW ) ;
: : framework : : TitleHelper * pHelper = new : : framework : : TitleHelper ( xSMGR ) ;
m_pData - > m_xTitleHelper = css : : uno : : Reference < css : : frame : : XTitle > ( static_cast < : : cppu : : OWeakObject * > ( pHelper ) , css : : uno : : UNO_QUERY_THROW ) ;
pHelper - > setOwner ( xThis ) ;
pHelper - > connectWithUntitledNumbers ( xDesktop ) ;
}
return m_pData - > m_xTitleHelper ;
}
//=============================================================================
css : : uno : : Reference < css : : frame : : XUntitledNumbers > SfxBaseModel : : impl_getUntitledHelper ( )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return css : : uno : : Reference < css : : frame : : XUntitledNumbers > ( ) ;
if ( ! m_pData - > m_xNumberedControllers . is ( ) )
{
css : : uno : : Reference < css : : frame : : XModel > xThis ( static_cast < css : : frame : : XModel * > ( this ) , css : : uno : : UNO_QUERY_THROW ) ;
: : comphelper : : NumberedCollection * pHelper = new : : comphelper : : NumberedCollection ( ) ;
m_pData - > m_xNumberedControllers = css : : uno : : Reference < css : : frame : : XUntitledNumbers > ( static_cast < : : cppu : : OWeakObject * > ( pHelper ) , css : : uno : : UNO_QUERY_THROW ) ;
pHelper - > setOwner ( xThis ) ;
pHelper - > setUntitledPrefix ( : : rtl : : OUString : : createFromAscii ( " : " ) ) ;
}
return m_pData - > m_xNumberedControllers ;
}
//=============================================================================
// css.frame.XTitle
: : rtl : : OUString SAL_CALL SfxBaseModel : : getTitle ( )
throw ( css : : uno : : RuntimeException )
{
// SYNCHRONIZED ->
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return : : rtl : : OUString ( ) ;
2008-04-24 18:16:08 +00:00
: : rtl : : OUString aResult = impl_getTitleHelper ( ) - > getTitle ( ) ;
2008-08-27 06:53:05 +00:00
if ( m_pData - > m_pObjectShell )
{
2008-11-19 13:34:57 +00:00
SfxMedium * pMedium = m_pData - > m_pObjectShell - > GetMedium ( ) ;
if ( pMedium )
{
SFX_ITEMSET_ARG ( pMedium - > GetItemSet ( ) , pRepairedDocItem , SfxBoolItem , SID_REPAIRPACKAGE , sal_False ) ;
if ( pRepairedDocItem & & pRepairedDocItem - > GetValue ( ) )
aResult + = String ( SfxResId ( STR_REPAIREDDOCUMENT ) ) ;
}
2009-04-23 12:23:13 +00:00
if ( m_pData - > m_pObjectShell - > IsReadOnlyUI ( ) | | ( m_pData - > m_pObjectShell - > GetMedium ( ) & & m_pData - > m_pObjectShell - > GetMedium ( ) - > IsReadOnly ( ) ) )
2008-08-27 06:53:05 +00:00
aResult + = : : rtl : : OUString ( String ( SfxResId ( STR_READONLY ) ) ) ;
else if ( m_pData - > m_pObjectShell - > IsDocShared ( ) )
aResult + = : : rtl : : OUString ( String ( SfxResId ( STR_SHARED ) ) ) ;
2008-11-19 13:34:57 +00:00
if ( m_pData - > m_pObjectShell - > GetDocumentSignatureState ( ) = = SIGNATURESTATE_SIGNATURES_OK )
aResult + = String ( SfxResId ( RID_XMLSEC_DOCUMENTSIGNED ) ) ;
2008-08-27 06:53:05 +00:00
}
2008-04-24 18:16:08 +00:00
return aResult ;
2008-04-04 14:26:02 +00:00
}
//=============================================================================
// css.frame.XTitle
void SAL_CALL SfxBaseModel : : setTitle ( const : : rtl : : OUString & sTitle )
throw ( css : : uno : : RuntimeException )
{
// SYNCHRONIZED ->
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
impl_getTitleHelper ( ) - > setTitle ( sTitle ) ;
}
//=============================================================================
// css.frame.XTitleChangeBroadcaster
void SAL_CALL SfxBaseModel : : addTitleChangeListener ( const css : : uno : : Reference < css : : frame : : XTitleChangeListener > & xListener )
throw ( css : : uno : : RuntimeException )
{
// SYNCHRONIZED ->
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
css : : uno : : Reference < css : : frame : : XTitleChangeBroadcaster > xBroadcaster ( impl_getTitleHelper ( ) , css : : uno : : UNO_QUERY ) ;
if ( xBroadcaster . is ( ) )
xBroadcaster - > addTitleChangeListener ( xListener ) ;
}
//=============================================================================
// css.frame.XTitleChangeBroadcaster
void SAL_CALL SfxBaseModel : : removeTitleChangeListener ( const css : : uno : : Reference < css : : frame : : XTitleChangeListener > & xListener )
throw ( css : : uno : : RuntimeException )
{
// SYNCHRONIZED ->
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
css : : uno : : Reference < css : : frame : : XTitleChangeBroadcaster > xBroadcaster ( impl_getTitleHelper ( ) , css : : uno : : UNO_QUERY ) ;
if ( xBroadcaster . is ( ) )
xBroadcaster - > removeTitleChangeListener ( xListener ) ;
}
//=============================================================================
// css.frame.XUntitledNumbers
: : sal_Int32 SAL_CALL SfxBaseModel : : leaseNumber ( const css : : uno : : Reference < css : : uno : : XInterface > & xComponent )
throw ( css : : lang : : IllegalArgumentException ,
css : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return css : : frame : : UntitledNumbersConst : : INVALID_NUMBER ;
return impl_getUntitledHelper ( ) - > leaseNumber ( xComponent ) ;
}
//=============================================================================
// css.frame.XUntitledNumbers
void SAL_CALL SfxBaseModel : : releaseNumber ( : : sal_Int32 nNumber )
throw ( css : : lang : : IllegalArgumentException ,
css : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
impl_getUntitledHelper ( ) - > releaseNumber ( nNumber ) ;
}
//=============================================================================
// css.frame.XUntitledNumbers
void SAL_CALL SfxBaseModel : : releaseNumberForComponent ( const css : : uno : : Reference < css : : uno : : XInterface > & xComponent )
throw ( css : : lang : : IllegalArgumentException ,
css : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return ;
impl_getUntitledHelper ( ) - > releaseNumberForComponent ( xComponent ) ;
}
//=============================================================================
// css.frame.XUntitledNumbers
: : rtl : : OUString SAL_CALL SfxBaseModel : : getUntitledPrefix ( )
throw ( css : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return : : rtl : : OUString ( ) ;
return impl_getUntitledHelper ( ) - > getUntitledPrefix ( ) ;
}
2007-04-16 15:57:05 +00:00
//=============================================================================
// css::frame::XModel2
css : : uno : : Reference < css : : container : : XEnumeration > SAL_CALL SfxBaseModel : : getControllers ( )
throw ( css : : uno : : RuntimeException )
{
// object already disposed?
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
return css : : uno : : Reference < css : : container : : XEnumeration > ( ) ;
sal_Int32 c = m_pData - > m_seqControllers . getLength ( ) ;
sal_Int32 i = 0 ;
css : : uno : : Sequence < css : : uno : : Any > lEnum ( c ) ;
for ( i = 0 ; i < c ; + + i )
lEnum [ i ] < < = m_pData - > m_seqControllers [ i ] ;
: : comphelper : : OAnyEnumeration * pEnum = new : : comphelper : : OAnyEnumeration ( lEnum ) ;
css : : uno : : Reference < css : : container : : XEnumeration > xEnum ( static_cast < css : : container : : XEnumeration * > ( pEnum ) , css : : uno : : UNO_QUERY_THROW ) ;
return xEnum ;
}
//=============================================================================
// css::frame::XModel2
css : : uno : : Sequence < : : rtl : : OUString > SAL_CALL SfxBaseModel : : getAvailableViewControllerNames ( )
throw ( css : : uno : : RuntimeException )
{
2009-12-03 09:29:45 +01:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const SfxObjectFactory & rDocumentFactory = GetObjectShell ( ) - > GetFactory ( ) ;
const sal_Int32 nViewFactoryCount = rDocumentFactory . GetViewFactoryCount ( ) ;
Sequence < : : rtl : : OUString > aViewNames ( nViewFactoryCount ) ;
for ( sal_Int32 nViewNo = 0 ; nViewNo < nViewFactoryCount ; + + nViewNo )
{
: : rtl : : OUStringBuffer aViewName ;
aViewName . appendAscii ( " view " ) ;
aViewName . append ( nViewNo ) ;
aViewNames [ nViewNo ] = aViewName . makeStringAndClear ( ) ;
}
return aViewNames ;
2007-04-16 15:57:05 +00:00
}
//=============================================================================
// css::frame::XModel2
2009-12-03 09:29:45 +01:00
css : : uno : : Reference < css : : frame : : XController2 > SAL_CALL SfxBaseModel : : createDefaultViewController ( const css : : uno : : Reference < css : : frame : : XFrame > & i_rFrame )
2007-04-16 15:57:05 +00:00
throw ( css : : uno : : RuntimeException ,
css : : lang : : IllegalArgumentException ,
css : : uno : : Exception )
{
2009-12-03 09:29:45 +01:00
return createViewController ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " view0 " ) ) , Sequence < PropertyValue > ( ) , i_rFrame ) ;
// TODO: extende the SfxViewFactory with support for speaking view names
2007-04-16 15:57:05 +00:00
}
//=============================================================================
// css::frame::XModel2
2009-12-03 09:29:45 +01:00
css : : uno : : Reference < css : : frame : : XController2 > SAL_CALL SfxBaseModel : : createViewController (
const : : rtl : : OUString & i_rViewName , const Sequence < PropertyValue > & i_rArguments , const Reference < XFrame > & i_rFrame )
2007-04-16 15:57:05 +00:00
throw ( css : : uno : : RuntimeException ,
css : : lang : : IllegalArgumentException ,
css : : uno : : Exception )
{
2009-12-03 09:29:45 +01:00
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
// number of view to create
if ( i_rViewName . indexOfAsciiL ( " view " , 4 ) ! = 0 )
throw IllegalArgumentException ( : : rtl : : OUString ( ) , * this , 1 ) ;
const USHORT nViewId = ( USHORT ) i_rViewName . copy ( 4 ) . toInt32 ( ) ;
SfxObjectFactory & rDocumentFactory = GetObjectShell ( ) - > GetFactory ( ) ;
sal_Int32 nViewNo = - 1 ;
for ( nViewNo = 0 ; nViewNo < rDocumentFactory . GetViewFactoryCount ( ) ; + + nViewNo )
if ( rDocumentFactory . GetViewFactory ( nViewNo ) . GetOrdinal ( ) = = nViewId )
break ;
if ( nViewNo > = rDocumentFactory . GetViewFactoryCount ( ) )
throw IllegalArgumentException ( : : rtl : : OUString ( ) , * this , 1 ) ;
// determine previous shell (used in some special cases)
: : comphelper : : NamedValueCollection aCreationArgs ( i_rArguments ) ;
Reference < XController > xPreviousController = aCreationArgs . getOrDefault ( " PreviousView " , Reference < XController > ( ) ) ;
SfxViewShell * pOldViewShell = SfxViewShell : : Get ( xPreviousController ) ;
OSL_ENSURE ( ! xPreviousController . is ( ) | | ( pOldViewShell ! = NULL ) ,
" SfxBaseModel::createViewController: invalid old controller! " ) ;
// determine the ViewFrame belonging to the given XFrame
SfxViewFrame * pViewFrame = NULL ;
for ( pViewFrame = SfxViewFrame : : GetFirst ( GetObjectShell ( ) , FALSE ) ;
pViewFrame ;
pViewFrame = SfxViewFrame : : GetNext ( * pViewFrame , GetObjectShell ( ) , FALSE )
)
{
if ( pViewFrame - > GetFrame ( ) - > GetFrameInterface ( ) = = i_rFrame )
break ;
}
if ( ! pViewFrame )
// TODO: Effectively, this means that only our dedicated SFX-Loader can load documents into an arbitrary
// XFrame, since it will (directly or indirectly) create the Sfx(View)Frame which we need here.
// We should evaluate whether (after the re-factoring) it is possible/feasible to allow for an arbitrary
// XFrame here, by creating the necessary Sfx(View)Frame ourself. Finally, this is what a "view factory"
// is about ...
throw IllegalArgumentException ( : : rtl : : OUString ( RTL_CONSTASCII_USTRINGPARAM ( " invalid frame " ) ) , * this , 3 ) ;
// delegate to SFX' view factory
SfxViewFactory & rViewFactory = rDocumentFactory . GetViewFactory ( nViewNo ) ;
SfxViewShell * pViewShell = rViewFactory . CreateInstance ( pViewFrame , pOldViewShell ) ;
ENSURE_OR_THROW ( pViewShell , " invalid view shell provided by factory " ) ;
// by setting the ViewShell it is prevented that disposing the Controller will destroy this ViewFrame also
pViewFrame - > GetDispatcher ( ) - > SetDisableFlags ( 0 ) ;
pViewFrame - > SetViewShell_Impl ( pViewShell ) ;
// ensure a default controller, if the view shell did not provide an own implementation
if ( ! pViewShell - > GetController ( ) . is ( ) )
pViewShell - > SetController ( new SfxBaseController ( pViewShell ) ) ;
return Reference < XController2 > ( pViewShell - > GetController ( ) , UNO_QUERY_THROW ) ;
2007-04-16 15:57:05 +00:00
}
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
//=============================================================================
// RDF DocumentMetadataAccess
// ::com::sun::star::rdf::XRepositorySupplier:
uno : : Reference < rdf : : XRepository > SAL_CALL
SfxBaseModel : : getRDFRepository ( ) throw ( uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getRDFRepository ( ) ;
}
// ::com::sun::star::rdf::XNode:
: : rtl : : OUString SAL_CALL
SfxBaseModel : : getStringValue ( ) throw ( uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getStringValue ( ) ;
}
// ::com::sun::star::rdf::XURI:
: : rtl : : OUString SAL_CALL
SfxBaseModel : : getNamespace ( ) throw ( uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getNamespace ( ) ;
}
: : rtl : : OUString SAL_CALL
SfxBaseModel : : getLocalName ( ) throw ( uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getLocalName ( ) ;
}
// ::com::sun::star::rdf::XDocumentMetadataAccess:
uno : : Reference < rdf : : XMetadatable > SAL_CALL
SfxBaseModel : : getElementByMetadataReference (
const : : com : : sun : : star : : beans : : StringPair & i_rReference )
throw ( uno : : RuntimeException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getElementByMetadataReference ( i_rReference ) ;
}
uno : : Reference < rdf : : XMetadatable > SAL_CALL
SfxBaseModel : : getElementByURI ( const uno : : Reference < rdf : : XURI > & i_xURI )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getElementByURI ( i_xURI ) ;
}
uno : : Sequence < uno : : Reference < rdf : : XURI > > SAL_CALL
SfxBaseModel : : getMetadataGraphsWithType (
const uno : : Reference < rdf : : XURI > & i_xType )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > getMetadataGraphsWithType ( i_xType ) ;
}
uno : : Reference < rdf : : XURI > SAL_CALL
SfxBaseModel : : addMetadataFile ( const : : rtl : : OUString & i_rFileName ,
const uno : : Sequence < uno : : Reference < rdf : : XURI > > & i_rTypes )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
container : : ElementExistException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > addMetadataFile ( i_rFileName , i_rTypes ) ;
}
uno : : Reference < rdf : : XURI > SAL_CALL
SfxBaseModel : : importMetadataFile ( : : sal_Int16 i_Format ,
const uno : : Reference < io : : XInputStream > & i_xInStream ,
const : : rtl : : OUString & i_rFileName ,
const uno : : Reference < rdf : : XURI > & i_xBaseURI ,
const uno : : Sequence < uno : : Reference < rdf : : XURI > > & i_rTypes )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
datatransfer : : UnsupportedFlavorException ,
container : : ElementExistException , rdf : : ParseException , io : : IOException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > importMetadataFile ( i_Format ,
i_xInStream , i_rFileName , i_xBaseURI , i_rTypes ) ;
}
void SAL_CALL
SfxBaseModel : : removeMetadataFile (
const uno : : Reference < rdf : : XURI > & i_xGraphName )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
container : : NoSuchElementException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > removeMetadataFile ( i_xGraphName ) ;
}
void SAL_CALL
SfxBaseModel : : addContentOrStylesFile ( const : : rtl : : OUString & i_rFileName )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
container : : ElementExistException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > addContentOrStylesFile ( i_rFileName ) ;
}
void SAL_CALL
SfxBaseModel : : removeContentOrStylesFile ( const : : rtl : : OUString & i_rFileName )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
container : : NoSuchElementException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > removeContentOrStylesFile ( i_rFileName ) ;
}
void SAL_CALL
SfxBaseModel : : loadMetadataFromStorage (
uno : : Reference < embed : : XStorage > const & i_xStorage ,
uno : : Reference < rdf : : XURI > const & i_xBaseURI ,
uno : : Reference < task : : XInteractionHandler > const & i_xHandler )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
lang : : WrappedTargetException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA (
m_pData - > CreateDMAUninitialized ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
try {
xDMA - > loadMetadataFromStorage ( i_xStorage , i_xBaseURI , i_xHandler ) ;
} catch ( lang : : IllegalArgumentException & ) {
throw ; // not initialized
} catch ( uno : : Exception & ) {
// UGLY: if it's a RuntimeException, we can't be sure DMA is initialzed
m_pData - > m_xDocumentMetadata = xDMA ;
throw ;
}
m_pData - > m_xDocumentMetadata = xDMA ;
}
void SAL_CALL
SfxBaseModel : : storeMetadataToStorage (
uno : : Reference < embed : : XStorage > const & i_xStorage )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
lang : : WrappedTargetException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > storeMetadataToStorage ( i_xStorage ) ;
}
void SAL_CALL
SfxBaseModel : : loadMetadataFromMedium (
const uno : : Sequence < beans : : PropertyValue > & i_rMedium )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
lang : : WrappedTargetException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA (
m_pData - > CreateDMAUninitialized ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
try {
xDMA - > loadMetadataFromMedium ( i_rMedium ) ;
} catch ( lang : : IllegalArgumentException & ) {
throw ; // not initialized
} catch ( uno : : Exception & ) {
// UGLY: if it's a RuntimeException, we can't be sure DMA is initialzed
m_pData - > m_xDocumentMetadata = xDMA ;
throw ;
}
m_pData - > m_xDocumentMetadata = xDMA ;
}
void SAL_CALL
SfxBaseModel : : storeMetadataToMedium (
const uno : : Sequence < beans : : PropertyValue > & i_rMedium )
throw ( uno : : RuntimeException , lang : : IllegalArgumentException ,
lang : : WrappedTargetException )
{
: : vos : : OGuard aGuard ( Application : : GetSolarMutex ( ) ) ;
if ( impl_isDisposed ( ) )
throw lang : : DisposedException ( ) ;
const uno : : Reference < rdf : : XDocumentMetadataAccess > xDMA ( m_pData - > GetDMA ( ) ) ;
if ( ! xDMA . is ( ) ) {
throw uno : : RuntimeException ( : : rtl : : OUString : : createFromAscii (
" model has no document metadata " ) , * this ) ;
}
return xDMA - > storeMetadataToMedium ( i_rMedium ) ;
}