Remove commented code

2 files changed, 0 insertions, 167 deletions

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 3b3ad68e4f7e..9d80e96c180f 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -201,74 +201,7 @@ void SfxApplication::EnterBasicCall()
 
         // zuerst das BASIC laden
         GetBasic();
-/*
-        // als erstes SfxShellObject das SbxObject der SfxApplication erzeugen
-        SbxObject *pSbx = GetSbxObject();
-        DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject for SfxApplication" );
-
-        // die SbxObjects aller Module erzeugen
-        SfxModuleArr_Impl& rArr = GetModules_Impl();
-        for ( sal_uInt16 n = 0; n < rArr.Count(); ++n )
-        {
-            SfxModule *pMod = rArr.GetObject(n);
-            if ( pMod->IsLoaded() )
-            {
-                pSbx = pMod->GetSbxObject();
-                DBG_ASSERT( pSbx, "SfxModule: can't create SbxObject" );
-            }
-        }
-
-        // die SbxObjects aller Tasks erzeugen
-        for ( SfxTask *pTask = SfxTask::GetFirst(); pTask; pTask = SfxTask::GetNext( *pTask ) )
-            pTask->GetSbxObject();
 
-        // die SbxObjects aller SfxObjectShells erzeugen (ggf. Frame-los!)
-        for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst( NULL, sal_False );
-              pObjSh;
-              pObjSh = SfxObjectShell::GetNext(*pObjSh, NULL, sal_False) )
-        {
-            // kein IP-Object oder wenn doch dann initialisiert?
-            SvStorageRef aStorage;
-            if ( !pObjSh->IsHandsOff() )
-                aStorage = pObjSh->GetStorage();
-            if ( !pObjSh->GetInPlaceObject() || aStorage.Is() )
-            {
-                DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for %s",
-                              pObjSh->SfxShell::GetName().GetBuffer() ) );
-                pSbx = pObjSh->GetSbxObject();
-                DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
-            }
-        }
-
-        // die SbxObjects der SfxShells auf den Stacks der Frames erzeugen
-        for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst(0,sal_False);
-              pFrame;
-              pFrame = SfxViewFrame::GetNext(*pFrame,0,0,sal_False) )
-        {
-            // den Dispatcher des Frames rausholen
-            SfxDispatcher *pDispat = pFrame->GetDispatcher();
-            pDispat->Flush();
-
-            // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
-            // Frame selbst wird ausgespart, da er indirekt angezogen wird,
-            // sofern er ein Dokument enth"alt.
-            for ( sal_uInt16 nStackIdx = pDispat->GetShellLevel(*pFrame);
-                  0 != nStackIdx;
-                  --nStackIdx )
-            {
-                DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for level %u", nStackIdx-1 ); )
-                pSbx = pDispat->GetShell(nStackIdx - 1)->GetSbxObject();
-                DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
-            }
-
-            if ( !pFrame->GetObjectShell() )
-            {
-                DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for empty frame" ); )
-                pSbx = pFrame->GetSbxObject();
-                DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
-            }
-        }
-*/
         // Factories anmelden
 //        SbxBase::AddFactory( new SfxSbxObjectFactory_Impl );
     }
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index fcaef08a6fbf..0ce978564735 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -125,99 +125,7 @@ SfxMacroStatement::SfxMacroStatement
     // Workaround Recording nicht exportierter Slots (#25386#)
     if ( !rSlot.pName )
         return;
-/*
-    // Objekt-Typ bestimmen
-    bool bIsApp = rShell.ISA(SfxApplication);
-    bool bIsDoc = rShell.ISA(SfxObjectShell);
-    bool bIsWin = !bIsApp && !bIsDoc &&
-                      ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) );
-    bool bIsSel = !bIsApp && !bIsDoc && !bIsWin;
-
-    // Objekt nicht schon im Slot-Namen enthalten?
-    if ( bIsSel || rSlot.pName[0] == '.' )
-    {
-        // absolutes Aufzeichnen?
-        if ( rSlot.IsMode( SFX_SLOT_RECORDABSOLUTE ) )
-        {
-            // an der Applikation oder am Modul
-            if ( rShell.ISA(SfxApplication) || rShell.ISA(SfxModule) )
-                aStatement = rTarget;
-
-            // am Dokument?
-            // '[' = 5Bh
-            // ']' = 5Dh
-            else if ( rShell.ISA(SfxObjectShell) )
-            {
-                aStatement = 0x005B;
-                aStatement += rTarget;
-                aStatement += 0x005D;
-            }
-
-            else if ( rShell.ISA(SfxViewFrame) )
-            {
-                aStatement = 0x005B;
-                aStatement += String::CreateFromAscii("ViewFrame");//rShell.GetSbxObject()->GetName();
-                aStatement += 0x005D;
-            }
-
-            else
-            {
-                // an der View oder Sub-Shell
-                SfxViewShell *pViewShell = rShell.GetViewShell();
-                aStatement = 0x005B;
-                aStatement += String::CreateFromAscii("ViewShell");//pViewShell->GetViewFrame()->GetSbxObject()->GetName();
-                aStatement += 0x005D;
-                if ( !rShell.ISA(SfxViewFrame) )
-                    // an einer Sub-Shell zus"atlich ".Selection" anh"angen
-                    aStatement += DEFINE_CONST_UNICODE(".Selection");
-            }
-        }
-        else // relatives Aufzeichnen
-        {
-            // an der Application?
-            if ( rShell.ISA(SfxApplication) )
-                aStatement = DEFINE_CONST_UNICODE("Application");
-
-            // am Modul?
-            else if ( rShell.ISA(SfxModule) )
-                aStatement = DEFINE_CONST_UNICODE("ActiveModule");
-
-            // am Dokument
-            else if ( rShell.ISA(SfxObjectShell) )
-                aStatement = DEFINE_CONST_UNICODE("ActiveDocument");
 
-            // am Window
-            else if ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) )
-                aStatement = DEFINE_CONST_UNICODE("ActiveWindow");
-
-            else
-                // an einer Sub-Shell
-                aStatement = DEFINE_CONST_UNICODE("Selection");
-        }
-    }
-
-    if ( bIsSel )
-    {
-        // bei Selection ggf. noch den Namen der SubShell anh"angen
-        const SfxShellObject *pShObj =
-                    (const SfxShellObject*) rShell.GetSbxObject();
-        if ( pShObj )
-        {
-            const SfxShellObject *pParentObj =
-                        (const SfxShellObject*) pShObj->GetParent();
-            SfxShell *pParentSh = pParentObj->GetShell();
-            DBG_ASSERT( pParentSh->ISA(SfxViewFrame),
-                        "parent of SubShell must be a Frame" );
-            if ( rSlot.pName[0] == '.' )
-            {
-                aStatement += '.';
-                aStatement += rShell.GetSbxObject()->GetName();
-            }
-        }
-        else
-            DBG_ASSERT( rSlot.pName[0] != '0', "recording unnamed object" );
-    }
-*/
     aStatement = DEFINE_CONST_UNICODE("Selection");
 
     // an diesen Objekt-Ausdruck den Methoden-/Property-Namen und Parameter
@@ -422,14 +330,6 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                     aArg += aRecordable;
                     aArg += '"';
                 }
-/*
-                case SbxBYTE:
-                {
-                    // als Zahl darstellen
-                    aArg = (USHORT) rVar.GetByte();
-                    break;
-                }
-*/
             }
             else
             {