Commit Graph

18735 Commits

Author SHA1 Message Date
Pavel Sanda
69520456e0 Fix RCS part of #6396. Btw revert is slightly broken now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36153 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:21:04 +00:00
Pavel Sanda
0586a14d63 Compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36150 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:34:03 +00:00
Vincent van Ravesteijn
4397cef1f8 src/support/debug.h/cpp:
- rename the private member dt to dt_,
- rename second_ and second_used_ to second_stream and second_enabled_ to have the same terminology as the stream_ and enabled_ member,
- remove FIXME because now we have a Qt pane showing the messages,
- adjust some comments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36149 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:22:47 +00:00
Stephan Witt
69dd56d6c4 CVS implementation for buffer-info vcs-author, cvs-date and cvs-time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:20:42 +00:00
Pavel Sanda
badbd3dcc3 Compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36147 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:04:21 +00:00
Vincent van Ravesteijn
38e43ce4ca Clarify comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:23:26 +00:00
Vincent van Ravesteijn
afa873dc5f Remove the FileName parameter of Buffer::loadLyXFile and friends. Now, getAutosaveFileNameFor and getEmergencyFileNamefor can be removed too. Last, the call to lyxvc.file_found_hook can now be centralized and can be given the correct parameter (d->filename instead of the name of the emergency/autosave file).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36145 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:21:01 +00:00
Vincent van Ravesteijn
ab8d87f26a Allow for nested setBusy calls.
Before, LyX could crash when calling setBusy(false) while LyX is still in a busy state due to a surrounding setBusy(true)/setBusy(false) construction.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36140 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:24:58 +00:00
Vincent van Ravesteijn
f226c9d3fc Fix bug #6058: Change tracking and versioning.
Computes a hash value for the authors when using change tracking.

Text.cpp, BufferParams.h, Author.h:
  Change unsigned int to int because the hash values can be negative.

lyx2lyx:
  Allow to convert negative author_ids.

See also: r30756.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36134 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 18:25:29 +00:00
Vincent van Ravesteijn
a4fd294373 Add a static assert to prevent compilation on platforms where int/usigned int are not 32-bits/4-bytes.
This is added to be sure that the to-be-added author hash is always 32-bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36126 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:51:09 +00:00
Vincent van Ravesteijn
2810b7aef7 typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36062 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:35:12 +00:00
Vincent van Ravesteijn
6f61652605 Fix part of bug #5561: Issues with image pasting
Now the path to the pasted graphics is saved as a relative path if possible.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36058 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:28:33 +00:00
Richard Heck
f652f90af9 LyX does \makeat for us.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36030 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:08:01 +00:00
Richard Heck
f7e80e6681 More safety here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36013 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 20:15:04 +00:00
Richard Heck
01af564dc2 Fix bug #7014. The problem here is that we get DEFSKIP if we don't
recognize the argument, but that leads to an infinite loop.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36012 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 20:12:18 +00:00
Uwe Stöhr
bbb8671328 GuiTabular.cpp: add comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 01:29:01 +00:00
Enrico Forestieri
31b5ba7e25 Be compatible with Qt 4.2 and 4.3 (Q_EMIT).
Actually, it still fails to link with anything less than Qt 4.4.0
due to the xxxAndDestroy() business in GuiView.cpp ...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 00:38:35 +00:00
Richard Heck
dc5934737d Improve display of index names under Insert>Lists/TOC.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36006 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 20:38:42 +00:00
Richard Heck
cddf32f152 Use bformat so we get RTL etc correct here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36005 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 20:31:52 +00:00
Pavel Sanda
f5123ccfa8 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36003 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 19:54:08 +00:00
Pavel Sanda
70db6e30c8 Be compatible with Qt 4.2.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg162871.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36002 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 16:37:47 +00:00
Richard Heck
2a0fcda936 Perhaps this is overkill, but it can't hurt....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:42:45 +00:00
Richard Heck
efa0da26c8 Fix the following sort of crash, reported on the list. This is also
#6884.

1. Open LyX. File>New. Document>Outline, to make sure the TOC is open.
That isn't necessary, but it helps you to see what is happening.
2. Create a section heading (alt-P, 2) with an x in it.
3. Split the screen.
4. File>New. You should now still see the TOC for the OLD buffer.
5. Click in the top screen. You now see an empty TOC (the one for the
empty buffer).
6. Click in the empty buffer. Other TOC!
7. Back to the "x" buffer. Empty TOC. Type something. Boom!

The problem is that teh setCurrentWorkArea() call eventually gets us to
structureChanged(), which accesses documentBufferView(). But that
doesn't get reset until later, and hence everything is out of sync.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35999 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:33:52 +00:00
Richard Heck
4645e3c56f Make sure that the members of this enum get the same value on every
platform.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35995 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 14:50:07 +00:00
Abdelrazak Younes
3142a62c7a Table dialog: Fix enabling/disabling of first header and last footer
check boxes.
This should fix bug #7008


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 13:35:16 +00:00
Pavel Sanda
07fc85d3e2 typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35986 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 23:24:24 +00:00
Stephan Witt
2f10f8edd0 first step to cure the VCS load problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35985 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 22:20:54 +00:00
Richard Heck
96dfec471f Partially fix #5108.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35984 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:54:20 +00:00
Uwe Stöhr
f0b79f00fc GuiTabular.cpp: fix #7006: the caption checkbox was simply not connected
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35983 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:52:08 +00:00
Peter Kümmel
8718c455a6 check also if there is a QApplication instance
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35981 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:32:59 +00:00
Uwe Stöhr
3e7d87f489 GuiTabular.cpp: add a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35979 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:20:27 +00:00
Abdelrazak Younes
8b7584846c Fix bug #6997
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35977 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:00:03 +00:00
Richard Heck
fa6118e4af Revert unintentional commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:58:24 +00:00
Richard Heck
64e77d6c14 Fix bug #6888.
This is why it was worth doing the updateBuffer() rewrite.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:57:10 +00:00
Pavel Sanda
5075f0f25f typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35973 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:24:29 +00:00
Richard Heck
9b105fc6bf Fix bug #7002. I think this is correct, but Peter should check.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 19:37:59 +00:00
Uwe Stöhr
7c2b2c464b InsetTabular.cpp: multirows are always left-aligned thus allow left alignment and forbid center alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:45:02 +00:00
Uwe Stöhr
90291acefb InsetTabular.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:12:46 +00:00
Uwe Stöhr
98b8e1eb81 InsetTabular.cpp: multirow cells are ALWAYS left aligned and thus cannot inherit the alignment of the column
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:09:38 +00:00
Uwe Stöhr
bc30270b35 InsetTabular.cpp: fix #7003 that I accidentally introduced when fixing #6958
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 16:16:40 +00:00
Stephan Witt
85b09e9d04 remove the translation context for vcs buffer info message for unimplemented features, the name of vcs info is hardcoded and ascii only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35965 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:16:59 +00:00
Jürgen Spitzmüller
9ef7efd85a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:15:38 +00:00
Richard Heck
5c9dde4d3b Had to be a typo, right?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 11:54:18 +00:00
Stephan Witt
17b3e30335 correct the gettext context for the format of the displayed error message for unknown vcs buffer-info insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35961 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 07:03:47 +00:00
Stephan Witt
81b0f275a8 correct the gettext format of the displayed error message for unknown vcs buffer-info insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35960 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 06:32:09 +00:00
Uwe Stöhr
c6fa2fa10e InsetTabular.cpp: fix #7000
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 04:30:06 +00:00
Vincent van Ravesteijn
34338c474a Remove unnecessary breaks.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:54:23 +00:00
Uwe Stöhr
fa695f939c InsetTabular.cpp: fix #6985 - we need to break after unsetting otherwise case Tabular::MULTICOLUMN: would be executed afterwards reverting the unsetting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:26:25 +00:00
Vincent van Ravesteijn
892bc7dac3 In r35952 we reverted r35933, but InsetParamsWidget.h was forgotten.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 23:59:07 +00:00
Uwe Stöhr
e882f797bf GuiTabular.cpp: apply immediately for all edit fields in the table dialog as discusses in #7001
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35953 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 22:32:53 +00:00
Richard Heck
79811671e9 Revert r35933. There are insets not based upon InsetCommand, such as
VSpace, that use InsetParamsWidget, so we cannot have code that requires
InsetCommandParams there.

Stephen Witt reported a similar crash with the info dialog.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35952 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 18:56:32 +00:00
Vincent van Ravesteijn
a59fec10ff Squash warning about unused variable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35949 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 14:41:59 +00:00
Vincent van Ravesteijn
dad3c8ce74 Fix compilation for platforms besides Windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 14:39:50 +00:00
Vincent van Ravesteijn
f90f3d146b More include frenzy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 01:26:50 +00:00
Vincent van Ravesteijn
222b3580d2 More include frenzy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35940 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 01:04:03 +00:00
Vincent van Ravesteijn
a7e2b7eea9 Remove some unneeded includes from some header files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35939 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 00:31:57 +00:00
Abdelrazak Younes
766e300f42 Migrate GuiPrintNomencl to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35938 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 20:14:57 +00:00
Stephan Witt
4b57639ad0 after successfuly load of autosave or emergency file the VCS state has to be checked for the original name
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35937 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 20:05:55 +00:00
Uwe Stöhr
30879d6553 GuiTabular.cpp: display width and alignment for multirows, fixes rest of #6958
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 19:00:23 +00:00
Abdelrazak Younes
5320ce0206 GuiLabel: generalize initialiseParams() and transfer to InsetParamsWidget as this will be used by other insets. The implementation of the new paramsToDialog(InsetCommandParams) is optional.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35933 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 18:40:53 +00:00
Uwe Stöhr
eb0c10b6b4 InsetTabular.cpp: multirows inherit the width and the alignment from the column; this fixes #6958 partly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35932 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 18:11:37 +00:00
Uwe Stöhr
eef6b32eff InsetTabular.cpp; remove SET_SPECIAL_MULTIROW because according to the multirow documentation multirows inherit the LaTeX-argument from the current column since they don't span multiple columns
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 16:36:08 +00:00
Uwe Stöhr
7c6a642f01 GuiTabular.cpp: fix #7001
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35930 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 16:26:12 +00:00
Jürgen Spitzmüller
a3a51b545c * InsetTabular.cpp:
- only set/unset a caption if necessary.

This fixes the setting of multicols via dialog (part of bug 6985)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35929 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 11:28:16 +00:00
Jürgen Spitzmüller
023afde520 * GuiTabular.cpp:
- fix console warning about unknown feature. 

Not sure if SET_SPECIAL_MULTIROW is supposed to do something eventually, but if not, specialAlignmentED should probably be disabled in multirows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35928 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 10:41:46 +00:00
Vincent van Ravesteijn
3bb31a04dd Remove saveCheckSum from Buffer::reload again. Now, the saveCheckSum call is already in Buffer::readFile, so it is not needed here anymore.
Also move the saveCheckSum declaration to the section of functions involving reading/writing. And note that it should be made private.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 23:51:13 +00:00
Richard Heck
3a4ebf380c Squash warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35923 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 20:54:26 +00:00
Vincent van Ravesteijn
eff06951a9 Centralize preview generation/deletion code to Buffer::updatePreviews and Buffer::removePreviews.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35922 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 20:00:51 +00:00
Vincent van Ravesteijn
0c9da47505 BufferList should not determine that the current author has id = 0. This should really be in AuthorList. Besides BufferList shouldn't have to create an Author by itself.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35921 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 19:27:55 +00:00
Vincent van Ravesteijn
be40bdeb3e Write code in a language that everyone understands ?
Does anyone have a clue why nvec is declared static here ? Or can I remove it ?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35920 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 19:10:54 +00:00
Vincent van Ravesteijn
e703e02db5 Compile fix in case DEVEL_VERSION is defined.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35919 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 19:07:41 +00:00
Vincent van Ravesteijn
076803fdb1 BufferList.h: adjust some comments and group the functions that are just here because they iterate over all buffers.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35918 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 19:00:06 +00:00
Vincent van Ravesteijn
e9e577f6a4 All occurrences of buf->errors("Parse") in GuiApplication an GuiView are positioned after a call to GuiView::loadDocument which already should handle any errors.
GuiView::loadDocument also already calls setBuffer(), so this is not needed everytime too.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35917 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 18:57:40 +00:00
Vincent van Ravesteijn
e82cd410c1 Pass the Buffer to GuiView::reloadBuffer. We always know which buffer we want to reload, so don't ask the documentBufferView again.
Besides, now we can always call GuiView::reloadBuffer instead of calling Buffer::reload directly. This means we don't have to do the error handling each time over and over again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35916 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 18:50:48 +00:00
Richard Heck
455ac11cfc Bit of cleanup around the Format view and edit code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35914 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 17:14:00 +00:00
Richard Heck
2b067ed466 Constness.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35913 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 17:08:31 +00:00
Jürgen Spitzmüller
3381784318 fix #6998. Center alignment is the default, also with multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35912 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 17:02:01 +00:00
Vincent van Ravesteijn
ef7ecea2b3 Move the call to Buffer::errors("Parse") from BufferView::insertLyXFile to GuiView::insertLyXFile.
Buffer::errors("Parse") is called 7 times in the whole project. 4 times from GuiView and three times from functions in other classes, but which are (almost) only called from the GuiView. 

Buffer::errors is used to signal the GUI that there might be an error occuring, but what sense does it make if it is only called from the Gui ?

Isn't it better to let the function return wether it succeeded or not and let the GuiView take action in doing something with the possible errors.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35911 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 16:51:50 +00:00
Vincent van Ravesteijn
c9a91c5474 Relay the ReadStatus all the way up to the GUI also for Buffer::reload().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35908 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 16:26:32 +00:00
Richard Heck
91b4afa3c1 This has to be delayed, since otherwise it provides the command before
the user gets to do so.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35907 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 14:31:52 +00:00
Richard Heck
16a1c042ef Fix prettyref output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35906 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 13:07:05 +00:00
Richard Heck
6fa8ea97c4 Complete Jurgen's fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35905 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 13:06:52 +00:00
Jürgen Spitzmüller
40f06a50de * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35902 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 11:33:48 +00:00
Jürgen Spitzmüller
ec1fd2a860 * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35899 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 10:15:50 +00:00
Jürgen Spitzmüller
2b604413e7 * GuiDocument.cpp:
use translateIfPossible here, since the module names might be non-ASCII
	(thanks rgh).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35898 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 08:34:26 +00:00
Uwe Stöhr
fadde98eb3 InsetTabular: implement some SET/UNSET functions as prerequisite to fix #6985
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35897 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 04:09:49 +00:00
Uwe Stöhr
b47d15cb71 GuiTabular.cpp: table caption inside table is only allowed for longtables (fixes regression to LyX 1.6.x)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35896 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:38:58 +00:00
Uwe Stöhr
c378fede8b InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35895 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:29:53 +00:00
Uwe Stöhr
a0b84e0ba0 GuiTabular.cpp: fix #6585
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35894 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:18:18 +00:00
Vincent van Ravesteijn
2bbf8e5f2d Remove InsetCommand::mailer_name_.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35893 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:46:21 +00:00
Vincent van Ravesteijn
aafe985042 Remove the now unused parameter of createDialogStr();
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35892 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:42:40 +00:00
Vincent van Ravesteijn
c5b9664476 Remove the name parameter from string2params and params2string. We can always derive the name with insetName(params.code()).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35891 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:25:28 +00:00
Richard Heck
e313d3a12b Move saveCheckSum() call to Buffer::readFile(). Also, remove the
argument from that function. We are always saving the checksum for the
Buffer's file. The argument is a left-over from a time when we did the
wrong thing and saved it for e.g. the emergency file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35890 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 22:12:29 +00:00
Richard Heck
2101b37a0f Rename invisible buffers to hidden ones, thanks to John McC-D.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 22:00:50 +00:00
Richard Heck
c4f5d8fae2 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35888 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 20:23:39 +00:00
Richard Heck
84717d0fcc Lemma definition for refstyle.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35887 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 17:35:28 +00:00
Richard Heck
d8d239cae0 InsetParamsWidget should not just ignore the initialization data. I
don't know if there are similar issues with other dialogs based on it,
but this seems to fix it for GuiLabel.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35886 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 16:31:14 +00:00
Richard Heck
c4faeb75db Comments mostly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35885 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 16:28:57 +00:00
Richard Heck
98525b5d3d Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35884 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 16:28:16 +00:00
Richard Heck
249fe0167e Took out too much in r35582.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35883 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 16:04:46 +00:00
Richard Heck
1fbddcb149 Change the way we output formatted references under refstyle to avoid
some problems with the previous \\lyxref macro.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35882 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 15:15:14 +00:00
Enrico Forestieri
8590a51f9b Fix bug #6589 (Crash when reverting to saved while cursor is in mathed)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35880 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 12:32:32 +00:00
Enrico Forestieri
3ebcbf5b32 Fix bug #6965 (Crash editing ERT in math mode)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35879 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 11:13:47 +00:00
Vincent van Ravesteijn
6d82aacf48 Remove InsetRef::isLatex. This no longer needed as we always can access the Buffer nowadays from the Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35874 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 22:34:18 +00:00
Vincent van Ravesteijn
c75d667e78 Organize header files in src\insets.
- Functions that inherit from the same baseclass are grouped together with a command;
- Functions that inherit should not have a doxy entry;
- Other functions are also grouped together as much as possible;
- Some function don't need to be implemented if they return the same as the baseclass;
- and more.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35873 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 21:35:13 +00:00
Abdelrazak Younes
716cfaea68 Another compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35872 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 20:18:50 +00:00
Abdelrazak Younes
ea96796437 Compile fix, sorry.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35871 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 20:15:35 +00:00
Abdelrazak Younes
190439eccf GuiNomencl.xxx: Rename to be in line with class name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35870 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 20:05:38 +00:00
Abdelrazak Younes
ee535fa8ea Migrate GuiNomencl to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35869 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 20:01:49 +00:00
Abdelrazak Younes
585f8b9fda Migrate GuiLabel to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35868 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 17:25:55 +00:00
Abdelrazak Younes
26dc500557 Migrate GuiHyperlink to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35867 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 17:02:42 +00:00
Abdelrazak Younes
77713af558 InsetParamsDialog: fix Restore button enabling/disabling.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35866 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 12:55:57 +00:00
Vincent van Ravesteijn
e52a8ba627 Revert r32909: make input completion case sensitive again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35864 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 08:45:21 +00:00
Vincent van Ravesteijn
49beed7437 Fix bug #6989: Be somewhat more secure with the homebrew dynamic asserts that were changed in r35855.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35863 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 07:04:58 +00:00
Vincent van Ravesteijn
faab3618ae Fix two potential crashes due to invalid static_casts.
An example of a fatal function call is "gotoInset(this, NOTE_CODE, true)". Luckily we don't check for the contents in LFUN_NOTE_NEXT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35860 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 00:42:43 +00:00
Kornel Benko
48a8d24328 Make it compilable, missing parentheses
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35859 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 19:38:45 +00:00
Vincent van Ravesteijn
afc87eb625 Let's add one step of security more here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35858 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 17:00:43 +00:00
Jürgen Spitzmüller
74b9bce881 * GuiDocument.cpp: translate module names also in descriptions (bug 6987)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35857 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 16:53:59 +00:00
Vincent van Ravesteijn
07924ac300 Remove some unnecessary static_casts and add two FIXMEs about casts that don't look safe.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35856 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 16:45:21 +00:00
Vincent van Ravesteijn
573500dd04 Remove unneccessary uses of dynamic_cast from the code.
A dynamic_cast is necessary when:

- the object to be casted is from an external library because we can't add Qxxx::asXxxx() to Qt e.g.:
    * QAbstractListModel to GuiIdListModel,
    * QValidator to PathValidator,
    * QWidget to TabWorkArea,
    * QWidget to GuiWorkArea;

- the object is to be casted from an interface to the implementing class, because the Interface does not know by whom it is implemented:
    * ProgressInterface to GuiProgress,
    * Application to GuiApplication.

A dynamic_cast can be replaced by:
  - already existing as***Inset() functions, e.g.:
    * asHullInset(),
    * asInsetMath()->asMacro(),
    * asInsetText();

  - a static_cast when we are sure this can't go wrong, e.g.:
    * we are sure that CellData::inset->clone() is an InsetTableCell,
    * in cases where we explicitly check it->lyxCode().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35855 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 15:03:51 +00:00
Vincent van Ravesteijn
8d10d82392 Buffer: Rename function names:
- rename readFromVC to extractFromVC because this function actually doesn't read anything as compared to readEmergency, readAutosave and so on.

- rename readEmergency and readAutosave to loadEmergency and loadAutosave just like loadLyXFile and loadThisLyXFile. Only in loadThisLyXFile we switch to the actually reading of a file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35854 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 13:27:06 +00:00
Vincent van Ravesteijn
6ba6d4120d Compile fix.
I forgot this in the previous commit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35853 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 13:19:26 +00:00
Vincent van Ravesteijn
f311377671 Buffer: Make Buffer::readFile() private.
It's strange to have a public interface which has a function loadLyXFile and a function readFile. A user of this class will be confused about the difference.

Therefore, loadThisLyXFile will be next to loadLyXFile to stress that loadThisLyXFile will not load another file ;). I don't know whether all of you like that this function just calls readFile, but it feels good this way. All public paths for loading a file will now go through loadThisLyXFile (i.e. the paths that come from loadLyXFile), while readFile is a pure private function. If this doesn't make sense, just shout.

I think this improves the readability of the class.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35852 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 13:17:10 +00:00
Vincent van Ravesteijn
9063402fca Buffer.h: Cleanup, Sorting, and Improvements:
- group the read and emergency/autosave functions,
- add comments to the functions,
- adjust visibility of functions,
- add FIXMEs to some functions which are still unneccesarily public.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35851 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 12:54:31 +00:00
Vincent van Ravesteijn
5518b04248 Adjust comments to the truth.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 12:34:04 +00:00
Uwe Stöhr
dbe3d79e15 InsetTabular.cpp: remove comment, we already discussed this and the star as default was the result
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35847 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 02:02:10 +00:00
Vincent van Ravesteijn
8693ae474b Proper implementatiom of isInToc()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 01:10:19 +00:00
Vincent van Ravesteijn
2e42a7b645 We don't want InsetCommand to have a function updateCommand while this is not a special function of an InsetCommand, but only accidentally a shared function of two children. So, in this case I think we should just (dynamically) cast these objecten and call their own insetCommand function.
This also fixes compilation again. I forgot to cherry-pick all commits in git ;)...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35845 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 23:20:05 +00:00
Uwe Stöhr
b7764dbe42 InsetCommand.h: revert my last commit - makes it worse than it helps as quick workaround
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35843 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 22:13:52 +00:00
Uwe Stöhr
8a4933f250 InsetCommand.h: reintroduce updateCommand from r35840 to make it compilable (this void is used in CutAndPaste.cpp); Vincent, can you please have a look?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35842 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 21:51:28 +00:00
Enrico Forestieri
f967cd1c45 Proper fix for #6967 that does not reintroduce #6793
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35841 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 21:36:25 +00:00
Vincent van Ravesteijn
6e0f8f89b0 InsetCommand.h: Reorder and add comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35840 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 20:20:44 +00:00
Vincent van Ravesteijn
f270358904 Correct toc to floatlist
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 19:53:40 +00:00
Stephan Witt
85b1bba640 in client server mode CVS does not like full path operand for directory operation; LyX is in the repo dir already, so "." is used as target
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35836 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 17:49:45 +00:00
Vincent van Ravesteijn
e48942bbbb Fix bug #6550: "Any Changes will be lost" even when there are no changes.
Patch from JOhn McCabe-Dansted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35835 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 16:10:01 +00:00
Richard Heck
3e53707570 Little bit of cleanup, motivated by need to squash a warning.
The only substantive change here is moving the markDirty() call into the
first case. If we don't load the file successfully, then there is no
need to mark dirty.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35834 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 15:33:51 +00:00
Vincent van Ravesteijn
314232d2ff Properly convert from ReadStatus to boolean.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35833 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 15:21:08 +00:00
Vincent van Ravesteijn
80a09f4ea6 Merge readFile and readFile; and readFile and readString.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35832 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 14:14:44 +00:00
Vincent van Ravesteijn
5a30a98346 Buffer.cpp:
Extract convertLyXFormat function that runs LyX2LyX.

(and some compile fixes)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35831 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:55:39 +00:00
Vincent van Ravesteijn
5f9b12ec39 Buffer.cpp:
We need to save the checksum of the requested file. Not of the autosave file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35830 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:32:38 +00:00
Vincent van Ravesteijn
aab708c594 Buffer.cpp:
- Move the saveCheckSum to both autosave file as emergency file read function.
- Extract the function parseLyxFormat.
- Improve comment about the older LyX format numbers.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35829 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:29:50 +00:00
Stephan Witt
c6d4080694 #6396 no dialog when no doc changes were done and check-in or revert is done
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35828 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:27:48 +00:00
Vincent van Ravesteijn
80a5dd8144 Buffer.cpp:
- Move some lines of code to more proper places.
- Let Buffer::readFile(FileName const &) return ReadStatus as well.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35827 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:04:13 +00:00
Vincent van Ravesteijn
c1a1d16967 Centralize the generation of the emergency and autosave filenames.
Forgot this one in the previous commit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35826 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:46:16 +00:00
Vincent van Ravesteijn
375db69d99 Centralize the generation of the emergency and autosave filenames.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35825 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:31:22 +00:00
Richard Heck
5cd48620f1 Return early again if there's nothing to do. Also, mark the buffer dirty
only if we manage to read the autosave file successfully.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35824 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:24:15 +00:00
Vincent van Ravesteijn
1d55e97b2d Oops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35823 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:19:39 +00:00
Vincent van Ravesteijn
1102636923 FFix warnings in Buffer::readString.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35822 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:18:09 +00:00
Richard Heck
1edd77ca30 Lessen indentation by returning early if there's nothing to do.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35821 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 12:14:10 +00:00
Vincent van Ravesteijn
df1c5ef611 Refactor Buffer.cpp: loadLyXFile():
- make a new function readFromVC(),
if the file does not exist, try to extract it from the version control (RCS),

- make a new function readEmergency(),
try to read the emergency file that is associated to the file we are trying to read,

- make a new function readAutosave(),
try to read the autosave file that is associated to the file we are trying to read,

- merge loadLyXFile() and readFileHelper(),
this new function now determines which file to read.

- add more ReadStatus elements to describe failures.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35819 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 11:57:56 +00:00