Commit Graph

16 Commits

Author SHA1 Message Date
f384875119 #119467# Form controls cannot be saved into .ppt file in AOO3.4
Reported by: Du Jing
Patch by: Jianyuan Li
Review by: sunying
2013-06-26 16:45:28 +01:00
c7876a2c4f Resolves: #i119520# right brace shape not displayed after save to .doc
Reported by: louqle
Patch by: Jianyuan Li
Review by: sunying

(cherry picked from commit 8be633def896c74867b9f9dcc929d7d210b4f192)

Conflicts:
	filter/inc/filter/msfilter/escherex.hxx
	filter/source/msfilter/escherex.cxx

Change-Id: I3311aad033ca321397c596452d60de5a7c58e223
2013-06-15 15:50:46 +01:00
131486a9ad removed unused variable bSuppressRotation
(cherry picked from commit b7a63f1dc7c1ddab8092f1b7b9641923aa857579)

Conflicts:
	filter/inc/filter/msfilter/escherex.hxx

Change-Id: I66b664c26d5db2dae2deea36490350d40deb3ccd
2013-06-12 17:16:52 +01:00
c76974576a share spPaperSizeTable ( and associated access code ) in msfilter
PageSetup.PaperSize implementation more or less copy&pasted the
papersize conversion code from oox, this is a followup to remove
the duplication. ( Probably the binary filter could be converted
to use this also saving yet another nearly similar implementation )

Change-Id: I479f0322163161f7819c5d650a9511910ac2e781
2013-06-07 16:39:39 +01:00
cd582f922b Resolves: #i119631# Teardrop shape cannot be shown correctly in pptx
* subversion/main/filter/inc/filter/msfilter/escherex.hxx
* subversion/main/filter/source/msfilter/escherex.cxx
[]check whether one shape is default shape of ppt by shape type
* subversion/main/svx/inc/svx/msdffdef.hxx
* subversion/main/oox/source/drawingml/customshapegeometry.cxx
* subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
[]add definition and declaration for tear drop
* subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
[]the content of tear drop shape which incudes "path, adjust value, handle"

Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Zong Dongjun <zongdongjun@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>

(cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6)

Conflicts:
	filter/inc/filter/msfilter/escherex.hxx
	oox/source/drawingml/customshapegeometry.cxx
	svx/inc/svx/msdffdef.hxx

Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0
2013-05-31 10:53:10 +01:00
c05c16635b Resolves: #i119753# fix audio video object lost when save .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li

(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)

Conflicts:
	filter/inc/filter/msfilter/escherex.hxx
	filter/source/msfilter/escherex.cxx

Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
2013-05-27 10:23:07 +01:00
88b8bd644e Resolves: #i119874 Fixed text alignment in RTL layout
This reverts commit 979def88090633bfee0e0445b19999a1dac71ed4,
this time manually confirmed that the import layout does change, but that it
appears to be all desirable changes

Change-Id: Iee5e5ebd16989f65569b02f8b4f6570985157dfc
2013-05-25 12:11:51 +01:00
979def8809 Revert "Resolves: #i119874 Fixed text alignment in RTL layout."
This reverts commit 54c679f481647890f18151f4db05cfc3eff5d98b.

pushed that too soon before verifying if it does what it says
it does
2013-05-24 20:58:32 +01:00
54c679f481 Resolves: #i119874 Fixed text alignment in RTL layout.
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 57fdcdd79d1682ee7d5e88fbab3803631496afa2)

Conflicts:
	filter/inc/filter/msfilter/svdfppt.hxx
	filter/source/msfilter/svdfppt.cxx

Change-Id: I6adae6d40ff106caeea2b9310a57228257d79404

Related: #i119874# Missing part of patch.

Patch by: Jianyuan Li
(cherry picked from commit a7dc3e8b82c87b138c973f1434717d634ed8dc67)

Change-Id: Icff3e1167ab780612ad47775aaa39c9baa99c70f
2013-05-24 18:55:27 +01:00
0982b526bf Resolves: #i120554# Shape Gradient MS2003 import/export Enhancement
Reported by: Jianyuan Li
Patch by: Jianyuan Li
Review by: SunYing

(cherry picked from commit 09c33de80a0e5fa321979e53bf88c4d17271eba8)

Conflicts:
	filter/inc/filter/msfilter/escherex.hxx
	filter/inc/filter/msfilter/msdffimp.hxx
	filter/source/msfilter/escherex.cxx
	filter/source/msfilter/msdffimp.cxx

Change-Id: I80a60af4862eb99523ea59e4f788b685d6de1fbd

WaE fixes: reorder initialization, handle all cases in switch, ...

(cherry picked from commit 350f294badf378806348e77e6a8ed0b5f1d5b77d)

Conflicts:
	filter/source/msfilter/msdffimp.cxx

Change-Id: I4f1bde463921d48d1e014d0521427eaa9294663e

Add default to switch statements to avoid compiler warnings.

Patch by: Jianyuan Li

(cherry picked from commit f1302af0d803ca969022e69bcf7deeb62459f789)

Change-Id: I4e78e3b565d5922d452d2cfd1bf473af1587d29b
2013-05-20 15:56:19 +01:00
1a357b7394 fdo#64586: Fix incorrect import non-empty placeholders + unit test.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
2013-05-15 09:43:07 +02:00
4bba859817 bnc#758621: Kill unused aPlacementId, it is never set.
Based on work of Felix Zhang <fezhang@suse.com>, thank you!

Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
2013-05-12 18:05:57 +02:00
b5465ea163 Revert "bnc#758621: show preset texts in slide placeholder"
This reverts commit 95bb951826c7fbaafb055008416f4f1d5cfc95dc.

Mid-air collision :-)  I've been working on an improvement based on this patch
when Muthu pushed it - the following commits are based on the Felix's work,
thank you Felix!

Change-Id: I12d649219911815e6b97d62f4584fa4d258d8917
2013-05-12 18:05:26 +02:00
95bb951826 bnc#758621: show preset texts in slide placeholder 2013-05-10 18:10:46 +05:30
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01: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