Remove STARIMAGE_AVAILABLE

6 files changed, 0 insertions, 103 deletions

diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx
index ff6a9d722..a1f052967 100644
--- a/sd/inc/misc.hxx
+++ b/sd/inc/misc.hxx
@@ -29,10 +29,6 @@
 #ifndef _SD_MISC_HXX
 #define _SD_MISC_HXX
 
-// do we have a StarOffice Image OLE server?
-#undef STARIMAGE_AVAILABLE
-
 #endif // _SD_MISC_HXX
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 9f5b9853b..04d8dbf02 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -37,13 +37,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 
-
 #include "misc.hxx"
-
-#ifdef STARIMAGE_AVAILABLE
-#include <sim2/simdll.hxx>
-#endif
-
 #include "strings.hrc"
 #include "ViewShell.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index c1102ea4f..d0b9ec6db 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -471,11 +471,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
     }
     else if( aType.EqualsAscii( "GraphicObjectShape" ) )
     {
-#ifdef STARIMAGE_AVAILABLE
-        eObjKind = PRESOBJ_IMAGE;
-#else
         eObjKind = PRESOBJ_GRAPHIC;
-#endif
     }
     else if( aType.EqualsAscii( "OrgChartShape" ) )
     {
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 7e8d4fc3f..6a64e21e8 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -59,10 +59,6 @@
 
 #include "misc.hxx"
 
-#ifdef STARIMAGE_AVAILABLE
-#include <sim2/simdll.hxx>
-#endif
-
 #include <svx/dialogs.hrc>
 
 #include "view/viewoverlaymanager.hxx"
@@ -794,76 +790,6 @@ ErrCode DrawViewShell::DoVerb(long nVerb)
             {
                 ActivateObject( (SdrOle2Obj*) pObj, nVerb);
             }
-#ifdef STARIMAGE_AVAILABLE
-            else if (nInv = SdrInventor && nSdrObjKind == OBJ_GRAF &&
-                     ((SdrGrafObj*) pObj)->GetGraphicType() == GRAPHIC_BITMAP &&
-                     SFX_APP()->HasFeature(SFX_FEATURE_SIMAGE))
-            {
-                SdrGrafObj* pSdrGrafObj = (SdrGrafObj*) pObj;
-                short nOK = RET_YES;
-
-                if ( pSdrGrafObj->GetFileName().Len() )
-                {
-                    // Graphik ist gelinkt, soll der Link aufgehoben werden?
-                    QueryBox aBox(pWindow, WB_YES_NO | WB_DEF_YES,
-                                  String( SdResId(STR_REMOVE_LINK) ) );
-                    nOK = aBox.Execute();
-
-                    if (nOK == RET_YES)
-                    {
-                        // Link aufheben (File- und Filtername zuruecksetzen)
-                        pSdrGrafObj->SetGraphicLink(String(), String());
-                    }
-                }
-
-                if (nOK == RET_YES)
-                {
-                    /**************************************************************
-                    * OLE-Objekt erzeugen, StarImage starten
-                    * Grafik-Objekt loeschen (durch OLE-Objekt ersetzt)
-                    **************************************************************/
-                    //HMHmpDrView->HideMarkHdl();
-
-                    SvStorageRef aStor = new SvStorage(String());
-                    SvInPlaceObjectRef aNewIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())
-                    ->CreateAndInit(SimModuleDummy::GetID(SOFFICE_FILEFORMAT_CURRENT), aStor);
-                    if ( aNewIPObj.Is() )
-                    {
-                        SdrGrafObj* pTempSdrGrafObj = (SdrGrafObj*) pSdrGrafObj->Clone ();
-
-                        SvEmbeddedInfoObject * pInfo;
-                        pInfo = GetViewFrame()->GetObjectShell()->
-                                       InsertObject( aNewIPObj, String() );
-
-                        String aName;
-                        if (pInfo)
-                        {
-                            aName = pInfo->GetObjName();
-                        }
-
-                        Rectangle aRect = pObj->GetLogicRect();
-                        SdrOle2Obj* pSdrOle2Obj = new SdrOle2Obj( aNewIPObj,
-                                                                  aName, aRect );
-
-                        SdrPageView* pPV = mpDrawView->GetSdrPageView();
-
-                        pPV->GetObjList()->InsertObject( pSdrOle2Obj );
-                        mpDrawView->ReplaceObjectAtView( pObj, *pPV, pTempSdrGrafObj );
-
-                        pSdrOle2Obj->SetLogicRect(aRect);
-                        aNewIPObj->SetVisAreaSize(aRect.GetSize());
-
-                        SimDLL::Update(aNewIPObj, pTempSdrGrafObj->GetGraphic(), pWindow);
-                        ActivateObject(pSdrOle2Obj, SVVERB_SHOW);
-
-                        Client* pClient = (Client*) GetIPClient();
-
-                        if (pClient)
-                            pClient->SetSdrGrafObj( pTempSdrGrafObj );
-                    }
-                }
-            }
-#endif
         }
     }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 110a8cff2..8a1af14b2 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -954,9 +954,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_INSERT_VIDEO );
         rSet.DisableItem( SID_INSERT_APPLET );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
-#ifdef STARIMAGE_AVAILABLE
-        rSet.DisableItem( SID_INSERT_IMAGE );
-#endif
         rSet.DisableItem( SID_INSERT_MATH );
         rSet.DisableItem( SID_INSERT_DIAGRAM );
         rSet.DisableItem( SID_ATTR_TABLE );
@@ -1059,9 +1056,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_INSERT_APPLET );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
 
-#ifdef STARIMAGE_AVAILABLE
-        rSet.DisableItem( SID_INSERT_IMAGE );
-#endif
         rSet.DisableItem( SID_INSERT_MATH );
         rSet.DisableItem( SID_INSERT_FRAME );
         rSet.DisableItem( SID_INSERTFILE );
@@ -1268,12 +1262,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     {
         rSet.DisableItem( SID_INSERT_DIAGRAM );
     }
-#ifdef STARIMAGE_AVAILABLE
-    if (!(pApp->HasFeature(SFX_FEATURE_SIMAGE)))
-    {
-        rSet.DisableItem( SID_INSERT_IMAGE );
-    }
-#endif
     if (!SvtModuleOptions().IsMath())
     {
         rSet.DisableItem( SID_INSERT_MATH );
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index dd2d4d9ad..443d4f1dd 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -783,9 +783,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId )
         break;
 
         case SID_INSERT_DIAGRAM:
-#ifdef STARIMAGE_AVAILABLE
-        case SID_INSERT_IMAGE:
-#endif
         case SID_ATTR_TABLE:
         case SID_INSERTFILE:
         case SID_INSERT_GRAPHIC: