Skip to content

C
core
Kaydet (Commit) fd8e6b21 authored tarafından Anders Jonsson's avatar Anders Jonsson Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Remove commented code

üst 8051a883
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 216 deletions
basctl/source/basicide/tbxctl.cxx
Dosyayı görüntüle @ fd8e6b21
...@@ -50,68 +50,6 @@ static ::rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM( "private ...@@ -50,68 +50,6 @@ static ::rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM( "private
SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem ) 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 |* Klasse fuer Toolbox
...@@ -219,23 +157,6 @@ SfxPopupWindow* TbxControls::CreatePopupWindow() ...@@ -219,23 +157,6 @@ SfxPopupWindow* TbxControls::CreatePopupWindow()
if ( GetSlotId() == SID_CHOOSE_CONTROLS ) if ( GetSlotId() == SID_CHOOSE_CONTROLS )
createAndPositionSubToolBar( aSubToolBarResName ); 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); return(0);
} }
......
xmlsecurity/source/xmlsec/errorcallback.cxx
Dosyayı görüntüle @ fd8e6b21
...@@ -44,112 +44,6 @@ ...@@ -44,112 +44,6 @@
using namespace ::com::sun::star::xml::crypto; 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" extern "C"
void errorCallback(const char * /*file*/, void errorCallback(const char * /*file*/,
...@@ -167,47 +61,16 @@ void errorCallback(const char * /*file*/, ...@@ -167,47 +61,16 @@ void errorCallback(const char * /*file*/,
// const char * amsg = msg ? msg : ""; // const char * amsg = msg ? msg : "";
// fprintf(stdout, "xmlsec error: %s, %s, %s, %i %s \n", afunc, errObj, errSub, reason, amsg); // fprintf(stdout, "xmlsec error: %s, %s, %s, %i %s \n", afunc, errObj, errSub, reason, amsg);
#endif #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() 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); 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() void clearErrorRecorder()
{ {
xmlSecErrorsSetCallback(NULL); xmlSecErrorsSetCallback(NULL);
// g_xErrorRecorder = NULL;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment