sfx2/source/appl/impldde.cxx | 13 +------------ sfx2/source/appl/impldde.hxx | 1 - 2 files changed, 1 insertion(+), 13 deletions(-)
New commits: commit 8d7b9d7d23ae6a02be4c9408fc01e756aef0e4a2 Author: Stephan Bergmann <[email protected]> Date: Wed Apr 20 16:11:58 2016 +0200 SvDDEObject::nError is never read ...at least since 98eabdaa5a7f4a35b87925361a5a437077e274c0/ 14483df71f08d2bf676d558708429af066fd9ecd "INTEGRATION: CWS mav09: #i27773# move implementation from so3" moved the code to where it is today. Change-Id: Ia57aee6e0ea2f1c179ca542046dd26b86c9b7e04 diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 1919270..e7a2732 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -47,9 +47,6 @@ #include <unotools/securityoptions.hxx> -#define DDELINK_ERROR_APP 1 -#define DDELINK_ERROR_DATA 2 - using namespace ::com::sun::star::uno; namespace sfx2 @@ -121,7 +118,7 @@ IMPL_LINK_NOARG_TYPED( SvDDELinkEditDialog, EditHdl_Impl, Edit&, void) } SvDDEObject::SvDDEObject() - : pConnection( nullptr ), pLink( nullptr ), pRequest( nullptr ), pGetData( nullptr ), nError( 0 ) + : pConnection( nullptr ), pLink( nullptr ), pRequest( nullptr ), pGetData( nullptr ) { SetUpdateTimeout( 100 ); bWaitForData = sal_False; @@ -148,8 +145,6 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/, delete pConnection; pConnection = new DdeConnection( sServer, sTopic ); - if( pConnection->GetError() ) - nError = DDELINK_ERROR_APP; } if( bWaitForData ) // we are in an rekursive loop, get out again @@ -171,9 +166,6 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/, aReq.Execute(); } while( aReq.GetError() && ImplHasOtherFormat( aReq ) ); - if( pConnection->GetError() ) - nError = DDELINK_ERROR_DATA; - bWaitForData = sal_False; } else @@ -235,11 +227,8 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) if( bSysTopic ) { // if the system topic works then the server is up but just doesn't know the original topic - nError = DDELINK_ERROR_DATA; return false; } - - nError = DDELINK_ERROR_APP; } if( SfxLinkUpdateMode::ALWAYS == nLinkType && !pLink && !pConnection->GetError() ) diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 7e67adb..d3ea678 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -41,7 +41,6 @@ class SvDDEObject : public SvLinkSource css::uno::Any * pGetData; sal_uInt8 bWaitForData : 1; // waiting for data? - sal_uInt8 nError : 7; // Error code for dialogue static bool ImplHasOtherFormat( DdeTransaction& ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
