Commit Graph

32 Commits

Author SHA1 Message Date
717aafb9ca robustify some headers
Change-Id: Id1998b240025973f43691e83cebce17449b060ba
2013-06-30 14:52:30 +02:00
ecbd3104c1 MSVC build fixes
Change-Id: I189fe3635f94fdd6b91bd7930c7abf02e70368aa
Reviewed-on: https://gerrit.libreoffice.org/4581
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:03:04 +00:00
8810d26c92 Convert all ContextHandler-derived clases over to ContextHandler2
Change-Id: I81f54e3b7d29a0807ec4c2f082ae00fd6e1d6138
Reviewed-on: https://gerrit.libreoffice.org/4580
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:02:50 +00:00
bc8f89931a Also LockedCanvasContext needs to be a ContextHandler2 now then
Change-Id: Idcc55370efbcd85f9f7142803e4cb61f3742e7fc
Reviewed-on: https://gerrit.libreoffice.org/4579
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:02:28 +00:00
c7e1845985 Further MCE work
As it is wrong (says Thorsten) to override the methods from
XFastContextHandler in ContextHandler2 in its derived classes, mark them with
SAL_FINAL to catch that (when compiling with a compiler thaty supports
"final").

Do corresponding changes then; change createFastChildContext() methods to
onCreateContext() ones instead.

Now the unit tests work, and a sample PPTX that uses embedded OLE thingies
loads without crash, but unfortunately it looks like crap...

Change-Id: Ie30022f37418ba9caf8ce59fe4003b808fa900f3
Reviewed-on: https://gerrit.libreoffice.org/4578
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:02:12 +00:00
32ce3c6b0a More OOXML Markup Compatibility and Extensibility (MCE) support
Change many classes in oox to be based on ContextHandler2 instead of
ContextHandler. That supposedly adds MCE support.

This is a minimal initial effort. It compiles and links but doesn't work
(CppunitTest_chart2_export fails). Follow-up coming...

Change-Id: If89117abd48cfead468633fd7fce1ea785f6f420
Reviewed-on: https://gerrit.libreoffice.org/4577
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:01:52 +00:00
1680a8cd4f fix hair & fine cell border export ( followon fix fdo#56960 )
1) align excel binary and oox import filter border thickness values
2) use new fine-dash border style
3) detect & determine hair vrs fine borderline on export

Change-Id: Ieb024bc6f4bfc87c525082c7b9a1f3c444f5c5ca
2013-06-24 21:08:21 +01:00
e3a8e4f221 convert the right number of elements
Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
2013-06-24 13:31:46 +02:00
76a90e69d1 fdo#43641 oox: fix position/size of LineShapes inside lockedCanvas
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc
2013-06-21 10:43:51 +02:00
0c0a9c3abb Remove redundant toplevel const
...that might be the reason the Raspbian-ARM tb broke.

Change-Id: I1c238f0bd70dd2237c66b479aa5eb79010f477ce
2013-06-15 12:44:21 +02:00
559d194d80 fdo#58819 DOCX VML export: fix shape size for rotated shapes
The problem is that we wrote the size of the shape itself, while VML wants the
bounding box here. The WW8 export ignores the rectangle given in
EscherEx::Commit(), uses SdrObject::GetSnapRect() instead and later refines the
position by using the point got in WW8AttributeOutput::OutputFlyFrame_Impl(),
see PlcDrawObj::WritePlc().

Do the same in the VML export, i.e. ignore the Rectangle we get in
VMLExport::Commit() and use SdrObject::GetSnapRect() + the point given
in DocxAttributeOutput::OutputFlyFrame_Impl() instead.

Change-Id: I5adbdf205792c87f92c1ddf1cf674f87e11eb54e
2013-06-15 10:45:11 +02:00
175d28d564 fdo#58819 VML export of mso-position-*
mso-position-horizontal, mso-position-horizontal-relative,
mso-position-vertical and mso-position-vertical-relative

With this, the watermark in the bugdoc is almost in place, if you ignore
the missing rotation.

Change-Id: I8d3d834089e734654fcbbb0fb6166b4d7e01f80f
2013-06-13 17:14:06 +02:00
c7e237045d fdo#58819 VML export: handle objects anchored in the header / footer
Previously such shapes landed in the middle of section properties.

Change-Id: I7993eaa721e2b53d8adb1cbdee40992bbeb11416
2013-06-13 12:16:11 +02:00
fecd316a96 typo correction AX_SELCTION_xxx -> AX_SELECTION_xxx
petty correct of AX_SELCTION_xxx -> AX_SELECTION_xxx but it
was irritating me

Change-Id: Iae7a0151a63502aa89f04ae54fe7348548ffd32c
2013-06-12 18:53:19 +01:00
8668453566 fix build error, reinstate WriteOCXExcelKludgeStream to export ole control
new ole export used WriteOCXExcelKludgeStream but that function dissapeared when
msocximex was stripped of ocx control import ( now we use the new filters in oox )
When that stuff was moved WriteOCXExcelKludgeStream was #ifdef'ed out

Change-Id: I370983efa5e8c4ba2b210dfb7535ea211d13a8c1
2013-06-11 14:10:01 +01:00
56ab9c1289 Resolves: #i119547# support the chart legend positon of top&&left...
just set the Anchor to Alignment_TOP_RIGHT

Found by: Shan Zhu
Patch by: zhaoshzh
Review by: zhangjf

(cherry picked from commit 8de6941efffd22214da577ff637b2522e46c7fa5)

Conflicts:
	oox/inc/oox/drawingml/chart/converterbase.hxx
	oox/source/drawingml/chart/titleconverter.cxx

Change-Id: Iad1fe1af8f93e6904759c10a9c9206fd1f1aebbb
2013-06-06 12:00:45 +01:00
25bb9d13b2 fix for fdo#53042 fix ole object macro bindings ( for xlsm )
A number of fixes needed here
a) make sure convert properties of control model is done before inserting
control model into formcontainer, need to do that to ensure that
GenerateVBAEvents is set ( so the fake VBA event generation can be
triggered )
b) remove the IsAlieanExcel check in servuno.cxx ( it's too strict and
additionally seems there is confusion over the media type to check )
c) split the vba import so that we can ensure the VBA mode is set (if
we have modules to import ) before sheets are imported and defer further
processing ( actual assigning of the modules and associated objects )
until later

Change-Id: I8fdbe788b400d7e41d4cc4b51b15f692bd7b0ecc
2013-06-04 15:29:45 +01:00
f39f7ba614 Fix issue #i120723#: Table style is lost when import PPTX by AOO
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx
* subversion/main/oox/source/drawingml/table/tableproperties.cxx
[]if the imported table in pptx just have tableStyleId, should fill the tablestyle's content.

Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by:Ma Bingbing <jiazema@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 74b1435a4d39eac71e36fb1c387b24af4b353fa0)

Conflicts:
	oox/inc/oox/drawingml/table/tableproperties.hxx
	oox/source/drawingml/table/tableproperties.cxx

Change-Id: I554169522a95343662781c3f169c6485c38a6800
2013-06-03 00:04:06 +02:00
290695c785 bnc#817956 VML import of v:textpath
Word exposes this as Watermark in its UI.

Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-29 15:56:50 +02:00
1fb61b8713 provide complete types of FragmentHandler and RecordInfo before they are used
(cherry picked from commit c73bc9587bdcf6a5d3add454fe3383fc9d2c1e65)

Conflicts:
	oox/inc/oox/core/recordparser.hxx

Change-Id: I6deecaabe32d4b071a83ce4687f83543354ddac2
2013-05-25 13:28:11 +01:00
d31d305015 bnc#820786: Best effort mapping of the OOXML patterns to our hatches.
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-23 14:27:24 +02:00
f30399c540 Revert "fdo#46808, Convert chart2::Title service to new style"
This reverts commit d256dbede60533369d1aac64cca34721183f6a8a:

For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the
direct properties of the old-style css.chart2.Title service into attributes, but
left out all the properties inherited by the old-style service from
css.style.ParagraphProperties, css.drawing.FillProperties,
css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement,
whatever that is supposed to be).  This needs more thought, to either make
available all propertiers as attributes, or none.

For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument,
sch.ChartTitle), for hard-to-debug reasons.

Conflicts:
	chart2/source/model/main/Title.cxx
	chart2/source/model/main/Title.hxx
	offapi/com/sun/star/chart2/XTitle2.idl
	sc/source/filter/inc/xlchart.hxx

Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7
2013-05-23 10:39:21 +02:00
d4d16d8a27 fdo#46808, Remove unnecessary XMultiServiceFactory member
.. and associated methods

Change-Id: Iec01b4615decc1616e405166088d7d1d844ac0ae
2013-05-21 13:53:20 +02:00
d256dbede6 fdo#46808, Convert chart2::Title service to new style
API CHANGE: The chart2::XTitled interface now takes and returns
   a XTitle2 instead of an XTitle.

Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6
2013-05-21 08:24:01 +02:00
880da6c7b7 fix userform data aware control import
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c
2013-05-09 14:11:21 +01:00
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
b399c1a38c n#592908: docx import, fixed handling of w10:wrap
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.

The fix consists in letting the w10:wrap element be handled by writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.

(cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2)

Conflicts:
	oox/inc/oox/vml/vmlshape.hxx
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
2013-04-30 09:34:28 +02:00
f9cd73ebe1 remove a few more unused variables
Change-Id: I6c70c000f60e7e6e43bd068ccb98b693b80746f2
2013-04-30 00:17:29 +02:00
d5ef883025 remove unused variables
Change-Id: I78e778408abb72772771daf5776a26f08c313ee2
2013-04-30 00:17:29 +02:00
33671ee413 export for error bars to OOXML, fdo#62312
This does not work yet as we have several validation errors in our
exported OOXML chart doc. I have to clean them up before the documents
are accepted by Excel.

Change-Id: I0bba64a9c6cab489199c8e6f04158fea7b953d0a
2013-04-29 00:15:00 +02:00
d56ba7ee6f Fix bnc#705982 - make animations inside SmartArt work.
With the fallback loading of extDrawing for SmartArt graphics,
slideshow animations into that drawingml fragment didn't work -
for it being modelId diagram references instead of plain shape IDs.

So use the modelId if present, and only then fallback to shape id.

Change-Id: Iac2b8bc16255611d7ab165b72fb251cd2a65073a
2013-04-26 13:35:25 +02:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00