Commit graph

694 commits

Author SHA1 Message Date
Julien Nabet
104badf31c Resolves: fdo#49178 CRASH when FILEOPEN particular RTF
Change-Id: Idd938980b91ec8b822a92dfd7013a20fe5b6f498
2012-06-12 19:51:44 +02:00
Miklos Vajna
9b0be41e96 n#766477 dmapper: import NS_ooxml::LN_CT_FFCheckBox_default
Change-Id: If7edb301fa90a49d79fc5322a7c19ee2591f5494
2012-06-12 16:54:48 +02:00
Miklos Vajna
61ba6e49f5 fdo#49659 dmapper: handle tables in substreams
Change-Id: I4c81eb1ec57bda2b5ce65b19de998bab2dfb6c3c
2012-06-11 17:04:48 +02:00
Miklos Vajna
9e8957de20 n#757905 fix VML import of mso-wrap-style:none
There were two problems here:
1) SimpleShape::implConvertAndInsert() did not set the anchor type
2) DomainMapper_Impl::PushShapeContext() tried to overwrite it

Change-Id: I2c32016c4bb15c891cf287d8208e10817c6291e6
2012-06-07 10:59:51 +02:00
Noel Grandin
b3c76dee6d fdo#46808, Adapt UNO services to new style, Part 7, updating ::create
Update calls to factories to use new ::create methods

Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
2012-06-04 16:57:55 +02:00
Norbert Thiebaud
c2966ec959 targeted string re-work
Change-Id: I17bec612eb6d50acc4bf8ac8ea4299fd2380afb5
2012-06-02 16:48:36 -05:00
Norbert Thiebaud
d5d29accb7 targeted string re-work
Change-Id: I910a508722a309d7916377a7e2df2093070809ad
2012-06-02 14:55:58 -05:00
Julien Nabet
80d5a21acb Fix some Prefer prefix ++/--
Change-Id: Ief7279a06ffbdd0e23fac28f8948daea4023823c
2012-06-02 01:41:38 +02:00
Miklos Vajna
6e770b1619 n#764005 VML import of absolutely positioned pictures should not be opaque
Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
2012-05-31 14:45:55 +02:00
Miklos Vajna
0a412cc13e n#764005 dmapper: don't insert "at page" anchored graphics as "as character"
Change-Id: Ibdde32014d2fc2fe43d59a5cc6ee7f722adcbfb6
2012-05-31 14:45:48 +02:00
Michael Meeks
d4fac516c2 targetted revert of small prefix operator changes
Change-Id: I02e9af0034f4e9ed626615083c7c1506597f2a7e
2012-05-31 13:09:04 +01:00
Miklos Vajna
9486851bae n#760764 dmapper: don't ignore character properties of text fields
Change-Id: If1497d78b8c31a4b2e5677bb57f40a0343a819a9
2012-05-29 19:30:24 +02:00
Miklos Vajna
028d56943c writerfilter: read dgm:relIds element and its attributes 2012-05-29 09:11:51 +02:00
Luboš Luňák
d4798414f2 handle column break in .docx properly too
related to d8cac25ed29dbeca16161f62173a7e341793b8b6

Change-Id: I56b02a450e96acec0346d6a36c29ad8e0326b0c8
2012-05-24 17:59:44 +02:00
Luboš Luňák
e1ff97ab62 remove number of -I directives in writerfilter
Windows length path limitations strike again, and this should reduce the total
argument length.

Change-Id: I76fefabc8201e51494a7003d7ca4f9fd92ffa3b9
2012-05-22 08:53:36 +02:00
Julien Nabet
c53812a1b7 Some cppcheck cleaning
Change-Id: Ic30cdeffabec1eb1a6c153ac450a3d28064ef534
2012-05-20 15:25:37 +02:00
Michael Stahl
76cec6c3fd work around spurious signed overflow warnings
g++ (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5:
/com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow
does not occur when assuming that (X - c) > X is always false
[-Werror=strict-overflow]
2012-05-18 16:33:19 +02:00
Miklos Vajna
50cb166702 fdo#49940 dmapper: handle m_bTitlePage when m_nBreakType is zero
We used to ignore m_bTitlePage in this case, resulting in wrong
'Default' page style for the first page, instead of 'First Page'.

Change-Id: I1899354fb39db4f0eb663fd5233395f2d4a5e72a
2012-05-15 09:02:15 +02:00
David Tardon
dfe0baa281 do not crash when opening rtf file with unclosed field group
It still fails to load the file (General input/output error), because
RTFDocumentImpl::resolve() throws io::UnexpectedEOFException, but that
is a bit better than a crash .-)

Example of such a file can be found in fdo#49666 or rhbz#819304 .

Change-Id: I I1e575bf8e3194afe063297a4daf3e98eaaa510cc
2012-05-14 15:02:02 +02:00
Noel Power
2dee7d6205 Revert "another partial fix for bnc#693238" ( and fixes fdo#44292 )
This reverts commit cd1c434c4b.

Conflicts:

	writerfilter/source/dmapper/PropertyMap.cxx

Change-Id: I I83ae3418438aa02db744e6b6eb5a9c199938c91f
2012-05-11 09:55:36 +01:00
Luboš Luňák
20a8768b1c .docx wrap values mean different things than in LO, map them (bnc#750838)
Change-Id: Ic355ae9993702c37c958ea16d8d97e6ef4892dcd
2012-05-04 20:19:38 +02:00
Luboš Luňák
042da09216 finish handling of w:pStyle in numbering (bnc#751028)
Now each such numbering should be properly assigned to the given paragraph
style.

Change-Id: I97a796dfb3f4a46f0fee0663852b3a40c3eaa922
2012-05-02 17:42:24 +02:00
Luboš Luňák
d776f9433b set as outline numbering only those ones that are for headings (bnc#751028)
w:pStyle in a numbering does not necessarily mean it is for outlines,
normal styles can specify numbering too

Change-Id: I0953d94833760ddf4edbe759a19192c477a57bf3
2012-05-02 16:45:48 +02:00
Luboš Luňák
7d327f66db bin unused macro
Change-Id: I796aba0ee431309e44671a6d851c84cd35dae3b6
2012-05-02 16:45:46 +02:00
Luboš Luňák
7ef5e1ceba don't overwrite numbering properties with paragraph properties (bnc#751028)
Part of bnc#751028, that is. The origin of this function is unclear,
without good repo history, and it's a question if it is still needed
after my previous fixes for bnc#751028 that fixed applying some of numbering
properties. Keeping it there just in case, but prevent it from overwriting
w:ind that's been read from the .docx file.
2012-04-28 11:24:16 +02:00
Caolán McNamara
cff388eb4b WaE: msvc2008 unused variables
Change-Id: If956faf42dcc5625c490e685d6ca69bb07e00188
2012-04-27 13:40:10 +01:00
Luboš Luňák
fb68711fc3 fall flat on the face when doing UNO call with incorrect arguments
I think this is reasonable with debug builds, the import filter
should check the values are in sensible ranges.
2012-04-25 17:25:07 +02:00
Luboš Luňák
a9e16b168c don't use properties that aren't valid for paragraphs (part of bnc#751028) 2012-04-25 17:25:06 +02:00
Luboš Luňák
c953267dbe handle w:suff correctly
that includes having a good default value, otherwise the whole
creation of the rule in ListDef::CreateNumberingRules bails out
with IllegalArgumentException
2012-04-25 17:25:01 +02:00
Miklos Vajna
5f32957bc3 use PropNameSupplier in SectionPropertyMap::PrepareHeaderFooterProperties() 2012-04-25 12:17:13 +02:00
Miklos Vajna
5dd8e91934 n#757890 dmapper: paragraph properties of shape text should have limited scope 2012-04-23 17:04:50 +02:00
Caolán McNamara
b92de73fdd WaE: MacOSX itemZOrder may be unused uninitialized 2012-04-17 20:11:50 +01:00
Luboš Luňák
0a9161263b implement relativeHeight (z-order) in .docx import (part of bnc#747461) 2012-04-17 13:57:05 +02:00
Luboš Luňák
6242b36b78 remove unused variable 2012-04-16 18:44:00 +02:00
Miklos Vajna
8adbd3df42 dmapper: parse NS_ooxml::LN_CT_Zoom_percent token
The VisibleBottom and ZoomType properties are just set as it seems
without that, SwView::ReadUserDataSequence() ignores the ZoomFactor as
well.
2012-04-14 23:36:20 +02:00
Miklos Vajna
9a8c2db542 dmapper: log unhandled attributes in the settings table 2012-04-14 23:36:20 +02:00
Miklos Vajna
fd1bef82a9 dmapper: use PropNameSupplier in SectionPropertyMap::CloseSectionGroup() 2012-04-14 16:52:45 +02:00
Miklos Vajna
0ef7dbcb36 dmapper: fix import of odd/even page breaks 2012-04-14 16:43:04 +02:00
Caolán McNamara
234f150f30 Resolves: fdo#48640 handle various busted rtf docs without hanging 2012-04-14 12:47:23 +01:00
Luboš Luňák
c4fbb03608 implement wp:docPr title and fix descr 2012-04-12 17:11:36 +02:00
Miklos Vajna
b0edaff7e2 fdo#44176 dmapper: fix import of titlepg top/bottom margin 2012-04-11 11:17:35 +02:00
Szabolcs Dezsi
d6bc02f8c4 Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator 2012-04-06 20:03:42 +02:00
Szabolcs Dezsi
743f22045c Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:

find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
2012-04-06 15:07:41 +02:00
Szabolcs Dezsi
8a01ee6243 Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:

find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
2012-04-06 14:30:05 +02:00
Miklos Vajna
1cb2730981 n#751017 dmapper: fix handling of GetExpression and SetExpression fields 2012-04-05 12:08:57 +02:00
Takeshi Abe
643a582793 removed duplicate #includes
in vbahelper / writerfilter / writerperfect / xmlhelp / xmloff / xmlscript / xmlsecurity
2012-04-04 01:39:08 +09:00
Brennan Vincent
290654cc23 Fix RTF levelfollow import and export 2012-04-03 09:17:48 +02:00
Caolán McNamara
8a539e49c4 ditch some UniStrings and intermediate temporaries 2012-03-26 12:18:08 +01:00
Miklos Vajna
51cfbf0cfa n#751054 fix VML import of absolutely positioned pictures
There were multiple issues here:

- convertEmuToHmm() not handling negative values
- position:absolute style property being ignored
- mso-position-vertical-relative is not converted to
  text::RelOrientation
- SwAnchoredDrawObject::_SetPositioningAttr() re-positioning already
  positioned objects
- DomainMapper_Impl::PushShapeContext() inserting positioned objects as
  character
2012-03-22 11:03:26 +01:00
Michael Stahl
cc99bb9f38 writerfilter: PropertyMap: speed this up a bit
Using XMultiPropertySet reduces the number of SwTxtNodes created for the
bugdoc from rhbz#789022 from ~5k to ~3k.
2012-03-21 12:08:33 +01:00