[Libreoffice-commits] .: sc/inc sc/source
J Graeme Lingard
jgraeme at kemper.freedesktop.org
Thu Nov 11 12:38:34 PST 2010
sc/inc/drwlayer.hxx | 3 ---
sc/inc/tablink.hxx | 4 ----
sc/source/core/data/documen5.cxx | 5 -----
sc/source/core/data/drwlayer.cxx | 19 -------------------
sc/source/ui/app/scdll.cxx | 2 --
sc/source/ui/docshell/arealink.cxx | 1 -
sc/source/ui/inc/drwtrans.hxx | 3 ---
sc/source/ui/inc/linkarea.hxx | 5 -----
sc/source/ui/inc/tabview.hxx | 5 -----
sc/source/ui/inc/transobj.hxx | 2 --
10 files changed, 49 deletions(-)
New commits:
commit 3f154dc067227f055e4eac2c5c5843ce84797c4e
Author: J. Graeme Lingard <jgraeme+git at gmail.com>
Date: Thu Nov 11 20:33:40 2010 +0000
Remove commented out code - //REMOVE
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index c6025ff..3429f10 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -99,7 +99,6 @@ public:
class SC_DLLPUBLIC ScDrawLayer : public FmFormModel
{
private:
-//REMOVE SotStorageRef xPictureStorage;
String aName;
ScDocument* pDoc;
SdrUndoGroup* pUndoGroup;
@@ -128,8 +127,6 @@ public:
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
-//REMOVE void ReleasePictureStorage();
-
BOOL HasObjects() const;
BOOL ScAddPage( SCTAB nTab );
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 0b6ab11..84992af 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -34,10 +34,6 @@
#include <sfx2/lnkbase.hxx>
#include <sfx2/objsh.hxx>
-//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE SO2_DECL_REF(SvEmbeddedObject)
-//REMOVE #endif
class ScDocShell;
struct TableLink_Impl;
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index a25d660..8a2ea15 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -49,11 +49,6 @@
#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
-//REMOVE #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-//REMOVE #define SO2_DECL_SVINPLACEOBJECT_DEFINED
-//REMOVE SO2_DECL_REF(SvInPlaceObject)
-//REMOVE #endif
-
#include "document.hxx"
#include "drwlayer.hxx"
#include "chartarr.hxx"
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 7ad749b..14f6719 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -107,7 +107,6 @@ static E3dObjFactory* pF3d = NULL;
static USHORT nInst = 0;
SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
-//REMOVE SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL;
BOOL bDrawIsInUndo = FALSE; //! Member
@@ -2042,30 +2041,12 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
}
}
}
- // the following code seems to be related to binary format
-//REMOVE else
-//REMOVE {
-//REMOVE pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)),
-//REMOVE STREAM_READ | STREAM_WRITE | STREAM_TRUNC );
-//REMOVE
-//REMOVE if( pRet )
-//REMOVE {
-//REMOVE pRet->SetVersion( pStor->GetVersion() );
-//REMOVE pRet->SetKey( pStor->GetKey() );
-//REMOVE }
-//REMOVE }
-
rStreamInfo.mbDeleteAfterUse = ( pRet != NULL );
}
return pRet;
}
-//REMOVE void ScDrawLayer::ReleasePictureStorage()
-//REMOVE {
-//REMOVE xPictureStorage.Clear();
-//REMOVE }
-
SdrLayerID __EXPORT ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const
{
// Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index ca15f48..46d8a17 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -152,8 +152,6 @@ void ScDLL::Init()
ScModule* pMod = new ScModule( &ScDocShell::Factory() );
(*ppShlPtr) = pMod;
-//REMOVE ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO );
-
ScDocShell::Factory().SetDocumentServiceName( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
ScGlobal::Init(); // erst wenn der ResManager initialisiert ist
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 3e38045..8cbde13 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -271,7 +271,6 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter);
ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
-//REMOVE SvEmbeddedObjectRef aRef = pSrcShell;
SfxObjectShellRef aRef = pSrcShell;
pSrcShell->DoLoad(pMed);
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 4e9088c..541b537 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -51,8 +51,6 @@ private:
SdrModel* pModel;
TransferableDataHelper aOleData;
TransferableObjectDescriptor aObjDesc;
-//REMOVE SvEmbeddedObjectRef aDocShellRef;
-//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
SfxObjectShellRef aDocShellRef;
SfxObjectShellRef aDrawPersistRef;
@@ -72,7 +70,6 @@ private:
void InitDocShell();
-//REMOVE SvInPlaceObjectRef GetSingleObject();
SdrOle2Obj* GetSingleObject();
public:
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 4c28737..42d53b0 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -39,11 +39,6 @@
#include <svtools/stdctrl.hxx>
#include <svtools/inettbc.hxx>
-//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE SO2_DECL_REF(SvEmbeddedObject)
-//REMOVE #endif
-
namespace sfx2 { class DocumentInserter; }
namespace sfx2 { class FileDialogHelper; }
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 7cde207..e6bcc0e 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -30,11 +30,6 @@
#include <vcl/scrbar.hxx>
-//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE SO2_DECL_REF(SvInPlaceClient)
-//REMOVE #endif
-
#include <sfx2/ipclient.hxx>
#include "viewutil.hxx"
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 4e0f9c9..61244b5 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -53,8 +53,6 @@ private:
SCROW nNonFiltered; // non-filtered rows
TransferableDataHelper aOleData;
TransferableObjectDescriptor aObjDesc;
-//REMOVE SvEmbeddedObjectRef aDocShellRef;
-//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
SfxObjectShellRef aDocShellRef;
SfxObjectShellRef aDrawPersistRef;
com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges;
More information about the Libreoffice-commits
mailing list