mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f13ce448ff464d557a9b360eb413f914276cc4e3
libreoffice/sfx2/source/doc/sfxbasemodel.cxx

4309 lines
174 KiB
C++
Raw Normal View History

initial import
2000-09-18 16:07:07 +00:00
/*************************************************************************
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:13:03 +00:00
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
initial import
2000-09-18 16:07:07 +00:00
*
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2010-02-12 15:01:35 +01:00
* Copyright 2000, 2010 Oracle and/or its affiliates.
initial import
2000-09-18 16:07:07 +00:00
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:13:03 +00:00
* OpenOffice.org - a multi-platform office productivity suite
initial import
2000-09-18 16:07:07 +00:00
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:13:03 +00:00
* This file is part of OpenOffice.org.
initial import
2000-09-18 16:07:07 +00:00
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
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.
initial import
2000-09-18 16:07:07 +00:00
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
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).
initial import
2000-09-18 16:07:07 +00:00
*
INTEGRATION: CWS changefileheader (1.137.28); FILE MERGED 2008/03/31 13:38:29 rt 1.137.28.1: #i87441# Change license header to LPGL v3.
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.
initial import
2000-09-18 16:07:07 +00:00
*
************************************************************************/
INTEGRATION: CWS pchfix02 (1.114.22); FILE MERGED 2006/09/01 17:38:43 kaib 1.114.22.1: #i68856# Added header markers and pch files
2006-09-17 15:45:28 +00:00
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// my own includes
//________________________________________________________________________________________________________
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:24:53 +00:00
#include <sfx2/sfxbasemodel.hxx>
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// include of other projects
//________________________________________________________________________________________________________
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
initial import
2000-09-18 16:07:07 +00:00
#include <com/sun/star/view/XSelectionSupplier.hpp>
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
#include <com/sun/star/view/XPrintJobListener.hpp>
initial import
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>
#98385# new IllegalArgumentIOException
2002-04-03 10:51:03 +00:00
#include <com/sun/star/frame/IllegalArgumentIOException.hpp>
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/frame/UntitledNumbersConst.hpp>
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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>
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
#include <com/sun/star/document/XActionLockable.hpp>
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
#include <com/sun/star/beans/XPropertySet.hpp>
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
#include <com/sun/star/container/XIndexContainer.hpp>
INTEGRATION: CWS scriptingf6 (1.67.56); FILE MERGED 2004/10/11 16:46:22 toconnor 1.67.56.3: RESYNC: (1.68-1.69); FILE MERGED 2004/10/11 14:29:14 toconnor 1.67.56.2: RESYNC: (1.67-1.68); FILE MERGED 2004/08/03 16:33:08 dfoster 1.67.56.1: #i32502#
2004-10-22 13:40:46 +00:00
#include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
INTEGRATION: CWS removedrafts (1.82.10); FILE MERGED 2005/02/22 10:42:08 cd 1.82.10.2: #i42557# Remove drafts from UNOIDL types 2005/02/17 14:02:15 cd 1.82.10.1: #i42557# Move UNOIDL types from drafts to com
2005-03-01 19:02:00 +00:00
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
2005-03-23 13:25:16 +00:00
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
#include <com/sun/star/embed/ElementModes.hpp>
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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>
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
#include <comphelper/enumhelper.hxx> // can be removed when this is a "real" service
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
#include <cppuhelper/interfacecontainer.hxx>
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
#include <cppuhelper/exc_hlp.hxx>
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
#include <comphelper/processfactory.hxx> // can be removed when this is a "real" service
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
#include <comphelper/componentcontext.hxx>
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
#include <comphelper/namedvaluecollection.hxx>
#i103496#: split svtools; improve ConfitItems
2009-10-16 00:05:16 +02:00
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
#include <svl/intitem.hxx>
INTEGRATION: CWS visibility03 (1.87.12); FILE MERGED 2005/04/06 17:32:40 mhu 1.87.12.2: RESYNC: (1.87-1.90); FILE MERGED 2005/03/26 16:25:39 mhu 1.87.12.1: #i45006# subst includes svtools/sbx with basic/sbx
2005-04-13 11:41:28 +00:00
#include <basic/sbx.hxx>
#96074#: remove me from AppBasic
2001-12-19 17:02:03 +00:00
#include <basic/sbuno.hxx>
#100448# enable urls for printing instead of system pathes
2002-06-28 08:15:06 +00:00
#include <tools/urlobj.hxx>
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
#include <tools/diagnose_ex.h>
#100448# enable urls for printing instead of system pathes
2002-06-28 08:15:06 +00:00
#include <unotools/tempfile.hxx>
#include <vos/mutex.hxx>
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
#include <vcl/salctype.hxx>
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
2003-09-19 07:02:02 +00:00
#include <sot/clsids.hxx>
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
#include <sot/storinfo.hxx>
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
#include <comphelper/storagehelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/transfer.hxx>
INTEGRATION: CWS fwk64 (1.120.98); FILE MERGED 2007/03/26 12:28:52 mav 1.120.98.2: #i69640# fix some errors and warnings, let them be handled by interaction handler 2007/03/16 08:57:40 mav 1.120.98.1: #108296# set the correct error context
2007-04-19 08:29:27 +00:00
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
INTEGRATION: CWS perform01 (1.81.12); FILE MERGED 2005/02/07 16:29:05 mt 1.81.12.1: #i40901# More RTL_LOG
2005-02-16 15:35:35 +00:00
#include <rtl/logfile.hxx>
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
2005-03-23 13:25:16 +00:00
#include <framework/configimporter.hxx>
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
#include <framework/interaction.hxx>
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
#include <framework/titlehelper.hxx>
#include <comphelper/numberedcollection.hxx>
INTEGRATION: CWS fwk80_SRC680 (1.131.14); FILE MERGED 2008/01/24 07:53:28 pb 1.131.14.3: RESYNC: (1.131-1.131.26.1); FILE MERGED 2008/01/16 07:29:31 mav 1.131.14.2: #i84941# allow to use interaction handler if the document has one 2008/01/04 11:49:55 mav 1.131.14.1: #i81702# disconnect from template after the loading has finished
2008-01-29 14:29:24 +00:00
#include <unotools/ucbstreamhelper.hxx>
#100448# enable urls for printing instead of system pathes
2002-06-28 08:15:06 +00:00
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// includes of my own project
//________________________________________________________________________________________________________
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
#include <sfx2/sfxbasecontroller.hxx>
#include "viewfac.hxx"
autorecovery: moved some code from SfxFrame::InsertDocument_Impl to where the view is actually created (or connected)
2009-12-10 12:41:09 +01:00
#include "workwin.hxx"
INTEGRATION: CWS dba24c (1.130.4); FILE MERGED 2007/10/16 08:22:20 fs 1.130.4.1: in preparation of #i52527# #i73705#: outsourced the SIGNATURE_STATE_ defines to signaturestate.hxx
2007-11-21 15:49:53 +00:00
#include <sfx2/signaturestate.hxx>
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:24:53 +00:00
#include <sfx2/sfxuno.hxx>
initial import
2000-09-18 16:07:07 +00:00
#include <objshimp.hxx>
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
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>
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
#include <basmgr.hxx>
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:24:53 +00:00
#include <sfx2/event.hxx>
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
#include <eventsupplier.hxx>
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:24:53 +00:00
#include <sfx2/evntconf.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/app.hxx>
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both can effectively be treated as one class. This change was done to make subsequent refactorings easier.
2009-11-30 12:56:04 +01:00
#include <sfx2/viewfrm.hxx>
#96074#: remove me from AppBasic
2001-12-19 17:02:03 +00:00
#include "appdata.hxx"
INTEGRATION: CWS vgbugs07 (1.122.38); FILE MERGED 2007/06/04 13:34:56 vg 1.122.38.1: #i76605# Remove -I .../inc/module hack introduced by hedaburemove01
2007-06-27 22:24:53 +00:00
#include <sfx2/docfac.hxx>
#include <sfx2/fcontnr.hxx>
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
#include "sfx2/docstoragemodifylistener.hxx"
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
#include "brokenpackageint.hxx"
INTEGRATION: CWS graphicapi (1.64.14); FILE MERGED 2004/06/03 08:37:10 mav 1.64.14.1: #i27850# thumbnail storing
2004-06-11 08:47:05 +00:00
#include "graphhelp.hxx"
#i10000# include sfx2/msgpool.hxx added
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>
INTEGRATION: CWS mav32 (1.141.4); FILE MERGED 2008/04/18 15:12:22 mav 1.141.4.1: #i88435# use the correct suffix for the shared documents
2008-04-24 18:16:08 +00:00
#include <sfxresid.hxx>
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
//________________________________________________________________________________________________________
// const
static const ::rtl::OUString SERVICENAME_DESKTOP = ::rtl::OUString::createFromAscii ("com.sun.star.frame.Desktop");
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// namespaces
//________________________________________________________________________________________________________
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
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;
#88560#: implementation for XCloseable
2002-10-24 11:12:32 +00:00
using namespace ::com::sun::star::uno;
[CWS autorecovery] initial implementation of XModel2::createViewController
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;
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
using ::com::sun::star::io::IOException;
using ::com::sun::star::lang::WrappedTargetException;
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
using ::com::sun::star::uno::Type;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::document::XDocumentRecovery;
initial import
2000-09-18 16:07:07 +00:00
CWS-TOOLING: integrate CWS oj18 2009-08-21 15:08:49 +0200 oj r275263 : wrong check 2009-08-21 08:56:01 +0200 oj r275215 : missing not 2009-08-20 07:27:13 +0200 oj r275164 : use new method from global 2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale 2009-08-18 10:39:32 +0200 oj r275082 : missing header include 2009-08-18 10:09:44 +0200 oj r275081 : new methods at global 2009-08-18 10:09:00 +0200 oj r275080 : unused var 2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml 2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55) 2009-08-17 13:29:44 +0200 oj r275047 : compile error 2009-08-17 13:27:47 +0200 oj r275045 : compile error 2009-08-17 11:44:54 +0200 oj r275040 : add dep 2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl 2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl 2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code 2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand 2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char 2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator 2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc 2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled 2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger 2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand 2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand 2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl 2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
2009-09-08 04:57:32 +00:00
/** This Listener is used to get notified when the XDocumentProperties of the
XModel change.
*/
class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
::com::sun::star::util::XModifyListener >
{
public:
SfxObjectShell& m_rShell;
SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
: m_rShell(i_rDoc)
{ };
~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() );
// notify changes to the SfxObjectShell
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
m_rShell.FlushDocInfo();
CWS-TOOLING: integrate CWS oj18 2009-08-21 15:08:49 +0200 oj r275263 : wrong check 2009-08-21 08:56:01 +0200 oj r275215 : missing not 2009-08-20 07:27:13 +0200 oj r275164 : use new method from global 2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale 2009-08-18 10:39:32 +0200 oj r275082 : missing header include 2009-08-18 10:09:44 +0200 oj r275081 : new methods at global 2009-08-18 10:09:00 +0200 oj r275080 : unused var 2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml 2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55) 2009-08-17 13:29:44 +0200 oj r275047 : compile error 2009-08-17 13:27:47 +0200 oj r275045 : compile error 2009-08-17 11:44:54 +0200 oj r275040 : add dep 2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl 2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl 2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code 2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand 2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char 2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator 2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc 2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled 2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger 2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand 2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand 2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl 2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
2009-09-08 04:57:32 +00:00
}
void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
throw ( uno::RuntimeException )
{
}
initial import
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
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
// counter for SfxBaseModel instances created.
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 ;
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
sal_Bool m_bInitialized ;
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
sal_Bool m_bModifiedSinceLastSave;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< com::sun::star::view::XPrintable> m_xPrintable ;
uno::Reference< script::provider::XScriptProvider > m_xScriptProvider;
uno::Reference< ui::XUIConfigurationManager > m_xUIConfigurationManager;
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListen;
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
::rtl::OUString m_sModuleIdentifier;
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
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;
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav31 (1.137.38); FILE MERGED 2008/04/09 10:19:47 mav 1.137.38.1: #i87197# fix the crash/deadlock
2008-04-15 09:27:10 +00:00
IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell )
: m_pObjectShell ( pObjectShell )
, m_aInterfaceContainer ( rMutex )
initial import
2000-09-18 16:07:07 +00:00
, m_nControllerLockCount ( 0 )
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
, m_bClosed ( sal_False )
, m_bClosing ( sal_False )
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
, m_bSaving ( sal_False )
, m_bSuicide ( sal_False )
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
, m_bInitialized ( sal_False )
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
, m_bModifiedSinceLastSave( sal_False )
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
, m_pStorageModifyListen ( NULL )
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
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
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
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 );
initial import
2000-09-18 16:07:07 +00:00
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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;
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
};
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
// static member initialization.
sal_Int64 IMPL_SfxBaseModel_DataContainer::g_nInstanceCounter = 0;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// =======================================================================================================
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 >
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
public:
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
IMPL_SfxBaseModel_DataContainer* m_pData;
SfxPrintHelperListener_Impl( IMPL_SfxBaseModel_DataContainer* pData )
: m_pData( pData )
{}
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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);
};
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException )
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_xPrintable = 0;
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (uno::RuntimeException)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 )
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
while (pIterator.hasMoreElements())
((view::XPrintJobListener*)pIterator.next())->printJobEvent( rEvent );
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
}
INTEGRATION: CWS fwk01 (1.39.4.3.16); FILE MERGED 2003/03/24 17:02:29 mba 1.39.4.3.16.3: #108086#: new printing hint 2003/03/20 11:42:46 as 1.39.4.3.16.2: #108086# remove typo 2003/03/19 17:44:36 mba 1.39.4.3.16.1: #108086#: cancelable PrintJobs
2003-04-04 16:36:59 +00:00
}
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
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;
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both can effectively be treated as one class. This change was done to make subsequent refactorings easier.
2009-11-30 12:56:04 +01:00
for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pObjectShell );
pFrame;
pFrame = SfxViewFrame::GetNext( *pFrame, pObjectShell )
)
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
SfxFrame& rSfxFrame = pFrame->GetFrame();
try
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
// get vcl window related to the frame and lock it if it is still not locked
uno::Reference< frame::XFrame > xFrame = rSfxFrame.GetFrameInterface();
Window* pWindow = GetVCLWindow( xFrame );
if ( !pWindow )
throw uno::RuntimeException();
if ( pWindow->IsEnabled() )
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
pWindow->Disable();
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
try
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
sal_Int32 nLen = m_aLockedFrames.getLength();
m_aLockedFrames.realloc( nLen + 1 );
m_aLockedFrames[nLen] = xFrame;
}
catch( uno::Exception& )
{
pWindow->Enable();
throw;
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
}
}
}
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
catch( uno::Exception& )
{
OSL_ENSURE( sal_False, "Not possible to lock the frame window!\n" );
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
}
}
}
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" );
}
}
}
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
// SfxSaveGuard ====================================================================================
class SfxSaveGuard
{
private:
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< frame::XModel > m_xModel;
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
IMPL_SfxBaseModel_DataContainer* m_pData;
SfxOwnFramesLocker* m_pFramesLock;
public:
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
SfxSaveGuard(const uno::Reference< frame::XModel >& xModel ,
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
IMPL_SfxBaseModel_DataContainer* pData ,
sal_Bool bRejectConcurrentSaveRequest);
~SfxSaveGuard();
};
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
SfxSaveGuard::SfxSaveGuard(const uno::Reference< frame::XModel >& xModel ,
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
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.");
INTEGRATION: CWS cov2src (1.100.8); FILE MERGED 2005/10/18 13:03:59 rt 1.100.8.1: #126234# Join MWS COV680 m4 into SRC680
2005-10-19 11:47:00 +00:00
if ( m_pData->m_bClosed )
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
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
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< util::XCloseable > xClose(m_xModel, uno::UNO_QUERY);
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
if (xClose.is())
xClose->close(sal_True);
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
catch(const util::CloseVetoException&)
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
{}
}
}
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
// =======================================================================================================
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// constructor
//________________________________________________________________________________________________________
INTEGRATION: CWS rpt23fix02 (1.125.12); FILE MERGED 2007/07/30 06:32:44 oj 1.125.12.1: #80155# insert DBG_NAME to find memory leaks easier
2007-08-03 09:24:13 +00:00
DBG_NAME(sfx2_SfxBaseModel)
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 )
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
, m_bSupportDocRecovery( pObjectShell && pObjectShell->Get_Impl() ? pObjectShell->Get_Impl()->m_bDocRecoverySupport : false )
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS rpt23fix02 (1.125.12); FILE MERGED 2007/07/30 06:32:44 oj 1.125.12.1: #80155# insert DBG_NAME to find memory leaks easier
2007-08-03 09:24:13 +00:00
DBG_CTOR(sfx2_SfxBaseModel,NULL);
initial import
2000-09-18 16:07:07 +00:00
if ( pObjectShell != NULL )
{
StartListening( *pObjectShell ) ;
}
}
//________________________________________________________________________________________________________
// destructor
//________________________________________________________________________________________________________
SfxBaseModel::~SfxBaseModel()
{
INTEGRATION: CWS rpt23fix02 (1.125.12); FILE MERGED 2007/07/30 06:32:44 oj 1.125.12.1: #80155# insert DBG_NAME to find memory leaks easier
2007-08-03 09:24:13 +00:00
DBG_DTOR(sfx2_SfxBaseModel,NULL);
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XInterface
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Any SAL_CALL SfxBaseModel::queryInterface( const UNOTYPE& rType ) throw( uno::RuntimeException )
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
if ( ( !m_bSupportEmbeddedScripts && rType.equals( XEMBEDDEDSCRIPTS::static_type() ) )
|| ( !m_bSupportDocRecovery && rType.equals( XDocumentRecovery::static_type() ) )
)
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
return Any();
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
return SfxBaseModel_Base::queryInterface( rType );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XInterface
//________________________________________________________________________________________________________
#65293# exception specification
2001-10-11 10:40:42 +00:00
void SAL_CALL SfxBaseModel::acquire() throw( )
initial import
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
//________________________________________________________________________________________________________
#65293# exception specification
2001-10-11 10:40:42 +00:00
void SAL_CALL SfxBaseModel::release() throw( )
initial import
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
//________________________________________________________________________________________________________
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
namespace
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
void lcl_stripType( Sequence< Type >& io_rTypes, const Type& i_rTypeToStrip )
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
Sequence< UNOTYPE > aStrippedTypes( io_rTypes.getLength() - 1 );
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
::std::remove_copy_if(
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
io_rTypes.getConstArray(),
io_rTypes.getConstArray() + io_rTypes.getLength(),
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
aStrippedTypes.getArray(),
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
::std::bind2nd( ::std::equal_to< Type >(), i_rTypeToStrip )
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
);
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
io_rTypes = aStrippedTypes;
initial import
2000-09-18 16:07:07 +00:00
}
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
}
uno::Sequence< UNOTYPE > SAL_CALL SfxBaseModel::getTypes() throw( uno::RuntimeException )
{
uno::Sequence< UNOTYPE > aTypes( SfxBaseModel_Base::getTypes() );
if ( !m_bSupportEmbeddedScripts )
lcl_stripType( aTypes, XEMBEDDEDSCRIPTS::static_type() );
if ( !m_bSupportDocRecovery )
lcl_stripType( aTypes, XDocumentRecovery::static_type() );
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
return aTypes;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XTypeProvider
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( uno::RuntimeException )
initial import
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!
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
static ::cppu::OImplementationId* pID = NULL ;
initial import
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::osl::MutexGuard aGuard( MUTEX::getGlobalMutex() ) ;
initial import
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 ...
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
static ::cppu::OImplementationId aID( sal_False ) ;
initial import
2000-09-18 16:07:07 +00:00
// ... and set his address to static pointer!
pID = &aID ;
}
}
return pID->getImplementationId() ;
}
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
//________________________________________________________________________________________________________
// XStarBasicAccess
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell* pObjectShell )
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess > xRet;
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
if( pObjectShell )
{
BasicManager* pMgr = pObjectShell->GetBasicManager();
xRet = getStarBasicAccess( pMgr );
}
return xRet;
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XNAMECONTAINER > SAL_CALL SfxBaseModel::getLibraryContainer() throw( uno::RuntimeException )
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess;
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
if( !rxAccess.is() && m_pData->m_pObjectShell.Is() )
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XNAMECONTAINER > xRet;
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
if( rxAccess.is() )
xRet = rxAccess->getLibraryContainer();
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
return xRet;
}
/**___________________________________________________________________________________________________
@seealso XStarBasicAccess
*/
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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)
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess;
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
if( !rxAccess.is() && m_pData->m_pObjectShell.Is() )
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
if( rxAccess.is() )
rxAccess->createLibrary( LibName, Password, ExternalSourceURL, LinkTargetURL );
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
}
/**___________________________________________________________________________________________________
@seealso XStarBasicAccess
*/
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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)
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess;
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
if( !rxAccess.is() && m_pData->m_pObjectShell.Is() )
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
if( rxAccess.is() )
rxAccess->addModule( LibraryName, ModuleName, Language, Source );
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
}
/**___________________________________________________________________________________________________
@seealso XStarBasicAccess
*/
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName,
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
const ::com::sun::star::uno::Sequence< sal_Int8 >& Data )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw(NOSUCHELEMENTEXCEPTION, uno::RuntimeException)
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::XStarBasicAccess >& rxAccess = m_pData->m_xStarBasicAccess;
INTEGRATION: CWS impress8ea1 (1.60.6); FILE MERGED 2004/04/21 17:35:55 cl 1.60.6.1: #i27567# there is not always a object shell! (f.e. clipboard documents)
2004-05-10 10:56:52 +00:00
if( !rxAccess.is() && m_pData->m_pObjectShell.Is() )
#80755# New functionality for Basic XML import/export
2000-11-27 14:16:00 +00:00
rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell );
if( rxAccess.is() )
rxAccess->addDialog( LibraryName, DialogName, Data );
SfxBaseModel supports XStarBasicAccess
2000-11-13 11:50:43 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< uno::XInterface > SAL_CALL SfxBaseModel::getParent() throw( uno::RuntimeException )
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
initial import
2000-09-18 16:07:07 +00:00
return m_pData->m_xParent;
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::setParent(const uno::Reference< uno::XInterface >& Parent) throw(NOSUPPORTEXCEPTION, uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
initial import
2000-09-18 16:07:07 +00:00
m_pData->m_xParent = Parent;
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel::dispose() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: it's allowed to dispose a document which has not yet been (fully) initialized - happens in some clipboard scenarios with 'artificial' documents
2010-02-23 10:16:39 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
initial import
2000-09-18 16:07:07 +00:00
#109351#: avoid recursions in close
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;
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
if ( m_pData->m_pStorageModifyListen.is() )
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
{
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
m_pData->m_pStorageModifyListen->dispose();
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
m_pData->m_pStorageModifyListen = NULL;
}
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
lang::EventObject aEvent( (frame::XModel *)this );
initial import
2000-09-18 16:07:07 +00:00
m_pData->m_aInterfaceContainer.disposeAndClear( aEvent );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
if ( m_pData->m_xDocumentInfo.is() )
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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;
initial import
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 > > () ;
INTEGRATION: CWS mav4 (1.42.2); FILE MERGED 2003/04/23 10:30:50 mba 1.42.2.2: #108760#: avoid double disposing 2003/04/11 14:33:04 mav 1.42.2.1: #108635# store the extent information in the additional stream
2003-04-24 12:20:39 +00:00
INTEGRATION: CWS fwk70 (1.127.6); FILE MERGED 2007/07/25 06:32:32 cd 1.127.6.1: #i79962# member m_pData must be set to zero to force disposed exceptions before the referenced object can be destroyed via delete
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;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addEventListener( const uno::Reference< XEVENTLISTENER >& aListener )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< XEVENTLISTENER >*)0), aListener );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XChild
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::removeEventListener( const uno::Reference< XEVENTLISTENER >& aListener )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: removeEventListener can also be called in the initialization phase
2010-02-22 13:31:57 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XEVENTLISTENER >*)0), aListener );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// document::XDocumentInfoSupplier
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< document::XDocumentInfo > SAL_CALL SfxBaseModel::getDocumentInfo() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
}
initial import
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
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 ( !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);
CWS-TOOLING: integrate CWS oj18 2009-08-21 15:08:49 +0200 oj r275263 : wrong check 2009-08-21 08:56:01 +0200 oj r275215 : missing not 2009-08-20 07:27:13 +0200 oj r275164 : use new method from global 2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale 2009-08-18 10:39:32 +0200 oj r275082 : missing header include 2009-08-18 10:09:44 +0200 oj r275081 : new methods at global 2009-08-18 10:09:00 +0200 oj r275080 : unused var 2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml 2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55) 2009-08-17 13:29:44 +0200 oj r275047 : compile error 2009-08-17 13:27:47 +0200 oj r275045 : compile error 2009-08-17 11:44:54 +0200 oj r275040 : add dep 2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl 2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl 2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code 2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand 2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char 2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc 2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator 2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc 2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled 2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger 2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files 2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand 2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand 2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl 2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
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;
}
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XEVENTLISTENER
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
::vos::OGuard aGuard( Application::GetSolarMutex() );
if ( impl_isDisposed() )
return;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 );
#92021#: releasing controllers
2001-09-27 09:44:57 +00:00
initial import
2000-09-18 16:07:07 +00:00
if ( xMod.is() )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XMODIFYLISTENER >*)0), xMod );
initial import
2000-09-18 16:07:07 +00:00
else if ( xListener.is() )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XEVENTLISTENER >*)0), xListener );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
else if ( xDocListener.is() )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0), xListener );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& rURL ,
const uno::Sequence< beans::PropertyValue >& rArgs )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( rURL.getLength() == 0 && rArgs.getLength() == 1 && rArgs[0].Name.equalsAscii( "SetEmbedded" ) )
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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() )
{
INTEGRATION: CWS warningfixes03_SRC680 (1.114.20); FILE MERGED 2006/08/18 15:03:42 mhu 1.114.20.1: #i68745# Fixed GCC 4.0.x warning(s).
2006-08-29 10:16:40 +00:00
sal_Bool bEmb = sal_Bool();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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;
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
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 ) )
INTEGRATION: CWS fwk02ea (1.61.24); FILE MERGED 2004/05/26 13:29:18 mav 1.61.24.3: #116711# do not let Stream parameter of MediaDescriptor be cached by Model until it is correctly handled 2004/05/26 10:10:30 mba 1.61.24.2: #116829#: don't treat binary filters as own storage format 2004/05/25 08:15:38 as 1.61.24.1: #i28652# correct typo
2004-06-10 12:32:28 +00:00
{
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
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 );
INTEGRATION: CWS fwk02ea (1.61.24); FILE MERGED 2004/05/26 13:29:18 mav 1.61.24.3: #116711# do not let Stream parameter of MediaDescriptor be cached by Model until it is correctly handled 2004/05/26 10:10:30 mba 1.61.24.2: #116829#: don't treat binary filters as own storage format 2004/05/25 08:15:38 as 1.61.24.1: #i28652# correct typo
2004-06-10 12:32:28 +00:00
}
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
sal_Bool bBreakMacroSign = sal_False;
if ( aArgs.get( "BreakMacroSignature" ) >>= bBreakMacroSign )
{
pObjectShell->BreakMacroSign_Impl( bBreakMacroSign );
INTEGRATION: CWS fwk02ea (1.61.24); FILE MERGED 2004/05/26 13:29:18 mav 1.61.24.3: #116711# do not let Stream parameter of MediaDescriptor be cached by Model until it is correctly handled 2004/05/26 10:10:30 mba 1.61.24.2: #116829#: don't treat binary filters as own storage format 2004/05/25 08:15:38 as 1.61.24.1: #i28652# correct typo
2004-06-10 12:32:28 +00:00
}
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
aArgs.remove( "WinExtent" );
aArgs.remove( "BreakMacroSignature" );
aArgs.remove( "Stream" );
aArgs.remove( "InputStream" );
writerfilter08ooo330: applied patch for writerfilter08
2010-07-28 14:17:26 +02:00
aArgs.remove( "URL" );
aArgs.remove( "Frame" );
INTEGRATION: CWS fwk55 (1.117.8); FILE MERGED 2006/10/20 10:59:37 mav 1.117.8.1: #134459# prevent reentrance problem
2006-11-07 13:53:52 +00:00
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
// TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be removed here
INTEGRATION: CWS fwk02ea (1.61.24); FILE MERGED 2004/05/26 13:29:18 mav 1.61.24.3: #116711# do not let Stream parameter of MediaDescriptor be cached by Model until it is correctly handled 2004/05/26 10:10:30 mba 1.61.24.2: #116829#: don't treat binary filters as own storage format 2004/05/25 08:15:38 as 1.61.24.1: #i28652# correct typo
2004-06-10 12:32:28 +00:00
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
m_pData->m_seqArguments = aArgs.getPropertyValues();
INTEGRATION: CWS fwk02ea (1.61.24); FILE MERGED 2004/05/26 13:29:18 mav 1.61.24.3: #116711# do not let Stream parameter of MediaDescriptor be cached by Model until it is correctly handled 2004/05/26 10:10:30 mba 1.61.24.2: #116829#: don't treat binary filters as own storage format 2004/05/25 08:15:38 as 1.61.24.1: #i28652# correct typo
2004-06-10 12:32:28 +00:00
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
SfxMedium* pMedium = pObjectShell->GetMedium();
if ( pMedium )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
{
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
SfxAllItemSet aSet( pObjectShell->GetPool() );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
TransformParameters( SID_OPENDOC, rArgs, aSet );
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
writerfilter08ooo330: applied patch for writerfilter08
2010-07-28 14:17:26 +02:00
// the arguments are not allowed to reach the medium
aSet.ClearItem( SID_FILE_NAME );
aSet.ClearItem( SID_FILLFRAME );
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
pMedium->GetItemSet()->Put( aSet );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, sal_False );
if ( pItem )
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
pMedium->SetFilter(
pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( pItem->GetValue() ) );
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
SFX_ITEMSET_ARG( &aSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False );
if ( pTitleItem )
{
[CWS autorecovery] #i65597# moved creation of new documents from application to loader The loader was the only client of the respective application code, and needs to have better control over the document creation process. In the course of this move, some dead/duplicate/obsolete code has been removed.
2009-11-25 09:34:02 +01:00
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pObjectShell );
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
if ( pFrame )
pFrame->UpdateTitle();
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
return sal_True ;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::rtl::OUString SAL_CALL SfxBaseModel::getURL() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
return m_pData->m_sURL ;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< beans::PropertyValue > seqArgsNew;
uno::Sequence< beans::PropertyValue > seqArgsOld;
MWS_SRX644: migrate branch mws_srx644 -> HEAD
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();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
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();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
seqArgsNew.realloc( ++nNewLength );
seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "WinExtent" );
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
if ( m_pData->m_aPreusedFilterName.getLength() )
{
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
seqArgsNew.realloc( ++nNewLength );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "PreusedFilterName" );
seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName;
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
INTEGRATION: CWS docking1 (1.64.4); FILE MERGED 2004/06/23 15:20:01 mba 1.64.4.2: Provide document border size before resizing (needed for InPlace mode) 2004/06/20 20:05:08 cd 1.64.4.1: #i30169# Use new image manager implementation and new layout manager methods
2004-07-06 12:36:40 +00:00
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell );
if ( pFrame )
{
SvBorder aBorder = pFrame->GetBorderPixelImpl( pFrame->GetViewShell() );
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
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();
INTEGRATION: CWS docking1 (1.64.4); FILE MERGED 2004/06/23 15:20:01 mba 1.64.4.2: Provide document border size before resizing (needed for InPlace mode) 2004/06/20 20:05:08 cd 1.64.4.1: #i30169# Use new image manager implementation and new layout manager methods
2004-07-06 12:36:40 +00:00
seqArgsNew.realloc( ++nNewLength );
seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "DocumentBorder" );
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq;
INTEGRATION: CWS docking1 (1.64.4); FILE MERGED 2004/06/23 15:20:01 mba 1.64.4.2: Provide document border size before resizing (needed for InPlace mode) 2004/06/20 20:05:08 cd 1.64.4.1: #i30169# Use new image manager implementation and new layout manager methods
2004-07-06 12:36:40 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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;
MWS_SRX644: migrate branch mws_srx644 -> HEAD
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 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
seqArgsNew[ nNewLength - 1 ] = m_pData->m_seqArguments[nOrg];
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aFinalCache.realloc( ++nFinalLength );
aFinalCache[ nFinalLength - 1 ] = m_pData->m_seqArguments[nOrg];
}
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
m_pData->m_seqArguments = aFinalCache;
return seqArgsNew;
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
return m_pData->m_seqArguments;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::connectController( const uno::Reference< frame::XController >& xController )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
OSL_PRECOND( xController.is(), "SfxBaseModel::connectController: invalid controller!" );
if ( !xController.is() )
return;
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
initial import
2000-09-18 16:07:07 +00:00
sal_uInt32 nOldCount = m_pData->m_seqControllers.getLength();
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< uno::Reference< frame::XController > > aNewSeq( nOldCount + 1 );
initial import
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;
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
if ( m_pData->m_seqControllers.getLength() == 1 )
{
SfxViewFrame* pViewFrame = SfxViewFrame::Get( xController, GetObjectShell() );
ENSURE_OR_THROW( pViewFrame, "SFX document without SFX view!?" );
pViewFrame->UpdateDocument_Impl();
const String sDocumentURL = GetObjectShell()->GetMedium()->GetName();
if ( sDocumentURL.Len() )
SFX_APP()->Broadcast( SfxStringHint( SID_OPENURL, sDocumentURL ) );
}
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
initial import
2000-09-18 16:07:07 +00:00
sal_uInt32 nOldCount = m_pData->m_seqControllers.getLength();
#83911#: check ControllerCount
2001-04-27 09:20:41 +00:00
if ( !nOldCount )
return;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< uno::Reference< frame::XController > > aNewSeq( nOldCount - 1 );
initial import
2000-09-18 16:07:07 +00:00
for ( sal_uInt32 nOld = 0, nNew = 0; nOld < nOldCount; ++nOld )
#92021#: releasing controllers
2001-09-27 09:44:57 +00:00
{
initial import
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;
}
#92021#: releasing controllers
2001-09-27 09:44:57 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
m_pData->m_seqControllers = aNewSeq;
if ( xController == m_pData->m_xCurrent )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_xCurrent = uno::Reference< frame::XController > ();
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel::lockControllers() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
++m_pData->m_nControllerLockCount ;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
void SAL_CALL SfxBaseModel::unlockControllers() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
--m_pData->m_nControllerLockCount ;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
return ( m_pData->m_nControllerLockCount != 0 ) ;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
#79614#: don't use current viewframe
2000-10-19 16:04:52 +00:00
// get the last active controller of this model
initial import
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;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::setCurrentController( const uno::Reference< frame::XController >& xCurrentController )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
m_pData->m_xCurrent = xCurrentController;
}
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// frame::XModel
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< uno::XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< uno::XInterface > xReturn;
uno::Reference< frame::XController > xController = getCurrentController() ;
initial import
2000-09-18 16:07:07 +00:00
if ( xController.is() )
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< view::XSelectionSupplier > xDocView( xController, uno::UNO_QUERY );
initial import
2000-09-18 16:07:07 +00:00
if ( xDocView.is() )
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Any xSel = xDocView->getSelection();
initial import
2000-09-18 16:07:07 +00:00
xSel >>= xReturn ;
}
}
return xReturn ;
}
INTEGRATION: CWS mav21 (1.120.20); FILE MERGED 2007/05/09 16:49:26 mav 1.120.20.3: RESYNC: (1.120-1.122); FILE MERGED 2006/12/13 14:24:21 mav 1.120.20.2: #i55790# fix modified state control 2006/12/05 15:17:22 mav 1.120.20.1: #i55790# allow more control over modified state
2007-06-26 15:10:07 +00:00
//________________________________________________________________________________________________________
// XModifiable2
//________________________________________________________________________________________________________
sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (::com::sun::star::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav21 (1.120.20); FILE MERGED 2007/05/09 16:49:26 mav 1.120.20.3: RESYNC: (1.120-1.122); FILE MERGED 2006/12/13 14:24:21 mav 1.120.20.2: #i55790# fix modified state control 2006/12/05 15:17:22 mav 1.120.20.1: #i55790# allow more control over modified state
2007-06-26 15:10:07 +00:00
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav21 (1.120.20); FILE MERGED 2007/05/09 16:49:26 mav 1.120.20.3: RESYNC: (1.120-1.122); FILE MERGED 2006/12/13 14:24:21 mav 1.120.20.2: #i55790# fix modified state control 2006/12/05 15:17:22 mav 1.120.20.1: #i55790# allow more control over modified state
2007-06-26 15:10:07 +00:00
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav21 (1.120.20); FILE MERGED 2007/05/09 16:49:26 mav 1.120.20.3: RESYNC: (1.120-1.122); FILE MERGED 2006/12/13 14:24:21 mav 1.120.20.2: #i55790# fix modified state control 2006/12/05 15:17:22 mav 1.120.20.1: #i55790# allow more control over modified state
2007-06-26 15:10:07 +00:00
if ( !m_pData->m_pObjectShell.Is() )
throw uno::RuntimeException();
return m_pData->m_pObjectShell->IsEnableSetModified();
}
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel::isModified() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsModified() : sal_False;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
initial import
2000-09-18 16:07:07 +00:00
m_pData->m_pObjectShell->SetModified(bModified);
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addModifyListener(const uno::Reference< XMODIFYLISTENER >& xListener) throw( uno::RuntimeException )
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< XMODIFYLISTENER >*)0),xListener );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XModifiable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::removeModifyListener(const uno::Reference< XMODIFYLISTENER >& xListener) throw( uno::RuntimeException )
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XMODIFYLISTENER >*)0), xListener );
initial import
2000-09-18 16:07:07 +00:00
}
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
//____________________________________________________________________________________________________
// XCloseable
//____________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
{
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
static ::rtl::OUString MSG_1 = ::rtl::OUString::createFromAscii("Cant close while saving.");
autorecovery: silently survice a close call when we're already disposed - there might be legacy code not expecting the DisposedException
2010-02-22 11:25:52 +01:00
::vos::OGuard aGuard( Application::GetSolarMutex() );
if ( impl_isDisposed() || m_pData->m_bClosed || m_pData->m_bClosing )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
return;
#88560#: implementation for XCloseable
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();
}
}
}
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
if ( m_pData->m_bSaving )
{
if (bDeliverOwnership)
m_pData->m_bSuicide = sal_True;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw util::CloseVetoException(
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
MSG_1,
static_cast< ::com::sun::star::util::XCloseable* >(this));
}
#88560#: implementation for XCloseable
2002-10-24 11:12:32 +00:00
// no own objections against closing!
#109351#: avoid recursions in close
2003-05-05 15:27:50 +00:00
m_pData->m_bClosing = sal_True;
#88560#: implementation for XCloseable
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();
}
}
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
m_pData->m_bClosed = sal_True;
#109351#: avoid recursions in close
2003-05-05 15:27:50 +00:00
m_pData->m_bClosing = sal_False;
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
#88560#: implementation for XCloseable
2002-10-24 11:12:32 +00:00
dispose();
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
}
//____________________________________________________________________________________________________
// XCloseBroadcaster
//____________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addCloseListener( const uno::Reference< XCLOSELISTENER >& xListener ) throw (uno::RuntimeException)
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
#88560#: implementation for XCloseable
2002-10-24 11:12:32 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< XCLOSELISTENER >*)0), xListener );
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
}
//____________________________________________________________________________________________________
// XCloseBroadcaster
//____________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::removeCloseListener( const uno::Reference< XCLOSELISTENER >& xListener ) throw (uno::RuntimeException)
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
#88560#: implementation for XCloseable
2002-10-24 11:12:32 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XCLOSELISTENER >*)0), xListener );
#97426# prepare model for further coming XCloseable
2002-04-08 10:28:17 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// XPrintable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper() )
return m_pData->m_xPrintable->getPrinter();
else
return uno::Sequence< beans::PropertyValue >();
INTEGRATION: CWS draw9 (1.39.4.3.28); FILE MERGED 2003/04/14 16:35:08 af 1.39.4.3.28.2: RESYNC: (1.40-1.42); FILE MERGED 2003/03/26 16:30:12 oj 1.39.4.3.28.1: #107472# new method to separate the setprinter call for draw
2003-04-24 13:33:42 +00:00
}
#96772#: wait for setting printer if printer is printing
2002-07-19 14:52:12 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter)
INTEGRATION: CWS draw9 (1.39.4.3.28); FILE MERGED 2003/04/14 16:35:08 af 1.39.4.3.28.2: RESYNC: (1.40-1.42); FILE MERGED 2003/03/26 16:30:12 oj 1.39.4.3.28.1: #107472# new method to separate the setprinter call for draw
2003-04-24 13:33:42 +00:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper() )
m_pData->m_xPrintable->setPrinter( rPrinter );
initial import
2000-09-18 16:07:07 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::print(const uno::Sequence< beans::PropertyValue >& rOptions)
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
if ( impl_getPrintHelper() )
m_pData->m_xPrintable->print( rOptions );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->HasName() : sal_False;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::rtl::OUString SAL_CALL SfxBaseModel::getLocation() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
#92075#: exception specification
2001-09-12 15:12:30 +00:00
sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsReadOnly() : sal_True;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
2004-11-26 15:16:51 +00:00
// XStorable2
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::storeSelf( const uno::Sequence< beans::PropertyValue >& aSeqArgs )
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
2004-11-26 15:16:51 +00:00
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException )
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS perform03 (1.91.2); FILE MERGED 2005/04/20 07:46:08 mt 1.91.2.2: RESYNC: (1.91-1.92); FILE MERGED 2005/04/20 07:17:14 mt 1.91.2.1: #i47755# RTL_LOGFILE_PRODUCT_* for logs in release versions...
2005-04-22 10:27:19 +00:00
RTL_LOGFILE_PRODUCT_CONTEXT( aPerfLog, "PERFORMANCE - SfxBaseModel::storeSelf" );
INTEGRATION: CWS perform01 (1.81.12); FILE MERGED 2005/02/07 16:29:05 mt 1.81.12.1: #i40901# More RTL_LOG
2005-02-16 15:35:35 +00:00
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
initial import
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" ) ) );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
INTEGRATION: CWS olefix (1.90.4); FILE MERGED 2005/04/13 13:02:13 mav 1.90.4.1: #120637# disable vcl window during saving
2005-04-18 13:39:50 +00:00
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
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" ) ) ) )
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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();
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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 );
}
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
2004-11-26 15:16:51 +00:00
}
SfxAllItemSet *pParams = new SfxAllItemSet( SFX_APP()->GetPool() );
TransformParameters( SID_SAVEDOC, aSeqArgs, *pParams );
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOC, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOC), m_pData->m_pObjectShell ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
#104746#: OLE objects in flat XML files need to be saved after loading
2002-11-05 07:10:15 +00:00
if ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 )
{
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
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
INTEGRATION: CWS sb59 (1.113.14); FILE MERGED 2006/08/18 19:22:49 sb 1.113.14.2: RESYNC: (1.113-1.114); FILE MERGED 2006/08/16 09:31:23 sb 1.113.14.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 14:56:47 +00:00
bRet = m_pData->m_pObjectShell->DoSave()
&& m_pData->m_pObjectShell->DoSaveCompleted();
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
else
{
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
2004-11-26 15:16:51 +00:00
bRet = m_pData->m_pObjectShell->Save_Impl( pParams );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
#104746#: OLE objects in flat XML files need to be saved after loading
2002-11-05 07:10:15 +00:00
}
else
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
2004-11-26 15:16:51 +00:00
bRet = m_pData->m_pObjectShell->Save_Impl( pParams );
DELETEZ( pParams );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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." ) ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl();
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCDONE), m_pData->m_pObjectShell ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
else
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
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
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCFAILED, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCFAILED), m_pData->m_pObjectShell ) );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nErrCode );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
}
INTEGRATION: CWS cd03 (1.72.4); FILE MERGED 2004/11/17 17:32:34 mav 1.72.4.1: #i37232# allow to provide some arguments on save operation
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 >() );
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::storeAsURL( const ::rtl::OUString& rURL ,
const uno::Sequence< beans::PropertyValue >& rArgs )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
INTEGRATION: CWS perform03 (1.91.2); FILE MERGED 2005/04/20 07:46:08 mt 1.91.2.2: RESYNC: (1.91-1.92); FILE MERGED 2005/04/20 07:17:14 mt 1.91.2.1: #i47755# RTL_LOGFILE_PRODUCT_* for logs in release versions...
2005-04-22 10:27:19 +00:00
RTL_LOGFILE_PRODUCT_CONTEXT( aPerfLog, "PERFORMANCE - SfxBaseModel::storeAsURL" );
INTEGRATION: CWS perform01 (1.81.12); FILE MERGED 2005/02/07 16:29:05 mt 1.81.12.1: #i40901# More RTL_LOG
2005-02-16 15:35:35 +00:00
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
initial import
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" ) ) );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
impl_store( rURL, rArgs, sal_False );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< beans::PropertyValue > aSequence ;
initial import
2000-09-18 16:07:07 +00:00
TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence );
attachResource( rURL, aSequence );
}
}
//________________________________________________________________________________________________________
// XStorable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& rURL ,
const uno::Sequence< beans::PropertyValue >& rArgs )
#92075#: exception specification
2001-09-12 15:12:30 +00:00
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
initial import
2000-09-18 16:07:07 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
initial import
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" ) ) );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
impl_store( rURL, rArgs, sal_True );
initial import
2000-09-18 16:07:07 +00:00
}
}
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException )
{
SfxModelGuard aGuard( *this );
return m_pData->m_bModifiedSinceLastSave;
}
autorecovery: saveToRecoveryFile => storeToRecoveryFile
2010-01-29 15:38:20 +01:00
void SAL_CALL SfxBaseModel::storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
{
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
SfxModelGuard aGuard( *this );
// delegate
SfxSaveGuard aSaveGuard( this, m_pData, sal_False );
impl_store( i_TargetLocation, i_MediaDescriptor, sal_True );
autorecovery: saveToRecoveryFile => storeToRecoveryFile
2010-01-29 15:38:20 +01:00
// no need for subsequent calls to storeToRecoveryFile, unless we're modified, again
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
m_pData->m_bModifiedSinceLastSave = sal_False;
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
}
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
void SAL_CALL SfxBaseModel::recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
{
recoverFromFile is allowed (required, strictly) in the initialization phase
2010-01-22 15:58:17 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
// delegate to our "load" method
::comphelper::NamedValueCollection aMediaDescriptor( i_MediaDescriptor );
// our load implementation expects the SalvagedFile to be in the media descriptor
OSL_ENSURE( !aMediaDescriptor.has( "SalvagedFile" ) || ( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) == i_SalvagedFile ),
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
"SfxBaseModel::recoverFromFile: inconsistent information!" );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
aMediaDescriptor.put( "SalvagedFile", i_SalvagedFile );
// similar for the to-be-loaded file
OSL_ENSURE( !aMediaDescriptor.has( "URL" ) || ( aMediaDescriptor.getOrDefault( "URL", ::rtl::OUString() ) == i_SourceLocation ),
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
"SfxBaseModel::recoverFromFile: inconsistent information!" );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
aMediaDescriptor.put( "URL", i_SourceLocation );
load( aMediaDescriptor.getPropertyValues() );
autorecovery: move the responsibility for calling attachResource into recoverFromFile. This saves us from some problems with SFX-based documents, which change there Args during the load process (during macro confirmation), so a later attachResource from outside would overwrite those changed args
2010-01-28 22:19:50 +01:00
// Note: The XDocumentRecovery interface specification requires us to do an attachResource after loading.
// However, we will not do this here, as we know that our load implementation (respectively some method
// called from there) already did so.
// In particular, the load process might already have modified some elements of the media
// descriptor, for instance the MacroExecMode (in case the user was involved to decide about it), and we do
// not want to overwrite it with the "old" elements passed to this method here.
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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)
{
autorecovery: silently survice a close call when we're already disposed - there might be legacy code not expecting the DisposedException
2010-02-22 11:25:52 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
if ( IsInitialized() )
throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), *this );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nErrCode );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
}
//________________________________________________________________________________________________________
// XLoadable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::load( const uno::Sequence< beans::PropertyValue >& seqArguments )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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)
{
autorecovery: allow creating SFX-based documents which do not support the XDocumentRecovery interface For this purpose, the SFX document factory methods got an additional parameter respectively flag ("DocumentRecoverySupport" resp. SFXMODEL_DISABLE_DOCUMENT_RECOVERY). This flag is used by database documents to remove the interface from sub documents (aka forms/reports). In this course, some of the functionality around those SFXMODELL_* flags, previously duplicated in all applications, has been consolidated into a new SfxObjectShell constructor.
2010-01-06 21:34:53 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
if ( IsInitialized() )
throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), *this );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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() )
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
// if a Medium is present, the document is already initialized
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
throw DOUBLEINITIALIZATIONEXCEPTION();
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if( pFilterNameItem )
aFilterName = pFilterNameItem->GetValue();
INTEGRATION: CWS readstorage (1.54.4); FILE MERGED 2004/01/16 15:06:16 mav 1.54.4.3: #111154# adopt fix for changes 2004/01/15 18:23:21 mav 1.54.4.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/14 14:32:37 mav 1.54.4.1: #111154# introduce fix to SRC680
2004-02-03 17:10:05 +00:00
if( !m_pData->m_pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) )
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
{
// filtername is not valid
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
delete pMedium;
throw frame::IllegalArgumentIOException();
INTEGRATION: CWS perform06 (1.101.6); FILE MERGED 2005/10/27 12:54:16 mav 1.101.6.1: #120150# the temporary file from crashrecovery is not owned by document
2005-11-11 08:06:33 +00:00
}
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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 );
//}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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;
INTEGRATION: CWS fwk80_SRC680 (1.131.14); FILE MERGED 2008/01/24 07:53:28 pb 1.131.14.3: RESYNC: (1.131-1.131.26.1); FILE MERGED 2008/01/16 07:29:31 mav 1.131.14.2: #i84941# allow to use interaction handler if the document has one 2008/01/04 11:49:55 mav 1.131.14.1: #i81702# disconnect from template after the loading has finished
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();
//
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
// QUESTION: if the following happens outside of DoLoad, something important is missing there!
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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 );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE );
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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 ) );
INTEGRATION: CWS mav16 (1.81.16); FILE MERGED 2005/02/15 14:12:21 mav 1.81.16.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/10 14:09:57 mav 1.81.16.1: #i41809# treat documents without manifest.xml as broken documents
2005-02-25 08:36:50 +00:00
INTEGRATION: CWS mav17 (1.82.36); FILE MERGED 2005/03/02 19:03:08 mav 1.82.36.2: RESYNC: (1.82-1.85); FILE MERGED 2005/03/01 09:06:46 mav 1.82.36.1: #i23531# improve document repairing
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();
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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;
INTEGRATION: CWS fwk83_SRC680 (1.131.26.1.6); FILE MERGED 2008/01/24 12:01:43 mav 1.131.26.1.6.1: #i85334# do not ignore warnings from SfxMedium
2008-02-05 11:32:29 +00:00
if( bSalvage )
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
{
INTEGRATION: CWS fwk83_SRC680 (1.131.26.1.6); FILE MERGED 2008/01/24 12:01:43 mav 1.131.26.1.6.1: #i85334# do not ignore warnings from SfxMedium
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);
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS fwk83_SRC680 (1.131.26.1.6); FILE MERGED 2008/01/24 12:01:43 mav 1.131.26.1.6.1: #i85334# do not ignore warnings from SfxMedium
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();
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
}
if ( !nError )
nError = pMedium->GetError();
INTEGRATION: CWS fwk83_SRC680 (1.131.26.1.6); FILE MERGED 2008/01/24 12:01:43 mav 1.131.26.1.6.1: #i85334# do not ignore warnings from SfxMedium
2008-02-05 11:32:29 +00:00
m_pData->m_pObjectShell->ResetError();
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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();
INTEGRATION: CWS calc25 (1.70.12); FILE MERGED 2004/11/04 17:36:02 nn 1.70.12.2: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 14:48:49 nn 1.70.12.1: #i30711# load: don't throw an exception if the ErrorCode is a warning
2004-11-15 15:43:10 +00:00
BOOL bWarning = ((nError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
if ( nError != ERRCODE_IO_BROKENPACKAGE && !bSilent )
{
// broken package was handled already
INTEGRATION: CWS fwk64 (1.120.98); FILE MERGED 2007/03/26 12:28:52 mav 1.120.98.2: #i69640# fix some errors and warnings, let them be handled by interaction handler 2007/03/16 08:57:40 mav 1.120.98.1: #108296# set the correct error context
2007-04-19 08:29:27 +00:00
if ( SfxObjectShell::UseInteractionToHandleError( xHandler, nError ) && !bWarning )
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
{
INTEGRATION: CWS fwk64 (1.120.98); FILE MERGED 2007/03/26 12:28:52 mav 1.120.98.2: #i69640# fix some errors and warnings, let them be handled by interaction handler 2007/03/16 08:57:40 mav 1.120.98.1: #108296# set the correct error context
2007-04-19 08:29:27 +00:00
// abort loading (except for warnings)
nError = ERRCODE_IO_ABORT;
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
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;
}
INTEGRATION: CWS calc25 (1.70.12); FILE MERGED 2004/11/04 17:36:02 nn 1.70.12.2: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 14:48:49 nn 1.70.12.1: #i30711# load: don't throw an exception if the ErrorCode is a warning
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 );
}
INTEGRATION: CWS loadenv01 (1.59.10); FILE MERGED 2004/03/12 14:44:33 mba 1.59.10.1: #115936#: remove SfxLoadEnvironment
2004-04-22 12:25:05 +00:00
}
[CWS autorecovery] further streamlined the SFX frame loader's load method
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
}
//________________________________________________________________________________________________________
// XTransferable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
throw (::com::sun::star::datatransfer::UnsupportedFlavorException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Any aAny;
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() )
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
aDesc.mnViewAspect = sal::static_int_cast< sal_uInt16 >( embed::Aspects::MSOLE_CONTENT );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
storeToURL( aTmp.GetURL(), uno::Sequence < beans::PropertyValue >() );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( pMetaFile )
{
SvMemoryStream aMemStm( 65535, 65535 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aMemStm.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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 );
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
2006-03-24 12:17:41 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( pStream )
{
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 ) );
}
}
}
INTEGRATION: CWS graphicapi (1.64.14); FILE MERGED 2004/06/03 08:37:10 mav 1.64.14.1: #i27850# thumbnail storing
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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() ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
}
else
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( pStream )
{
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 ) );
}
}
}
INTEGRATION: CWS graphicapi (1.64.14); FILE MERGED 2004/06/03 08:37:10 mav 1.64.14.1: #i27850# thumbnail storing
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
}
else
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
if ( pStream )
{
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
INTEGRATION: CWS as01 (1.55.36); FILE MERGED 2004/02/16 12:29:05 as 1.55.36.2: RESYNC: (1.55-1.57); FILE MERGED 2004/02/10 14:10:07 as 1.55.36.1: #115339# correct if/else list of statements
2004-02-26 09:41:27 +00:00
else if ( aFlavor.MimeType.equalsAscii( "image/png" ) )
INTEGRATION: CWS mav07 (1.51.36); FILE MERGED 2003/12/16 09:58:55 mav 1.51.36.3: RESYNC: (1.52-1.54); FILE MERGED 2003/10/28 10:35:57 mav 1.51.36.2: RESYNC: (1.51-1.52); FILE MERGED 2003/10/21 11:27:16 mav 1.51.36.1: #112739# provide png representation
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 );
INTEGRATION: CWS mav07 (1.51.36); FILE MERGED 2003/12/16 09:58:55 mav 1.51.36.3: RESYNC: (1.52-1.54); FILE MERGED 2003/10/28 10:35:57 mav 1.51.36.2: RESYNC: (1.51-1.52); FILE MERGED 2003/10/21 11:27:16 mav 1.51.36.1: #112739# provide png representation
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 ) );
INTEGRATION: CWS mav07 (1.51.36); FILE MERGED 2003/12/16 09:58:55 mav 1.51.36.3: RESYNC: (1.52-1.54); FILE MERGED 2003/10/28 10:35:57 mav 1.51.36.2: RESYNC: (1.51-1.52); FILE MERGED 2003/10/21 11:27:16 mav 1.51.36.1: #112739# provide png representation
2004-01-06 07:58:48 +00:00
if ( pStream )
{
INTEGRATION: CWS dba22 (1.73.12); FILE MERGED 2005/01/19 19:46:35 fs 1.73.12.4: RESYNC: (1.76-1.77); FILE MERGED 2005/01/07 08:31:28 oj 1.73.12.3: RESYNC: (1.73-1.76); FILE MERGED 2004/12/09 17:42:59 mav 1.73.12.2: #i33930# change the title in the frame if requested 2004/12/09 13:20:40 oj 1.73.12.1: fix for possible crash when getting a preview
2005-01-21 16:34:23 +00:00
pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
INTEGRATION: CWS mav07 (1.51.36); FILE MERGED 2003/12/16 09:58:55 mav 1.51.36.3: RESYNC: (1.52-1.54); FILE MERGED 2003/10/28 10:35:57 mav 1.51.36.2: RESYNC: (1.51-1.52); FILE MERGED 2003/10/21 11:27:16 mav 1.51.36.1: #112739# provide png representation
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav07 (1.51.36); FILE MERGED 2003/12/16 09:58:55 mav 1.51.36.3: RESYNC: (1.52-1.54); FILE MERGED 2003/10/28 10:35:57 mav 1.51.36.2: RESYNC: (1.51-1.52); FILE MERGED 2003/10/21 11:27:16 mav 1.51.36.1: #112739# provide png representation
2004-01-06 07:58:48 +00:00
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
else
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw datatransfer::UnsupportedFlavorException();
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
return aAny;
}
//________________________________________________________________________________________________________
// XTransferable
//________________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< DATAFLAVOR > SAL_CALL SfxBaseModel::getTransferDataFlavors()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
throw (::com::sun::star::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
2006-03-24 12:17:41 +00:00
sal_Int32 nSuppFlavors = GraphicHelper::supportsMetaFileHandle_Impl() ? 10 : 8;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence< DATAFLAVOR > aFlavorSeq( nSuppFlavors );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
aFlavorSeq[0].MimeType =
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 =
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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" ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[2].MimeType =
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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" ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aFlavorSeq[3].MimeType =
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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" ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
aFlavorSeq[4].MimeType =
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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)" ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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 )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
{
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
2006-03-24 12:17:41 +00:00
aFlavorSeq[8].MimeType =
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
2006-03-24 12:17:41 +00:00
aFlavorSeq[9].MimeType =
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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 );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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;
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
INTEGRATION: CWS graphicapi (1.64.14); FILE MERGED 2004/06/03 08:37:10 mav 1.64.14.1: #i27850# thumbnail storing
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
&& aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
return sal_True;
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
else if ( aFlavor.MimeType.equalsAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) )
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
INTEGRATION: CWS graphicapi (1.64.14); FILE MERGED 2004/06/03 08:37:10 mav 1.64.14.1: #i27850# thumbnail storing
2004-06-11 08:47:05 +00:00
else if ( GraphicHelper::supportsMetaFileHandle_Impl()
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
&& aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
return sal_True;
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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\"" ) )
INTEGRATION: CWS fwk33 (1.105.6); FILE MERGED 2006/03/09 13:50:51 mav 1.105.6.4: RESYNC: (1.105-1.106); FILE MERGED 2006/02/10 13:19:39 mav 1.105.6.3: #i46838# allow to retrieve HC-representation 2006/02/10 12:01:13 mav 1.105.6.2: #i46838# allow to retrieve HC-representation 2006/02/08 10:18:42 mav 1.105.6.1: #i58677# disconnect from original template file
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" ) )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
return sal_True;
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
return sal_False;
}
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
//--------------------------------------------------------------------------------------------------------
// XEventsSupplier
//--------------------------------------------------------------------------------------------------------
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( uno::RuntimeException )
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
#76800# Added XEventsSupplier interface
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;
}
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
//--------------------------------------------------------------------------------------------------------
// XEmbeddedScripts
//--------------------------------------------------------------------------------------------------------
uno::Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
if ( m_pData->m_pObjectShell )
INTEGRATION: CWS fwk80_SRC680 (1.131.14); FILE MERGED 2008/01/24 07:53:28 pb 1.131.14.3: RESYNC: (1.131-1.131.26.1); FILE MERGED 2008/01/16 07:29:31 mav 1.131.14.2: #i84941# allow to use interaction handler if the document has one 2008/01/04 11:49:55 mav 1.131.14.1: #i81702# disconnect from template after the loading has finished
2008-01-29 14:29:24 +00:00
return m_pData->m_pObjectShell->AdjustMacroMode( String(), false );
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
return sal_False;
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
//--------------------------------------------------------------------------------------------------------
// XScriptInvocationContext
//--------------------------------------------------------------------------------------------------------
Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
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;
}
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
//--------------------------------------------------------------------------------------------------------
// XEventBroadcaster
//--------------------------------------------------------------------------------------------------------
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addEventListener( const uno::Reference< XDOCEVENTLISTENER >& aListener ) throw( uno::RuntimeException )
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0), aListener );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
}
//--------------------------------------------------------------------------------------------------------
// XEventBroadcaster
//--------------------------------------------------------------------------------------------------------
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::removeEventListener( const uno::Reference< XDOCEVENTLISTENER >& aListener ) throw( uno::RuntimeException )
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0), aListener );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
//________________________________________________________________________________________________________
// SfxListener
//________________________________________________________________________________________________________
#96032#: update arguments after save
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();
INTEGRATION: CWS ooo20031110 (1.52.12); FILE MERGED 2003/11/11 12:01:16 waratah 1.52.12.1: #i22301# Correct for scoping rules
2003-12-01 17:24:28 +00:00
sal_Int32 nArg;
for ( nArg = 0; nArg < nCount; nArg++ )
#96032#: update arguments after save
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;
}
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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();
}
}
}
}
}
initial import
2000-09-18 16:07:07 +00:00
void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
const SfxHint& rHint )
{
avoid crash if Notification arrives after dispose
2003-04-28 12:31:20 +00:00
if ( !m_pData )
return;
initial import
2000-09-18 16:07:07 +00:00
if ( &rBC == m_pData->m_pObjectShell )
{
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
SfxSimpleHint* pSimpleHint = PTR_CAST( SfxSimpleHint, &rHint );
if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DOCCHANGED )
initial import
2000-09-18 16:07:07 +00:00
changing();
#86233# ::Notify: adjust m_pData->m_sURL in case of the SaveAsDocDone event
2001-04-24 15:38:13 +00:00
#96032#: update arguments after save
2001-12-17 10:10:21 +00:00
SfxEventHint* pNamedHint = PTR_CAST( SfxEventHint, &rHint );
if ( pNamedHint )
#91174#: some changes for proper title settings
2001-10-11 11:31:39 +00:00
{
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
switch ( pNamedHint->GetEventId() )
{
case SFX_EVENT_STORAGECHANGED:
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
#i38373#, #i38471#, #i38386# forget storages on reload
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
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
// other events are used to detect storage change
// NotifyStorageListeners_Impl();
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
INTEGRATION: CWS mav15 (1.76.44); FILE MERGED 2005/01/21 15:11:04 mav 1.76.44.3: #119160# embedded document can have no own configuration 2005/01/17 14:52:41 mav 1.76.44.2: RESYNC: (1.76-1.77); FILE MERGED 2005/01/13 09:47:41 mav 1.76.44.1: #i40469# no need to change the creation mode
2005-01-31 08:15:48 +00:00
if ( m_pData->m_xUIConfigurationManager.is()
&& m_pData->m_pObjectShell->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xConfigStorage;
#i38373#, #i38471#, #i38386# forget storages on reload
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
Reference< ui::XUIConfigurationStorage > xUIConfigStorage( m_pData->m_xUIConfigurationManager, uno::UNO_QUERY );
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
xUIConfigStorage->setStorage( xConfigStorage );
}
INTEGRATION: CWS mav19 (1.103.6); FILE MERGED 2005/11/24 15:02:20 mav 1.103.6.2: #126228# improve storing of own objects inserted from file 2005/11/23 16:45:56 mav 1.103.6.1: #i58357# Use storage change notification
2006-02-01 18:11:59 +00:00
else
{
OSL_ENSURE( sal_False, "Unexpected scenario!\n" );
}
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
}
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
ListenForStorage_Impl( m_pData->m_pObjectShell->GetStorage() );
}
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
break;
case SFX_EVENT_LOADFINISHED:
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
{
CWS-TOOLING: integrate CWS cmcfixes57 2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes 2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings 2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings 2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings 2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts 2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends 2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
2009-04-23 12:23:13 +00:00
impl_getPrintHelper();
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
ListenForStorage_Impl( m_pData->m_pObjectShell->GetStorage() );
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
m_pData->m_bModifiedSinceLastSave = sal_False;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
break;
case SFX_EVENT_SAVEASDOCDONE:
#91174#: some changes for proper title settings
2001-10-11 11:31:39 +00:00
{
#96032#: update arguments after save
2001-12-17 10:10:21 +00:00
m_pData->m_sURL = m_pData->m_pObjectShell->GetMedium()->GetName();
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
#96032#: update arguments after save
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 );
#91174#: some changes for proper title settings
2001-10-11 11:31:39 +00:00
}
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
break;
case SFX_EVENT_DOCCREATED:
CWS-TOOLING: integrate CWS cmcfixes57 2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes 2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings 2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings 2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings 2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts 2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends 2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
2009-04-23 12:23:13 +00:00
{
impl_getPrintHelper();
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
m_pData->m_bModifiedSinceLastSave = sal_False;
}
break;
case SFX_EVENT_MODIFYCHANGED:
{
m_pData->m_bModifiedSinceLastSave = isModified();
}
break;
CWS-TOOLING: integrate CWS cmcfixes57 2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes 2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings 2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings 2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings 2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts 2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends 2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
2009-04-23 12:23:13 +00:00
}
#91174#: some changes for proper title settings
2001-10-11 11:31:39 +00:00
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
postEvent_Impl( pNamedHint->GetEventName() );
#91174#: some changes for proper title settings
2001-10-11 11:31:39 +00:00
}
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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 );
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_TITLECHANGED ) );
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
if ( pSimpleHint->GetId() == SFX_HINT_MODECHANGED )
{
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_MODECHANGED ) );
INTEGRATION: CWS basmgr03 (1.127.4); FILE MERGED 2007/08/24 20:11:25 fs 1.127.4.4: RESYNC: (1.127-1.129); FILE MERGED 2007/07/31 08:55:24 fs 1.127.4.3: #i73331# UNO event for SFX_HINT_MODECHANGED 2007/07/27 20:41:04 fs 1.127.4.2: #i73331# +XEmbeddedScripts 2007/07/26 12:35:27 fs 1.127.4.1: copying the fix for #i79962# herein
2007-10-09 14:32:54 +00:00
}
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
/*
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
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();
}
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
*/
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
}
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
void SfxBaseModel::NotifyModifyListeners_Impl() const
{
::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const uno::Reference< XMODIFYLISTENER >*)0) );
if ( pIC )
{
lang::EventObject aEvent( (frame::XModel *)this );
pIC->notifyEach( &util::XModifyListener::modified, aEvent );
}
autorecovery: NotifyModifyListeners_Impl is called to generously, ensure that m_bModifiedSinceLastSave is properly set
2010-01-28 15:31:27 +01:00
// this notification here is done too generously, we cannot simply assume that we're really modified
// now, but we need to check it ...
m_pData->m_bModifiedSinceLastSave = const_cast< SfxBaseModel* >( this )->isModified();
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
}
initial import
2000-09-18 16:07:07 +00:00
void SfxBaseModel::changing()
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
initial import
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
// 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;
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
NotifyModifyListeners_Impl();
initial import
2000-09-18 16:07:07 +00:00
}
void SfxBaseModel::impl_change()
{
// object already disposed?
if ( impl_isDisposed() )
return;
autorecovery: initial implementation of a new save/recovery for database documents For the moment, the document only stores and loads itself, as before. In this course, the AutoRecovery service now delegates the decision whether or not a document needs to be stored (to the "salvage location") to the document itself, using the new method XDocumentRecovery::wasModifiedSinceLastSave, superseded the previous E_MODIFIED_SINCE_LAST_AUTOSAVE flag. XDocumentRecovery::wasModifiedSinceLastSave has been implemented for SfxBaseModel, yielding the same behavior as before. It has also been implemented for database documents, where the implementation is somewhat "sloppy", in that it returns always <TRUE/> when any of the opened sub components of the document is modified.
2010-01-12 23:32:12 +01:00
NotifyModifyListeners_Impl();
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
SfxObjectShell* SfxBaseModel::GetObjectShell() const
{
INTEGRATION: CWS mh11rc (1.48.28); FILE MERGED 2003/06/06 10:06:45 mh 1.48.28.1: join: from beta2
2003-06-12 08:42:59 +00:00
return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0;
initial import
2000-09-18 16:07:07 +00:00
}
SfxObjectShell* SfxBaseModel::impl_getObjectShell() const
{
INTEGRATION: CWS mh11rc (1.48.28); FILE MERGED 2003/06/06 10:06:45 mh 1.48.28.1: join: from beta2
2003-06-12 08:42:59 +00:00
return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0;
initial import
2000-09-18 16:07:07 +00:00
}
//________________________________________________________________________________________________________
// public impl.
//________________________________________________________________________________________________________
sal_Bool SfxBaseModel::IsDisposed() const
{
return ( m_pData == NULL ) ;
}
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
sal_Bool SfxBaseModel::IsInitialized() const
{
if ( !m_pData || !m_pData->m_pObjectShell )
{
OSL_ENSURE( false, "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
return sal_False;
}
return m_pData->m_pObjectShell->GetMedium() != NULL;
}
initial import
2000-09-18 16:07:07 +00:00
sal_Bool SfxBaseModel::impl_isDisposed() const
{
return ( m_pData == NULL ) ;
}
//________________________________________________________________________________________________________
// private impl.
//________________________________________________________________________________________________________
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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();
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SfxBaseModel::impl_store( const ::rtl::OUString& sURL ,
const uno::Sequence< beans::PropertyValue >& seqArguments ,
initial import
2000-09-18 16:07:07 +00:00
sal_Bool bSaveTo )
{
#98385# separate GUI and API parts
2002-03-26 15:29:12 +00:00
if( !sURL.getLength() )
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw frame::IllegalArgumentIOException();
#98385# separate GUI and API parts
2002-03-26 15:29:12 +00:00
//sal_Bool aSaveAsTemplate = sal_False;
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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() )
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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() );
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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 )
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
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 );
INTEGRATION: CWS calcshare2 (1.137.4); FILE MERGED 2008/04/04 11:13:54 mav 1.137.4.2: #i87752# let SaveAs to the same document behave correctly 2008/03/28 12:07:36 mav 1.137.4.1: #i87551# adopt SaveAs for sharing scenario
2008-04-15 13:35:55 +00:00
}
}
}
}
}
if ( !bSaved && m_pData->m_pObjectShell )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
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 ),
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
m_pData->m_pObjectShell ) );
initial import
2000-09-18 16:07:07 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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 ) );
#98385# separate GUI and API parts
2002-03-26 15:29:12 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
TransformParameters( SID_SAVEASDOC, seqArguments, *aParams );
INTEGRATION: CWS fwk36 (1.106.18); FILE MERGED 2006/03/16 12:58:48 mav 1.106.18.2: #i46895# allow to create a copy of the document if possible 2006/03/15 17:06:06 cd 1.106.18.1: #i46895# New method SaveDocumentAsFormat to make 'Send document as e-Mail' more flexible. Uses MS file format as default
2006-03-27 08:36:54 +00:00
SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, sal_False );
INTEGRATION: CWS npower3 (1.113.10); FILE MERGED 2006/10/09 09:24:59 mav 1.113.10.7: #i64377# move the warning handling in central place 2006/10/05 10:00:29 npower 1.113.10.6: #i64377# fixup some added/removed lines to make diffs more pleasant 2006/10/05 08:04:48 npower 1.113.10.5: #i64377# move ModuleSizeExceeded implementation into its own source file 2006/10/04 18:22:32 npower 1.113.10.4: #i64377# reflect changes to css::script::ModuleSizeExceededRequest also remove definition of ModuleSizeExceeded from sfxbasemodule 2006/09/29 10:26:39 npower 1.113.10.3: #i64377# oops logic error, normal processing and my code should not be mixed 2006/09/28 22:54:26 npower 1.113.10.2: RESYNC: (1.113-1.116); FILE MERGED 2006/09/28 16:28:17 npower 1.113.10.1: #i64377# added check to raise warning via interaction handler to sfxbasemodel::storeSelf & sfxbasemodel::impl_store for pasword protected libraries
2006-11-01 15:22:21 +00:00
INTEGRATION: CWS fwk36 (1.106.18); FILE MERGED 2006/03/16 12:58:48 mav 1.106.18.2: #i46895# allow to create a copy of the document if possible 2006/03/15 17:06:06 cd 1.106.18.1: #i46895# New method SaveDocumentAsFormat to make 'Send document as e-Mail' more flexible. Uses MS file format as default
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();
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
throw frame::IllegalArgumentIOException(
INTEGRATION: CWS fwk36 (1.106.18); FILE MERGED 2006/03/16 12:58:48 mav 1.106.18.2: #i46895# allow to create a copy of the document if possible 2006/03/15 17:06:06 cd 1.106.18.1: #i46895# New method SaveDocumentAsFormat to make 'Send document as e-Mail' more flexible. Uses MS file format as default
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
}
INTEGRATION: CWS fwk36 (1.106.18); FILE MERGED 2006/03/16 12:58:48 mav 1.106.18.2: #i46895# allow to create a copy of the document if possible 2006/03/15 17:06:06 cd 1.106.18.1: #i46895# New method SaveDocumentAsFormat to make 'Send document as e-Mail' more flexible. Uses MS file format as default
2006-03-27 08:36:54 +00:00
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-15 21:01:57 +02:00
sal_uInt32 nModifyPasswordHash = 0;
uno::Sequence< beans::PropertyValue > aModifyPasswordInfo;
SFX_ITEMSET_ARG( aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False );
if ( pModifyPasswordInfoItem )
{
// it contains either a simple hash or a set of PropertyValues
// TODO/LATER: the sequence of PropertyValue should replace the hash completely in future
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-16 10:36:38 +02:00
sal_Int32 nMPHTmp = 0;
pModifyPasswordInfoItem->GetValue() >>= nMPHTmp;
nModifyPasswordHash = (sal_uInt32)nMPHTmp;
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-15 21:01:57 +02:00
pModifyPasswordInfoItem->GetValue() >>= aModifyPasswordInfo;
}
aParams->ClearItem( SID_MODIFYPASSWORDINFO );
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
sal_uInt32 nOldModifyPasswordHash = m_pData->m_pObjectShell->GetModifyPasswordHash();
m_pData->m_pObjectShell->SetModifyPasswordHash( nModifyPasswordHash );
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-15 21:01:57 +02:00
uno::Sequence< beans::PropertyValue > aOldModifyPasswordInfo = m_pData->m_pObjectShell->GetModifyPasswordInfo();
m_pData->m_pObjectShell->SetModifyPasswordInfo( aModifyPasswordInfo );
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02: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();
CWS-TOOLING: integrate CWS fwk95 2009-01-15 13:24:14 +0100 cd r266366 : #i96390# Change method name to use UNO AWT style for mnemonics 2009-01-15 13:23:30 +0100 cd r266365 : #i96390# Change method name to use UNO AWT style for mnemonics 2009-01-12 17:25:13 +0100 cd r266174 : #i97983# Check pointer returned by dynamic_cast 2009-01-12 15:31:40 +0100 cd r266162 : #i97983# Create toolkit popup menus via service manager instead of implementation class 2008-12-11 15:04:34 +0100 cd r265305 : #i95863# Remove user defined properties 2008-12-11 14:56:45 +0100 cd r265302 : #i95606# Update documentation for textfields 2008-12-11 10:06:20 +0100 cd r265250 : #i96390# Fix warning on Solaris compiler 2008-12-09 17:27:32 +0100 cd r265119 : CWS-TOOLING: rebase CWS fwk95 to trunk@264807 (milestone: DEV300:m37) 2008-12-01 13:29:43 +0100 cd r264597 : #i96390# New interfaces and structures for complete UNO AWT menu API 2008-12-01 13:25:22 +0100 cd r264596 : #i96390# Added implementation of the new UNO AWT interfaces and structures for menus 2008-11-28 13:55:19 +0100 cd r264553 : #i96640# Fixed wrong property type for MenuBarCloser 2008-11-28 13:53:56 +0100 cd r264552 : #i96621# Fixed ambiguous usage of && and || 2008-11-18 16:05:45 +0100 cd r263781 : #i95316# Initialize SvtTabAppearanceCfg to enable system settings changed notiifcation code 2008-11-18 16:05:43 +0100 cd r263780 : #i96155# Fix wrong statement to check for enabled argument 2008-10-20 16:54:37 +0200 cd r262328 : #i10000# migrate CWS fwk95 to SVN.
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
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
sal_Bool bRet = m_pData->m_pObjectShell->APISaveAs_Impl( sURL, aParams );
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
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;
}
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
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;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
DELETEZ( aParams );
#98385# separate GUI and API parts
2002-03-26 15:29:12 +00:00
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
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!" ) ) );
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
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
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
m_pData->m_pObjectShell->ResetError();
if ( bRet )
{
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
2005-02-21 16:05:15 +00:00
if ( nErrCode )
{
// must be a warning - use Interactionhandler if possible or abandone
if ( xHandler.is() )
{
INTEGRATION: CWS fwk64 (1.120.98); FILE MERGED 2007/03/26 12:28:52 mav 1.120.98.2: #i69640# fix some errors and warnings, let them be handled by interaction handler 2007/03/16 08:57:40 mav 1.120.98.1: #108296# set the correct error context
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() );
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
2005-02-21 16:05:15 +00:00
::com::sun::star::task::ErrorCodeRequest aErrorCode;
aErrorCode.ErrCode = nErrCode;
CWS-TOOLING: integrate CWS encsig09 2009-09-14 15:11:29 +0200 oc r276125 : #i105049# MacroSignatur needs Macro 2009-09-09 17:09:46 +0200 jl r276005 : #i103989# could not signe encrypted doc containing a formular object 2009-09-09 13:11:24 +0200 jl r275985 : #i103989# could not signe encrypted doc containing a formular object 2009-09-08 15:54:02 +0200 mav r275934 : #i103906# fix the automation test scenario ( tempfile should be writable for the user ) 2009-09-07 14:01:39 +0200 mav r275895 : #i103906# fix the problem with reload 2009-09-07 09:34:48 +0200 mav r275871 : #i104786# do the ODF version check only for ODF documents 2009-09-07 08:19:06 +0200 mav r275870 : #i104389# fix text 2009-09-06 22:24:21 +0200 mav r275867 : #i104786# check the consistency of ODF version 2009-09-06 22:23:24 +0200 mav r275866 : #i104786# check the consistency of ODF version 2009-09-06 22:23:00 +0200 mav r275865 : #i104786# check the consistency of ODF version 2009-09-06 22:22:36 +0200 mav r275864 : #i104786# check the consistency of ODF version 2009-09-06 22:22:03 +0200 mav r275863 : #i104786# check the consistency of ODF version 2009-09-02 17:09:30 +0200 mav r275722 : #i104715# let repairing mechanics use the streams correctly 2009-09-01 16:52:49 +0200 mav r275670 : #i104389# notify user not to trust the corrupted document 2009-09-01 16:31:37 +0200 mav r275668 : #i104389# use vnd.sun.star.zip: protocol to access zip files 2009-09-01 16:30:32 +0200 mav r275667 : #i104389# use vnd.sun.star.zip: protocol to access zip files 2009-09-01 16:22:13 +0200 jl r275666 : #i104339# small content change 2009-09-01 14:20:42 +0200 jl r275660 : #i103519# remove some debug output 2009-09-01 13:51:52 +0200 jl r275659 : #i103519# NSS uses '\' for escaping in distinguished names 2009-09-01 12:49:47 +0200 mav r275655 : #i104389# use zip-mode to read from jar files 2009-09-01 12:40:22 +0200 mav r275653 : #i104389# use zip-mode to read from jar files 2009-09-01 12:32:29 +0200 mav r275652 : #i104389# use constants 2009-08-31 21:58:00 +0200 mav r275637 : #i10000# fix warning 2009-08-31 21:11:17 +0200 mav r275636 : #i104227# adding of scripting signature removes the document signature 2009-08-31 20:55:05 +0200 mav r275635 : #i103905# ZipStorage supports Compressed property 2009-08-31 20:53:55 +0200 mav r275634 : #i103905# adjust macro signature transfer to usage of ZipStorage 2009-08-31 15:30:49 +0200 jl r275609 : #i103989# warning is shown as long the user does not click 'OK' 2009-08-31 14:36:10 +0200 jl r275608 : #i103989# changed warning text when signing macro and there is a document signature. This warning is only displayed once 2009-08-31 13:34:41 +0200 mav r275603 : #i104452# disable macros in repaired documents 2009-08-31 13:33:42 +0200 mav r275602 : #i104452# disable macros in repaired documents 2009-08-31 13:03:56 +0200 jl r275600 : #i45212# signature dialog could not be started when using read-only documents 2009-08-31 09:26:13 +0200 mav r275583 : #i104578# store the additional entry as the last one to workaround parsing problem in OOo3.1 and later 2009-08-30 20:54:25 +0200 mav r275562 : #i10000# adopt for unix 2009-08-30 10:56:00 +0200 mav r275561 : CWS-TOOLING: rebase CWS encsig09 to trunk@275331 (milestone: DEV300:m56) 2009-08-28 16:34:00 +0200 mav r275539 : #i104578# write necessary info in manifest.xml for ODF1.2 encrypted document 2009-08-28 14:04:22 +0200 mav r275533 : #104587# fix handling of readonly streams 2009-08-28 13:58:10 +0200 mav r275531 : #i104389# fix the broken document handling 2009-08-28 11:40:39 +0200 mav r275522 : #i104389# fix the signature streams check 2009-08-27 21:48:12 +0200 mav r275509 : #i103927# show the warning 2009-08-27 21:47:48 +0200 mav r275508 : #i103927# show the warning 2009-08-27 16:45:59 +0200 jl r275495 : #i45212# remove unused variable 2009-08-27 16:34:00 +0200 jl r275494 : #i103989# 2009-08-27 13:54:28 +0200 jl r275482 : #i103519# fixed replacement of 'S' by 'ST' 2009-08-27 12:32:21 +0200 mav r275472 : #i10000# fix warning 2009-08-27 11:58:11 +0200 mav r275467 : #i104389# handle the entry path correctly 2009-08-26 17:18:35 +0200 jl r275438 : #i103519# subject and issuer distinguished names were not properly displayed. The strings were obtained by system functions (Windows, NSS), which use quotes to escape the values, when they contain special characters 2009-08-26 11:00:20 +0200 mav r275403 : #i10000# fix warnings 2009-08-26 08:25:45 +0200 mav r275392 : #i10000# fix warning 2009-08-26 08:02:22 +0200 mav r275391 : #i10000# adopt for linux 2009-08-26 07:40:30 +0200 mav r275390 : #i10000# fix warning 2009-08-26 07:35:28 +0200 mav r275389 : #i10000# use correct include file name 2009-08-25 15:01:41 +0200 jl r275356 : #i103989# better check for mimetype of streams 2009-08-25 09:07:09 +0200 mav r275335 : CWS-TOOLING: rebase CWS encsig09 to trunk@274622 (milestone: DEV300:m54) 2009-08-24 18:17:02 +0200 mav r275329 : #i103927# check the nonencrypted streams 2009-08-24 18:14:14 +0200 mav r275328 : #i103927# check the nonencrypted streams 2009-08-24 17:59:34 +0200 mav r275327 : #i103927#,#i104389# check the package consistency and nonencrypted streams 2009-08-24 16:18:28 +0200 jl r275323 : #i103989# added comment 2009-08-24 13:08:47 +0200 jl r275305 : #i45212# #i66276# only write the X509Certificate element once and allow to add remove several certificates at a time 2009-08-21 12:57:28 +0200 ufi r275239 : 104339 2009-08-21 08:39:05 +0200 jl r275213 : #i10398# comparing URIs of signed files with the 'element list' 2009-08-20 13:39:47 +0200 jl r275178 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:35:39 +0200 jl r275177 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:29:06 +0200 jl r275176 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:26:21 +0200 jl r275175 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 12:05:09 +0200 ufi r275170 : i104339 2009-08-19 12:24:54 +0200 jl r275146 : #i10398# displaying 'old signature' icon and status in signature dialog 2009-08-18 15:18:48 +0200 jl r275111 : #i103989# document signatures containing manifest.xml are now validated according to the final ODF1.2 spec 2009-08-18 11:41:06 +0200 mav r275087 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams 2009-08-18 11:35:13 +0200 mav r275085 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams 2009-08-14 17:32:41 +0200 jl r274999 : #i103989# using c14n tranformation for XML streams 2009-08-14 15:27:43 +0200 jl r274987 : #i103989# remove special handling for encrypted document streams in UriBindingHelper::OpenInputStream, since we use zip storage this is not necessary anymore 2009-08-14 15:08:10 +0200 jl r274983 : #i103989# Showing a message when adding or removing a macro signature, that the document signature will be removed 2009-08-14 14:57:27 +0200 jl r274982 : #i103989# accesing Sequence at invalid index 2009-08-11 08:55:02 +0200 mav r274846 : #i103905# let signing service know if there is already a valid document signature 2009-08-10 11:33:37 +0200 jl r274799 : #i103905# do not truncate the stream 2009-08-10 10:43:47 +0200 mav r274797 : #i103905# provide the storage version 2009-08-07 16:58:46 +0200 jl r274780 : #i103989# 2009-08-07 16:56:19 +0200 jl r274779 : #i103989# using odf version string etc. 2009-08-07 15:20:53 +0200 mav r274771 : #i103905# provide the storage version 2009-08-07 15:19:12 +0200 mav r274770 : #i103905# provide the storage version 2009-08-07 12:41:45 +0200 mav r274758 : #103930# do not store thumbnail in case of encrypted document 2009-08-07 12:36:52 +0200 mav r274757 : #i103905# provide the storage version 2009-08-07 12:15:54 +0200 mav r274754 : #i103760# the signed state is not lost on saving 2009-08-07 12:06:19 +0200 mav r274753 : #i103760# avoid warning regarding signature removal on export 2009-08-07 12:06:01 +0200 mav r274752 : #i103760# avoid warning regarding signature removal on export 2009-08-06 08:47:34 +0200 mav r274703 : #i103905# allow to transport ODF version to the signing component 2009-08-05 21:34:42 +0200 mav r274701 : #i103905# allow to transport ODF version to the signing component 2009-08-05 15:48:17 +0200 mav r274683 : #i103905# allow to transport ODF version to the signing component 2009-08-05 14:58:12 +0200 jl r274673 : #i103989# documentsignature now signes all streams except documentsignatures.xml, all streams are processed as binary files 2009-08-05 12:00:32 +0200 mav r274648 : #i103905# allow to transport ODF version to the signing component 2009-08-04 10:57:04 +0200 jl r274612 : #i103989# added XInitialization 2009-07-31 10:32:27 +0200 mav r274516 : #i103905# use zip storage to sign documents 2009-07-30 14:01:33 +0200 mav r274489 : #i103906# optimize the usage of temporary medium 2009-07-30 14:00:28 +0200 mav r274488 : #i103906# optimize the usage of temporary medium 2009-07-30 13:59:09 +0200 mav r274487 : #i103906# optimize the usage of temporary medium 2009-07-30 13:50:44 +0200 mav r274485 : #i103906# optimize the usage of temporary medium 2009-07-30 13:49:53 +0200 mav r274484 : #i103906# optimize the usage of temporary medium 2009-07-30 13:49:13 +0200 mav r274483 : #i103906# optimize the usage of temporary medium 2009-07-30 13:47:09 +0200 mav r274482 : #i103905#,#i103906# let the signing process use zip-storage; optimize the usage of temporary medium 2009-07-21 09:10:31 +0200 mav r274159 : CWS-TOOLING: rebase CWS encsig09 to trunk@273468 (milestone: DEV300:m51) 2009-05-05 08:39:01 +0200 mav r271496 : #i100832# allow to sign macros only when there are any
2009-09-17 13:53:54 +00:00
SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), sal_False );
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
2005-02-21 16:05:15 +00:00
}
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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!" ) ) );
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
if ( !bSaveTo )
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
2005-02-21 16:05:15 +00:00
{
m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl();
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
m_pData->m_pObjectShell->SetModifyPasswordEntered();
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEASDOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVEASDOCDONE), m_pData->m_pObjectShell ) );
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
2005-02-21 16:05:15 +00:00
}
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
else
{
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash );
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-15 21:01:57 +02:00
m_pData->m_pObjectShell->SetModifyPasswordInfo( aOldModifyPasswordInfo );
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVETODOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVETODOCDONE), m_pData->m_pObjectShell ) );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
else
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
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();
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash );
tl78v2: #i112427# Support password to modify in calc and writer ODF documents
2010-06-15 21:01:57 +02:00
m_pData->m_pObjectShell->SetModifyPasswordInfo( aOldModifyPasswordInfo );
tl78: #i110383# password to modify support for binary types only
2010-06-03 00:10:45 +02:00
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
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),
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
m_pData->m_pObjectShell ) );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nErrCode );
INTEGRATION: CWS fwk16 (1.96.8); FILE MERGED 2005/07/01 12:38:23 mav 1.96.8.3: #i50651# send a notification even if saving fails 2005/06/30 11:37:23 as 1.96.8.2: #i50651# prevent model from closing if save operation is in progress 2005/06/28 11:05:59 as 1.96.8.1: #i50651# reject close and store while saving is in progress
2005-07-12 13:27:05 +00:00
}
#98385# separate GUI and API parts
2002-03-26 15:29:12 +00:00
}
initial import
2000-09-18 16:07:07 +00:00
}
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
//********************************************************************************************************
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
{
// object already disposed?
if ( impl_isDisposed() )
return;
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
2009-09-18 10:15:03 +00:00
DBG_ASSERT( aName.getLength(), "Empty event name!" );
if (!aName.getLength())
return;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0) );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
if( pIC )
{
CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS 2009-07-27 mba apply patch from broken svn CWS
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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();
INTEGRATION: CWS dialogdiet (1.53.12); FILE MERGED 2004/01/19 22:43:27 mba 1.53.12.2: RESYNC: (1.53-1.55); FILE MERGED 2004/01/13 12:25:45 mba 1.53.12.1: #i19711#: copy interface container before notification because object might be disposed
2004-02-03 18:58:43 +00:00
for ( sal_Int32 nElem=0; nElem<aElements.getLength(); nElem++ )
aIC.addInterface( aElements[nElem] );
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::cppu::OInterfaceIteratorHelper aIt( aIC );
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
while( aIt.hasMoreElements() )
#99101# catch disposed exceptions if listener connections are broken
2002-05-24 10:57:54 +00:00
{
try
{
((XDOCEVENTLISTENER *)aIt.next())->notifyEvent( aEvent );
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
catch( uno::RuntimeException& )
#99101# catch disposed exceptions if listener connections are broken
2002-05-24 10:57:54 +00:00
{
aIt.remove();
}
}
#76800# Added XEventsSupplier interface
2001-02-09 11:49:32 +00:00
}
}
XViewDataSupplier added
2001-03-28 15:50:15 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(::com::sun::star::uno::RuntimeException)
XViewDataSupplier added
2001-03-28 15:50:15 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
INTEGRATION: CWS mav3 (1.39.4.1.12); FILE MERGED 2003/04/02 06:33:41 mav 1.39.4.1.12.10: #i2822# adopt for unix 2003/03/27 17:17:24 mav 1.39.4.1.12.9: RESYNC: (1.39.4.1-1.39.4.3); FILE MERGED 2003/03/27 14:05:07 mav 1.39.4.1.12.8: #i2822# SetExtent, GetExtent 2003/03/26 10:58:14 mav 1.39.4.1.12.7: #i2822# set the document mode to 'embedded' 2003/03/10 15:50:38 mav 1.39.4.1.12.6: #i2822# global handler for windows metafile representation 2003/03/05 15:02:11 mav 1.39.4.1.12.5: #i2822# closing of docshell should be done only through model closing 2003/03/05 12:32:28 mav 1.39.4.1.12.4: #i2822# do not hold a reference to the document shell after it is closed 2003/03/05 08:32:44 mav 1.39.4.1.12.3: #i11704# delete temporary created ItemSet 2003/03/03 08:58:39 mav 1.39.4.1.12.2: #i2822# metafile stuff 2003/02/20 10:01:26 mav 1.39.4.1.12.1: #i2822# XLoadable and XTransferable implementations
2003-04-04 18:24:37 +00:00
if ( m_pData->m_pObjectShell.Is() && !m_pData->m_contViewData.is() )
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
{
SfxViewFrame *pActFrame = SfxViewFrame::Current();
if ( !pActFrame || pActFrame->GetObjectShell() != m_pData->m_pObjectShell )
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both can effectively be treated as one class. This change was done to make subsequent refactorings easier.
2009-11-30 12:56:04 +01:00
pActFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell );
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
INTEGRATION: CWS fwkpostbeta02 (1.81.2); FILE MERGED 2005/02/15 21:34:15 mba 1.81.2.4: #i41710#: in caseof reloading empty ViewFrame is possible 2005/02/11 11:59:44 mba 1.81.2.3: #i41983#: preused filter name can't be set on export 2005/02/10 11:46:15 mba 1.81.2.2: RESYNC: (1.81-1.82); FILE MERGED 2005/02/03 16:41:38 mba 1.81.2.1: #i41854#: handle warnings while saving
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
return uno::Reference < container::XIndexAccess >();
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
m_pData->m_contViewData = Reference < container::XIndexAccess >(
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.document.IndexedPropertyValues") ),
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::UNO_QUERY );
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
if ( !m_pData->m_contViewData.is() )
{
// error: no container class available!
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
return uno::Reference < container::XIndexAccess >();
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference < container::XIndexContainer > xCont( m_pData->m_contViewData, uno::UNO_QUERY );
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
sal_Int32 nCount = 0;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Sequence < beans::PropertyValue > aSeq;
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
::com::sun::star::uno::Any aAny;
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both can effectively be treated as one class. This change was done to make subsequent refactorings easier.
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 ) )
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
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;
XViewDataSupplier added
2001-03-28 15:50:15 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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)
XViewDataSupplier added
2001-03-28 15:50:15 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS beta2regression02 (1.46.2); FILE MERGED 2003/04/30 09:15:45 mba 1.46.2.3: #109223#: allow to remove Lock without closing 2003/04/30 08:06:28 mba 1.46.2.2: #109223#: allow to remove Lock without closing 2003/04/29 14:07:14 mba 1.46.2.1: #109207#: views must be notified before disposing the model
2003-05-02 14:30:49 +00:00
#82045#; implement the functions getViewData and setViewData to make the export and import of the viewsettings in XML possible
2001-04-06 14:27:20 +00:00
m_pData->m_contViewData = aData;
XViewDataSupplier added
2001-03-28 15:50:15 +00:00
}
#95585# export helper for XEventBroadcaster
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;
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0) );
#95585# export helper for XEventBroadcaster
2002-01-28 09:46:55 +00:00
if( pIC )
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::cppu::OInterfaceIteratorHelper aIt( *pIC );
#95585# export helper for XEventBroadcaster
2002-01-28 09:46:55 +00:00
while( aIt.hasMoreElements() )
#99101# catch disposed exceptions if listener connections are broken
2002-05-24 10:57:54 +00:00
{
try
{
((XDOCEVENTLISTENER *)aIt.next())->notifyEvent( aEvent );
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
catch( uno::RuntimeException& )
#99101# catch disposed exceptions if listener connections are broken
2002-05-24 10:57:54 +00:00
{
aIt.remove();
}
}
#95585# export helper for XEventBroadcaster
2002-01-28 09:46:55 +00:00
}
}
/** returns true if someone added a XEventListener to this XEventBroadcaster */
sal_Bool SfxBaseModel::hasEventListeners() const
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0) ) );
#95585# export helper for XEventBroadcaster
2002-01-28 09:46:55 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::addPrintJobListener( const uno::Reference< view::XPrintJobListener >& xListener ) throw (uno::RuntimeException)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
INTEGRATION: CWS late241bf01_DEV300 (1.131.26.4.18); FILE MERGED 2008/05/16 12:58:52 mba 1.131.26.4.18.2: #157928#: forward PrintJobListeners to PrintingHelper 2008/05/16 12:57:09 mba 1.131.26.4.18.1: #157928#: forward PrintJobListeners to PrintingHelper
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 );
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::XPrintJobListener >& xListener ) throw (uno::RuntimeException)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
INTEGRATION: CWS late241bf01_DEV300 (1.131.26.4.18); FILE MERGED 2008/05/16 12:58:52 mba 1.131.26.4.18.2: #157928#: forward PrintJobListeners to PrintingHelper 2008/05/16 12:57:09 mba 1.131.26.4.18.1: #157928#: forward PrintJobListeners to PrintingHelper
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 );
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 10:29:38 +00:00
}
INTEGRATION: CWS gcc4fwdecl (1.95.22); FILE MERGED 2005/06/01 11:52:06 pmladek 1.95.22.1: #i50070# Fixed forward declarations for gcc4 in sfx2
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;
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
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() );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
if ( GetObjectShell() )
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
2003-09-19 07:02:02 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
SvGlobalName aName( aIdentifier );
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
2003-09-19 07:02:02 +00:00
if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )
INTEGRATION: CWS intptr (1.98.58); FILE MERGED 2005/09/13 14:51:12 kendy 1.98.58.1: #i54498# Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
2005-10-06 10:15:09 +00:00
return (sal_Int64)(sal_IntPtr)(SvObject*)GetObjectShell();
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
2003-09-19 07:02:02 +00:00
else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )
INTEGRATION: CWS intptr (1.98.58); FILE MERGED 2005/09/13 14:51:12 kendy 1.98.58.1: #i54498# Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
2005-10-06 10:15:09 +00:00
return (sal_Int64)(sal_IntPtr)(SfxObjectShell*)GetObjectShell();
INTEGRATION: CWS fwkq1 (1.50.10); FILE MERGED 2003/08/13 16:49:46 mba 1.50.10.2: RESYNC: (1.50-1.51); FILE MERGED 2003/07/14 18:00:18 mba 1.50.10.1: #110843#: get rid of factories
2003-09-19 07:02:02 +00:00
}
return 0;
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XDocumentSubStorageSupplier
//____________________________________________________________________________________________________
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
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() )
{
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
if ( !m_pData->m_pStorageModifyListen.is() )
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
{
CWS-TOOLING: integrate CWS odbmacros3
2008-10-16 06:57:26 +00:00
m_pData->m_pStorageModifyListen = new ::sfx2::DocumentStorageModifyListener( *m_pData, Application::GetSolarMutex() );
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
// no need to deregister the listening for old storage since it should be disposed automatically
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
xModifiable->addModifyListener( m_pData->m_pStorageModifyListen.get() );
INTEGRATION: CWS tdoc3 (1.70.10); FILE MERGED 2004/11/03 16:12:25 kso 1.70.10.7: RESYNC: (1.70-1.71); FILE MERGED 2004/11/03 12:39:57 mav 1.70.10.6: #i36554# listen for the storage only after the new document is completely created 2004/11/03 11:25:41 mav 1.70.10.5: #i36554# listen for the storage only after the new document is completely created 2004/11/03 10:13:57 mav 1.70.10.4: #i36554# the events should not be sent multiple times 2004/11/03 09:28:05 mav 1.70.10.3: #i36428# let new documents listen as well 2004/11/02 19:24:20 mav 1.70.10.2: #i36428# fix notification 2004/11/02 15:59:55 mav 1.70.10.1: #i36428# let the model be modified if it's storage is modified
2004-11-09 14:38:24 +00:00
}
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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)
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xResult;
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
if ( m_pData->m_pObjectShell.Is() )
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
uno::Reference< embed::XStorage > xStorage = m_pData->m_pObjectShell->GetStorage();
if ( xStorage.is() )
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
try
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
xResult = xStorage->openStorageElement( aStorageName, nMode );
}
catch ( uno::Exception& )
{
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
}
}
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
}
return xResult;
}
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames()
throw ( io::IOException,
RuntimeException )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
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() )
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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() )
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
Sequence< ::rtl::OUString > aTemp = xAccess->getElementNames();
for ( sal_Int32 n = 0; n < aTemp.getLength(); n++ )
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
{
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
if ( xStorage->isStorageElement( aTemp[n] ) )
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
{
aResult.realloc( ++nResultSize );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aResult[ nResultSize - 1 ] = aTemp[n];
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
2004-04-13 10:50:23 +00:00
}
}
bSuccess = sal_True;
}
}
if ( !bSuccess )
throw io::IOException();
return aResult;
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XScriptProviderSupplier
//____________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider()
throw ( uno::RuntimeException )
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS scriptingf4 (1.61.4); FILE MERGED 2004/05/06 13:05:13 dfoster 1.61.4.1: #i28812# Modified to use new MasterScriptProviderFactory to obtain MasterScriptProvider ( used to create it directly ) Issue number: Submitted by: Reviewed by:
2004-05-19 07:35:17 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
uno::Reference< script::provider::XScriptProvider > xScriptProvider;
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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 );
INTEGRATION: CWS scriptingf4 (1.61.4); FILE MERGED 2004/05/06 13:05:13 dfoster 1.61.4.1: #i28812# Modified to use new MasterScriptProviderFactory to obtain MasterScriptProvider ( used to create it directly ) Issue number: Submitted by: Reviewed by:
2004-05-19 07:35:17 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
try
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
{
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
Reference< XScriptInvocationContext > xScriptContext( this );
xScriptProvider.set( xScriptProviderFactory->createScriptProvider( makeAny( xScriptContext ) ), uno::UNO_SET_THROW );
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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;
INTEGRATION: CWS scriptingf1 (1.52.2); FILE MERGED 2003/10/29 15:05:59 toconnor 1.52.2.4: #i21858# - removal of framework namespace from namespace hierarchy of Scripting Framework UNO interfaces and services 2003/10/13 11:51:45 mav 1.52.2.3: #i19302# initialize MasterScriptProvider with the documet 2003/10/13 11:45:52 mav 1.52.2.2: #i19302# provide access to the document's MasterScriptProvider 2003/10/06 14:43:42 mav 1.52.2.1: #i19303# UNO API storage duplicate related stuff
2003-11-18 15:49:01 +00:00
}
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
//____________________________________________________________________________________________________
// XUIConfigurationManagerSupplier
//____________________________________________________________________________________________________
INTEGRATION: CWS unopkg1 (1.54.30); FILE MERGED 2004/03/02 15:11:05 dbo 1.54.30.7: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 16:43:30 kso 1.54.30.6: #112920# - Fixed XDocumentSubStorageSupplier implementation. 2004/01/22 15:05:09 kso 1.54.30.5: #112920# - Added SfxBaseModel::getRuntimeUID() 2004/01/19 15:42:21 mav 1.54.30.4: #114733# reset error after problem 2004/01/14 13:34:06 kso 1.54.30.3: Fixed SfxBaseModel::getDocumentSubStoragesNames() to return a value. 2004/01/13 14:32:55 kso 1.54.30.2: RESYNC: (1.54-1.55); FILE MERGED 2004/01/08 11:49:04 mav 1.54.30.1: #114733# allow to get list of substorages
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;
}
INTEGRATION: CWS fwk36 (1.106.18); FILE MERGED 2006/03/16 12:58:48 mav 1.106.18.2: #i46895# allow to create a copy of the document if possible 2006/03/15 17:06:06 cd 1.106.18.1: #i46895# New method SaveDocumentAsFormat to make 'Send document as e-Mail' more flexible. Uses MS file format as default
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;
}
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
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;
}
}
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
static void ConvertSlotsToCommands( SfxObjectShell* pDoc, uno::Reference< container::XIndexContainer >& rToolbarDefinition )
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
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 ));
}
}
}
}
}
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfigurationManager()
throw ( uno::RuntimeException )
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
if ( !m_pData->m_xUIConfigurationManager.is() )
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< ui::XUIConfigurationManager > xNewUIConfMan(
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
::comphelper::getProcessServiceFactory()->createInstance(
INTEGRATION: CWS removedrafts (1.82.10); FILE MERGED 2005/02/22 10:42:08 cd 1.82.10.2: #i42557# Remove drafts from UNOIDL types 2005/02/17 14:02:15 cd 1.82.10.1: #i42557# Move UNOIDL types from drafts to com
2005-03-01 19:02:00 +00:00
::rtl::OUString::createFromAscii( "com.sun.star.ui.UIConfigurationManager" )),
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::UNO_QUERY );
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
Reference< ui::XUIConfigurationStorage > xUIConfigStorage( xNewUIConfMan, uno::UNO_QUERY );
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
if ( xUIConfigStorage.is() )
{
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xConfigStorage;
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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() )
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
{
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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 ))
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
{
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
a <<= aUIConfigMediaType;
xPropSet->setPropertyValue( aMediaTypeProp, a );
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
}
}
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
2008-03-06 18:56:03 +00:00
else
xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, embed::ElementModes::READ );
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
// initialize ui configuration manager with document substorage
xUIConfigStorage->setStorage( xConfigStorage );
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
2005-03-23 13:25:16 +00:00
INTEGRATION: CWS odbmacros2 (1.131.2); FILE MERGED 2008/03/04 12:12:01 fs 1.131.2.7: RESYNC: (1.134-1.136); FILE MERGED 2008/02/04 13:15:47 fs 1.131.2.6: RESYNC: (1.131-1.134); FILE MERGED 2008/01/08 15:01:02 fs 1.131.2.5: #i68333# allow UI configuration for embedded objects, too 2008/01/02 20:50:22 fs 1.131.2.4: ModifiableDocument renamed to IModifiableDocument 2008/01/02 20:44:40 fs 1.131.2.3: #i49133# OStorageModifyListen_Impl now known as ::sfx2::DocumentStorageModifyListener (class is now re-used outside sfx2) 2007/12/17 12:40:06 fs 1.131.2.2: #i49133# implement XScriptInvocationContext 2007/12/11 22:46:41 fs 1.131.2.1: #i49133# getScriptProvider: if we ourself do not support scripts, but one of our ancestors does, use this ancestor's script provider
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
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
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
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xOOo1ConfigStorage;
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
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 ));
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< container::XIndexContainer > xToolbar = rToolbars[i];
INTEGRATION: CWS fwkfinal1 (1.86.4); FILE MERGED 2005/03/11 10:20:22 cd 1.86.4.1: #i44558# Use new importer implementation for custom OOo 1.x toolbars
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();
}
}
}
}
}
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
}
#i38373#, #i38471#, #i38386# forget storages on reload
2004-12-07 12:37:15 +00:00
m_pData->m_xUIConfigurationManager = xNewUIConfMan;
INTEGRATION: CWS layoutmanager (1.53.4); FILE MERGED 2004/02/19 17:05:22 cd 1.53.4.6: RESYNC: (1.55-1.57); FILE MERGED 2004/01/29 19:36:04 cd 1.53.4.5: RESYNC: (1.53-1.55); FILE MERGED 2004/01/28 16:33:20 cd 1.53.4.4: #111899# Some fixes to use ui configuration API 2004/01/21 18:33:11 cd 1.53.4.3: #111899# Adapt menu bar configuration dialog 2004/01/19 10:13:41 cd 1.53.4.2: #111899# Support ui configuration manager at model and modify flag 2004/01/15 17:41:07 mav 1.53.4.1: #114858# the model is modified if one of substorages is commited
2004-02-25 14:46:43 +00:00
}
return m_pData->m_xUIConfigurationManager;
}
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
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 )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
if ( !m_pData->m_pObjectShell.Is() )
throw uno::Exception(); // TODO: error handling
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both can effectively be treated as one class. This change was done to make subsequent refactorings easier.
2009-11-30 12:56:04 +01:00
SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False );
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() );
INTEGRATION: CWS fwkbugfix05 (1.76.22); FILE MERGED 2005/01/25 12:24:38 mba 1.76.22.3: #i38912#: calling SetModified in dispose is dangerous and superfluous 2005/01/19 13:40:45 mba 1.76.22.2: RESYNC: (1.76-1.77); FILE MERGED 2005/01/06 15:25:58 mba 1.76.22.1: #i37381#: setting visarea through API at active objects must resize the window
2005-01-31 07:53:54 +00:00
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 );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
else
INTEGRATION: CWS fwkbugfix05 (1.76.22); FILE MERGED 2005/01/25 12:24:38 mba 1.76.22.3: #i38912#: calling SetModified in dispose is dangerous and superfluous 2005/01/19 13:40:45 mba 1.76.22.2: RESYNC: (1.76-1.77); FILE MERGED 2005/01/06 15:25:58 mba 1.76.22.1: #i37381#: setting visarea through API at active objects must resize the window
2005-01-31 07:53:54 +00:00
{
Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
aTmpRect.SetSize( Size( aSize.Width, aSize.Height ) );
INTEGRATION: CWS fwkbugfix05 (1.76.22); FILE MERGED 2005/01/25 12:24:38 mba 1.76.22.3: #i38912#: calling SetModified in dispose is dangerous and superfluous 2005/01/19 13:40:45 mba 1.76.22.2: RESYNC: (1.76-1.77); FILE MERGED 2005/01/06 15:25:58 mba 1.76.22.1: #i37381#: setting visarea through API at active objects must resize the window
2005-01-31 07:53:54 +00:00
m_pData->m_pObjectShell->SetVisArea( aTmpRect );
}
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
}
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ )
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
throw ( lang::IllegalArgumentException,
embed::WrongStateException,
uno::Exception,
uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
if ( !m_pData->m_pObjectShell.Is() )
throw uno::Exception(); // TODO: error handling
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT );
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
return awt::Size( aTmpRect.GetWidth(), aTmpRect.GetHeight() );
}
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
sal_Int32 SAL_CALL SfxBaseModel::getMapUnit( sal_Int64 /*nAspect*/ )
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
throw ( uno::Exception,
uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
if ( !m_pData->m_pObjectShell.Is() )
throw uno::Exception(); // TODO: error handling
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
return VCLUnoHelper::VCL2UnoEmbedMapUnit( m_pData->m_pObjectShell->GetMapUnit() );
}
INTEGRATION: CWS warnings01 (1.102.2); FILE MERGED 2006/05/23 22:17:32 sb 1.102.2.4: RESYNC: (1.109-1.110); FILE MERGED 2006/04/07 19:30:46 sb 1.102.2.3: RESYNC: (1.104-1.109); FILE MERGED 2006/01/25 20:07:35 sb 1.102.2.2: RESYNC: (1.102-1.104); FILE MERGED 2005/11/28 16:16:27 cd 1.102.2.1: #i55991# Remove warnings
2006-06-19 21:31:31 +00:00
embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentation( ::sal_Int64 /*nAspect*/ )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
throw ( lang::IllegalArgumentException,
embed::WrongStateException,
uno::Exception,
uno::RuntimeException )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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
//____________________________________________________________________________________________________
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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,
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
DOUBLEINITIALIZATIONEXCEPTION,
IOEXCEPTION,
EXCEPTION,
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: silently survice a close call when we're already disposed - there might be legacy code not expecting the DisposedException
2010-02-22 11:25:52 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
if ( IsInitialized() )
throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), *this );
// after i36090 is fixed the pool from object shell can be used
// SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() );
SfxAllItemSet aSet( SFX_APP()->GetPool() );
// the BaseURL is part of the ItemSet
SfxMedium* pMedium = new SfxMedium( xStorage, String() );
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;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
// load document
if ( !m_pData->m_pObjectShell->DoLoad(pMedium) )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
sal_uInt32 nError = m_pData->m_pObjectShell->GetErrorCode();
throw task::ErrorCodeIOException( ::rtl::OUString(),
uno::Reference< uno::XInterface >(),
nError ? nError : ERRCODE_IO_CANTREAD );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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,
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
IOEXCEPTION,
EXCEPTION,
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xResult;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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();
}
INTEGRATION: CWS fwkbeta02 (1.74.8); FILE MERGED 2004/12/07 13:42:36 mav 1.74.8.1: #i38469# call saveCompleted
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
{
INTEGRATION: CWS mav19 (1.103.6); FILE MERGED 2005/11/24 15:02:20 mav 1.103.6.2: #126228# improve storing of own objects inserted from file 2005/11/23 16:45:56 mav 1.103.6.1: #i58357# Use storage change notification
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
INTEGRATION: CWS templatetype1 (1.79.10); FILE MERGED 2005/02/01 07:30:47 mav 1.79.10.1: #i41172# mediatypes for oasis templates
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 );
INTEGRATION: CWS sb19 (1.69.42); FILE MERGED 2005/01/03 11:05:46 mav 1.69.42.8: #100000# resync problem 2004/12/21 09:36:05 sb 1.69.42.7: RESYNC: (1.74-1.76); FILE MERGED 2004/12/09 05:53:48 sb 1.69.42.6: RESYNC: (1.70-1.74); FILE MERGED 2004/11/10 18:27:19 mba 1.69.42.5: #110407#: wrong dispose handling of storages 2004/10/28 15:39:54 sb 1.69.42.4: RESYNC: (1.69-1.70); FILE MERGED 2004/10/27 15:49:39 mba 1.69.42.3: #110407#: for safety reasons don't dispose storages ATM 2004/10/27 11:42:25 sb 1.69.42.2: #110407# Made code compile on unxlngi6. 2004/10/26 15:46:54 mba 1.69.42.1: #110407#: remove static BaseURL
2005-01-11 12:32:15 +00:00
// BaseURL is part of the ItemSet
SfxMedium aMedium( xStorage, String(), &aSet );
aMedium.CanDisposeStorage_Impl( FALSE );
INTEGRATION: CWS fwk32 (1.104.10); FILE MERGED 2006/01/30 15:38:33 mba 1.104.10.1: #127149#: avoid storing own format with pFilter==0
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 );
}
INTEGRATION: CWS fwkbeta02 (1.74.8); FILE MERGED 2004/12/07 13:42:36 mav 1.74.8.1: #i38469# call saveCompleted
2004-12-09 15:00:39 +00:00
}
INTEGRATION: CWS fwk79 (1.131.8); FILE MERGED 2007/12/04 10:34:14 mav 1.131.8.1: #i83632# the error must be removed from the object shell after the saving
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
INTEGRATION: CWS fwkbeta02 (1.74.8); FILE MERGED 2004/12/07 13:42:36 mav 1.74.8.1: #i38469# call saveCompleted
2004-12-09 15:00:39 +00:00
if ( !bSuccess )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
throw task::ErrorCodeIOException( ::rtl::OUString(),
uno::Reference< uno::XInterface >(),
nError ? nError : ERRCODE_IO_GENERAL );
}
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& xStorage )
throw ( lang::IllegalArgumentException,
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
IOEXCEPTION,
EXCEPTION,
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xResult;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
if ( !m_pData->m_pObjectShell.Is() )
throw IOEXCEPTION(); // TODO:
INTEGRATION: CWS mav19 (1.103.6); FILE MERGED 2005/11/24 15:02:20 mav 1.103.6.2: #126228# improve storing of own objects inserted from file 2005/11/23 16:45:56 mav 1.103.6.1: #i58357# Use storage change notification
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 ) )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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;
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > SAL_CALL SfxBaseModel::getDocumentStorage()
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
throw ( IOEXCEPTION,
EXCEPTION,
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
uno::Reference< XSTORAGE > xResult;
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
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(
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
const uno::Reference< document::XStorageChangeListener >& xListener )
throw ( uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
m_pData->m_aInterfaceContainer.addInterface(
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::getCppuType((const uno::Reference< document::XStorageChangeListener >*)0), xListener );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
}
void SAL_CALL SfxBaseModel::removeStorageChangeListener(
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
const uno::Reference< document::XStorageChangeListener >& xListener )
throw ( uno::RuntimeException )
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS mav09 (1.55.16); FILE MERGED 2004/09/21 17:57:27 mav 1.55.16.34: RESYNC: (1.67-1.68); FILE MERGED 2004/09/08 08:16:53 mav 1.55.16.33: #i27773# embedded link must be stored in the same format 2004/09/02 14:47:39 mba 1.55.16.32: #i27773#: storage based documents don't own their storage 2004/08/27 07:06:37 mav 1.55.16.31: #i27773# close medium input and output stream completely 2004/08/25 12:00:24 mav 1.55.16.30: #i27773# model implements XStorageBasedDocument 2004/08/25 11:35:57 mav 1.55.16.29: #i27773# document storage related problems 2004/08/20 15:19:05 mav 1.55.16.28: #i27773# get rid of dead header 2004/08/16 08:42:05 mba 1.55.16.27: #i27773#: some TODOs checked 2004/07/15 10:55:42 mba 1.55.16.26: #i27773#: cleaning up todos 2004/07/14 12:13:03 mav 1.55.16.25: #i27773# fix resync related issues 2004/07/09 16:10:37 mav 1.55.16.24: RESYNC: (1.66-1.67); FILE MERGED 2004/07/07 17:24:37 mav 1.55.16.23: RESYNC: (1.63-1.66); FILE MERGED 2004/07/06 14:16:19 mav 1.55.16.22: #i27773# review and solve some TODOs 2004/07/02 16:37:20 mba 1.55.16.21: #i27773#: merge conflicts 2004/07/02 08:39:39 mba 1.55.16.20: #i27773#: some TODOs 2004/07/01 17:34:40 mav 1.55.16.19: #i27773# transport document error code 2004/06/29 14:37:43 mav 1.55.16.18: #i27773# cach only properties that are unknown by DocShell 2004/06/18 15:38:25 mav 1.55.16.17: #i27773# Document storage related UNO API 2004/06/17 10:58:58 mav 1.55.16.16: #i27773# retrieve suggested size for embedded document 2004/06/02 11:47:26 mba 1.55.16.15: #i27773#: use real MapUnit 2004/06/01 10:29:35 mav 1.55.16.14: #i27773# let streams be closed when requested 2004/05/28 16:17:19 mba 1.55.16.13: #27773#: some wrong MediaTypes 2004/05/24 09:00:40 mba 1.55.16.12: #i27773#: some changes about MapUnit 2004/05/19 09:53:20 mav 1.55.16.11: #i27773# adopt to incompatible changes that came with resync 2004/05/18 16:23:56 mav 1.55.16.10: #i27773# resolve resync problems 2004/05/17 16:07:33 mav 1.55.16.9: RESYNC: (1.61-1.63); FILE MERGED 2004/05/06 16:41:44 mba 1.55.16.8: #i27773#: some bugfixes in first testing 2004/05/05 13:48:33 mba 1.55.16.7: #i27773#: platform independent GUIDs 2004/05/04 13:02:18 mba 1.55.16.6: #i27773#: remove so3 2004/04/29 21:23:30 mav 1.55.16.5: RESYNC: (1.59-1.61); FILE MERGED 2004/04/14 11:46:13 mba 1.55.16.4: #i27773#: use new storage API; remove SO3 2004/03/11 10:15:26 mav 1.55.16.3: #115904# move GUISaveAs out of SfxDocShell 2004/03/02 08:31:03 mav 1.55.16.2: RESYNC: (1.55-1.59); FILE MERGED 2004/01/27 17:17:00 mav 1.55.16.1: #115011# allow to retrieve bitmaps
2004-10-04 19:57:20 +00:00
m_pData->m_aInterfaceContainer.removeInterface(
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
2007-07-18 05:53:49 +00:00
::getCppuType((const uno::Reference< document::XStorageChangeListener >*)0), xListener );
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
}
INTEGRATION: CWS basemodelrefactoring (1.120.92); FILE MERGED 2007/05/09 12:29:34 mba 1.120.92.5: resync errors 2007/05/09 00:46:21 mba 1.120.92.4: RESYNC: (1.120-1.122); FILE MERGED 2007/04/06 18:57:23 mba 1.120.92.3: #i75677#: superfluous includes in docfile.hxx removed 2007/03/26 13:44:01 mba 1.120.92.2: warning problem fixed 2007/03/24 19:30:22 mba 1.120.92.1: #i75677#: refactoring step 1
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;
}
INTEGRATION: CWS fwkbugfix02 (1.59.14); FILE MERGED 2004/04/27 10:44:28 mav 1.59.14.3: RESYNC: (1.59-1.61); FILE MERGED 2004/04/19 15:09:52 mav 1.59.14.2: #116056# object map mode 2004/04/16 08:52:26 mav 1.59.14.1: #116056# adopt to interfaces change
2004-05-10 16:33:10 +00:00
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
//=============================================================================
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
// css.frame.XModule
void SAL_CALL SfxBaseModel::setIdentifier(const ::rtl::OUString& Identifier)
throw (css::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
m_pData->m_sModuleIdentifier = Identifier;
}
//=============================================================================
// css.frame.XModule
::rtl::OUString SAL_CALL SfxBaseModel::getIdentifier()
throw (css::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
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();
}
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
//=============================================================================
css::uno::Reference< css::frame::XTitle > SfxBaseModel::impl_getTitleHelper ()
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 ()
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 ->
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
INTEGRATION: CWS mav32 (1.141.4); FILE MERGED 2008/04/18 15:12:22 mav 1.141.4.1: #i88435# use the correct suffix for the shared documents
2008-04-24 18:16:08 +00:00
::rtl::OUString aResult = impl_getTitleHelper()->getTitle ();
INTEGRATION: CWS mav37_DEV300 (1.144.92); FILE MERGED 2008/08/14 11:49:25 mav 1.144.92.1: #i92687# adjust title of readonly documents
2008-08-27 06:53:05 +00:00
if ( m_pData->m_pObjectShell )
{
CWS-TOOLING: integrate CWS fwk94_DEV300
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) );
}
CWS-TOOLING: integrate CWS cmcfixes57 2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes 2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings 2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings 2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings 2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts 2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends 2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
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()) )
INTEGRATION: CWS mav37_DEV300 (1.144.92); FILE MERGED 2008/08/14 11:49:25 mav 1.144.92.1: #i92687# adjust title of readonly documents
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) ) );
CWS-TOOLING: integrate CWS fwk94_DEV300
2008-11-19 13:34:57 +00:00
if ( m_pData->m_pObjectShell->GetDocumentSignatureState() == SIGNATURESTATE_SIGNATURES_OK )
aResult += String( SfxResId( RID_XMLSEC_DOCUMENTSIGNED ) );
INTEGRATION: CWS mav37_DEV300 (1.144.92); FILE MERGED 2008/08/14 11:49:25 mav 1.144.92.1: #i92687# adjust title of readonly documents
2008-08-27 06:53:05 +00:00
}
INTEGRATION: CWS mav32 (1.141.4); FILE MERGED 2008/04/18 15:12:22 mav 1.141.4.1: #i88435# use the correct suffix for the shared documents
2008-04-24 18:16:08 +00:00
return aResult;
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
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 ->
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 ->
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 ->
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
return impl_getUntitledHelper ()->leaseNumber (xComponent);
}
//=============================================================================
// css.frame.XUntitledNumbers
void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
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 )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
impl_getUntitledHelper ()->releaseNumberForComponent (xComponent);
}
//=============================================================================
// css.frame.XUntitledNumbers
::rtl::OUString SAL_CALL SfxBaseModel::getUntitledPrefix()
throw (css::uno::RuntimeException)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS titles02 (1.129.56); FILE MERGED 2008/02/29 11:02:33 as 1.129.56.4: RESYNC: (1.135-1.136); FILE MERGED 2008/02/12 13:28:56 as 1.129.56.3: RESYNC: (1.131-1.135); FILE MERGED 2007/12/04 10:09:42 as 1.129.56.2: RESYNC: (1.129-1.131); FILE MERGED 2007/10/12 13:09:26 as 1.129.56.1: #116375# support new title feature
2008-04-04 14:26:02 +00:00
return impl_getUntitledHelper ()->getUntitledPrefix ();
}
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory();
const sal_Int32 nViewFactoryCount = rDocumentFactory.GetViewFactoryCount();
Sequence< ::rtl::OUString > aViewNames( nViewFactoryCount );
for ( sal_Int32 nViewNo = 0; nViewNo < nViewFactoryCount; ++nViewNo )
autorecovery: step 2 of final roll up of calling hierarchy
2009-12-10 15:36:53 +01:00
aViewNames[nViewNo] = rDocumentFactory.GetViewFactory( nViewNo ).GetViewName();
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
return aViewNames;
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
}
//=============================================================================
// css::frame::XModel2
[CWS autorecovery] initial implementation of XModel2::createViewController
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 )
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
throw (css::uno::RuntimeException ,
css::lang::IllegalArgumentException,
css::uno::Exception )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory();
const ::rtl::OUString sDefaultViewName = rDocumentFactory.GetViewFactory( 0 ).GetViewName();
aGuard.clear();
return createViewController( sDefaultViewName, Sequence< PropertyValue >(), i_rFrame );
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
}
//=============================================================================
autorecovery: SfxBaseModel::createViewController: ensure the created SfxFrame (if any) is closed in case of a failure
2009-12-11 22:07:36 +01:00
namespace sfx { namespace intern {
/** a class which, in its dtor, cleans up variuos objects (well, at the moment only the frame) collected during
the creation of a document view, unless the creation was successful.
*/
class SAL_DLLPRIVATE ViewCreationGuard
{
public:
ViewCreationGuard()
:m_bSuccess( false )
{
}
~ViewCreationGuard()
{
if ( !m_bSuccess )
impl_closeAll();
}
void takeFrameOwnership( SfxFrame* i_pFrame )
{
OSL_PRECOND( !m_aWeakFrame, "ViewCreationGuard::takeFrameOwnership: already have a frame!" );
OSL_PRECOND( i_pFrame != NULL, "ViewCreationGuard::takeFrameOwnership: invalid frame!" );
m_aWeakFrame = i_pFrame;
}
void releaseAll()
{
m_bSuccess = true;
}
private:
void impl_closeAll()
{
if ( m_aWeakFrame && !m_aWeakFrame->GetCurrentDocument() )
{
m_aWeakFrame->SetFrameInterface_Impl( NULL );
m_aWeakFrame->DoClose();
}
}
private:
bool m_bSuccess;
SfxFrameWeak m_aWeakFrame;
};
} }
//=============================================================================
SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
{
SfxViewFrame* pViewFrame = NULL;
for ( pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), FALSE );
pViewFrame;
pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), FALSE )
)
{
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
if ( pViewFrame->GetFrame().GetFrameInterface() == i_rFrame )
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
break;
}
if ( !pViewFrame )
{
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
#if OSL_DEBUG_LEVEL > 0
for ( SfxFrame* pCheckFrame = SfxFrame::GetFirst();
pCheckFrame;
pCheckFrame = SfxFrame::GetNext( *pCheckFrame )
)
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
{
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
if ( pCheckFrame->GetFrameInterface() == i_rFrame )
{
if ( ( pCheckFrame->GetCurrentViewFrame() != NULL )
|| ( pCheckFrame->GetCurrentDocument() != NULL )
)
// Note that it is perfectly letgitimate that during loading into an XFrame which already contains
// a document, there exist two SfxFrame instances bound to this XFrame - the old one, which will be
// destroyed later, and the new one, which we're going to create
continue;
OSL_ENSURE( false, "SfxBaseModel::FindOrCreateViewFrame_Impl: there already is an SfxFrame for the given XFrame, but no view in it!" );
// nowadays, we're the only instance allowed to create an SfxFrame for an XFrame, so this case here should not happen
break;
}
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
}
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
#endif
SfxFrame* pTargetFrame = SfxFrame::Create( i_rFrame );
ENSURE_OR_THROW( pTargetFrame, "could not create an SfxFrame" );
autorecovery: SfxBaseModel::createViewController: ensure the created SfxFrame (if any) is closed in case of a failure
2009-12-11 22:07:36 +01:00
i_rGuard.takeFrameOwnership( pTargetFrame );
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
// prepare it
pTargetFrame->PrepareForDoc_Impl( *GetObjectShell() );
// create view frame
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
pViewFrame = new SfxViewFrame( *pTargetFrame, GetObjectShell() );
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
}
return pViewFrame;
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
}
//=============================================================================
// css::frame::XModel2
[CWS autorecovery] initial implementation of XModel2::createViewController
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 )
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
2007-04-16 15:57:05 +00:00
throw (css::uno::RuntimeException ,
css::lang::IllegalArgumentException,
css::uno::Exception )
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
if ( !i_rFrame.is() )
throw css::lang::IllegalArgumentException( ::rtl::OUString(), *this, 3 );
autorecovery: step 2 of final roll up of calling hierarchy
2009-12-10 15:36:53 +01:00
// find the proper SFX view factory
SfxViewFactory* pViewFactory = GetObjectShell()->GetFactory().GetViewFactoryByViewName( i_rViewName );
if ( !pViewFactory )
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
// determine previous shell (used in some special cases)
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
Reference< XController > xPreviousController( i_rFrame->getController() );
const Reference< XModel > xMe( this );
if ( ( xPreviousController.is() )
&& ( xMe != xPreviousController->getModel() )
)
{
xPreviousController.clear();
}
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
SfxViewShell* pOldViewShell = SfxViewShell::Get( xPreviousController );
OSL_ENSURE( !xPreviousController.is() || ( pOldViewShell != NULL ),
"SfxBaseModel::createViewController: invalid old controller!" );
autorecovery: SfxBaseModel::createViewController: ensure the created SfxFrame (if any) is closed in case of a failure
2009-12-11 22:07:36 +01:00
// a guard which will clean up in case of failure
::sfx::intern::ViewCreationGuard aViewCreationGuard;
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
// determine the ViewFrame belonging to the given XFrame
autorecovery: SfxBaseModel::createViewController: ensure the created SfxFrame (if any) is closed in case of a failure
2009-12-11 22:07:36 +01:00
SfxViewFrame* pViewFrame = FindOrCreateViewFrame_Impl( i_rFrame, aViewCreationGuard );
autorecovery: guard the creation of the SfxViewShell in Enter/LeaveRegistration
2009-12-10 13:20:56 +01:00
OSL_POSTCOND( pViewFrame, "SfxBaseModel::createViewController: no frame?" );
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
// delegate to SFX' view factory
autorecovery: guard the creation of the SfxViewShell in Enter/LeaveRegistration
2009-12-10 13:20:56 +01:00
pViewFrame->GetBindings().ENTERREGISTRATIONS();
autorecovery: step 2 of final roll up of calling hierarchy
2009-12-10 15:36:53 +01:00
SfxViewShell* pViewShell = pViewFactory->CreateInstance( pViewFrame, pOldViewShell );
autorecovery: guard the creation of the SfxViewShell in Enter/LeaveRegistration
2009-12-10 13:20:56 +01:00
pViewFrame->GetBindings().LEAVEREGISTRATIONS();
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
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 );
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
// remember ViewID
autorecovery: step 2 of final roll up of calling hierarchy
2009-12-10 15:36:53 +01:00
pViewFrame->SetCurViewId_Impl( pViewFactory->GetOrdinal() );
[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case
2009-12-03 09:29:45 +01:00
[CWS autorecovery] initial implementation of XModel2::createViewController
2009-12-03 09:29:45 +01:00
// ensure a default controller, if the view shell did not provide an own implementation
if ( !pViewShell->GetController().is() )
pViewShell->SetController( new SfxBaseController( pViewShell ) );
autorecovery: made JumpMark a argument of the to-be-created view. For this purpose, the loader moves this argument from the loader args to the args which are later passed to XModel2.createViewController, and the Controller implementation retrieves it from there. (In this course, XController2.getCreationArguments has been introduced, and implemented in the two known XController2 implementations in the code base.)
2009-12-11 11:28:14 +01:00
// pass the creation arguments to the controller
SfxBaseController* pBaseController = pViewShell->GetBaseController_Impl();
ENSURE_OR_THROW( pBaseController, "invalid controller implementation!" );
autorecovery: moved more SFX-dependent code from frame loader's ::load to proper place in SfxBaseModel/Controller
2009-12-11 21:51:06 +01:00
pBaseController->SetCreationArguments_Impl( i_rArguments );
autorecovery: made JumpMark a argument of the to-be-created view. For this purpose, the loader moves this argument from the loader args to the args which are later passed to XModel2.createViewController, and the Controller implementation retrieves it from there. (In this course, XController2.getCreationArguments has been introduced, and implemented in the two known XController2 implementations in the code base.)
2009-12-11 11:28:14 +01:00
autorecovery: streamlined InsertDocument_Impl, as preparation for moving its content into XModel2::createViewController or XController2::attachFrame or ...
2009-12-09 12:29:14 +01:00
// some initial view settings, coming from our most recent attachResource call
::comphelper::NamedValueCollection aDocumentLoadArgs( getArgs() );
if ( aDocumentLoadArgs.getOrDefault( "ViewOnly", false ) )
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
pViewFrame->GetFrame().SetMenuBarOn_Impl( FALSE );
autorecovery: streamlined InsertDocument_Impl, as preparation for moving its content into XModel2::createViewController or XController2::attachFrame or ...
2009-12-09 12:29:14 +01:00
autorecovery: moved some code from SfxFrame::InsertDocument_Impl to where the view is actually created (or connected)
2009-12-10 12:41:09 +01:00
const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
if ( nPluginMode == 1 )
{
pViewFrame->ForceOuterResize_Impl( FALSE );
pViewFrame->GetBindings().HidePopups( TRUE );
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
SfxFrame& rFrame = pViewFrame->GetFrame();
autorecovery: moved some code from SfxFrame::InsertDocument_Impl to where the view is actually created (or connected)
2009-12-10 12:41:09 +01:00
// MBA: layoutmanager of inplace frame starts locked and invisible
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( FALSE );
rFrame.GetWorkWindow_Impl()->Lock_Impl( TRUE );
autorecovery: moved some code from SfxFrame::InsertDocument_Impl to where the view is actually created (or connected)
2009-12-10 12:41:09 +01:00
autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL)
2009-12-15 23:07:57 +01:00
rFrame.GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
autorecovery: moved some code from SfxFrame::InsertDocument_Impl to where the view is actually created (or connected)
2009-12-10 12:41:09 +01:00
pViewFrame->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
}
autorecovery: SfxBaseModel::createViewController: ensure the created SfxFrame (if any) is closed in case of a failure
2009-12-11 22:07:36 +01:00
// tell the guard we were successful
aViewCreationGuard.releaseAll();
// outta gere
return pBaseController;
INTEGRATION: CWS fwkdbdesign01 (1.120.86); FILE MERGED 2007/02/26 13:27:03 as 1.120.86.1: #i66775# first draft of view factory, #i45663# support XModule interface
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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)
{
autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery In this course, the auto recovery learned to restore multiple views of a document. Also, in the course of the change, the LoadDispatchListener became superfluous, and was removed. Also, the loader code in dbaccess was slightly adjusted, since now the connectController call is in the responsibility of the loader, and must not happen inside the XController::attachModel call anymore. This change made the ModelControllerConnector class superfluous, so it has been removed, too.
2010-01-05 22:32:38 +01:00
SfxModelGuard aGuard( *this );
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
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);
}
Reference in New Issue Copy Permalink