summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/core/data/documen5.cxx12
-rw-r--r--sc/source/core/tool/ddelink.cxx10
-rw-r--r--sc/source/ui/app/makefile.mk7
-rw-r--r--sc/source/ui/docshell/arealink.cxx8
-rw-r--r--sc/source/ui/docshell/docsh.cxx22
-rw-r--r--sc/source/ui/docshell/docsh4.cxx49
-rw-r--r--sc/source/ui/docshell/docsh6.cxx12
-rw-r--r--sc/source/ui/inc/docsh.hxx7
-rw-r--r--sc/source/ui/inc/viewfunc.hxx8
-rw-r--r--sc/source/ui/view/cellsh1.cxx9
-rw-r--r--sc/source/ui/view/tabvwshb.cxx11
11 files changed, 42 insertions, 113 deletions
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 5c9c0d984ace..4ababa9658ee 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: documen5.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: er $ $Date: 2001-05-18 12:11:39 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:59:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -254,8 +254,8 @@ void ScDocument::UpdateChartArea( const String& rChartName,
delete pMemChart;
// Dies veranlaesst Chart zum sofortigen Update
- SvData aEmpty;
- aIPObj->SendDataChanged( aEmpty );
+ //SvData aEmpty;
+ //aIPObj->SendDataChanged( aEmpty );
aIPObj->SendViewChanged();
pObject->SendRepaintBroadcast();
@@ -312,8 +312,8 @@ void ScDocument::UpdateChart( const String& rChartName, Window* pWindow )
delete pMemChart;
// Dies veranlaesst Chart zum sofortigen Update
- SvData aEmpty;
- aIPObj->SendDataChanged( aEmpty );
+ //SvData aEmpty;
+ //aIPObj->SendDataChanged( aEmpty );
aIPObj->SendViewChanged();
pObject->SendRepaintBroadcast();
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 2c80348936c4..136527835684 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ddelink.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: nn $ $Date: 2001-04-10 18:52:48 $
+ * last change: $Author: nn $ $Date: 2001-06-22 20:01:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,7 +98,7 @@ BOOL ScDdeLink::bIsInUpdate = FALSE;
ScDdeLink::ScDdeLink( ScDocument* pD, const String& rA, const String& rT, const String& rI,
BYTE nM ) :
- ::so3::SvBaseLink(LINKUPDATE_ALWAYS,FORMAT_STRING),
+ ::so3::SvBaseLink(so3::LINKUPDATE_ALWAYS,FORMAT_STRING),
pDoc( pD ),
aAppl( rA ),
aTopic( rT ),
@@ -117,7 +117,7 @@ __EXPORT ScDdeLink::~ScDdeLink()
}
ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) :
- ::so3::SvBaseLink(LINKUPDATE_ALWAYS,FORMAT_STRING),
+ ::so3::SvBaseLink(so3::LINKUPDATE_ALWAYS,FORMAT_STRING),
pDoc ( pD ),
aAppl ( rOther.aAppl ),
aTopic ( rOther.aTopic ),
@@ -131,7 +131,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) :
}
ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr ) :
- ::so3::SvBaseLink(LINKUPDATE_ALWAYS,FORMAT_STRING),
+ ::so3::SvBaseLink(so3::LINKUPDATE_ALWAYS,FORMAT_STRING),
pDoc( pD ),
pResult( NULL ),
bNeedUpdate( FALSE )
diff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mk
index a4e453ec2dca..d8382d4325dc 100644
--- a/sc/source/ui/app/makefile.mk
+++ b/sc/source/ui/app/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: nn $ $Date: 2001-04-03 17:41:34 $
+# last change: $Author: nn $ $Date: 2001-06-22 20:03:09 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -89,9 +89,6 @@ SLOFILES = \
$(SLO)$/scmod2.obj \
$(SLO)$/scdll.obj \
$(SLO)$/typemap.obj \
- $(SLO)$/dataobj.obj \
- $(SLO)$/dataobj2.obj \
- $(SLO)$/dataobj3.obj \
$(SLO)$/transobj.obj \
$(SLO)$/drwtrans.obj \
$(SLO)$/lnktrans.obj \
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 4ec8885cf538..0d6aaf3ae3e6 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: arealink.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: nn $ $Date: 2001-05-10 14:11:39 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:55:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,7 +99,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
const String& rFilter, const String& rOpt,
const String& rArea, const ScRange& rDest,
ULONG nRefresh ) :
- ::so3::SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE),
+ ::so3::SvBaseLink(so3::LINKUPDATE_ONCALL,FORMAT_FILE),
ScRefreshTimer ( nRefresh ),
pDocShell ((ScDocShell*)pShell),
aFileName (rFile),
@@ -168,7 +168,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
// adjust in dialog:
String aLinkName;
- MakeLnkName( aLinkName, NULL, aFile, aArea, &aFilter );
+ so3::MakeLnkName( aLinkName, NULL, aFile, aArea, &aFilter );
SetName( aLinkName );
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 9a06c6536aeb..6ecf87a964ea 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: dr $ $Date: 2001-06-08 14:54:15 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:55:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -238,24 +238,6 @@ void __EXPORT ScDocShell::FillClass( SvGlobalName* pClassName,
//------------------------------------------------------------------
-void __EXPORT ScDocShell::FillRegInfo( SvEmbeddedRegistryInfo* pInfo )
-{
- SfxInPlaceObject::FillRegInfo( pInfo );
-
- pInfo->aObjName = String::CreateFromAscii(pStarCalcDoc);
- pInfo->nMajorVers = 6;
- pInfo->nMinorVers = 0;
- pInfo->aHumanShortTypeName = String( ScResId( SCSTR_HUMAN_SCDOC_NAME ) );
-
- //! nIconResId nur, wenn Desktop?
-
- pInfo->nIconResId = REG_ICON_RESID_CALC;
-
- // nShell und aExt sind schon gefuellt
-}
-
-//------------------------------------------------------------------
-
void ScDocShell::DoEnterHandler()
{
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6772b8a8b8af..26ce0001af2c 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh4.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: nn $ $Date: 2001-05-29 19:36:04 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:55:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,7 +119,6 @@
#include "printfun.hxx" // DrawToDev
#include "viewdata.hxx"
#include "tabvwsh.hxx"
-#include "dataobj.hxx"
#include "impex.hxx"
#include "attrib.hxx"
#include "corodlg.hxx"
@@ -2002,50 +2001,6 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
return SfxInPlaceObject::GetVisArea( nAspect );
}
-SvDataMemberObjectRef __EXPORT ScDocShell::CreateSnapshot()
-{
- ScDocShell* pNewSh = new ScDocShell;
- SvEmbeddedObjectRef aDocShellRef = pNewSh;
- pNewSh->DoInitNew(NULL);
- pNewSh->ResetEmpty();
- ScDocument* pDestDoc = pNewSh->GetDocument();
- pDestDoc->RenameTab( 0,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("______42_____")),
- FALSE );
-
- // Kopieren (wie in ScDataObject::GetCalcData):
- // - Tabellen
- // - Seitenvorlage
-
- if (aDocument.GetDrawLayer())
- pNewSh->MakeDrawLayer();
-
- ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
- ScStyleSheetPool* pDestPool = pDestDoc->GetStyleSheetPool();
-
- USHORT nCount = aDocument.GetTableCount();
- for (USHORT nTab=0; nTab<nCount; nTab++)
- {
- pDestDoc->MakeTable( nTab );
- pDestDoc->TransferTab( &aDocument, nTab, nTab ); // nicht einfuegen
- String aStyleName = aDocument.GetPageStyle( nTab );
- // CopyStyleFrom kopiert SetItems mit richtigem Pool
- pDestPool->CopyStyleFrom( pStylePool, aStyleName, SFX_STYLE_FAMILY_PAGE );
- }
-
- pDestDoc->DeleteTab( nCount ); // vorher kann die einzige Tab nicht geloescht werden
-
- aDocument.CopyDdeLinks( pDestDoc ); // Werte von DDE-Links kopieren
-
- pDestDoc->SetViewOptions( aDocument.GetViewOptions() );
-
- pDestDoc->SetVisibleTab( aDocument.GetVisibleTab() );
- // hier muss auch der Start angepasst werden
- pNewSh->SetVisAreaOrSize( SfxInPlaceObject::GetVisArea(), TRUE );
-
- return new ScDataObject( pNewSh );
-}
-
void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
USHORT nCurTab,
BOOL& rbHeader,
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 0accbfe6edd6..3ff6a8abf662 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh6.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: er $ $Date: 2001-04-18 12:30:51 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:55:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -271,8 +271,8 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
if (pViewSh->GetViewData()->GetDocShell() == this)
pViewSh->UpdateOleZoom();
}
- else
- DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv
+ //else
+ // DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv
}
if (aDocument.IsEmbedded())
@@ -333,8 +333,8 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
bChange = TRUE;
}
- if (bChange)
- DataChanged( SvDataType() ); //! passiert auch bei SetModified
+// if (bChange)
+// DataChanged( SvDataType() ); //! passiert auch bei SetModified
}
//
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 14320929d1cd..8c10aa1011cf 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh.hxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: nn $ $Date: 2001-05-14 10:05:38 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:51:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -193,7 +193,6 @@ public:
virtual SfxUndoManager* GetUndoManager();
- virtual void FillRegInfo( SvEmbeddedRegistryInfo* pInfo );
virtual void FillClass( SvGlobalName * pClassName,
ULONG * pFormat,
String * pAppName,
@@ -232,8 +231,6 @@ public:
void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart );
- virtual SvDataMemberObjectRef CreateSnapshot();
-
virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent,
const SfxItemSet &rSet );
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 3b131d2bf443..22bf503b1a5c 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfunc.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: dr $ $Date: 2001-04-05 10:49:47 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:51:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -153,10 +153,6 @@ public:
void PasteFromSystem();
BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE );
- BOOL DropFiles( const DropEvent& );
- BOOL DropFile( const DropEvent&, const String& );
- BOOL OpenFile( const String& );
-
void PasteDraw();
void PasteDraw( const Point& rLogicPos, SdrModel* pModel,
BOOL bGroup = FALSE );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c2a6c98d0982..3aa6199f19a9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cellsh1.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: nn $ $Date: 2001-05-11 18:29:47 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:57:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,6 @@
#include <vcl/msgbox.hxx>
#include <so3/pastedlg.hxx>
#include <sot/formats.hxx>
-#include <vcl/clip.hxx>
#include <svx/postattr.hxx>
#include <svx/fontitem.hxx>
#include <svx/charmap.hxx>
@@ -1307,7 +1306,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
break;
- // Clipboard-Abfrage-Slots wie im Writer (da auch an der Selection)
+#if 0
+ // clipboard slots were used only for old basic:
case SID_GET_CLPBRD_FORMAT_COUNT:
rReq.SetReturnValue( SfxUInt16Item( nSlot, Clipboard::GetFormatCount() ) );
@@ -1341,6 +1341,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
break;
+#endif
//
// sonstiges
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 8c74b5212221..ef8467e26c49 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabvwshb.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: jp $ $Date: 2001-03-08 20:53:32 $
+ * last change: $Author: nn $ $Date: 2001-06-22 19:57:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -161,9 +161,10 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
ErrCode nErr = ERRCODE_NONE;
BOOL bErrorShown = FALSE;
- if ( xIPObj->IsLink() )
- nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc.
- else
+ // linked objects aren't supported
+// if ( xIPObj->IsLink() )
+// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc.
+// else
{
SfxInPlaceClientRef xClient = FindIPClient( xIPObj, pWin );
if ( !xClient.Is() )
generated by cgit (git 2.34.1) at 2024-08-03 11:41:26 +0000