Re: [Libreoffice] [GSOC][PATCH] Multiline inputbar

Hi Noel,

Actually the problem started from not doing a git pull on my end after
Kohei pushing my patch (created using git diff) as I went on making
changes. In order to resolve this I ran git stash; git pull; and then
git stash pop; And I made some more changes and sent you the same
patch generated by git diff. Where things would have gone wrong ?

Anyways since I'm not a git expert as you said to checkout a fresh SC;
can you send me the git command which need to be run on my side. Or
will a git reset Hard followed by pull will do the trick ?

On Wed, Jun 22, 2011 at 12:57 AM, Noel Power <nopower@novell.com> wrote:
> Hi Anurag
> On 21/06/11 18:59, Anurag Jain wrote:
>
> Hi Noel,
>
> Please review the patch I'm sending here. I did not have luck getting
> the control shown up. Please guide me what I'm missing ?
>
> Thanks and regards
>
> Sorry I think you need to redo the patch, it doesn't apply for me ( or at
> least the hunks to inputwin.hxx don't ) And looking at it it's clear the
> diff is not against the feature branch but some local version that you have
> :-(
>
> for instance have a look at the final hunk and you can see there is a
> ScInputBarGroup in the context ( but of course that doesn't exist yet )
> @@ -230,7 +229,6 @@ protected:
>
> private:
> ScPosWnd aWndPos;
> -// ScTextWnd aTextWindow;
> ScInputBarGroup aBarGroup;
> ScInputHandler* pInputHdl;
> SfxBindings* pBindings;
>
> If I was you I would check out a fresh sc ( from the branch ) and do a diff
> against your local files ( there are only 2 ) or alternatively send me the
> inputwin.[ch]xx files
>
> thanks,
>
> Noel


Thanks and regards
-- 
Anurag Jain
Final yr B.Tech CSE
SASTRA University
Thanjavur(T.N.)-613402