Age | Commit message (Collapse) | Author | Files | Lines |
|
Create a table with a merged cell like in the screenshot in the
bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following
lines are painted:
debug: paint start
1 debug: start: 2749,1488 end: 12387,1488
2 debug: start: 2749,1945 end: 7567,1945
3 debug: start: 7567,1945 end: 12387,1945
4 debug: start: 2749,2015 end: 12387,2015
5 debug: start: 2749,2542 end: 7567,2542
6 debug: start: 7567,2542 end: 12387,2542
7 debug: start: 2749,1488 end: 2749,1945
8 debug: start: 2749,1945 end: 2749,2015
9 debug: start: 2749,2015 end: 2749,2542
A debug: start: 7567,1945 end: 7567,2542
B debug: start: 12387,1488 end: 12387,1945
C debug: start: 12387,1945 end: 12387,2015
D debug: start: 12387,2015 end: 12387,2542
debug: paint end
*11111*11111*
7 B
7 B
*22222*33333*
8 A C
*44444*44444*
9 A D
9 A D
*55555*66666*
The problem is obviously that the Y coordinates of the lines 2, 3
and 4 differ; they should be on the same Y position.
The problem here is that logically horizontal lines must be painted
not centered but "below" the line, and It turns out that
SwTabFrmPainter::Insert cannot correct the positions properly to
do that, because it only looks at borders in a single cell.
When using the UI to set the borders, we get (for innner table borders)
only a bottom border in the cells, but no top borders, so the
top position of the logically vertical borders needs to be corrected
with the width of the bottom border of the cell _above_; a symmetric
correction of the bottom position to the top border of the cell below
is also necessary.
Fortunately if we just leave the positons alone in Insert then
TabFrmPainter will eliminate duplicate lines with equal positions
and so it's only necessary to correct the positions when actually
painting the line in wTabFrmPainter::PaintLines,
where we have the neighboring lines available.
(cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f)
Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
(cherry picked from commit a6d01758da37af1d6bab9c14197134ce410d9408)
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Eike Rathke <erack@redhat.com>
|
|
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
(cherry picked from commit dd1bc101f93107c021fa180f23bda7ace0c5e6a3)
Change-Id: I9f80d5be700c94cf5993243903a70295d2545868
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: Ida7920c3196105f7f8aab519da12e79135839345
(cherry picked from commit 859018061956b1937c7be3809a9858cbd610fa9c)
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
(cherry picked from commit 48d61f4ad1eb4f8a031e65c3fcbebc5023d600e9)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Eike Rathke <erack@redhat.com>
|
|
Change-Id: Ie12e5b11196b1b0f919bd18f28a0b86f60cc6513
Signed-off-by: Takeshi Abe <tabe@fixedpoint.jp>
|
|
Use w:defaultTabStop in w:settings instead.
Change-Id: I7056ff0ee8574fd942e2f330a1f76bae657a825e
(cherry picked from commit 15af925c254f27046427de70a59011e2ac3d6bdb)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee
(cherry picked from commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
This change seems wrong as the end position is actually behind the
CH_TXT_ATR_FIELDEND; fortunately it is also unnecessary because
the change in MSWordExportBase::OutputTextNode is sufficient to
fix the crash.
Change-Id: I79d508b13ecc8d85c4e09149b44695436416ba6d
(cherry picked from commit f2b6d71ccd04f41a849a0e5386f6619bfcc211da)
|
|
(cherry picked from commit 190ca072fc1c8679c586867582c816d98016f343)
Conflicts:
sw/source/core/doc/number.cxx
Change-Id: If50a09a14ad30fa3dcb587d6e59a5a0d161394b1
|
|
Word uses a completely different definition of "width" of a double border
than OOo and ODF: for Word the width is apparently the largest of the 3
component widths, while OOo and ODF define the width as the total with of
all 3 components. The new border implementation in LO 3.4 was apparently
inspired by Word's double border definition, which resulted in
various import filter regressions, see the previous fixes:
36e43b52992735c622833e923faa63774b9e2f76
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8
These fixes set the ScaleMetrics, which actually seems sub-optimal as
there is a ScaleItemSet function somewhere that apparently re-scales
all items in an itemset, which could undo the fixes.
Also, one of the fixes actually managed to break RTF/DOCX import
of double borders, as that ended up in the same code via the API.
This commit now reverses the change, so that the width of a border is
now always the total with of all components, which is (imho) much more
intutitive, and also leads to a consistent UI where selecting say 3pt
width has predictable results, no matter what the border style.
The border widths are now converted in the Word format import/export
filters (writerfilter and sw/source/filter/ww8), and various tests
were adapted to the new handling.
(cherry picked from commit 2d045cdb69176b280812dda0b813371cf1ac72e2)
Conflicts:
sw/qa/extras/ooxmltok/ooxmltok.cxx
Change-Id: I50456c49b1a298569607e6c88f19f18441348ac3
|
|
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67
(cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
|
|
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae
(cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
|
|
A bit differently this time around:
+ remove Credits menu item from menu
+ remove License button from the About dialog
Conflicts:
cui/source/dialogs/about.cxx
Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294
|
|
For borders in vertically oriented text it's necessary to correct
positions at different sides, i.e., right and left instead of
top and bottom; refactor SwTabFrmPainter::Insert some more
to handle this properly.
Change-Id: If20b9477415e9bd12e63aab4eed2f070065eb473
(cherry picked from commit d0bbbfdef6b31650a351883de09b5338562048a2)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
There is a special case for i#9860, which is for first line in follow
table (i.e. continued on new page) without repeated headlines:
Here the bottom border of the cell is used as the top border in case
the cell does not have a top border; this is fixed now with a bit of
refactoring, so the correct half width adjustment can be made.
Change-Id: I58ef81b7e13544014ef75973ea793f673a242488
(cherry picked from commit 3a4b7c3555f2ffb4e89502bb04ff063d8c08f628)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
In a table with collapsing borders, the horizontal borders need to be
painted "below" the reference line, and not "centered" on the line like
the vertical borders.
a0486f02433703744f487e599422714d03937956 was apparently an attempt to
fix this, but unfortunately it adjusted both top and bottom borders
with the top border width, which has horrible results if the top and
bottom borders have different widths.
Change-Id: I7605eda6ef8111612ceb1ded79c0811de9ca7b25
(cherry picked from commit aa8240e80394887a4af45710de69aacacec66d25)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
The problem was that a page break has been always exported when the page
style changed -- but in case the page style changes just because of
"first page"-like styles, we don't need that.
Change-Id: I15527c8d3a2d1c441b4817cf94d61ea68dc5f92c
|
|
Change-Id: I1fb7e3d9d65f2f3388bb4851f5ad517ed1681f04
|
|
Change-Id: I022556acd0891cf24963d667d34f366496453630
|
|
Change-Id: I5f0e7aefdea80bbb9cf61b991c5b706bd2023dfa
|
|
StringRangeEnumerator (i.e. user's input) contains page numbers in a different
page range (it excludes empty pages). So:
- first map page numbers to a common range, then compare
- user's input can't contain empty pages, remove this check
Change-Id: I4fce5215272fc90f39c9e05d3f3604734a8aebe3
(cherry picked from commit db053e48d2ca17e1256eb12500f075488483603b)
|
|
Change-Id: I2350adf98e12b9c9cda4c18a6ba9f935016ac299
Signed-off-by: David Tardon <dtardon@redhat.com>
|
|
Use vector<shared_ptr> instead of ptr_vector.
Change-Id: I4e7d0735cbb036c608f697f7418109a2c497982f
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
|
|
Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
We were ignoring redlined (deleted) text when counting characters, but not when counting
words or characters without spaces. We now mask all redlined/hidden content from the
expanded node text before operating on it.
Change-Id: If882a6dde883a2ba0ca99909ca7ac2b9abd4a1fb
|
|
Change-Id: I3358fad4949c2c21ecf63983a36b7c8428df9f06
|
|
Regression from commit ed8b5f2d -- to be safe, reverted only for fly
frames in headers.
Change-Id: Ia538b69bb913567c7d087d40afc7f0a141b7a0ed
|
|
Regression from commit 2ad707b3, which only updated the import, but
forgot to remove the fake "in background" property on export.
Change-Id: I2b42c5fa7873d946b10d311800049586bc214071
|
|
The border widths are tripled on import, because that is effectively
what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8
Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba
(cherry picked from commit 36e43b52992735c622833e923faa63774b9e2f76)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
There was a typo in the character counting code of text nodes. When a numbered list is detected, the code attempts to add the character count of the "item number" to the total count, but ends up overwriting it instead (uses '=' instead of '+='). This resulted in the item number strings to be the only ones counted in a numbered list.
Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4
(cherry picked from commit a585863f013aa4207270e11f5e031126adf1ed4a)
|
|
Word vs. Writer difference: if the only portion in a line is a fly
(as-character shape) and the height of the fly is smaller than the
height of the line, then Writer sets the height to the height of the
fly. Word takes the max of the two values.
We already have IgnoreTabsAndBlanksForLineCalculation for Word compat
wrt. line height calculation, use that here as well.
Change-Id: Iebe1bc697d6f19a03d15a1e5fd25ab4d5f4898fd
(cherry picked from commits 563df5d0c3c696912f211e74dd4dbda1aa720ae7 and
11a54814be785766d797cc83cfdacd2368ea642c)
|
|
Change-Id: Ia42060d415516a1ba8e23f913875786fe27c9710
|
|
Change-Id: I99a4a2a3fc6e20f9c8d35213609075f2269eab2f
|
|
The dmapper part was already fixed in commit
9486851baea59d16c449d79bd61a38f6e686cfe0 for DOCX, this fixes the RTF
tokenizer.
Change-Id: Iaca706e50367bb744f5a03e15134bda1646df8fc
(cherry picked from commit b9508dd55f82d35f09a58021dc001cf79b390e08)
|
|
Change-Id: Ia80e0bc0540259f9a752452ad677c645c97fc7f5
|
|
This will turn the mouse cursor into an arrow cursor when the word count
is updated, which seems odd.
Change-Id: I136824a554cc31e302193cce58241cdf4e4dd281
(cherry picked from commit 78b61b4d944db7f00093d7ee250d234694f1d5b5)
|
|
(Also fixes fdo#50540 View area jumps when start drawing)
The word count code for the status bar was calling EndAction, which scrolls the view to focus on the cursor.
We were calling it directly (Start/EndAction) and indirectly (through SwWrtShell::GetUpdatedDocStat). I removed the
direct calls and replaced the SwWrtShell call with SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.
Change-Id: I764e8c2d9c10f8eb685d36d0e26142cf3fee628c
(cherry picked from commit a8080cad1089431a2d97903f73623eabe2eb23a7)
|
|
Change-Id: I4c11c82df0fdbf0040729323dc1fda2ece7f2582
|
|
Change-Id: I0584f4d158225dc28518fb67185d0a704bfe10d1
|
|
Change-Id: I0f237c360cfaa02c6492cbd95ebfd07657e04fd0
|
|
This reverts commit 2a22e664811e10ca58ec66ba8fd10b1a6185c178.
i don't have an opinion whether this commit is wrong or right,
but nobody has time to investigate the layout changes that it causes,
so since it's not a regression itself it's safest to revert it.
|
|
Change-Id: I952fa56cb8cef0321688ccd117659c8603f71e16
|
|
Change-Id: Ic012ba427febb305269d9138dd918455aa49c712
|
|
Make "export extended ODF" consistently mean "version > ODF1.2".
Future ODF versions need manual review anyway, of the various
changes/additions we ship.
Change-Id: I0f6c1646b306e18f0abcdd1a1802fece821b2e93
|
|
Change-Id: I504d3b0ac6250b88ca3de3cad179a7caec35e2a5
|
|
If a word is in sentence case then the auto-completed word should
be in the same case i.e. if the auto-complete list contains the
word "LIBRE" then "Lib" should auto-complete to "Libre" rather
than "LibRE". See OpenOffice bug 22961.
Also implement better i18n handling for calander month and day
names. Previously, if a month or day name was not ASCII then it
would only auto-complete if it exactly matched the names retrieved
from the internal calander i.e. had be a case sensitive match.
Change-Id: I0c4543bd9e912072bce1ceaf4adecd41b55b576b
|
|
Note that the replacement vector stores all strings first and then
sort and "unique" are applied (ASCII treated as case-insensitive).
Previously strings were inserted sequentially and only the first
version of a string would be stored (case-insensitive ASCII
comparision). This should have no material impact as the strings
retreived from SwAutoCompleteWord are already unique (case-
insensitive ASCII comparison) and the capitalization of the string
is generally changed anyway to match the capitalization of the word
to be auto-completed. Also, there appears to be no logical reason
to store the first inserted version of a string over of the first
version post-sort.
Change-Id: I132865bbb9b382d417fb2cff9de351fdb2cbfb13
|
|
Update calls to factories to use new ::create methods
Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
|
|
Change-Id: I7924da4bff73ca8f82c76eb8cb211401530acdeb
|
|
|
|
|