Remove some dead code

9 files changed, 0 insertions, 194 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e9a9a2fe75d6..a336bbe5f91a 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -464,8 +464,6 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
 
                xDoc->GetStorage()->copyToStorage( xTempStorage );
 
-//REMOVE                // the following operations should be done in one step
-//REMOVE                xDoc->DoHandsOff();
             if ( !xDoc->DoSaveCompleted( new SfxMedium( xTempStorage, String() ) ) )
                 throw uno::RuntimeException();
         }
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ebc187bc6669..843e9303b0cb 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -659,18 +659,6 @@ void FileDialogHelper_Impl::updateVersions()
 
                 for ( sal_Int32 i=0; i<xVersions.getLength(); i++ )
                     aEntries[ i + 1 ] = xVersions[i].Identifier;
-
-                // TODO/LATER: not sure that this information must be shown in future ( binfilter? )
-//REMOVE                    else
-//REMOVE                    {
-//REMOVE                        SfxFilterFlags nMust = SFX_FILTER_IMPORT | SFX_FILTER_OWN;
-//REMOVE                        SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED | SFX_FILTER_STARONEFILTER;
-//REMOVE                        if ( SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( pStor->GetFormat(), nMust, nDont ) )
-//REMOVE                        {
-//REMOVE                            aEntries.realloc( 1 );
-//REMOVE                            aEntries[0] = OUString( String ( SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ) ) );
-//REMOVE                        }
-//REMOVE                    }
             }
             catch( uno::Exception& )
             {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d08e096733db..68e118a5c31b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2179,7 +2179,6 @@ void SfxMedium::ClearBackup_Impl()
         if ( pImp->m_aBackupURL.getLength() )
         {
             if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) )
-              // || !::utl::UCBContentHelper::IsDocument( pImp->m_aBackupURL ) );
             {
                 pImp->m_bRemoveBackup = sal_False;
                 pImp->m_aBackupURL = ::rtl::OUString();
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 135af6887e83..c206c72ccc6d 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -135,45 +135,6 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
                 SetModified( TRUE );
 
                SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
-
-            /*
-            Size aSize (GetVisArea().GetSize());
-            if ( GetIPEnv() && GetIPEnv()->GetEditWin() )
-                ViewChanged( ASPECT_CONTENT );
-            */
-
-
-            // OutPlace die Gr"o\se des MDI-Fensters anpassen
-            // Unbedingt den Gr"o\senvergleich machen, spart nicht nur Zeit, sondern
-            // vermeidet auch Rundungsfehler !
-            /*
-                // in case of ole outplace editing the frame should be found
-                SfxViewFrame* pFrameToResize = pFrame ? pFrame : SfxViewFrame::GetFirst( GetObjectShell() );
-
-                if ( pFrameToResize && !pIPF && rRect.GetSize() != aSize &&
-                    !pFrameToResize->IsAdjustPosSizePixelLocked_Impl() )
-
-                {
-                    // Zuerst die logischen Koordinaten von IP-Objekt und EditWindow
-                    // ber"ucksichtigen
-                    SfxViewShell *pShell = pFrameToResize->GetViewShell();
-                    Window *pWindow = pShell->GetWindow();
-
-                    // Da in den Applikationen bei der R"ucktransformation immer die
-                    // Eckpunkte tranformiert werden und nicht die Size (um die Ecken
-                    // alignen zu k"onnen), transformieren wir hier auch die Punkte, um
-                    // m"oglichst wenig Rundungsfehler zu erhalten.
-                    Rectangle aRect = pWindow->LogicToPixel( rRect );
-                    Size aSize = aRect.GetSize();
-                    pShell->GetWindow()->SetSizePixel( aSize );
-                    pFrameToResize->DoAdjustPosSizePixel( pShell, Point(), aSize );
-                }
-
-            // bei InPlace die View skalieren
-            if ( GetIPEnv() && GetIPEnv()->GetEditWin() && !bDisableViewScaling && pIPF )
-                pIPF->GetEnv_Impl()->MakeScale( rRect.GetSize(), GetMapUnit(),
-                            pIPF->GetViewShell()->GetWindow()->GetOutputSizePixel() );
-           */
         }
     }
 }
@@ -233,9 +194,6 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
         Fraction aXF( rSize.Width(), aSize.Width() );
         Fraction aYF( rSize.Height(), aSize.Height() );
 
-//REMOVE            Point aOrg = rObjPos;
-//REMOVE            aMod.SetMapUnit( MAP_100TH_MM );
-//REMOVE            aSize = pDev->LogicToLogic( GetVisArea( nAspect ).GetSize(), &aMod, &aWilliMode );
         DoDraw_Impl( pDev, rObjPos, aXF, aYF, rSetup, nAspect );
     }
 }
@@ -281,9 +239,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
         else
             pMtf = NULL;
     }
-// #ifndef UNX
     if( pDev->IsClipRegion() && pDev->GetOutDevType() != OUTDEV_PRINTER )
-// #endif
     {
         aRegion = pDev->PixelToLogic( aRegion );
         pDev->SetClipRegion( aRegion );
@@ -291,12 +247,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
     if( pMtf )
         pMtf->Record( pDev );
 
-//REMOVE        SvOutPlaceObjectRef xOutRef( this );
-//REMOVE        if ( xOutRef.Is() )
-//REMOVE            xOutRef->DrawObject( pDev, rSetup, rSize, nAspect );
-//REMOVE        else
         Draw( pDev, rSetup, nAspect );
-//REMOVE        DrawHatch( pDev, aVisArea.TopLeft(), aVisArea.GetSize() );
 
     // Deviceeinstellungen wieder herstellen
     pDev->Pop();
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index e346dfa7ebeb..eb0098d77a49 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -938,7 +938,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 
                     if ( !pFrame || !pDoc->HasName() ||
                         !IsOwnStorageFormat_Impl( *pDoc->GetMedium() ) )
-//REMOVE                            || pDoc->GetMedium()->GetStorage()->GetVersion() < SOFFICE_FILEFORMAT_50 )
                         rSet.DisableItem( nWhich );
                     break;
                 }
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 360fcccce408..dfc1388c0cfd 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2536,14 +2536,6 @@ void SfxBaseModel::Notify(          SfxBroadcaster& rBC     ,
             {
                 postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_MODECHANGED ) );
             }
-/*
-            else if ( pSimpleHint->GetId() == SFX_HINT_DYING
-                || pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
-            {
-                SfxObjectShellLock pShellLock = m_pData->m_pObjectShellLock;
-                m_pData->m_pObjectShellLock = SfxObjectShellLock();
-            }
-*/
         }
     }
 }
@@ -2649,8 +2641,6 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
     if( !sURL.getLength() )
         throw frame::IllegalArgumentIOException();
 
-    //sal_Bool aSaveAsTemplate = sal_False;
-
     sal_Bool bSaved = sal_False;
     if ( !bSaveTo && m_pData->m_pObjectShell && sURL.getLength()
       && sURL.compareToAscii( "private:stream", 14 ) != COMPARE_EQUAL
@@ -3005,8 +2995,6 @@ void SAL_CALL SfxBaseModel::addPrintJobListener( const uno::Reference< view::XPr
         if ( xPJB.is() )
             xPJB->addPrintJobListener( xListener );
     }
-//  else
-//      m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
 }
 
 void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::XPrintJobListener >& xListener ) throw (uno::RuntimeException)
@@ -3019,8 +3007,6 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::
         if ( xPJB.is() )
             xPJB->removePrintJobListener( xListener );
     }
-//  else
-//      m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
 }
 
 // simple declaration of class SvObject is enough
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index a4c440b3924c..483e651fa604 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -33,7 +33,6 @@
 #include <sfx2/basedlgs.hxx>
 
 class SfxObjectShell;
-//REMOVE    class SvStorageRef;
 class SfxFrameWindow;
 
 class SfxFrame;
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index 8138ffc31c60..a1ba8ac7ef67 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -70,9 +70,6 @@ struct _FileListEntry
     const CollatorWrapper* pCollator;
     SfxObjectShellLock aDocShell; // ObjectShell als Ref-Klasse
 
-//REMOVE        SvStorageRef aStor;         // Referenz auf Storage, wenn wir diesen geoeffnet haben
-    //uno::Reference< embed::XStorage > xStorage;
-
     BOOL bFile;                 // als Datei auf Platte
                                 // (!= unbenannt1, nicht als Dok. geladen;
                                 // diese werden nicht gespeichert!)
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 34eb11b5899c..8b6de50eec0d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -170,8 +170,6 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
 TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
 
-//=========================================================================
-
 //-------------------------------------------------------------------------
 namespace
 {
@@ -1187,22 +1185,6 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
     // ViewFrames, erh"alt er ein ParentActivate
     if ( bUI )
     {
-/*
-        SfxMedium* pMed = GetObjectShell() ? GetObjectShell()->GetMedium() : NULL;
-        if( pMed )
-        {
-            SFX_ITEMSET_ARG(
-                pMed->GetItemSet(), pInterceptorItem, SfxSlotInterceptorItem,
-                SID_INTERCEPTOR, sal_False );
-            if( pInterceptorItem )
-            {
-                SfxSlotInterceptor* pInter = pInterceptorItem->GetValue();
-                if( !pInter->GetBindings() )
-                    pInter->SetBindings( &GetBindings() );
-                pInter->Activate( sal_True );
-            }
-        }
- */
         SfxViewFrame *pFrame = GetParentViewFrame();
         while ( pFrame )
         {
@@ -1224,19 +1206,6 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
     // ViewFrames, erh"alt er ein ParentDeactivate
     if ( bUI )
     {
-//        if ( GetFrame().GetWorkWindow_Impl() )
-//            GetFrame().GetWorkWindow_Impl()->SaveStatus_Impl();
-/*
-        SfxMedium* pMed = GetObjectShell() ? GetObjectShell()->GetMedium() : NULL;
-        if( pMed )
-        {
-            SFX_ITEMSET_ARG(
-                pMed->GetItemSet(), pInterceptorItem, SfxSlotInterceptorItem,
-                SID_INTERCEPTOR, sal_False );
-            if( pInterceptorItem )
-                pInterceptorItem->GetValue()->Activate( sal_False );
-        }
-*/
         SfxViewFrame *pFrame = GetParentViewFrame();
         while ( pFrame )
         {
@@ -1259,13 +1228,6 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
         {
             if ( GetFrame().IsInPlace() )
             {
-                /*
-                Size aSize( GetViewShell()->GetWindow()->GetSizePixel() );
-
-                //Size aBorderSz( pEnv->GetBorderWin()->GetHatchBorderPixel() );
-                Point aOfs; //( aBorderSz.Width(), aBorderSz.Height() );
-
-                DoAdjustPosSizePixel( GetViewShell(), aOfs, aSize );*/
                 return;
             }
 
@@ -1699,43 +1661,18 @@ SfxProgress* SfxViewFrame::GetProgress() const
 //--------------------------------------------------------------------
 void SfxViewFrame::ShowStatusText( const String& /*rText*/)
 {
-/* OBSOLETE: If this is used, framework/uielement/progressbarwrapper.[h|c]xx &
-             framework/uielement/statusindicatorinterfacewrapper.[h|c]xx must be
-             extended to support a new interface to support ShowStatusText/HideStatusText
-    SfxWorkWindow* pWorkWin = GetFrame().GetWorkWindow_Impl();
-    SfxStatusBarManager *pMgr = pWorkWin->GetStatusBarManager_Impl();
-    if ( pMgr )
-    {
-        pMgr->GetStatusBar()->HideItems();
-        pMgr->GetStatusBar()->SetText( rText );
-    }
-*/
 }
 
 //--------------------------------------------------------------------
 void SfxViewFrame::HideStatusText()
 {
-/* OBSOLETE: If this is used, framework/uielement/progressbarwrapper.[h|c]xx &
-             framework/uielement/statusindicatorinterfacewrapper.[h|c]xx must be
-             extended to support a new interface to support ShowStatusText/HideStatusText
-    SfxWorkWindow* pWorkWin = GetFrame().GetWorkWindow_Impl();
-    SfxStatusBarManager *pMgr = pWorkWin->GetStatusBarManager_Impl();
-    if ( pMgr )
-        pMgr->GetStatusBar()->ShowItems();
-*/
 }
 
-
 //--------------------------------------------------------------------
 #ifdef ENABLE_INIMANAGER//MUSTINI
 SfxIniManager* SfxViewFrame::GetIniManager() const
 {
-/*  SfxIniManager *pIniMgr = GetObjectShell()
-            ? GetObjectShell()->GetFactory().GetIniManager()
-            : 0;
-    if ( !pIniMgr )*/ //!
         return SFX_APP()->GetAppIniManager();
-//  return pIniMgr;
 }
 #endif
 
@@ -1885,13 +1822,6 @@ void SfxViewFrame::Enable( sal_Bool bEnable )
             if ( pViewSh )
                 pViewSh->ShowCursor(sal_False);
         }
-/*
-        if ( !bEnable )
-            GetBindings().ENTERREGISTRATIONS();
-        GetDispatcher()->Lock( !bEnable );
-        if ( bEnable )
-            GetBindings().LEAVEREGISTRATIONS();
-*/
     }
 }
 
@@ -1929,12 +1859,6 @@ void SfxViewFrame::Show()
         GetWindow().Show();
     GetFrame().GetWindow().Show();
 
-/*    SfxViewFrame* pCurrent = SfxViewFrame::Current();
-    if ( GetFrame().GetFrameInterface()->isActive() &&
-            pCurrent != this &&
-            ( !pCurrent || pCurrent->GetParentViewFrame_Impl() != this ) &&
-            !GetActiveChildFrame_Impl() )
-        MakeActive_Impl( FALSE );*/
     if ( xObjSh.Is() && xObjSh->Get_Impl()->bHiddenLockedByAPI )
     {
         xObjSh->Get_Impl()->bHiddenLockedByAPI = FALSE;
@@ -2059,21 +1983,6 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
 SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
 {
     SfxViewFrame *pViewFrame = pImp->pActiveChild;
-/*
-    if ( !pViewFrame )
-    {
-        // Wenn es keinen aktiven ChildFrame gibt, irgendeinen nehmen
-        for ( sal_uInt16 n=0; n<GetChildFrameCount(); n++ )
-        {
-            pViewFrame =
-                PTR_CAST( SfxViewFrame, GetChildFrame(n)->GetChildFrame(0) );
-            if ( pViewFrame )
-                break;
-        }
-    }
-
-    pImp->pActiveChild = pViewFrame;
-*/
     return pViewFrame;
 }
 
@@ -2832,14 +2741,6 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BO
  */
 void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 {
-    /*
-    // get lib and modul name from dialog
-    SfxModule *pMod = GetObjectShell()->GetModule();
-    SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pMod->GetPool() );
-    const SfxPoolItem* pRet = pMod->ExecuteSlot( aReq );
-    if ( pRet )
-        ::rtl::OUString = ((SfxStringItem*)pRet)->GetValue();
-    */
     if ( !sMacro.getLength() )
         return;
 
@@ -3023,12 +2924,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
     {
         // add code for "session only" macro
     }
-
-    /*
-    FILE* pFile = fopen( "macro.bas", "a" );
-    fprintf( pFile, "%s", ::rtl::OUStringToOString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8).getStr() );
-    fclose ( pFile );
-    */
 }
 
 void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
@@ -3501,12 +3396,6 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( USHORT /*nId*/ )
     return pWork;
 }
 
-/*
-void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn)
-{
-    SetChildWindow( nId, bOn, TRUE );
-}*/
-
 void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );