[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/inc

Joseph Powers jpowers at kemper.freedesktop.org
Sun Sep 11 21:18:35 PDT 2011


 binfilter/bf_forms/source/component/forms_Image.cxx    |    7 --
 binfilter/bf_sch/source/core/sch_chtmode2.cxx          |    6 -
 binfilter/bf_sch/source/core/sch_chtmode6.cxx          |    5 -
 binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx   |    4 -
 binfilter/bf_sd/source/ui/app/sd_sdmod.cxx             |   10 --
 binfilter/bf_sfx2/source/doc/sfx2_interno.cxx          |   38 ++++++----
 binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx          |   41 ++++-------
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx          |   59 -----------------
 binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx          |   13 ---
 binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx     |   27 ++-----
 binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx |    9 --
 binfilter/inc/bf_sfx2/objsh.hxx                        |    3 
 12 files changed, 49 insertions(+), 173 deletions(-)

New commits:
commit 47ac39f2006075016ef55249ab561f8dc037e3f2
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sun Sep 11 20:49:58 2011 -0700

    The last of the SFX2 cleanups
    
    The rest of the DBG_BF_ASSERT()s are used in virtual methods; someone needs
    to review the method and make sure that it's not used by any of the other
    classes and then remove it.

diff --git a/binfilter/bf_forms/source/component/forms_Image.cxx b/binfilter/bf_forms/source/component/forms_Image.cxx
index 0f99cbf..3ff11c2 100644
--- a/binfilter/bf_forms/source/component/forms_Image.cxx
+++ b/binfilter/bf_forms/source/component/forms_Image.cxx
@@ -716,13 +716,6 @@ void OImageModel::SetURL( const ::rtl::OUString& rURL )
 
         if( xModel.is() )
         {
-            SfxObjectShell *pTestObjSh = SfxObjectShell::Current();
-            if( pTestObjSh )
-            {
-                Reference< XModel >  xTestModel = pTestObjSh->GetModel();
-                if( xTestModel == xModel )
-                    pObjSh = pTestObjSh;
-            }
             if( !pObjSh )
             {
                 SfxObjectShell *pLclTestObjSh = SfxObjectShell::GetFirst();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 6147a65..8a1e7a0 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -509,9 +509,6 @@ enum ChartStyleV0
 
 /*N*/ SdrObjGroup* ChartModel::CreateChart(const Rectangle &rRect)
 /*N*/ {
-/*N*/   if( pDocShell )
-/*N*/       pDocShell->SetWaitCursor( TRUE );
-/*N*/
 /*N*/   Rectangle aRect( rRect );
 /*N*/   SdrObjGroup* pGroup;
 /*N*/
@@ -623,9 +620,6 @@ enum ChartStyleV0
 /*?*/           break;
 /*N*/   }
 /*N*/
-/*N*/   if( pDocShell )
-/*N*/       pDocShell->SetWaitCursor( FALSE );
-/*N*/
 /*N*/   SdrPage* pPage=GetPage( 0 );
 /*N*/   SdrObject* pObj = GetObjWithId( CHOBJID_DIAGRAM_AREA, *pPage );
 /*N*/   if( pObj )
diff --git a/binfilter/bf_sch/source/core/sch_chtmode6.cxx b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
index 41d0ca3..afce003 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode6.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
@@ -94,11 +94,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/   SchChartDocShell* pDocSh = (SchChartDocShell*) pDocShell;
 /*N*/
-/*N*/   if (!pDocSh)
-/*N*/   {
-/*?*/       pDocSh = PTR_CAST(SchChartDocShell, SfxObjectShell::Current());
-/*N*/   }
-/*N*/
 /*N*/   if (pDocSh)
 /*N*/   {
 /*N*/       SfxPrinter* pPrinter = pDocSh->GetPrinter();
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index a7d3edd..53efdf1 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -445,8 +445,6 @@ using namespace ::com::sun::star;
 /*N*/
 /*N*/           if( bRet )
 /*N*/           {
-/*N*/               SetWaitCursor( TRUE );
-/*N*/
 /*N*/               // Pool und StyleSheet Pool laden
 /*N*/               String aStyleSheetsStr( SCH_STYLE_SHEET_NAME );
 /*N*/
@@ -564,8 +562,6 @@ using namespace ::com::sun::star;
 /*N*/                   pChDoc->SetChanged( FALSE );
 /*N*/                   pChDoc->NewOrLoadCompleted( DOC_LOADED );
 /*N*/               }
-/*N*/
-/*N*/               SetWaitCursor( FALSE );
 /*N*/           }
 /*N*/
 /*N*/           if( pProgress )
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx b/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
index 612f7bf..a51df19 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
@@ -123,16 +123,6 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
             pImpressOptions = new SdOptions( SDCFG_IMPRESS );
         pOptions = pImpressOptions;
     }
-    if( pOptions )
-     {
-         UINT16 nMetric = pOptions->GetMetric();
-         SdDrawDocShell* pDocSh = PTR_CAST( SdDrawDocShell, SfxObjectShell::Current() );
-         SdDrawDocument* pDoc = NULL;
-         if (pDocSh)
-            pDoc = pDocSh->GetDoc();
-        if( nMetric != 0xffff && pDoc && eDocType == pDoc->GetDocumentType() )
-            PutItem( SfxUInt16Item( SID_ATTR_METRIC, nMetric ) );
-    }
     return(pOptions);
 }
 
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
index f925418..93d1dff 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
@@ -147,8 +147,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/   if( SvInPlaceObject::Load( pStor ) )
 /*N*/   {
-/*N*/       // Spaeter mal Childs on demand
-/*N*/ //        if( LoadChilds() )
 /*N*/           return TRUE;
 /*N*/   }
 /*N*/   return FALSE;
@@ -184,11 +182,16 @@ namespace binfilter {
 
 //--------------------------------------------------------------------
 
-/*N*/ ErrCode SfxInPlaceObject::Verb( long /*nVerb*/, SvEmbeddedClient * /*pCaller*/,
-/*N*/                               Window * /*pWindow*/, const Rectangle* /*pRect*/)
-/*N*/ {
-         return FALSE;
-/*N*/ }
+ErrCode SfxInPlaceObject::Verb(
+    long /*nVerb*/,
+    SvEmbeddedClient * /*pCaller*/,
+    Window * /*pWindow*/,
+    const Rectangle* /*pRect*/
+)
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+    return FALSE;
+}
 
 //--------------------------------------------------------------------
 
@@ -206,21 +209,24 @@ namespace binfilter {
 
 //-------------------------------------------------------------------------
 
-/*N*/ void SfxInPlaceObject::InPlaceActivate( BOOL /*bActivate*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void SfxInPlaceObject::InPlaceActivate( BOOL /*bActivate*/ )
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //--------------------------------------------------------------------
 
-/*N*/ void SfxInPlaceObject::Embed( BOOL /*bEmbed*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void SfxInPlaceObject::Embed( BOOL /*bEmbed*/ )
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //--------------------------------------------------------------------
 
-/*N*/ void SfxInPlaceObject::DocumentNameChanged( const String & /*rDocName*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void SfxInPlaceObject::DocumentNameChanged( const String & /*rDocName*/ )
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //--------------------------------------------------------------------
 
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index 70742bd..11b9671 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -571,9 +571,10 @@ namespace binfilter {
 
 //--------------------------------------------------------------------
 
-/*?*/ void SfxObjectShell::MemoryError()
-/*?*/ {
-/*?*/ }
+void SfxObjectShell::MemoryError()
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //--------------------------------------------------------------------
 
@@ -627,12 +628,10 @@ namespace binfilter {
 
 //-------------------------------------------------------------------------
 
-/*N*/ void SfxObjectShell::PrepareReload( )
-/*  [Beschreibung ]
-    Wird vor dem Reload gerufen und gibt die Moeglichkeit,
-    etwaige Caches zu leeren. */
-/*N*/ {
-/*N*/ }
+void SfxObjectShell::PrepareReload( )
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //-------------------------------------------------------------------------
 
@@ -847,14 +846,7 @@ namespace binfilter {
 /*?*/   else if( rKV.GetKey().CompareIgnoreCaseToAscii( "expires" ) == COMPARE_EQUAL )
 /*?*/   {
 /*?*/       DateTime aDateTime;
-/*?*/       if( INetRFC822Message::ParseDateField( rKV.GetValue(), aDateTime ) )
-/*?*/       {DBG_BF_ASSERT(0, "STRIP");
-/*?*/       }
-/*?*/       else
-/*?*/       {
-/*?*/ //            OSL_FAIL( "Schlechtes ::com::sun::star::util::DateTime fuer Expired" );
-/*?*/           DBG_BF_ASSERT(0, "STRIP");
-/*?*/       }
+/*?*/       INetRFC822Message::ParseDateField( rKV.GetValue(), aDateTime );
 /*?*/   }
 /*?*/   else if( rKV.GetKey().CompareIgnoreCaseToAscii( "content-type" ) == COMPARE_EQUAL )
 /*?*/   {
@@ -864,9 +856,7 @@ namespace binfilter {
 /*?*/
 /*?*/       if( INetContentTypes::parse( sContent, sType, sSubType, &aParameters ) )
 /*?*/       {
-/*?*/           const INetContentTypeParameter * pCharset = aParameters.find("charset");
-/*?*/           if (pCharset != 0)
-/*?*/               {DBG_BF_ASSERT(0, "STRIP");}
+/*?*/           /* const INetContentTypeParameter * pCharset = */ aParameters.find("charset");
 /*?*/       }
 /*?*/   }
 /*?*/ }
@@ -913,10 +903,6 @@ namespace binfilter {
 /*N*/   return bPreview;
 /*N*/ }
 
-/*N*/ void SfxObjectShell::SetWaitCursor( BOOL /*bSet*/ ) const
-/*N*/ {
-/*N*/ }
-
 /*N*/ String SfxObjectShell::GetAPIName() const
 /*N*/ {
 /*N*/   INetURLObject aURL( GetMedium()->GetName() );
@@ -928,9 +914,10 @@ namespace binfilter {
 /*N*/     return aLclName;
 /*N*/ }
 
-/*N*/ void SfxObjectShell::Invalidate( USHORT /*nId*/ )
-/*N*/ {
-/*N*/ }
+void SfxObjectShell::Invalidate( USHORT /*nId*/ )
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 // nMacroMode == -1 : uninitialized
 // other values as in /com/sun/star/document/MacroExecMode.hxx
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 4eb5dbe..75d9f9d 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -232,7 +232,7 @@ zugeordnet, bis SaveCompleted() durchlaufen ist.
 sal_Bool SfxObjectShell::DoLoad(
     const String& /*rFileName*/, StreamMode /*nStreamMode*/, StorageMode /*nStorageMode*/)
 {
-    DBG_BF_ASSERT(0, "STRIP");
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
     return sal_False;
 }
 
@@ -718,12 +718,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
         const SfxStringItem *pVersionItem = pSet ? (const SfxStringItem*)
             SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL;
 
-        if ( pVersionItem )
-        {DBG_BF_ASSERT(0, "STRIP");
-        }
-        else if ( pImp->bIsSaving )
-        {DBG_BF_ASSERT(0, "STRIP");
-        }
     }
     // SetModified must be enabled when SaveCompleted is called, otherwise the modified flag of child objects will not be cleared
     EnableSetModified( sal_True );
@@ -768,15 +762,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
                 DoHandsOff();
         }
 
-        if ( bOk && pMedium && ( rMedium.GetName() == pMedium->GetName() ) )
-        {
-            // before we overwrite the original file, we will make a backup if there is a demand for that
-            const sal_Bool bDoBackup = SvtSaveOptions().IsBackup();
-            if ( bDoBackup )
-            {{DBG_BF_ASSERT(0, "STRIP");}
-            }
-        }
-
         if ( bOk )
         {
             // transfer data to its destinated location
@@ -784,30 +769,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
             RegisterTransfer( rMedium );
             bOk = rMedium.Commit();
             EnableSetModified( sal_True );
-
-            if ( bOk )
-            {
-                // watch: if the document was successfully saved into an own format, no "SaveCompleted" was called,
-                // this must be done by the caller ( because they want to do different calls )
-                if( xNewTempRef.Is() && xNewTempRef != GetStorage() )
-                {
-                    // if the new object storage is a temporary one, because the target format is an alien format
-                    //SaveCompleted( xNewTempRef );
-                }
-            }
-            else
-            {
-                // if the storing process fails on medium commit step it means that
-                // the new medium should contain successfully written temporary representation
-                // of the document, so the docshell can just switch to new medium.
-                // it is reasonable in case an open document suddenly became unavailable.
-
-                OUString aOrigName = pMedium ? OUString(pMedium->GetName()) : OUString();
-                if ( aOrigName.getLength() && aOrigName.compareToAscii( "private:", 8 ) != COMPARE_EQUAL
-                    && !::utl::UCBContentHelper::Exists( aOrigName ) )
-                {DBG_BF_ASSERT(0, "STRIP");
-                }
-            }
         }
     }
 
@@ -1211,10 +1172,6 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
 /*N*/       }
 /*N*/   }
 /*N*/
-/*N*/   if ( GetMedium()->GetFilter() && ( GetMedium()->GetFilter()->GetFilterFlags() & SFX_FILTER_PACKED ) )
-/*N*/   {DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/
 /*N*/     // Save the document ( first as temporary file, then transfer to the target URL by committing the medium )
 /*N*/     sal_Bool bOk = sal_False;
 /*N*/     if ( !pNewFile->GetErrorCode() && SaveTo_Impl( *pNewFile, NULL, sal_True ) )
@@ -1270,19 +1227,9 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
 /*N*/   else
 /*N*/   {
 /*?*/       ::binfilter::StaticBaseUrl::SetBaseURL( aOldURL );
-/*?*/         SetError( pNewFile->GetErrorCode() );
-/*?*/
-/*?*/         // reconnect to the old storage
-/*?*/         if ( IsHandsOff() )
-/*?*/             {
-                    // was DoSaveCompleted( pMedium ) but return value is not checked;
-                  }
-/*?*/         else
-/*?*/             {
-                    // was DoSaveCompleted( (SvStorage*)0 ); but return value is not checked;
-                  }
+/*?*/       SetError( pNewFile->GetErrorCode() );
 /*?*/
-/*?*/         DELETEZ( pNewFile );
+/*?*/       DELETEZ( pNewFile );
 /*N*/   }
 /*N*/
 /*N*/     if( !bOk )
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index fba1553..84bdf77 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -315,13 +315,6 @@ extern AsynchronLink* pPendingCloser;
 
 //--------------------------------------------------------------------
 
-/*N*/ SfxObjectShell* SfxObjectShell::Current()
-/*N*/ {
-/*N*/   return 0;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
 /*N*/ struct BoolEnv_Impl
 /*N*/ {
 /*N*/   SfxObjectShell_Impl* pImp;
@@ -356,7 +349,6 @@ extern AsynchronLink* pPendingCloser;
 /*N*/
 /*N*/   SfxApplication *pSfxApp = SFX_APP();
 /*N*/   pSfxApp->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, this) );
-/*N*/   sal_Bool bClose = sal_False;
 /*N*/
 /*N*/   // ggf. hinweisen, da\s unter Fremdformat gespeichert
 /*N*/   if( pMedium )
@@ -366,11 +358,6 @@ extern AsynchronLink* pPendingCloser;
 /*N*/       if( pIgnoreInformationLost && pIgnoreInformationLost->GetValue() )
 /*N*/           bUI = sal_False;
 /*N*/   }
-/*N*/   if ( bUI && !bClose && IsInformationLost() )
-/*N*/   {
-/*N*/       // minimierte restoren
-/*?*/         DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
 /*N*/
 /*N*/   pImp->bPreparedForClose = sal_True;
 /*N*/   return sal_True;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index b5bb7af..c987bf7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -532,8 +532,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource(    const    OUSTRING&
         if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() )
         {
             sal_Bool bEmb;
-            if ( ( rArgs[0].Value >>= bEmb ) && bEmb )
-                {DBG_BF_ASSERT(0, "STRIP");}
+            rArgs[0].Value >>= bEmb;
         }
 
         return sal_True;
@@ -858,17 +857,6 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (CLOSEVETO
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
-        while (pCloseIterator.hasMoreElements())
-        {
-            try
-            {
-                DBG_BF_ASSERT(0, "STRIP");
-            }
-            catch( uno::RuntimeException& )
-            {
-                pCloseIterator.remove();
-            }
-        }
     }
 
     m_pData->m_bClosed = sal_True;
@@ -901,10 +889,11 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const REFERENCE< XCLOSELISTENER
 
 //  XPrintable
 //________________________________________________________________________________________________________
-/*?*/ void SAL_CALL SfxBaseModel::print(const SEQUENCE< PROPERTYVALUE >& /*rOptions*/)
-/*?*/         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+void SAL_CALL SfxBaseModel::print(const SEQUENCE< PROPERTYVALUE >& /*rOptions*/)
+    throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
+}
 
 //________________________________________________________________________________________________________
 //  XStorable
@@ -1107,7 +1096,7 @@ ANY SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& /*aFlavor*/ )
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException)
 {
-    DBG_BF_ASSERT(0, "STRIP");
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
     ANY aAny;
     return aAny;
 }
@@ -1116,7 +1105,7 @@ ANY SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& /*aFlavor*/ )
 SEQUENCE< DATAFLAVOR > SAL_CALL SfxBaseModel::getTransferDataFlavors()
         throw (::com::sun::star::uno::RuntimeException)
 {
-    DBG_BF_ASSERT(0, "STRIP");
+    DBG_BF_ASSERT(0, "STRIP");  // VIRTUAL
     SEQUENCE< DATAFLAVOR > aDATAFLAVOR(0);
     return aDATAFLAVOR;
 }
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index 7d1863f..49a476d 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -289,9 +289,6 @@ namespace binfilter {
 
 /*N*/ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell* pDoc )
 /*N*/ {
-/*N*/   if ( !pDoc )
-/*N*/       pDoc = SfxObjectShell::Current();
-/*N*/
 /*N*/   SEQUENCE < PROPERTYVALUE > aInProps;
 /*N*/   SEQUENCE < PROPERTYVALUE > aOutProps(2);
 /*N*/
@@ -303,7 +300,7 @@ namespace binfilter {
 /*N*/   if ( !nCount )
 /*N*/       return;
 /*N*/
-/*N*/     OUSTRING aType;
+/*N*/   OUSTRING aType;
 /*N*/   OUSTRING aScript;
 /*N*/   OUSTRING aLibrary;
 /*N*/   OUSTRING aMacroName;
@@ -347,10 +344,6 @@ namespace binfilter {
 /*?*/                   OUSTRING aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
 /*?*/                   if ( aBasMgrName.compareToAscii(".") == 0 )
 /*?*/                       aLibrary = pDoc->GetTitle( SFX_TITLE_APINAME );
-/*
-                    else if ( aBasMgrName.getLength() )
-                        aLibrary = aBasMgrName;
- */
 /*?*/                   else
 /*?*/                       aLibrary = SFX_APP()->GetName();
 /*?*/
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index a1ae21f..9d39df6 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -197,7 +197,7 @@ public:
     static SfxObjectShell*      GetNext( const SfxObjectShell& rPrev,
                                          const TypeId* pType = 0,
                                          sal_Bool bOnlyVisible = sal_True );
-    static SfxObjectShell*      Current();
+
     static SfxObjectShell*      GetWorkingDocument();
 
     virtual void                Invalidate(USHORT nId = 0);
@@ -285,7 +285,6 @@ public:
     SfxObjectCreateMode         GetCreateMode() const { return eCreateMode; }
     virtual void                MemoryError();
     SfxProgress*                GetProgress() const;
-    void                        SetWaitCursor( BOOL bSet ) const;
 
     // Naming Interface
     void                        SetTitle( const String& rTitle );


More information about the Libreoffice-commits mailing list