harvester/composerplugins/imagecomposer/src/imagecomposerao.cpp
branchRCL_3
changeset 49 f23c07ec56e2
parent 47 b73252188534
child 50 85f623e1ef41
equal deleted inserted replaced
47:b73252188534 49:f23c07ec56e2
   273 	                    SetPriority( KHarvesterPriorityComposerPlugin );
   273 	                    SetPriority( KHarvesterPriorityComposerPlugin );
   274 	                    }
   274 	                    }
   275 	                
   275 	                
   276 	                SetNextRequest( ERequestCompose );
   276 	                SetNextRequest( ERequestCompose );
   277 	                }
   277 	                }
   278 	            // if object does not exists, find next
   278 	            // if object does not exists, or data is not modified, find next
   279 	            else if ( err == KErrNotFound || err == KErrAbort )
   279 	            else if ( err == KErrNotFound || err == KErrAbort )
   280 	                 {
   280 	                 {
   281 	                 if ( err == KErrAbort && mdeObjectId != KNoId )
   281 	                 if ( err == KErrAbort && mdeObjectId != KNoId )
   282 	                	 {
   282 	                	 {
   283 		                 RArray<TItemId> objectId;
   283 		                 RArray<TItemId> objectId;
   421 	    	TEntry entry;
   421 	    	TEntry entry;
   422 	    	TInt error = iFs.Entry( mdeObject->Uri(), entry );
   422 	    	TInt error = iFs.Entry( mdeObject->Uri(), entry );
   423 	
   423 	
   424 	    	if( error != KErrNone || entry.iModified == time )
   424 	    	if( error != KErrNone || entry.iModified == time )
   425 	    		{
   425 	    		{
       
   426 	    	    WRITELOG( "CImageComposerAO::GetObjectFromMdeL() - image data has not been modified - abort" );
   426 	    		User::Leave( KErrAbort );
   427 	    		User::Leave( KErrAbort );
   427 	    		}
   428 	    		}
   428 	    	}
   429 	    	}
   429 	    else
   430 	    else
   430 	    	{
   431 	    	{