Commit Graph

54 Commits

Author SHA1 Message Date
8792ec7b21 Remove visual noise from include
Conflicts:
	include/framework/preventduplicateinteraction.hxx
	include/sfx2/sfxbasecontroller.hxx
	include/sfx2/sfxbasemodel.hxx
	include/toolkit/awt/vclxtabpagemodel.hxx
	include/vcl/field.hxx
	include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 09:51:32 -06:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
69388f4753 cid#707782 Uninitialized pointer field
Change-Id: I3392cc01c0f7f69d166900a0dca9a9fcef239772
2014-02-21 11:59:07 +02:00
3e971c792c sal_Bool->bool
Change-Id: Ibd5178f35d735e94065a3fbb6b61de53e53b1b0c
2014-02-14 14:15:13 +02:00
0c7f352775 remove SvStream::operator>> methods
in favour of ReadXXX methods.

Change-Id: Ic2c0a7b6b92ff4c236ae99b39d77f3d935b301e3
Reviewed-on: https://gerrit.libreoffice.org/7915
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-12 19:45:10 +00:00
ed5cf167c6 coverity#708947 Empty virtual destructor
Change-Id: I3f660aff0c53b1cd35c7ae57bde612daf0950349
2014-02-11 20:21:47 +00:00
7ab03b245d coverity#707785 Unitialized scalar field
Change-Id: If3a54628ae6dc0deb605ff075695147d6a58762b
2014-02-08 12:30:16 -06:00
618891adc6 coverity#707784 Unitialized scalar field
Change-Id: Iac0a1bb3dd01cc51d17e040a96a8c866fac01058
2014-02-08 12:30:16 -06:00
47a82e10ca coverity#707783 Unitialized scalar field
Change-Id: I7d294c217da28b45fd94fb256d8f990d0f9427f5
2014-02-08 12:30:16 -06:00
bfcd369f9b coverity#707774: Uninitialized scalar value
Change-Id: Icba50e53a162276b90c1602d22f28fa3ef42f05d
2014-02-08 12:30:15 -06:00
3bd0d1f63d sw: hardwired NS_sprm::LN_CCv
Change-Id: Ibbffd00b146369be75c462f9eea243e3582f14e6
2014-02-06 21:59:49 +01:00
a9102eba62 coverity#707781 Uninitialized scalar field
Change-Id: Ic29735bc125b2b9e662e97402dfccf72f7dedb5d
2014-02-06 15:11:56 +00:00
186b4ebc99 convert specialised SvStream::operator>> methods to ReadXXX methods
as preparation for converting the SvStream::operator>> methods on
primitive types

Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9
Reviewed-on: https://gerrit.libreoffice.org/7798
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-04 22:50:39 +00:00
2df08acc4c sw: hardcoded NS_sprm::LN_CPbiIBullet
Change-Id: I51d4638b588da290853422750b90365b454c046f
2014-01-31 10:52:10 +01:00
a797452912 sw: hardcoded NS_sprm::LN_CPbiGrf
Change-Id: I2a63d1c937392be194c00909213bc89ffe26a550
2014-01-28 21:23:23 +01:00
f0dc6cda75 bool improvements
Change-Id: Ib0f16e57ce84a40412fd95bffd4f41a113810a96
2014-01-28 20:24:40 +01:00
4520e37785 filter: add sprmids header
This was generated previously in writerfilter, but keeping around an XML
file of 8000+ lines just to generate these constants is an overkill.

Additionally, these constants are hardwired in all available WW8 files,
so they won't change. By copying it here, it's possible to incrementally
remove what's still remaining from writerfilter's not used doctok.

Change-Id: I1d30da1f635946b15a37de68080fd9eebc2ad88e
2014-01-27 20:19:14 +01:00
7649e53d6f fdo#39468 Translate German comments (include/filter/msfilter/svdfppt.hxx)
Translate remaining German comments to English.
Also remove an empty comment.

Change-Id: I11b8fad73a7a7e9bfc751d812be05d4b81784fbb
Reviewed-on: https://gerrit.libreoffice.org/7666
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-26 17:36:03 +00:00
f1ec5dcfca fdo#69616: Fix for VML part missing for group.
Cause:
 - In altenrate content, Fallback contains only group tag.
Implementation:
 - Added export logic in Vml export.
 - Added unit test case for vml group.

Change-Id: Ia1c9834950528dc892caea1cb675a7f42165d9ba
Reviewed-on: https://gerrit.libreoffice.org/7276
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-24 08:43:08 +00:00
8bb8187016 Removed unused solar.h reference in filter
Change-Id: Ieffee3f06a12836b8a01dcebe2a6dc097b35dde9
Reviewed-on: https://gerrit.libreoffice.org/7520
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-20 21:33:34 +00:00
c4ff46485f fdo#65833 Fix to preserve VML Canvas Information
Grab-bagged the "editas" attribute of v:group and added UT for
the same

Please verify this fix on MS Office 2007 as it renders the mc:Fallback VML part

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/7335

Change-Id: I4e4456997621089967514009005ee775b71d6d69
2014-01-13 17:48:18 +01:00
b55259eeb5 typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
2013-12-20 15:55:00 +01:00
8fe352be80 fdo#65836 Do not compress WMF / EMF file incase of OOXML export
Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/6849
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-13 11:49:35 +00:00
a44e42b9cd filter: handle ooxml shapes in EscherPropertyContainer::GetCustomShapeType()
The problem was that the shapes produced by the drawingML import had
types like ooxml-triangle, and EnhancedCustomShapeTypeNames::Get() only
handles VML/binary MSO shapes (e.g. isosceles-triangle). Add an OOXML
mode, and in that case use msfilter::util::GETVMLShapeType() instead,
and only fall back to EnhancedCustomShapeTypeNames::Get() if necessary.

Change-Id: Ic93ba4719133dd3e96c17d2562642a03e559fefa
2013-12-03 11:58:23 +01:00
7f9a03e1b7 msfilter: add a drawingML -> VML map
This can be used later for the VML or binary export of shapes imported
from drawingML. Note that without this, drawingML shapes won't be
exported to VML, as e.g. for a triangle it expects a
'isosceles-triangle' type, while the shype's type is 'ooxml-triangle'.

Change-Id: I59abc27febdd026c181a7ff38b16c93567058cb9
2013-12-02 19:04:18 +01:00
8dbedf1667 oox: move lcl_GetPresetGeometry to msfilter, so filter can use it
Change-Id: Ia741d392a87eaa2f02615a6c9626417a420f205c
2013-12-02 19:04:18 +01:00
8d7cb7773d Moved 'DateTimeToOString' from 'filter' package to 'tools' package
After the move now other classes can convert DateTime to OString also

Reviewed on:
	https://gerrit.libreoffice.org/6816

Change-Id: I0ceb9a5cc26103a6cb36d7765a717770ec3fbe7d
2013-11-26 14:02:02 +01:00
9f3aa81c5d Lenght -> Length
Change-Id: Ic338484627a1b74fba2d4d0794f8865290177464
2013-11-23 23:22:25 +01:00
6e9e1dfc05 -Werror,-Wshift-sign-overflow
Change-Id: I24a341ef92a41682622a3d497638b6724419a89b
2013-11-14 10:15:04 +01:00
f96cfc8ca4 fdo#65108 inter-module includes <> include/filter
Change-Id: I3ddab6b426b0dda32487e51aa5433fd21cbf21ec
2013-11-09 18:48:52 -06:00
6df9dd68ec move OOXML_COLOR_AUTO from writerfilter to msfilter, we need it from sw
Change-Id: I145c08d17ccb36bfbf734306cd9d27e8423debdd
2013-10-25 18:23:01 +02:00
1130a359cb fixincludeguards.sh: include - the rest
Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9
2013-10-23 23:22:31 +02:00
352f4f1f04 FILTER_PLUGIN_PUBLIC is not used anywhere
Change-Id: I2788bac96326f888e758a895d587125d4b8a3b3b
2013-10-12 20:03:29 +03:00
0d586f5b7e convert leftovers in filter module from String to OUString
Change-Id: If8954c39fec724066d46fe5d8c7e486d9bf6e955
2013-10-01 10:08:37 +02:00
5342cd7533 Resolves: fdo#66400 import combined characters from docx
move .doc combined character parser stuff from sw to filter for reuse in .docx

and fix bad length problem when nSavPtr == -1 after String->OUString conversion

thanks for the pasta CloudOn

Change-Id: I368ca30c14fd089271902b9b874de1099eb40038
2013-09-25 22:40:23 +02:00
98de5b40c8 Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
2013-09-25 19:24:23 +02:00
d4f46e00a8 convert filter/source/msfilter/rtfutil.hxx from String to OUString
Change-Id: Ibcea731a84e9afb62c6ce0a0e6b70017e610dc45
2013-09-17 09:04:44 +02:00
750f0ebf97 Introduce msfilter::util::findQuotedText()
This was in writerfilter, but we'll need it soon in sw as well, so move
it down to msfilter.

Change-Id: I8efe02b6bbe8f391d9e14857ed58dbae184d5632
2013-08-26 13:11:09 +02:00
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