summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-16fdo#70393: move libpng to a subdir of externalBjoern Michaelsen
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-16Improve testStephan Bergmann
Change-Id: If0983696bf9a44bda6edeb746c121446106a95c5
2013-10-16Get rid of PRODUCT, unused I hopeTor Lillqvist
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
2013-10-16fdo#69548 do not remove last space from hyperlink targetAndras Timar
Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I7efd68fe21dddd7d9262d3e0b7400db67504e6bc
2013-10-16CID#1103764 uninitialized scalar fieldCaolán McNamara
Change-Id: I828ab50e11546ba5f183e27dbff8ba87827bb426
2013-10-16CID#1103768 uninitialized scalar fieldCaolán McNamara
Change-Id: I05ce7f66ca76345eabb660a12d9cd85a34ef55dd
2013-10-16CID#736195 out of boundsCaolán McNamara
Change-Id: I9a644a52146eb33248762c65c71fbd9a187490b7
2013-10-16CID#982804 out of boundsCaolán McNamara
Change-Id: I134944d8c4a1312f65ff7c3df98d8828bfc96b15
2013-10-16CID#982805 out of boundsCaolán McNamara
Change-Id: I58b6a1738c2039e863f1446cbfa17d1138523694
2013-10-16CID#1103722 resource leakCaolán McNamara
Change-Id: Ia08a0c8d4366bde572a7438ceff687f6028b066e
2013-10-16CID#1103728 malloc(1)Caolán McNamara
Change-Id: I89bbd213b7eddd5c55d4c8768929add326a63722
2013-10-16Resolves: #i123481# - Paragraph should have a language to mark it localizableAriel Constenla-Haile
(cherry picked from commit 6f9694374143ce181353b44df1d9da78d7dd7cc1) Conflicts: readlicense_oo/docs/readme/readme.xrm Change-Id: Idfa47f97ad84ad5b3bb9414ee9e3b89e693501f6
2013-10-16Resolves: #i122759# Pass the Sequence by referenceAriel Constenla-Haile
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-16Resolves: #i122738# corrected update of FillStyle/FillAttribute UI elementsArmin Le Grand
(cherry picked from commit 2fc5d2946561258b012b80443cac025d851afda8) Conflicts: svx/inc/svx/fillctrl.hxx svx/source/tbxctrls/fillctrl.cxx Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea
2013-10-16Related: fdo#38838 remove unused String::Append varientsCaolán McNamara
Change-Id: I158c171d39756d1949427b3a45d685a194d9fb63
2013-10-16Straighten the removeFragment code againStephan Bergmann
...what apparently happened is: (1) First, 2c6363eb16f50a8cfd81bc8511554af4f9e06478 "Be less pathetic" replaced MediaDescriptor::impl_normalizeURL with removeFragment. (2) Then, b378e754ae892a044460cfbe33ccc2e51c01f5ca "CMIS: fix file saving issue" (plus follow-up b50d3727cf336bb536efe7bf067f484ddf864e9a "WaE: unused function 'removeFragment'") removed calling removeFragment at all (but re- introduced a now bogus "Parse URL! ..." comment that (1) had removed), which (3) 34f4d2574987b272681b5843e8f5edc374f55fde "CMIS file picker: it really does not like ID Mark" tried to revert again (but kept the bogus comment in), and (4) odd commit 319b160320a045b1a5b302dafbc2220ee1d4d3c3 "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) 706c5a54f662ea58e3b3a64f189eb5120191152a "-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-Werror,-Wlogical-not-parenthesesStephan Bergmann
"logical not is only applied to the left hand side of this comparison" Change-Id: I015befe47ea9f40f83217b259e07eb01edb7d820
2013-10-16sd: Fix output for unit test file n819614.pptxJacobo Aragunde Pérez
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-16oox: added methods to lock Smart-Art editionAndres Gomez
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-16unotools: add menu option to enable/disable Smart-Art lockJacobo Aragunde Pérez
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-16sw: Smart-Art related UTs updated to new optionAndres Gomez
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-16cui: allow lines in MS filter section to have independently enabled checkboxesJacobo Aragunde Pérez
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-16Code changes & unit tests for fixing multicolumn section separator line issueYogeshBharate
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-16CID#1000838 Fix overrides' exception specificationsStephan Bergmann
Includes also fixes for CID#1000839 CID#1000840 CID#1000841 Change-Id: I4c7d0bbaec59357af722353bdf947f5629dde1b0
2013-10-16fdo#45777: handling of whitespaces in hyperlinksThomas Arnhold
Remove leading and trailing whitespaces in the hyperlink dialog, because the resulting links would be unusable. Change-Id: Icf617daf51508a37494536e02fb298fb3cf746c5
2013-10-16fdo#45970: "pale green" is not green at allThomas Arnhold
Was like Cyan 10 before. Now it's like Green 10... Change-Id: I7ec9b884b53fb0ab2a5a0c3d09cb8b2789037234
2013-10-16cleanupThomas Arnhold
Change-Id: I7bfd221f89718ba8634417c93a26b3a199178694
2013-10-16remove some stuffThomas Arnhold
Change-Id: I766c01c3ea4c03f4c76ef70fd16037d8196242a1
2013-10-16HTML: always export CSS option for font sizeThomas Arnhold
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-16Adapt to changed directory structure in fundamentalrcTor Lillqvist
With this change, the MobileLibreOffice app builds and runs for me. Change-Id: I8c7ce3fdedced5eb82ed18e21873e773733d612f
2013-10-16No "registry" directly at top app level any moreTor Lillqvist
Change-Id: Idc81f4913a96938f1fdd2644cc9e34a07554bb21
2013-10-16No mlo_select_all(), probably left out accidentally from Ptyl's commitTor Lillqvist
Change-Id: I1859f6c05f371fccdd39f903d663d5a452866876
2013-10-16Use libc++ here, too, as we now do for the LO codeTor Lillqvist
Also quotes added by Xcode around library names that contain nonalphanumerics. Change-Id: Ie5b34b2da0ec5600e9ca1aba1e17efd7e3e087de
2013-10-16Add dummy touch_ui_keyboard_visible()Tor Lillqvist
Change-Id: Ib3de4092f48e16ac88108d6a69a04baf92a82de1
2013-10-16Ignore the lib_link and resource_link dirsTor Lillqvist
Change-Id: Ib30199e3f193f9b98e9f0e2ec0d76953abf39a14
2013-10-16Adapt library names and paths to current build systemTor Lillqvist
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-16Linking changes: Adapt to changes in build systemTor Lillqvist
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-16Adapt to recent changes in solver/instdir/workdir structureTor Lillqvist
Change-Id: I1286feafa1a11fe30aa4f8383c094661aa10db92
2013-10-16Use OUTDIR and INSTDIR in the shell scriptTor Lillqvist
Change-Id: I400fc5d0d572b3eab99f8da20162de1191cf3a53
2013-10-16Add OUTDIRTor Lillqvist
Change-Id: I1b3b22a9de54559a0b89c91fb10ef6f90ccb1ceb
2013-10-16Adapt to changed <touch/touch.h> APITor Lillqvist
Change-Id: I9304a0a08c6eed79726700cdc8451dc0fbe613cf
2013-10-16Use WORKDIR instead of hardcoding unxiosr.proTor Lillqvist
In a --enable-dbgutil build there is no ".pro" suffix. Change-Id: Id95f5a4a972059a9c67985a8c15405a9303ad6b2
2013-10-16There is no "make" mode at least in my EmacsTor Lillqvist
Change-Id: If693c4ddcd560336df6878a0a83e445d889d30de
2013-10-16We want config_host, not config_buildTor Lillqvist
We use GNU cross-compilation terminology: "host" means the platform the code being compiled will run on (this is often somewhat surprising to those unaware), and "build" means the platform the build tools (= the compiler, linker etc) is running on. For an iOS app, "host" is iOS and "build" is OS X. There is also "target" but it is in this case the same as "host". (Only in a so-called Canadian Cross situation is "target" different from "host" (and from "build").) Change-Id: I6eefa982916f0660afd259770bf455cf28793670
2013-10-16Set ARCHS = armv7 otherwise Xcode complains for me about armv7sTor Lillqvist
Change-Id: I59767af5fe4b2067a175c6882ecb3edf3c4ee2f7
2013-10-16Generate the ios/lo.xcconfig at configure timeTor Lillqvist
Also, add INSTDIR and WORKDIR. Change-Id: I16266202c2e2d005533f7ffbcc2ae41f63833928
2013-10-16Remove file that contained pathname specific to one developer's machineTor Lillqvist
Change-Id: Ia8eb3ad11c947bae64b5758fd4c0820bf3c09905
2013-10-15Some string clean-upStephan Bergmann
Change-Id: Ic046150605c599746ed3235c04bcbc981e18e589
2013-10-15Allow starts-/endsWith* to also return the rest of the matched stringStephan Bergmann
...as there are many cases where the code later wants to obtain this part, and esp. for the string literal variants it is awkward to calculate the length of the literal again if this is coded with a following copy() call. Adapt some code to use this new feature. (Strictly speaking, the @since tags for the---backwards-compatibly---modified functions are no longer accurate of course. Also, clean up some sal_Bool and SAL_THROWS(()) that are unnecesssary cargo-cult here, and where the clean-up should have no practical compatibility consequences.) Change-Id: I43e5c578c8c4b44cb47fd08f170b5c69322ad641
2013-10-15Simplify some matchAsciiL -> matchStephan Bergmann
Change-Id: Ib0cac79b86ed60b4df1fc90db15842cc99abc1e9