[Libreoffice-commits] .: binfilter/bf_so3 binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Jan 17 22:21:51 PST 2011
binfilter/bf_so3/source/inplace/applet2.cxx | 62 +++++---------
binfilter/bf_so3/source/inplace/ipclient.cxx | 17 ---
binfilter/bf_so3/source/inplace/ipenv.cxx | 117 ---------------------------
binfilter/bf_so3/source/inplace/ipobj.cxx | 27 ------
binfilter/bf_so3/source/inplace/plugin.cxx | 3
binfilter/inc/bf_so3/ipenv.hxx | 8 -
6 files changed, 29 insertions(+), 205 deletions(-)
New commits:
commit 75b14fdee7e634933763b0b4be7c8d315efd8a3a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Jan 17 22:09:52 2011 -0800
Remove dead code
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index 6adcb9b..401bffb 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.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
@@ -29,8 +29,6 @@
#include <ctype.h>
#include <stdio.h>
-//#define REMOTE_VERSION
-
#include "bf_so3/applet.hxx"
#include <tools/list.hxx>
#include <tools/urlobj.hxx>
@@ -194,7 +192,6 @@ SvAppletEnvironment::~SvAppletEnvironment()
SetEditWin( NULL );
delete pAppletWin;
DeleteWindows();
- DeleteObjMenu();
}
//=========================================================================
@@ -433,13 +430,13 @@ static sal_Bool isAppletEnabled()
Reference<XInterface> xConfRegistry = ::comphelper::getProcessServiceFactory()->createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationRegistry")));
if(!xConfRegistry.is()) throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), Reference<XInterface>());
-
+
Reference<XSimpleRegistry> xConfRegistry_simple(xConfRegistry, UNO_QUERY);
if(!xConfRegistry_simple.is()) throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.cxx: couldn't get ConfigurationRegistry")), Reference<XInterface>());
-
+
xConfRegistry_simple->open(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")), sal_True, sal_False);
Reference<XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey();
-
+
if (xRegistryRootKey.is())
{
Reference<XRegistryKey> key_Enable = xRegistryRootKey->openKey(OUString(
@@ -485,38 +482,30 @@ ErrCode SvAppletObject::Verb
ErrCode nRet = ERRCODE_SO_GENERALERROR;
-/*
- nRet = SjWrapper::CheckJavaEnvironment();
- BOOL bJavaOk = TRUE;
- bJavaOk = SjWrapper::IsJavaRuntimeOk();
- if( !ERRCODE_TOERROR( nRet ) && bJavaOk )
-*/
+ switch( nVerb )
{
- switch( nVerb )
+ case SVVERB_PROPS:
{
- case SVVERB_PROPS:
- {
- DBG_ERROR( "non-working code!" );
- // TODO: dead corpses
- nRet = 0;
- break;
- }
- case SVVERB_SHOW:
- break;
-
- case SVVERB_IPACTIVATE:
- break;
-
- case 0L:
- nRet = GetProtocol().IPProtocol();
- break;
- case SVVERB_HIDE:
- nRet = DoInPlaceActivate( FALSE );
- break;
- default:
- nRet = ERRCODE_SO_GENERALERROR;
- break;
+ DBG_ERROR( "non-working code!" );
+ // TODO: dead corpses
+ nRet = 0;
+ break;
}
+ case SVVERB_SHOW:
+ break;
+
+ case SVVERB_IPACTIVATE:
+ break;
+
+ case 0L:
+ nRet = GetProtocol().IPProtocol();
+ break;
+ case SVVERB_HIDE:
+ nRet = DoInPlaceActivate( FALSE );
+ break;
+ default:
+ nRet = ERRCODE_SO_GENERALERROR;
+ break;
}
return nRet;
}
@@ -817,7 +806,6 @@ BOOL SvAppletObject::IsLink() const
<SvPseudoObject::IsLink()>
*/
{
- //return TRUE;
return FALSE;
}
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index 51127ea..4257c8a 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.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
@@ -300,12 +300,6 @@ void SvInPlaceClient::InPlaceActivate
abgebrochen.
*/
{
- if( !bActivate )
- {
- SvContainerEnvironment * pEnv = GetEnv();
- pEnv->ResetChilds();
- }
-
if( !bActivate && HasViewData() )
FreeViewData( pData );
}
@@ -328,14 +322,7 @@ void SvInPlaceClient::UIActivate
{
SvInPlaceEnvironment * pActEnv = SOAPP->pUIShowIPEnv;
SvContainerEnvironment * pEnv = GetEnv();
- if( pActEnv )
- {
- if( !pEnv->IsChild( pActEnv->GetContainerEnv() ) )
- { // es wurde kein Child aktiviert
- pEnv->GetIPEnv()->DoShowIPObj( FALSE );
- }
- }
- else
+ if( !pActEnv )
{
pEnv->GetIPEnv()->DoShowIPObj( FALSE );
if( pEnv->GetParent() )
diff --git a/binfilter/bf_so3/source/inplace/ipenv.cxx b/binfilter/bf_so3/source/inplace/ipenv.cxx
index 94a8d47..68c4767 100644
--- a/binfilter/bf_so3/source/inplace/ipenv.cxx
+++ b/binfilter/bf_so3/source/inplace/ipenv.cxx
@@ -148,7 +148,6 @@ SvContainerEnvironment::~SvContainerEnvironment()
*/
{
DBG_ASSERT( !pIPEnv, "IPEnv exist" );
- ResetChilds();
if( bDeleteEditWin )
{
@@ -182,94 +181,6 @@ SvContainerEnvironment::~SvContainerEnvironment()
"can't destroy xDocFrame" );
}
-//=========================================================================
-
-//=========================================================================
-SvContainerEnvironment* SvContainerEnvironment::GetChild
-(
- ULONG nChildPos /* Position des Childs in der Liste */
-) const
-/* [Beschreibung]
-
- Die Methode liefert das Child-Env an von der angebenen Position
- zur"ck.
-
- [R"uckgabewert]
-
- SvContainerEnvironment * , wenn die Anzahl der Child's > nChildPos
- ist, wird das Child-Env zur"uckgegeben.
- Ansonsten wird NULL zur"uckgegeben.
-
- [Querverweise]
-
- <SvContainerEnvironment::()>
-*/
-{
- return NULL;
-}
-
-//=========================================================================
-void SvContainerEnvironment::ResetChilds()
-/* [Beschreibung]
-
- Die Verbindung aller Client's, die in den Child-Environments
- stehen, werden abgebrochen.
-*/
-{
-}
-
-//=========================================================================
-void SvContainerEnvironment::ResetChilds2IPActive()
-/* [Beschreibung]
-
- Die Methode setzt alle Childs auf IPActive zur"uck. Dabei
- arbeitet die Methode rekusiv. Das heisst Child's von Child's werden
- auch zur"uckgesetzt.
-
- [R"uckgabewert]
-
- SvContainerEnvironment * , wenn die Anzahl der Child's > nChildPos
- ist, wird das Child-Env zur"uckgegeben.
- Ansonsten wird NULL zur"uckgegeben.
-*/
-{
- // kein Child darf UI-Aktiv sein
- ULONG n = 0;
- SvContainerEnvironment * pChild;
- while( NULL != (pChild = GetChild( n++ ) ) )
- {
- if( pChild->GetIPClient() )
- pChild->GetIPClient()->GetProtocol().Reset2InPlaceActive();
- pChild->ResetChilds2IPActive();
- }
-}
-
-//=========================================================================
-BOOL SvContainerEnvironment::IsChild
-(
- SvContainerEnvironment * pEnv /* Das Env, von dem festgestellt werden
- soll, ob es ein Child ist */
-) const
-/* [Beschreibung]
-
- Stellt fest, ob es sich um ein Child handelt.
-
- [R"uckgabewert]
-
- BOOL TRUE, es ist ein Child.
- FALSE, es ist kein Child.
-*/
-{
- ULONG n = 0;
- SvContainerEnvironment * pChild;
- while( NULL != (pChild = GetChild( n++ ) ) )
- {
- if( pChild == pEnv || pChild->IsChild( pEnv ) )
- return TRUE;
- }
- return FALSE;
-}
-
/************************************************************************
|* SvContainerEnvironment::IsStub()
|*
@@ -610,12 +521,6 @@ void SvContainerEnvironment::SetTopToolFramePixel( const SvBorder & rBorder )
if( pIPEnv )
// InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
pIPEnv->DoTopWinResize();
-
- // Alle Childs benachrichtigen
- ULONG n = 0;
- SvContainerEnvironment * pChild;
- while( NULL != (pChild = GetChild( n++ ) ) )
- pChild->SetTopToolFramePixel( aTopBorder );
}
}
@@ -632,12 +537,6 @@ void SvContainerEnvironment::SetDocToolFramePixel( const SvBorder & rBorder )
if( pIPEnv )
// InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
pIPEnv->DoDocWinResize();
-
- // Alle Childs benachrichtigen
- ULONG n = 0;
- SvContainerEnvironment * pChild;
- while( NULL != (pChild = GetChild( n++ ) ) )
- pChild->SetDocToolFramePixel( aDocBorder );
}
}
@@ -837,11 +736,6 @@ SvInPlaceEnvironment::~SvInPlaceEnvironment()
}
//=========================================================================
-void SvInPlaceEnvironment::DeleteObjMenu()
-{
-}
-
-//=========================================================================
Window * SvInPlaceEnvironment::GetEditWin()
{
return pEditWin;
@@ -859,16 +753,6 @@ MenuBar * SvInPlaceEnvironment::QueryMenu
}
/*************************************************************************/
-void SvInPlaceEnvironment::MergeMenus()
-{
-}
-
-/*************************************************************************/
-void SvInPlaceEnvironment::ReleaseClientMenu()
-{
-}
-
-/*************************************************************************/
void SvInPlaceEnvironment::DoShowIPObj( BOOL bShow )
{
if( bShow )
@@ -906,7 +790,6 @@ void SvInPlaceEnvironment::DoShowUITools( BOOL bShow )
// kein Child darf UI-Aktiv sein
SvContainerEnvironment * pEnv = GetContainerEnv();
- pEnv->ResetChilds2IPActive();
// kein Parent darf UI-Aktiv sein
SvContainerEnvironment * pPar = pEnv->GetParent();
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 6fab391..24fc431 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.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
@@ -318,11 +318,6 @@ void SvInPlaceObject::InPlaceActivate
}
}
- if( Owner() && !bActivate )
- { // Client-Items aus OleMenu entfernen
- if( pIPEnv )
- pIPEnv->ReleaseClientMenu();
- }
if( !bActivate && pIPEnv )
{
if( bDeleteIPEnv )
@@ -361,11 +356,6 @@ ErrCode SvInPlaceObject::DoUIActivate( BOOL bActivate )
*************************************************************************/
void SvInPlaceObject::UIActivate( BOOL bActivate )
{
- if( Owner() )
- {
- if( bActivate )
- pIPEnv->MergeMenus();
- }
// bei !bActivate siehe IPClient::UIActivate
if( bActivate )
pIPEnv->ShowIPObj( bActivate );
@@ -403,21 +393,6 @@ void SvInPlaceObject::DocWinActivate( BOOL bActivate )
*************************************************************************/
BOOL SvInPlaceObject::DoMergePalette()
{
- /*if( GetClient()->Owner() )
- {
- WorkWindow * pWW = pIPEnv->GetContainerEnv()->GetDocWin();
- if( pWW )
- {
- Palette aPal = pWW->GetPalette();
- return MergePalette( aPal );
- }
- else
- {
- pWW = pIPEnv->GetContainerEnv()->GetTopWin();
- Palette aPal = pWW->GetPalette();
- return MergePalette( aPal );
- }
- }*/
return FALSE;
}
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index b6a7f59..cba5928 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.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
@@ -127,7 +127,6 @@ SvPlugInEnvironment::~SvPlugInEnvironment()
// statt DeleteEditWin() auf NULL setzen und durch den Manager
// zerst"oren
SetEditWin( NULL );
- DeleteObjMenu();
DeleteWindows();
delete pImpl;
}
diff --git a/binfilter/inc/bf_so3/ipenv.hxx b/binfilter/inc/bf_so3/ipenv.hxx
index fdf150d..4a6fb05 100644
--- a/binfilter/inc/bf_so3/ipenv.hxx
+++ b/binfilter/inc/bf_so3/ipenv.hxx
@@ -161,10 +161,6 @@ public:
OLEINPLACEFRAMEINFO * GetOleInfo_Impl();
SvContainerEnvironment* GetParent() const { return pParent; }
- SvContainerEnvironment* GetChild( ULONG n ) const;
- void ResetChilds();
- void ResetChilds2IPActive();
- BOOL IsChild( SvContainerEnvironment * pEnv ) const;
SvInPlaceEnvironment * GetIPEnv() const { return pIPEnv; }
BOOL IsStub() const;
@@ -244,8 +240,6 @@ private:
SvContainerEnvironment *pContEnv;
SvInPlaceObject * pObj;
- SO3_DLLPRIVATE void MergeMenus();
- SO3_DLLPRIVATE void ReleaseClientMenu();
protected:
SO3_DLLPRIVATE virtual void TopWinResize();
SO3_DLLPRIVATE virtual void DocWinResize();
@@ -260,8 +254,6 @@ protected:
SO3_DLLPRIVATE virtual BOOL DispatchAccel( const KeyCode & );
- SO3_DLLPRIVATE void DeleteObjMenu();
-
SO3_DLLPRIVATE void MakeWindows();
SO3_DLLPRIVATE void DeleteWindows();
SO3_DLLPRIVATE void SetClipWin( SvInPlaceClipWindow * pWin )
More information about the Libreoffice-commits
mailing list