summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-10-05 11:27:50 +0000
committerjp <jp@openoffice.org>2000-10-05 11:27:50 +0000
commita07432e589160e6a183e1800d7d61c85a4b4f217 (patch)
tree507c2e5a5bea7270a8091081235ff4ccc3b1fb69 /sw/source
parent4a2fdbe54419f6949dbd68e3672a5d8bdc82c443 (diff)
should change: remove image
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/doc.cxx104
-rw-r--r--sw/source/core/doc/doctxm.cxx36
-rw-r--r--sw/source/core/frmedt/feflyole.cxx30
-rw-r--r--sw/source/core/unocore/unoidx.cxx13
-rw-r--r--sw/source/ui/app/app.src6
-rw-r--r--sw/source/ui/docvw/edtwin.cxx82
-rw-r--r--sw/source/ui/inc/edtwin.hxx9
-rw-r--r--sw/source/ui/inc/shells.hrc6
-rw-r--r--sw/source/ui/inc/view.hxx5
-rw-r--r--sw/source/ui/index/cnttab.cxx8
-rw-r--r--sw/source/ui/index/cnttab.src25
-rw-r--r--sw/source/ui/ribbar/workctrl.src9
-rw-r--r--sw/source/ui/shells/shells.src38
-rw-r--r--sw/source/ui/shells/textsh.cxx24
14 files changed, 53 insertions, 342 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6219b077f6e6..c9d35180efc2 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: doc.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:07:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -228,21 +228,6 @@
#include <statstr.hrc> // StatLine-String
#endif
-class _GrfToOleUndo : public SwClient
-{
-public:
- String aAlternateText;
- SwUndoReRead* pSaveObj;
- PolyPolygon *pContour;
-
- _GrfToOleUndo( SwUndoReRead* pObj, SwGrfNode &rNd );
- TYPEINFO();
-
- // wird der Parent geloescht, dann loeschen wir uns selbst
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-};
-
-
// Seiten-Deskriptoren
SV_IMPL_PTRARR(SwPageDescs,SwPageDescPtr);
// Autoren
@@ -252,16 +237,6 @@ SV_IMPL_PTRARR( SwTOXTypes, SwTOXTypePtr )
// FeldTypen
SV_IMPL_PTRARR( SwFldTypes, SwFldTypePtr)
-TYPEINIT1( _GrfToOleUndo, SwClient );
-
-
-_GrfToOleUndo::_GrfToOleUndo( SwUndoReRead* pObj, SwGrfNode &rNd ) :
- SwClient( 0 ),
- pSaveObj( pObj ),
- aAlternateText( rNd.GetAlternateText() ),
- pContour( rNd.HasContour() ? new PolyPolygon( *rNd.HasContour() ) : 0 )
-{
-}
/*
* Dokumenteditieren (Doc-SS) zum Fuellen des Dokuments
@@ -578,68 +553,6 @@ SwFlyFrmFmt* SwDoc::Insert(const SwPaM &rRg, SvInPlaceObject *pObj,
pFrmFmt );
}
-void SwDoc::GrfToOle( const SwPaM &rRg, SvInPlaceObject * pObj )
-{
- // haben wir ueberhaupt eine Grafik an der Hand ??
- SwNodeIndex& rNdIdx = (SwNodeIndex&)rRg.GetPoint()->nNode;
- SwGrfNode* pGrfNd = rNdIdx.GetNode().GetGrfNode();
- if( !pGrfNd )
- return;
-
- _GrfToOleUndo* pSaveForUndo = 0;
- if( DoesUndo() )
- pSaveForUndo = new _GrfToOleUndo( new SwUndoReRead( rRg, *pGrfNd ), *pGrfNd);
-
- SwOLENode* pOLENd = GetNodes().MakeOLENode( rNdIdx, pObj,
- (SwGrfFmtColl*)pGrfNd->GetFmtColl(),
- pGrfNd->GetpSwAttrSet() );
-
- pGrfNd->MakeFrms( *pOLENd );
-
- if( pSaveForUndo )
- pOLENd->Add( pSaveForUndo );
-
- ((SwPaM&)rRg).GetPoint()->nContent.Assign( pOLENd, 0 );
- GetNodes().DelNodes( rNdIdx, 1 );
- rNdIdx--;
-}
-
-void SwDoc::OleToGrf( const SwPaM &rRg, const Graphic *pGrf )
-{
- // haben wir ueberhaupt eine Ole an der Hand ??
- SwNodeIndex& rNdIdx = (SwNodeIndex&)rRg.GetPoint()->nNode;
- SwOLENode* pOleNd = rNdIdx.GetNode().GetOLENode();
- if( !pOleNd )
- return;
-
- SwGrfNode* pGrfNd = GetNodes().MakeGrfNode( rNdIdx, aEmptyStr, aEmptyStr,
- pGrf,
- (SwGrfFmtColl*)pOleNd->GetFmtColl(),
- pOleNd->GetpSwAttrSet() );
-
- pOleNd->MakeFrms( *pGrfNd );
-
- // dann suche doch mal nach unserem angehaengten Client fuers Undo
- {
- SwClientIter aIter( *pOleNd );
- SwClient* pGTO = aIter.First(TYPE( _GrfToOleUndo ));
- if( pGTO )
- {
- SwUndoReRead* pUndo = ((_GrfToOleUndo*)pGTO)->pSaveObj;
- pGrfNd->SetAlternateText( ((_GrfToOleUndo*)pGTO)->aAlternateText );
- pGrfNd->SetContour( ((_GrfToOleUndo*)pGTO)->pContour );
- if( DoesUndo() )
- AppendUndo( pUndo );
- else
- delete pUndo; // Undo wurde abgeschaltet
- delete pGTO;
- }
- }
-
- ((SwPaM&)rRg).GetPoint()->nContent.Assign( pGrfNd, 0 );
- GetNodes().DelNodes( rNdIdx, 1 );
- rNdIdx--;
-}
String SwDoc::GetCurWord( SwPaM& rPaM )
{
@@ -933,19 +846,6 @@ void SwDoc::ReRead( SwPaM& rPam, const String& rGrfName,
}
}
- // wird der Parent geloescht, dann loeschen wir uns selbst
-void _GrfToOleUndo::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
-{
- if( !pOld )
- pOld = pNew;
- if( pOld && RES_OBJECTDYING == pOld->Which() &&
- ((SwPtrMsgPoolItem *)pOld)->pObject == (void*)GetRegisteredIn() )
- {
- delete pSaveObj;
- delete this;
- }
-}
-
BOOL lcl_SpellAgain( const SwNodePtr& rpNd, void* pArgs )
{
SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 0ff1cfd0c572..4e2fecd06bb9 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: doctxm.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:07:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,6 @@
#ifndef SC_SCDLL_HXX
#include <sc/scdll.hxx>
#endif
-#ifndef _SIM_SIMDLL0_HXX
-#include <sim2/simdll0.hxx>
-#endif
#ifndef _SCHDLL0_HXX
#include <sch/schdll0.hxx>
#endif
@@ -1503,24 +1500,19 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eType,
if ( pOLENode->GetOLEObj().IsOleRef() ) //Noch nicht geladen
{
- BOOL bMath = SmModuleDummy::HasID(
- *pOLENode->GetOLEObj().GetOleRef()->GetSvFactory());
- BOOL bChart = SchModuleDummy::HasID(
- *pOLENode->GetOLEObj().GetOleRef()->GetSvFactory());
- BOOL bImage = SimModuleDummy::HasID(
- *pOLENode->GetOLEObj().GetOleRef()->GetSvFactory());
- BOOL bCalc = ScModuleDummy::HasID(
- *pOLENode->GetOLEObj().GetOleRef()->GetSvFactory());
- BOOL bDrawImage = SdModuleDummy::HasID(
- *pOLENode->GetOLEObj().GetOleRef()->GetSvFactory());
+ const SotFactory* pFact = pOLENode->GetOLEObj().
+ GetOleRef()->GetSvFactory();
+ BOOL bMath = SmModuleDummy::HasID( *pFact );
+ BOOL bChart = SchModuleDummy::HasID( *pFact );
+ BOOL bCalc = ScModuleDummy::HasID( *pFact );
+ BOOL bDrawImage = SdModuleDummy::HasID( *pFact );
if(
- (nOLEOptions & TOO_MATH) && bMath ||
- (nOLEOptions & TOO_CHART)&& bChart ||
- (nOLEOptions & TOO_IMAGE) && bImage ||
- (nOLEOptions & TOO_CALC) && bCalc ||
- (nOLEOptions & TOO_DRAW_IMPRESS) && bDrawImage ||
- (nOLEOptions & TOO_OTHER) &&
- !bMath && !bChart && !bImage && !bCalc && !bDrawImage)
+ ((nOLEOptions & TOO_MATH) && bMath ) ||
+ ((nOLEOptions & TOO_CHART)&& bChart ) ||
+ ((nOLEOptions & TOO_CALC) && bCalc ) ||
+ ((nOLEOptions & TOO_DRAW_IMPRESS) && bDrawImage ) ||
+ ((nOLEOptions & TOO_OTHER) &&
+ !bMath && !bChart && !bCalc && !bDrawImage))
bInclude = TRUE;
}
else
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index dd5cbff58965..7919f9652fe5 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: feflyole.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:19 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:08:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -135,32 +135,6 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const SvEmbeddedObject *pIPObj ) const
}
-void SwFEShell::GrfToOle( SvInPlaceObject * pObj )
-{
- SET_CURR_SHELL( this );
- StartAllAction();
- FOREACHPAM_START( this )
-
- GetDoc()->GrfToOle( *PCURCRSR, pObj );
-
- FOREACHPAM_END()
- EndAllAction();
-}
-
-
-void SwFEShell::OleToGrf( const Graphic *pGrf )
-{
- SET_CURR_SHELL( this );
- StartAllAction();
- FOREACHPAM_START( this )
-
- GetDoc()->OleToGrf( *PCURCRSR, pGrf );
-
- FOREACHPAM_END()
- EndAllAction();
-}
-
-
String SwFEShell::GetUniqueOLEName() const
{
return GetDoc()->GetUniqueOLEName();
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 83349f267a3f..9e3c26a50d46 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoidx.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:28 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:10:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -519,9 +519,6 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName,
case WID_CREATE_FROM_STAR_MATH:
nOLEOptions = lcl_AnyToBool(aValue) ? nOLEOptions | TOO_MATH : nOLEOptions & ~TOO_MATH;
break;
- case WID_CREATE_FROM_STAR_IMAGE :
- nOLEOptions = lcl_AnyToBool(aValue) ? nOLEOptions | TOO_IMAGE : nOLEOptions & ~TOO_IMAGE;
- break;
case WID_CREATE_FROM_STAR_CHART :
nOLEOptions = lcl_AnyToBool(aValue) ? nOLEOptions | TOO_CHART : nOLEOptions & ~TOO_CHART;
break;
@@ -763,9 +760,6 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
case WID_CREATE_FROM_STAR_MATH:
bRet = 0 != (nOLEOptions & TOO_MATH);
break;
- case WID_CREATE_FROM_STAR_IMAGE :
- bRet = 0 != (nOLEOptions & TOO_IMAGE);
- break;
case WID_CREATE_FROM_STAR_CHART :
bRet = 0 != (nOLEOptions & TOO_CHART);
break;
@@ -2535,6 +2529,9 @@ sal_Bool SwXIndexTokenAccess_Impl::hasElements(void) throw( RuntimeException )
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/19 00:08:28 hr
+ initial import
+
Revision 1.66 2000/09/18 16:04:32 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index f38431892f9f..c24b5c733a21 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -2,9 +2,9 @@
*
* $RCSfile: app.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nf $ $Date: 2000-09-27 21:04:35 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:11:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -173,7 +173,6 @@ String STR_PAGE_COUNT_MACRO
SID_BACKGROUND_COLOR ;\
SID_FRAME_LINESTYLE ;\
SID_FRAME_LINECOLOR ;\
- SID_SIM_START ;\
SID_ATTR_ZOOM ;\
SID_WIN_FULLSCREEN ;\
SID_FRAME_TO_TOP ;\
@@ -310,7 +309,6 @@ String STR_PAGE_COUNT_MACRO
FN_INSERT_FLD_TOPIC ;\
FN_INSERT_FLD_TITLE ;\
FN_INSERT_FLD_AUTHOR ;\
- FN_INSERT_SIM; \
FN_INSERT_SMA; \
FN_INSERT_FOOTNOTE; \
FN_INSERT_ENDNOTE; \
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 7afe4e36e40d..703ea66cf27f 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: edtwin.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:13:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -187,13 +187,6 @@
#ifndef _OFF_APP_HXX //autogen
#include <offmgr/app.hxx>
#endif
-#ifndef _SIMDLL0_HXX //autogen
-#include <sim2/simdll0.hxx>
-#endif
-#ifndef _SIMDLL_HXX //autogen
-#include <sim2/simdll.hxx>
-#endif
-
#ifndef _EDTWIN_HXX //autogen
#include <edtwin.hxx>
@@ -3365,7 +3358,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
EnableChildTransparentMode();
SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS );
- bLinkRemoved = bMBPressed = bInsDraw = bInsFrm = bGrfToOle =
+ bLinkRemoved = bMBPressed = bInsDraw = bInsFrm =
bIsInDrag = bOldIdle = bOldIdleSet = bChainMode = bWasShdwCrsr = FALSE;
SetMapMode(MapMode(MAP_TWIP));
@@ -3412,72 +3405,6 @@ SwEditWin::~SwEditWin()
}
-
-
-//Fuer MSC 2.0 W95
-#pragma optimize("",off)
-
-void SwEditWin::GrfToOle()
-{
- //Wir machen aus einer Grafik ein OLE-Object (StarImage)
- //Wird von MouseButtonDown bei Doppelklick gerufen.
-
- //Wer das nicht versteht ist selber schuld ;-)
- SvStorageRef aStor = new SvStorage( aEmptyStr );
- SvInPlaceObjectRef aIPObj;
-#ifdef SO3
- aIPObj = &((SvFactory *)SvInPlaceObject::ClassFactory())->CreateAndInit( *SIM_MOD()->pSimDrawDocShellFactory, aStor );
-#else
- aIPObj = &SvInPlaceObject::ClassFactory()->CreateAndInit( *SIM_MOD()->pSimDrawDocShellFactory, aStor );
-#endif
-
- if ( aIPObj.Is() )
- {
- SwWrtShell &rSh = GetView().GetWrtShell();
- SimDLL::Update( aIPObj, rSh.GetGraphic(), rSh.GetOut() );
-
- Size aSz;
- rSh.GetGrfSize( aSz );
- aSz = OutputDevice::LogicToLogic
- ( aSz, MapMode( MAP_TWIP), MapMode( aIPObj->GetMapUnit()));
- aIPObj->SetVisAreaSize( aSz );
-
- rSh.StartAllAction();
- rSh.GrfToOle( aIPObj );
- rSh.EndAllAction();
- bGrfToOle = TRUE;
- }
-}
-
-
-
-void SwEditWin::OleToGrf()
-{
- //Wenn wir ein Ole an der Hand haben und dies ein SIM-Object ist, so
- //wird daraus wieder eine Graphic.
-
- if ( bGrfToOle )
- {
- SwWrtShell &rSh = GetView().GetWrtShell();
- if ( rSh.IsOLEObj() )
- {
- SvInPlaceObjectRef aRef = rSh.GetOLEObj();
-
- //Wer das nicht versteht ist selber schuld ;-)
- if ( SimModuleDummy::HasID( *aRef->GetSvFactory() ) )
- {
- Graphic aGrf( SimDLL::GetGraphic( aRef ) );
- rSh.StartAllAction();
- rSh.OleToGrf( &aGrf );
- rSh.EndAllAction();
- }
- }
- bGrfToOle = FALSE;
- }
-}
-
-#pragma optimize("",on)
-
/******************************************************************************
* Beschreibung: DrawTextEditMode einschalten
******************************************************************************/
@@ -4031,6 +3958,9 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
/***********************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:35 hr
+ initial import
+
Revision 1.776 2000/09/18 16:05:23 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 5f631cdad10b..1b291351b2aa 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: edtwin.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:16:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -163,7 +163,6 @@ friend void PageNumNotify( ViewShell* pVwSh,
bMBPressed : 1,
bInsDraw : 1,
bInsFrm : 1,
- bGrfToOle : 1, //Grf to Sim, fuer den Rueckweg.
bIsInMove : 1,
bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren
bOldIdle : 1, //Zum abschalten des Idle'ns
@@ -234,10 +233,6 @@ protected:
public:
-
- void OleToGrf();
- void GrfToOle();
-
void UpdatePointer(const Point &, USHORT nButtons = 0);
BOOL IsDrawSelMode();
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index 44eb7efbe3cf..e17785803e44 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: shells.hrc,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:16:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,8 +64,6 @@
#include "rcid.hrc"
-#define MSG_REMOVE_LINK (RC_SHELLS_BEGIN + 1)
-
#define STR_GRFILTER_OPENERROR (RC_SHELLS_BEGIN + 1)
#define STR_GRFILTER_IOERROR (RC_SHELLS_BEGIN + 2)
#define STR_GRFILTER_FORMATERROR (RC_SHELLS_BEGIN + 3)
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 38694520c2f3..1010868b600f 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: view.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:43 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:18:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -401,7 +401,6 @@ public:
SfxDispatcher &GetDispatcher();
virtual SdrView* GetDrawView() const;
- virtual void UIDeactivate( SvInPlaceObject *pIPObj );
virtual BOOL HasUIFeature( ULONG nFeature );
virtual void ShowCursor( FASTBOOL bOn = TRUE );
virtual ErrCode DoVerb( long nVerb );
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f5d3074e5434..57a637e10fcb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cnttab.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:43 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:23:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -983,7 +983,6 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
sal_uInt16 nOLEOptions = rDesc.GetOLEOptions();
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_MATH, 0 != (TOO_MATH &nOLEOptions ));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CHART, 0 != (TOO_CHART &nOLEOptions ));
- lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_IMAGE, 0 != (TOO_IMAGE &nOLEOptions ));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CALC, 0 != (TOO_CALC &nOLEOptions ));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_DRAW, 0 != (TOO_DRAW_IMPRESS&nOLEOptions));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS, 0 != (TOO_OTHER|nOLEOptions ));
@@ -4779,6 +4778,9 @@ IMPL_LINK(SwAutoMarkDlg_Impl, OkHdl, OKButton*, pButton)
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:43 hr
+ initial import
+
Revision 1.162 2000/09/18 16:05:51 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 7eea836eaa11..53ddb996da49 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -2,9 +2,9 @@
*
* $RCSfile: cnttab.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nf $ $Date: 2000-09-27 21:28:10 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:23:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1795,7 +1795,6 @@ TabPage TP_TOX_SELECT
{
< "StarMath" ; 1;> ;
< "StarChart" ; 2;> ;
- < "StarImage" ; 4;> ;
< "StarCalc" ; 8;> ;
< "StarDraw/StarImpress" ; 16;> ;
< "Andere OLE-Objekte"; 128;> ;
@@ -1804,7 +1803,6 @@ TabPage TP_TOX_SELECT
{
< "StarMath" ; 1; > ;
< "StarChart" ; 2;> ;
- < "StarImage" ; 4;> ;
< "StarCalc" ; 8;> ;
< "StarDraw/StarImpress" ; 16;> ;
< "Other OLE objects" ; 128;> ;
@@ -1813,7 +1811,6 @@ TabPage TP_TOX_SELECT
{
< " " ; 1;> ;
< " " ; 2;> ;
- < " " ; 4;> ;
< " " ; 8;> ;
< " " ; 16;> ;
< " "; 128;> ;
@@ -1822,7 +1819,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Other OLE objects"; 128;> ;
@@ -1831,7 +1827,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Outros obejctos OLE"; 128;> ;
@@ -1840,7 +1835,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< " OLE"; 128;> ;
@@ -1849,7 +1843,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< " OLE"; 128;> ;
@@ -1858,7 +1851,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Andere OLE-objecten"; 128;> ;
@@ -1867,7 +1859,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Autres objets OLE"; 128;> ;
@@ -1876,7 +1867,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Otros objetos OLE"; 128;> ;
@@ -1885,7 +1875,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Altri oggetti OLE"; 128;> ;
@@ -1894,7 +1883,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Andre OLE-objekter"; 128;> ;
@@ -1903,7 +1891,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Andra OLE-objekt"; 128;> ;
@@ -1912,7 +1899,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Inne obiekty OLE"; 128;> ;
@@ -1921,7 +1907,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Andere OLE-Objekte"; 128;> ;
@@ -1930,7 +1915,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "ق OLE ޼ު"; 128;> ;
@@ -1939,7 +1923,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Ÿ OLE ü"; 128;> ;
@@ -1948,7 +1931,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< " OLE "; 128;> ;
@@ -1957,7 +1939,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "L OLE "; 128;> ;
@@ -1966,7 +1947,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< " OLE "; 128;> ;
@@ -1975,7 +1955,6 @@ TabPage TP_TOX_SELECT
{
< "StarOffice Math" ; 1;> ;
< "StarOffice Chart" ; 2;> ;
- < "StarOffice Image" ; 4;> ;
< "StarOffice Calc" ; 8;> ;
< "StarOffice Draw/StarOffice Impress" ; 16;> ;
< "Dier OLE nesneleri"; 128;> ;
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 90387c368ae6..1a0f6583ba85 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -2,9 +2,9 @@
*
* $RCSfile: workctrl.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nf $ $Date: 2000-09-27 21:31:26 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:25:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -192,11 +192,6 @@ FloatingWindow RID_INSERT_OBJ_CTRL
};
ToolBoxItem
{
- Identifier = FN_INSERT_SIM ;
- HelpID = FN_INSERT_SIM ;
- };
- ToolBoxItem
- {
Identifier = FN_INSERT_SMA ;
HelpID = FN_INSERT_SMA ;
};
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 2ff5b54589f0..75b9a9c93dd9 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -2,9 +2,9 @@
*
* $RCSfile: shells.src,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nf $ $Date: 2000-09-27 21:32:27 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:27:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,36 +63,6 @@
#include <svx/globlmn.hrc>
#include "toolbox.hrc"
#include "helpid.h"
-InfoBox MSG_REMOVE_LINK
-{
- Buttons = WB_YES_NO ;
- Defbutton = WB_DEF_YES ;
- Message = "Diese Grafik ist mit dem Dokument verknpft. Mchten Sie die Verknpfung aufheben, um die Grafik zu bearbeiten?" ;
- Message [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
- Message [ norwegian ] = "Dette er +++linked grafikk. nsker du +++unlink the graphic for redigere?" ;
- Message [ italian ] = "Questra immagine collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ;
- Message [ portuguese_brazilian ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
- Message [ portuguese ] = "Esta imagem est ligada a um documento. Deseja cancelar a ligao para poder edit-la?" ;
- Message [ english_us ] = "This graphic is linked to a document. Do you want to unlink the graphic in order to edit it?" ;
- Message [ finnish ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ;
- Message [ danish ] = "Denne grafik er kdet til dokumentet. Vil du ophve kden for at kunne redigere grafikken." ;
- Message [ french ] = "Cette image est lie un document. Dsirez-vous supprimer le lien pour l'dition ?" ;
- Message [ swedish ] = "Den hr grafiken r lnkad till dokumentet. Vill Du upphva lnken fr att kunna redigera grafiken?" ;
- Message [ dutch ] = "Deze afbeelding is met het document gekoppeld. Wilt u de koppeling opheffen om de afbeelding te bewerken?" ;
- Message [ spanish ] = "Esta imagen est vinculada al documento. Desea deshacer el vnculo para editar la imagen?" ;
- Message[ chinese_simplified ] = "ͼǺһĵӵġҪȡӣ༭ͼ";
- Message[ russian ] = " . ?";
- Message[ polish ] = "Ta grafika jest poczona z dokumentem. Czy chcesz usun to poczenie, aby mc edytowa grafik?";
- Message[ japanese ] = "̐}ͤ޷ĂݸĂ܂B}ҏW邽߂ݸ܂H";
- Message[ chinese_traditional ] = "oӹϤOM@ɮ׬۳sCznoӱ|AsoӹϤH";
- Message[ arabic ] = " . ɿ";
- Message[ dutch ] = "Deze afbeelding is met het document gekoppeld. Wilt u de koppeling opheffen om de afbeelding te bewerken?";
- Message[ chinese_simplified ] = "ͼǺһĵӵġҪȡӣ༭ͼ";
- Message[ greek ] = " . ;";
- Message[ korean ] = " ׷ Ǿ ֽϴ. ׷ Ͻðڽϱ?";
- Message[ turkish ] = "Bu grafik belgeye bal. Grafigi dzenlemek iin bu balanty kaldrmak istiyor musunuz?";
- Message[ language_user1 ] = " ";
-};
InfoBox MSG_NO_RULER
{
BUTTONS = WB_OK ;
@@ -1163,10 +1133,6 @@ ToolBox RID_GRAFIK_TOOLBOX
HelpID = FN_FLIP_HORZ_GRAFIC ;
};
ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- ITEM_TOOLBAR_SIM_START
- };
MN_ATTRIBUTES_GRAFIK
};
Scroll = TRUE ;
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 1e06a1478da7..7b5162e7e86e 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: textsh.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ * last change: $Author: jp $ $Date: 2000-10-05 12:27:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -167,9 +167,6 @@
#ifndef _SCH_MEMCHRT_HXX
#include <sch/memchrt.hxx>
#endif
-#ifndef _SIMDLL_HXX
-#include <sim2/simdll0.hxx>
-#endif
#ifndef _SVX_HTMLMODE_HXX
#include <svx/htmlmode.hxx>
#endif
@@ -449,12 +446,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
break;
- case FN_INSERT_SIM:
- {
- rSh.Insert( 0, SIM_MOD()->pSimDrawDocShellFactory );
- }
- break;
-
case FN_INSERT_SMA:
{
rSh.Insert( 0, SM_MOD()->pSmDocShellFactory );
@@ -719,14 +710,6 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
break;
}
- case FN_INSERT_SIM:
- if( FN_INSERT_SIM == nWhich &&
- !SFX_APP()->HasFeature( SFX_FEATURE_SIMAGE ) )
- {
- rSet.DisableItem( nWhich );
- break;
- }
-
case FN_INSERT_SMA:
if( FN_INSERT_SMA == nWhich &&
!SFX_APP()->HasFeature( SFX_FEATURE_SMATH ) )
@@ -999,6 +982,9 @@ void SwTextShell::InsertSymbol(const String& rChars, const String& rFontName)
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:47 hr
+ initial import
+
Revision 1.356 2000/09/18 16:06:06 willem.vandorp
OpenOffice header added.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 08:29:32 +0000