[Libreoffice-commits] Changes to 'distro/suse/suse-3.6'
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 8 08:39:57 PDT 2012
New branch 'distro/suse/suse-3.6' available with the following commits:
commit c71788d2b1fa3066ac0bc326e36d693fe4770d49
Author: Andras Timar <atimar at suse.com>
Date: Thu Oct 4 16:09:16 2012 +0200
fix SUSE banner image for 3.6
Change-Id: Ie35bfafaca7217fb520c1ed49321f66f47e28139
commit cee1ed07aca36a49bab3e82f9fca89eebebaceca
Author: Andras Timar <atimar at suse.com>
Date: Thu Oct 4 08:43:34 2012 +0200
$SRCDIR -> $(SRCDIR) in distro configs
Change-Id: I2da992ed4bfd2b7869b04144a99cee00ca826e61
commit bc58d7bfd941361cf7671ecd48b9a6510c7e9173
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Sep 20 18:26:03 2012 +0200
probably a rather ugly hack for inline text frame in a table (bnc#780851)
Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1
commit 340e06c4e2c32358d0977af69714531729ff2905
Author: Noel Power <noel.power at suse.com>
Date: Wed Oct 3 10:04:29 2012 +0100
fix for fdo#55565 regression, failure to export vertical text in shape
Change-Id: If3d6413b1fb9e02dc26f930634f84712d7d08ca3
commit 21ad1ee67ac5b7ba9329189b4e7a7e115f80a6b8
Author: Noel Power <noel.power at suse.com>
Date: Mon Sep 24 09:57:57 2012 +0100
fix parent style import xlsx fdo#55198
Change-Id: I77d38eba69ad7aa89b0f9b692e40fd365d002071
(cherry picked from commit 72d3539e26f0485743126301c438bcb05b02643d)
Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
commit a8e3f0a50e0e81004ec56b9b0dabc5f3a9ec5792
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Wed Sep 26 13:10:31 2012 +0200
sw: implement page-relative size for drawing objects and import them from docx
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
oox/source/vml/vmlshapecontext.cxx
svx/inc/svx/svdobj.hxx
Change-Id: I98b5c53d4860278e3646324ca045114e37b4cf61
commit 331bc92dc42cc05bf786ed30f4548b048d98fbf1
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Fri Sep 21 17:17:33 2012 +0200
n#780563: Fixed table import in shapes table handler was missing
Change-Id: I7720cfc706d9612fcc1e8a53b13a31f22b91d99e
commit 8ef9931bd7f15e42c0e1f93b6a766262d5ad6291
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Sep 21 10:40:24 2012 +0200
n#779627: table empty cell para collapse fix with fly frames
Make sure that the collapsed empty cell paragraph is more important in
FormatEmpty than anything else (fly frames are the onle case.
Change-Id: Id88e3370e988b45eabe4b9b30628e5472e9db1fe
commit 7669dac281be48ce1d0602e7619d5936bc9f7aea
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Thu Sep 20 13:28:37 2012 +0200
n#779627: fixed writerfilter import of grid when there are nested tables
When a nested table is ended, it resets the m_nCell to 0... and thus the
filter forgets about the previous cells of the outer table row it is
importing. Using a vector to store the m_nCell values for each table
solves the problem
Change-Id: I8007960f4c95d713bfedc6b815d5783a5d25af23
commit 823512d12d268e45c4ff6b13b6ed9e0db49d1d8a
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Thu Sep 20 09:59:48 2012 +0200
n#779627: forgot to remove a debug fprintf
Change-Id: Idba155358166db358b0ef36b71a0bcf5abf77ce9
commit c091b8fc526bed051295870b8b28f73f3ac908ae
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Wed Sep 19 17:51:19 2012 +0200
n779627: docx import of table styles, why not copy the ids?
Change-Id: I72188eef689c656b56e2c19e60e0104a1e6d87bf
commit 3e6f387606971130fe8710553a4d28cadf7ef3d1
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Wed Sep 19 16:19:37 2012 +0200
n#779627: added quite some compat options from the ww8 filter on writerfilter
Change-Id: I9e8dee39f63a08517eb654e33747bd8c95d84b59
commit c3f399bacd5278895276d1c3aaafcaae63462cd3
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Wed Sep 19 16:19:49 2012 +0200
n#779627: fixed the collapse empty cell paragraphs compat option
This option didn't work if the paragraph to collapse had an alignment or
spacing defined. This fix was needed to properly import docx/doc files
Change-Id: I6b3522905714fe3def7d87cd82cca84746310793
commit 84b13cf2072f2c65cf5718726a4017434ff26c7f
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Mon Sep 17 17:42:00 2012 +0200
n#779627: support for arcsize value in VML
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
oox/source/vml/vmlshape.cxx
Change-Id: If03f36d30a7861f5d14ed3142e339d52da0bdce0
commit a023fd1367931a15e650d3c9ecba9623636ed666
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Mon Sep 3 16:52:47 2012 +0200
n#777699: Clip the objects to the pagewe are painting
Change-Id: I78ac7de5346a2adea9a2c6cf3cbb0321e05d79dc
commit a9ebdd0e3464feeea6c22ab5a84c32c1ec71e490
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Tue Oct 2 17:37:45 2012 +0200
Missing published flag for BorderLine2
Change-Id: I32223bbb6c8abb792c3e133da6eba3d57e2fc5f5
commit 06b632e384b50b8213d85369fb08b7d69ac860be
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Thu Aug 30 22:15:58 2012 +0200
n#775270: clip pictures instead of scaling they don't fit
Word clips pictures that are bigger than a page instead of scaling them
down. This patch introduces a new compatibility option to allow clipping
a picture in Writer instead of scaling it down.
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I4defbee05be81e23ec28a2ed272eaf4e4cc6faf5
commit 97feb234b590e5102b44bfe5794b4ed17901ea50
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Tue Jul 31 14:46:59 2012 +0200
n#772094: pictures was eaten by document default LR settings
Why should we take care of LR Space for SwNoTxtNode... those are
images-like contents that don't contain text.
Change-Id: I58f6d77efc01febf422073032802f57c5158a034
commit ba71c346d6ac60b2c49caed81673d4ca498a6f1e
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Aug 31 11:08:08 2012 +0200
Output typeid().name( ) in layout dump for easier debugging
Change-Id: I12c0583b73200fa9fa4d4d56be464b1467149630
commit da14d66a3d2faf52210498fda03a0957d4edc7a7
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Mon Sep 24 18:19:58 2012 +0200
n#779627: VML: import mso-position-vertical:center and friends
This allows to properly position objects that are vertically and/or
horizontally centered relatively to the page.
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
oox/source/token/properties.txt
oox/source/vml/vmlshape.cxx
oox/source/vml/vmlshapecontext.cxx
Change-Id: Ib9723b2cdf804b8a7956ea2062f66e9002d82f1f
commit 8a30806b880ae1ea6dd5c1d7998a77221adba4ce
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Aug 7 12:28:45 2012 +0200
fix test after the recent w:position fix (i.e. bnc#773061)
The value 58 was hardcoded in w:position handling before and so was
reused for the test, but now use the value that is (hopefully) correct.
(cherry picked from commit fc41a73a67a2bd30006a49d061d870533d49c0e8)
Change-Id: I1191fce9859d688a60f1b3fbdb0e704b130c1670
commit e3ea2eb7eb9100509d661f18455a7e5bb9a1bd45
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Oct 1 13:42:02 2012 +0200
n#782345 import DOCX w:splitPgBreakAndParaMark compat option
This fixes docx import of page breaks in empty paragraphs, when the
compat option in question is set.
Even empty paragraphs have an "end of paragraph" character in dmapper:
import page breaks there, instead of delaying the import till the
all-catcher importer at the start of the next paragraph.
Change-Id: Ie5c37042b3c445e0669771d15c8eb46380192db3
(cherry picked from commit 40d93d978d4f8fa709bdeb061b106122789d8e32)
commit 6bbd433294d598eca5feb3f1e8264e6b7a816396
Author: Andras Timar <atimar at suse.com>
Date: Fri Mar 30 11:05:05 2012 +0200
add missing header file
commit af272c439c252b263dc760169094f528945cd3b3
Author: Noel Power <noel.power at suse.com>
Date: Thu Sep 20 15:05:00 2012 +0100
xlsx fix cyclic referenced defined names partially fixes bnc#780296 bnc#781166
Use scoped_ptr instead of deprecated auto_ptr
Change-Id: I8dcae78d6faab29c3889e97185839d41cbc3e402
Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
commit e74c879c6f9a2d80941c11a4fb57eb9874795349
Author: Noel Power <noel.power at novell.com>
Date: Wed Aug 1 17:01:44 2012 +0100
simpler fix fo fdo#51336, bnc#757602 - change vcl checkbox no-label behaviour
Change-Id: I1563dc2afc49c7b1115192db00fbd08a7524154e
commit ee6a1c0797ca839e50d7b5ab522088d8d2f6501e
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 28 15:43:05 2012 +0100
Revert "fdo#51336 - change vcl checkbox no-label behaviour"
This reverts commit 99cad9fd7f413adecffc527d334eff616799cc4b.
commit 886ff48256948fa6117548b1fc319646beb6fb8a
Author: Noel Power <noel.power at suse.com>
Date: Fri Sep 28 15:42:55 2012 +0100
Revert "additional fix for fdo#51336 for radiobuttons"
This reverts commit aea425a8cd851e6bee02247673c8996b58789484.
commit 815ac0a036ac023986598e6aa69e05c7d241b24e
Author: Noel Power <noel.power at novell.com>
Date: Wed Aug 1 18:25:32 2012 +0100
add TabRatio api and detect macro at group shape fixes bnc#770708
Change-Id: I73eb612edaba21aa5bb07577b42bd31f8de2dd2a
commit b5d3954566cef2952993daaba212d0ea77e37747
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 28 09:51:42 2012 +0100
n#782061 DOCX import: w:position should respect w:sz in w:rPrDefault
Subscript relative font size (w:position) is in percents in Writer, but
is in half points in Word. When checking for the default font size to
count the percent value, the mapper should search font size (w:sz) not
only in direct character properties, but also in default character
properties (w:rPrDefault).
Change-Id: I9286d44c6498c765ddfee795d50921ef58b80071
(cherry picked from commit 0c8017a364efb0e8a1cab57b22257e9b319fa0a1)
commit 107036bc53870439053b0cdbcf54da3015e5801a
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Aug 7 11:37:19 2012 +0200
try somewhat harder to read w:position (bnc#773061)
SvxEscapementItem stores the vertical offset as percentage, so it depends
on the font size.
Change-Id: I1b2d5b2c230b6243a6c1a4580147c4e0c4ae94cc
commit d93b9212023361bdf206a5479ec114067ccb1524
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon Aug 6 17:55:07 2012 +0200
support for deferred property processing in writerfilter
There currently does not seem to be any sane way to process
an attribute or sprm that depends on another one that may not
possibly be there yet (e.g. in e7ab4bb6b0e83f01148ffff41e8c5eaa0c5ba0a4,
or w:position which for Svx internal reasons depends on fontsize
and thus w:sz).
So make it possible to defer such properties and process them
only before they are actually used, instead of trying to get them
out of PropertyMap, possibly in more places and possibly having
to undo the changes that have been done to them already.
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Change-Id: I1630057ecdf46443647ec1dd5253983ae15a083f
commit 5fa014dba4ab63317e6c67aa7b33df398f833d62
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Tue Jul 31 15:19:23 2012 +0200
n#772094: writerfilter, pictures anchored in header/footer won't be opaque
This dark magic is needed to have a behavior similar to the one of Word
for images anchored in headers/footers. Writer can't have pictures laid
over the header/footer but below the body text.
Change-Id: I2c001d4f696c1623370c531059b74e3d5fa4f5b7
commit 5a942930d3155ab90ff49176b384d3784416d729
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Sep 27 09:37:36 2012 +0200
n#781825 fix DOCX import of bottom para margin autospacing
If w:doNotUseHTMLParagraphAutoSpacing is enabled, it should be 100, not
200, see SwWW8ImplReader::GetParagraphAutoSpace().
(cherry picked from commit 526e007bb6340e2c4a2cb96f5612ba268fcd5583)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I29c5e97c828f0f55b655410198bfa03dc42a196d
commit 7db6af5c9efb1e89a7c0329cf5351b62ac1a8055
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Sep 26 11:14:04 2012 +0200
n#780843 fix docx import of cont section's header/footer on title page
Change-Id: I129e154a3fea8a96607dc6350a99f4d6ca68196e
(cherry picked from commit 211916f86585cb4f6258eb30e0474e4c21cd37f1)
commit 7c95a98331dcd02e3820ff3c14e90480635a24f5
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Sep 25 08:57:48 2012 +0100
n#780853 fix DOCX import of w:sdtContent in table cell
The problem was that the framePr token made the table import fail. Given
that frames inside w:sdtContent are invisible anway, just ignore them.
Change-Id: I88ab9d5dd6cf362c629de74bc079c3108725f0a1
(cherry picked from commit 73bd937420b9a99e1e35950e3f9dcbcfd874876d)
commit d5529ab1e4d2c26c7e609251e2ef2530ab56be73
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Thu Sep 20 11:49:29 2012 +0200
docx import: position table using tblInd OR tblCellMar
Previously cell-margin was unconditionnaly used to compute table position.
Office only does so on top-level tables and if tblInd is missing.
Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d
commit cefa651967578a6b56ad017272bf62d600b213e2
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Sep 19 12:06:57 2012 +0100
n#778828 fix docx import of continous section break on title page
Change-Id: Ib9e9cce5abdcf00c2546f831c8af191da10e1b15
(cherry picked from commit 1a60519fcd7706b487ceb7c5e879a81a6109f839)
commit e00739cf1d2253322c24f17b9678f59e3985d6a4
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Sep 18 12:31:31 2012 +0200
n#778148 sw: fix mouse pointer over urls with background image
Change-Id: Idbc93dfc95dfefc4c962ef36e0557a717550b7d7
(cherry picked from commit 1fe4aa6ed810d1be7b81875977da1da33e9fe4bf)
commit 30451a6c314dc44ff086e38885084b4fbd31e28f
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Sep 17 12:49:32 2012 +0200
n#778140 DOCX import of w:doNotUseHTMLParagraphAutoSpacing compat option
This reverts commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d (as it
touched values which are not in the spec) and sets the correct paragraph
top/bottom margin in case the compat option is enabled.
(cherry picked from commit a10bb9a08b7a96477eefce59f8900cf49604316d)
Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/SettingsTable.hxx
Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx
Change-Id: I152a76d8fcdef3acf5491783c2ccacd2d48e76b3
commit 29982fd31b163730ad54c414bf772e021af31e9b
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 14 17:06:47 2012 +0200
n#778140 fix import of w:fldSimple character properties
The character properties of the field are applied when the next run
begins, so insert an empty run right after the field to fix the issue.
Change-Id: I18d747d99d6604fa331a0e70e6989f9f4975eab2
commit 47eadacc10999bc60c731dcf4b80a62c4354afcb
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 14 14:54:42 2012 +0200
n#778140 as the comment says, it's 100 twips
Change-Id: If2e0d2f4805cd04bec0dd7983ec544b9922ef796
(cherry picked from commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d)
commit bfe7c587bf5e581eb74b51f951204fb2abe2c336
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Sep 14 13:03:51 2012 +0200
n#778140 enable AddParaTableSpacing for docx, as it's enabled for ww8 as well
(cherry picked from commit 5d4bd2f97128adecc5b11699e98c934be3c3a462)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I7523be9f07d378e1c4d88468077653d3fa4161d3
commit bde6bec743185b41514b5796fbc5532bc8af8b89
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Sep 13 10:01:23 2012 +0200
n#778836 fix DOCX import of right margin vs numbering and paragraph styles
The problem was that the left / first paragraph margin was defined in
the numbering style, and that zeroed out the already inherited right
margin.
(cherry picked from commit c5f9d61d45e56d9baaf6e9a91640c60d9b549aab)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Change-Id: Ife521d1de4868a7be33de5f8d6af363d10cbc903
commit aaf350c598158574a653d464fd388e20377418d8
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Sep 12 09:59:27 2012 +0200
n#778133 sw: add BackgroundParaOverDrawings compat flag
In Word, the layer that contains a background image is behind the layer
that contains the paragraph background. In Writer, the paragraph
background is painted before the hell layer. Add a compat flag to change
the order, so the DOCX importer can trigger that.
To reproduce, create an XShape, send it to the background, set some
color for a paragraph background, and notice that the background color
is missing where the shape is behind the text.
(cherry picked from commit 741132e8a60891684d40726a3d34ef784268a21e)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I94aa58fcfe47e4a2fd27d411d7e04ccce92824fa
commit b60a65e4d59c4a70f9b627b3f64c588fc6b7f753
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Sep 10 15:38:07 2012 +0200
n#778148 SwEditWin::MouseButtonDown: prefer url over hell frames on ctrl-click
To reproduce, create a large XShape, put it to the background, set wrap
style to 'through', then add some text, including a hyperlink. Click
should select text, ctrl-click should select the hyperlink, or in case
the text is normal, the shape.
Change-Id: I6cd62af30b58555f8b58c7db4648444fceba83dc
(cherry picked from commit 3925a10d4784cf5966c5ee182dd64296b1cfba21)
commit 861a2d7602c3bb5a74c61ec318ab9ba10c5c218a
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Aug 30 09:11:17 2012 +0100
n#777337 fix DOCX import of title page top/bottom margin with headers/footers
SectionPropertyMap::PrepareHeaderFooterProperties() already backed up
m_nTopMargin to have the same result when that method is called multiple
times. Do the same for the header footer height values as well to match
the WW8 behaviour.
Change-Id: Ib2347abc3db39308900c7721c0e15de040d9a01f
(cherry picked from commit a474559ff1e560b83952f00595dbd8ae7fde88b6)
commit c4461be541f89918efe77546def18835ef90c490
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Jun 28 13:06:52 2012 +0200
dmapper: better fix for import of titlepg top/bottom margin
This commit reverts the fix for fdo#44176, and implements a better fix,
which keeps the original testcase passing, but also fixes the layout of
a simple document, having different first, odd and even headers within
the same section.
Change-Id: I96893ce3e886e479f1d7640b126ad7a1dd828bdb
(cherry picked from commit 45e60ae3120b81e2987151a8485766c2fa946d48)
commit 4da461814f158a6ec150700474a191adbce21e9a
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Aug 30 16:44:56 2012 +0200
n#777337 SwEditWin::UpdatePointer: fix mouse pointer wrt. background images
When the image is in the background, just show the normal text cursor,
since we're able to select text as well in that situation.
Change-Id: I4b4303834245e402d40567cff4a2bf53a0a13e5e
(cherry picked from commit 1223dd3bc84899d8f77c46340c46565ca74cbe1b)
commit ce3063ae2eba1fa283677b4889024bc265d63dd9
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Aug 28 15:52:42 2012 +0200
n#777345 import imagedata of v:rect elements inside OLE objects
(cherry picked from commit 5dc095f0432befcde9d407c1ec1fbce0830afb16)
Change-Id: I300bb5d3008b839f6ec63a4435f5ce8c1dd0a2c1
commit 47a971230b629b7e124044de0789ade7987db848
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Aug 27 14:06:12 2012 +0200
n#775899 docx import of w:usePrinterMetrics compat option
This was set unconditionally, but it turns out it's not the default for
docx, it's triggered by a compat flag there as well.
(cherry picked from commit 93cdd851ee5917fa95e78d84734c73055b0edc4e)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I84dccfe7ffd49fbc6878b19ff4276f8a36b827a3
commit 681fbb8eb275db4fd2bf7357819e8a991b734109
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Aug 27 13:07:05 2012 +0200
n#775899 docx import: set PrinterIndependentLayout like ww8 does
(cherry picked from commit 926fe8298be1a2d4a22277a5e9ecf4e2582b0b21)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I32869aa3d7b6b25c7eb9756d79ea7126130afc4b
commit cbf529659b1aaa9f4806462d5ea5ac8db1c876c2
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Aug 23 12:11:08 2012 +0200
n#775899 sw: add FloattableNomargins compat flag
The DOCX filter imports floating tables as frames containing a table.
Word ignores the margins of paragraphs next to such a table, Writer does
not. Add a compatibility flag the import filter can set that triggers
this weird behaviour.
(cherry picked from commit 50a1df360c907d8419ce49f098b6bc87a37a9956)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: Iaaa1d2a2e2f9d0eaea17832b2e418f9a845efffd
commit 453821351238d81f7707c4e205a6ed82f884eca5
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Aug 21 17:58:24 2012 +0200
n#775899 SwXText::convertToTextFrame fix for multi-paragraph tables
The problem was that when we only had a table inside the frame, the
DelFullPara() call removed the last paragraph of the first cell, and
returned no error. Instead, check if we had to remove paragraphs both
before and after, and if so, use the manual remove all the time.
Change-Id: I9a3591ce9a92a2aca7d2f65b62fdf641f54e4f05
(cherry picked from commit fd99896fcd4826e5326fe01dd28f168cf1844fd4)
commit ca7b41e7e0d11768957f2211656f93ba4a6f75fc
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Aug 15 16:31:51 2012 +0200
n#775899 initial docx import of w:vertAnchor inside w:tblpPr
(cherry picked from commit edc4861a68e0269b83b17e0ec57912a1ce4220ad)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
Change-Id: I5c848a8d4c860a83d6729b8db40f744afad906d5
commit d624809600adf874e954f57a305afe5cf354ea0e
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Tue Aug 21 16:15:09 2012 +0200
n#775899 SwXText::convertToTextFrame fix removing fake paragraph
In case the textrange contains a single table, the DelFullPara() call to
remove the ending fake paragraph failed. When this happens, we now find
the paragraph in question manually to delete it.
Change-Id: I7055d4489192a8a694aef118f7646d8db87a64df
(cherry picked from commit 12ce1c3a06e07f16fefe11fce9ae35c94ef657e7)
commit f91d0026c903e911c82b6acd7eed475a9a85deaf
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Aug 23 17:10:41 2012 +0200
n#775906 dmapper: fix inherited first/left margin vs w:ind/w:right
This is similar to 89f208c, but here the direct right margin reset the
left/first margin, inherited from the numbering style.
Change-Id: I2d238740c24db7607719dcefb17565656592be44
(cherry picked from commit 9133794932fc2ba221f1167fd539479951ed6a6c)
commit dfaa2a0274c301bdc658c08caac8234549428a77
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Aug 8 18:07:03 2012 +0200
n#774681 SwFltControlStack::NewAttr don't extend font name / size attributes
Regression from commit b3cee382, the bugdoc is an example of why those
can't be optimized with the current method. (Yes, it is somewhat
special, after a resave in Word, the bug is no longer there.)
Change-Id: I4b5e82b13242726d6df47c447642ca8916aa6f31
(cherry picked from commit 9eb05aa6883ea41fb1d1dad2f7f1870e8e63ce32)
commit 9837e432eae2a40bf67a68440bd236c8ab6a4f61
Author: Andras Timar <atimar at suse.com>
Date: Mon Sep 24 12:12:33 2012 +0200
fdo#54276 speed up packaging on Windows significantly
See the bug for more details.
Change-Id: If77544f2fbec2793b6edb015d9447569c6a4e215
Signed-off-by: Fridrich Strba <fridrich.strba at suse.com>
commit 5438fcb9d3be756a83097e9feec3a89c1cd3ed20
Author: Andras Timar <atimar at suse.com>
Date: Thu Sep 27 18:35:40 2012 +0200
explicitly --disable-gtk for Windows and MacOSX
Change-Id: I0b90350cd1fb9221213e052c1b0f5605663f5090
Signed-off-by: Michael Meeks <michael.meeks at suse.com>
commit 605ff1d958f489e63a70614b8f4b34e8f5b17fce
Author: Andras Timar <atimar at suse.com>
Date: Thu Jun 7 10:52:46 2012 +0200
[SUSE only] add real SUSE EULA (English)
Change-Id: I612e4181bce48658cb0acdfb109eb10ec1aa3774
commit 1c4f3627d56564bd23c62d595cdb94b89fd8e6b5
Author: Andras Timar <atimar at suse.com>
Date: Wed May 9 21:06:12 2012 +0200
[SUSE only] add EULA (dummy text for now)
Conflicts:
instsetoo_native/util/openoffice.lst
readlicense_oo/makefile.mk
Change-Id: I3a4ed94dbd5cf1c31e082f25d2fa63e201333885
commit de51e1a4e8cdd7fcfc193cc84b9ad3322b386ece
Author: Andras Timar <atimar at suse.com>
Date: Mon May 21 12:08:58 2012 +0200
[SUSE only] ARP Summary Information for Novell
Change-Id: I7573e4507cd420b70b7bafc590e0743a1dd55ef4
commit f1dd42ac6441c2954d6ecd87b8ce2f3132f20cd7
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 28 12:24:11 2012 +0200
[SUSE only] remove MySQL Connector extension from AppUp build
Change-Id: If7476f7ce18be4bc8b4672136382445247eaee30
commit 9093b8395c8561bbc5a4b607e0a0578e1b1696a0
Author: Andras Timar <atimar at suse.com>
Date: Tue May 8 19:22:37 2012 +0200
adding notes regarding the special requirements of Intel AppUp
commit 869a7c409a977775c1a40f141943eb7d36a037d3
Author: Andras Timar <atimar at suse.com>
Date: Tue Jul 3 11:27:20 2012 +0200
move comment to correct place in BorderLine2.idl
Signed-off-by: Miklos Vajna <vmiklos at suse.cz>
Conflicts:
offapi/com/sun/star/table/BorderLine2.idl
Change-Id: I4618f91b0a000c6bece39936a97a5e3ce13b0925
commit cda84f0a8f8b496a301008af7e5734f010928032
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 28 11:49:21 2012 +0200
[SUSE only] SUSE black and white branding images
Change-Id: Iadd0fcdb9e9521047f73cc43b0dd63e7fd8a5288
commit cb4ce6edb2448540c60ed26e8a490fd6b7d8fc7d
Author: Andras Timar <atimar at suse.com>
Date: Sun Jul 22 09:11:14 2012 +0200
revert fc1e9f253dd07362065f2be9691be89fb9b3f84f
I don't know, if it made sense, but it definitely broke MSP
patch creation in SUSE environment, so I reverted it.
Change-Id: Ib6cea4a59993b4edadabfa1fdca42264a8eb2311
commit b34db791b704e79b0af6f3d541bd4ab4e43d4cae
Author: Andras Timar <atimar at suse.com>
Date: Fri Jul 20 22:55:26 2012 +0200
work around unexpected behaviour of msidb.exe from SDK 7.1
Change-Id: I48cfa19c40140dc81b105e27051f99e8f1a0c8ae
commit f73fc79601b07b4d1a660b76ef3fb674fc6c53b6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Jul 22 00:20:39 2012 +0200
[SUSE only] update info fields of libreoffice.pcp
Conflicts:
setup_native/source/packinfo/libreoffice.pcp
Change-Id: I50f67688bef7fe359b3fb589bd08c68ee37bc922
commit 7a3f15d5892a5d6b4b6805ba3e5b5b7c2fc0f59b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue May 8 15:42:54 2012 +0200
novell-win32-xp-fpicker-detail.diff, bnc#620924
make it possible to set file open dialog default to "details" on XP
commit 1a8ba3e16e437a9d4b1061a8ec98af8260717936
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 27 17:29:04 2012 +0200
bnc#777181 open XML in Writer
Change-Id: I3766ca977d1c09b562e4c74dcf3adc078a550941
commit 4e014747f0057a64d19acc0963ae927f083c47b0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 19 10:55:35 2012 +0200
set MSP name
Change-Id: Ib1120ea82a8e3e9d15d524ff413a1342dec3dad0
commit e1d3fd15ad49bb5aada335b930b66cbce5d6e1ca
Author: Andras Timar <atimar at suse.com>
Date: Sat Jul 21 10:43:33 2012 +0200
install help xsl files unconditionally, needed for MSP patch creation
Change-Id: Iec60fca2895cffac34290dc8db8954b95dda6606
commit 2ff127f4d536f2633d28ccfce126d092a1b9c524
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 28 10:15:04 2012 +0200
[SUSE only] SUSE and AppUp distro configs
Change-Id: Ifa970848051df4737d11f9749fe6f87f7192d73c
commit 3763faef4a39d43de6935e6bb2ac165f0351ab12
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Sep 26 20:01:20 2012 +0200
don't access out of bound array index, fdo#55022
Change-Id: Ica088822055b2fb5bbd6dabe6482b7cb6c472c48
Signed-off-by: Michael Meeks <michael.meeks at suse.com>
commit 81f3a43d70dd23661b30036ca510a6a0da78b616
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Sep 24 16:09:10 2012 -0400
fdo#55298: We should only treat empty values as continuation of previous ones.
For better Excel compatibility.
Change-Id: I3bc44f65127d3f020894dc29e5c6549bb257f218
Signed-off-by: Noel Power <noel.power at suse.com>
commit f0dd1a5ebcb2bd4a04a5b5f4cf6f1d10d08f88a8
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Sep 24 15:29:01 2012 -0400
fdo#55297: Fix regression in chart complex category placements.
This is effectively a revert of a769fd1ec076b61c1ce2f84da87283cc637dd5d5
and a1be31fd8bf830a4f5961e690bcffd050782e210 which unfortunately caused
regression in complex category placements.
This unfortunately re-introduces fdo#44832. We need to re-think how to
fix that one without breaking the multi-level category feature.
Change-Id: I1ed8364a46174ac6c29aa0b027a33f84bcca51fa
Signed-off-by: Noel Power <noel.power at suse.com>
commit 0afcd2c90d2ddd174404bcd809a684b6d9420f63
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Sep 22 01:34:38 2012 +0200
set conditional format range for xls import, fdo#54555
Change-Id: I43d1834d28534fc0ec8cb406e1be7e9f48074da2
Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
commit e3e1b274389d77137d32b6d8b29e2bcab9e2dd2b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Sep 22 04:44:35 2012 +0200
some more fixes for ScRangeList::DeleteArea
Change-Id: I7f4cf6b053d7cff85e46ecf51cbf8a327530de67
Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
commit 653176b757e02c109632512bde70fb21004bb812
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Fri Sep 21 20:39:40 2012 -0400
Backported fixes for several bugs found in ScRangeList::DeleteArea().
Change-Id: I9875485008d021dd7a0605e4b7e350345d367a69
Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
commit d53aaa983637f6e121fddbb531b637a6703733f9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Aug 31 04:02:10 2012 +0200
Backport various conditional formatting fixes from master.
Change-Id: I52987e957918853bcd1abd1460c6166b52454d62
Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
commit 418cc49f717dac87bbf1d76e455d818680fed8f1
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Sep 27 23:35:40 2012 -0400
Revert "fix crash when updating conditional formats, fdo#54498"
This reverts commit 5343c2fc6d00c75226ddb78b5300d3e34db53ddb.
commit 07fcd21f3a7697bd019ddefd93c0f0b0071c9b58
Author: Andras Timar <atimar at suse.com>
Date: Thu Sep 27 13:09:54 2012 +0200
set version for the initial SUSE 3.6 build
Change-Id: I5ce3e920885def19b93ae103b63b9c5dfef6d94e
commit c599c168a3afaebdccc6ea363bb89c1b29cd14e4
Author: Andras Timar <atimar at suse.com>
Date: Wed Sep 26 22:12:26 2012 +0200
Branch suse-3.6
This is 'suse-3.6' - the stable branch for the SUSE 3.6 release.
It will be used for the official maintenance update for SLED, openSUSE,
and Windows.
We want here all safe L3 and other important fixes.
Only safe changes are allowed.
Change-Id: I0841df1f143de7a517f913e4a3ec2751fe1d8ee4
More information about the Libreoffice-commits
mailing list