diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 23:30:42 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 23:30:42 +0100 |
commit | 0052e0dbbd6868a244458964a0abd204391d73c8 (patch) | |
tree | bc9eaba06f6a9c3efb0cac7f6b8d4016d155a721 /sd/source/ui | |
parent | 5c66dc4af93b3bd952819f55be13cece6ab851b6 (diff) |
Remove STARIMAGE_AVAILABLE
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/docshell/sdclient.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 74 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsc.cxx | 3 |
5 files changed, 0 insertions, 99 deletions
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index 2634572150e9..2cdb4d1b5630 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 82600b764480..296b29c7c1f6 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 b8356f48cf43..50354b941be1 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 04294613cc0b..c5c85cfbb157 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 81162af15aab..17bbda1fac55 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: |