[Libreoffice-commits] .: 6 commits - binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 17 01:54:53 PDT 2011
binfilter/bf_sc/source/core/data/sc_attrib.cxx | 19
binfilter/bf_sc/source/core/data/sc_conditio.cxx | 8
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 9
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 650 ----------------
binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx | 14
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 10
binfilter/bf_sfx2/source/notify/sfx2_hintpost.cxx | 17
binfilter/bf_so3/source/persist/transbnd.cxx | 8
binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx | 17
binfilter/bf_svx/source/outliner/svx_outliner.cxx | 6
binfilter/bf_sw/source/core/doc/sw_doc.cxx | 17
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 58 -
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 15
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 63 -
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 30
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 8
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 2
binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx | 3
binfilter/bf_sw/source/core/doc/sw_swserv.cxx | 25
binfilter/bf_sw/source/core/doc/sw_visiturl.cxx | 49 -
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 4
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 39
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 16
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 129 ---
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 2
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 2
binfilter/bf_sw/source/core/inc/blink.hxx | 6
binfilter/bf_sw/source/core/inc/flowfrm.hxx | 2
binfilter/bf_sw/source/core/inc/frmtool.hxx | 3
binfilter/bf_sw/source/core/inc/txtfrm.hxx | 2
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 204 -----
binfilter/bf_sw/source/core/swg/makefile.mk | 6
binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx | 66 -
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 4
binfilter/bf_sw/source/core/text/sw_portxt.cxx | 4
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 204 -----
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 86 --
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 37
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 1
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 85 --
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 7
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 2
binfilter/inc/bf_sc/conditio.hxx | 1
binfilter/inc/bf_sc/dbcolect.hxx | 3
binfilter/inc/bf_sc/xmlwrap.hxx | 22
binfilter/inc/bf_sfx2/hintpost.hxx | 5
binfilter/inc/bf_sfx2/macrconf.hxx | 2
binfilter/inc/bf_sfx2/objsh.hxx | 1
binfilter/inc/bf_so3/transbnd.hxx | 1
binfilter/inc/bf_svx/dlight3d.hxx | 1
binfilter/inc/bf_svx/outliner.hxx | 1
binfilter/inc/bf_sw/SwXMLSectionList.hxx | 54 -
binfilter/inc/bf_sw/doc.hxx | 6
binfilter/inc/bf_sw/editsh.hxx | 1
binfilter/inc/bf_sw/ndarr.hxx | 12
55 files changed, 39 insertions(+), 2010 deletions(-)
New commits:
commit 2b05103496ecc92eab354aaba8d6f727d901a1fa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 09:49:50 2011 +0100
callcatcher: another round
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
index 8939be3..97098f9 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
@@ -88,277 +88,6 @@ ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage*
DBG_ASSERT( pMedium || pStorage, "ScXMLImportWrapper: Medium or Storage must be set" );
}
-uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator(
- uno::Reference < frame::XModel> & rModel)
-{
- uno::Reference<task::XStatusIndicator> xStatusIndicator;
- if (rModel.is())
- {
- uno::Reference<frame::XController> xController( rModel->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())
- {
- try
- {
- xStatusIndicator = xFactory->createStatusIndicator();
- }
- catch( lang::DisposedException e )
- {
- OSL_FAIL("Exception while trying to get a Status Indicator");
- }
- }
- }
- }
- }
- return xStatusIndicator;
-}
-
-uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator()
-{
- uno::Reference<task::XStatusIndicator> xStatusIndicator;
- if (pMedium)
- {
- SfxItemSet* pSet = pMedium->GetItemSet();
- if (pSet)
- {
- const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
- if (pItem)
- {
- uno::Any aAny(pItem->GetValue());
- aAny >>= xStatusIndicator;
- }
- }
- }
- return xStatusIndicator;
-}
-
-sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory,
- uno::Reference<frame::XModel>& xModel, uno::Reference<uno::XInterface>& xXMLParser,
- xml::sax::InputSource& aParserInput,
- const ::rtl::OUString& sComponentName, const ::rtl::OUString& sDocName,
- const ::rtl::OUString& sOldDocName, uno::Sequence<uno::Any>& aArgs,
- sal_Bool bMustBeSuccessfull)
-{
- SvStorageStreamRef xDocStream;
- if ( !pStorage && pMedium )
- pStorage = pMedium->GetStorage();
-
- // Get data source ...
-
- uno::Reference< uno::XInterface > xPipe;
- uno::Reference< io::XActiveDataSource > xSource;
-
- sal_Bool bEncrypted = sal_False;
- if( pStorage )
- {
- if (pStorage->IsStream(sDocName))
- xDocStream = pStorage->OpenStream( sDocName,
- STREAM_READ | STREAM_NOCREATE );
- else if (sOldDocName.getLength() && pStorage->IsStream(sOldDocName))
- xDocStream = pStorage->OpenStream( sOldDocName,
- STREAM_READ | STREAM_NOCREATE );
- else
- return sal_False;
- xDocStream->SetBufferSize( 16*1024 );
- aParserInput.aInputStream = xDocStream->GetXInputStream();
-
- uno::Any aAny;
- bEncrypted = xDocStream->GetProperty(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ), aAny ) &&
- aAny.getValueType() == ::getBooleanCppuType() &&
- *(sal_Bool *)aAny.getValue();
- }
- else
- return SCERR_IMPORT_UNKNOWN;
-
- sal_uInt32 nReturn(0);
- uno::Reference<xml::sax::XDocumentHandler> xDocHandler(
- xServiceFactory->createInstanceWithArguments(
- sComponentName, aArgs ),
- uno::UNO_QUERY );
- DBG_ASSERT( xDocHandler.is(), "can't get Calc importer" );
- uno::Reference<document::XImporter> xImporter( xDocHandler, uno::UNO_QUERY );
- uno::Reference<lang::XComponent> xComponent( xModel, uno::UNO_QUERY );
- if (xImporter.is())
- xImporter->setTargetDocument( xComponent );
-
- // connect parser and filter
- uno::Reference<xml::sax::XParser> xParser( xXMLParser, uno::UNO_QUERY );
- xParser->setDocumentHandler( xDocHandler );
-
- // parse
- if( xSource.is() )
- {
- uno::Reference<io::XActiveDataControl> xSourceControl( xSource, uno::UNO_QUERY );
- if( xSourceControl.is() )
- xSourceControl->start();
- }
-
- try
- {
- xParser->parseStream( aParserInput );
- }
- catch( xml::sax::SAXParseException& r )
- {
- if( bEncrypted )
- nReturn = ERRCODE_SFX_WRONGPASSWORD;
- else
- {
-
-#ifdef DBG_UTIL
- ByteString aError( "SAX parse exception catched while importing:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
-#endif
-
- String sErr( String::CreateFromInt32( r.LineNumber ));
- sErr += ',';
- sErr += String::CreateFromInt32( r.ColumnNumber );
-
- if( sDocName.getLength() )
- {
- nReturn = *new TwoStringErrorInfo(
- (bMustBeSuccessfull ? SCERR_IMPORT_FILE_ROWCOL
- : SCWARN_IMPORT_FILE_ROWCOL),
- sDocName, sErr,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
- }
- else
- {
- DBG_ASSERT( bMustBeSuccessfull, "Warnings are not supported" );
- nReturn = *new StringErrorInfo( SCERR_IMPORT_FORMAT_ROWCOL, sErr,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
- }
- }
- }
- catch( xml::sax::SAXException& r )
- {
- if( bEncrypted )
- nReturn = ERRCODE_SFX_WRONGPASSWORD;
- else
- {
-
-#ifdef DBG_UTIL
- ByteString aError( "SAX exception catched while importing:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
-#endif
- nReturn = SCERR_IMPORT_FORMAT;
- }
- }
- catch( packages::zip::ZipIOException& r )
- {
-#ifdef DBG_UTIL
- ByteString aError( "Zip exception catched while importing:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
-#endif
- nReturn = ERRCODE_IO_BROKENPACKAGE;
- }
- catch( io::IOException& r )
- {
-#ifdef DBG_UTIL
- ByteString aError( "IO exception catched while importing:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
-#endif
- nReturn = SCERR_IMPORT_OPEN;
- }
- catch( uno::Exception& r )
- {
-#ifdef DBG_UTIL
- ByteString aError( "uno exception catched while importing:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
-#endif
- nReturn = SCERR_IMPORT_UNKNOWN;
- }
-
- if ( xDocHandler.is() )
- {
- ScXMLImport* pImport = static_cast<ScXMLImport*>(SvXMLImport::getImplementation(xDocHandler));
-
- if (pImport && pImport->HasRangeOverflow() && !nReturn)
- nReturn = pImport->GetRangeOverflowType();
- }
-
- // free the component
- xParser->setDocumentHandler( NULL );
-
- // success!
- return nReturn;
-}
-
-sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory,
- uno::Reference<frame::XModel>& xModel, uno::Reference<uno::XInterface>& xWriter,
- uno::Sequence<beans::PropertyValue>& aDescriptor, const ::rtl::OUString& sName,
- const ::rtl::OUString& sMediaType, const ::rtl::OUString& sComponentName,
- const sal_Bool bPlainText, uno::Sequence<uno::Any>& aArgs, ScMySharedData*& pSharedData)
-{
- sal_Bool bRet(sal_False);
- uno::Reference<io::XOutputStream> xOut;
- SvStorageStreamRef xStream;
-
- if( pStorage )
- {
- // #96807#; trunc stream before use, because it could be an existing stream
- // and the new content could be shorter than the old content. In this case
- // would not all be over written by the new content and the xml file
- // would not be valid.
- xStream = pStorage->OpenStream( sName,
- STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC );
- uno::Any aAny; aAny <<= sMediaType;
- xStream->SetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aAny);
- if (bPlainText)
- {
- aAny = ::cppu::bool2any(sal_False);
- xStream->SetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")), aAny);
- }
- else
- {
- aAny = ::cppu::bool2any(sal_True);
- xStream->SetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")), aAny);
- }
- xStream->SetBufferSize( 16*1024 );
- xOut = new ::utl::OOutputStreamWrapper( *xStream );
- }
- // #99667#; no longer necessary
-/* else if ( pMedium )
- {
- xOut = pMedium->GetDataSink();
- }*/
-
- uno::Reference<io::XActiveDataSource> xSrc( xWriter, uno::UNO_QUERY );
- xSrc->setOutputStream( xOut );
-
-
- uno::Reference<document::XFilter> xFilter(
- xServiceFactory->createInstanceWithArguments( sComponentName , aArgs ),
- uno::UNO_QUERY );
- DBG_ASSERT( xFilter.is(), "can't get exporter" );
- uno::Reference<document::XExporter> xExporter( xFilter, uno::UNO_QUERY );
- uno::Reference<lang::XComponent> xComponent( xModel, uno::UNO_QUERY );
- if (xExporter.is())
- xExporter->setSourceDocument( xComponent );
-
- if ( xFilter.is() )
- {
- ScXMLExport* pExport = static_cast<ScXMLExport*>(SvXMLExport::getImplementation(xFilter));
- pExport->SetSharedData(pSharedData);
- bRet = xFilter->filter( aDescriptor );
- pSharedData = pExport->GetSharedData();
-
- if (xStream.Is())
- xStream->Commit();
- }
- return bRet;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 03691ac..c87f6f5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -412,34 +412,6 @@ namespace binfilter {
/*N*/ SetModified();
/*N*/ }
-/*************************************************************************
-|*
-|* SwDoc::DelPageDesc()
-|*
-|* Beschreibung Alle Descriptoren, deren Follow auf den zu loeschenden
-|* zeigen muessen angepasst werden.
-|*
-|*************************************************************************/
-
-void lcl_RemoveFrms( SwFrmFmt& rFmt, bool& rbFtnsRemoved )
-{
- SwClientIter aIter( rFmt );
- SwFrm *pFrm;
- for( pFrm = (SwFrm*)aIter.First(TYPE(SwFrm)); pFrm;
- pFrm = (SwFrm*)aIter.Next() )
- if ( !rbFtnsRemoved && pFrm->IsPageFrm() &&
- ((SwPageFrm*)pFrm)->IsFtnPage() )
- {
- rbFtnsRemoved = TRUE;
- }
- else
- {
- pFrm->Cut();
- delete pFrm;
- }
-}
-
-
void SwDoc::DelPageDesc( USHORT i )
{
OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
diff --git a/binfilter/inc/bf_sc/xmlwrap.hxx b/binfilter/inc/bf_sc/xmlwrap.hxx
index 6398ad8..b18c9fc 100644
--- a/binfilter/inc/bf_sc/xmlwrap.hxx
+++ b/binfilter/inc/bf_sc/xmlwrap.hxx
@@ -55,26 +55,6 @@ class ScXMLImportWrapper
SfxMedium* pMedium;
SvStorage* pStorage;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> GetStatusIndicator(
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel);
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> GetStatusIndicator();
-
- sal_uInt32 ImportFromComponent(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& xServiceFactory,
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xXMLParser,
- ::com::sun::star::xml::sax::InputSource& aParserInput,
- const ::rtl::OUString& sComponentName, const ::rtl::OUString& sDocName, const ::rtl::OUString& sOldDocName,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArgs,
- sal_Bool bMustBeSuccessfull);
-
- sal_Bool ExportToComponent(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& xServiceFactory,
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xWriter,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aDescriptor,
- const ::rtl::OUString& sName, const ::rtl::OUString& sMediaType, const ::rtl::OUString& sComponentName,
- const sal_Bool bPlainText, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArgs,
- ScMySharedData*& pSharedData);
-
public:
ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage* pS);
};
commit 17dac9a93bec655d1b02715ed67552c6d816b607
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 23:05:25 2011 +0100
GetRootFrm can only be NULL
diff --git a/binfilter/bf_sw/source/core/doc/sw_doc.cxx b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
index f65d492..bcbe753 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
@@ -381,23 +381,6 @@ void SwDoc::SetGlobalMacro( USHORT nEvent, const SvxMacro& rMacro )
/*M*/ return 0;
/*M*/ }
-/*M*/ const Size SwDoc::GetPageSize( sal_uInt16 nPageNum ) const
-/*M*/ {
-/*M*/ Size aSize;
-/*M*/ if( GetRootFrm() && nPageNum )
-/*M*/ {
-/*M*/ const SwPageFrm* pPage = static_cast<const SwPageFrm*>
-/*M*/ (GetRootFrm()->Lower());
-/*M*/ while( --nPageNum && pPage->GetNext() )
-/*M*/ pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
-/*M*/ if( pPage->IsEmptyPage() && pPage->GetNext() )
-/*M*/ pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
-/*M*/ aSize = pPage->Frm().SSize();
-/*M*/ }
-/*M*/ return aSize;
-/*M*/ }
-
-
/*************************************************************************
* void UpdateDocStat( const SwDocStat& rStat );
*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 7bdd0eb..03691ac 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -372,29 +372,20 @@ namespace binfilter {
/*N*/
/*N*/ //Wenn sich das UseOn oder der Follow aendern muessen die
/*N*/ //Absaetze das erfahren.
-/*N*/ BOOL bUseOn = FALSE;
-/*N*/ BOOL bFollow = FALSE;
/*N*/ if ( pDesc->GetUseOn() != rChged.GetUseOn() )
/*N*/ { pDesc->SetUseOn( rChged.GetUseOn() );
-/*N*/ bUseOn = TRUE;
/*N*/ }
/*N*/ if ( pDesc->GetFollow() != rChged.GetFollow() )
/*N*/ { if ( rChged.GetFollow() == &rChged )
/*N*/ { if ( pDesc->GetFollow() != pDesc )
/*?*/ { pDesc->SetFollow( pDesc );
-/*?*/ bFollow = TRUE;
/*?*/ }
/*N*/ }
/*N*/ else
/*N*/ { pDesc->SetFollow( rChged.pFollow );
-/*N*/ bFollow = TRUE;
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ if ( (bUseOn || bFollow) && GetRootFrm() )
-/*N*/ //Layot benachrichtigen!
-/*N*/ GetRootFrm()->CheckPageDescs( (SwPageFrm*)GetRootFrm()->Lower() );
-/*N*/
/*N*/ //Jetzt noch die Seiten-Attribute uebernehmen.
/*N*/ ::binfilter::lcl_DescSetAttr( rChged.GetMaster(), pDesc->GetMaster() );
/*N*/ ::binfilter::lcl_DescSetAttr( rChged.GetLeft(), pDesc->GetLeft() );
@@ -495,30 +486,9 @@ void SwDoc::DelPageDesc( USHORT i )
if ( aPageDescs[j]->GetFollow() == pDel )
{
aPageDescs[j]->SetFollow( 0 );
- //Clients des PageDesc sind die Attribute, denen sagen wir bescheid.
- //die Attribute wiederum reichen die Meldung an die Absaetze weiter.
-
- //Layot benachrichtigen!
- if( GetRootFrm() ) // ist nicht immer vorhanden!! (Orginizer)
- GetRootFrm()->CheckPageDescs( (SwPageFrm*)GetRootFrm()->Lower() );
}
}
- if( GetRootFrm() ) // ist nicht immer vorhanden!! (Orginizer)
- {
- //Wenn jetzt noch irgendwelche Seiten auf die FrmFmt'e (Master und Left)
- //Zeigen (z.B. irgendwelche Fussnotenseiten), so muessen die Seiten
- //vernichtet werden.
-
- // Wenn wir auf Endnotenseiten stossen, schmeissen wir alle Fussnoten weg,
- // anders kann die Reihenfolge der Seiten (FollowsPageDescs usw.)
- // nicht garantiert werden.
- bool bFtnsRemoved = FALSE;
-
- ::binfilter::lcl_RemoveFrms( pDel->GetMaster(), bFtnsRemoved );
- ::binfilter::lcl_RemoveFrms( pDel->GetLeft(), bFtnsRemoved );
- }
-
aPageDescs.Remove( i );
delete pDel;
SetModified();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index fa24a1c..5fc77de 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -299,36 +299,12 @@ namespace binfilter {
/*N*/ if( !(GetEndNoteInfo() == rInfo) )
/*N*/ {
/*N*/ bool bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
-/*N*/ bool bExtra = (!bNumChg &&
-/*N*/ rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType()) ||
-/*N*/ rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix() ||
-/*N*/ rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix();
-/*N*/ bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
-/*N*/ GetEndNoteInfo().GetPageDesc( *this );
/*N*/ SwCharFmt *pOldChrFmt = GetEndNoteInfo().GetCharFmt( *this ),
/*N*/ *pNewChrFmt = rInfo.GetCharFmt( *this );
/*N*/ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
/*N*/
/*N*/ *pEndNoteInfo = rInfo;
/*N*/
-/*N*/ if ( GetRootFrm() )
-/*N*/ {
-/*?*/ if ( bFtnDesc )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ if ( bExtra )
-/*?*/ {
-/*?*/ //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns
-/*?*/ //extra-Code und nutzen die vorhandenen Wege.
-/*?*/ SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-/*?*/ for( USHORT nPos = 0; nPos < rFtnIdxs.Count(); ++nPos )
-/*?*/ {
-/*?*/ SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-/*?*/ const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-/*?*/ if ( rFtn.IsEndNote() )
-/*?*/ pTxtFtn->SetNumber( rFtn.GetNumber(), &rFtn.GetNumStr());
-/*?*/ }
-/*N*/ }
-/*N*/ }
/*N*/ if( bNumChg )
/*?*/ GetFtnIdxs().UpdateAllFtn();
/*N*/ else if( bFtnChrFmts )
@@ -419,16 +395,10 @@ namespace binfilter {
/*N*/ if ( !bTypeChgd )
/*N*/ rFtnArr.UpdateAllFtn();
/*N*/ }
-/*N*/ else if( GetRootFrm() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ return bChg;
/*N*/ }
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 55688a6..99e81d2 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -570,10 +570,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*?*/ }
/*?*/ pFmt->SetAttr( aFmtSize );
/*N*/ }
-
- // Frames anlegen
-/*N*/ if( GetRootFrm() )
-/*N*/ pFmt->MakeFrms(); // ???
/*N*/
/*N*/ SetModified();
/*N*/ return pFmt;
@@ -708,10 +704,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/
/*N*/ new SwDrawContact( pFmt, &rDrawObj );
/*N*/
-/*N*/ // ggfs. Frames anlegen
-/*N*/ if( GetRootFrm() )
-/*N*/ pFmt->MakeFrms();
-/*N*/
/*N*/ SetModified();
/*N*/ return pFmt;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/inc/blink.hxx b/binfilter/bf_sw/source/core/inc/blink.hxx
index 3e57b11..a3d0e58 100644
--- a/binfilter/bf_sw/source/core/inc/blink.hxx
+++ b/binfilter/bf_sw/source/core/inc/blink.hxx
@@ -31,7 +31,6 @@
#define _BLINK_HXX
class SwLinePortion;
-class SwRootFrm;
class SwTxtFrm;
#include <bf_svtools/svarray.hxx>
@@ -42,17 +41,14 @@ class SwBlinkPortion
{
Point aPos;
const SwLinePortion *pPor;
- const SwRootFrm *pFrm;
USHORT nDir;
public:
SwBlinkPortion( const SwLinePortion* pPortion, USHORT nDirection )
{ pPor = pPortion; nDir = nDirection; }
SwBlinkPortion( const SwBlinkPortion* pBlink, const SwLinePortion* pPort )
- { pPor = pPort; pFrm = pBlink->pFrm; aPos = pBlink->aPos; nDir = pBlink->nDir; }
+ { pPor = pPort; aPos = pBlink->aPos; nDir = pBlink->nDir; }
void SetPos( const Point& aNew ){ aPos = aNew; }
const Point& GetPos() const{ return aPos; }
- void SetRootFrm( const SwRootFrm* pNew ){ pFrm = pNew; }
- const SwRootFrm* GetRootFrm() const{ return pFrm; }
const SwLinePortion *GetPortion() const{ return pPor; }
USHORT GetDirection() const { return nDir; }
BOOL operator<( const SwBlinkPortion& rBlinkPortion ) const
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 8c74263..fcc7f97 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -2030,7 +2030,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
if (nRenderer >= pDoc->GetPageCount())
return uno::Sequence< beans::PropertyValue >();
- Size aPgSize( pDoc->GetPageSize( nRenderer + 1 ) );
+ Size aPgSize;
DBG_ASSERT( aPgSize != Size(), "no page size" );
awt::Size aPageSize( TWIP_TO_MM100( aPgSize.Width() ),
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index cdeb2a6..66b6fae 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1072,7 +1072,6 @@ public:
void UpdateDocStat( SwDocStat& rStat );
sal_uInt16 GetPageCount() const;
- const Size GetPageSize( sal_uInt16 nPageNum ) const;
//PageDescriptor-Schnittstelle
sal_uInt16 GetPageDescCnt() const { return aPageDescs.Count(); }
commit df3fe2ab44006ca83e7d6651ffb3aba9afa51cde
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 22:55:12 2011 +0100
GetRootFrm can only be NULL
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index 1c69880..af0a398 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -135,7 +135,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ SwNodeIndex aStt( *pHeadNd ); aIdx--;
/*?*/ SwSectionFmt* pSectFmt = MakeSectionFmt( 0 );
/*?*/ GetNodes().InsertSection( aStt, *pSectFmt, aSect, &aIdx,
-/*?*/ TRUE, FALSE );
+/*?*/ TRUE );
/*?*/ }
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index 236c0b6..9c0d034 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -576,7 +576,7 @@ namespace binfilter {
/*N*/ SwSectionFmt& rSectionFmt,
/*N*/ const SwSection& rSection,
/*N*/ const SwNodeIndex* pEnde,
-/*N*/ BOOL bInsAtStart, BOOL bCreateFrms )
+/*N*/ BOOL bInsAtStart )
/*N*/ {
/*N*/ SwNodeIndex aInsPos( rNdIdx );
/*N*/ if( !pEnde ) // kein Bereich also neue Section davor/hinter anlegen
@@ -647,14 +647,6 @@ namespace binfilter {
/*N*/ pSectNd->GetSection() = rSection;
/*N*/ SwSectionFmt* pSectFmt = pSectNd->GetSection().GetFmt();
/*N*/
-/*N*/ // Hier bietet sich als Optimierung an, vorhandene Frames nicht zu
-/*N*/ // zerstoeren und wieder neu anzulegen, sondern nur umzuhaengen.
-/*N*/ BOOL bInsFrm = bCreateFrms && !pSectNd->GetSection().IsHidden() &&
-/*N*/ GetDoc()->GetRootFrm();
-/*N*/ SwNode2Layout *pNode2Layout = NULL;
-/*N*/ if( bInsFrm )
-/*?*/ pNode2Layout = new SwNode2Layout( *pSectNd );
-/*N*/
/*N*/ // jetzt noch bei allen im Bereich den richtigen StartNode setzen
/*N*/ ULONG nEnde = pSectNd->EndOfSectionIndex();
/*N*/ ULONG nStart = pSectNd->GetIndex()+1;
@@ -695,18 +687,6 @@ namespace binfilter {
/*N*/
/*N*/ lcl_DeleteFtn( pSectNd, nStart, nEnde );
/*N*/
-/*N*/ if( bInsFrm )
-/*N*/ {
-/*N*/ if( pNode2Layout )
-/*N*/ {
-/*?*/ ULONG nIdx = pSectNd->GetIndex();
-/*?*/ pNode2Layout->RestoreUpperFrms( pSectNd->GetNodes(), nIdx, nIdx + 1 );
-/*?*/ delete pNode2Layout;
-/*N*/ }
-/*N*/ else
-/*N*/ pSectNd->MakeFrms( &aInsPos );
-/*N*/ }
-/*N*/
/*N*/ return pSectNd;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 2c146ba..1c26538 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -2668,7 +2668,6 @@ void SwXOLEListener::modified( const EventObject& rEvent )
{
// if the OLE-Node is UI-Active do nothing
pNd->SetOLESizeInvalid( sal_True );
- pNd->GetDoc()->SetOLEObjModified();
}
}
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 2888c78..cdeb2a6 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1440,11 +1440,6 @@ public:
// Der Pointer geht NICHT in den Besitz des Doc's!!
void SetPreViewPrtData( const SwPagePreViewPrtData* pData );
- // update all modified OLE-Objects. The modification is called over the
- // StarOne - Interface --> Bug 67026
- void SetOLEObjModified()
- { if( GetRootFrm() ) aOLEModifiedTimer.Start(); }
-
// -------------------- Uno - Schnittstellen ---------------------------
const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; }
SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr = sal_False );
diff --git a/binfilter/inc/bf_sw/ndarr.hxx b/binfilter/inc/bf_sw/ndarr.hxx
index 00ad8c3..939b071 100644
--- a/binfilter/inc/bf_sw/ndarr.hxx
+++ b/binfilter/inc/bf_sw/ndarr.hxx
@@ -278,8 +278,7 @@ public:
SwSectionFmt& rSectionFmt,
const SwSection&,
const SwNodeIndex* pEnde,
- BOOL bInsAtStart = TRUE,
- BOOL bCreateFrms = TRUE );
+ BOOL bInsAtStart = TRUE );
// in welchem Doc steht das Nodes-Array ?
SwDoc* GetDoc() { return pMyDoc; }
commit 378a2b969a9a221ef898889bb651afd36b4c03af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 22:45:44 2011 +0100
FindPrvNxtFrmNode can only be NULL
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index a8d6435..236c0b6 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -653,12 +653,7 @@ namespace binfilter {
/*N*/ GetDoc()->GetRootFrm();
/*N*/ SwNode2Layout *pNode2Layout = NULL;
/*N*/ if( bInsFrm )
-/*N*/ {
-/*N*/ SwNodeIndex aTmp( *pSectNd );
-/*N*/ if( !pSectNd->GetNodes().FindPrvNxtFrmNode( aTmp, pSectNd->EndOfSectionNode() ) )
-/*N*/ // dann sammel mal alle Uppers ein
-/*?*/ pNode2Layout = new SwNode2Layout( *pSectNd );
-/*N*/ }
+/*?*/ pNode2Layout = new SwNode2Layout( *pSectNd );
/*N*/
/*N*/ // jetzt noch bei allen im Bereich den richtigen StartNode setzen
/*N*/ ULONG nEnde = pSectNd->EndOfSectionIndex();
@@ -822,25 +817,17 @@ namespace binfilter {
//Fuer jedes vorkommen im Layout einen SectionFrm anlegen und vor den
//entsprechenden CntntFrm pasten.
-/*N*/ void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEndIdx )
+/*N*/ void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* /*pEndIdx*/ )
/*N*/ {
/*N*/ OSL_ENSURE( pIdxBehind, "kein Index" );
/*N*/ SwNodes& rNds = GetNodes();
-/*N*/ SwDoc* pDoc = rNds.GetDoc();
/*N*/
/*N*/ *pIdxBehind = *this;
/*N*/
/*N*/ pSection->bHiddenFlag = TRUE;
/*N*/
/*N*/ if( rNds.IsDocNodes() )
-/*N*/ {
-/*N*/ SwNodeIndex *pEnd = pEndIdx ? pEndIdx :
-/*N*/ new SwNodeIndex( *EndOfSectionNode(), 1 );
-/*N*/ ::binfilter::MakeFrms( pDoc, *pIdxBehind, *pEnd );
-/*N*/ if( !pEndIdx )
-/*N*/ delete pEnd;
-/*N*/ }
-/*N*/
+/*N*/ ::binfilter::MakeFrms();
/*N*/ }
/*N*/ void SwSectionNode::DelFrms()
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index d6bdb7b..3db2caa 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -573,22 +573,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ {
/*N*/ OSL_ENSURE( pIdxBehind, "kein Index" );
/*N*/ *pIdxBehind = *this;
-/*N*/ SwNode *pNd = GetNodes().FindPrvNxtFrmNode( *pIdxBehind, EndOfSectionNode() );
-/*N*/ if( !pNd )
-/*N*/ return ;
-/*N*/
-/*N*/ // liegt der gefundene ContentNode vor oder hinter der Tabelle ?
-/*N*/ BOOL bBehind = EndOfSectionIndex() < pIdxBehind->GetIndex();
-/*N*/
-/*N*/ SwFrm *pFrm, *pNew;
-/*N*/
-/*N*/ SwNode2Layout aNode2Layout( *pNd, GetIndex() );
-/*N*/ while( 0 != (pFrm = aNode2Layout.NextFrm()) )
-/*N*/ {
-/*N*/ pNew = MakeFrm();
-/*N*/ pNew->Paste( pFrm->GetUpper(), bBehind ? pFrm : pFrm->GetNext() );
-/*N*/ ((SwTabFrm*)pNew)->RegistFlys();
-/*N*/ }
/*N*/ }
/*N*/ void SwTableNode::DelFrms()
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index b035afb..7c2f4e3 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -1008,21 +1008,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-
- // suche den vorhergehenden [/nachfolgenden ] ContentNode oder
- // TabellenNode mit Frames. Wird kein Ende angeben, dann wird mit
- // dem FrameIndex begonnen; ansonsten, wird mit dem vor rFrmIdx und
- // dem hintern pEnd die Suche gestartet. Sollte kein gueltiger Node
- // gefunden werden, wird 0 returnt. rFrmIdx zeigt auf dem Node mit
- // Frames
-/*N*/ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& /*rFrmIdx*/,
-/*N*/ const SwNode* /*pEnd*/ ) const
-/*N*/ {
-/*N*/ SwNode* pFrmNd = 0;
-/*N*/ return pFrmNd;
-/*N*/ }
-
-
/*N*/ void SwNodes::ForEach( const SwNodeIndex& rStart, const SwNodeIndex& rEnd,
/*N*/ FnForEach_SwNodes fnForEach, void* pArgs )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index cce71bb..0bd8a03 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -1019,7 +1019,7 @@ void SwSectionFmt::MakeFrms()
/*N*/ aSave++;
/*N*/
/*N*/ if( !bCreateFrm )
-/*N*/ ::binfilter::MakeFrms( pDoc, aSave, rInsPos );
+/*N*/ ::binfilter::MakeFrms();
/*N*/
/*N*/ // den letzten Node noch loeschen, aber nur wenn
/*N*/ // erfolgreich kopiert werden konnte, also der Bereich
diff --git a/binfilter/bf_sw/source/core/inc/flowfrm.hxx b/binfilter/bf_sw/source/core/inc/flowfrm.hxx
index 7aafb1d..27a8d81 100644
--- a/binfilter/bf_sw/source/core/inc/flowfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/flowfrm.hxx
@@ -71,7 +71,7 @@ class SwFlowFrm
//TblSel darf das Follow-Bit zuruecksetzen.
friend inline void UnsetFollow( SwFlowFrm *pFlow );
- friend void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & );
+ friend void MakeFrms();
friend class SwNode2LayImpl;
diff --git a/binfilter/bf_sw/source/core/inc/frmtool.hxx b/binfilter/bf_sw/source/core/inc/frmtool.hxx
index c4be369..df29a17 100644
--- a/binfilter/bf_sw/source/core/inc/frmtool.hxx
+++ b/binfilter/bf_sw/source/core/inc/frmtool.hxx
@@ -95,8 +95,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, ULONG nIndex,
SwFrm *pPrv = 0 );
//Erzeugen der Frames fuer einen bestimmten Bereich, verwendet _InsertCnt
-void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
- const SwNodeIndex &rEndIdx );
+void MakeFrms();
//Um z.B. fuer Tabelleheadlines das Erzeugen der Flys in _InsertCnt zu unterbinden.
extern bool bDontCreateObjects;
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index f5675e6..05b2585 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -1403,210 +1403,8 @@ bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt )
/*N*/ }
-void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
- const SwNodeIndex &rEndIdx )
+void MakeFrms()
{
- bObjsDirect = FALSE;
-
- SwNodeIndex aTmp( rSttIdx );
- ULONG nEndIdx = rEndIdx.GetIndex();
- SwNode* pNd = pDoc->GetNodes().FindPrvNxtFrmNode( aTmp,
- pDoc->GetNodes()[ nEndIdx-1 ]);
- if ( pNd )
- {
- BOOL bApres = aTmp < rSttIdx;
- SwNode2Layout aNode2Layout( *pNd, rSttIdx.GetIndex() );
- SwFrm* pFrm;
- while( 0 != (pFrm = aNode2Layout.NextFrm()) )
- {
- SwLayoutFrm *pUpper = pFrm->GetUpper();
- SwFtnFrm* pFtnFrm = pUpper->FindFtnFrm();
- BOOL bOldLock, bOldFtn;
- if( pFtnFrm )
- {
- bOldFtn = pFtnFrm->IsColLocked();
- pFtnFrm->ColLock();
- }
- else
- bOldFtn = TRUE;
- SwSectionFrm* pSct = pUpper->FindSctFrm();
- // Es sind innerhalb von Fussnoten nur die Bereiche interessant,
- // die in den Fussnoten liegen, nicht etwa die (spaltigen) Bereiche,
- // in denen die Fussnoten(Container) liegen.
- // #109767# Table frame is in section, insert section in cell frame.
- if( ( pSct && ( pFtnFrm && !pSct->IsInFtn() ) ) || ( pUpper->IsCellFrm() ) )
- pSct = NULL;
- if( pSct )
- { // damit der SectionFrm nicht zerstoert wird durch pTmp->MoveFwd()
- bOldLock = pSct->IsColLocked();
- pSct->ColLock();
- }
- else
- bOldLock = TRUE;
-
- // Wenn pFrm sich nicht bewegen kann, koennen wir auch niemanden
- // auf die naechste Seite schieben. Innerhalb eines Rahmens auch
- // nicht ( in der 1. Spalte eines Rahmens waere pFrm Moveable()! )
- // Auch in spaltigen Bereichen in Tabellen waere pFrm Moveable.
- BOOL bMoveNext = nEndIdx - rSttIdx.GetIndex() > 120;
- BOOL bAllowMove = !pFrm->IsInFly() && pFrm->IsMoveable() &&
- (!pFrm->IsInTab() || pFrm->IsTabFrm() );
- if ( bMoveNext && bAllowMove )
- {
- SwFrm *pMove = pFrm;
- SwFrm *pPrev = pFrm->GetPrev();
- SwFlowFrm *pTmp = SwFlowFrm::CastFlowFrm( pMove );
- OSL_ENSURE( pTmp, "Missing FlowFrm" );
-
- if ( bApres )
- {
- // Wir wollen, dass der Rest der Seite leer ist, d.h.
- // der naechste muss auf die naechste Seite wandern.
- // Dieser kann auch in der naechsten Spalte stehen!
- OSL_ENSURE( !pTmp->HasFollow(), "Follows forbidden" );
- pPrev = pFrm;
- // Wenn unser umgebender SectionFrm einen Next besitzt,
- // so soll dieser ebenfalls gemoved werden!
- pMove = pFrm->GetIndNext();
- SwColumnFrm* pCol = (SwColumnFrm*)pFrm->FindColFrm();
- if( pCol )
- pCol = (SwColumnFrm*)pCol->GetNext();
- do
- {
- if( pCol && !pMove )
- { // Bisher haben wir keinen Nachfolger gefunden
- // jetzt gucken wir in die naechste Spalte
- pMove = pCol->ContainsAny();
- if( pCol->GetNext() )
- pCol = (SwColumnFrm*)pCol->GetNext();
- else if( pCol->IsInSct() )
- { // Wenn es keine naechste Spalte gibt, wir aber
- // innerhalb eines spaltigen Bereichs sind,
- // koennte es noch ausserhalb des Bereich
- // (Seiten-)Spalten geben
- pCol = (SwColumnFrm*)pCol->FindSctFrm()->FindColFrm();
- if( pCol )
- pCol = (SwColumnFrm*)pCol->GetNext();
- }
- else
- pCol = NULL;
- }
- // Falls hier verschrottete SectionFrms herumgammeln,
- // muessen diese uebersprungen werden.
- while( pMove && pMove->IsSctFrm() &&
- !((SwSectionFrm*)pMove)->GetSection() )
- pMove = pMove->GetNext();
- } while( !pMove && pCol );
-
- if( pMove )
- {
- if ( pMove->IsCntntFrm() )
- pTmp = (SwCntntFrm*)pMove;
- else if ( pMove->IsTabFrm() )
- pTmp = (SwTabFrm*)pMove;
- else if ( pMove->IsSctFrm() )
- {
- pMove = ((SwSectionFrm*)pMove)->ContainsAny();
- if( pMove )
- pTmp = SwFlowFrm::CastFlowFrm( pMove );
- else
- pTmp = NULL;
- }
- }
- else
- pTmp = 0;
- }
- else
- {
- OSL_ENSURE( !pTmp->IsFollow(), "Follows really forbidden" );
- // Bei Bereichen muss natuerlich der Inhalt auf die Reise
- // geschickt werden.
- if( pMove->IsSctFrm() )
- {
- while( pMove && pMove->IsSctFrm() &&
- !((SwSectionFrm*)pMove)->GetSection() )
- pMove = pMove->GetNext();
- if( pMove && pMove->IsSctFrm() )
- pMove = ((SwSectionFrm*)pMove)->ContainsAny();
- if( pMove )
- pTmp = SwFlowFrm::CastFlowFrm( pMove );
- else
- pTmp = NULL;
- }
- }
-
- if( pTmp )
- {
- SwFrm* pOldUp = pTmp->GetFrm()->GetUpper();
- // MoveFwd==TRUE bedeutet, dass wir auf der gleichen
- // Seite geblieben sind, wir wollen aber die Seite wechseln,
- // sofern dies moeglich ist
- BOOL bOldLock1 = pTmp->IsJoinLocked();
- pTmp->LockJoin();
- while( pTmp->MoveFwd( TRUE, FALSE, TRUE ) )
- {
- if( pOldUp == pTmp->GetFrm()->GetUpper() )
- break;
- pOldUp = pTmp->GetFrm()->GetUpper();
- }
- if( !bOldLock1 )
- pTmp->UnlockJoin();
- }
- ::binfilter::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(),
- pFrm->IsInDocBody(), nEndIdx, pPrev );
- }
- else
- {
- BOOL bSplit(false);
- SwFrm* pPrv = bApres ? pFrm : pFrm->GetPrev();
- // Wenn in einen SectionFrm ein anderer eingefuegt wird,
- // muss dieser aufgebrochen werden
- if( pSct && rSttIdx.GetNode().IsSectionNode() )
- {DBG_BF_ASSERT(0, "STRIP");
- }
- else
- bSplit = FALSE;
- ::binfilter::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), FALSE,
- nEndIdx, pPrv );
- // correction: append objects doesn't
- // depend on value of <bAllowMove>
- if( !bDontCreateObjects )
- {
- const SwSpzFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
- if( pTbl->Count() )
- AppendAllObjs( pTbl );
- }
-
- // Wenn nichts eingefuegt wurde, z.B. ein ausgeblendeter Bereich,
- // muss das Splitten rueckgaengig gemacht werden
- if( bSplit && pSct && pSct->GetNext()
- && pSct->GetNext()->IsSctFrm() )
- pSct->MergeNext( (SwSectionFrm*)pSct->GetNext() );
- if( pFrm->IsInFly() )
- pFrm->FindFlyFrm()->_Invalidate();
- if( pFrm->IsInTab() )
- pFrm->InvalidateSize();
- }
-
- SwPageFrm *pPage = pUpper->FindPageFrm();
- SwFrm::CheckPageDescs( pPage, FALSE );
- if( !bOldFtn )
- pFtnFrm->ColUnlock();
- if( !bOldLock )
- {
- pSct->ColUnlock();
- // Zum Beispiel beim Einfuegen von gelinkten Bereichen,
- // die wiederum Bereiche enthalten, kann pSct jetzt leer sein
- // und damit ruhig zerstoert werden.
- if( !pSct->ContainsCntnt() )
- {
- pSct->DelEmpty( TRUE );
- delete pSct;
- }
- }
- }
- }
-
bObjsDirect = TRUE;
}
diff --git a/binfilter/inc/bf_sw/ndarr.hxx b/binfilter/inc/bf_sw/ndarr.hxx
index bdbe785..00ad8c3 100644
--- a/binfilter/inc/bf_sw/ndarr.hxx
+++ b/binfilter/inc/bf_sw/ndarr.hxx
@@ -284,15 +284,6 @@ public:
// in welchem Doc steht das Nodes-Array ?
SwDoc* GetDoc() { return pMyDoc; }
const SwDoc* GetDoc() const { return pMyDoc; }
-
- // suche den vorhergehenden [/nachfolgenden ] ContentNode oder
- // TabellenNode mit Frames. Wird kein Ende angeben, dann wird mit
- // dem FrameIndex begonnen; ansonsten, wird mit dem vor rFrmIdx und
- // dem hintern pEnd die Suche gestartet. Sollte kein gueltiger Node
- // gefunden werden, wird 0 returnt. rFrmIdx zeigt auf dem Node mit
- // Frames
- SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
- const SwNode* pEnd = 0 ) const;
private:
// privater Constructor, weil nie kopiert werden darf !!
SwNodes( const SwNodes & rNodes );
commit 3ffd41cc7975996ab4d35b903a5321e1dca06be2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 22:35:48 2011 +0100
GetRootFrm can only be NULL
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
index 6a6d71d..9832083 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
@@ -120,18 +120,9 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/
/*N*/ if( RES_FLYFRMFMT == pFmt->Which() )
/*N*/ {
-/*N*/ if( pFmt->GetDoc()->GetRootFrm() )
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ if( aIter.First( TYPE( SwFlyFrm) ) )
-/*N*/ nOrdNum = ((SwFlyFrm*)aIter())->GetVirtDrawObj()->GetOrdNum();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ if( aIter.First( TYPE(SwFlyDrawContact) ) )
-/*N*/ nOrdNum = ((SwFlyDrawContact*)aIter())->GetMaster()->GetOrdNum();
-/*N*/ }
+/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
+/*N*/ if( aIter.First( TYPE(SwFlyDrawContact) ) )
+/*N*/ nOrdNum = ((SwFlyDrawContact*)aIter())->GetMaster()->GetOrdNum();
/*N*/ }
/*N*/ else if( RES_DRAWFRMFMT == pFmt->Which() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 44e9b67..b747fd7 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -142,65 +142,6 @@ namespace binfilter {
/*N*/ return pRetFmt;
/*N*/ }
-
-/***********************************************************************
-#* Class : SwDoc
-#* Methode : SetFlyFrmAnchor
-#* Beschreibung: Das Ankerattribut des FlyFrms aendert sich.
-#***********************************************************************/
-
-/*N*/ Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
-/*N*/ const SwFrmFmt* pFlyFmt )
-/*N*/ {
-/*N*/ Point aRet;
-/*N*/ if( rDoc.GetRootFrm() )
-/*N*/ switch( rAnch.GetAnchorId() )
-/*N*/ {
-/*N*/ case FLY_IN_CNTNT:
-/*N*/ if( pFlyFmt && rAnch.GetCntntAnchor() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case FLY_AT_CNTNT:
-/*N*/ case FLY_AUTO_CNTNT: // LAYER_IMPL
-/*N*/ if( rAnch.GetCntntAnchor() )
-/*N*/ {
-/*N*/ const SwPosition *pPos = rAnch.GetCntntAnchor();
-/*N*/ const SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode();
-/*N*/ const SwFrm* pOld = pNd ? pNd->GetFrm( &aRet, 0, FALSE ) : 0;
-/*N*/ if( pOld )
-/*N*/ aRet = pOld->Frm().Pos();
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case FLY_AT_FLY: // LAYER_IMPL
-/*?*/ if( rAnch.GetCntntAnchor() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ break;
-/*?*/
-/*N*/ case FLY_PAGE:
-/*?*/ {
-/*?*/ USHORT nPgNum = rAnch.GetPageNum();
-/*?*/ const SwPageFrm *pPage = (SwPageFrm*)rDoc.GetRootFrm()->Lower();
-/*?*/ for( USHORT i = 1; (i <= nPgNum) && pPage; ++i,
-/*?*/ pPage = (const SwPageFrm*)pPage->GetNext() )
-/*?*/ if( i == nPgNum )
-/*?*/ {
-/*?*/ aRet = pPage->Frm().Pos();
-/*?*/ break;
-/*?*/ }
-/*?*/ }
-/*?*/ break;
- default:
- break;
-/*?*/ }
-/*N*/ return aRet;
-/*N*/ }
-
#define MAKEFRMS 0
#define IGNOREANCHOR 1
#define DONTMAKEFRMS 2
@@ -226,8 +167,8 @@ namespace binfilter {
/*M*/ return DONTMAKEFRMS;
/*M*/
/*M*/
-/*M*/ Point aOldAnchorPos( ::binfilter::lcl_FindAnchorLayPos( *this, rOldAnch, &rFmt ));
-/*M*/ Point aNewAnchorPos( ::binfilter::lcl_FindAnchorLayPos( *this, aNewAnch, 0 ));
+/*M*/ Point aOldAnchorPos;
+/*M*/ Point aNewAnchorPos;
/*M*/
/*M*/ //Die alten Frms vernichten. Dabei werden die Views implizit gehidet und
/*M*/ //doppeltes hiden waere so eine art Show!
diff --git a/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx b/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx
index 5c9037c..547b255 100644
--- a/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx
@@ -292,9 +292,6 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*N*/ }
-/*N*/
-/*N*/ if( pDoc->GetRootFrm() && FTNNUM_PAGE == rFtnInfo.eNum )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
index 4e07b51..4064088 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
@@ -159,31 +159,6 @@ namespace binfilter {
/*N*/ SwDataChanged::~SwDataChanged()
/*N*/ {
-/*N*/ // JP 09.04.96: nur wenn das Layout vorhanden ist ( also waehrend der
-/*N*/ // Eingabe)
-/*N*/ if( pDoc->GetRootFrm() )
-/*N*/ {
-/*N*/ const ::binfilter::SvLinkSources& rServers = pDoc->GetLinkManager().GetServers();
-/*N*/
-/*N*/ for( USHORT nCnt = rServers.Count(); nCnt; )
-/*N*/ {
-/*N*/ ::binfilter::SvLinkSourceRef refObj( rServers[ --nCnt ] );
-/*N*/ // noch jemand am Object interessiert ?
-/*?*/ if( refObj->HasDataLinks() && refObj->ISA( SwServerObject ))
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
-/*?*/ // sollte jetzt gar keine Verbindung mehr bestehen
-/*?*/ if( !refObj->HasDataLinks() )
-/*?*/ {
-/*?*/ // dann raus aus der Liste (Object bleibt aber bestehen!)
-/*?*/ // falls es noch da ist !!
-/*?*/ if( nCnt < rServers.Count() && &refObj == rServers[ nCnt ] )
-/*?*/ pDoc->GetLinkManager().RemoveServer( nCnt, 1 );
-/*?*/ }
-/*?*/ }
-/*N*/ }
/*N*/ }
}
diff --git a/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx b/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
index fb0d9d0..a45187e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_visiturl.cxx
@@ -60,55 +60,8 @@ namespace binfilter {
/*N*/ EndListening( *INetURLHistory::GetOrCreate() );
/*N*/ }
-/*N*/ void SwURLStateChanged::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
+/*N*/ void SwURLStateChanged::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/ )
/*N*/ {
-/*N*/ if( rHint.ISA( INetURLHistoryHint ) && pDoc->GetRootFrm() )
-/*N*/ {
-/*N*/ // diese URL wurde veraendert:
-/*N*/ const INetURLObject* pIURL = ((INetURLHistoryHint&)rHint).GetObject();
-/*N*/ String sURL( pIURL->GetMainURL( INetURLObject::NO_DECODE ) ), sBkmk;
-/*N*/
-/*N*/ SwEditShell* pESh = pDoc->GetEditShell();
-/*N*/
-/*N*/ if( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() &&
-/*N*/ // falls das unser Doc ist, kann es auch lokale Spruenge geben!
-/*N*/ sURL == pDoc->GetDocShell()->GetMedium()->GetName() )
-/*?*/ (sBkmk = pIURL->GetMark()).Insert( INET_MARK_TOKEN, 0 );
-/*N*/
-/*N*/ BOOL bAction = FALSE, bUnLockView = FALSE;
-/*N*/ const SwFmtINetFmt* pItem;
-/*N*/ const SwTxtINetFmt* pTxtAttr;
-/*N*/ const SwTxtNode* pTxtNd;
-/*N*/ USHORT n, nMaxItems = pDoc->GetAttrPool().GetItemCount( RES_TXTATR_INETFMT );
-/*N*/ for( n = 0; n < nMaxItems; ++n )
-/*N*/ if( 0 != (pItem = (SwFmtINetFmt*)pDoc->GetAttrPool().GetItem(
-/*N*/ RES_TXTATR_INETFMT, n ) ) &&
-/*N*/ ( pItem->GetValue() == sURL ||
-/*N*/ ( sBkmk.Len() && pItem->GetValue() == sBkmk )) &&
-/*N*/ 0 != ( pTxtAttr = pItem->GetTxtINetFmt()) &&
-/*N*/ 0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) )
-/*N*/ {
-/*?*/ if( !bAction && pESh )
-/*?*/ {
-/*?*/ pESh->StartAllAction();
-/*?*/ bAction = TRUE;
-/*?*/ bUnLockView = !pESh->IsViewLocked();
-/*?*/ pESh->LockView( TRUE );
-/*?*/ }
-/*?*/ ((SwTxtINetFmt*)pTxtAttr)->SetValidVis( FALSE );
-/*?*/ const SwTxtAttr* pAttr = pTxtAttr;
-/*?*/ SwUpdateAttr aUpdateAttr( *pAttr->GetStart(),
-/*?*/ *pAttr->GetEnd(),
-/*?*/ RES_FMT_CHG );
-/*?*/ ((SwTxtNode*)pTxtNd)->SwCntntNode::Modify( &aUpdateAttr,
-/*?*/ &aUpdateAttr );
-/*?*/ }
-/*N*/
-/*N*/ if( bAction )
-/*?*/ pESh->EndAllAction();
-/*N*/ if( bUnLockView )
-/*?*/ pESh->LockView( FALSE );
-/*N*/ }
/*N*/ }
// erfrage ob die URL besucht war. Uebers Doc, falls nur ein Bookmark
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
index 50aa0a8..62c76a5 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
@@ -301,7 +301,6 @@ struct _CopyTable
/*N*/ rTbl.SetHeadlineRepeat( GetTable().IsHeadlineRepeat() );
/*N*/ rTbl.SetTblChgMode( GetTable().GetTblChgMode() );
/*N*/
-/*N*/ SwDDEFieldType* pDDEType = 0;
/*N*/ if( IS_TYPE( SwDDETable, &GetTable() ))
/*N*/ {
/*?*/ // es wird eine DDE-Tabelle kopiert
@@ -330,9 +329,6 @@ struct _CopyTable
/*N*/
/*N*/ ((SwTable&)GetTable()).GetTabLines().ForEach( &lcl_CopyTblLine, &aPara );
/*N*/
-/*N*/ if( pDDEType && pDoc->GetRootFrm() )
-/*?*/ pDDEType->IncRefCnt();
-/*N*/
/*N*/ return pTblNd;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 6fc8a81..b035afb 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -1015,124 +1015,10 @@ namespace binfilter {
// dem hintern pEnd die Suche gestartet. Sollte kein gueltiger Node
// gefunden werden, wird 0 returnt. rFrmIdx zeigt auf dem Node mit
// Frames
-/*N*/ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
-/*N*/ const SwNode* pEnd ) const
+/*N*/ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& /*rFrmIdx*/,
+/*N*/ const SwNode* /*pEnd*/ ) const
/*N*/ {
/*N*/ SwNode* pFrmNd = 0;
-/*N*/
-/*N*/ // habe wir gar kein Layout, vergiss es
-/*N*/ if( GetDoc()->GetRootFrm() )
-/*N*/ {
-/*N*/ SwNode* pSttNd = &rFrmIdx.GetNode();
-/*N*/
-/*N*/ // wird in eine versteckte Section verschoben ??
-/*N*/ SwSectionNode* pSectNd = pSttNd->IsSectionNode()
-/*N*/ ? pSttNd->FindStartNode()->FindSectionNode()
-/*N*/ : pSttNd->FindSectionNode();
-/*N*/ if( !( pSectNd && pSectNd->GetSection().CalcHiddenFlag()/*IsHiddenFlag()*/ ) )
-/*N*/ {
-/*N*/ SwNodeIndex aIdx( rFrmIdx );
-/*N*/ SwNode* pNd;
-/*N*/ if( pEnd )
-/*N*/ {
-/*N*/ aIdx--;
-/*N*/ pNd = &aIdx.GetNode();
-/*N*/ }
-/*N*/ else
-/*?*/ pNd = pSttNd;
-/*N*/
-/*N*/ if( ( pFrmNd = pNd )->IsCntntNode() )
-/*N*/ rFrmIdx = aIdx;
-/*N*/
-/*N*/ // suche nach vorne/hinten nach einem Content Node
-/*N*/ else if( 0 != ( pFrmNd = GoPrevSection( &aIdx, TRUE, FALSE )) &&
-/*N*/ ::binfilter::CheckNodesRange( aIdx, rFrmIdx, TRUE ) &&
-/*N*/ // nach vorne nie aus der Tabelle hinaus!
-/*N*/ pFrmNd->FindTableNode() == pSttNd->FindTableNode() &&
-/*N*/ // Bug 37652: nach hinten nie aus der Tabellenzelle hinaus!
-/*N*/ (!pFrmNd->FindTableNode() || pFrmNd->FindTableBoxStartNode()
-/*N*/ == pSttNd->FindTableBoxStartNode() ) &&
-/*N*/ (!pSectNd || pSttNd->IsSectionNode() ||
-/*N*/ pSectNd->GetIndex() < pFrmNd->GetIndex())
-/*N*/ )
-/*N*/ {
-/*N*/ rFrmIdx = aIdx;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if( pEnd )
-/*N*/ aIdx = pEnd->GetIndex() + 1;
-/*N*/ else
-/*?*/ aIdx = rFrmIdx;
-/*N*/
-/*N*/ // JP 19.09.93: aber nie die Section dafuer verlassen !!
-/*N*/ if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsCntntNode() ) ||
-/*N*/ ( 0 != ( pFrmNd = GoNextSection( &aIdx, TRUE, FALSE )) &&
-/*N*/ ::binfilter::CheckNodesRange( aIdx, rFrmIdx, TRUE ) &&
-/*N*/ // JP 27.01.99: wenn der "Start"Node ein TabellenNode ist,
-/*N*/ // dann kann der dahinter liegende nie der gleiche sein!
-/*N*/ ( pSttNd->IsTableNode() ||
-/*N*/ ( pFrmNd->FindTableNode() == pSttNd->FindTableNode() &&
-/*N*/ // Bug 37652: nach hinten nie aus der Tabellenzelle hinaus!
-/*N*/ (!pFrmNd->FindTableNode() || pFrmNd->FindTableBoxStartNode()
-/*N*/ == pSttNd->FindTableBoxStartNode() ))) &&
-/*N*/ (!pSectNd || pSttNd->IsSectionNode() ||
-/*N*/ pSectNd->EndOfSectionIndex() > pFrmNd->GetIndex())
-/*N*/ ))
-/*N*/ {
-/*N*/ //JP 18.02.99: Undo von Merge einer Tabelle mit der
-/*N*/ // der vorherigen, wenn dahinter auch noch eine steht
-/*N*/ // falls aber der Node in einer Tabelle steht, muss
-/*N*/ // natuerlich dieser returnt werden, wenn der SttNode eine
-/*N*/ // Section oder Tabelle ist!
-/*N*/ SwTableNode* pTblNd;
-/*N*/ if( ( pSttNd->IsTableNode() ) &&
-/*N*/ 0 != ( pTblNd = pFrmNd->FindTableNode() ))
-/*N*/ {
-/*?*/ pFrmNd = pTblNd;
-/*?*/ rFrmIdx = *pFrmNd;
-/*N*/ }
-/*N*/ else
-/*N*/ rFrmIdx = aIdx;
-/*N*/ }
-/*N*/ else if( pNd->IsEndNode() && pNd->FindStartNode()->IsTableNode() )
-/*N*/ {
-/*?*/ pFrmNd = pNd->FindStartNode();
-/*?*/ rFrmIdx = *pFrmNd;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ if( pEnd )
-/*?*/ aIdx = pEnd->GetIndex() + 1;
-/*?*/ else
-/*?*/ aIdx = rFrmIdx.GetIndex() + 1;
-/*?*/
-/*?*/ if( (pFrmNd = &aIdx.GetNode())->IsTableNode() )
-/*?*/ rFrmIdx = aIdx;
-/*?*/ else
-/*?*/ {
-/*?*/ pFrmNd = 0;
-/*?*/
-/*?*/ // is there some sectionnodes before a tablenode?
-/*?*/ while( aIdx.GetNode().IsSectionNode() )
-/*?*/ {
-/*?*/ const SwSection& rSect = aIdx.GetNode().
-/*?*/ GetSectionNode()->GetSection();
-/*?*/ if( rSect.IsHiddenFlag() )
-/*?*/ aIdx = aIdx.GetNode().EndOfSectionIndex()+1;
-/*?*/ else
-/*?*/ aIdx++;
-/*?*/ }
-/*?*/ if( aIdx.GetNode().IsTableNode() )
-/*?*/ {
-/*?*/ rFrmIdx = aIdx;
-/*?*/ pFrmNd = &aIdx.GetNode();
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*N*/ return pFrmNd;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
index db0f5eb..d693bf3 100644
--- a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
@@ -145,8 +145,6 @@ using ::rtl::OUString;
/*N*/ {
/*N*/ refLink->SetVisible( pDoc->IsVisibleLinks() );
/*N*/ pDoc->GetLinkManager().InsertDDELink( refLink );
-/*N*/ if( pDoc->GetRootFrm() )
-/*?*/ UpdateNow();
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index 9ac5217..48e43c9 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -239,90 +239,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ return aText.Len();
/*N*/ }
-/*---------------------------------------------------------------------------
- * lcl_ChangeFtnRef
- * After a split node, it's necessary to actualize the ref-pointer of the
- * ftnfrms.
- * --------------------------------------------------------------------------*/
-
-/*N*/ void lcl_ChangeFtnRef( SwTxtNode &rNode )
-/*N*/ {
-/*N*/ SwpHints *pSwpHints = rNode.GetpSwpHints();
-/*N*/ if( pSwpHints && rNode.GetDoc()->GetRootFrm() )
-/*N*/ {
-/*N*/ SwTxtAttr* pHt;
-/*N*/ SwCntntFrm* pFrm = NULL;
-/*N*/ // OD 07.11.2002 #104840# - local variable to remember first footnote
-/*N*/ // of node <rNode> in order to invalidate position of its first content.
-/*N*/ // Thus, in its <MakeAll()> it will checked its position relative to its reference.
-/*N*/ SwFtnFrm* pFirstFtnOfNode = 0;
-/*N*/ for( register USHORT j = pSwpHints->Count(); j; )
-/*N*/ {
-/*N*/ if( RES_TXTATR_FTN == (pHt = pSwpHints->GetHt(--j))->Which() )
-/*N*/ {
-/*N*/ if( !pFrm )
-/*N*/ {
-/*N*/ SwClientIter aNew( rNode );
-/*N*/ pFrm = (SwCntntFrm*)aNew.First( TYPE(SwCntntFrm) );
-/*N*/ //JP 11.07.00: the assert's shows incorrect an error when nodes are converted
-/*N*/ // to a table. Then no layout exist!
-/*N*/ // OSL_ENSURE( pFrm, "lcl_ChangeFtnRef: No TxtFrm" );
-/*N*/ // OSL_ENSURE( pFrm && !aNew.Next(),"lcl_ChangeFtnRef: Doublefault");
-/*N*/ if( !pFrm )
-/*N*/ return;
-/*N*/ }
-/*N*/ SwTxtFtn *pAttr = (SwTxtFtn*)pHt;
-/*N*/ OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
-/*N*/ SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
-/*N*/ SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
-/*N*/ if ( !pNd )
-/*N*/ pNd = pFrm->GetAttrSet()->GetDoc()->
-/*N*/ GetNodes().GoNextSection( &aIdx, TRUE, FALSE );
-/*N*/ if ( !pNd )
-/*N*/ continue;
-/*N*/ SwClientIter aIter( *pNd );
-/*N*/ SwCntntFrm* pCntnt = (SwCntntFrm*)aIter.First(TYPE(SwCntntFrm));
-/*N*/ if( pCntnt )
-/*N*/ {
-/*N*/ OSL_ENSURE( pCntnt->FindRootFrm() == pFrm->FindRootFrm(),
-/*N*/ "lcl_ChangeFtnRef: Layout double?" );
-/*N*/ SwFtnFrm *pFtn = pCntnt->FindFtnFrm();
-/*N*/ if( pFtn && pFtn->GetAttr() == pAttr )
-/*N*/ {
-/*N*/ while( pFtn->GetMaster() )
-/*N*/ pFtn = pFtn->GetMaster();
-/*N*/ // OD 07.11.2002 #104840# - remember footnote frame
-/*N*/ pFirstFtnOfNode = pFtn;
-/*N*/ while ( pFtn )
-/*N*/ {
-/*N*/ pFtn->SetRef( pFrm );
-/*N*/ pFtn = pFtn->GetFollow();
-/*N*/ ((SwTxtFrm*)pFrm)->SetFtn( TRUE );
-/*N*/ }
-/*N*/ }
-/*N*/ #ifdef DBG_UTIL
-/*N*/ while( 0 != (pCntnt = (SwCntntFrm*)aIter.Next()) )
-/*N*/ {
-/*N*/ SwFtnFrm *pLclFtn = pCntnt->FindFtnFrm();
-/*N*/ OSL_ENSURE( !pLclFtn || pLclFtn->GetRef() == pFrm,
-/*N*/ "lcl_ChangeFtnRef: Who's that guy?" );
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-/*N*/ }
-/*N*/ } // end of for-loop on <SwpHints>
-/*N*/ // OD 08.11.2002 #104840# - invalidate
-/*N*/ if ( pFirstFtnOfNode )
-/*N*/ {
-/*N*/ SwCntntFrm* pCntnt = pFirstFtnOfNode->ContainsCntnt();
-/*N*/ if ( pCntnt )
-/*N*/ {
-/*N*/ pCntnt->_InvalidatePos();
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ SwCntntNode *SwTxtNode::SplitNode( const SwPosition &rPos )
/*N*/ {
/*N*/ // lege den Node "vor" mir an
@@ -434,7 +350,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ if( pSwpHints )
{DBG_BF_ASSERT(0, "STRIP");}
/*?*/ pNode->MakeFrms( *this ); // neue Frames anlegen.
-/*?*/ lcl_ChangeFtnRef( *this );
/*N*/ }
/*N*/ else
/*N*/ {
@@ -460,7 +375,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/
/*N*/ if ( GetDepends() )
/*N*/ MakeFrms( *pNode ); // neue Frames anlegen.
-/*N*/ lcl_ChangeFtnRef( *pNode );
/*N*/ }
/*N*/
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index 5fb49c0..b654be2 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
@@ -510,15 +510,6 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
else
throw uno::RuntimeException();
}
- else if( aAnchor.GetAnchorId() != FLY_PAGE && pDoc->GetRootFrm() )
- {
- SwCrsrMoveState aState( MV_SETONLYTEXT );
- Point aTmp(MM100_TO_TWIP(aMM100Pos.X), MM100_TO_TWIP(aMM100Pos.Y));
- pDoc->GetRootFrm()->GetCrsrOfst( pPam->GetPoint(), aTmp, &aState );
- aAnchor.SetAnchor( pPam->GetPoint() );
-
- aSet.Put( SwFmtVertOrient( 0, VERT_TOP ) );
- }
else
{
aAnchor.SetType(FLY_PAGE);
@@ -895,26 +886,6 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
}
}
- else if( pDoc->GetRootFrm() )
- {
- UnoActionContext aCtx(pDoc);
- if(RES_ANCHOR == pMap->nWID && MID_ANCHOR_ANCHORTYPE == pMap->nMemberId)
- {
- SdrObject* pObj = pFmt->FindSdrObject();
- SdrMarkList aList;
- SdrMark aMark(pObj);
- aList.InsertEntry(aMark);
- sal_Int32 nAnchor(0);
- cppu::enum2int( nAnchor, aValue );
- pDoc->ChgAnchor( aList, nAnchor,
- sal_False, sal_True );
- }
- else
- {
- aPropSet.setPropertyValue(*pMap, aValue, aSet);
- pFmt->SetAttr(aSet);
- }
- }
else
{
aPropSet.setPropertyValue(*pMap, aValue, aSet);
@@ -970,13 +941,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
if(aPSet.getValueType() != rPSetType || !aPSet.getValue())
throw uno::RuntimeException();
xPrSet = *(uno::Reference< XPropertySet >*)aPSet.getValue();
- if( pFmt && pFmt->GetDoc()->GetRootFrm() )
- {
- UnoActionContext aCtx(pFmt->GetDoc());
- xPrSet->setPropertyValue(rPropertyName, aValue);
- }
- else
- xPrSet->setPropertyValue(rPropertyName, aValue);
+ xPrSet->setPropertyValue(rPropertyName, aValue);
}
}
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index d8f883a..169063e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -163,76 +163,31 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
SwDoc* pDoc = rIdx.GetNode().GetDoc();
USHORT nChkType = bSort ? FLY_AUTO_CNTNT : FLY_AT_CNTNT;
- const SwCntntFrm* pCFrm;
- const SwCntntNode* pCNd;
- if( pDoc->GetRootFrm() &&
- 0 != (pCNd = rIdx.GetNode().GetCntntNode()) &&
- 0 != (pCFrm = pCNd->GetFrm()) )
+ const SwSpzFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+ USHORT nSize = rFmts.Count();
+ for ( USHORT i = 0; i < nSize; i++)
{
- const SwDrawObjs *pObjs = pCFrm->GetDrawObjs();
- if( pObjs )
- for( USHORT i = 0; i < pObjs->Count(); ++i )
- {
- const SdrObject *pO = (*pObjs)[ i ];
- const SwFlyFrm *pFly;
- SwFrmFmt* pFmt;
-
- if( pO->IsWriterFlyFrame()
- ? ( (pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm())
- ->IsFlyAtCntFrm() &&
- (bSort ? pFly->IsAutoPos() : !pFly->IsAutoPos() ) &&
- 0 != ( pFmt = (SwFrmFmt*)pFly->GetFmt()) )
- : ( 0 != (pFmt=((SwDrawContact*)GetUserCall(pO))->GetFmt())
- && pFmt->GetAnchor().GetAnchorId() == nChkType )
- )
- {
- //jetzt einen SwDepend anlegen und in das Array einfuegen
- SwDepend* pNewDepend = new SwDepend( &rClnt, pFmt );
-
- USHORT nInsPos = rFrameArr.Count();
- if( bSort )
- {
- xub_StrLen nInsertIndex = pFmt->GetAnchor().
- GetCntntAnchor()->nContent.GetIndex();
-
- USHORT nEnd = nInsPos;
- for( nInsPos = 0; nInsPos < nEnd; ++nInsPos )
- if( aSortArr[ nInsPos ] > nInsertIndex )
- break;
- aSortArr.Insert( nInsertIndex, nInsPos );
- }
- rFrameArr.C40_INSERT( SwDepend, pNewDepend, nInsPos );
- }
- }
- }
- else
- {
- const SwSpzFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
- USHORT nSize = rFmts.Count();
- for ( USHORT i = 0; i < nSize; i++)
+ const SwFrmFmt* pFmt = rFmts[ i ];
+ const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+ const SwPosition* pAnchorPos;
+ if( rAnchor.GetAnchorId() == nChkType &&
+ 0 != (pAnchorPos = rAnchor.GetCntntAnchor()) &&
+ pAnchorPos->nNode == rIdx )
{
- const SwFrmFmt* pFmt = rFmts[ i ];
- const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
- const SwPosition* pAnchorPos;
- if( rAnchor.GetAnchorId() == nChkType &&
- 0 != (pAnchorPos = rAnchor.GetCntntAnchor()) &&
- pAnchorPos->nNode == rIdx )
+ //jetzt einen SwDepend anlegen und in das Array einfuegen
+ SwDepend* pNewDepend = new SwDepend( &rClnt, (SwFrmFmt*)pFmt);
+ USHORT nInsPos = rFrameArr.Count();
+ if( bSort )
{
- //jetzt einen SwDepend anlegen und in das Array einfuegen
- SwDepend* pNewDepend = new SwDepend( &rClnt, (SwFrmFmt*)pFmt);
- USHORT nInsPos = rFrameArr.Count();
- if( bSort )
- {
- xub_StrLen nInsertIndex = pAnchorPos->nContent.GetIndex();
+ xub_StrLen nInsertIndex = pAnchorPos->nContent.GetIndex();
- USHORT nEnd = nInsPos;
- for( nInsPos = 0; nInsPos < nEnd; ++nInsPos )
- if( aSortArr[ nInsPos ] > nInsertIndex )
- break;
- aSortArr.Insert( nInsertIndex, nInsPos );
- }
- rFrameArr.C40_INSERT( SwDepend, pNewDepend, nInsPos );
+ USHORT nEnd = nInsPos;
+ for( nInsPos = 0; nInsPos < nEnd; ++nInsPos )
+ if( aSortArr[ nInsPos ] > nInsertIndex )
+ break;
+ aSortArr.Insert( nInsertIndex, nInsPos );
}
+ rFrameArr.C40_INSERT( SwDepend, pNewDepend, nInsPos );
}
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index eaa0d7a..0224d62 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -2635,13 +2635,6 @@ void SwXMLTableContext::MakeTable()
// 4) set new (DDE)table at node.
pTableNode->SetNewTable(pDDETable, FALSE);
}
-
- if( pTableNode->GetDoc()->GetRootFrm() )
- {
- pTableNode->DelFrms();
- SwNodeIndex aIdx( *pTableNode->EndOfSectionNode(), 1 );
- pTableNode->MakeFrms( &aIdx );
- }
}
void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW )
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index a704045..1c79414 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -88,7 +88,6 @@ class SwFrmFmt; // fuer GetTxtNodeFmts()
class SwCharFmt;
class SwExtTextInput;
class SwTxtNode; // fuer IsNotMakeTxtNode
-class SwRootFrm; // fuer CTOR
class SwFmtINetFmt; // InsertURL
class SwTable;
commit 624c09b3070ffcb1d62ca451ca73bb80e9e96caa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 22:17:32 2011 +0100
callcatcher: remove some low-hanging fruit
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index 5beea09..ccaf3ce 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -814,8 +814,6 @@ using namespace ::com::sun::star;
/*N*/ virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara,
/*N*/ USHORT nPos, Color*& rTxtColor,
/*N*/ Color*& rFldColor );
-/*N*/
-/*N*/ BOOL ConvertFields();
/*N*/ };
/*N*/
/*N*/ ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pInEnginePool,
@@ -840,23 +838,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ return EMPTY_STRING;
/*N*/ }
-/*N*/
-/*N*/ BOOL ScFieldChangerEditEngine::ConvertFields()
-/*N*/ {
-/*N*/ BOOL bConverted = FALSE;
-/*N*/ do
-/*N*/ {
-/*N*/ bConvert = FALSE;
-/*N*/ UpdateFields();
-/*N*/ if ( bConvert )
-/*N*/ {
-/*N*/ ESelection aSel( nConvPara, nConvPos, nConvPara, nConvPos+1 );
-/*N*/ QuickInsertField( SvxFileField(), aSel );
-/*N*/ bConverted = TRUE;
-/*N*/ }
-/*N*/ } while ( bConvert );
-/*N*/ return bConverted;
-/*N*/ }
/*N*/ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
index 636178f..85808c5 100644
--- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
@@ -1237,14 +1237,6 @@ namespace binfilter {
/*N*/ return NULL;
/*N*/ }
-/*N*/ void ScConditionalFormatList::ResetUsed()
-/*N*/ {
-/*N*/ USHORT nCount = Count();
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ (*this)[i]->SetUsed(FALSE);
-/*N*/ }
-
-
/*N*/ void ScConditionalFormatList::CompileXML()
/*N*/ {
/*N*/ USHORT nCount = Count();
diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
index 0abc1b2..7331957 100644
--- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
@@ -454,15 +454,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ BOOL ScDBData::IsBeyond(USHORT nMaxRow) const
-/*N*/ {
-/*N*/ return ( nStartRow > nMaxRow ||
-/*N*/ nEndRow > nMaxRow ||
-/*N*/ nQueryDestRow > nMaxRow );
-/*N*/ }
-
-
-
/*N*/ void ScDBData::GetArea(USHORT& rTab, USHORT& rCol1, USHORT& rRow1, USHORT& rCol2, USHORT& rRow2) const
/*N*/ {
/*N*/ rTab = nTable;
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
index bd4ca2c..8939be3 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
@@ -294,194 +294,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
return nReturn;
}
-sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScXMLImportWrapper::Import" );
-
- uno::Reference<lang::XMultiServiceFactory> xServiceFactory =
- ::legacy_binfilters::getLegacyProcessServiceFactory();
- DBG_ASSERT( xServiceFactory.is(), "got no service manager" );
- if( !xServiceFactory.is() )
- return sal_False;
-
- xml::sax::InputSource aParserInput;
- if (pMedium)
- aParserInput.sSystemId = OUString(pMedium->GetName());
-
-
- // get parser
- uno::Reference<uno::XInterface> xXMLParser =
- xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) );
- DBG_ASSERT( xXMLParser.is(), "com.sun.star.xml.sax.Parser service missing" );
- if( !xXMLParser.is() )
- return sal_False;
-
- // get filter
- SfxObjectShell* pObjSh = rDoc.GetDocumentShell();
- if ( pObjSh )
- {
- ::rtl::OUString sEmpty;
- uno::Reference<frame::XModel> xModel = pObjSh->GetModel();
-
- /** property map for export info set */
- ::comphelper::PropertyMapEntry aImportInfoMap[] =
- {
- { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "NumberStyles" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { NULL, 0, 0, NULL, 0, 0 }
- };
- uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aImportInfoMap ) ) );
-
- uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator());
- if (xStatusIndicator.is())
- {
- sal_Int32 nProgressRange(1000000);
- xStatusIndicator->start(::rtl::OUString(ScGlobal::GetRscString(STR_LOAD_DOC)), nProgressRange);
- uno::Any aProgRange;
- aProgRange <<= nProgressRange;
- xInfoSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")), aProgRange);
- }
-
- sal_uInt32 nMetaRetval(0);
- if(!bStylesOnly)
- {
- uno::Sequence<uno::Any> aMetaArgs(1);
- uno::Any* pMetaArgs = aMetaArgs.getArray();
- pMetaArgs[0] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import start" );
-
- nMetaRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaImporter")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Meta.xml")), aMetaArgs,
- sal_False);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import end" );
- }
-
- SvXMLGraphicHelper* pGraphicHelper = NULL;
- uno::Reference< document::XGraphicObjectResolver > xGrfContainer;
-
- uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver;
- SvXMLEmbeddedObjectHelper *pObjectHelper = NULL;
-
- if( pStorage )
- {
- pGraphicHelper = SvXMLGraphicHelper::Create( *pStorage, GRAPHICHELPER_MODE_READ );
- xGrfContainer = pGraphicHelper;
-
- SvPersist *pPersist = pObjSh;
- if( pPersist )
- {
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create(*pStorage, *pPersist, EMBEDDEDOBJECTHELPER_MODE_READ, sal_False );
- xObjectResolver = pObjectHelper;
- }
- }
- uno::Sequence<uno::Any> aStylesArgs(4);
- uno::Any* pStylesArgs = aStylesArgs.getArray();
- pStylesArgs[0] <<= xGrfContainer;
- pStylesArgs[1] <<= xStatusIndicator;
- pStylesArgs[2] <<= xObjectResolver;
- pStylesArgs[3] <<= xInfoSet;
-
- sal_uInt32 nSettingsRetval(0);
- if (!bStylesOnly)
- {
- // Settings must be loaded first because of the printer setting,
- // which is needed in the page styles (paper tray).
-
- uno::Sequence<uno::Any> aSettingsArgs(0);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import start" );
-
- nSettingsRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsImporter")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml")),
- sEmpty, aSettingsArgs, sal_False);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import end" );
- }
-
- sal_uInt32 nStylesRetval(0);
- {
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" );
-
- nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesImporter")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")),
- sEmpty, aStylesArgs, sal_True);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" );
- }
-
- sal_uInt32 nDocRetval(0);
- if (!bStylesOnly)
- {
- uno::Sequence<uno::Any> aDocArgs(4);
- uno::Any* pDocArgs = aDocArgs.getArray();
- pDocArgs[0] <<= xGrfContainer;
- pDocArgs[1] <<= xStatusIndicator;
- pDocArgs[2] <<= xObjectResolver;
- pDocArgs[3] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" );
-
- nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentImporter")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content.xml")), aDocArgs,
- sal_True);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" );
- }
- if( pGraphicHelper )
- SvXMLGraphicHelper::Destroy( pGraphicHelper );
-
- if( pObjectHelper )
- SvXMLEmbeddedObjectHelper::Destroy( pObjectHelper );
-
- if (xStatusIndicator.is())
- xStatusIndicator->end();
-
- sal_Bool bRet(sal_False);
- if (bStylesOnly)
- {
- if (nStylesRetval)
- pStorage->SetError(nStylesRetval);
- else
- bRet = sal_True;
- }
- else
- {
- if (nDocRetval)
- {
- pStorage->SetError(nDocRetval);
- if (nDocRetval == SCWARN_IMPORT_RANGE_OVERFLOW ||
- nDocRetval == SCWARN_IMPORT_ROW_OVERFLOW ||
- nDocRetval == SCWARN_IMPORT_COLUMN_OVERFLOW ||
- nDocRetval == SCWARN_IMPORT_SHEET_OVERFLOW)
- bRet = sal_True;
- }
- else if (nStylesRetval)
- pStorage->SetError(nStylesRetval);
- else if (nMetaRetval)
- pStorage->SetError(nMetaRetval);
- else if (nSettingsRetval)
- pStorage->SetError(nSettingsRetval);
- else
- bRet = sal_True;
- }
-
- // Don't test bStylesRetval and bMetaRetval, because it could be an older file which not contain such streams
- return bRet;//!bStylesOnly ? bDocRetval : bStylesRetval;
- }
- return sal_False;
-}
-
sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory,
uno::Reference<frame::XModel>& xModel, uno::Reference<uno::XInterface>& xWriter,
uno::Sequence<beans::PropertyValue>& aDescriptor, const ::rtl::OUString& sName,
@@ -547,197 +359,6 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
return bRet;
}
-sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScXMLImportWrapper::Export" );
-
- uno::Reference<lang::XMultiServiceFactory> xServiceFactory =
- ::legacy_binfilters::getLegacyProcessServiceFactory();
- DBG_ASSERT( xServiceFactory.is(), "got no service manager" );
- if( !xServiceFactory.is() )
- return sal_False;
-
- uno::Reference<uno::XInterface> xWriter =
- xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) );
- DBG_ASSERT( xWriter.is(), "com.sun.star.xml.sax.Writer service missing" );
- if(!xWriter.is())
- return sal_False;
-
- if ( !pStorage && pMedium )
- pStorage = pMedium->GetOutputStorage( sal_True );
-
- uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
-
- OUString sFileName;
- OUString sTextMediaType(RTL_CONSTASCII_USTRINGPARAM("text/xml"));
- if (pMedium)
- sFileName = pMedium->GetName();
- SfxObjectShell* pObjSh = rDoc.GetDocumentShell();
- uno::Sequence<beans::PropertyValue> aDescriptor(1);
- beans::PropertyValue* pProps = aDescriptor.getArray();
- pProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) );
- pProps[0].Value <<= sFileName;
-
- /** property map for export info set */
- ::comphelper::PropertyMapEntry aExportInfoMap[] =
- {
- { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "WrittenNumberStyles" ), 0, &::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { NULL, 0, 0, NULL, 0, 0 }
- };
- uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
-
- if ( pObjSh && pStorage)
- {
- pObjSh->UpdateDocInfoForSave(); // update information
-
- uno::Reference<frame::XModel> xModel = pObjSh->GetModel();
- uno::Reference<task::XStatusIndicator> xStatusIndicator = GetStatusIndicator(xModel);
- sal_Int32 nProgressRange(1000000);
- if(xStatusIndicator.is())
- xStatusIndicator->start(::rtl::OUString(ScGlobal::GetRscString(STR_SAVE_DOC)), nProgressRange);
- uno::Any aProgRange;
- aProgRange <<= nProgressRange;
- xInfoSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")), aProgRange);
-
- SvtSaveOptions aSaveOpt;
- sal_Bool bUsePrettyPrinting(aSaveOpt.IsPrettyPrinting());
- uno::Any aUsePrettyPrinting;
- aUsePrettyPrinting <<= bUsePrettyPrinting;
- xInfoSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")), aUsePrettyPrinting);
-
- sal_Bool bMetaRet(pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
- sal_Bool bStylesRet (sal_False);
- sal_Bool bDocRet(sal_False);
- sal_Bool bSettingsRet(sal_False);
- ScMySharedData* pSharedData = NULL;
-
- // meta export
- if (!bStylesOnly && !bMetaRet)
- {
- uno::Sequence<uno::Any> aMetaArgs(3);
- uno::Any* pMetaArgs = aMetaArgs.getArray();
- pMetaArgs[0] <<= xHandler;
- pMetaArgs[1] <<= xStatusIndicator;
- pMetaArgs[2] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" );
-
- bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("meta.xml")),
- sTextMediaType, ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaExporter")),
- sal_True, aMetaArgs, pSharedData);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" );
- }
-
- uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver;
- SvXMLEmbeddedObjectHelper *pObjectHelper = 0;
-
- uno::Reference< document::XGraphicObjectResolver > xGrfContainer;
- SvXMLGraphicHelper* pGraphicHelper = 0;
-
- if( pStorage )
- {
- pGraphicHelper = SvXMLGraphicHelper::Create( *pStorage, GRAPHICHELPER_MODE_WRITE, FALSE );
- xGrfContainer = pGraphicHelper;
- }
-
- SvPersist *pPersist = pObjSh;
- if( pPersist )
- {
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create( *pStorage, *pPersist, EMBEDDEDOBJECTHELPER_MODE_WRITE, sal_False );
- xObjectResolver = pObjectHelper;
- }
-
- // styles export
-
- {
- uno::Sequence<uno::Any> aStylesArgs(5);
- uno::Any* pStylesArgs = aStylesArgs.getArray();
- pStylesArgs[0] <<= xGrfContainer;
- pStylesArgs[1] <<= xStatusIndicator;
- pStylesArgs[2] <<= xHandler;
- pStylesArgs[3] <<= xObjectResolver;
- pStylesArgs[4] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" );
-
- bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("styles.xml")),
- sTextMediaType, ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesExporter")),
- sal_False, aStylesArgs, pSharedData);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" );
- }
-
- // content export
-
- if (!bStylesOnly)
- {
- uno::Sequence<uno::Any> aDocArgs(5);
- uno::Any* pDocArgs = aDocArgs.getArray();
- pDocArgs[0] <<= xGrfContainer;
- pDocArgs[1] <<= xStatusIndicator;
- pDocArgs[2] <<= xHandler;
- pDocArgs[3] <<= xObjectResolver;
- pDocArgs[4] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" );
-
- bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("content.xml")),
- sTextMediaType, ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentExporter")),
- sal_False, aDocArgs, pSharedData);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" );
- }
-
- if( pGraphicHelper )
- SvXMLGraphicHelper::Destroy( pGraphicHelper );
-
- if( pObjectHelper )
- SvXMLEmbeddedObjectHelper::Destroy( pObjectHelper );
-
- // settings export
-
- if (!bStylesOnly)
- {
- uno::Sequence<uno::Any> aSettingsArgs(3);
- uno::Any* pSettingsArgs = aSettingsArgs.getArray();
- pSettingsArgs[0] <<= xHandler;
- pSettingsArgs[1] <<= xStatusIndicator;
- pSettingsArgs[2] <<= xInfoSet;
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" );
-
- bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("settings.xml")),
- sTextMediaType, ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsExporter")),
- sal_False, aSettingsArgs, pSharedData);
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" );
- }
-
- if (pSharedData)
- delete pSharedData;
-
- if (xStatusIndicator.is())
- xStatusIndicator->end();
- return bStylesRet && ((!bStylesOnly && bDocRet && bMetaRet && bSettingsRet) || bStylesOnly);
- }
-
- // later: give string descriptor as parameter for doc type
-
- return sal_False;
-}
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
index a679676..1f7b233 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
@@ -176,20 +176,6 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ delete pImp;
/*?*/ }
-//==========================================================================
-
-/*?*/ IMPL_LINK( SfxMacroConfig, CallbackHdl_Impl, SfxMacroConfig*, EMPTYARG )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return 0;
-/*?*/ }
-
-/*?*/ IMPL_LINK( SfxMacroConfig, EventHdl_Impl, SfxMacroInfo*, EMPTYARG )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ pImp->nEventId = 0;
-/*?*/ return 0;
-/*?*/ }
-
/*?*/ ErrCode SfxMacroConfig::Call(SbxObject*,
/*?*/ const String&, BasicManager*, SbxArray *, SbxValue *)
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index 209a7b4..f970f68 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -797,16 +797,6 @@ namespace binfilter {
/*N*/ pImp->aBaseURL = rURL;
/*N*/ }
-/*N*/ const String& SfxObjectShell::GetBaseURL() const
-/*N*/ {
-/*N*/ if ( pImp->aBaseURL.Len() )
-/*N*/ return pImp->aBaseURL;
-/*N*/ else if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_PACKED ) )
-/*N*/ return pMedium->GetPhysicalName();
-/*N*/ else
-/*N*/ return pMedium->GetBaseURL();
-/*N*/ }
-
/*?*/ String SfxObjectShell::QueryTitle( SfxTitleQuery eType ) const
/*?*/ {
/*?*/ String aRet;
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_hintpost.cxx b/binfilter/bf_sfx2/source/notify/sfx2_hintpost.cxx
index f6fcff7..991a3fa 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_hintpost.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_hintpost.cxx
@@ -34,27 +34,10 @@
#include "app.hxx"
namespace binfilter {
-//====================================================================
-
-//--------------------------------------------------------------------
-
/*N*/ SfxHintPoster::~SfxHintPoster()
/*N*/ {
/*N*/ }
-//--------------------------------------------------------------------
-
-/*N*/ IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
-/*N*/ {
-/*N*/ DBG_MEMTEST();
-/*N*/ Event( pPostedHint );
-/*N*/ ReleaseRef();
-/*N*/ return 0;
-/*N*/ }
-/*N*/ IMPL_LINK_INLINE_END( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
-
-//--------------------------------------------------------------------
-
/*N*/ void SfxHintPoster::Event( SfxHint* pPostedHint )
/*N*/ {
/*N*/ aLink.Call( pPostedHint );
diff --git a/binfilter/bf_so3/source/persist/transbnd.cxx b/binfilter/bf_so3/source/persist/transbnd.cxx
index 2263597..4204301 100644
--- a/binfilter/bf_so3/source/persist/transbnd.cxx
+++ b/binfilter/bf_so3/source/persist/transbnd.cxx
@@ -241,16 +241,8 @@ SvBindStatusCallback::~SvBindStatusCallback (void)
{
}
-/*
- * SetProgressCallback.
- */
Link SvBindStatusCallback::m_aProgressCallback;
-void SvBindStatusCallback::SetProgressCallback (const Link &rLink)
-{
- m_aProgressCallback = rLink;
-}
-
/*
* InitStartTime.
*/
diff --git a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
index 32a03bb..a4b2e4e 100644
--- a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
@@ -61,23 +61,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Richtung ZUR Lichtquelle setzen
-|*
-\************************************************************************/
-
-/*N*/ void E3dDistantLight::SetDirection(const Vector3D& rNewDir)
-/*N*/ {
-/*N*/ if ( aDirection != rNewDir )
-/*N*/ {
-/*N*/ aDirection = rNewDir;
-/*N*/ aDirection.Normalize();
-/*N*/ CreateLightObj();
-/*N*/ StructureChanged(this);
-/*N*/ }
-/*N*/ }
-
-/*************************************************************************
-|*
|* Lichtstaerke an uebergeben Punkt bestimmen und die akkumulierte
|* Punktfarbe berechnen
|*
diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
index a4307ea..040953d 100644
--- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
@@ -1211,12 +1211,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-/*N*/ IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, EMPTYARG )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list