mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
Let's get rid of this strange Buffer * construction. After that I introduced the inMultiViews() function, it wasn't necessary anymore.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31064 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5679ae92f2
commit
845baf5016
@ -609,8 +609,9 @@ bool GuiView::closeBufferAll(bool tolastopened)
|
|||||||
|
|
||||||
GuiWorkArea * wa = twa->currentWorkArea();
|
GuiWorkArea * wa = twa->currentWorkArea();
|
||||||
bool const is_active_wa = active_wa == wa;
|
bool const is_active_wa = active_wa == wa;
|
||||||
Buffer * b = &wa->bufferView().buffer();
|
Buffer & b = wa->bufferView().buffer();
|
||||||
if (b->parent()) {
|
|
||||||
|
if (b.parent()) {
|
||||||
// This is a child document, just close the tab
|
// This is a child document, just close the tab
|
||||||
// after saving but keep the file loaded.
|
// after saving but keep the file loaded.
|
||||||
if (!closeWorkArea(wa, false, tolastopened, is_active_wa))
|
if (!closeWorkArea(wa, false, tolastopened, is_active_wa))
|
||||||
@ -618,7 +619,7 @@ bool GuiView::closeBufferAll(bool tolastopened)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
vector<Buffer *> clist = b->getChildren();
|
vector<Buffer *> clist = b.getChildren();
|
||||||
for (vector<Buffer *>::const_iterator it = clist.begin();
|
for (vector<Buffer *>::const_iterator it = clist.begin();
|
||||||
it != clist.end(); ++it) {
|
it != clist.end(); ++it) {
|
||||||
if ((*it)->isClean())
|
if ((*it)->isClean())
|
||||||
@ -637,7 +638,7 @@ bool GuiView::closeBufferAll(bool tolastopened)
|
|||||||
|
|
||||||
// closeBuffer() needs buffer workArea still alive and
|
// closeBuffer() needs buffer workArea still alive and
|
||||||
// set as currrent one, and destroys it
|
// set as currrent one, and destroys it
|
||||||
if (b && !closeWorkArea(wa, close_buffer, tolastopened, is_active_wa))
|
if (!closeWorkArea(wa, close_buffer, tolastopened, is_active_wa))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user