[Libreoffice-commits] .: 3 commits - sd/inc sd/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Mar 1 23:49:07 PST 2011
sd/inc/misc.hxx | 38 ------------------
sd/source/core/glob.src | 1
sd/source/core/sdpage.cxx | 1
sd/source/ui/app/app.src | 1
sd/source/ui/app/menuids2_tmpl.src | 1
sd/source/ui/docshell/docshel4.cxx | 4 -
sd/source/ui/docshell/sdclient.cxx | 7 ---
sd/source/ui/func/fuinsert.cxx | 1
sd/source/ui/unoidl/unopage.cxx | 5 --
sd/source/ui/view/drviews1.cxx | 78 -------------------------------------
sd/source/ui/view/drviews7.cxx | 13 ------
sd/source/ui/view/drviews8.cxx | 1
sd/source/ui/view/drviewsc.cxx | 4 -
sd/source/ui/view/viewshe2.cxx | 1
14 files changed, 156 deletions(-)
New commits:
commit 73ddab60128c26f603976061fc86f09a72f33974
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 23:33:43 2011 +0100
Remove unused misc.hxx and its references
diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx
deleted file mode 100644
index a1f0529..0000000
--- a/sd/inc/misc.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SD_MISC_HXX
-#define _SD_MISC_HXX
-
-#endif // _SD_MISC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 24d4f22..a38af73 100755
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -28,7 +28,6 @@
#define __RSC
-#include "misc.hxx"
#include "glob.hrc"
#include "sderror.hxx"
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 455229d..2cab72e 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -66,7 +66,6 @@
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
-#include "misc.hxx"
#include "eetext.hxx"
#include "drawdoc.hxx"
#include "sdpage.hxx"
diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src
index 4433082..36c224b 100644
--- a/sd/source/ui/app/app.src
+++ b/sd/source/ui/app/app.src
@@ -30,6 +30,5 @@
#include "res_bmp.hrc"
#include <svx/dialogs.hrc>
#include "cfgids.hxx"
-#include "misc.hxx"
#include <svx/svxids.hrc>
diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src
index ec3422c..e9240b5 100755
--- a/sd/source/ui/app/menuids2_tmpl.src
+++ b/sd/source/ui/app/menuids2_tmpl.src
@@ -24,7 +24,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "misc.hxx"
#ifndef _MENUIDS2_SRC
#define _MENUIDS2_SRC
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 04d8dbf..37259d9 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -37,7 +37,6 @@
#include <toolkit/helper/vclunohelper.hxx>
-#include "misc.hxx"
#include "strings.hrc"
#include "ViewShell.hxx"
#include "DrawViewShell.hxx"
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 2deabd7..74eb675 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -76,7 +76,6 @@
#include <sfx2/viewfrm.hxx>
#include "app.hrc"
-#include "misc.hxx"
#include "sdresid.hxx"
#include "View.hxx"
#include "app.hxx"
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index d0b9ec6..32d82f9 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -72,7 +72,6 @@
#include <svx/svdoole2.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdview.hxx>
-#include "misc.hxx"
#include "View.hxx"
#ifndef SVX_LIGHT
#include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 6a64e21..21b5b2a 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -55,10 +55,6 @@
#include <svx/globl3d.hxx>
#include <svx/fmglob.hxx>
#include <editeng/outliner.hxx>
-
-
-#include "misc.hxx"
-
#include <svx/dialogs.hrc>
#include "view/viewoverlaymanager.hxx"
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 8a1af14..da974ad 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -71,7 +71,6 @@
#include "res_bmp.hrc"
#include "PresentationViewShell.hxx"
-#include "misc.hxx"
#include "Outliner.hxx"
#include "drawdoc.hxx"
#include "sdresid.hxx"
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 04ad908..a2ca5c5 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -47,7 +47,6 @@
#include "app.hrc"
#include "strings.hrc"
-#include "misc.hxx"
#include "fuzoom.hxx"
#include "fudspord.hxx"
#include "futransf.hxx"
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 443d4f1..be53372 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -55,7 +55,6 @@
#include "app.hrc"
#include "strings.hrc"
#include "helpids.h"
-#include "misc.hxx"
#include "Window.hxx"
#include "imapinfo.hxx"
#include "futempl.hxx"
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index bc42cb9..44edda9 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -57,7 +57,6 @@
#include <svx/dialogs.hrc>
#include <sot/clsids.hxx>
-#include "misc.hxx"
#include "strings.hrc"
#include "app.hrc"
#include "unokywds.hxx"
commit ac25becaf4aae68cd663d12f956a01214e49118b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 23:30:42 2011 +0100
Remove STARIMAGE_AVAILABLE
diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx
index ff6a9d7..a1f0529 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 9f5b985..04d8dbf 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 c1102ea..d0b9ec6 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 7e8d4fc..6a64e21 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 110a8cf..8a1af14 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 dd2d4d9..443d4f1 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:
commit f77a7926380edd3b91371de9044e437ddf00b133
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 23:27:24 2011 +0100
Remove TF_STARONE
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 33c06c4..b7470fb 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -51,10 +51,6 @@
#include <sot/clsids.hxx>
#include <sot/formats.hxx>
#include <sfx2/request.hxx>
-#ifdef TF_STARONE
-#include "unomodel.hxx"
-#endif
-
#include <unotools/fltrcfg.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
More information about the Libreoffice-commits
mailing list