Commit Graph

336491 Commits

Author SHA1 Message Date
Jan Holesovsky
d62b71bdde Prevw -> Preview.
Change-Id: I93cd8e27d5f16fe62a1434e3667fc7cc06c62e08
2013-10-16 16:57:22 +02:00
Armin Le Grand
dfa1afd0e8 i123485 secured file import scanning existing pages
(cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036
 and adapted to the rewritten scanBuildPageChainCache)

Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162
Reviewed-on: https://gerrit.libreoffice.org/6272
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2013-10-16 15:55:05 +00:00
Tor Lillqvist
4d392f9132 Bin a line of dead code
Change-Id: Iebbb7e5200977e9c89cbd213cb78613d3d0f3ba4
2013-10-16 18:14:24 +03:00
Eike Rathke
7693a4b9fb Resolves: rhbz#1015594 CVE-2013-2924 use-after-free
Added icu.10318.CVE-2013-2924_changeset_34076.patch from
https://ssl.icu-project.org/trac/changeset/34076 assigned to
https://ssl.icu-project.org/trac/ticket/10318

Change-Id: I93a33e59aec9b79fb8d4b1517cd0990c79ee65fb
2013-10-16 16:13:21 +02:00
Miklos Vajna
628f572791 writerfilter: initial import of numbering styles
Change-Id: I81205ae7010ab776cd1880f779af2f623e290da9
2013-10-16 15:52:47 +02:00
Stephan Bergmann
15cbc3e54a Unwind useless comphelper::ByteSequence typedef
Change-Id: I59317a0d591eac188fa01636031e907357038c29
2013-10-16 15:42:59 +02:00
Tor Lillqvist
22fbb71b5c Use ln -f to avoid warnings about existing files
Some libraries exist both in solver/*/lib and in their
UnpackedTarball/foo location.

Change-Id: Ie312479069738b27900bd4d7021ede986d94f22a
2013-10-16 16:39:49 +03:00
Tor Lillqvist
a2f51cf9f4 Drop the set -x
Change-Id: I014202fa48a211499b0290e6236bbdc96ad247a8
2013-10-16 16:39:49 +03:00
Tor Lillqvist
795dcf9da4 Make libc++ optional for iOS and use the right library in the Xcode projects
It seems that using libc++ when building with Xcode 4 (and iOS SDK 6)
you get linking errors. Stick to libstdc++ for now then with that.

Propagate the choice to the iOS Xcode projects through the lo.xcconfig
file.

Change-Id: Ic61dd2336066a77c4219c532106e3e50e85d0689
2013-10-16 16:39:49 +03:00
Caolán McNamara
687275db4c canvas is null under Xdmx so createBitmap fails
Change-Id: Ia7ce38ef07e6225ce785fab580343dfcd7ecb948
2013-10-16 14:37:01 +01:00
Tor Lillqvist
ea8028a575 For clarity, prefix the LO-specific Xcode configuration variables with LO_
Change-Id: I196feb392f9ebebfdcd6f6e0ecd2c9cc89707cbb
2013-10-16 15:58:15 +03:00
Bjoern Michaelsen
99f8cf1221 fdo#70393: move libpng to a subdir of external
Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 12:51:10 +00:00
Stephan Bergmann
ca216af0fa Improve test
Change-Id: If0983696bf9a44bda6edeb746c121446106a95c5
2013-10-16 14:43:27 +02:00
Tor Lillqvist
529ab4e735 Get rid of PRODUCT, unused I hope
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
2013-10-16 15:38:29 +03:00
Andras Timar
7ee2ce24c4 fdo#69548 do not remove last space from hyperlink target
Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I7efd68fe21dddd7d9262d3e0b7400db67504e6bc
2013-10-16 13:21:32 +02:00
Caolán McNamara
f9768de91e CID#1103764 uninitialized scalar field
Change-Id: I828ab50e11546ba5f183e27dbff8ba87827bb426
2013-10-16 11:59:51 +01:00
Caolán McNamara
d70b46c163 CID#1103768 uninitialized scalar field
Change-Id: I05ce7f66ca76345eabb660a12d9cd85a34ef55dd
2013-10-16 11:59:51 +01:00
Caolán McNamara
9ad3316530 CID#736195 out of bounds
Change-Id: I9a644a52146eb33248762c65c71fbd9a187490b7
2013-10-16 11:59:50 +01:00
Caolán McNamara
8df4f86d27 CID#982804 out of bounds
Change-Id: I134944d8c4a1312f65ff7c3df98d8828bfc96b15
2013-10-16 11:59:50 +01:00
Caolán McNamara
557de68e96 CID#982805 out of bounds
Change-Id: I58b6a1738c2039e863f1446cbfa17d1138523694
2013-10-16 11:59:50 +01:00
Caolán McNamara
5d6fc7d3fb CID#1103722 resource leak
Change-Id: Ia08a0c8d4366bde572a7438ceff687f6028b066e
2013-10-16 11:59:50 +01:00
Caolán McNamara
f4b293d577 CID#1103728 malloc(1)
Change-Id: I89bbd213b7eddd5c55d4c8768929add326a63722
2013-10-16 11:59:49 +01:00
Ariel Constenla-Haile
3c54ef67ac Resolves: #i123481# - Paragraph should have a language to mark it localizable
(cherry picked from commit 6f9694374143ce181353b44df1d9da78d7dd7cc1)

Conflicts:
	readlicense_oo/docs/readme/readme.xrm

Change-Id: Idfa47f97ad84ad5b3bb9414ee9e3b89e693501f6
2013-10-16 11:59:49 +01:00
Ariel Constenla-Haile
831e35610c Resolves: #i122759# Pass the Sequence by reference
Despite it's name, rProperties, the Sequence is not a reference in the
function signature.

Besides, some small improvements:

- instead of compareToAscii, use operator==, which is  optimized for
performance
(cherry picked from commit a17e221225915c140c7840904cb9b46d75731edc)

Conflicts:
	cui/source/options/optsave.cxx

Change-Id: Ifffd2b9014210c885f03ff8116ea97625b903cba
2013-10-16 11:59:49 +01:00
Armin Le Grand
500822eeb4 Resolves: #i122738# corrected update of FillStyle/FillAttribute UI elements
(cherry picked from commit 2fc5d2946561258b012b80443cac025d851afda8)

Conflicts:
	svx/inc/svx/fillctrl.hxx
	svx/source/tbxctrls/fillctrl.cxx

Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea
2013-10-16 11:59:49 +01:00
Caolán McNamara
255cfbbeaa Related: fdo#38838 remove unused String::Append varients
Change-Id: I158c171d39756d1949427b3a45d685a194d9fb63
2013-10-16 11:59:48 +01:00
Stephan Bergmann
0522b84769 Straighten the removeFragment code again
...what apparently happened is:

(1) First, 2c6363eb16 "Be less pathetic" replaced
    MediaDescriptor::impl_normalizeURL with removeFragment.

(2) Then, b378e754ae "CMIS: fix file saving issue"
    (plus follow-up b50d3727cf "WaE: unused
    function 'removeFragment'") removed calling removeFragment at all (but re-
    introduced a now bogus "Parse URL! ..." comment that (1) had removed), which

(3) 34f4d25749 "CMIS file picker: it really does
    not like ID Mark" tried to revert again (but kept the bogus comment in), and

(4) odd commit 319b160320 "CMIS file picker: it
    really does not like ID Mark" (that looks like a merge conflict resolution
    gone wrong) erroneously re-introduced MediaDescriptor::impl_normalizeURL
    that (1) had removed, which caused a -Wunused-variable warning that

(5) 706c5a54f6 "-Werror,-Wunused-variable" tried
    to fix, but working under wrong assumptions.

The solution is to go effectively back to the code as it was after (1).

Change-Id: I62dfa9fa3adbea6b2cb10a509416fe3797c577b9
2013-10-16 12:43:46 +02:00
Stephan Bergmann
a0b389d682 -Werror,-Wlogical-not-parentheses
"logical not is only applied to the left hand side of this comparison"

Change-Id: I015befe47ea9f40f83217b259e07eb01edb7d820
2013-10-16 12:36:11 +02:00
Jacobo Aragunde Pérez
3f8e73a36a sd: Fix output for unit test file n819614.pptx
Change-Id: Ida2d2bab3a30beaa8e686a23355e4d6f41182f3f
Reviewed-on: https://gerrit.libreoffice.org/6257
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-16 10:24:26 +00:00
Andres Gomez
c0e3574ce0 oox: added methods to lock Smart-Art edition
Added the possibility of rendering the basic shapes generated for a
Smart-Art into a bitmap and replacing them with it in order to not
letting to edit the Smart-Art. This possibility is controlled using a
configuration parameter located at Options -> Load/Save -> MS Office
-> SmartArt to LibreOffice shapes or reverse.

Made the "oox" library to depend on the "drawinglayer" and "svx"
libraries.

Made the "ooxmlexport" C++ unit tests in the "sw" module to depend on
the "drawinglayer" and "svx" components.

Fixed to set to diagram type a new "oox::drawingml::Shape"
representing a Smart-Art in the "getShape" method of the
"oox::shape::ShapeContextHandler" class.

Added the "keepDiagramCompatibilityInfo" and "renderDiagramToGraphic"
protected methods to the "oox::drawingml::Shape"
class. "keepDiagramCompatibilityInfo" is now called after an instance
of type "FRAMETYPE_DIAGRAM" has added all its children in the
"addShape" method and the proper setting is in place.

"keepDiagramCompatibilityInfo" substitutes previous similar code in
the "createAndInsert" method and also calls "renderDiagramToGraphic".

The "renderDiagramToGraphic" renders the basic shapes in a Smart-Art
into a PNG image and replaces these basic shapes with a new
"GraphicObjectShape" filled with the new PNG image. It also sets the
"MoveProtect" and "SizeProtect" properties of the
"GraphicObjectShape".

Change-Id: Ie4002238ff5fae758a5881b03735bf1f0721ed5b
Reviewed-on: https://gerrit.libreoffice.org/6059
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-16 10:24:13 +00:00
Jacobo Aragunde Pérez
2eba5391d3 unotools: add menu option to enable/disable Smart-Art lock
The point of this menu option is that locked Smart-Art shapes would
preserve the original XML files attached so they could be exported
back to docx with no loss.

The new menu option is located at Options -> Load/Save -> MS Office ->
SmartArt to LibreOffice shapes or reverse.

Change-Id: I6aafc2eb83404ee2c0b8538b2f6fbbbd4363e7d3
Reviewed-on: https://gerrit.libreoffice.org/6138
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-16 10:24:00 +00:00
Andres Gomez
b3362fc9cb sw: Smart-Art related UTs updated to new option
The "ooxmlexport" unit test for Smart-Art has been updated to just
check for the new rendered bitmap that substitutes the generated basic
shapes.

The "ooxmlimport" has been updated with a new "testSmartart" unit
tests which checks that the importing has been done to just basic
shapes.

For this, the "run" method has been customized so we can set the
proper filter option.

Slightly modified the expected results in the "testChartProp" unit
test since linking it to additional libraries has modified the
dimmensions of the imported chart in few units.

Made the "ooxmlimport" C++ unit tests in the "sw" module to depend on
the "drawinglayer" and "svx" components and the "utl" library.

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I0900a50cfee07999511d071bc9932477ad9430c5
2013-10-16 12:23:34 +02:00
Jacobo Aragunde Pérez
09edaa05cd cui: allow lines in MS filter section to have independently enabled checkboxes
An extra InsertEntry method is added with parameters to enable or disable the
load and save checkboxes independently.

Change-Id: I49233ce31e2eaf361310f89887dcede86dec0edc
Reviewed-on: https://gerrit.libreoffice.org/6137
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-16 10:22:30 +00:00
YogeshBharate
764432e36a Code changes & unit tests for fixing multicolumn section separator line issue
Problem Description: In case of multicolumn sections, separator line was getting added during export to docx.
Unit test cases added to verify the code changes.

Change-Id: Id65ac4d3878eed298882c85082cec9575f914d83
Reviewed-on: https://gerrit.libreoffice.org/6211
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-16 09:08:12 +00:00
Stephan Bergmann
7a3381c2a8 CID#1000838 Fix overrides' exception specifications
Includes also fixes for
CID#1000839
CID#1000840
CID#1000841

Change-Id: I4c7d0bbaec59357af722353bdf947f5629dde1b0
2013-10-16 10:04:44 +02:00
Thomas Arnhold
e7841b6245 fdo#45777: handling of whitespaces in hyperlinks
Remove leading and trailing whitespaces in the hyperlink dialog, because
the resulting links would be unusable.

Change-Id: Icf617daf51508a37494536e02fb298fb3cf746c5
2013-10-16 06:17:09 +02:00
Thomas Arnhold
aa2d011acd fdo#45970: "pale green" is not green at all
Was like Cyan 10 before. Now it's like Green 10...

Change-Id: I7ec9b884b53fb0ab2a5a0c3d09cb8b2789037234
2013-10-16 05:41:55 +02:00
Thomas Arnhold
67aec43915 cleanup
Change-Id: I7bfd221f89718ba8634417c93a26b3a199178694
2013-10-16 05:41:26 +02:00
Thomas Arnhold
d6f18c0949 remove some stuff
Change-Id: I766c01c3ea4c03f4c76ef70fd16037d8196242a1
2013-10-16 03:29:30 +02:00
Thomas Arnhold
d4ae0d8d30 HTML: always export CSS option for font size
This removes some kind of a hack. Before this commit the CSS
option was only exported if the size didn't fit any HTML size
option. Maybe size could be dropped in the future.

Old:

<font size=7 style="font-size: 66pt">Text 1</font>
<font size=5>Text 2</font>

New:

<font size=7 style="font-size: 66pt">Text 1</font>
<font size=5 style="font-size: 18pt">Text 2</font>

Change-Id: I360038b01e0ccc5b408ff726646f91da5555db50
2013-10-16 03:29:30 +02:00
Tor Lillqvist
1204d2ff81 Adapt to changed directory structure in fundamentalrc
With this change, the MobileLibreOffice app builds and runs for me.

Change-Id: I8c7ce3fdedced5eb82ed18e21873e773733d612f
2013-10-16 01:57:52 +03:00
Tor Lillqvist
0d9c32a8df No "registry" directly at top app level any more
Change-Id: Idc81f4913a96938f1fdd2644cc9e34a07554bb21
2013-10-16 01:43:39 +03:00
Tor Lillqvist
5b0577885a No mlo_select_all(), probably left out accidentally from Ptyl's commit
Change-Id: I1859f6c05f371fccdd39f903d663d5a452866876
2013-10-16 01:39:49 +03:00
Tor Lillqvist
de547ccdde Use libc++ here, too, as we now do for the LO code
Also quotes added by Xcode around library names that contain
nonalphanumerics.

Change-Id: Ie5b34b2da0ec5600e9ca1aba1e17efd7e3e087de
2013-10-16 01:36:10 +03:00
Tor Lillqvist
892ebc079a Add dummy touch_ui_keyboard_visible()
Change-Id: Ib3de4092f48e16ac88108d6a69a04baf92a82de1
2013-10-16 01:35:28 +03:00
Tor Lillqvist
0aca32e4c0 Ignore the lib_link and resource_link dirs
Change-Id: Ib30199e3f193f9b98e9f0e2ec0d76953abf39a14
2013-10-16 01:12:42 +03:00
Tor Lillqvist
a359bc887a Adapt library names and paths to current build system
For many 3rd-party libraries we have for some time already kept the
archives only in their build directories, under workdir's
UnpackedTarball. Also, we now use upstream names for them which often
contain a verison number.

Change-Id: I51888de287e2c352a890bd4ae1dfdf0c6dc77158
2013-10-16 00:49:49 +03:00
Tor Lillqvist
4eddef42f3 Linking changes: Adapt to changes in build system
Link libs from where they are now. Yeah, a third place where we
tediously list this (also in solenv/gbuild/platform/IOS_ARM_GCC.mk and
ios/Executable_LibreOffice.mk, although the latter will probably now
go away when/if the experimenatl iOS app is superseded by this
MobileLibreOffice app).

Also, don't duplicate the lib_link directory, and don't use a path to
the randomly-named DerivedData directory.

Change-Id: I7b685085d07da18a4594db067fb586b4eb3d2d4a
2013-10-16 00:34:03 +03:00
Tor Lillqvist
4afeb5c4ad Adapt to recent changes in solver/instdir/workdir structure
Change-Id: I1286feafa1a11fe30aa4f8383c094661aa10db92
2013-10-16 00:17:00 +03:00
Tor Lillqvist
f42245a1c0 Use OUTDIR and INSTDIR in the shell script
Change-Id: I400fc5d0d572b3eab99f8da20162de1191cf3a53
2013-10-16 00:17:00 +03:00