diff options
| -rw-r--r-- | basctl/source/basicide/tbxctl.cxx | 79 | ||||
| -rw-r--r-- | 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 14ad71b2b93a..fab909754834 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 a533c1291c12..6a1558108b61 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: */ |