Commit (STABLE): Re: Commit (HEAD): Re: sxw margins patch

Backport: Set m_bSectionHasPara to false after inserting a section
                                                                                                                                               
CVS:
----------------------------------------------------------------------
CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: Tag: ABI-2-0-0-STABLE
CVS: ie_imp_OpenWriter.cpp
CVS:
----------------------------------------------------------------------

On di, 2004-08-24 at 22:06 +0200, J.M. Maurer wrote:
>
> Set m_bSectionHasPara to false after inserting a section
>
> CVS:
> ----------------------------------------------------------------------
> CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
> CVS:
> CVS: Committing in .
> CVS:
> CVS: Modified Files:
> CVS: ie_imp_OpenWriter.cpp
> CVS:
> ----------------------------------------------------------------------
>
> Note to me: backport
>
> On ma, 2004-08-23 at 06:22 -0700, Dom Lachowicz wrote:
> > Thanks for fixing up that patch, Robsta. Could you
> > also make sure that when you append a PTX_Section, you
> > reset that flag to "FALSE" please?
> >
> > Thanks,
> > Dom
> >
> > --- Robert Staudinger <robsta@stereolyzer.net> wrote:
> >
> > > Hello,
> > >
> > > attaching a tiny patch against HEAD to import top-
> > > and bottom- margins
> > > from the sxw styles.
> > > Wrt. to the current feature freeze, should I rather
> > > diff against
> > > ABIMATH?
> > >
> > > Thanks,
> > > Rob
> > > > Index:
> > >
> > abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp
> > >
> > ===================================================================
> > > RCS file:
> > >
> > /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp,v
> > > retrieving revision 1.12
> > > diff -u -r1.12 ie_imp_OpenWriter.cpp
> > > ---
> > >
> > abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp
> > > 21 Aug 2004 18:27:16 -0000 1.12
> > > +++
> > >
> > abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp
> > > 23 Aug 2004 08:27:36 -0000
> > > @@ -188,10 +188,18 @@
> > > if(val)
> > > m_marginLeft = UT_String_sprintf
> > > ("margin-left: %s;", val);
> > >
> > > + val = UT_getAttribute ("fo:margin-top", props);
> > > + if(val)
> > > + m_marginTop = UT_String_sprintf ("margin-top:
> > > %s;", val);
> > > +
> > > val = UT_getAttribute ("fo:margin-right",
> > > props);
> > > if(val)
> > > m_marginRight = UT_String_sprintf
> > > ("margin-right: %s;", val);
> > >
> > > + val = UT_getAttribute ("fo:margin-bottom",
> > > props);
> > > + if(val)
> > > + m_marginBottom = UT_String_sprintf
> > > ("margin-bottom: %s;", val);
> > > +
> > > val = UT_getAttribute
> > > ("style:line-height-at-least", props);
> > > if (val)
> > > m_lineHeight = UT_String_sprintf
> > > ("line-height: %s+;", val);
> > > @@ -260,7 +268,9 @@
> > > APPEND_STYLE(m_textPos);
> > > APPEND_STYLE(m_textDecoration);
> > > APPEND_STYLE(m_marginLeft);
> > > + APPEND_STYLE(m_marginTop);
> > > APPEND_STYLE(m_marginRight);
> > > + APPEND_STYLE(m_marginBottom);
> > > APPEND_STYLE(m_lineHeight);
> > > APPEND_STYLE(m_keepWithNext);
> > > APPEND_STYLE(m_keepTogether);
> > > @@ -287,7 +297,9 @@
> > > UT_String m_textPos;
> > > UT_String m_textDecoration;
> > > UT_String m_marginLeft;
> > > + UT_String m_marginTop;
> > > UT_String m_marginRight;
> > > + UT_String m_marginBottom;
> > > UT_String m_lineHeight;
> > > UT_String m_keepWithNext;
> > > UT_String m_keepTogether;
> > >
> >
> >
> >
> >
> >
> > __________________________________
> > Do you Yahoo!?
> > New and Improved Yahoo! Mail - 100MB free storage!
> > http://promotions.yahoo.com/new_mail
> >
>
Received on Tue Aug 24 22:16:19 2004