Broken tree (was: Re: CVS: commit daniel_dandrada abiword-plugins/wp/impexp/OpenDocument/exp/xp ODe_AuxiliaryData.cpp ODe_AuxiliaryData.h ODe_HeadingSearcher_Listener.cpp ODe_HeadingSearcher_Listener.h GNUmakefile.am ODe_AbiDocListener.cpp ODe_AbiDocListener.h ODe_Frame_Listener.cpp ODe_Frame_Listener.h ODe_Main_Listener.cpp ODe_Main_Listener.h ODe_Note_Listener.cpp ODe_Note_Listener.h ODe_Table_Listener.cpp ODe_Table_Listener.h ODe_Text_Listener.cpp ODe_Text_Listener.h ie_exp_OpenDocument.cpp

Daniel,

I'm not sure that the content of this is what you were expecting....
Looks like you overwrote the .h with the .cpp

Hub

On 05/12/05 12:52 pm, cvs@abisource.com wrote:
> Index: ODe_AbiDocListener.h
> ===================================================================
> RCS file:
> /cvsroot/abiword-plugins/wp/impexp/OpenDocument/exp/xp/ODe_AbiDocListener.h
>,v retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- ODe_AbiDocListener.h        25 Nov 2005 17:26:36 -0000      1.1
> +++ ODe_AbiDocListener.h        5 Dec 2005 17:52:51 -0000       1.2
> @@ -1,6 +1,7 @@
>  /* AbiSource
>   *
>   * Copyright (C) 2002 Dom Lachowicz <cinamod@hotmail.com>
> + * Copyright (C) 2004 Robert Staudinger <robsta@stereolyzer.net>
>   *
>   * Copyright (C) 2005 INdT
>   * Author: Daniel d'Andrada T. de Carvalho <daniel.carvalho@indt.org.br>
> @@ -20,150 +21,1110 @@
>   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
>   * 02111-1307, USA.
>   */
> [...1188 lines suppressed...]
> +            break;
> +        
> +        case ODe_ListenerAction::ACTION_POP:
> +            if (m_deleteCurrentWhenPop) {
> +                DELETEP(m_pCurrentImpl);
> +            } else {
> +                m_pCurrentImpl = NULL;
> +            }
> +
> +            if (m_implStack.getItemCount() > 0) {
> +                StackCell stackCell;
> +                stackCell = m_implStack.getLastItem();            
> +                m_pCurrentImpl = stackCell.m_pListenerImpl;
> +                m_deleteCurrentWhenPop = stackCell.m_deleteWhenPop;
> +                
> +                m_implStack.pop_back();
> +            }
> +            break;
> +    }
> +}
Received on Mon Dec 5 20:15:22 2005