2010-10-12 15:53:47 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2000-09-18 16:07:07 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2010-02-12 15:01:35 +01:00
|
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2008-04-11 12:09:13 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
|
|
|
************************************************************************/
|
2004-10-04 19:56:09 +00:00
|
|
|
|
2006-09-17 15:43:20 +00:00
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
#include <sot/storage.hxx>
|
2004-09-20 09:15:28 +00:00
|
|
|
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
|
2002-03-26 15:29:12 +00:00
|
|
|
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
|
|
|
|
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
|
2002-08-26 06:40:01 +00:00
|
|
|
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
|
|
|
|
#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
|
2002-04-12 12:51:03 +00:00
|
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
|
|
#include <com/sun/star/beans/XPropertyAccess.hpp>
|
2004-09-20 09:15:28 +00:00
|
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
2002-04-12 12:51:03 +00:00
|
|
|
#include <com/sun/star/beans/PropertyValue.hpp>
|
|
|
|
#include <com/sun/star/container/XNameAccess.hpp>
|
2002-04-30 12:35:41 +00:00
|
|
|
#include <com/sun/star/document/XExporter.hpp>
|
2002-08-28 14:21:01 +00:00
|
|
|
#include <com/sun/star/task/XInteractionHandler.hpp>
|
2004-11-17 12:37:17 +00:00
|
|
|
#include <com/sun/star/task/XStatusIndicator.hpp>
|
|
|
|
#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
|
2012-05-26 13:53:19 +02:00
|
|
|
#include <com/sun/star/frame/DocumentTemplates.hpp>
|
2006-07-13 12:28:42 +00:00
|
|
|
#include <com/sun/star/frame/XDocumentTemplates.hpp>
|
2004-10-04 19:56:09 +00:00
|
|
|
#include <com/sun/star/frame/XStorable.hpp>
|
2002-04-12 07:21:13 +00:00
|
|
|
#include <comphelper/processfactory.hxx>
|
2011-06-01 09:20:01 +01:00
|
|
|
#include <comphelper/servicehelper.hxx>
|
2005-11-11 09:20:30 +00:00
|
|
|
#include <com/sun/star/security/CertificateValidity.hpp>
|
|
|
|
|
|
|
|
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
|
2004-08-31 11:36:00 +00:00
|
|
|
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <tools/urlobj.hxx>
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/whiter.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <vcl/msgbox.hxx>
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/intitem.hxx>
|
|
|
|
#include <svl/eitem.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <vcl/wrkwin.hxx>
|
|
|
|
#include <svtools/sfxecode.hxx>
|
|
|
|
#include <svtools/ehdl.hxx>
|
|
|
|
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
#include <comphelper/string.hxx>
|
2005-04-13 11:40:59 +00:00
|
|
|
#include <basic/sbx.hxx>
|
2009-10-06 07:38:24 +02:00
|
|
|
#include <unotools/pathoptions.hxx>
|
|
|
|
#include <unotools/useroptions.hxx>
|
|
|
|
#include <unotools/saveopt.hxx>
|
2010-10-05 10:11:12 -04:00
|
|
|
#include <svtools/asynclink.hxx>
|
|
|
|
#include <svtools/miscopt.hxx>
|
2008-05-14 09:30:29 +00:00
|
|
|
#include <comphelper/documentconstants.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2007-06-27 22:23:45 +00:00
|
|
|
#include <sfx2/app.hxx>
|
2007-11-21 15:47:51 +00:00
|
|
|
#include <sfx2/signaturestate.hxx>
|
2010-04-16 23:02:51 +02:00
|
|
|
#include "sfx2/sfxresid.hxx"
|
2007-06-27 22:23:45 +00:00
|
|
|
#include <sfx2/event.hxx>
|
|
|
|
#include <sfx2/request.hxx>
|
|
|
|
#include <sfx2/printer.hxx>
|
|
|
|
#include <sfx2/viewsh.hxx>
|
|
|
|
#include <sfx2/doctdlg.hxx>
|
|
|
|
#include <sfx2/docfilt.hxx>
|
|
|
|
#include <sfx2/docfile.hxx>
|
|
|
|
#include <sfx2/dispatch.hxx>
|
|
|
|
#include <sfx2/dinfdlg.hxx>
|
|
|
|
#include <sfx2/objitem.hxx>
|
|
|
|
#include <sfx2/objsh.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include "objshimp.hxx"
|
|
|
|
#include "sfxtypes.hxx"
|
2007-06-27 22:23:45 +00:00
|
|
|
#include <sfx2/module.hxx>
|
2009-11-30 12:56:04 +01:00
|
|
|
#include <sfx2/viewfrm.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include "versdlg.hxx"
|
|
|
|
#include "doc.hrc"
|
2007-06-27 22:23:45 +00:00
|
|
|
#include <sfx2/docfac.hxx>
|
|
|
|
#include <sfx2/fcontnr.hxx>
|
2010-04-17 20:34:49 +02:00
|
|
|
#include "sfx2/sfxhelp.hxx"
|
2007-06-27 22:23:45 +00:00
|
|
|
#include <sfx2/msgpool.hxx>
|
|
|
|
#include <sfx2/objface.hxx>
|
2002-03-26 15:29:12 +00:00
|
|
|
|
2004-08-31 11:36:00 +00:00
|
|
|
#include "../appl/app.hrc"
|
|
|
|
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
|
|
|
|
#include <com/sun/star/embed/XTransactedObject.hpp>
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
#include <com/sun/star/util/XCloneable.hpp>
|
|
|
|
#include <com/sun/star/document/XDocumentProperties.hpp>
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2002-03-26 15:29:12 +00:00
|
|
|
#include "helpid.hrc"
|
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
#include "guisaveas.hxx"
|
|
|
|
|
2004-08-31 11:36:00 +00:00
|
|
|
using namespace ::com::sun::star;
|
2002-03-26 15:29:12 +00:00
|
|
|
using namespace ::com::sun::star::lang;
|
|
|
|
using namespace ::com::sun::star::uno;
|
|
|
|
using namespace ::com::sun::star::ui::dialogs;
|
2002-04-12 07:21:13 +00:00
|
|
|
using namespace ::com::sun::star::awt;
|
|
|
|
using namespace ::com::sun::star::container;
|
|
|
|
using namespace ::com::sun::star::beans;
|
2002-04-30 12:35:41 +00:00
|
|
|
using namespace ::com::sun::star::document;
|
2002-08-28 14:21:01 +00:00
|
|
|
using namespace ::com::sun::star::task;
|
2002-03-26 15:29:12 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
|
|
|
|
class SfxSaveAsContext_Impl
|
|
|
|
{
|
|
|
|
String& _rNewNameVar;
|
|
|
|
String _aNewName;
|
|
|
|
|
|
|
|
public:
|
|
|
|
SfxSaveAsContext_Impl( String &rNewNameVar,
|
|
|
|
const String &rNewName )
|
|
|
|
: _rNewNameVar( rNewNameVar ),
|
|
|
|
_aNewName( rNewName )
|
|
|
|
{ rNewNameVar = rNewName; }
|
|
|
|
~SfxSaveAsContext_Impl()
|
|
|
|
{ _rNewNameVar.Erase(); }
|
|
|
|
};
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
|
|
|
|
#define SfxObjectShell
|
|
|
|
#include "sfxslots.hxx"
|
|
|
|
|
|
|
|
//=========================================================================
|
|
|
|
|
2003-04-04 18:23:35 +00:00
|
|
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
SFX_IMPL_INTERFACE(SfxObjectShell,SfxShell,SfxResId(0))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
//=========================================================================
|
|
|
|
|
2006-02-09 13:07:43 +00:00
|
|
|
class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
|
|
|
|
{
|
|
|
|
sal_Bool m_bGotOwnership;
|
|
|
|
sal_Bool m_bPreventClose;
|
|
|
|
|
|
|
|
public:
|
|
|
|
SfxClosePreventer_Impl();
|
|
|
|
|
|
|
|
sal_Bool HasOwnership() { return m_bGotOwnership; }
|
|
|
|
|
|
|
|
void SetPreventClose( sal_Bool bPrevent ) { m_bPreventClose = bPrevent; }
|
|
|
|
|
|
|
|
virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership )
|
|
|
|
throw ( uno::RuntimeException, util::CloseVetoException );
|
|
|
|
|
|
|
|
virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException ) ;
|
|
|
|
|
|
|
|
virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException ) ;
|
|
|
|
|
|
|
|
} ;
|
|
|
|
|
|
|
|
SfxClosePreventer_Impl::SfxClosePreventer_Impl()
|
|
|
|
: m_bGotOwnership( sal_False )
|
|
|
|
, m_bPreventClose( sal_True )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2006-06-19 21:29:50 +00:00
|
|
|
void SAL_CALL SfxClosePreventer_Impl::queryClosing( const lang::EventObject&, sal_Bool bDeliverOwnership )
|
2006-02-09 13:07:43 +00:00
|
|
|
throw ( uno::RuntimeException, util::CloseVetoException )
|
|
|
|
{
|
|
|
|
if ( m_bPreventClose )
|
|
|
|
{
|
|
|
|
if ( !m_bGotOwnership )
|
|
|
|
m_bGotOwnership = bDeliverOwnership;
|
|
|
|
|
|
|
|
throw util::CloseVetoException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-19 21:29:50 +00:00
|
|
|
void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& ) throw ( uno::RuntimeException )
|
2006-02-09 13:07:43 +00:00
|
|
|
{}
|
|
|
|
|
2006-06-19 21:29:50 +00:00
|
|
|
void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException )
|
2006-02-09 13:07:43 +00:00
|
|
|
{}
|
|
|
|
|
|
|
|
//=========================================================================
|
|
|
|
class SfxInstanceCloseGuard_Impl
|
|
|
|
{
|
|
|
|
SfxClosePreventer_Impl* m_pPreventer;
|
|
|
|
uno::Reference< util::XCloseListener > m_xPreventer;
|
|
|
|
uno::Reference< util::XCloseable > m_xCloseable;
|
|
|
|
|
|
|
|
public:
|
|
|
|
SfxInstanceCloseGuard_Impl()
|
|
|
|
: m_pPreventer( NULL )
|
|
|
|
{}
|
|
|
|
|
|
|
|
~SfxInstanceCloseGuard_Impl();
|
|
|
|
|
|
|
|
sal_Bool Init_Impl( const uno::Reference< util::XCloseable >& xCloseable );
|
|
|
|
};
|
|
|
|
|
|
|
|
sal_Bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XCloseable >& xCloseable )
|
|
|
|
{
|
|
|
|
sal_Bool bResult = sal_False;
|
|
|
|
|
|
|
|
// do not allow reinit after the successful init
|
|
|
|
if ( xCloseable.is() && !m_xCloseable.is() )
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
m_pPreventer = new SfxClosePreventer_Impl();
|
|
|
|
m_xPreventer = uno::Reference< util::XCloseListener >( m_pPreventer );
|
|
|
|
xCloseable->addCloseListener( m_xPreventer );
|
|
|
|
m_xCloseable = xCloseable;
|
|
|
|
bResult = sal_True;
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
2011-03-19 14:09:49 +01:00
|
|
|
OSL_FAIL( "Could not register close listener!\n" );
|
2006-02-09 13:07:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bResult;
|
|
|
|
}
|
|
|
|
|
|
|
|
SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl()
|
|
|
|
{
|
|
|
|
if ( m_xCloseable.is() && m_xPreventer.is() )
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
m_xCloseable->removeCloseListener( m_xPreventer );
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
if ( m_pPreventer )
|
|
|
|
{
|
|
|
|
m_pPreventer->SetPreventClose( sal_False );
|
|
|
|
|
|
|
|
if ( m_pPreventer->HasOwnership() )
|
|
|
|
m_xCloseable->close( sal_True ); // TODO: do it asynchronously
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//=========================================================================
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq)
|
|
|
|
{
|
|
|
|
SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this);
|
|
|
|
if ( pFrame )
|
|
|
|
{
|
|
|
|
rReq.SetSlot( SID_PRINTDOC );
|
|
|
|
pFrame->GetViewShell()->ExecuteSlot(rReq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet)
|
|
|
|
{
|
2006-10-12 14:55:38 +00:00
|
|
|
bool bPrinting = false;
|
2009-11-30 12:56:04 +01:00
|
|
|
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( pFrame )
|
|
|
|
{
|
|
|
|
SfxPrinter *pPrinter = pFrame->GetViewShell()->GetPrinter();
|
|
|
|
bPrinting = pPrinter && pPrinter->IsPrinting();
|
|
|
|
}
|
|
|
|
rSet.Put( SfxBoolItem( SID_PRINTOUT, bPrinting ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-03-26 15:29:12 +00:00
|
|
|
|
|
|
|
sal_Bool SfxObjectShell::APISaveAs_Impl
|
|
|
|
(
|
|
|
|
const String& aFileName,
|
|
|
|
SfxItemSet* aParams
|
|
|
|
)
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_Bool bOk = sal_False;
|
2002-03-26 15:29:12 +00:00
|
|
|
|
|
|
|
{DBG_CHKTHIS(SfxObjectShell, 0);}
|
|
|
|
|
|
|
|
if ( GetMedium() )
|
|
|
|
{
|
2002-05-03 12:37:26 +00:00
|
|
|
String aFilterName;
|
|
|
|
SFX_ITEMSET_ARG( aParams, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False );
|
|
|
|
if( pFilterNameItem )
|
2005-01-21 16:34:09 +00:00
|
|
|
{
|
2002-05-03 12:37:26 +00:00
|
|
|
aFilterName = pFilterNameItem->GetValue();
|
2005-01-21 16:34:09 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, sal_False );
|
|
|
|
if ( pContentTypeItem )
|
|
|
|
{
|
|
|
|
const SfxFilter* pFilter = SfxFilterMatcher( String::CreateFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT );
|
|
|
|
if ( pFilter )
|
|
|
|
aFilterName = pFilter->GetName();
|
|
|
|
}
|
|
|
|
}
|
2002-05-03 12:37:26 +00:00
|
|
|
|
2002-04-12 07:21:13 +00:00
|
|
|
// in case no filter defined use default one
|
|
|
|
if( !aFilterName.Len() )
|
2002-03-26 15:29:12 +00:00
|
|
|
{
|
2004-04-29 15:42:03 +00:00
|
|
|
const SfxFilter* pFilt = SfxFilter::GetDefaultFilterFromFactory(GetFactory().GetFactoryName());
|
2002-03-26 15:29:12 +00:00
|
|
|
|
2002-04-12 07:21:13 +00:00
|
|
|
DBG_ASSERT( pFilt, "No default filter!\n" );
|
|
|
|
if( pFilt )
|
|
|
|
aFilterName = pFilt->GetFilterName();
|
|
|
|
|
|
|
|
aParams->Put(SfxStringItem( SID_FILTER_NAME, aFilterName));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
SfxObjectShellRef xLock( this ); // ???
|
|
|
|
|
2006-07-13 12:28:42 +00:00
|
|
|
// use the title that is provided in the media descriptor
|
|
|
|
SFX_ITEMSET_ARG( aParams, pDocTitleItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False );
|
|
|
|
if ( pDocTitleItem )
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
getDocProperties()->setTitle( pDocTitleItem->GetValue() );
|
2006-07-13 12:28:42 +00:00
|
|
|
|
2004-12-13 11:53:47 +00:00
|
|
|
bOk = CommonSaveAs_Impl( INetURLObject(aFileName), aFilterName,
|
|
|
|
aParams );
|
2002-03-26 15:29:12 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bOk;
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
|
|
|
|
{
|
|
|
|
{DBG_CHKTHIS(SfxObjectShell, 0);}
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_uInt16 nId = rReq.GetSlot();
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2004-11-26 14:08:03 +00:00
|
|
|
if( SID_SIGNATURE == nId || SID_MACRO_SIGNATURE == nId )
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
|
|
|
if ( QueryHiddenInformation( WhenSigning, NULL ) == RET_YES )
|
2004-11-26 14:08:03 +00:00
|
|
|
( SID_SIGNATURE == nId ) ? SignDocumentContent() : SignScriptingContent();
|
2004-08-31 11:36:00 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( !GetMedium() && nId != SID_CLOSEDOC )
|
2002-07-10 15:27:51 +00:00
|
|
|
{
|
|
|
|
rReq.Ignore();
|
2000-09-18 16:07:07 +00:00
|
|
|
return;
|
2002-07-10 15:27:51 +00:00
|
|
|
}
|
2002-03-26 15:29:12 +00:00
|
|
|
|
2006-02-09 13:07:43 +00:00
|
|
|
// this guard is created here to have it destruction at the end of the method
|
|
|
|
SfxInstanceCloseGuard_Impl aModelGuard;
|
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
sal_Bool bIsPDFExport = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
switch(nId)
|
|
|
|
{
|
|
|
|
case SID_VERSION:
|
|
|
|
{
|
|
|
|
SfxViewFrame* pFrame = GetFrame();
|
|
|
|
if ( !pFrame )
|
|
|
|
pFrame = SfxViewFrame::GetFirst( this );
|
|
|
|
if ( !pFrame )
|
|
|
|
return;
|
|
|
|
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame->GetFrame().GetParentFrame() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2002-07-10 15:27:51 +00:00
|
|
|
pFrame->GetTopViewFrame()->GetObjectShell()->ExecuteSlot( rReq );
|
|
|
|
return;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( !IsOwnStorageFormat_Impl( *GetMedium() ) )
|
|
|
|
return;
|
|
|
|
|
2007-07-17 12:44:02 +00:00
|
|
|
SfxVersionDialog *pDlg = new SfxVersionDialog( pFrame, IsSaveVersionOnClose() );
|
2000-09-18 16:07:07 +00:00
|
|
|
pDlg->Execute();
|
2007-07-17 12:44:02 +00:00
|
|
|
SetSaveVersionOnClose( pDlg->IsSaveVersionOnClose() );
|
2000-09-18 16:07:07 +00:00
|
|
|
delete pDlg;
|
2007-07-17 12:44:02 +00:00
|
|
|
rReq.Done();
|
2002-07-10 15:27:51 +00:00
|
|
|
return;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
case SID_DOCINFO:
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
|
2007-07-17 12:44:02 +00:00
|
|
|
if ( pDocInfItem )
|
|
|
|
{
|
|
|
|
// parameter, e.g. from replayed macro
|
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
|
|
|
pDocInfItem->UpdateDocumentInfo(getDocProperties(), true);
|
2007-07-17 12:44:02 +00:00
|
|
|
SetUseUserData( pDocInfItem->IsUseUserData() );
|
|
|
|
}
|
|
|
|
else
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2007-07-17 12:44:02 +00:00
|
|
|
// no argument containing DocInfo; check optional arguments
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_Bool bReadOnly = IsReadOnly();
|
|
|
|
SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False);
|
2007-07-17 12:44:02 +00:00
|
|
|
if ( pROItem )
|
|
|
|
// override readonly attribute of document
|
|
|
|
// e.g. if a readonly document is saved elsewhere and user asks for editing DocInfo before
|
|
|
|
bReadOnly = pROItem->GetValue();
|
|
|
|
|
|
|
|
// collect data for dialog
|
|
|
|
String aURL, aTitle;
|
2009-12-09 11:33:24 +01:00
|
|
|
if ( HasName() )
|
2007-07-17 12:44:02 +00:00
|
|
|
{
|
|
|
|
aURL = GetMedium()->GetName();
|
|
|
|
aTitle = GetTitle();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-09 11:33:24 +01:00
|
|
|
aURL = DEFINE_CONST_UNICODE( "private:factory/" );
|
|
|
|
aURL += String::CreateFromAscii( GetFactory().GetShortName() );
|
2007-07-17 12:44:02 +00:00
|
|
|
|
|
|
|
aTitle = GetTitle();
|
|
|
|
}
|
|
|
|
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
SfxDocumentInfoItem aDocInfoItem( aURL, getDocProperties(),
|
2009-01-21 15:28:14 +00:00
|
|
|
IsUseUserData() );
|
2007-07-17 12:44:02 +00:00
|
|
|
if ( !GetSlotState( SID_DOCTEMPLATE ) )
|
|
|
|
// templates not supported
|
2011-01-07 17:14:47 +01:00
|
|
|
aDocInfoItem.SetTemplate(sal_False);
|
2007-07-17 12:44:02 +00:00
|
|
|
|
|
|
|
SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY,
|
|
|
|
SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL,
|
|
|
|
0L );
|
|
|
|
aSet.Put( aDocInfoItem );
|
|
|
|
aSet.Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) );
|
|
|
|
aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, aTitle ) );
|
|
|
|
aSet.Put( SfxStringItem( SID_BASEURL, GetMedium()->GetBaseURL() ) );
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
// creating dialog is done via virtual method; application will
|
|
|
|
// add its own statistics page
|
2007-07-17 12:44:02 +00:00
|
|
|
SfxDocumentInfoDialog *pDlg = CreateDocumentInfoDialog(0, aSet);
|
|
|
|
if ( RET_OK == pDlg->Execute() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
|
2007-07-17 12:44:02 +00:00
|
|
|
if ( pDocInfoItem )
|
|
|
|
{
|
|
|
|
// user has done some changes to DocumentInfo
|
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
|
|
|
pDocInfoItem->UpdateDocumentInfo(getDocProperties());
|
2007-07-17 12:44:02 +00:00
|
|
|
SetUseUserData( ((const SfxDocumentInfoItem *)pDocInfoItem)->IsUseUserData() );
|
|
|
|
|
|
|
|
// add data from dialog for possible recording purposes
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
rReq.AppendItem( SfxDocumentInfoItem( GetTitle(),
|
2009-01-21 15:28:14 +00:00
|
|
|
getDocProperties(), IsUseUserData() ) );
|
2007-07-17 12:44:02 +00:00
|
|
|
}
|
2002-04-05 10:32:19 +00:00
|
|
|
|
2002-07-10 15:27:51 +00:00
|
|
|
rReq.Done();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
2007-07-17 12:44:02 +00:00
|
|
|
// nothing done; no recording
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Ignore();
|
|
|
|
|
2007-07-17 12:44:02 +00:00
|
|
|
delete pDlg;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2002-03-26 15:29:12 +00:00
|
|
|
|
2002-08-26 06:40:01 +00:00
|
|
|
case SID_EXPORTDOCASPDF:
|
|
|
|
case SID_DIRECTEXPORTDOCASPDF:
|
2004-10-04 19:56:09 +00:00
|
|
|
bIsPDFExport = sal_True;
|
|
|
|
case SID_EXPORTDOC:
|
2000-09-18 16:07:07 +00:00
|
|
|
case SID_SAVEASDOC:
|
2004-10-04 19:56:09 +00:00
|
|
|
case SID_SAVEDOC:
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2010-07-15 14:30:44 +02:00
|
|
|
// derived class may decide to abort this
|
|
|
|
if( !QuerySlotExecutable( nId ) )
|
2010-07-06 19:34:53 +02:00
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
|
2010-07-06 19:34:53 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
//!! detailed analysis of an error code
|
2000-09-18 16:07:07 +00:00
|
|
|
SfxObjectShellRef xLock( this );
|
|
|
|
|
2006-02-09 13:07:43 +00:00
|
|
|
// the model can not be closed till the end of this method
|
|
|
|
// if somebody tries to close it during this time the model will be closed
|
|
|
|
// at the end of the method
|
|
|
|
aModelGuard.Init_Impl( uno::Reference< util::XCloseable >( GetModel(), uno::UNO_QUERY ) );
|
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
sal_Bool bDialogUsed = sal_False;
|
|
|
|
sal_uInt32 nErrorCode = ERRCODE_NONE;
|
2005-07-20 11:26:35 +00:00
|
|
|
|
|
|
|
// by default versions should be preserved always except in case of an explicit
|
|
|
|
// SaveAs via GUI, so the flag must be set accordingly
|
|
|
|
pImp->bPreserveVersions = (nId == SID_SAVEDOC);
|
2004-10-04 19:56:09 +00:00
|
|
|
try
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2004-10-04 19:56:09 +00:00
|
|
|
SfxErrorContext aEc( ERRCTX_SFX_SAVEASDOC, GetTitle() ); // ???
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2005-02-25 08:36:27 +00:00
|
|
|
if ( nId == SID_SAVEASDOC )
|
|
|
|
{
|
|
|
|
// in case of plugin mode the SaveAs operation means SaveTo
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, sal_False );
|
2005-02-25 08:36:27 +00:00
|
|
|
if ( pViewOnlyItem && pViewOnlyItem->GetValue() )
|
|
|
|
rReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
|
|
|
|
}
|
|
|
|
|
2004-11-17 12:37:17 +00:00
|
|
|
// TODO/LATER: do the following GUI related actions in standalown method
|
|
|
|
// ========================================================================================================
|
|
|
|
// Introduce a status indicator for GUI operation
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
|
2004-11-17 12:37:17 +00:00
|
|
|
if ( !pStatusIndicatorItem )
|
|
|
|
{
|
|
|
|
// get statusindicator
|
|
|
|
uno::Reference< task::XStatusIndicator > xStatusIndicator;
|
|
|
|
SfxViewFrame *pFrame = GetFrame();
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame )
|
2004-11-17 12:37:17 +00:00
|
|
|
{
|
|
|
|
uno::Reference< task::XStatusIndicatorFactory > xStatFactory(
|
2009-12-15 23:07:57 +01:00
|
|
|
pFrame->GetFrame().GetFrameInterface(),
|
2004-11-17 12:37:17 +00:00
|
|
|
uno::UNO_QUERY );
|
|
|
|
if( xStatFactory.is() )
|
|
|
|
xStatusIndicator = xStatFactory->createStatusIndicator();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
OSL_ENSURE( xStatusIndicator.is(), "Can not retrieve default status indicator!\n" );
|
|
|
|
if ( xStatusIndicator.is() )
|
|
|
|
{
|
|
|
|
SfxUnoAnyItem aStatIndItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::makeAny( xStatusIndicator ) );
|
|
|
|
|
|
|
|
if ( nId == SID_SAVEDOC )
|
|
|
|
{
|
|
|
|
// in case of saving it is not possible to transport the parameters from here
|
|
|
|
// but it is not clear here whether the saving will be done or saveAs operation
|
|
|
|
GetMedium()->GetItemSet()->Put( aStatIndItem );
|
|
|
|
}
|
|
|
|
|
|
|
|
rReq.AppendItem( aStatIndItem );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( nId == SID_SAVEDOC )
|
|
|
|
{
|
|
|
|
// in case of saving it is not possible to transport the parameters from here
|
|
|
|
// but it is not clear here whether the saving will be done or saveAs operation
|
|
|
|
GetMedium()->GetItemSet()->Put( *pStatusIndicatorItem );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Introduce an interaction handler for GUI operation
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False );
|
2004-11-17 12:37:17 +00:00
|
|
|
if ( !pInteractionHandlerItem )
|
|
|
|
{
|
|
|
|
uno::Reference< task::XInteractionHandler > xInteract;
|
|
|
|
uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
|
|
|
|
if( xServiceManager.is() )
|
|
|
|
{
|
|
|
|
xInteract = Reference< XInteractionHandler >(
|
|
|
|
xServiceManager->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ),
|
|
|
|
UNO_QUERY );
|
|
|
|
}
|
|
|
|
|
|
|
|
OSL_ENSURE( xInteract.is(), "Can not retrieve default status indicator!\n" );
|
|
|
|
if ( xInteract.is() )
|
|
|
|
{
|
|
|
|
SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) );
|
|
|
|
if ( nId == SID_SAVEDOC )
|
|
|
|
{
|
|
|
|
// in case of saving it is not possible to transport the parameters from here
|
|
|
|
// but it is not clear here whether the saving will be done or saveAs operation
|
|
|
|
GetMedium()->GetItemSet()->Put( aInteractionItem );
|
|
|
|
}
|
|
|
|
|
|
|
|
rReq.AppendItem( aInteractionItem );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( nId == SID_SAVEDOC )
|
|
|
|
{
|
|
|
|
// in case of saving it is not possible to transport the parameters from here
|
|
|
|
// but it is not clear here whether the saving will be done or saveAs operation
|
|
|
|
GetMedium()->GetItemSet()->Put( *pInteractionHandlerItem );
|
|
|
|
}
|
|
|
|
// ========================================================================================================
|
|
|
|
|
2007-08-02 16:08:44 +00:00
|
|
|
sal_Bool bPreselectPassword = sal_False;
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False );
|
|
|
|
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, sal_False );
|
2010-11-05 15:58:35 +01:00
|
|
|
if ( pOldEncryptionDataItem || pOldPasswordItem )
|
2007-08-02 16:08:44 +00:00
|
|
|
bPreselectPassword = sal_True;
|
2005-01-31 07:45:08 +00:00
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
uno::Sequence< beans::PropertyValue > aDispatchArgs;
|
|
|
|
if ( rReq.GetArgs() )
|
|
|
|
TransformItems( nId,
|
|
|
|
*rReq.GetArgs(),
|
|
|
|
aDispatchArgs,
|
|
|
|
NULL );
|
|
|
|
|
|
|
|
const SfxSlot* pSlot = GetModule()->GetSlotPool()->GetSlot( nId );
|
|
|
|
if ( !pSlot )
|
|
|
|
throw uno::Exception();
|
|
|
|
|
|
|
|
uno::Reference< lang::XMultiServiceFactory > xEmptyFactory;
|
|
|
|
SfxStoringHelper aHelper( xEmptyFactory );
|
|
|
|
|
|
|
|
if ( QueryHiddenInformation( bIsPDFExport ? WhenCreatingPDF : WhenSaving, NULL ) == RET_YES )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2004-10-04 19:56:09 +00:00
|
|
|
bDialogUsed = aHelper.GUIStoreModel( GetModel(),
|
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::createFromAscii( pSlot->GetUnoName() ),
|
|
|
|
aDispatchArgs,
|
|
|
|
bPreselectPassword,
|
2009-09-17 13:53:54 +00:00
|
|
|
GetSharedFileURL(),
|
|
|
|
GetDocumentSignatureState() );
|
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
|
|
|
|
{
|
|
|
|
// the user has decided not to store the document
|
|
|
|
throw task::ErrorCodeIOException( ::rtl::OUString(),
|
|
|
|
uno::Reference< uno::XInterface >(),
|
|
|
|
ERRCODE_IO_ABORT );
|
|
|
|
}
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
// merge aDispatchArgs to the request
|
|
|
|
SfxAllItemSet aResultParams( GetPool() );
|
|
|
|
TransformParameters( nId,
|
|
|
|
aDispatchArgs,
|
|
|
|
aResultParams,
|
|
|
|
NULL );
|
|
|
|
rReq.SetArgs( aResultParams );
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False );
|
2004-10-04 19:56:09 +00:00
|
|
|
::rtl::OUString aFilterName = pFilterNameItem ? ::rtl::OUString( pFilterNameItem->GetValue() )
|
|
|
|
: ::rtl::OUString();
|
|
|
|
const SfxFilter* pFilt = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
|
|
|
|
|
|
|
|
OSL_ENSURE( nId == SID_SAVEDOC || pFilt, "The filter can not be zero since it was used for storing!\n" );
|
|
|
|
if ( bDialogUsed && pFilt
|
|
|
|
&& pFilt->IsOwnFormat()
|
|
|
|
&& pFilt->UsesStorage()
|
|
|
|
&& pFilt->GetVersion() >= SOFFICE_FILEFORMAT_60 )
|
|
|
|
{
|
|
|
|
SfxViewFrame* pDocViewFrame = SfxViewFrame::GetFirst( this );
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pDocViewFrame )
|
|
|
|
SfxHelp::OpenHelpAgent( &pDocViewFrame->GetFrame(), HID_DID_SAVE_PACKED_XML );
|
2004-10-04 19:56:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// the StoreAsURL/StoreToURL method have called this method with false
|
|
|
|
// so it has to be restored to true here since it is a call from GUI
|
|
|
|
GetMedium()->SetUpdatePickList( sal_True );
|
|
|
|
|
|
|
|
// TODO: in future it must be done in followind way
|
|
|
|
// if document is opened from GUI it is immediatelly appeares in the picklist
|
|
|
|
// if the document is a new one then it appeares in the picklist immediatelly
|
|
|
|
// after SaveAs operation triggered from GUI
|
|
|
|
}
|
2011-12-26 03:38:13 +09:00
|
|
|
catch( const task::ErrorCodeIOException& aErrorEx )
|
2004-10-04 19:56:09 +00:00
|
|
|
{
|
|
|
|
nErrorCode = (sal_uInt32)aErrorEx.ErrCode;
|
|
|
|
}
|
|
|
|
catch( Exception& )
|
|
|
|
{
|
|
|
|
nErrorCode = ERRCODE_IO_GENERAL;
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
2004-10-04 19:56:09 +00:00
|
|
|
|
2005-07-20 11:26:35 +00:00
|
|
|
// by default versions should be preserved always except in case of an explicit
|
|
|
|
// SaveAs via GUI, so the flag must be reset to guarantee this
|
|
|
|
pImp->bPreserveVersions = sal_True;
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_uIntPtr lErr=GetErrorCode();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
if ( !lErr && nErrorCode )
|
|
|
|
lErr = nErrorCode;
|
|
|
|
|
|
|
|
if ( lErr && nErrorCode == ERRCODE_NONE )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, sal_False );
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( pWarnItem && pWarnItem->GetValue() )
|
2004-10-04 19:56:09 +00:00
|
|
|
nErrorCode = lErr;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
// may be nErrorCode should be shown in future
|
|
|
|
if ( lErr != ERRCODE_IO_ABORT )
|
2003-04-04 18:23:35 +00:00
|
|
|
{
|
|
|
|
SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC,GetTitle());
|
2004-10-04 19:56:09 +00:00
|
|
|
ErrorHandler::HandleError( lErr );
|
2003-04-04 18:23:35 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2002-08-26 06:40:01 +00:00
|
|
|
if ( nId == SID_EXPORTDOCASPDF )
|
|
|
|
{
|
|
|
|
// This function is used by the SendMail function that needs information if a export
|
|
|
|
// file was written or not. This could be due to cancellation of the export
|
|
|
|
// or due to an error. So IO abort must be handled like an error!
|
2004-10-04 19:56:09 +00:00
|
|
|
nErrorCode = ( lErr != ERRCODE_IO_ABORT ) && ( nErrorCode == ERRCODE_NONE ) ? nErrorCode : lErr;
|
2002-08-26 06:40:01 +00:00
|
|
|
}
|
|
|
|
|
2004-10-04 19:56:09 +00:00
|
|
|
rReq.SetReturnValue( SfxBoolItem(0, nErrorCode == ERRCODE_NONE ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2002-08-26 06:40:01 +00:00
|
|
|
ResetError();
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
Invalidate();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2002-03-26 15:29:12 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
case SID_CLOSEDOC:
|
|
|
|
{
|
2002-10-07 08:56:25 +00:00
|
|
|
SfxViewFrame *pFrame = GetFrame();
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame && pFrame->GetFrame().GetParentFrame() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// If SID_CLOSEDOC is excecuted through menu and so on, but
|
|
|
|
// the current document is in a frame, then the
|
|
|
|
// FrameSetDocument should actually be closed.
|
2002-10-07 08:56:25 +00:00
|
|
|
pFrame->GetTopViewFrame()->GetObjectShell()->ExecuteSlot( rReq );
|
|
|
|
rReq.Done();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_Bool bInFrameSet = sal_False;
|
|
|
|
sal_uInt16 nFrames=0;
|
2002-10-07 08:56:25 +00:00
|
|
|
pFrame = SfxViewFrame::GetFirst( this );
|
|
|
|
while ( pFrame )
|
|
|
|
{
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame->GetFrame().GetParentFrame() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// In this document there still exists a view that is
|
|
|
|
// in a FrameSet , which of course may not be closed
|
2002-10-07 08:56:25 +00:00
|
|
|
// geclosed werden
|
2011-01-07 17:14:47 +01:00
|
|
|
bInFrameSet = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2002-10-07 08:56:25 +00:00
|
|
|
else
|
|
|
|
nFrames++;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2002-10-07 08:56:25 +00:00
|
|
|
pFrame = SfxViewFrame::GetNext( *pFrame, this );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( bInFrameSet )
|
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// Close all views that are not in a FrameSet.
|
2000-09-18 16:07:07 +00:00
|
|
|
pFrame = SfxViewFrame::GetFirst( this );
|
|
|
|
while ( pFrame )
|
|
|
|
{
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( !pFrame->GetFrame().GetParentFrame() )
|
|
|
|
pFrame->GetFrame().DoClose();
|
2000-09-18 16:07:07 +00:00
|
|
|
pFrame = SfxViewFrame::GetNext( *pFrame, this );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
// Evaluate Parameter
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, sal_False);
|
|
|
|
SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, sal_False);
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( pSaveItem )
|
|
|
|
{
|
|
|
|
if ( pSaveItem->GetValue() )
|
|
|
|
{
|
|
|
|
if ( !pNameItem )
|
|
|
|
{
|
2012-03-05 02:00:40 +02:00
|
|
|
#ifndef DISABLE_SCRIPTING
|
2000-09-18 16:07:07 +00:00
|
|
|
SbxBase::SetError( SbxERR_WRONG_ARGS );
|
2012-03-05 02:00:40 +02:00
|
|
|
#endif
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Ignore();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
SfxAllItemSet aArgs( GetPool() );
|
|
|
|
SfxStringItem aTmpItem( SID_FILE_NAME, pNameItem->GetValue() );
|
|
|
|
aArgs.Put( aTmpItem, aTmpItem.Which() );
|
|
|
|
SfxRequest aSaveAsReq( SID_SAVEASDOC, SFX_CALLMODE_API, aArgs );
|
|
|
|
ExecFile_Impl( aSaveAsReq );
|
|
|
|
if ( !aSaveAsReq.IsDone() )
|
|
|
|
{
|
|
|
|
rReq.Ignore();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2011-01-07 17:14:47 +01:00
|
|
|
SetModified(sal_False);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
// Cancelled by the user?
|
2001-08-31 14:52:31 +00:00
|
|
|
if ( !PrepareClose( 2 ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
rReq.SetReturnValue( SfxBoolItem(0, sal_False) );
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Done();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
SetModified( sal_False );
|
|
|
|
sal_uIntPtr lErr = GetErrorCode();
|
2000-09-18 16:07:07 +00:00
|
|
|
ErrorHandler::HandleError(lErr);
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
rReq.SetReturnValue( SfxBoolItem(0, sal_True) );
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Done();
|
2011-03-10 18:00:38 +05:30
|
|
|
rReq.ReleaseArgs(); // because the pool is destroyed in Close
|
2006-05-02 15:43:46 +00:00
|
|
|
DoClose();
|
2000-09-18 16:07:07 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
case SID_DOCTEMPLATE:
|
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// save as document templates
|
2000-09-18 16:07:07 +00:00
|
|
|
SfxDocumentTemplateDlg *pDlg = 0;
|
|
|
|
SfxErrorContext aEc(ERRCTX_SFX_DOCTEMPLATE,GetTitle());
|
|
|
|
SfxDocumentTemplates *pTemplates = new SfxDocumentTemplates;
|
|
|
|
|
|
|
|
if ( !rReq.GetArgs() )
|
|
|
|
{
|
|
|
|
pDlg = new SfxDocumentTemplateDlg(0, pTemplates);
|
|
|
|
if ( RET_OK == pDlg->Execute() && pDlg->GetTemplateName().Len())
|
|
|
|
{
|
|
|
|
rReq.AppendItem(SfxStringItem(
|
|
|
|
SID_TEMPLATE_NAME, pDlg->GetTemplateName()));
|
2006-07-13 12:28:42 +00:00
|
|
|
rReq.AppendItem(SfxStringItem(
|
|
|
|
SID_TEMPLATE_REGIONNAME, pDlg->GetRegionName()));
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
delete pDlg;
|
|
|
|
rReq.Ignore();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
|
|
|
|
SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
|
|
|
|
SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, sal_False);
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( (!pRegionItem && !pRegionNrItem ) || !pNameItem )
|
|
|
|
{
|
|
|
|
DBG_ASSERT( rReq.IsAPI(), "non-API call without Arguments" );
|
2012-03-05 02:00:40 +02:00
|
|
|
#ifndef DISABLE_SCRIPTING
|
2000-09-18 16:07:07 +00:00
|
|
|
SbxBase::SetError( SbxERR_WRONG_ARGS );
|
2012-03-05 02:00:40 +02:00
|
|
|
#endif
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Ignore();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-07-13 12:28:42 +00:00
|
|
|
::rtl::OUString aTemplateName = pNameItem->GetValue();
|
|
|
|
::rtl::OUString aTemplateGroup;
|
|
|
|
if ( pRegionItem )
|
|
|
|
aTemplateGroup = pRegionItem->GetValue();
|
|
|
|
else
|
|
|
|
// pRegionNrItem must not be NULL, it was just checked
|
|
|
|
aTemplateGroup = pTemplates->GetFullRegionName( pRegionNrItem->GetValue() );
|
|
|
|
// check Group and Name
|
|
|
|
delete pTemplates;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2006-07-13 12:28:42 +00:00
|
|
|
sal_Bool bOk = sal_False;
|
|
|
|
try
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-07-13 12:28:42 +00:00
|
|
|
uno::Reference< frame::XStorable > xStorable( GetModel(), uno::UNO_QUERY_THROW );
|
|
|
|
uno::Reference< frame::XDocumentTemplates > xTemplates(
|
2012-05-26 13:53:19 +02:00
|
|
|
frame::DocumentTemplates::create(comphelper::getProcessComponentContext()) );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2006-07-13 12:28:42 +00:00
|
|
|
bOk = xTemplates->storeTemplate( aTemplateGroup, aTemplateName, xStorable );
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
DELETEX(pDlg);
|
|
|
|
|
2006-07-13 12:28:42 +00:00
|
|
|
rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
|
|
|
|
if ( bOk )
|
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// update the Organizer runtime cache from the template
|
|
|
|
// component if the cache has already been created
|
2006-07-13 12:28:42 +00:00
|
|
|
// TODO/LATER: get rid of this cache duplication
|
|
|
|
SfxDocumentTemplates aTemplates;
|
|
|
|
aTemplates.ReInitFromComponent();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
|
2000-09-18 16:07:07 +00:00
|
|
|
return;
|
2006-07-13 12:28:42 +00:00
|
|
|
}
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
// Prevent entry in the Pick-lists
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( rReq.IsAPI() )
|
2011-01-07 17:14:47 +01:00
|
|
|
GetMedium()->SetUpdatePickList( sal_False );
|
2000-09-18 16:07:07 +00:00
|
|
|
else if ( rReq.GetArgs() )
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, sal_False );
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( pPicklistItem )
|
|
|
|
GetMedium()->SetUpdatePickList( pPicklistItem->GetValue() );
|
|
|
|
}
|
|
|
|
|
2011-03-10 18:00:38 +05:30
|
|
|
// Ignore()-branches have already returned
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.Done();
|
|
|
|
}
|
|
|
|
|
2010-07-06 19:34:53 +02:00
|
|
|
//-------------------------------------------------------------------------
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
|
|
|
|
{
|
|
|
|
DBG_CHKTHIS(SfxObjectShell, 0);
|
|
|
|
SfxWhichIter aIter( rSet );
|
2004-10-04 19:56:09 +00:00
|
|
|
|
2011-01-07 17:14:47 +01:00
|
|
|
for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
switch ( nWhich )
|
|
|
|
{
|
|
|
|
case SID_DOCTEMPLATE :
|
|
|
|
{
|
|
|
|
if ( !GetFactory().GetTemplateFilter() )
|
|
|
|
rSet.DisableItem( nWhich );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_VERSION:
|
|
|
|
{
|
|
|
|
SfxObjectShell *pDoc = this;
|
|
|
|
SfxViewFrame* pFrame = GetFrame();
|
|
|
|
if ( !pFrame )
|
|
|
|
pFrame = SfxViewFrame::GetFirst( this );
|
|
|
|
if ( pFrame )
|
|
|
|
{
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame->GetFrame().GetParentFrame() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
pFrame = pFrame->GetTopViewFrame();
|
|
|
|
pDoc = pFrame->GetObjectShell();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !pFrame || !pDoc->HasName() ||
|
2004-10-04 19:56:09 +00:00
|
|
|
!IsOwnStorageFormat_Impl( *pDoc->GetMedium() ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
rSet.DisableItem( nWhich );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case SID_SAVEDOC:
|
|
|
|
{
|
2010-10-05 10:11:12 -04:00
|
|
|
SvtMiscOptions aMiscOptions;
|
|
|
|
bool bAlwaysAllowSave = aMiscOptions.IsSaveAlwaysAllowed();
|
|
|
|
bool bAllowSave = (bAlwaysAllowSave || IsModified());
|
|
|
|
bool bMediumRO = IsReadOnlyMedium();
|
|
|
|
if ( !bMediumRO && GetMedium() && bAllowSave )
|
2000-09-18 16:07:07 +00:00
|
|
|
rSet.Put(SfxStringItem(
|
|
|
|
nWhich, String(SfxResId(STR_SAVEDOC))));
|
|
|
|
else
|
|
|
|
rSet.DisableItem(nWhich);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SID_DOCINFO:
|
|
|
|
if ( 0 != ( pImp->eFlags & SFXOBJECTSHELL_NODOCINFO ) )
|
|
|
|
rSet.DisableItem( nWhich );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SID_CLOSEDOC:
|
|
|
|
{
|
|
|
|
SfxObjectShell *pDoc = this;
|
|
|
|
SfxViewFrame *pFrame = GetFrame();
|
2009-12-15 23:07:57 +01:00
|
|
|
if ( pFrame && pFrame->GetFrame().GetParentFrame() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
|
|
|
|
// If SID_CLOSEDOC is excecuted through menu and so on, but
|
|
|
|
// the current document is in a frame, then the
|
|
|
|
// FrameSetDocument should actually be closed.
|
2000-09-18 16:07:07 +00:00
|
|
|
pDoc = pFrame->GetTopViewFrame()->GetObjectShell();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( pDoc->GetFlags() & SFXOBJECTSHELL_DONTCLOSE )
|
|
|
|
rSet.DisableItem(nWhich);
|
|
|
|
else
|
|
|
|
rSet.Put(SfxStringItem(nWhich, String(SfxResId(STR_CLOSEDOC))));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_SAVEASDOC:
|
|
|
|
{
|
|
|
|
if( ( pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) != SFX_LOADED_MAINDOCUMENT )
|
|
|
|
{
|
|
|
|
rSet.DisableItem( nWhich );
|
|
|
|
break;
|
|
|
|
}
|
2004-01-28 18:14:07 +00:00
|
|
|
if ( /*!pCombinedFilters ||*/ !GetMedium() )
|
2003-03-27 10:29:38 +00:00
|
|
|
rSet.DisableItem( nWhich );
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
|
|
|
rSet.Put( SfxStringItem( nWhich, String( SfxResId( STR_SAVEASDOC ) ) ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2002-08-26 06:40:01 +00:00
|
|
|
case SID_EXPORTDOCASPDF:
|
|
|
|
case SID_DIRECTEXPORTDOCASPDF:
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
case SID_DOC_MODIFIED:
|
|
|
|
{
|
2010-09-29 17:09:42 -04:00
|
|
|
rSet.Put( SfxBoolItem( SID_DOC_MODIFIED, IsModified() ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_MODIFIED:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxBoolItem( SID_MODIFIED, IsModified() ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCINFO_TITLE:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxStringItem(
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
SID_DOCINFO_TITLE, getDocProperties()->getTitle() ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case SID_FILE_NAME:
|
|
|
|
{
|
|
|
|
if( GetMedium() && HasName() )
|
|
|
|
rSet.Put( SfxStringItem(
|
|
|
|
SID_FILE_NAME, GetMedium()->GetName() ) );
|
|
|
|
break;
|
|
|
|
}
|
2004-08-31 11:36:00 +00:00
|
|
|
case SID_SIGNATURE:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxUInt16Item( SID_SIGNATURE, GetDocumentSignatureState() ) );
|
|
|
|
break;
|
|
|
|
}
|
2004-11-26 14:08:03 +00:00
|
|
|
case SID_MACRO_SIGNATURE:
|
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
// the slot makes sense only if there is a macro in the document
|
|
|
|
if ( pImp->documentStorageHasMacros() || pImp->aMacroMode.hasMacroLibrary() )
|
|
|
|
rSet.Put( SfxUInt16Item( SID_MACRO_SIGNATURE, GetScriptingSignatureState() ) );
|
|
|
|
else
|
|
|
|
rSet.DisableItem( nWhich );
|
2004-11-26 14:08:03 +00:00
|
|
|
break;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
|
|
|
|
{
|
|
|
|
switch ( rReq.GetSlot() )
|
|
|
|
{
|
|
|
|
case SID_MODIFIED:
|
|
|
|
{
|
|
|
|
SetModified( ( (SfxBoolItem&) rReq.GetArgs()->Get(SID_MODIFIED)).GetValue() );
|
|
|
|
rReq.Done();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCTITLE:
|
|
|
|
SetTitle( ( (SfxStringItem&) rReq.GetArgs()->Get(SID_DOCTITLE)).GetValue() );
|
|
|
|
rReq.Done();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SID_DOCINFO_AUTHOR :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue();
|
|
|
|
getDocProperties()->setAuthor( aStr );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCINFO_COMMENTS :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue();
|
|
|
|
getDocProperties()->setDescription( aStr );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCINFO_KEYWORDS :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue();
|
|
|
|
getDocProperties()->setKeywords(
|
|
|
|
::comphelper::string::convertCommaSeparated(aStr) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet)
|
|
|
|
{
|
|
|
|
SfxWhichIter aIter(rSet);
|
2011-01-07 17:14:47 +01:00
|
|
|
for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
switch ( nSID )
|
|
|
|
{
|
|
|
|
case SID_DOCINFO_AUTHOR :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
rSet.Put( SfxStringItem( nSID,
|
|
|
|
getDocProperties()->getAuthor() ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCINFO_COMMENTS :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
rSet.Put( SfxStringItem( nSID,
|
|
|
|
getDocProperties()->getDescription()) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCINFO_KEYWORDS :
|
|
|
|
{
|
INTEGRATION: CWS custommeta (1.101.20); FILE MERGED
2008/01/29 12:54:56 mst 1.101.20.4: interface change: convertCommaSeparated
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ remove functions convertCommaSeparated (moved to comphelper/string.hxx)
- sfx2/source/doc/{objserv.cxx,objstor.cxx,objuno.cxx},
sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/bastyp/{frmhtmlw.cxx,sfxhtml.cxx}:
+ adapt to convertCommaSeparated change (moved to comphelper)
2008/01/25 16:13:43 mst 1.101.20.3: 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.101.20.2: - sfx2/source/doc/objstor.cxx:
+ refactor DoLoad to use XDocumentProperties instead of SfxDocumentInfo
to delay initialization of the latter
2007/12/18 18:00:54 mst 1.101.20.1: interface change: remove assignment operator of SfxDocumentInfo
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/{docinf.cxx,objserv.cxx}:
+ removed SfxDocumentInfo::operator= and operator==
the assignment operator cannot be implemented reliably anymore
+ changed semantics of copy constructor!
now it creates a clone of the contained XDocumentInfo object
2008-02-26 14:09:58 +00:00
|
|
|
rSet.Put( SfxStringItem( nSID, ::comphelper::string::
|
|
|
|
convertCommaSeparated(getDocProperties()->getKeywords())) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCPATH:
|
|
|
|
{
|
2011-03-01 19:07:44 +01:00
|
|
|
OSL_FAIL( "Not supported anymore!" );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCFULLNAME:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxStringItem( SID_DOCFULLNAME, GetTitle(SFX_TITLE_FULLNAME) ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOCTITLE:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxStringItem( SID_DOCTITLE, GetTitle() ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOC_READONLY:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxBoolItem( SID_DOC_READONLY, IsReadOnly() ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOC_SAVED:
|
|
|
|
{
|
|
|
|
rSet.Put( SfxBoolItem( SID_DOC_SAVED, !IsModified() ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_CLOSING:
|
|
|
|
{
|
2009-12-09 11:33:24 +01:00
|
|
|
rSet.Put( SfxBoolItem( SID_CLOSING, false ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SID_DOC_LOADING:
|
|
|
|
rSet.Put( SfxBoolItem( nSID, SFX_LOADED_MAINDOCUMENT !=
|
|
|
|
( pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) ) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SID_IMG_LOADING:
|
|
|
|
rSet.Put( SfxBoolItem( nSID, SFX_LOADED_IMAGES !=
|
|
|
|
( pImp->nLoadedFlags & SFX_LOADED_IMAGES ) ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
|
|
|
void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
|
|
|
|
{
|
|
|
|
switch ( rReq.GetSlot() )
|
|
|
|
{
|
|
|
|
case SID_ACTIVATE:
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_True );
|
2000-09-18 16:07:07 +00:00
|
|
|
if ( pFrame )
|
2009-12-15 23:07:57 +01:00
|
|
|
pFrame->GetFrame().Appear();
|
2000-09-18 16:07:07 +00:00
|
|
|
rReq.SetReturnValue( SfxObjectItem( 0, pFrame ) );
|
|
|
|
rReq.Done();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case SID_NEWWINDOWFOREDIT:
|
|
|
|
{
|
|
|
|
SfxViewFrame* pFrame = SfxViewFrame::Current();
|
|
|
|
if( pFrame->GetObjectShell() == this &&
|
|
|
|
( pFrame->GetFrameType() & SFXFRAME_HASTITLE ) )
|
|
|
|
pFrame->ExecuteSlot( rReq );
|
|
|
|
else
|
|
|
|
{
|
|
|
|
String aFileName( GetObjectShell()->GetMedium()->GetName() );
|
|
|
|
if ( aFileName.Len() )
|
|
|
|
{
|
|
|
|
SfxStringItem aName( SID_FILE_NAME, aFileName );
|
2011-01-07 17:14:47 +01:00
|
|
|
SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, sal_True );
|
2000-09-18 16:07:07 +00:00
|
|
|
SFX_APP()->GetAppDispatcher_Impl()->Execute(
|
|
|
|
SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aName,
|
|
|
|
&aCreateView, 0L);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
|
2006-06-19 21:29:50 +00:00
|
|
|
void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2006-03-24 12:16:10 +00:00
|
|
|
sal_uInt16 SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequence< security::DocumentSignatureInformation >& aInfos )
|
|
|
|
{
|
|
|
|
sal_Bool bCertValid = sal_True;
|
|
|
|
sal_uInt16 nResult = SIGNATURESTATE_NOSIGNATURES;
|
|
|
|
int nInfos = aInfos.getLength();
|
2009-09-17 13:53:54 +00:00
|
|
|
bool bCompleteSignature = true;
|
2006-03-24 12:16:10 +00:00
|
|
|
if( nInfos )
|
|
|
|
{
|
|
|
|
nResult = SIGNATURESTATE_SIGNATURES_OK;
|
|
|
|
for ( int n = 0; n < nInfos; n++ )
|
|
|
|
{
|
|
|
|
if ( bCertValid )
|
|
|
|
{
|
|
|
|
sal_Int32 nCertStat = aInfos[n].CertificateStatus;
|
2009-11-13 13:51:33 +01:00
|
|
|
bCertValid = nCertStat == security::CertificateValidity::VALID ? sal_True : sal_False;
|
2006-03-24 12:16:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( !aInfos[n].SignatureIsValid )
|
|
|
|
{
|
|
|
|
nResult = SIGNATURESTATE_SIGNATURES_BROKEN;
|
|
|
|
break; // we know enough
|
|
|
|
}
|
2009-09-17 13:53:54 +00:00
|
|
|
bCompleteSignature &= !aInfos[n].PartialDocumentSignature;
|
2006-03-24 12:16:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( nResult == SIGNATURESTATE_SIGNATURES_OK && !bCertValid )
|
|
|
|
nResult = SIGNATURESTATE_SIGNATURES_NOTVALIDATED;
|
2009-09-17 13:53:54 +00:00
|
|
|
else if ( nResult == SIGNATURESTATE_SIGNATURES_OK && bCertValid && !bCompleteSignature)
|
|
|
|
nResult = SIGNATURESTATE_SIGNATURES_PARTIAL_OK;
|
2006-03-24 12:16:10 +00:00
|
|
|
|
|
|
|
// this code must not check whether the document is modified
|
|
|
|
// it should only check the provided info
|
|
|
|
|
|
|
|
return nResult;
|
|
|
|
}
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnalyzeSignature( sal_Bool bScriptingContent, const uno::Reference< security::XDocumentDigitalSignatures >& xSigner )
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
uno::Sequence< security::DocumentSignatureInformation > aResult;
|
|
|
|
uno::Reference< security::XDocumentDigitalSignatures > xLocSigner = xSigner;
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
if ( GetMedium() && GetMedium()->GetName().Len() && IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
try
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
if ( !xLocSigner.is() )
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
uno::Sequence< uno::Any > aArgs( 1 );
|
|
|
|
aArgs[0] <<= ::rtl::OUString();
|
|
|
|
try
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW );
|
|
|
|
aArgs[0] = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ) );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
2009-09-17 13:53:54 +00:00
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
xLocSigner.set( comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ), aArgs ), uno::UNO_QUERY_THROW );
|
|
|
|
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
2009-09-17 13:53:54 +00:00
|
|
|
|
|
|
|
if ( bScriptingContent )
|
|
|
|
aResult = xLocSigner->verifyScriptingContentSignatures( GetMedium()->GetZipStorageToSign_Impl(),
|
|
|
|
uno::Reference< io::XInputStream >() );
|
|
|
|
else
|
|
|
|
aResult = xLocSigner->verifyDocumentContentSignatures( GetMedium()->GetZipStorageToSign_Impl(),
|
|
|
|
uno::Reference< io::XInputStream >() );
|
|
|
|
}
|
|
|
|
catch( com::sun::star::uno::Exception& )
|
|
|
|
{
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
return aResult;
|
|
|
|
}
|
|
|
|
|
|
|
|
sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent )
|
|
|
|
{
|
|
|
|
sal_Int16* pState = bScriptingContent ? &pImp->nScriptingSignatureState : &pImp->nDocumentSignatureState;
|
|
|
|
|
|
|
|
if ( *pState == SIGNATURESTATE_UNKNOWN )
|
|
|
|
{
|
|
|
|
*pState = SIGNATURESTATE_NOSIGNATURES;
|
|
|
|
|
|
|
|
uno::Sequence< security::DocumentSignatureInformation > aInfos = ImplAnalyzeSignature( bScriptingContent );
|
|
|
|
*pState = ImplCheckSignaturesInformation( aInfos );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( *pState == SIGNATURESTATE_SIGNATURES_OK || *pState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
|
|
|
|
|| *pState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK)
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
|
|
|
if ( IsModified() )
|
|
|
|
*pState = SIGNATURESTATE_SIGNATURES_INVALID;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (sal_uInt16)*pState;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SfxObjectShell::ImplSign( sal_Bool bScriptingContent )
|
|
|
|
{
|
2008-05-14 09:30:29 +00:00
|
|
|
// Check if it is stored in OASIS format...
|
2010-04-27 12:34:19 +02:00
|
|
|
if ( GetMedium()
|
|
|
|
&& GetMedium()->GetFilter()
|
|
|
|
&& GetMedium()->GetName().Len()
|
|
|
|
&& ( !GetMedium()->GetFilter()->IsOwnFormat()
|
|
|
|
|| !GetMedium()->HasStorage_Impl()
|
|
|
|
)
|
|
|
|
)
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2008-05-14 09:30:29 +00:00
|
|
|
// Only OASIS and OOo6.x formats will be handled further
|
|
|
|
InfoBox( NULL, SfxResId( RID_XMLSEC_INFO_WRONGDOCFORMAT ) ).Execute();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// check whether the document is signed
|
|
|
|
ImplGetSignatureState( sal_False ); // document signature
|
|
|
|
ImplGetSignatureState( sal_True ); // script signature
|
|
|
|
sal_Bool bHasSign = ( pImp->nScriptingSignatureState != SIGNATURESTATE_NOSIGNATURES || pImp->nDocumentSignatureState != SIGNATURESTATE_NOSIGNATURES );
|
|
|
|
|
|
|
|
// the target ODF version on saving
|
|
|
|
SvtSaveOptions aSaveOpt;
|
|
|
|
SvtSaveOptions::ODFDefaultVersion nVersion = aSaveOpt.GetODFDefaultVersion();
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2008-05-14 09:30:29 +00:00
|
|
|
// the document is not new and is not modified
|
|
|
|
::rtl::OUString aODFVersion;
|
|
|
|
try
|
|
|
|
{
|
|
|
|
// check the version of the document
|
|
|
|
uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW );
|
|
|
|
xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ) ) >>= aODFVersion;
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
2008-05-14 09:30:29 +00:00
|
|
|
catch( uno::Exception& )
|
|
|
|
{}
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2008-05-14 09:30:29 +00:00
|
|
|
bool bNoSig = false;
|
|
|
|
|
|
|
|
if ( IsModified() || !GetMedium() || !GetMedium()->GetName().Len()
|
2009-04-23 12:23:13 +00:00
|
|
|
|| (!aODFVersion.equals( ODFVER_012_TEXT ) && !bHasSign) )
|
2004-08-31 11:36:00 +00:00
|
|
|
{
|
2008-05-14 09:30:29 +00:00
|
|
|
// the document might need saving ( new, modified or in ODF1.1 format without signature )
|
|
|
|
|
2009-09-16 13:55:36 +00:00
|
|
|
if ( nVersion >= SvtSaveOptions::ODFVER_012 )
|
2008-05-14 09:30:29 +00:00
|
|
|
{
|
|
|
|
|
2009-04-23 12:23:13 +00:00
|
|
|
if ( (bHasSign && QueryBox( NULL, SfxResId( MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN ) ).Execute() == RET_YES)
|
|
|
|
|| (!bHasSign && QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_SAVEBEFORESIGN ) ).Execute() == RET_YES) )
|
2008-05-14 09:30:29 +00:00
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
sal_uInt16 nId = SID_SAVEDOC;
|
2008-05-14 09:30:29 +00:00
|
|
|
if ( !GetMedium() || !GetMedium()->GetName().Len() )
|
|
|
|
nId = SID_SAVEASDOC;
|
|
|
|
SfxRequest aSaveRequest( nId, 0, GetPool() );
|
|
|
|
//ToDo: Review. We needed to call SetModified, otherwise the document would not be saved.
|
|
|
|
SetModified(sal_True);
|
|
|
|
ExecFile_Impl( aSaveRequest );
|
|
|
|
|
|
|
|
// Check if it is stored in OASIS format...
|
|
|
|
if ( GetMedium() && GetMedium()->GetFilter()
|
|
|
|
&& ( !GetMedium()->GetFilter()->IsOwnFormat() || !GetMedium()->HasStorage_Impl()
|
|
|
|
|| SotStorage::GetVersion( GetMedium()->GetStorage() ) <= SOFFICE_FILEFORMAT_60 ) )
|
|
|
|
{
|
|
|
|
// Only OASIS format will be handled further
|
|
|
|
InfoBox( NULL, SfxResId( RID_XMLSEC_INFO_WRONGDOCFORMAT ) ).Execute();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-03-10 18:00:38 +05:30
|
|
|
// When the document is modified then we must not show the
|
|
|
|
// digital signatures dialog
|
|
|
|
// If we have come here then the user denied to save.
|
2008-05-14 09:30:29 +00:00
|
|
|
if (!bHasSign)
|
|
|
|
bNoSig = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ErrorBox( NULL, WB_OK, SfxResId( STR_XMLSEC_ODF12_EXPECTED ) ).Execute();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( IsModified() || !GetMedium() || !GetMedium()->GetName().Len() )
|
|
|
|
return;
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
|
2005-07-12 11:26:12 +00:00
|
|
|
// the document is not modified currently, so it can not become modified after signing
|
|
|
|
sal_Bool bAllowModifiedBack = sal_False;
|
|
|
|
if ( IsEnableSetModified() )
|
|
|
|
{
|
|
|
|
EnableSetModified( sal_False );
|
|
|
|
bAllowModifiedBack = sal_True;
|
|
|
|
}
|
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
// we have to store to the original document, the original medium should be closed for this time
|
|
|
|
if ( !bNoSig
|
|
|
|
&& ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium ) )
|
2005-03-10 17:22:00 +00:00
|
|
|
{
|
2009-09-17 13:53:54 +00:00
|
|
|
GetMedium()->CloseAndRelease();
|
|
|
|
|
|
|
|
// We sign only ODF1.2, that means that if this point has been reached,
|
|
|
|
// the ODF1.2 signing process should be used.
|
|
|
|
// This code still might be called to show the signature of ODF1.1 document.
|
|
|
|
sal_Bool bSigned = GetMedium()->SignContents_Impl(
|
|
|
|
bScriptingContent,
|
|
|
|
aODFVersion,
|
|
|
|
pImp->nDocumentSignatureState == SIGNATURESTATE_SIGNATURES_OK
|
|
|
|
|| pImp->nDocumentSignatureState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
|
|
|
|
|| pImp->nDocumentSignatureState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK);
|
|
|
|
|
|
|
|
DoSaveCompleted( GetMedium() );
|
|
|
|
|
|
|
|
if ( bSigned )
|
|
|
|
{
|
|
|
|
if ( bScriptingContent )
|
|
|
|
{
|
|
|
|
pImp->nScriptingSignatureState = SIGNATURESTATE_UNKNOWN;// Re-Check
|
|
|
|
|
|
|
|
// adding of scripting signature removes existing document signature
|
|
|
|
pImp->nDocumentSignatureState = SIGNATURESTATE_UNKNOWN;// Re-Check
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pImp->nDocumentSignatureState = SIGNATURESTATE_UNKNOWN;// Re-Check
|
2004-08-31 11:36:00 +00:00
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
pImp->bSignatureErrorIsShown = sal_False;
|
2005-04-08 15:22:51 +00:00
|
|
|
|
2009-09-17 13:53:54 +00:00
|
|
|
Invalidate( SID_SIGNATURE );
|
|
|
|
Invalidate( SID_MACRO_SIGNATURE );
|
|
|
|
Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) );
|
|
|
|
}
|
2005-03-10 17:22:00 +00:00
|
|
|
}
|
2005-07-12 11:26:12 +00:00
|
|
|
|
|
|
|
if ( bAllowModifiedBack )
|
|
|
|
EnableSetModified( sal_True );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sal_uInt16 SfxObjectShell::GetDocumentSignatureState()
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
return ImplGetSignatureState( sal_False );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SfxObjectShell::SignDocumentContent()
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
ImplSign( sal_False );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sal_uInt16 SfxObjectShell::GetScriptingSignatureState()
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
return ImplGetSignatureState( sal_True );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SfxObjectShell::SignScriptingContent()
|
|
|
|
{
|
2011-01-07 17:14:47 +01:00
|
|
|
ImplSign( sal_True );
|
2004-08-31 11:36:00 +00:00
|
|
|
}
|
2004-11-26 14:08:03 +00:00
|
|
|
|
2011-06-01 09:20:01 +01:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
class theSfxObjectShellUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSfxObjectShellUnoTunnelId > {};
|
|
|
|
}
|
|
|
|
|
2009-09-18 15:24:22 +00:00
|
|
|
const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId()
|
|
|
|
{
|
2011-06-01 09:20:01 +01:00
|
|
|
return theSfxObjectShellUnoTunnelId::get().getSeq();
|
2009-09-18 15:24:22 +00:00
|
|
|
}
|
2010-10-12 15:53:47 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|