[Libreoffice-commits] .: 8 commits - binfilter/bf_sw binfilter/filter binfilter/inc filter/source
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Sun Jan 23 22:24:45 PST 2011
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 14
binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx | 120 --
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 202 ---
binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx | 114 --
binfilter/bf_sw/source/filter/ascii/wrtasc.hxx | 2
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 59 -
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx | 188 ---
binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx | 117 --
binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx | 2
binfilter/bf_sw/source/filter/writer/sw_writer.cxx | 61 -
binfilter/bf_sw/source/filter/xml/makefile.mk | 3
binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx | 549 ----------
binfilter/bf_sw/source/filter/xml/wrtxml.hxx | 104 -
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 208 ---
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 7
binfilter/inc/bf_sw/iodetect.hxx | 22
binfilter/inc/bf_sw/shellio.hxx | 83 -
binfilter/inc/bf_sw/sw3io.hxx | 2
filter/source/config/fragments/filters/StarWriter_3_0.xcu | 2
filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu | 2
filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu | 2
filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu | 2
filter/source/config/fragments/filters/StarWriter_4_0.xcu | 2
filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu | 2
filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu | 2
filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu | 2
filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu | 2
filter/source/config/fragments/filters/StarWriter_5_0.xcu | 2
filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu | 2
filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu | 2
filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu | 2
filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu | 2
filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu | 2
filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu | 2
34 files changed, 49 insertions(+), 1840 deletions(-)
New commits:
commit d0fad1cd6d588da4e7228a83191a37086d4ead5b
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Jan 14 21:33:20 2011 +0100
delete in binfilter bf_sw class SwWriter
deletion of write classes within the binfilter. Still not going out of
the StarWrtier range
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 981d57a..74730f1 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -867,20 +867,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/
-/*N*/ #ifdef JP_DEBUG
-/*N*/ {
-/*N*/ extern Writer* GetDebugWriter(const String&);
-/*N*/
-/*N*/ Writer* pWriter = GetDebugWriter(aEmptyStr);
-/*N*/ if( pWriter )
-/*N*/ {
-/*N*/ int nError;
-/*N*/ SvFileStream aStrm( "c:\\$$copy.db", STREAM_WRITE );
-/*N*/ SwWriter aWriter( aStrm, *pMyDoc );
-/*N*/ aWriter.Write( &nError, pWriter );
-/*N*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ }
/*N*/ void SwNodes::_DelDummyNodes( const SwNodeRange& rRg )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 8b5f461..0525dc0 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -288,7 +288,6 @@ void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
SwIoSystem::GetWriter( C2S(FILTER_TEXT_DLG), xWrt );
if( xWrt.Is() )
{
- SwWriter aWriter( aStream, aCrsr );
xWrt->bASCII_NoLastLineEnd = sal_True;
SwAsciiOptions aOpt = xWrt->GetAsciiOptions();
aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index 6971334..021958c 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -486,37 +486,6 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
}
-/*
- * Writer
- */
-
-/*
- * Konstruktoren, Destruktoren sind inline (inc/shellio.hxx).
- */
-
-/*N*/ SwWriter::SwWriter( SvStream& rStrm, SwPaM& rPam, BOOL bWriteAll )
-/*N*/ : pStrm( &rStrm ),
-/*N*/ pStg( 0 ),
-/*N*/ pMedium( 0 ),
-/*N*/ pShell( 0 ),
-/*N*/ pOutPam( &rPam ),
-/*N*/ rDoc( *rPam.GetDoc() ),
-/*N*/ bWriteAll( bWriteAll )
-/*N*/ {
-/*N*/ }
-
-
-/*N*/ SwWriter::SwWriter(SvStorage& rStg,SwDoc &rDoc)
-/*N*/ :pStrm( 0 ),
-/*N*/ pStg( &rStg ),
-/*N*/ pMedium( 0 ),
-/*N*/ pShell( 0 ),
-/*N*/ pOutPam( 0 ),
-/*N*/ rDoc( rDoc ),
-/*N*/ bWriteAll( TRUE )
-/*N*/ {
-/*N*/ }
-
/*N*/ BOOL SetHTMLTemplate( SwDoc & /*rDoc*/ )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return FALSE;
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 3cfccbb..0cd0e14 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -434,25 +434,6 @@ SV_IMPL_REF(Writer)
// speziellen Writer
-
-class SwWriter
-{
- SvStream* pStrm;
- SvStorage* pStg;
- SfxMedium* pMedium;
-
- SwPaM* pOutPam;
- SwCrsrShell *pShell;
- SwDoc &rDoc;
- BOOL bWriteAll;
-
-public:
-
- SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE );
- SwWriter( SvStorage&, SwDoc & );
-};
-
-
void GetRTFWriter( const String&, WriterRef& );
void GetASCWriter( const String&, WriterRef& );
commit f99fc98db445797639120c4c1df8e4251d620782
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Jan 14 21:14:16 2011 +0100
delete in binfilter/bf_sw class StgWriter
cleaning write functionalities within binfilter / in starWriter part
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index f4b082f..3cfccbb 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -430,26 +430,11 @@ SV_DECL_REF(Writer)
#endif
SV_IMPL_REF(Writer)
-// Basisklasse fuer alle Storage-Writer
-
-class StgWriter : public Writer
-{
-protected:
- String aFltName;
- SvStorage* pStg;
-
-public:
- StgWriter() : Writer(), pStg( 0 ) {}
-
- SvStorage& GetStorage() const { return *pStg; }
- const String& GetFltName() const { return aFltName; }
- void SetFltName( const String& r ) { aFltName = r; }
-};
-
-
// Schnittstellenklasse fuer den allgemeinen Zugriff auf die
// speziellen Writer
+
+
class SwWriter
{
SvStream* pStrm;
@@ -467,6 +452,7 @@ public:
SwWriter( SvStorage&, SwDoc & );
};
+
void GetRTFWriter( const String&, WriterRef& );
void GetASCWriter( const String&, WriterRef& );
commit 6fb51962d83899e006739e9b50bbb3bc7920a06c
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Fri Jan 14 19:13:25 2011 +0100
delete binfilter/bf_sw SwXMLWriter class
cleaning part of the binfilter. deletion of now unneeded classes
within binfilter/bf_sw. Currently only the StarWriter part is touched
diff --git a/binfilter/bf_sw/source/filter/xml/makefile.mk b/binfilter/bf_sw/source/filter/xml/makefile.mk
index 413481d..335dc1c 100644
--- a/binfilter/bf_sw/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sw/source/filter/xml/makefile.mk
@@ -54,7 +54,6 @@ CDEFS=$(CDEFS) -Dmydebug
CXXFILES = \
sw_swxml.cxx \
sw_xmlimp.cxx \
- sw_wrtxml.cxx \
sw_xmlexp.cxx \
sw_xmltext.cxx \
sw_xmltexte.cxx \
@@ -79,7 +78,6 @@ CXXFILES = \
SLOFILES = \
$(SLO)$/sw_swxml.obj \
$(SLO)$/sw_xmlimp.obj \
- $(SLO)$/sw_wrtxml.obj \
$(SLO)$/sw_xmlexp.obj \
$(SLO)$/sw_xmltext.obj \
$(SLO)$/sw_xmltexte.obj \
@@ -105,7 +103,6 @@ SLOFILES = \
EXCEPTIONSFILES= \
$(SLO)$/sw_swxml.obj \
$(SLO)$/sw_xmlimp.obj \
- $(SLO)$/sw_wrtxml.obj \
$(SLO)$/sw_xmlexp.obj \
$(SLO)$/sw_xmltext.obj \
$(SLO)$/sw_xmltexti.obj \
diff --git a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx b/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
deleted file mode 100644
index a6f1be6..0000000
--- a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/genericpropertyset.hxx>
-#include <unotools/streamwrap.hxx>
-#include <bf_svx/xmlgrhlp.hxx>
-#include <bf_svx/xmleohlp.hxx>
-#include <bf_svtools/saveopt.hxx>
-
-#include <bf_sfx2/docfile.hxx>
-
-#include <errhdl.hxx>
-
-#include <pam.hxx>
-
-#include <horiornt.hxx>
-
-#include <doc.hxx>
-#include <docstat.hxx>
-#include <docsh.hxx>
-
-#include <errhdl.hxx>
-#include <swerror.h>
-#include <wrtxml.hxx>
-#include <xmlexp.hxx>
-#include <statstr.hrc>
-#include <rtl/logfile.hxx>
-#include <legacysmgr/legacy_binfilters_smgr.hxx>
-namespace binfilter {
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-
-using rtl::OUString;
-
-#define LOGFILE_AUTHOR "mb93740"
-
-SwXMLWriter::SwXMLWriter()
-{
-}
-
-
-SwXMLWriter::~SwXMLWriter()
-{
-}
-
-
-sal_uInt32 SwXMLWriter::_Write()
-{
- // Get service factory
- Reference< lang::XMultiServiceFactory > xServiceFactory =
- ::legacy_binfilters::getLegacyProcessServiceFactory();
- ASSERT( xServiceFactory.is(),
- "SwXMLWriter::Write: got no service manager" );
- if( !xServiceFactory.is() )
- return ERR_SWG_WRITE_ERROR;
-
- // Get data sink ...
- Reference< io::XOutputStream > xOut;
- SvStorageStreamRef xDocStream;
- Reference< document::XGraphicObjectResolver > xGraphicResolver;
- SvXMLGraphicHelper *pGraphicHelper = 0;
- Reference< document::XEmbeddedObjectResolver > xObjectResolver;
- SvXMLEmbeddedObjectHelper *pObjectHelper = 0;
-
- ASSERT( pStg, "Where is my storage?" );
- pGraphicHelper = SvXMLGraphicHelper::Create( *pStg,
- GRAPHICHELPER_MODE_WRITE,
- sal_False );
- xGraphicResolver = pGraphicHelper;
-
- SvPersist *pPersist = pDoc->GetPersist();
- if( pPersist )
- {
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
- *pStg, *pPersist,
- EMBEDDEDOBJECTHELPER_MODE_WRITE,
- sal_False );
- xObjectResolver = pObjectHelper;
- }
-
- // create and prepare the XPropertySet that gets passed through
- // the components, and the XStatusIndicator that shows progress to
- // the user.
-
- // create XPropertySet with three properties for status indicator
- ::comphelper::PropertyMapEntry aInfoMap[] =
- {
- { "ProgressRange", sizeof("ProgressRange")-1, 0,
- &::getCppuType((sal_Int32*)0),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "ProgressMax", sizeof("ProgressMax")-1, 0,
- &::getCppuType((sal_Int32*)0),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "ProgressCurrent", sizeof("ProgressCurrent")-1, 0,
- &::getCppuType((sal_Int32*)0),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "WrittenNumberStyles", sizeof("WrittenNumberStyles")-1, 0,
- &::getCppuType((uno::Sequence<sal_Int32> *)0),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0,
- &::getBooleanCppuType(),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "ShowChanges", sizeof("ShowChanges")-1, 0,
- &::getBooleanCppuType(),
- beans::PropertyAttribute::MAYBEVOID, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
- };
- uno::Reference< beans::XPropertySet > xInfoSet(
- ::comphelper::GenericPropertySet_CreateInstance(
- new comphelper::PropertySetInfo( aInfoMap ) ) );
-
- // create XStatusIndicator
- uno::Reference<task::XStatusIndicator> xStatusIndicator;
-
- uno::Any aAny;
- if (bShowProgress)
- {
- try
- {
- uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel());
- if (xModel.is())
- {
- uno::Reference<frame::XController> xController(
- xModel->getCurrentController());
- if( xController.is())
- {
- uno::Reference<frame::XFrame> xFrame( xController->getFrame());
- if( xFrame.is())
- {
- uno::Reference<task::XStatusIndicatorFactory> xFactory(
- xFrame, uno::UNO_QUERY );
- if( xFactory.is())
- {
- xStatusIndicator =
- xFactory->createStatusIndicator();
- }
- }
- }
- }
- }
- catch( const RuntimeException& )
- {
- xStatusIndicator = 0;
- }
-
- // set progress range and start status indicator
- sal_Int32 nProgressRange(1000000);
- if (xStatusIndicator.is())
- {
- xStatusIndicator->start(SW_RESSTR( STR_STATSTR_SWGWRITE),
- nProgressRange);
- }
- aAny <<= nProgressRange;
- OUString sProgressRange(RTL_CONSTASCII_USTRINGPARAM("ProgressRange"));
- xInfoSet->setPropertyValue(sProgressRange, aAny);
-
- aAny <<= XML_PROGRESS_REF_NOT_SET;
- OUString sProgressMax(RTL_CONSTASCII_USTRINGPARAM("ProgressMax"));
- xInfoSet->setPropertyValue(sProgressMax, aAny);
- }
- SvtSaveOptions aSaveOpt;
- OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
- sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
- aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() );
- xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny );
-
- // save show redline mode ...
- OUString sShowChanges(RTL_CONSTASCII_USTRINGPARAM("ShowChanges"));
- sal_uInt16 nRedlineMode = pDoc->GetRedlineMode();
- sal_Bool bShowChanges( IsShowChanges( nRedlineMode ) );
- aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
- xInfoSet->setPropertyValue( sShowChanges, aAny );
- // ... and hide redlines for export
- nRedlineMode &= ~REDLINE_SHOW_MASK;
- nRedlineMode |= REDLINE_SHOW_INSERT;
- pDoc->SetRedlineMode( nRedlineMode );
-
-
- // filter arguments
- // - graphics + object resolver for styles + content
- // - status indicator
- // - info property set
- // - else empty
- sal_Int32 nArgs = 1;
- if( xStatusIndicator.is() )
- nArgs++;
-
- Sequence < Any > aEmptyArgs( nArgs );
- Any *pArgs = aEmptyArgs.getArray();
- if( xStatusIndicator.is() )
- *pArgs++ <<= xStatusIndicator;
- *pArgs++ <<= xInfoSet;
-
- if( xGraphicResolver.is() )
- nArgs++;
- if( xObjectResolver.is() )
- nArgs++;
-
- Sequence < Any > aFilterArgs( nArgs );
- pArgs = aFilterArgs.getArray();
- if( xGraphicResolver.is() )
- *pArgs++ <<= xGraphicResolver;
- if( xObjectResolver.is() )
- *pArgs++ <<= xObjectResolver;
- if( xStatusIndicator.is() )
- *pArgs++ <<= xStatusIndicator;
- *pArgs++ <<= xInfoSet;
-
- //Get model
- Reference< lang::XComponent > xModelComp(
- pDoc->GetDocShell()->GetModel(), UNO_QUERY );
- ASSERT( xModelComp.is(), "XMLWriter::Write: got no model" );
- if( !xModelComp.is() )
- return ERR_SWG_WRITE_ERROR;
-
- PutNumFmtFontsInAttrPool();
- PutEditEngFontsInAttrPool();
-
- // properties
- Sequence < PropertyValue > aProps( pOrigFileName ? 1 : 0 );
- if( pOrigFileName )
- {
- PropertyValue *pProps = aProps.getArray();
- pProps->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FileName") );
- (pProps++)->Value <<= OUString( *pOrigFileName );
- }
-
- // export sub streams for package, else full stream into a file
- sal_Bool bWarn = sal_False, bErr = sal_False;
- String sWarnFile, sErrFile;
-
- if( !bOrganizerMode && !bBlock &&
- SFX_CREATE_MODE_EMBEDDED != pDoc->GetDocShell()->GetCreateMode() )
- {
- if( !WriteThroughComponent(
- xModelComp, "meta.xml", xServiceFactory,
- "com.sun.star.comp.Writer.XMLMetaExporter",
- aEmptyArgs, aProps, sal_True ) )
- {
- bWarn = sal_True;
- sWarnFile = String( RTL_CONSTASCII_STRINGPARAM("meta.xml"),
- RTL_TEXTENCODING_ASCII_US );
- }
- }
-
- if( !WriteThroughComponent(
- xModelComp, "styles.xml", xServiceFactory,
- "com.sun.star.comp.Writer.XMLStylesExporter",
- aFilterArgs, aProps, sal_False ) )
- {
- bErr = sal_True;
- sErrFile = String( RTL_CONSTASCII_STRINGPARAM("styles.xml"),
- RTL_TEXTENCODING_ASCII_US );
- }
-
- if( !bErr )
- {
- if( !bBlock )
- {
- if( !WriteThroughComponent(
- xModelComp, "settings.xml", xServiceFactory,
- "com.sun.star.comp.Writer.XMLSettingsExporter",
- aEmptyArgs, aProps, sal_False ) )
- {
- if( !bWarn )
- {
- bWarn = sal_True;
- sWarnFile = String( RTL_CONSTASCII_STRINGPARAM("settings.xml"),
- RTL_TEXTENCODING_ASCII_US );
- }
- }
- }
- }
-
- if( !bOrganizerMode && !bErr )
- {
- if( !WriteThroughComponent(
- xModelComp, "content.xml", xServiceFactory,
- "com.sun.star.comp.Writer.XMLContentExporter",
- aFilterArgs, aProps, sal_False ) )
- {
- bErr = sal_True;
- sErrFile = String( RTL_CONSTASCII_STRINGPARAM("content.xml"),
- RTL_TEXTENCODING_ASCII_US );
- }
- }
-
- if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
- !(bOrganizerMode || bBlock || bErr) )
- {
- OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") );
- SvStorageStreamRef xStrm = pStg->OpenStream( sStreamName,
- STREAM_WRITE | STREAM_SHARE_DENYWRITE );
- DBG_ASSERT(xStrm.Is(), "Can't create output stream in package!");
- if( xStrm.Is() )
- {
- xStrm->SetSize( 0 );
- String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("appication/binary") );
- uno::Any aAny;
- aAny <<= aMime;
- xStrm->SetProperty( aPropName, aAny );
- xStrm->SetBufferSize( 16*1024 );
- pDoc->WriteLayoutCache( *xStrm );
- xStrm->Commit();
- }
- }
-
- if( pGraphicHelper )
- SvXMLGraphicHelper::Destroy( pGraphicHelper );
- xGraphicResolver = 0;
-
- if( pObjectHelper )
- SvXMLEmbeddedObjectHelper::Destroy( pObjectHelper );
- xObjectResolver = 0;
-
- // restore redline mode
- aAny = xInfoSet->getPropertyValue( sShowChanges );
- nRedlineMode = pDoc->GetRedlineMode();
- nRedlineMode &= ~REDLINE_SHOW_MASK;
- nRedlineMode |= REDLINE_SHOW_INSERT;
- if ( *(sal_Bool*)aAny.getValue() )
- nRedlineMode |= REDLINE_SHOW_DELETE;
- pDoc->SetRedlineMode( nRedlineMode );
-
- if (xStatusIndicator.is())
- {
- xStatusIndicator->end();
- }
-
- if( bErr )
- {
- if( sErrFile.Len() )
- return *new StringErrorInfo( ERR_WRITE_ERROR_FILE, sErrFile,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
- else
- return ERR_SWG_WRITE_ERROR;
- }
- else if( bWarn )
- {
- if( sWarnFile.Len() )
- return *new StringErrorInfo( WARN_WRITE_ERROR_FILE, sWarnFile,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
- else
- return WARN_SWG_FEATURES_LOST;
- }
-
- return 0;
-}
-
-ULONG SwXMLWriter::WriteStorage()
-{
- return _Write();
-}
-
-sal_Bool SwXMLWriter::WriteThroughComponent(
- const Reference<XComponent> & xComponent,
- const sal_Char* pStreamName,
- const Reference<lang::XMultiServiceFactory> & rFactory,
- const sal_Char* pServiceName,
- const Sequence<Any> & rArguments,
- const Sequence<beans::PropertyValue> & rMediaDesc,
- sal_Bool bPlainStream )
-{
- DBG_ASSERT( NULL != pStg, "Need storage!" );
- DBG_ASSERT( NULL != pStreamName, "Need stream name!" );
- DBG_ASSERT( NULL != pServiceName, "Need service name!" );
-
- RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR,
- "SwXMLWriter::WriteThroughComponent : stream %s",
- pStreamName );
-
- Reference< io::XOutputStream > xOutputStream;
- SvStorageStreamRef xDocStream;
-
- // open stream
- OUString sStreamName = OUString::createFromAscii( pStreamName );
- xDocStream = pStg->OpenStream( sStreamName,
- STREAM_WRITE | STREAM_SHARE_DENYWRITE );
- DBG_ASSERT(xDocStream.Is(), "Can't create output stream in package!");
- if (! xDocStream.Is())
- return sal_False;
-
- xDocStream->SetSize( 0 );
-
- String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
- uno::Any aAny;
- aAny <<= aMime;
- xDocStream->SetProperty( aPropName, aAny );
-
- if( bPlainStream )
- {
- OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("Compressed") );
- sal_Bool bFalse = sal_False;
- aAny.setValue( &bFalse, ::getBooleanCppuType() );
- xDocStream->SetProperty( aPropName, aAny );
- }
- else
- {
- OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("Encrypted") );
- sal_Bool bTrue = sal_True;
- aAny.setValue( &bTrue, ::getBooleanCppuType() );
- xDocStream->SetProperty( aPropName, aAny );
- }
-
-
- // set buffer and create outputstream
- xDocStream->SetBufferSize( 16*1024 );
- xOutputStream = new ::utl::OOutputStreamWrapper( *xDocStream );
-
- // write the stuff
- sal_Bool bRet = WriteThroughComponent(
- xOutputStream, xComponent, rFactory,
- pServiceName, rArguments, rMediaDesc );
-
- // finally, commit stream.
- if( bRet )
- xDocStream->Commit();
-
- return bRet;
-
-}
-
-sal_Bool SwXMLWriter::WriteThroughComponent(
- const Reference<io::XOutputStream> & xOutputStream,
- const Reference<XComponent> & xComponent,
- const Reference<XMultiServiceFactory> & rFactory,
- const sal_Char* pServiceName,
- const Sequence<Any> & rArguments,
- const Sequence<PropertyValue> & rMediaDesc )
-{
- ASSERT( xOutputStream.is(), "I really need an output stream!" );
- ASSERT( xComponent.is(), "Need component!" );
- ASSERT( NULL != pServiceName, "Need component name!" );
-
- RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", LOGFILE_AUTHOR,
- "SwXMLWriter::WriteThroughComponent" );
-
- // get component
- Reference< io::XActiveDataSource > xSaxWriter(
- rFactory->createInstance(
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.xml.sax.Writer")) ),
- UNO_QUERY );
- ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
- if(!xSaxWriter.is())
- return sal_False;
-
- RTL_LOGFILE_CONTEXT_TRACE( aFilterLog, "SAX-Writer created" );
-
- // connect XML writer to output stream
- xSaxWriter->setOutputStream( xOutputStream );
-
- // prepare arguments (prepend doc handler to given arguments)
- Reference<xml::sax::XDocumentHandler> xDocHandler( xSaxWriter,UNO_QUERY);
- Sequence<Any> aArgs( 1 + rArguments.getLength() );
- aArgs[0] <<= xDocHandler;
- for(sal_Int32 i = 0; i < rArguments.getLength(); i++)
- aArgs[i+1] = rArguments[i];
-
- // get filter component
- Reference< document::XExporter > xExporter(
- rFactory->createInstanceWithArguments(
- OUString::createFromAscii(pServiceName), aArgs), UNO_QUERY);
- ASSERT( xExporter.is(),
- "can't instantiate export filter component" );
- if( !xExporter.is() )
- return sal_False;
- RTL_LOGFILE_CONTEXT_TRACE1( aFilterLog, "%s instantiated.", pServiceName );
-
- // set block mode (if appropriate)
- if( bBlock )
- {
- Reference<XUnoTunnel> xFilterTunnel( xExporter, UNO_QUERY );
- if (xFilterTunnel.is())
- {
- SwXMLExport *pFilter = (SwXMLExport *)xFilterTunnel->getSomething(
- SwXMLExport::getUnoTunnelId() );
- if (NULL != pFilter)
- pFilter->setBlockMode();
- }
- }
-
-
- // connect model and filter
- xExporter->setSourceDocument( xComponent );
-
- // filter!
- RTL_LOGFILE_CONTEXT_TRACE( aFilterLog, "call filter()" );
- Reference<XFilter> xFilter( xExporter, UNO_QUERY );
- return xFilter->filter( rMediaDesc );
-}
-
-void GetXMLWriter( const String& /*rName*/, WriterRef& xRet )
-{
- xRet = new SwXMLWriter();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/xml/wrtxml.hxx b/binfilter/bf_sw/source/filter/xml/wrtxml.hxx
deleted file mode 100644
index 4387249..0000000
--- a/binfilter/bf_sw/source/filter/xml/wrtxml.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _WRTXML_HXX
-#define _WRTXML_HXX
-
-#include <shellio.hxx>
-namespace com { namespace sun { namespace start {
- namespace uno { template<class A> class Reference; }
- namespace uno { template<class A> class Sequence; }
- namespace uno { class Any; }
- namespace lang { class XComponent; }
- namespace lang { class XMultiServiceFactory; }
- namespace beans { struct PropertyValue; }
-} } }
-namespace binfilter {
-
-class SwDoc;
-class SwPaM;
-class SfxMedium;
-
-
-class SwXMLWriter : public StgWriter
-{
- sal_uInt32 _Write();
-
-protected:
- virtual ULONG WriteStorage();
-
-public:
-
- SwXMLWriter();
- virtual ~SwXMLWriter();
-
-private:
-
- // helper methods to write XML streams
-
- /// write a single XML stream into the package
- sal_Bool WriteThroughComponent(
- /// the component we export
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent> & xComponent,
- const sal_Char* pStreamName, /// the stream name
- /// service factory for pServiceName
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory> & rFactory,
- const sal_Char* pServiceName, /// service name of the component
- /// the argument (XInitialization)
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any> & rArguments,
- /// output descriptor
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue> & rMediaDesc,
- sal_Bool bPlainStream ); /// neither compress nor encrypt
-
- /// write a single output stream
- /// (to be called either directly or by WriteThroughComponent(...))
- sal_Bool WriteThroughComponent(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XOutputStream> & xOutputStream,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent> & xComponent,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory> & rFactory,
- const sal_Char* pServiceName,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any> & rArguments,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue> & rMediaDesc );
-};
-
-
-} //namespace binfilter
-#endif // _WRTXML_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index a1c0df3..3c9d98c 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -169,7 +169,7 @@ SwIoDetect aReaderWriter[ MAXFILTER ] = { \
{/* 13*/ SwIoEntry(sExcel, 4, 0, FALSE)}, \
{/* 14*/ SwIoEntry(sLotusD, 5, 0, TRUE)}, \
{/* 18*/ SwIoEntry(sSwg1, 4, 0, FALSE)}, \
- {/* 19*/ SwIoEntry(FILTER_XML, 4, &::binfilter::GetXMLWriter, TRUE)} \
+ {/* 19*/ SwIoEntry(FILTER_XML, 4, 0, TRUE)} \
\
, \
/*last*/ {SwIoEntry(FILTER_TEXT, 4, &::binfilter::GetASCWriter, TRUE)} \
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index e2baa20..f4b082f 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -469,7 +469,6 @@ public:
void GetRTFWriter( const String&, WriterRef& );
void GetASCWriter( const String&, WriterRef& );
-void GetXMLWriter( const String&, WriterRef& );
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
commit 5833e44cf236601f4a9f9a470756638937621a1d
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Tue Jan 11 16:45:02 2011 +0100
class Sw3Writer in binfilter deleted
this class has been deleted with all its dependencies witin bf_sw,
aka StarWriter filter functionalities.
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 5f2851a..0dba035 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -121,9 +121,6 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
/*N*/ ASSERT( MAXFILTER == nCnt, "Anzahl Filter ungleich der Definierten" );
/*N*/ }
-
-
-
/*N*/ void _FinitFilter()
/*N*/ {
/*N*/ // die Reader vernichten
@@ -136,8 +133,6 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
/*N*/ }
-/* */
-
/*N*/ void SwIoSystem::GetWriter( const String& rFltName, WriterRef& xRet )
/*N*/ {
/*N*/ for( USHORT n = 0; n < MAXFILTER; ++n )
@@ -190,17 +185,8 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
/*N*/ }
-/* */
-
/////////////// die Storage Reader/Writer ////////////////////////////////
-
-/*N*/ void GetSw3Writer( const String&, WriterRef& xRet )
-/*N*/ {
-/*N*/ xRet = new Sw3Writer;
-/*N*/ }
-
-
ULONG StgReader::OpenMainStream( SvStorageStreamRef& rRef, USHORT& rBuffSize )
{
ULONG nRet = ERR_SWG_READ_ERROR;
@@ -227,8 +213,6 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
return nRet;
}
-/* */
-
/*N*/ ULONG Sw3Reader::Read( SwDoc & /*rDoc*/, SwPaM &rPam, const String & )
/*N*/ {
@@ -265,9 +249,6 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
BOOL Writer::IsSw3Writer() const { return FALSE; }
-/* */
-
-
ULONG SwgReader::Read( SwDoc &rDoc, SwPaM &rPam, const String& rFileName )
{
if( !pStrm )
@@ -337,8 +318,6 @@ ULONG SwgReader::Read( SwDoc &rDoc, SwPaM &rPam, const String& rFileName )
return bRes;
}
-/* */
-
//-----------------------------------------------------------------------
// Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt.
//-----------------------------------------------------------------------
@@ -432,15 +411,6 @@ ULONG SwgReader::Read( SwDoc &rDoc, SwPaM &rPam, const String& rFileName )
return bExist;
}
-/* */
-
-
-
-
-
-
-/* */
-
SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, BOOL bNDoc )
: bNewDoc( bNDoc )
{
@@ -604,7 +574,7 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
}
}
}
-/* */
+
struct CharSetNameMap
{
rtl_TextEncoding eCode;
@@ -711,6 +681,7 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
};
return &aMapArr[0];
}
+
/*
Get a rtl_TextEncoding from its name
*/
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index ebcc175..a1c0df3 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -29,9 +29,6 @@
#ifndef _IODETECT_HXX
#define _IODETECT_HXX
-
-
-
#ifdef IS_SW_DLL
#include <shellio.hxx>
#endif
@@ -160,30 +157,20 @@ sal_Char sSwDos[] = "SW6"; \
\
\
SwIoDetect aReaderWriter[ MAXFILTER ] = { \
- {/* 0*/ SwIoEntry(FILTER_SW5, 4, &::binfilter::GetSw3Writer, TRUE)}, \
- {/* 1*/ SwIoEntry(FILTER_SW4, 4, &::binfilter::GetSw3Writer, FALSE)}, \
- {/* 2*/ SwIoEntry(FILTER_SW3, 4, &::binfilter::GetSw3Writer, FALSE)}, \
+ {/* 0*/ SwIoEntry(FILTER_SW5, 4, 0, TRUE)}, \
+ {/* 1*/ SwIoEntry(FILTER_SW4, 4, 0, FALSE)}, \
+ {/* 2*/ SwIoEntry(FILTER_SW3, 4, 0, FALSE)}, \
{/* 3*/ SwIoEntry(FILTER_SWG, STRING_LEN, 0, TRUE)}, \
{/* 4*/ SwIoEntry(FILTER_SWGV, 4, 0, FALSE)}, \
-/* 5 SwIoEntry(FILTER_RTF, STRING_LEN, &::GetRTFWriter, TRUE), */\
{/* 6*/ SwIoEntry(sSwDos, STRING_LEN, 0, TRUE)}, \
{/* 7*/ SwIoEntry(FILTER_BAS, STRING_LEN, &::binfilter::GetASCWriter, FALSE)}, \
-/* 8 SwIoEntry(sWW6, STRING_LEN, &::GetWW8Writer, TRUE), */\
-/* 9 SwIoEntry(FILTER_WW8, STRING_LEN, &::GetWW8Writer, FALSE), */\
{/* 10*/ SwIoEntry(FILTER_W4W, 3, &::binfilter::GetW4WWriter, TRUE)}, \
-/* 11 SwIoEntry(sRtfWH, STRING_LEN, &::GetRTFWriter, FALSE), */\
{/* 12*/ SwIoEntry(sCExcel, 5, 0, TRUE)}, \
{/* 13*/ SwIoEntry(sExcel, 4, 0, FALSE)}, \
{/* 14*/ SwIoEntry(sLotusD, 5, 0, TRUE)}, \
-/* 15 SwIoEntry(sHTML, 4, &::GetHTMLWriter, TRUE), */\
-/* 16 SwIoEntry(sWW1, STRING_LEN, 0, TRUE), */\
-/* 17 SwIoEntry(sWW5, STRING_LEN, 0, FALSE), */\
{/* 18*/ SwIoEntry(sSwg1, 4, 0, FALSE)}, \
{/* 19*/ SwIoEntry(FILTER_XML, 4, &::binfilter::GetXMLWriter, TRUE)} \
\
-/* opt DEB_SH_SwIoEntry(sW4W_Int, STRING_LEN, 0, TRUE) */\
-/* opt DEB_DBWRT_SwIoEntry(sDebug,STRING_LEN, &::GetDebugWriter, FALSE) */\
-/* opt DEB_DBWRT_SwIoEntry(sUndo, STRING_LEN, &::GetUndoWriter, FALSE) */\
, \
/*last*/ {SwIoEntry(FILTER_TEXT, 4, &::binfilter::GetASCWriter, TRUE)} \
}; \
@@ -203,7 +190,6 @@ struct W1_FIB
USHORT nFibGet() { return SVBT16ToShort(nFib); }
USHORT wIdentGet() { return SVBT16ToShort(wIdent); }
USHORT fFlagsGet() { return SVBT16ToShort(fFlags); }
- // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format.
BOOL fComplexGet() { return ((fFlagsGet() >> 2) & 1); }
};
#if OSL_DEBUG_LEVEL > 1
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 027d2da..e2baa20 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -184,8 +184,6 @@ public:
};
-
-/* */
/**************** SPEZIELLE Reader ************************/
// spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
@@ -359,8 +357,6 @@ protected:
void PutNumFmtFontsInAttrPool();
void PutEditEngFontsInAttrPool( BOOL bIncl_CJK_CTL = TRUE );
-// virtual ULONG WriteStream() = 0;
-
public:
SwDoc* pDoc;
SwPaM* pCurPam;
@@ -442,10 +438,6 @@ protected:
String aFltName;
SvStorage* pStg;
- // Fehler beim Aufruf erzeugen
-// virtual ULONG WriteStream(){DBG_BF_ASSERT(0, "STRIP"); return 0;}
-// virtual ULONG WriteStorage() = 0;
-
public:
StgWriter() : Writer(), pStg( 0 ) {}
@@ -454,24 +446,6 @@ public:
void SetFltName( const String& r ) { aFltName = r; }
};
-class Sw3Writer : public StgWriter
-{
- Sw3Io* pIO;
- BOOL bSaveAs : 1;
-
-// virtual ULONG WriteStorage();
-
-public:
- Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {}
-
- Sw3Io* GetSw3Io() { return pIO; }
- const Sw3Io* GetSw3Io() const { return pIO; }
- void SetSw3Io( Sw3Io* pIo, BOOL bSvAs = FALSE )
- { pIO = pIo; bSaveAs = bSvAs; }
-
-};
-
-
// Schnittstellenklasse fuer den allgemeinen Zugriff auf die
// speziellen Writer
@@ -495,7 +469,6 @@ public:
void GetRTFWriter( const String&, WriterRef& );
void GetASCWriter( const String&, WriterRef& );
-void GetSw3Writer( const String&, WriterRef& );
void GetXMLWriter( const String&, WriterRef& );
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
commit 0772f1d7ee7a39ae6e497f93cb912a7dc75f6ef4
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Tue Jan 11 00:59:24 2011 +0100
deletion of Sw3Io::Save and Sw3Io::SaveAs in binfilter sw
this is the cleaning of Sw3Io class, deleting the Save and SaveAs
function and the dependancies (inheritance, virtual functions, function
where this was called...) This may still left behind orphean functions
that are not called any more, but have not yet been deleted
The scope of this cleaning is binfilter/bf_sw, means StarWriter perimeter
only
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
index ecf47ce..be1c0c4 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
@@ -120,7 +120,7 @@ namespace binfilter {
/*N*/ pImp->pDoc->PrtOLENotify( TRUE );
/*N*/ }
/*N*/
-/*N*/ // unbenutzte OLE-Objekte l”schen, falls ein 3.0-Dok
+/*N*/ // unbenutzte OLE-Objekte l?schen, falls ein 3.0-Dok
/*N*/ // geladen wird
/*N*/ if( pImp->nVersion<=SWG_SHORTFIELDS &&
/*N*/ pImp->bNormal && !pImp->bBlock && !pImp->bInsert && !pImp->nRes )
@@ -145,124 +145,6 @@ namespace binfilter {
/*N*/ return pImp->nRes;
/*N*/ }
-
-/*N*/ ULONG Sw3Io::Save( SwPaM* pPaM, BOOL bSaveAll )
-/*N*/ {
-/*N*/ if( !pImp->pRoot.Is() )
-/*?*/ pImp->pRoot = pImp->pDoc->GetPersist()->GetStorage();
-/*N*/
-/*N*/ if( pImp->bNormal && pImp->IsSw31Or40Export() &&
-/*N*/ pImp->pDoc->GetNodes().GetEndOfContent().GetIndex() > 65200 )
-/*N*/ {
-/*N*/ // Das Dokument ist zu gross, um vom SW3.1/4.0 gelesen zu werden.
-/*?*/ return ERR_SWG_LARGE_DOC_ERROR;
-/*N*/ }
-/*N*/
-/*N*/ ULONG nHiddenDraws = ULONG_MAX;
-/*N*/ if( pImp->bNormal )
-/*N*/ {
-/*N*/ pImp->InsertHiddenDrawObjs();
-/*N*/ nHiddenDraws = pImp->nHiddenDrawObjs;
-/*N*/ }
-/*N*/ BOOL bGood = pImp->OpenStreams( TRUE );
-/*N*/ ASSERT( bGood, "Es fehlen leider ein paar Streams!" );
-/*N*/ pImp->nHiddenDrawObjs = nHiddenDraws; // OpenStreams loescht den Member!
-/*N*/ if( !bGood )
-/*N*/ {
-/*?*/ pImp->RemoveHiddenDrawObjs();
-/*?*/ return ERR_SWG_WRITE_ERROR;
-/*N*/ }
-/*N*/
-/*N*/ // Bookmarks sammeln: Wenn kein Inhalt geschrieben wird, nur die
-/*N*/ // in Seitenvorlagen
-/*N*/ if( pImp->bNormal || pImp->bPageDescs )
-/*N*/ {
-/*N*/ pImp->CollectMarks( pPaM, !pImp->bNormal );
-/*N*/ if( !pImp->IsSw31Or40Export() )
-/*N*/ pImp->CollectRedlines( pPaM, !pImp->bNormal );
-/*N*/ else
-/*N*/ pImp->CollectTblLineBoxFmts40();
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ pImp->bSaveAll = bSaveAll;
-/*N*/ BOOL bNewPaM = BOOL( pPaM == NULL );
-/*N*/ if( bNewPaM )
-/*N*/ {
-/*?*/ pImp->bSaveAll = TRUE;
-/*?*/ pPaM = new SwPaM( pImp->pDoc->GetNodes().GetEndOfContent() );
-/*?*/ pPaM->Move( fnMoveForward, fnGoDoc );
-/*?*/ pPaM->SetMark();
-/*?*/ pPaM->Move( fnMoveBackward, fnGoDoc );
-/*N*/ }
-/*N*/ // Den Doc-Hauptbereich als Mass der Dinge beim Speichern nehmen
-/*N*/ ULONG n1 = pImp->pDoc->GetNodes().GetEndOfExtras().GetIndex();
-/*N*/ ULONG n2 = pImp->pDoc->GetNodes().GetEndOfContent().GetIndex();
-/*N*/ USHORT nPages = pImp->pDoc->GetRootFrm() ?
-/*N*/ pImp->pDoc->GetRootFrm()->GetPageNum() : 0;
-/*N*/ // Wir nehmen einfach 10 Nodes/Page an
-/*N*/ n2 += nPages * 10;
-/*N*/ pImp->OpenPercentBar( n1, n2 );
-/*N*/ if( pImp->bNormal || pImp->bTxtColls )
-/*N*/ {
-/*N*/ // Stringpool fuellen, Namen im Doc erweitern
-/*N*/ pImp->aStringPool.Setup( *pImp->pDoc, pImp->pRoot->GetVersion(),
-/*N*/ pImp->pExportInfo );
-/*N*/ pImp->SaveStyleSheets( FALSE );
-/*N*/ // Temporaere Namenserweiterungen entfernen
-/*N*/ pImp->aStringPool.RemoveExtensions( *pImp->pDoc );
-/*N*/ }
-/*N*/ if( ( pImp->bNormal || pImp->bNumRules ) && !pImp->nRes )
-/*N*/ pImp->SaveNumRules();
-/*N*/ if( ( pImp->bNormal || pImp->bPageDescs ) && !pImp->nRes )
-/*N*/ pImp->SavePageStyles();
-/*N*/ if( pImp->bNormal && !pImp->nRes )
-/*N*/ pImp->SaveDrawingLayer();
-/*N*/ if( pImp->bNormal && !pImp->nRes )
-/*N*/ pImp->SaveContents( *pPaM );
-/*N*/ if( bNewPaM )
-/*N*/ delete pPaM;
-/*N*/
-/*N*/ pImp->RemoveHiddenDrawObjs();
-/*N*/
-/*N*/ if( pImp->nRes )
-/*N*/ pImp->nRes |= ERRCODE_CLASS_WRITE;
-/*N*/ else if( pImp->nWarn )
-/*N*/ pImp->nRes = pImp->nWarn | ERRCODE_CLASS_WRITE;
-/*N*/
-/*N*/ //pImp->pRoot->Commit();
-/*N*/
-/*N*/ ULONG nErr = pImp->pRoot->GetError();
-/*N*/ if( nErr == SVSTREAM_DISK_FULL )
-/*N*/ pImp->nRes = ERR_W4W_WRITE_FULL;
-/*N*/ else if( nErr != SVSTREAM_OK )
-/*N*/ {
-/*N*/ if ( nErr == ERRCODE_IO_NOTSTORABLEINBINARYFORMAT )
-/*N*/ pImp->nRes = nErr;
-/*N*/ else
-/*N*/ pImp->nRes = ERR_SWG_WRITE_ERROR;
-/*N*/ }
-/*N*/
-/*N*/ pImp->ClosePercentBar();
-/*N*/ pImp->CloseStreams();
-/*N*/
-/*N*/ return pImp->nRes;
-/*N*/ }
-
-
-// Speichern in einen frischen Storage.
-
-/*N*/ ULONG Sw3Io::SaveAs( SvStorage* pStor, SwPaM* pPaM, BOOL bSaveAll )
-/*N*/ {
-/*N*/ pImp->pOldRoot = pImp->pRoot;
-/*N*/ pImp->pRoot = pStor;
-/*N*/ ULONG nRet = Save( pPaM, bSaveAll );
-/*N*/ pImp->pRoot = pImp->pOldRoot;
-/*N*/ pImp->pOldRoot.Clear();
-/*N*/ return nRet;
-/*N*/ }
-
-
/*N*/ void Sw3Io::HandsOff()
/*N*/ {
/*N*/ pImp->pRoot.Clear();
diff --git a/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx b/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx
index 6c0f8de..79a80c1 100644
--- a/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx
+++ b/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx
@@ -110,120 +110,6 @@ namespace binfilter {
/*N*/ SwASCWriter::~SwASCWriter() {}
-/*N*/ ULONG SwASCWriter::WriteStream()
-/*N*/ {
-/*N*/ sal_Char cLineEnd[ 3 ];
-/*N*/ sal_Char* pCEnd = cLineEnd;
-/*N*/ if( bASCII_ParaAsCR ) // falls vorgegeben ist.
-/*?*/ *pCEnd++ = '\015';
-/*N*/ else if( bASCII_ParaAsBlanc )
-/*?*/ *pCEnd++ = ' ';
-/*N*/ else
-/*N*/ switch( GetAsciiOptions().GetParaFlags() )
-/*N*/ {
-/*?*/ case LINEEND_CR: *pCEnd++ = '\015'; break;
-/*?*/ case LINEEND_LF: *pCEnd++ = '\012'; break;
-/*N*/ case LINEEND_CRLF: *pCEnd++ = '\015', *pCEnd++ = '\012'; break;
-/*N*/ }
-/*N*/ *pCEnd = 0;
-/*N*/
-/*N*/ sLineEnd.AssignAscii( cLineEnd );
-/*N*/
-/*N*/ long nMaxNode = pDoc->GetNodes().Count();
-/*N*/
-/*N*/ if( bShowProgress )
-/*N*/ ::binfilter::StartProgress( STR_STATSTR_W4WWRITE, 0, nMaxNode, pDoc->GetDocShell() );
-/*N*/
-/*N*/ SwPaM* pPam = pOrigPam;
-/*N*/
-/*N*/ BOOL bWriteSttTag = bUCS2_WithStartChar &&
-/*M*/ (RTL_TEXTENCODING_UCS2 == GetAsciiOptions().GetCharSet() ||
-/*M*/ RTL_TEXTENCODING_UTF8 == GetAsciiOptions().GetCharSet());
-/*N*/
-/*N*/ rtl_TextEncoding eOld = Strm().GetStreamCharSet();
-/*N*/ Strm().SetStreamCharSet( GetAsciiOptions().GetCharSet() );
-/*N*/
-/*N*/ // gebe alle Bereich des Pams in das ASC-File aus.
-/*N*/ do {
-/*N*/ BOOL bTstFly = TRUE;
-/*N*/ while( pCurPam->GetPoint()->nNode.GetIndex() < pCurPam->GetMark()->nNode.GetIndex() ||
-/*N*/ (pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() &&
-/*N*/ pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) )
-/*N*/ {
-/*N*/ SwTxtNode* pNd = pCurPam->GetPoint()->nNode.GetNode().GetTxtNode();
-/*N*/ if( pNd )
-/*N*/ {
-/*N*/ // sollten nur Rahmen vorhanden sein?
-/*N*/ // (Moeglich, wenn Rahmen-Selektion ins Clipboard
-/*N*/ // gestellt wurde)
-/*N*/ if( bTstFly && bWriteAll &&
-/*N*/ // keine Laenge
-/*N*/ !pNd->GetTxt().Len() &&
-/*N*/ // Rahmen vorhanden
-/*N*/ pDoc->GetSpzFrmFmts()->Count() &&
-/*N*/ // nur ein Node im Array
-/*N*/ pDoc->GetNodes().GetEndOfExtras().GetIndex() + 3 ==
-/*N*/ pDoc->GetNodes().GetEndOfContent().GetIndex() &&
-/*N*/ // und genau der ist selektiert
-/*N*/ pDoc->GetNodes().GetEndOfContent().GetIndex() - 1 ==
-/*N*/ pCurPam->GetPoint()->nNode.GetIndex() )
-/*N*/ {
-/*N*/ // dann den Inhalt vom Rahmen ausgeben.
-/*N*/ // dieser steht immer an Position 0 !!
-/*?*/ SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[ 0 ];
-/*?*/ const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
-/*?*/ if( pIdx )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*M*/ {
-/*M*/ if (bWriteSttTag)
-/*M*/ {
-/*M*/ switch(GetAsciiOptions().GetCharSet())
-/*M*/ {
-/*M*/ case RTL_TEXTENCODING_UTF8:
-/*M*/ Strm() << BYTE(0xEF) << BYTE(0xBB) <<
-/*M*/ BYTE(0xBF);
-/*M*/ break;
-/*M*/ case RTL_TEXTENCODING_UCS2:
-/*M*/ //Strm().StartWritingUnicodeText();
-/*M*/ Strm().SetEndianSwap(FALSE);
-/*M*/ #ifdef OSL_LITENDIAN
-/*M*/ Strm() << BYTE(0xFF) << BYTE(0xFE);
-/*M*/ #else
-/*M*/ Strm() << BYTE(0xFE) << BYTE(0xFF);
-/*M*/ #endif
-/*M*/ break;
-/*M*/
-/*M*/ }
-/*?*/ bWriteSttTag = FALSE;
-/*N*/ }
-/*N*/ Out( aASCNodeFnTab, *pNd, *this );
-/*N*/ }
-/*N*/ bTstFly = FALSE; // eimal Testen reicht
-/*N*/ }
-/*N*/
-/*N*/ if( !pCurPam->Move( fnMoveForward, fnGoNode ) )
-/*N*/ break;
-/*N*/
-/*N*/ if( bShowProgress )
-/*N*/ ::binfilter::SetProgressState( pCurPam->GetPoint()->nNode.GetIndex(),
-/*N*/ pDoc->GetDocShell() ); // Wie weit ?
-/*N*/
-/*N*/ }
-/*N*/ } while( CopyNextPam( &pPam ) ); // bis alle Pam bearbeitet
-/*N*/
-/*N*/ Strm().SetStreamCharSet( eOld );
-/*N*/
-/*N*/ if( bShowProgress )
-/*N*/ ::binfilter::EndProgress( pDoc->GetDocShell() );
-/*N*/
-/*N*/ return 0;
-/*N*/ }
-
-
/*N*/ void GetASCWriter( const String& rFltNm, WriterRef& xRet )
/*N*/ {
/*N*/ xRet = new SwASCWriter( rFltNm );
diff --git a/binfilter/bf_sw/source/filter/ascii/wrtasc.hxx b/binfilter/bf_sw/source/filter/ascii/wrtasc.hxx
index cd90f32..d38b34c 100644
--- a/binfilter/bf_sw/source/filter/ascii/wrtasc.hxx
+++ b/binfilter/bf_sw/source/filter/ascii/wrtasc.hxx
@@ -41,8 +41,6 @@ class SwASCWriter : public Writer
{
String sLineEnd;
- virtual ULONG WriteStream();
-
public:
SwASCWriter( const String& rFilterName );
virtual ~SwASCWriter();
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 9799041..5f2851a 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -260,32 +260,6 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
// returns the count of it
-/*N*/ ULONG Sw3Writer::WriteStorage()
-/*N*/ {
-/*N*/ ULONG nRet;
-/*N*/ if( pIO )
-/*N*/ {
-/*N*/ // der gleiche Storage -> Save, sonst SaveAs aufrufen
-/*N*/ if( !bSaveAs )
-/*?*/ nRet = pIO->Save( pOrigPam, bWriteAll );
-/*N*/ else
-/*N*/ nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll );
-/*N*/
-/*N*/ pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !!
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ ASSERT( !this, "Sw3-Writer ohne IO-System" )
-/*?*/ nRet = ERR_SWG_WRITE_ERROR;
-/*N*/ }
-/*N*/ return nRet;
-/*N*/ }
-
-
-
-
-
-
BOOL Writer::IsStgWriter() const { return FALSE; }
BOOL Writer::IsSw3Writer() const { return FALSE; }
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx b/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
index 881d734..07c0bab 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
@@ -533,123 +533,6 @@ SwW4WWriter::SwW4WWriter( const String& rFltName )
SwW4WWriter::~SwW4WWriter() {}
-ULONG SwW4WWriter::WriteStream()
-{
- {
- USHORT nFltNo = GetFilter();
- const sal_Char* aNames[ 2 ] = { "W4W/W4W000", "W4W/W4W000" };
- sal_uInt32 aVal[ 2 ];
-
- SwFilterOptions aOpt;
-
- // set into the first name the filter number
- sal_Char* pStr = (sal_Char*)aNames[0];
- pStr += 7;
- *pStr++ = '0' + ( nFltNo / 100 ); nFltNo %= 100;
- *pStr++ = '0' + ( nFltNo / 10 ); nFltNo %= 10;
- *pStr++ = '0' + nFltNo;
-
- // first test if the node & content exist. If not, then we may not
- // ask the configuration (produce assertions!)
- pStr = (sal_Char*)aNames[0];
- pStr[ 3 ] = 0;
-
- if( aOpt.CheckNodeContentExist( pStr, pStr + 4 ))
- {
- pStr[ 3 ] = '/';
- aOpt.GetValues( 2, aNames, aVal );
- }
- else
- {
- aOpt.GetValues( 1, aNames+1, aVal+1 );
- aVal[0] = 0;
- }
-
- nIniFlags = aVal[ 0 ];
- if( !nIniFlags )
- nIniFlags = aVal[ 1 ];
- }
-
- bStyleDef = bStyleOnOff = bTable = bPageDesc = bEvenPage = bLastPg
- = bHdFt = bIsTxtInPgDesc = bFly = FALSE;
- nFlyWidth = nFlyHeight = 0;
- nFlyLeft = nFlyRight = 0;
- // Hier wird festgelegt, welches Ziel welche Buchstabencodierung
- // per XCS vorgeworfen bekommt. HEX und UCS benutzen immer den
- // IBMPC-Code. Wenn es nicht stimmt, klappt der
- // Re-Import der Umlaute nicht. Es koennte auch etwas
- // schlimmeres passieren, wenn der Export-Filter zu bloed ist.
- //
- // Im Moment wird nur fuer WW1/2/6 ANSI angenommen, sonst IBMPC.
- // Wahrscheinlich erwarten alle Win-Ziele oder vielleicht auch
- // alle Ziele Ansi, das konnte ich aber noch nicht ausprobieren.
- // Dasselbe wird fuer die Styles benutzt, allerdings ohne
- // XCS, sondern als direktes Zeichen, da ich vermute, dass es dann
- // besser durch die Filter geht.
- switch ( nFilter )
- {
- case 44 :
- case 49 : eTargCharSet = RTL_TEXTENCODING_MS_1252; break;
- default : eTargCharSet = RTL_TEXTENCODING_IBM_850; break;
- }
- nFontId = 0;
-
- nMaxNode = pDoc->GetNodes().Count();
-
- pFlyFmt = 0; // kein FlyFrmFormat gesetzt
- pStyleEndStrm = pPostNlStrm = 0; // kein StyleEndStream gesetzt
-
- pNxtPg = new SwPosition( *pOrigPam->GetMark() );
-
-// ValidateLayout(); // Nach ValidateLayout() aus pageiter.cxx
- // sind alle Umbrueche richtig
-
- pIter = new SwPageIter( *pDoc, *pOrigPam->GetMark() );
-
- ASSERT( pIter->GetPageDesc(), "1. Seite: PageDesc weg");
- pPgDsc2 = pPageDesc = pIter->GetPageDesc();
- pPgFrm = (SwFrmFmt*)&(pPgDsc2->GetMaster());
- pIter->NextPage();
- bLastPg = !( pIter->GetPosition( *pNxtPg ));
-
- // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn
- // das gesamte Dokument geschrieben wird
- nAktFlyPos = 0;
- BYTE nSz = (BYTE)Min( pDoc->GetSpzFrmFmts()->Count(), USHORT(255) );
- SwPosFlyFrms aFlyPos( nSz, nSz );
- pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pOrigPam );
- pFlyPos = &aFlyPos;
- nDefLanguage = ((const SvxLanguageItem&)pDoc
- ->GetDefault( RES_CHRATR_LANGUAGE )).GetLanguage();
-
- // schreibe die StyleTabelle, allg. Angaben,Header/Footer/Footnotes
- MakeHeader();
-
- // kein PageDesc im 1. Absatz vorhanden ?
- SfxItemSet* pSet = pCurPam->GetCntntNode(FALSE)->GetpSwAttrSet();
- if( !pSet || SFX_ITEM_SET != pSet->GetItemState( RES_PAGEDESC, FALSE ))
- {
-// Sound::Beep(); // dann gebe den Default-Pagedesc aus
- OutW4W_SwFmtPageDesc1( *this, pPgDsc2 );
- }
-
- // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn
- // das gesamte Dokument geschrieben wird
- nAktFlyPos = 0;
-
- Out_SwDoc( pOrigPam, TRUE );
-
- DELETEZ( pIter );
- DELETEZ( pNxtPg );
-
- // loesche die Tabelle mit den freifliegenden Rahmen
- for( USHORT i = aFlyPos.Count(); i > 0; )
- delete aFlyPos[ --i ];
- pFlyPos = 0;
-
- return 0;
-}
-
void SwW4WWriter::Out_SwDoc( SwPaM* pPam, BOOL /*bAttrOn*/ )
{
BOOL bSaveWriteAll = bWriteAll; // sichern
diff --git a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
index 4873435..b38f714 100644
--- a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
+++ b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
@@ -118,8 +118,6 @@ class SwW4WWriter : public Writer
void OutFlyFrm();
void OutW4WFlyFrms( const SwFlyFrmFmt& );
- ULONG WriteStream();
-
public:
SwFlyFrmFmt* pFlyFmt; // liegt der Node in einem FlyFrame, ist
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 3a3f865..027d2da 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -359,7 +359,7 @@ protected:
void PutNumFmtFontsInAttrPool();
void PutEditEngFontsInAttrPool( BOOL bIncl_CJK_CTL = TRUE );
- virtual ULONG WriteStream() = 0;
+// virtual ULONG WriteStream() = 0;
public:
SwDoc* pDoc;
@@ -443,8 +443,8 @@ protected:
SvStorage* pStg;
// Fehler beim Aufruf erzeugen
- virtual ULONG WriteStream(){DBG_BF_ASSERT(0, "STRIP"); return 0;}
- virtual ULONG WriteStorage() = 0;
+// virtual ULONG WriteStream(){DBG_BF_ASSERT(0, "STRIP"); return 0;}
+// virtual ULONG WriteStorage() = 0;
public:
StgWriter() : Writer(), pStg( 0 ) {}
@@ -459,7 +459,7 @@ class Sw3Writer : public StgWriter
Sw3Io* pIO;
BOOL bSaveAs : 1;
- virtual ULONG WriteStorage();
+// virtual ULONG WriteStorage();
public:
Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {}
diff --git a/binfilter/inc/bf_sw/sw3io.hxx b/binfilter/inc/bf_sw/sw3io.hxx
index be59316..40f44cc 100644
--- a/binfilter/inc/bf_sw/sw3io.hxx
+++ b/binfilter/inc/bf_sw/sw3io.hxx
@@ -54,8 +54,6 @@ class Sw3Io
friend class Sw3Writer;
ULONG Load( SvStorage*, SwPaM* = NULL );
- ULONG Save( SwPaM* = NULL, BOOL = TRUE );
- ULONG SaveAs( SvStorage*, SwPaM* = NULL, BOOL = TRUE );
public:
Sw3Io( SwDoc& );
commit f6414cc87ca37bdaf005445b94eee2c1821499f4
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Mon Jan 10 16:42:18 2011 +0100
deletion of StgWriter::Write and its dependancies
During this deletion part, all the deletion have been done within
the binfilter/bf_sw, not touching the generic part. Further, all deletion
have been done based only on the deletion of the above mentionned function
and of its dependancies.
This step left behind some orphean functions, that are probably not called anymore,
this will be deleted in further steps.
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 75482d9..8b5f461 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -187,9 +187,7 @@ SwParaSelection::~SwParaSelection()
pUnoCrsr->MovePara(fnParaCurr, fnParaStart);
}
}
-/* -----------------13.05.98 12:15-------------------
- *
- * --------------------------------------------------*/
+
SwUnoInternalPaM::SwUnoInternalPaM(SwDoc& rDoc) :
SwPaM(rDoc.GetNodes())
{
@@ -222,6 +220,7 @@ SwUnoInternalPaM& SwUnoInternalPaM::operator=(const SwPaM& rPaM)
}
return *this;
}
+
/****************************************************************************
ActionContext
****************************************************************************/
@@ -232,9 +231,7 @@ UnoActionContext::UnoActionContext(SwDoc* pDc) :
if(pRootFrm)
pRootFrm->StartAllAction();
}
-/*-----------------04.03.98 11:56-------------------
---------------------------------------------------*/
UnoActionContext::~UnoActionContext()
{
//das Doc kann hier schon entfernt worden sein
@@ -256,9 +253,7 @@ UnoActionRemoveContext::UnoActionRemoveContext(SwDoc* pDc) :
if(pRootFrm)
pRootFrm->UnoRemoveAllActions();
}
-/* -----------------07.07.98 12:05-------------------
- *
- * --------------------------------------------------*/
+
UnoActionRemoveContext::~UnoActionRemoveContext()
{
SwRootFrm* pRootFrm = pDoc->GetRootFrm();
@@ -267,9 +262,6 @@ UnoActionRemoveContext::~UnoActionRemoveContext()
}
-/*-----------------09.03.98 08:29-------------------
-
---------------------------------------------------*/
void SwXTextCursor::SelectPam(SwPaM& rCrsr, sal_Bool bExpand)
{
if(bExpand)
@@ -281,9 +273,7 @@ void SwXTextCursor::SelectPam(SwPaM& rCrsr, sal_Bool bExpand)
rCrsr.DeleteMark();
}
-/* -----------------20.05.98 14:59-------------------
- *
- * --------------------------------------------------*/
+
void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
{
if(!aCrsr.HasMark())
@@ -306,34 +296,9 @@ void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
xWrt->bUCS2_WithStartChar = FALSE;
long lLen;
- if( !IsError( aWriter.Write( xWrt ) ) &&
- STRING_MAXLEN > (( lLen = aStream.GetSize() )
- / sizeof( sal_Unicode )) + 1 )
- {
- aStream << (sal_Unicode)'\0';
-
- String sBuf;
- const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer();
- if( p )
- sBuf = p;
- else
- {
- long lUniLen = (lLen / sizeof( sal_Unicode ));
- sal_Unicode* pStrBuf = sBuf.AllocBuffer( xub_StrLen(
- lUniLen + 1));
- aStream.Seek( 0 );
- aStream.ResetError();
- aStream.Read( pStrBuf, lLen );
- pStrBuf[ lUniLen ] = '\0';
- }
- rBuffer = OUString( sBuf );
- }
}
}
-/* -----------------06.07.98 07:33-------------------
- *
- * --------------------------------------------------*/
void lcl_setCharStyle(SwDoc* pDoc, const uno::Any aValue, SfxItemSet& rSet)
throw (lang::IllegalArgumentException)
{
@@ -358,9 +323,7 @@ void lcl_setCharStyle(SwDoc* pDoc, const uno::Any aValue, SfxItemSet& rSet)
}
};
-/* -----------------30.06.98 08:46-------------------
- *
- * --------------------------------------------------*/
+
void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM)
throw (lang::IllegalArgumentException)
{
@@ -388,9 +351,7 @@ void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM)
}
}
-/* -----------------06.07.98 07:38-------------------
- *
- * --------------------------------------------------*/
+
void lcl_setPageDesc(SwDoc* pDoc, const uno::Any& aValue, SfxItemSet& rSet)
{
if(aValue.getValueType() != ::getCppuType((const OUString*)0))
@@ -434,9 +395,7 @@ void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM)
}
delete pNewDesc;
}
-/* -----------------30.06.98 10:29-------------------
- *
- * --------------------------------------------------*/
+
void lcl_SetNodeNumStart( SwPaM& rCrsr, uno::Any aValue )
{
sal_Int16 nTmp(0);
@@ -456,9 +415,6 @@ void lcl_SetNodeNumStart( SwPaM& rCrsr, uno::Any aValue )
pDoc->SetNodeNumStart( *rCrsr.GetPoint(), nStt );
}
-/* -----------------17.09.98 09:44-------------------
- *
- * --------------------------------------------------*/
class SwTextCursorItemSet_Impl
{
SwDoc *pDoc;
@@ -663,9 +619,6 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap,
return bRet;
}
-/* -----------------30.06.98 08:39-------------------
- *
- * --------------------------------------------------*/
SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
{
static const sal_uInt16 nMaxLookup = 1000;
@@ -714,9 +667,6 @@ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
return bError ? 0 : pFmt;
}
-/* -----------------26.06.98 16:20-------------------
- * Hilfsfunktion fuer PageDesc
- * --------------------------------------------------*/
SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName)
{
SwPageDesc* pRet = 0;
@@ -746,6 +696,7 @@ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
return pRet;
}
+
/******************************************************************************
******************************************************************************
******************************************************************************
@@ -755,16 +706,12 @@ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
/******************************************************************
* SwXTextCursor
******************************************************************/
-/*-- 09.12.98 14:19:19---------------------------------------------------
- -----------------------------------------------------------------------*/
OUString SwXTextCursor::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXTextCursor");
}
-/*-- 09.12.98 14:19:19---------------------------------------------------
- -----------------------------------------------------------------------*/
BOOL SwXTextCursor::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
String sServiceName(rServiceName);
@@ -777,9 +724,7 @@ BOOL SwXTextCursor::supportsService(const OUString& rServiceName) throw( Runtime
sServiceName.EqualsAscii("com.sun.star.style.ParagraphPropertiesComplex") ||
sServiceName.EqualsAscii("com.sun.star.text.TextSortable");
}
-/*-- 09.12.98 14:19:19---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< OUString > SwXTextCursor::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(8);
@@ -794,9 +739,7 @@ Sequence< OUString > SwXTextCursor::getSupportedServiceNames(void) throw( Runtim
pArray[7] = C2U("com.sun.star.text.TextSortable");
return aRet;
}
-/*-- 09.12.98 14:19:19---------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, const SwPosition& rPos,
CursorType eSet, SwDoc* pDoc, const SwPosition* pMark) :
aLstnrCntnr(( util::XSortable*)this),
@@ -813,9 +756,7 @@ SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, const SwPosition&
}
pUnoCrsr->Add(this);
}
-/* -----------------04.03.99 09:02-------------------
- *
- * --------------------------------------------------*/
+
SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent,
SwUnoCrsr* pSourceCrsr, CursorType eSet) :
aLstnrCntnr( (util::XSortable*)this),
@@ -833,18 +774,13 @@ SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent,
pUnoCrsr->Add(this);
}
-/*-- 09.12.98 14:19:20---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwXTextCursor::~SwXTextCursor()
{
SwUnoCrsr* pUnoCrsr = GetCrsr();
delete pUnoCrsr;
delete pLastSortOptions;
}
-/*-- 09.12.98 14:19:18---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::DeleteAndInsert(const String& rText)
{
SwUnoCrsr* pUnoCrsr = GetCrsr();
@@ -874,17 +810,13 @@ void SwXTextCursor::DeleteAndInsert(const String& rText)
} while( (_pStartCrsr=(SwCursor*)_pStartCrsr->GetNext()) != pUnoCrsr );
}
}
-/* -----------------------------10.03.00 18:02--------------------------------
- ---------------------------------------------------------------------------*/
const uno::Sequence< sal_Int8 > & SwXTextCursor::getUnoTunnelId()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
return aSeq;
}
-/* -----------------------------10.03.00 18:04--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int64 SAL_CALL SwXTextCursor::getSomething( const uno::Sequence< sal_Int8 >& rId )
throw(uno::RuntimeException)
{
@@ -897,9 +829,6 @@ sal_Int64 SAL_CALL SwXTextCursor::getSomething( const uno::Sequence< sal_Int8 >&
return OTextCursorHelper::getSomething(rId);
}
-/*-- 09.12.98 14:18:12---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwXTextCursor::collapseToStart(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -918,9 +847,7 @@ void SwXTextCursor::collapseToStart(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
}
}
-/*-- 09.12.98 14:18:14---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::collapseToEnd(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -939,9 +866,7 @@ void SwXTextCursor::collapseToEnd(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
}
}
-/*-- 09.12.98 14:18:41---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isCollapsed(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -953,9 +878,7 @@ sal_Bool SwXTextCursor::isCollapsed(void) throw( uno::RuntimeException )
}
return bRet;
}
-/*-- 09.12.98 14:18:42---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -972,9 +895,7 @@ sal_Bool SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand) throw( uno::Ru
}
return bRet;
}
-/*-- 09.12.98 14:18:42---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -991,9 +912,7 @@ sal_Bool SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand) throw( uno::R
}
return bRet;
}
-/*-- 09.12.98 14:18:43---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1043,9 +962,7 @@ void SwXTextCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException )
throw uno::RuntimeException();
}
}
-/*-- 09.12.98 14:18:43---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1070,9 +987,7 @@ void SwXTextCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException )
throw uno::RuntimeException();
}
}
-/* -----------------05.03.99 07:27-------------------
- *
- * --------------------------------------------------*/
+
void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_Bool bExpand )
throw( uno::RuntimeException )
{
@@ -1209,9 +1124,6 @@ void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_B
}
}
-/*-- 09.12.98 14:18:44---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isStartOfWord(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1227,9 +1139,7 @@ sal_Bool SwXTextCursor::isStartOfWord(void) throw( uno::RuntimeException )
}
return bRet;
}
-/*-- 09.12.98 14:18:44---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isEndOfWord(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1245,9 +1155,7 @@ sal_Bool SwXTextCursor::isEndOfWord(void) throw( uno::RuntimeException )
}
return bRet;
}
-/*-- 09.12.98 14:18:44---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoNextWord(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1275,9 +1183,7 @@ sal_Bool SwXTextCursor::gotoNextWord(sal_Bool Expand) throw( uno::RuntimeExcepti
}
return bRet;
}
-/*-- 09.12.98 14:18:45---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1303,9 +1209,7 @@ sal_Bool SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw( uno::RuntimeExc
}
return bRet;
}
-/*-- 09.12.98 14:18:45---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1325,9 +1229,7 @@ sal_Bool SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw( uno::RuntimeExcept
}
return bRet;
}
-/*-- 09.12.98 14:18:46---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1347,9 +1249,7 @@ sal_Bool SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw( uno::RuntimeExce
}
return bRet;
}
-/*-- 09.12.98 14:18:46---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isStartOfSentence(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1373,9 +1273,7 @@ sal_Bool SwXTextCursor::isStartOfSentence(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:47---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isEndOfSentence(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1399,9 +1297,7 @@ sal_Bool SwXTextCursor::isEndOfSentence(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:47---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1429,9 +1325,7 @@ sal_Bool SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw( uno::RuntimeExc
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:47---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1456,9 +1350,7 @@ sal_Bool SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) throw( uno::Runtim
throw uno::RuntimeException();
return bRet;
}
-/* -----------------15.10.99 08:24-------------------
- --------------------------------------------------*/
sal_Bool SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1478,9 +1370,7 @@ sal_Bool SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) throw( uno::Runtime
throw uno::RuntimeException();
return bRet;
}
-/* -----------------15.10.99 08:24-------------------
- --------------------------------------------------*/
sal_Bool SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1503,9 +1393,6 @@ sal_Bool SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw( uno::RuntimeEx
return bRet;
}
-/*-- 09.12.98 14:18:48---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isStartOfParagraph(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1517,9 +1404,7 @@ sal_Bool SwXTextCursor::isStartOfParagraph(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:48---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::isEndOfParagraph(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1531,9 +1416,7 @@ sal_Bool SwXTextCursor::isEndOfParagraph(void) throw( uno::RuntimeException )
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:49---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1550,9 +1433,7 @@ sal_Bool SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand) throw( uno::Runtim
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:49---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1569,9 +1450,7 @@ sal_Bool SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw( uno::RuntimeE
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:50---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1586,9 +1465,7 @@ sal_Bool SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw( uno::RuntimeEx
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:50---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1603,16 +1480,12 @@ sal_Bool SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand) throw( uno::Runti
throw uno::RuntimeException();
return bRet;
}
-/*-- 09.12.98 14:18:50---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XText > SwXTextCursor::getText(void) throw( uno::RuntimeException )
{
return xParentText;
}
-/*-- 09.12.98 14:18:50---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XTextRange > SwXTextCursor::getStart(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1628,9 +1501,7 @@ uno::Reference< XTextRange > SwXTextCursor::getStart(void) throw( uno::RuntimeE
throw uno::RuntimeException();
return xRet;
}
-/*-- 09.12.98 14:18:51---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XTextRange > SwXTextCursor::getEnd(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1646,9 +1517,7 @@ uno::Reference< XTextRange > SwXTextCursor::getEnd(void) throw( uno::RuntimeExc
throw uno::RuntimeException();
return xRet;
}
-/*-- 09.12.98 14:18:51---------------------------------------------------
- -----------------------------------------------------------------------*/
OUString SwXTextCursor::getString(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1656,30 +1525,14 @@ OUString SwXTextCursor::getString(void) throw( uno::RuntimeException )
SwUnoCrsr* pUnoCrsr = ((SwXTextCursor*)this)->GetCrsr();
if( pUnoCrsr)
{
-/* if( pUnoCrsr->GetPoint()->nNode.GetIndex() ==
- pUnoCrsr->GetMark()->nNode.GetIndex() )
- {
- SwTxtNode* pTxtNd = pUnoCrsr->GetNode()->GetTxtNode();
- if( pTxtNd )
- {
- sal_uInt16 nStt = pUnoCrsr->Start()->nContent.GetIndex();
- aTxt = pTxtNd->GetExpandTxt( nStt,
- pUnoCrsr->End()->nContent.GetIndex() - nStt );
- }
- }
- else
-*/ {
//Text ueber mehrere Absaetze
SwXTextCursor::getTextFromPam(*pUnoCrsr, aTxt);
- }
}
else
throw uno::RuntimeException();
return aTxt;
}
-/*-- 09.12.98 14:18:52---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::setString(const OUString& aString) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1689,9 +1542,7 @@ void SwXTextCursor::setString(const OUString& aString) throw( uno::RuntimeExcept
DeleteAndInsert(aString);
}
-/* -----------------------------03.05.00 12:56--------------------------------
- ---------------------------------------------------------------------------*/
Any SwXTextCursor::GetPropertyValue(
SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
const OUString& rPropertyName)
@@ -1722,9 +1573,7 @@ Any SwXTextCursor::GetPropertyValue(
return aAny;
}
-/* -----------------------------03.05.00 12:57--------------------------------
- ---------------------------------------------------------------------------*/
void SwXTextCursor::SetPropertyValue(
SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName,
const Any& aValue, const SfxItemPropertyMap* _pMap, USHORT nAttrMode)
@@ -1749,9 +1598,7 @@ void SwXTextCursor::SetPropertyValue(
else
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) );
}
-/* -----------------------------03.05.00 13:16--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< PropertyState > SwXTextCursor::GetPropertyStates(
SwPaM& rPaM, SfxItemPropertySet& rPropSet,
const Sequence< OUString >& PropertyNames,
@@ -1843,9 +1690,7 @@ Sequence< PropertyState > SwXTextCursor::GetPropertyStates(
delete pSetParent;
return aRet;
}
-/* -----------------------------03.05.00 13:17--------------------------------
- ---------------------------------------------------------------------------*/
PropertyState SwXTextCursor::GetPropertyState(
SwPaM& rPaM, SfxItemPropertySet& rPropSet, const OUString& rPropertyName)
throw(UnknownPropertyException, RuntimeException)
@@ -1855,9 +1700,7 @@ PropertyState SwXTextCursor::GetPropertyState(
Sequence < PropertyState > aSeq = GetPropertyStates( rPaM, rPropSet, aStrings, SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY );
return aSeq[0];
}
-/* -----------------------------03.05.00 13:20--------------------------------
- ---------------------------------------------------------------------------*/
void lcl_SelectParaAndReset ( SwPaM &rPaM, SwDoc* pDoc, const SvUShortsSort* pWhichIds = 0 )
{
// if we are reseting paragraph attributes, we need to select the full paragraph first
@@ -1901,9 +1744,7 @@ void SwXTextCursor::SetPropertyToDefault(
else
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) );
}
-/* -----------------------------03.05.00 13:19--------------------------------
- ---------------------------------------------------------------------------*/
Any SwXTextCursor::GetPropertyDefault(
SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
const OUString& rPropertyName)
@@ -1925,9 +1766,7 @@ Any SwXTextCursor::GetPropertyDefault(
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) );
return aRet;
}
-/*-- 09.12.98 14:18:54---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< beans::XPropertySetInfo > SwXTextCursor::getPropertySetInfo(void) throw( uno::RuntimeException )
{
static uno::Reference< beans::XPropertySetInfo > xRef;
@@ -1948,9 +1787,7 @@ uno::Reference< beans::XPropertySetInfo > SwXTextCursor::getPropertySetInfo(voi
}
return xRef;
}
-/*-- 09.12.98 14:18:54---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
throw( beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -1977,9 +1814,7 @@ void SwXTextCursor::setPropertyValue(const OUString& rPropertyName, const uno::A
throw uno::RuntimeException();
}
-/*-- 09.12.98 14:18:55---------------------------------------------------
- -----------------------------------------------------------------------*/
Any SwXTextCursor::getPropertyValue(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
@@ -2006,45 +1841,35 @@ Any SwXTextCursor::getPropertyValue(const OUString& rPropertyName)
return aAny;
}
-/*-- 09.12.98 14:18:55---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::addPropertyChangeListener(
const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 09.12.98 14:18:57---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::removePropertyChangeListener(
const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 09.12.98 14:18:57---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::addVetoableChangeListener(
const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 09.12.98 14:18:58---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::removeVetoableChangeListener(
const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-- 05.03.99 11:36:11---------------------------------------------------
- -----------------------------------------------------------------------*/
beans::PropertyState SwXTextCursor::getPropertyState(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, uno::RuntimeException )
{
@@ -2059,9 +1884,7 @@ beans::PropertyState SwXTextCursor::getPropertyState(const OUString& rPropertyNa
throw RuntimeException();
return eRet;
}
-/*-- 05.03.99 11:36:11---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< beans::PropertyState > SwXTextCursor::getPropertyStates(
const uno::Sequence< OUString >& PropertyNames)
throw( beans::UnknownPropertyException, uno::RuntimeException )
@@ -2072,18 +1895,14 @@ uno::Sequence< beans::PropertyState > SwXTextCursor::getPropertyStates(
throw RuntimeException();
return GetPropertyStates(*pUnoCrsr, aPropSet, PropertyNames);
}
-/*-- 05.03.99 11:36:12---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextCursor::setPropertyToDefault(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, uno::RuntimeException )
{
Sequence < OUString > aSequence ( &rPropertyName, 1 );
setPropertiesToDefault ( aSequence );
}
-/*-- 05.03.99 11:36:12---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Any SwXTextCursor::getPropertyDefault(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index 02cb2bf..6971334 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -485,19 +485,6 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
}
}
- // read the sections of the document, which is equal to the medium.
- // returns the count of it
-
-// ------------------------------------------------
-
-
-
-
-// ------------------------------------------------
-
-
-
-
/*
* Writer
@@ -507,11 +494,6 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
* Konstruktoren, Destruktoren sind inline (inc/shellio.hxx).
*/
-
-
-
-
-
/*N*/ SwWriter::SwWriter( SvStream& rStrm, SwPaM& rPam, BOOL bWriteAll )
/*N*/ : pStrm( &rStrm ),
/*N*/ pStg( 0 ),
@@ -535,150 +517,11 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
/*N*/ {
/*N*/ }
-
-/*N*/ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
-/*N*/ {
-/*N*/ BOOL bHasMark = FALSE;
-/*N*/ SwPaM * pPam;
-/*N*/
-/*N*/ SwDoc *pDoc = 0L;
-/*N*/ SvEmbeddedObjectRef* pRefForDocSh = 0;
-/*N*/
-/*N*/ if ( pShell && !bWriteAll && pShell->IsTableMode() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ if( !bWriteAll && ( pShell || pOutPam ))
-/*N*/ {
-/*N*/ if( pShell )
-/*?*/ pPam = pShell->GetCrsr();
-/*N*/ else
-/*N*/ pPam = pOutPam;
-/*N*/
-/*N*/ SwPaM *pEnd = pPam;
-/*N*/
-/*N*/ // Erste Runde: Nachsehen, ob eine Selektion besteht.
-/*N*/ while(TRUE)
-/*N*/ {
-/*N*/ bHasMark = bHasMark || pPam->HasMark();
-/*N*/ pPam = (SwPaM *) pPam->GetNext();
-/*N*/ if(bHasMark || pPam == pEnd)
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ // Wenn keine Selektion besteht, eine ueber das ganze Dokument aufspannen.
-/*N*/ if(!bHasMark)
-/*N*/ {
-/*?*/ if( pShell )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ pPam = new SwPaM( *pPam );
-/*?*/ pPam->Move( fnMoveBackward, fnGoDoc );
-/*?*/ pPam->SetMark();
-/*?*/ pPam->Move( fnMoveForward, fnGoDoc );
-/*?*/ }
-/*N*/ }
-/*N*/ // pPam ist immer noch der akt. Cursor !!
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // keine Shell oder alles schreiben -> eigenen Pam erzeugen
-/*N*/ SwDoc* pOutDoc = pDoc ? pDoc : &rDoc;
-/*N*/ pPam = new SwPaM( pOutDoc->GetNodes().GetEndOfContent() );
-/*N*/ pPam->Move( fnMoveBackward, fnGoDoc );
-/*N*/ pPam->SetMark();
-/*N*/ pPam->Move( fnMoveForward, fnGoDoc );
-/*N*/ }
-/*N*/
-/*N*/ rxWriter->bWriteAll = bWriteAll;
-/*N*/ SwDoc* pOutDoc = pDoc ? pDoc : &rDoc;
-/*N*/
-/*N*/ // falls der Standart PageDesc. immer noch auf initalen Werten steht
-/*N*/ // (wenn z.B. kein Drucker gesetzt wurde) dann setze jetzt auf DIN A4
-/*N*/ if( !pOutDoc->GetPrt() )
-/*N*/ {
-/*?*/ const SwPageDesc& rPgDsc = pOutDoc->GetPageDesc( 0L );
-/*?*/ //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );;
-/*?*/ const SwFmtFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize();
-/*?*/ // Clipboard-Dokument wird immer ohne Drucker angelegt, so ist
-/*?*/ // der Std.PageDesc immer aug LONG_MAX !! Mappe dann auf DIN A4
-/*?*/ if( LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth() )
-/*?*/ {
-/*?*/ SwPageDesc aNew( rPgDsc );
-/*?*/ SwFmtFrmSize aNewSz( rSz );
-/*?*/ aNewSz.SetHeight( lA4Height );
-/*?*/ aNewSz.SetWidth( lA4Width );
-/*?*/ aNew.GetMaster().SetAttr( aNewSz );
-/*?*/ pOutDoc->ChgPageDesc( 0, aNew );
-/*?*/ }
-/*N*/ }
-/*N*/
-/*N*/ SwEditShell* pESh = pOutDoc->GetEditShell();
-/*N*/ if( pESh )
-/*N*/ pESh->StartAllAction();
-/*N*/
-/*N*/ BOOL bWasPurgeOle = pOutDoc->IsPurgeOLE();
-/*N*/ pOutDoc->SetPurgeOLE( FALSE );
-/*N*/
-/*N*/ ULONG nError = 0;
-/*N*/ if( pMedium )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else if( pStg )
-/*N*/ nError = rxWriter->Write( *pPam, *pStg, pRealFileName );
-/*N*/ else if( pStrm )
-/*N*/ nError = rxWriter->Write( *pPam, *pStrm, pRealFileName );
-/*N*/
-/*N*/ pOutDoc->SetPurgeOLE( bWasPurgeOle );
-/*N*/ if( pESh )
-/*N*/ pESh->EndAllAction();
-/*N*/
-/*N*/ // Falls nur zum Schreiben eine Selektion aufgespannt wurde, vor der
-/*N*/ // Rueckkehr den alten Crsr wieder herstellen.
-/*N*/ if( !bWriteAll && ( pShell || pOutPam ))
-/*N*/ {
-/*N*/ if(!bHasMark)
-/*N*/ {
-/*?*/ if( pShell )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ else
-/*?*/ delete pPam;
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ delete pPam; // loesche den hier erzeugten Pam
-/*N*/ // Alles erfolgreich geschrieben? Sag' das dem Dokument!
-/*N*/ if( !IsError( nError ) && !pDoc )
-/*N*/ rDoc.ResetModified();
-/*N*/ }
-/*N*/
-/*N*/ if ( pDoc )
-/*N*/ {
-/*N*/ delete pRefForDocSh;
-/*?*/ if ( !pDoc->RemoveLink() )
-/*?*/ delete pDoc;
-/*?*/ bWriteAll = FALSE;
-/*N*/ }
-/*N*/
-/*N*/ return nError;
-/*N*/ }
-
-
-/* */
-
-// ----------------------------------------------------------------------
-
-
/*N*/ BOOL SetHTMLTemplate( SwDoc & /*rDoc*/ )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
index 782cb50..29c2e36 100644
--- a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
+++ b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -249,35 +248,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
return rStrm << pStr;
}
-
-/*N*/ ULONG Writer::Write( SwPaM& rPaM, SvStream& rStrm, const String* pFName )
-/*N*/ {
-/*N*/ pStrm = &rStrm;
-/*N*/ pDoc = rPaM.GetDoc();
-/*N*/ pOrigFileName = pFName;
-/*N*/ pImpl = new Writer_Impl( *pDoc );
-/*N*/
-/*N*/ // PaM kopieren, damit er veraendert werden kann
-/*N*/ pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-/*N*/ // zum Vergleich auf den akt. Pam sichern
-/*N*/ pOrigPam = &rPaM;
-/*N*/
-/*N*/ ULONG nRet = WriteStream();
-/*N*/
-/*N*/ ResetWriter();
-/*N*/
-/*N*/ return nRet;
-/*N*/ }
-
-
-/*N*/ ULONG Writer::Write( SwPaM& /*rPam*/, SvStorage&, const String* )
-/*N*/ {
-/*N*/ ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
-/*N*/ return ERR_SWG_WRITE_ERROR;
-/*N*/ }
-
-
-
/*N*/ void Writer::PutNumFmtFontsInAttrPool()
/*N*/ {
/*N*/ if( !pImpl )
@@ -333,8 +303,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
/*N*/ }
/*N*/ }
-
-
/*N*/ void Writer::_AddFontItems( SfxItemPool& rPool, USHORT nW )
/*N*/ {
/*N*/ const SvxFontItem* pFont = (const SvxFontItem*)&rPool.GetDefaultItem( nW );
@@ -373,35 +341,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
/*N*/ }
/*N*/ }
-// build a bookmark table, which is sort by the node position. The
-// OtherPos of the bookmarks also inserted.
-
-// search alle Bookmarks in the range and return it in the Array
-
-// Storage-spezifisches
-
-
-/*N*/ ULONG StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const String* pFName )
-/*N*/ {
-/*N*/ pStrm = 0;
-/*N*/ pStg = &rStg;
-/*N*/ pDoc = rPaM.GetDoc();
-/*N*/ pOrigFileName = pFName;
-/*N*/ pImpl = new Writer_Impl( *pDoc );
-/*N*/
-/*N*/ // PaM kopieren, damit er veraendert werden kann
-/*N*/ pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-/*N*/ // zum Vergleich auf den akt. Pam sichern
-/*N*/ pOrigPam = &rPaM;
-/*N*/
-/*N*/ ULONG nRet = WriteStorage();
-/*N*/
-/*N*/ pStg = NULL;
-/*N*/ ResetWriter();
-/*N*/
-/*N*/ return nRet;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx b/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
index 1a11b38..a6f1be6 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
@@ -392,14 +392,6 @@ ULONG SwXMLWriter::WriteStorage()
return _Write();
}
-ULONG SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
- const String* pFileName )
-{
- return IsStgWriter()
- ? ((StgWriter *)this)->Write( rPaM, *rMed.GetOutputStorage( sal_True ), pFileName )
- : ((Writer *)this)->Write( rPaM, *rMed.GetOutStream(), pFileName );
-}
-
sal_Bool SwXMLWriter::WriteThroughComponent(
const Reference<XComponent> & xComponent,
const sal_Char* pStreamName,
diff --git a/binfilter/bf_sw/source/filter/xml/wrtxml.hxx b/binfilter/bf_sw/source/filter/xml/wrtxml.hxx
index 025ff4b..4387249 100644
--- a/binfilter/bf_sw/source/filter/xml/wrtxml.hxx
+++ b/binfilter/bf_sw/source/filter/xml/wrtxml.hxx
@@ -57,8 +57,6 @@ public:
SwXMLWriter();
virtual ~SwXMLWriter();
- virtual ULONG Write( SwPaM&, SfxMedium&, const String* = 0 );
-
private:
// helper methods to write XML streams
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 79f73c6..6d67478 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -175,9 +175,6 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
if (!(*ppRdr)->CheckPasswd( aPasswd, *pRead ))
{
delete *ppRdr;
- //JP: SFX-Aenderung - kein close rufen
- // if( !rMedium.IsStorage() )
- // rMedium.CloseInStream();
return 0;
}
}
@@ -290,192 +287,22 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
--------------------------------------------------------------------*/
-/*?*/ BOOL SwDocShell::Save()
-/*?*/ {
-/*?*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::Save" );
- /*?*/ sal_Bool bXML = pIo->GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60;
- /*?*/
- /*?*/ CalcLayoutForOLEObjects(); // format for OLE objets
-
- /*?*/ ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
- /*?*/ if( SfxInPlaceObject::Save() )
- /*?*/ {
- /*?*/ switch( GetCreateMode() )
- /*?*/ {
- /*?*/ case SFX_CREATE_MODE_INTERNAL:
- /*?*/ nErr = 0;
- /*?*/ break;
- /*?*/
- /*?*/ case SFX_CREATE_MODE_ORGANIZER:
- /*?*/ if( bXML )
- /*?*/ {
- /*?*/ WriterRef xWrt;
-/*?*/ ::binfilter::GetXMLWriter( aEmptyStr, xWrt );
- /*?*/ xWrt->SetOrganizerMode( TRUE );
- /*?*/ SwWriter aWrt( *pIo->GetStorage(), *pDoc );
- /*?*/ nErr = aWrt.Write( xWrt );
- /*?*/ xWrt->SetOrganizerMode( FALSE );
- /*?*/ }
- /*?*/ else
- /*?*/ nErr = pIo->SaveStyles();
- /*?*/ break;
- /*?*/
- /*?*/ case SFX_CREATE_MODE_EMBEDDED:
- /*?*/ // SfxProgress unterdruecken, wenn man Embedded ist
- /*?*/ SW_MOD()->SetEmbeddedLoadSave( TRUE );
- /*?*/ // kein break;
- /*?*/
- /*?*/ case SFX_CREATE_MODE_STANDARD:
- /*?*/ case SFX_CREATE_MODE_PREVIEW:
- /*?*/ default:
- /*?*/ {
- /*?*/ // TabellenBox Edit beenden!
- /*?*/ if( pWrtShell )
- /*?*/ pWrtShell->EndAllTblBoxEdit();
- /*?*/
- /*?*/ WriterRef xWrt;
- /*?*/ if( bXML )
- /*?*/ {
-/*?*/ ::binfilter::GetXMLWriter( aEmptyStr, xWrt );
- /*?*/ }
- /*?*/ else
- /*?*/ {
-/*?*/ ::binfilter::GetSw3Writer( aEmptyStr, xWrt );
- /*?*/ ((Sw3Writer*)&xWrt)->SetSw3Io( pIo, FALSE );
- /*?*/ }
- /*?*/
- /*?*/ BOOL bLockedView;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list