These three patches remove large blocks of commented code in sdk,
components and libs-gui respectively. All code has been commented out at
least since 2005.
Anders Jonsson,
(LGPLv3+, MPL)
>From bd135dcc65666baf7317d02ba2ed9eecb35d8b2e Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jons...@norsjonet.se>
Date: Sat, 8 Jan 2011 13:57:29 +0100
Subject: Remove block of commented code
---
.../Components/CppComponent/service1_impl.cxx | 64 --------------------
1 files changed, 0 insertions(+), 64 deletions(-)
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index a6933ce..1c5e49a 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -244,68 +244,4 @@ Reference< XInterface > SAL_CALL create_MyService2Impl(
}
-/*
-extern "C" void SAL_CALL component_getImplementationEnvironment(
- sal_Char const ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry )
-{
- if (xRegistry)
- {
- try
- {
- // implementation of MyService1A
- Reference< registry::XRegistryKey > xKey(
- xRegistry->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService1/UNO/SERVICES") ) ) );
- // subkeys denote implemented services of implementation
- xKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.MyService1") ) );
- // implementation of MyService1B
- xKey = xRegistry->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService2/UNO/SERVICES") ) );
- // subkeys denote implemented services of implementation
- xKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.MyService2") ) );
- return sal_True; // success
- }
- catch (registry::InvalidRegistryException &)
- {
- // function fails if exception caught
- }
- }
- return sal_False;
-}
-extern "C" void * SAL_CALL component_getFactory(
- sal_Char const * implName, lang::XMultiServiceFactory * xMgr, void * )
-{
- Reference< lang::XSingleComponentFactory > xFactory;
- if (0 == ::rtl_str_compare( implName, "my_module.my_sc_implementation.MyService1" ))
- {
- // create component factory for MyService1 implementation
- OUString serviceName( RTL_CONSTASCII_USTRINGPARAM("my_module.MyService1") );
- xFactory = ::cppu::createSingleComponentFactory(
- ::my_sc_impl::create_MyService1Impl,
- OUString( RTL_CONSTASCII_USTRINGPARAM("my_module.my_sc_implementation.MyService1") ),
- Sequence< OUString >( &serviceName, 1 ) );
- }
- else if (0 == ::rtl_str_compare( implName, "my_module.my_sc_implementation.MyService2" ))
- {
- // create component factory for MyService12 implementation
- OUString serviceName( RTL_CONSTASCII_USTRINGPARAM("my_module.MyService2") );
- xFactory = ::cppu::createSingleComponentFactory(
- ::my_sc_impl::create_MyService2Impl,
- OUString( RTL_CONSTASCII_USTRINGPARAM("my_module.my_sc_implementation.MyService2") ),
- Sequence< OUString >( &serviceName, 1 ) );
- }
- if (xFactory.is())
- xFactory->acquire();
- return xFactory.get(); // return acquired interface pointer or null
-}
-*/
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.1
>From 16da339cefa87de0f1b5bb25da9e2abc222d9826 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jons...@norsjonet.se>
Date: Sat, 8 Jan 2011 13:32:08 +0100
Subject: Remove commented code
---
basctl/source/basicide/tbxctl.cxx | 79 ---------------
xmlsecurity/source/xmlsec/errorcallback.cxx | 137 ---------------------------
2 files changed, 0 insertions(+), 216 deletions(-)
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index f7cb3ba..4dba82d 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -52,68 +52,6 @@ SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
/*************************************************************************
|*
-|* WorkWindow Alignment
-|*
-\************************************************************************/
-/*
-IMPL_LINK( PopupWindowTbx, SelectHdl, void*, EMPTYARG )
-{
- if ( IsInPopupMode() )
- EndPopupMode();
-
- aSelectLink.Call( &aTbx.GetToolBox() );
-
- return 0;
-}
-
-PopupWindowTbx::PopupWindowTbx( USHORT nId, WindowAlign eAlign,
- ResId aRIdWin, ResId aRIdTbx,
- SfxBindings& rBind ) :
- SfxPopupWindow ( nId, aRIdWin, rBind ),
- aTbx ( this, GetBindings(), aRIdTbx )
-{
- FreeResource();
- aTbx.Initialize();
-
- ToolBox& rBox = aTbx.GetToolBox();
- rBox.SetAlign( eAlign );
- if( eAlign == WINDOWALIGN_LEFT )
- SetText( String() );
-
- Size aSize = aTbx.CalcWindowSizePixel();
- rBox.SetSizePixel( aSize );
- SetOutputSizePixel( aSize );
- aSelectLink = rBox.GetSelectHdl();
- rBox.SetSelectHdl( LINK( this, PopupWindowTbx, SelectHdl ) );
-}
-
-SfxPopupWindow* PopupWindowTbx::Clone() const
-{
- return new PopupWindowTbx( GetId(), aTbx.GetAlign(),
- IDEResId( RID_TBXCONTROLS ),
- IDEResId( RID_TOOLBOX ),
- (SfxBindings&) GetBindings() );
-}
-
-void PopupWindowTbx::PopupModeEnd()
-{
- aTbx.GetToolBox().EndSelection();
- SfxPopupWindow::PopupModeEnd();
-}
-
-void PopupWindowTbx::Update()
-{
- ToolBox *pBox = &aTbx.GetToolBox();
- aTbx.Activate( pBox );
- aTbx.Deactivate( pBox );
-}
-
-PopupWindowTbx::~PopupWindowTbx()
-{
-}
-*/
-/*************************************************************************
-|*
|* Klasse fuer Toolbox
|*
\************************************************************************/
@@ -219,23 +157,6 @@ SfxPopupWindow* TbxControls::CreatePopupWindow()
if ( GetSlotId() == SID_CHOOSE_CONTROLS )
createAndPositionSubToolBar( aSubToolBarResName );
-/*
- if (GetId() == SID_CHOOSE_CONTROLS)
- {
- PopupWindowTbx *pWin =
- new PopupWindowTbx( GetId(),
- GetToolBox().IsHorizontal() ?
- WINDOWALIGN_LEFT : WINDOWALIGN_TOP,
- IDEResId( RID_TBXCONTROLS ),
- IDEResId( RID_TOOLBOX ),
- GetBindings() );
- pWin->StartPopupMode(&GetToolBox(), TRUE);
- pWin->Update();
- pWin->StartSelection();
- pWin->Show();
- return(pWin);
- }
-*/
return(0);
}
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index 9ec9968..6e41013 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -44,112 +44,6 @@
using namespace ::com::sun::star::xml::crypto;
-// ::com::sun::star::uno::Reference< XXMLSecurityTemplate > g_xErrorRecorder;
-// bool g_bErrorRecorded;
-
-// SecurityOperationStatus getOperationStatus(int reason)
-// {
-// switch (reason)
-// {
-// case XMLSEC_ERRORS_R_XMLSEC_FAILED:
-// return SecurityOperationStatus_ENGINE_FAILED;
-// case XMLSEC_ERRORS_R_MALLOC_FAILED:
-// return SecurityOperationStatus_MALLOC_FAILED;
-// case XMLSEC_ERRORS_R_STRDUP_FAILED:
-// return SecurityOperationStatus_STRDUP_FAILED;
-// case XMLSEC_ERRORS_R_CRYPTO_FAILED:
-// return SecurityOperationStatus_CRYPTO_FAILED;
-// case XMLSEC_ERRORS_R_XML_FAILED:
-// return SecurityOperationStatus_XML_FAILED;
-// case XMLSEC_ERRORS_R_XSLT_FAILED:
-// return SecurityOperationStatus_XSLT_FAILED;
-// case XMLSEC_ERRORS_R_IO_FAILED:
-// return SecurityOperationStatus_IO_FAILED;
-// case XMLSEC_ERRORS_R_DISABLED:
-// return SecurityOperationStatus_DISABLED;
-// case XMLSEC_ERRORS_R_NOT_IMPLEMENTED:
-// return SecurityOperationStatus_NOT_IMPLEMENTED;
-// case XMLSEC_ERRORS_R_INVALID_SIZE:
-// return SecurityOperationStatus_INVALID_SIZE;
-// case XMLSEC_ERRORS_R_INVALID_DATA:
-// return SecurityOperationStatus_INVALID_DATA;
-// case XMLSEC_ERRORS_R_INVALID_RESULT:
-// return SecurityOperationStatus_INVALID_RESULT;
-// case XMLSEC_ERRORS_R_INVALID_TYPE:
-// return SecurityOperationStatus_INVALID_TYPE;
-// case XMLSEC_ERRORS_R_INVALID_OPERATION:
-// return SecurityOperationStatus_INVALID_OPERATION;
-// case XMLSEC_ERRORS_R_INVALID_STATUS:
-// return SecurityOperationStatus_INVALID_STATUS;
-// case XMLSEC_ERRORS_R_INVALID_FORMAT:
-// return SecurityOperationStatus_INVALID_FORMAT;
-// case XMLSEC_ERRORS_R_DATA_NOT_MATCH:
-// return SecurityOperationStatus_DATA_NOT_MATCH;
-// case XMLSEC_ERRORS_R_INVALID_NODE:
-// return SecurityOperationStatus_INVALID_NODE;
-// case XMLSEC_ERRORS_R_INVALID_NODE_CONTENT:
-// return SecurityOperationStatus_INVALID_NODE_CONTENT;
-// case XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE:
-// return SecurityOperationStatus_INVALID_NODE_ATTRIBUTE;
-// case XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE:
-// return SecurityOperationStatus_MISSING_NODE_ATTRIBUTE;
-// case XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT:
-// return SecurityOperationStatus_NODE_ALREADY_PRESENT;
-// case XMLSEC_ERRORS_R_UNEXPECTED_NODE:
-// return SecurityOperationStatus_UNEXPECTED_NODE;
-// case XMLSEC_ERRORS_R_NODE_NOT_FOUND:
-// return SecurityOperationStatus_NODE_NOT_FOUND;
-// case XMLSEC_ERRORS_R_INVALID_TRANSFORM:
-// return SecurityOperationStatus_INVALID_TRANSFORM;
-// case XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY:
-// return SecurityOperationStatus_INVALID_TRANSFORM_KEY;
-// case XMLSEC_ERRORS_R_INVALID_URI_TYPE:
-// return SecurityOperationStatus_INVALID_URI_TYPE;
-// case XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED:
-// return SecurityOperationStatus_TRANSFORM_SAME_DOCUMENT_REQUIRED;
-// case XMLSEC_ERRORS_R_TRANSFORM_DISABLED:
-// return SecurityOperationStatus_TRANSFORM_DISABLED;
-// case XMLSEC_ERRORS_R_INVALID_KEY_DATA:
-// return SecurityOperationStatus_INVALID_KEY_DATA;
-// case XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND:
-// return SecurityOperationStatus_KEY_DATA_NOT_FOUND;
-// case XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST:
-// return SecurityOperationStatus_KEY_DATA_ALREADY_EXIST;
-// case XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE:
-// return SecurityOperationStatus_INVALID_KEY_DATA_SIZE;
-// case XMLSEC_ERRORS_R_KEY_NOT_FOUND:
-// return SecurityOperationStatus_KEY_NOT_FOUND;
-// case XMLSEC_ERRORS_R_KEYDATA_DISABLED:
-// return SecurityOperationStatus_KEYDATA_DISABLED;
-// case XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL:
-// return SecurityOperationStatus_MAX_RETRIEVALS_LEVEL;
-// case XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH:
-// return SecurityOperationStatus_MAX_RETRIEVAL_TYPE_MISMATCH;
-// case XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL:
-// return SecurityOperationStatus_MAX_ENCKEY_LEVEL;
-// case XMLSEC_ERRORS_R_CERT_VERIFY_FAILED:
-// return SecurityOperationStatus_CERT_VERIFY_FAILED;
-// case XMLSEC_ERRORS_R_CERT_NOT_FOUND:
-// return SecurityOperationStatus_CERT_NOT_FOUND;
-// case XMLSEC_ERRORS_R_CERT_REVOKED:
-// return SecurityOperationStatus_CERT_REVOKED;
-// case XMLSEC_ERRORS_R_CERT_ISSUER_FAILED:
-// return SecurityOperationStatus_CERT_ISSUER_FAILED;
-// case XMLSEC_ERRORS_R_CERT_NOT_YET_VALID:
-// return SecurityOperationStatus_CERT_NOT_YET_VALID;
-// case XMLSEC_ERRORS_R_CERT_HAS_EXPIRED:
-// return SecurityOperationStatus_CERT_HAS_EXPIRED;
-// case XMLSEC_ERRORS_R_DSIG_NO_REFERENCES:
-// return SecurityOperationStatus_DSIG_NO_REFERENCES;
-// case XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE:
-// return SecurityOperationStatus_DSIG_INVALID_REFERENCE;
-// case XMLSEC_ERRORS_R_ASSERTION:
-// return SecurityOperationStatus_ASSERTION;
-// default:
-// return SecurityOperationStatus_RUNTIMEERROR_FAILED;
-// }
-// }
-
extern "C"
void errorCallback(const char * /*file*/,
@@ -167,47 +61,16 @@ void errorCallback(const char * /*file*/,
// const char * amsg = msg ? msg : "";
// fprintf(stdout, "xmlsec error: %s, %s, %s, %i %s \n", afunc, errObj, errSub, reason, amsg);
#endif
- //ToDo write log message
-// if (g_xErrorRecorder.is() && !g_bErrorRecorded)
-// {
-// g_xErrorRecorder->setStatus(getOperationStatus(reason));
-
-// if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED)
-// {
-// g_bErrorRecorded = true;
-// }
-// }
}
-// void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >& xTemplate)
-// {
-// g_xErrorRecorder = xTemplate;
-// g_xErrorRecorder->setStatus(SecurityOperationStatus_OPERATION_SUCCEEDED);
-// g_bErrorRecorded = false;
-// xmlSecErrorsSetCallback(errorCallback);
-// }
-
-//void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& xTemplate)
-
void setErrorRecorder()
{
-// ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
-// xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
-// setErrorRecorder( xSecurityTemplate );
xmlSecErrorsSetCallback(errorCallback);
}
-// void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xTemplate)
-// {
-// ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
-// xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
-// setErrorRecorder( xSecurityTemplate );
-// }
-
void clearErrorRecorder()
{
xmlSecErrorsSetCallback(NULL);
-// g_xErrorRecorder = NULL;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.1
>From 8d1019e003e14416f284d766f17c02502c4e77f3 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jons...@norsjonet.se>
Date: Sat, 8 Jan 2011 13:52:57 +0100
Subject: Remove unused code
---
svl/source/items/nranges.cxx | 58 ------------------------------------------
vcl/source/window/window.cxx | 42 ------------------------------
2 files changed, 0 insertions(+), 100 deletions(-)
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 9a086ce..c3f19a0 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -595,64 +595,6 @@ SfxNumRanges& SfxNumRanges::operator -=
delete [] pTarget;
return *this;
-
- /* untested code from MI commented out (MDA, 28.01.97)
- do
- {
- // 1st range is smaller than 2nd range?
- if ( pRange1[1] < pRange2[0] )
- // => keep 1st range
- pRange1 += 2;
-
- // 2nd range is smaller than 1st range?
- else if ( pRange2[1] < pRange1[0] )
- // => skip 2nd range
- pRange2 += 2;
-
- // 2nd range totally overlaps the 1st range?
- else if ( pRange2[0] <= pRange1[0] && pRange2[1] >= pRange1[1] )
- // => remove 1st range
- memmove( pRange1, pRange1+2, sizeof(NUMTYPE) * (pEndOfTarget-pRange1+2) );
-
- // 2nd range overlaps only the beginning of 1st range?
- else if ( pRange2[0] <= pRange1[0] && pRange2[1] < pRange1[1] )
- {
- // => cut the beginning of 1st range and goto next 2nd range
- pRange1[0] = pRange2[1] + 1;
- pRange2 += 2;
- }
-
- // 2nd range overlaps only the end of 1st range?
- else if ( pRange2[0] > pRange1[0] && pRange2[1] >= pRange1[0] )
- // => cut the beginning of 1st range
- pRange1[0] = pRange2[1]+1;
-
- // 2nd range is a real subset of 1st range
- else
- {
- // => split 1st range and goto next 2nd range
- memmove( pRange1+3, pRange1+1, sizeof(NUMTYPE) * (pEndOfTarget-pRange1-1) );
- pRange1[1] = pRange2[0] - 1;
- pRange1[2] = pRange2[1] + 1;
- pRange1 += 2;
- pRange2 += 2;
- }
- }
- while ( *pRange1 && *pRange2 );
-
- // assign the differentiated ranges
- delete[] _pRanges;
- NUMTYPE nUShorts = Count_Impl(pTarget) + 1;
- if ( 1 != nUShorts )
- {
- _pRanges = new NUMTYPE[ nUShorts ];
- memcpy( _pRanges, pTarget, nUShorts * sizeof(NUMTYPE) );
- _pRanges[ nUShorts-1 ] = 0;
- }
- else
- _pRanges = 0;
- return *this;
- */
}
//------------------------------------------------------------------------
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7461c95..bd893bf 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5099,48 +5099,6 @@ long Window::PreNotify( NotifyEvent& rNEvt )
// #82968# mouse and key events will be notified after processing ( in ImplNotifyKeyMouseCommandEventListeners() )!
// see also ImplHandleMouseEvent(), ImplHandleKey()
- /*
- else if( rNEvt.GetType() == EVENT_MOUSEMOVE )
- {
- if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- {
- if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, (void*)rNEvt.GetMouseEvent() );
- else
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
- }
- }
- else if( rNEvt.GetType() == EVENT_MOUSEBUTTONUP )
- {
- if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- {
- if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, (void*)rNEvt.GetMouseEvent() );
- else
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
- }
- }
- else if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
- {
- if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- {
- if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, (void*)rNEvt.GetMouseEvent() );
- else
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
- }
- }
- else if( rNEvt.GetType() == EVENT_KEYINPUT )
- {
- if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_KEYINPUT, (void*)rNEvt.GetKeyEvent() );
- }
- else if( rNEvt.GetType() == EVENT_KEYUP )
- {
- if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() );
- }
- */
}
return bDone;
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
