- Added #ifdef DOM to layout.h
- Backing out some changes in layout.c that should not have gotten checked in... git-svn-id: svn://10.0.0.236/trunk@847 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
e3b2621102
commit
05287d1e22
@ -3715,10 +3715,8 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
|
||||
#endif /* OLD_MSGS */
|
||||
|
||||
/* Flush out layer callbacks so that document dimensions are correct. */
|
||||
/*
|
||||
if (context->compositor)
|
||||
CL_CompositeNow(context->compositor);
|
||||
*/
|
||||
|
||||
FE_FinishedLayout(context);
|
||||
return;
|
||||
@ -3759,10 +3757,9 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
|
||||
#endif /* OLD_MSGS */
|
||||
|
||||
/* Flush out layer callbacks so that document dimensions are correct. */
|
||||
/*
|
||||
if (context->compositor)
|
||||
CL_CompositeNow(context->compositor);
|
||||
*/
|
||||
|
||||
FE_FinishedLayout(context);
|
||||
return;
|
||||
}
|
||||
@ -3832,10 +3829,8 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
|
||||
#endif /* OLD_MSGS */
|
||||
|
||||
/* Flush out layer callbacks so that document dimensions are correct. */
|
||||
/*
|
||||
if (context->compositor)
|
||||
CL_CompositeNow(context->compositor);
|
||||
*/
|
||||
|
||||
if (state->is_a_subdoc == SUBDOC_NOT && state->top_state && !state->top_state->have_title)
|
||||
{
|
||||
|
||||
@ -1465,9 +1465,11 @@ extern void
|
||||
lo_ReflectNamedAnchor(MWContext *context, lo_DocState *state, PA_Tag *tag,
|
||||
lo_NameList *name_rec, int32 layer_id);
|
||||
|
||||
#ifdef DOM
|
||||
extern void
|
||||
lo_ReflectSpan(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
|
||||
lo_NameList *name_rec, int32 layer_id);
|
||||
#endif
|
||||
|
||||
extern void
|
||||
lo_ReflectLink(MWContext *context, lo_DocState *state, PA_Tag *tag,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user