From c9ab48101f1b1448851ad37bf76f910398d13607 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 11 Sep 2007 09:31:02 +0000 Subject: INTEGRATION: CWS mav24_SRC680 (1.4.94); FILE MERGED 2007/09/07 09:24:07 mav 1.4.94.1: #i81318# let all elements at least transport the request further by default --- fpicker/source/win32/filepicker/controlcommand.cxx | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'fpicker/source/win32') diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx index 97ca9c1d3630..1b908c0b995d 100644 --- a/fpicker/source/win32/filepicker/controlcommand.cxx +++ b/fpicker/source/win32/filepicker/controlcommand.cxx @@ -4,9 +4,9 @@ * * $RCSfile: controlcommand.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-10-12 10:50:49 $ + * last change: $Author: ihi $ $Date: 2007-09-11 10:31:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,9 +78,28 @@ CControlCommand::~CControlCommand( ) // //--------------------------------------------- -CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* ) +CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* pRequest ) { - return new CControlCommandResult( ); + // if the command does not support handleRequest, it should at least + // redirect the request to the next element + // so the base class implementation has to do it + + OSL_ENSURE( pRequest, "inavlid parameter" ); + + CControlCommandResult* result; + CControlCommand* nextCommand; + + nextCommand = getNextCommand( ); + if ( nextCommand ) + { + result = nextCommand->handleRequest( pRequest ); + } + else + { + result = new CControlCommandResult(); + } + + return result; } //--------------------------------------------- -- cgit