[Libreoffice-commits] .: binfilter/bf_so3 binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Jan 18 08:16:05 PST 2011
binfilter/bf_so3/source/inplace/ipobj.cxx | 28 ------------------
binfilter/bf_so3/source/inplace/protocol.cxx | 41 ---------------------------
binfilter/bf_so3/source/misc/factory.cxx | 2 -
binfilter/inc/bf_so3/ipobj.hxx | 8 ++---
binfilter/inc/bf_so3/so2dll.hxx | 2 -
5 files changed, 5 insertions(+), 76 deletions(-)
New commits:
commit 85a7c1e775ad15050c53782314c381ffcd9279ec
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Jan 18 08:00:46 2011 -0800
Remove DECLARE_LIST(SvInPlaceObjectList,SvInPlaceObject*)
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 24fc431..f34309c 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -126,19 +126,6 @@ void SvInPlaceObject::SetIPEnv( SvInPlaceEnvironment * pFrm )
pIPEnv = pFrm;
}
-/************************************************************************
-|* SvInPlaceObject::GetIPActiveObjectList()
-|*
-|* Beschreibung
-*************************************************************************/
-SvInPlaceObjectList & SvInPlaceObject::GetIPActiveObjectList()
-{
- SoDll * pSoApp = SOAPP;
- if( !pSoApp->pIPActiveObjectList )
- pSoApp->pIPActiveObjectList = new SvInPlaceObjectList();
- return *pSoApp->pIPActiveObjectList;
-}
-
/*************************************************************************
|* SvInPlaceObject::Verb()
|*
@@ -157,16 +144,6 @@ ErrCode SvInPlaceObject::Verb
return SvEmbeddedObject::Verb( nVerb, pCl, pWin, pWorkRectPixel );
ErrCode nRet = ERRCODE_NONE;
- /*
- BOOL bGroesseNachTreten = TRUE;
- switch ( nVerb )
- {
- case SVVERB_OPEN:
- case SVVERB_HIDE:
- bGroesseNachTreten = FALSE;
- break;
- }
- */
if( Owner() )
{
@@ -198,11 +175,6 @@ ErrCode SvInPlaceObject::Verb
{
nRet = SvEmbeddedObject::Verb( nVerb, pCl, pWin, pWorkRectPixel );
}
- /*
- if( bRet && bGroesseNachTreten && pWorkRectPixel
- && GetProtocol().IsInPlaceActive() )
- pICl->GetEnv()->RequestObjAreaPixel( *pWorkRectPixel );
- */
return nRet;
}
diff --git a/binfilter/bf_so3/source/inplace/protocol.cxx b/binfilter/bf_so3/source/inplace/protocol.cxx
index 86a309d..17b9092 100644
--- a/binfilter/bf_so3/source/inplace/protocol.cxx
+++ b/binfilter/bf_so3/source/inplace/protocol.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -242,15 +242,6 @@ void SvEditObjectProtocol::Imp_DeleteDefault()
*************************************************************************/
SvEditObjectProtocol::SvEditObjectProtocol()
{
-/*
- if( !SOAPP->pIEOPDflt )
- {
- SOAPP->pIEOPDflt = new ImplSvEditObjectProtocol();
- SOAPP->pIEOPDflt->nRefCount = 1; // nie freigeben
- }
- pImp = SOAPP->pIEOPDflt;
- pImp->nRefCount++;
-*/
pImp = new ImplSvEditObjectProtocol();
pImp->nRefCount = 1;
}
@@ -461,7 +452,6 @@ ErrCode ImplSvEditObjectProtocol::PlugInProtocol()
return EmbedProtocol();
}
- //MakeVisible();
// IPProtocol ist TRUE, wenn eines der drei Protokolle
// gefahren werden konnte
if( !bIPActive && !bEmbed && !bPlugIn && !ERRCODE_TOERROR( nRet ) )
@@ -508,10 +498,6 @@ ErrCode ImplSvEditObjectProtocol::IPProtocol()
// auf PlugIn Protokoll umsteigen
nRet = PlugInProtocol();
}
- /*
- else
- MakeVisible();
- */
CLASS_INVARIANT
@@ -904,9 +890,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
if( bEmbedP )
Opened( bEmbedP );
-/* else gibt nicht ueber embed
- Reset2Embed();
-*/
if( bLastActionEmbed != bEmbedP )
return; // irgend einer hat rekursiv das Protokoll geaendert
@@ -982,9 +965,6 @@ void ImplSvEditObjectProtocol::PlugIn
if( bPlugInP )
Opened( bPlugInP );
-/* else gibt nicht ueber PlugIn
- Reset2PlugIn();
-*/
if( bLastActionPlugIn != bPlugInP )
return; // irgend einer hat rekursiv das Protokoll geaendert
@@ -1087,13 +1067,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
DBG_ASSERT( aIPObj.Is(), "inplace assert failed" );
bSvrIPActive = bIPActive;
DBG_PROTLOG( "Svr - InPlaceActivate", bIPActiveP )
- if( aIPObj->Owner() )
- {
- if( bIPActive )
- SvInPlaceObject::GetIPActiveObjectList().Insert( aIPObj, LIST_APPEND );
- else
- SvInPlaceObject::GetIPActiveObjectList().Remove( aIPObj );
- }
if( bIPActive )
{
aIPObj->InPlaceActivate( bIPActive );
@@ -1151,10 +1124,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
bLastActionUIActive = bUIActiveP;
if( bUIActiveP )
InPlaceActivate( bUIActiveP );
-/* gibt nichts ueber UIActive
- else
- Reset2UIActive();
-*/
DBG_PROTLOG( "UIActivate", bUIActiveP )
DBG_ASSERT( !bEmbed && !bPlugIn, "ui assert failed" );
bUIActive = bUIActiveP; // vor der Aktion den Status setzen
@@ -1241,14 +1210,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
aIPClient->UIActivate( FALSE );
}
- /*
- if( bUIActive )
- {
- if( aIPClient->Owner() )
- // Object anordnen anstossen
- aIPObj->GetIPEnv()->DoRectsChanged();
- }
- */
CLASS_INVARIANT
}
diff --git a/binfilter/bf_so3/source/misc/factory.cxx b/binfilter/bf_so3/source/misc/factory.cxx
index 21d588c..f331e21 100644
--- a/binfilter/bf_so3/source/misc/factory.cxx
+++ b/binfilter/bf_so3/source/misc/factory.cxx
@@ -110,7 +110,6 @@ SoDll::SoDll()
, pSoBindingFactory( NULL )
, pContEnvList( NULL )
, pIPActiveClientList( NULL )
- , pIPActiveObjectList( NULL )
, pUIShowIPEnv( NULL )
, pIEOPDflt( NULL )
, aSvInterface( 0xB34BB240L, 0x4BD8, 0x101C, 0x8D, 0x86,
@@ -131,7 +130,6 @@ SoDll::~SoDll()
{
delete pResMgr;
delete pIPActiveClientList;
- delete pIPActiveObjectList;
delete pContEnvList;
SvEditObjectProtocol::Imp_DeleteDefault();
delete pDeathTimer;
diff --git a/binfilter/inc/bf_so3/ipobj.hxx b/binfilter/inc/bf_so3/ipobj.hxx
index e9d67a8..f352d81 100644
--- a/binfilter/inc/bf_so3/ipobj.hxx
+++ b/binfilter/inc/bf_so3/ipobj.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -42,6 +42,7 @@ class KeyEvent;
class Palette;
namespace binfilter {
+
class SvContainerEnvironment;
class ImpInPlaceObject;
class ImpInPlaceSite;
@@ -49,11 +50,12 @@ class ImpOleInPlaceActiveObject;
struct IOleInPlaceObject;
struct IOleInPlaceActiveObject;
class SvInPlaceEnvironment;
-class SvInPlaceObjectList;
class SvInPlaceClipWindow;
class SvInPlaceWindow;
+
/*************************************************************************
*************************************************************************/
+
class SvInPlaceObject;
#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
#define SO2_DECL_SVINPLACEOBJECT_DEFINED
@@ -106,7 +108,6 @@ public:
SvInPlaceEnvironment* GetIPEnv() const { return pIPEnv; }
SvInPlaceClient * GetIPClient() const
{ return aProt.GetIPClient(); }
- static SvInPlaceObjectList & GetIPActiveObjectList();
// Robuste Protokollsteuerung
ErrCode DoInPlaceActivate( BOOL bActivate );
@@ -117,7 +118,6 @@ public:
virtual BOOL ReactivateAndUndo();
};
-DECLARE_LIST(SvInPlaceObjectList,SvInPlaceObject*)
SO2_IMPL_REF(SvInPlaceObject)
//=========================================================================
diff --git a/binfilter/inc/bf_so3/so2dll.hxx b/binfilter/inc/bf_so3/so2dll.hxx
index eee94ec..b1b5a98 100644
--- a/binfilter/inc/bf_so3/so2dll.hxx
+++ b/binfilter/inc/bf_so3/so2dll.hxx
@@ -54,7 +54,6 @@ namespace binfilter
{
class SvInPlaceClient;
class SvInPlaceClientList;
-class SvInPlaceObjectList;
class ImplSvEditObjectProtocol;
class SvInPlaceEnvironment;
class SvVerbList;
@@ -128,7 +127,6 @@ public:
// InPlace-Bearbeitung
SvInPlaceClientList * pIPActiveClientList;
- SvInPlaceObjectList * pIPActiveObjectList;
SvInPlaceEnvironment * pUIShowIPEnv;
ImplSvEditObjectProtocol * pIEOPDflt;
More information about the Libreoffice-commits
mailing list