Commit Graph

337688 Commits

Author SHA1 Message Date
Stephan Bergmann
1754344c88 Some Trivial clean-up
Change-Id: Ie48e8f5cbc455ef267ad756d82f8c0efee0ef065
2013-11-01 17:02:34 +01:00
Stephan Bergmann
1f0f538b20 Remove dead declaration w/o a definition
Change-Id: Ic0a1f07a2e16695fafbd63414397a8565d7c6861
2013-11-01 16:53:49 +01:00
Caolán McNamara
55369420bd stop unbalanced OutputDevice Push/Pop warnings on closing help
where it takes the early GetBackColor return after Push but before Pop

Change-Id: I5fac78b7270c8561cb8e7d26bd2bff44628c8547
2013-11-01 15:05:30 +00:00
Oliver-Rainer Wittmann
0921642e7f Related: #i33737# some minor refactoring in advance
(cherry picked from commit b27ff0a078b7c1b32e88041f25314eaad267618b)

Conflicts:
	sw/source/core/bastyp/init.cxx
	sw/source/core/crsr/findtxt.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/docfld.cxx
	sw/source/core/edit/edfld.cxx
	sw/source/core/fields/authfld.cxx
	sw/source/core/fields/dbfld.cxx
	sw/source/core/fields/docufld.cxx
	sw/source/core/fields/expfld.cxx
	sw/source/core/fields/fldlst.cxx
	sw/source/core/fields/reffld.cxx
	sw/source/core/frmedt/tblsel.cxx
	sw/source/core/inc/wrong.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/text/EnhancedPDFExportHelper.cxx
	sw/source/core/text/atrstck.cxx
	sw/source/core/text/itratr.cxx
	sw/source/core/tox/txmsrt.cxx
	sw/source/core/txtnode/atrfld.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/undo/SwUndoField.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/unocore/unocrsrhelper.cxx
	sw/source/core/unocore/unofield.cxx
	sw/source/core/unocore/unoportenum.cxx
	sw/source/core/unocore/unotext.cxx
	sw/source/filter/rtf/rtffld.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/ui/docvw/AnnotationWin.cxx
	sw/source/ui/utlui/content.cxx

Change-Id: I372cfaed881188266c359867879ae92c8d45fee1
2013-11-01 14:43:15 +00:00
Caolán McNamara
3b27470860 Resolves: fdo#71106 editing dde function crashes
Change-Id: Id2f4bffb7de7201ddeb8f75daaa2723cc42c59b0
2013-11-01 14:28:20 +00:00
Stephan Bergmann
dc704d724f Directly use OUString
Change-Id: I9029bab2b0ab98a2d78166145a35792e298c9115
2013-11-01 14:56:48 +01:00
Caolán McNamara
1e5367fc87 Updated core
Project: help  ae178e85f974c49304b0f2a950979d1adaa466ae
2013-11-01 07:49:38 -05:00
Caolán McNamara
dfbbda5623 convert math font dialog to .ui
Change-Id: Ib7bf087664b6c8491872dfa37c750485fedabbe2
2013-11-01 12:45:58 +00:00
Stephan Bergmann
c399eea88b SdrGraphLink::pGrafObj can never be null
Change-Id: Ifeb77e61040accd1f7f7ed31d0340c66fbab39a5
2013-11-01 13:00:16 +01:00
Thomas Arnhold
58720da224 twain: Update twain to version 2.2
Includes the mingw and style fixes from
dc6c7e844a

Change-Id: Iad075c78b28b2b344a5e8e56c8614a283b4819a8
2013-11-01 12:54:37 +01:00
Stephan Bergmann
c8f18aa3fe -Werror,-Wunused-variable
Change-Id: I3bf848c49c5ff980a3a8cc8b84333cb4d0d480df
2013-11-01 12:52:20 +01:00
Stephan Bergmann
79e469184b -Werror,-Wunused-variable
Change-Id: Icedd42e4cbdf76bba9fd21e8ead2c8e5dcaf52f1
2013-11-01 12:50:17 +01:00
Caolán McNamara
0b79f6ce62 cannot convert parameter 1 from ´const char [2]´ to ´sal_Unicode
Change-Id: I66a1005c3f6bcad448ed2c162a8399c7c32ad78e
2013-11-01 11:23:56 +00:00
Jian Hong Cheng
d0b30f90d4 Made some changes to remove the compile warnings...
on the comparison between un-uniform data types

(cherry picked from commit e0705e2a87726c6d8a04eae624d4f032c5d596ce)

Conflicts:
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtww8.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/filter/ww8/ww8par.hxx
	sw/source/filter/ww8/ww8par3.cxx

Change-Id: I1e6931e01fdcce6c1a4e98a86fcbc08f5e0933bd
2013-11-01 11:23:56 +00:00
Jian Hong Cheng
40543e5321 Revise un-necessary checking..
Patch by: chengjh,<chengjh@apache.org>
(cherry picked from commit 3869d0164607a1576826dcc338b1f8b52f1147bd)
2013-11-01 11:23:56 +00:00
Jian Hong Cheng
c1c49d8fdf Resolves: #i120927: Import/Export Hyperlink Info of Graphic with Anchor...
Type Except “As Character” to MS Word Binary File

* sw/source/filter/ww8/escher.hxx
* sw/source/filter/ww8/wrtw8esh.cxx
* sw/source/filter/ww8/wrtww8.hxx
* sw/source/filter/ww8/ww8graf.cxx
* sw/source/filter/ww8/ww8par.cxx
* sw/source/filter/ww8/ww8par.hxx

Interoperability of Hyperlink within Flying object

Patch by: Jane Kang,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@apache.org>
(cherry picked from commit 8f7c7a5713e92aecfe4837e628a001b7668c9540)

Conflicts:
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtww8.hxx
	sw/source/filter/ww8/ww8graf.cxx
	sw/source/filter/ww8/ww8par.cxx

Fix non-pro build breaker: SvMemoryStream has no member GetRecLeft()

Possible introduced from copy and paste from sc, see
sal_Size XclImpStream::GetRecLeft() function in class:XclImpStream
sc/source/filter/inc/xistream.hxx
(cherry picked from commit 4a3a3afa32785d0b1051d9d1104adbbb0e61a820)

Conflicts:
	sw/source/filter/ww8/ww8par.cxx

9ce792333ba3f6aa0f8d8660533bc740e1354597

Change-Id: Icbecea61bf6ec3e7baa02e678a575d64fcfca731
2013-11-01 11:23:56 +00:00
Stephan Bergmann
08698f258f Pass OUString by const &
Change-Id: I6b3d6709eb8e3471aaa6ad7b3bcba3319719218b
2013-11-01 11:55:26 +01:00
Vinaya Mandke
486222c7c0 Unit test for Docx Chart Series Name
UT to verify that the series labels are
imported (or rendered) as in the docx file.

Change-Id: I9e4ade7a905dbb894bc163ecec8c333fa6797818
Reviewed-on: https://gerrit.libreoffice.org/6502
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-11-01 05:08:12 -05:00
Stephan Bergmann
2c2ff53890 fdo#71005 Remove odd "Workaround for automated testing"
...that got added by 62ee5e1a75 "INTEGRATION: CWS
calcshare2: #i85794# workaround for automated testing" but does not make much
sense, esp. as all our (subsequent-)checks each use a dedicated, throwaway
UserInstallation anyway.

Change-Id: I64ca47a7d7ee3c2eb2ab33eebcec5a79a7e3d0df
2013-11-01 11:03:34 +01:00
Samuel Mehrbrodt
84f4b84212 Better approach for fdo#40077: Characters cropped in GTK-Combobox
Now using gtk_widget_size_request() to get the native size.
I reverted the earlier change (border_width etc. ignored)

Change-Id: I0d89a2df5186bd27cbb77c8b0f2cc7b1fb247005
Reviewed-on: https://gerrit.libreoffice.org/6478
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-01 04:22:41 -05:00
Pedro Giffuni
dc6c7e844a i#118517# - Update twain to version 2.1 with support for Apple and UNIX.
Mingw apparently tries to pass as GNUC and WIN32/64 so we detect it early and force it to work like in previous versions.

Cherry-picked from:

e1431bbb4eff94d7c2ca1e0660a13806cd6489f5

Also contains:

f30110565adafc75feb73eac9707d6d5f86f90f4 - Fix issue with twain header.
1d6adce05b0d7737268be32b1c24aef8254f48b2 - Minor style fix.

Conflicts:
	twain/inc/twain.h

Change-Id: I67c557b81661bc91e299309ade70d603160b6bca
Reviewed-on: https://gerrit.libreoffice.org/6508
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-01 04:16:45 -05:00
Thomas Arnhold
831fc27e2a remove nonsense FOLD comments
Conflicts:
	vcl/inc/sft.hxx

Change-Id: I1b744f14b6524e4d5913775427280e68c4ee07fc
Reviewed-on: https://gerrit.libreoffice.org/6491
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-01 04:07:42 -05:00
Samuel Mehrbrodt
90ef8ac1b5 fdo#70998 Termchange: Graphics->Image
Change-Id: I73458ad8c4f6017bd9fdc36a40b67684d36adbad
Reviewed-on: https://gerrit.libreoffice.org/6483
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-01 04:02:36 -05:00
Julien Nabet
7fb2aa82f6 fdo#68414: SIDEBAR: property's Text named incorrectly
Change-Id: I2b1fdbde3655b26ec7b94fb35e1277be532d3232
Reviewed-on: https://gerrit.libreoffice.org/6480
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-01 04:00:16 -05:00
Caolán McNamara
609f0b8bff add limits.h for rhel-6 build
Change-Id: I9d355be54eb4072044ad660296375fca8d0fa831
2013-11-01 08:54:20 +00:00
Stephan Bergmann
baa68e4e89 Try make this more robust in slow environments
...where the previous .uno:PrintPreview request has not yet been processed, the
same way it had been made more robust for ScAccessiblePageHeader.java in
5b5c52a3a4 "Try make this more robust in slow
environments" plus b5dd2b4218 "Also cope with
intermittend DisposedExceptions."

Change-Id: I64389b817d91a2bed8dfe1b8d92bafec42eba21a
2013-11-01 09:41:30 +01:00
Stephan Bergmann
5a10e33f4d Improve exception messages (for debugging)
Change-Id: Id2e00e0b0363c58c88585dd15f34156e57a7aaac
2013-11-01 09:00:17 +01:00
Tor Lillqvist
9b629f2967 Add (dummy) touch_ui_dialog_modal() implementations
Change-Id: I12fde9cc7180118ade39b7a037d05e8793bd1c12
2013-11-01 08:59:09 +02:00
Tor Lillqvist
354c1a99ea Add FREEHAND_LIBS
Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42
2013-11-01 08:59:09 +02:00
Tor Lillqvist
faf9aa674e Add FREEHAND_LIBS
Change-Id: I86d01c9afdedc2477c2894694ab04c4a493bfa65
2013-11-01 08:52:36 +02:00
Noel Grandin
ccbea81484 fix mozab driver after OUString change
for Windows build after my change in
commit e2451bd729
"Convert indexOf->startsWith and lastIndexOf->endsWith"

Change-Id: I9397f1310742cdd773a7d2d3c5f0dbe728041d2d
2013-11-01 08:43:24 +02:00
I-Jui (Ray) Sung
22119b5a47 GPU Calc: re-enable regression test testSharedFormulaXLS
Change-Id: Ica508140d849cfd7754aea91e019fb3ed565d993
2013-10-31 22:46:33 -05:00
Xukai Liu
7abfae3622 GPU Calc: refactor code generation for inlined library routines
Refactored two library functions: Round and approxEqual. Generate them
only when corresponding Calc spreadsheet functions are used.

Change-Id: Ibf532d551ba0d99a117cedd4a0f3397acb5e017d
Signed-off-by: I-Jui (Ray) Sung <ray@multicorewareinc.com>
2013-10-31 20:24:48 -05:00
Tor Lillqvist
2ee41f402f Typo
Change-Id: I31cd13e6b11b73166e7a7f351c5eb3ea8038a4fc
2013-11-01 00:26:56 +02:00
Tor Lillqvist
5a0aec771f Add dummy touch_ui_dialog_modal() here, too
Change-Id: I1b1e47de2eec94150a0abee4aa74994f55b9b88e
2013-11-01 00:23:16 +02:00
Tor Lillqvist
9fabf25bc4 Dummy implementation of touch_ui_dialog_modal()
Change-Id: I38b72837d8a26ef95d84deca299023c1646169cf
2013-11-01 00:23:00 +02:00
Tor Lillqvist
ec2ea6e6e0 Maybe Dialog::Execute() is one good place to call touch_ui_dialog_modal()
Change-Id: I5f1b9fd266d7920a947d3dfb6bcd584e3cc30b53
2013-11-01 00:22:30 +02:00
Tor Lillqvist
139bd9b440 Add first attempt at an error message etc API
Add a touch_ui_dialog_modal() function which in some way displays an
error or other message to the user, and possibly offers the
possibility to choose some "OK", "Cancel", "Retry", "Ignore" type of
response. Note that the "modality" is from the point of view of the LO
thread.

Change-Id: I1b2ad15854f8d76e2c30f93fb5356fad7e5d02ca
2013-11-01 00:21:38 +02:00
Tor Lillqvist
ac535415fe Bin pointless Android ifdefs
It did not do anything.

How to handle dialog attempts from random places in the code on
non-desktop needs to be re-done properly.

Change-Id: I854a12faba3f98c61f637b465789976493326d43
2013-11-01 00:21:22 +02:00
Tor Lillqvist
13c3ab5789 Use actual executable path
Change-Id: I75ffc83be6af34b09b4a98a5890b3585b4a76bde
2013-11-01 00:20:28 +02:00
Tor Lillqvist
8204fadf20 Bin dead code
Change-Id: I7c3ae0afd6740df326a5c74826e7f204e9df2219
2013-11-01 00:18:49 +02:00
Tor Lillqvist
d68e1a2fcc Cosmetics and style cleanups
Change-Id: I45b072e5d6a216f0b82f7a0b3a4554ef4cc3570f
2013-11-01 00:18:49 +02:00
Tor Lillqvist
d7a4a5b268 The "source size" of a VCL bitmap is not used for anything
Thorsten thought it might have been used for to the handling of the "Original
Size" functionality originally. That seems slightly broken currently in some
use cases, and this change doesn't make it any worse. (To see the brokenness,
play with resizing an image, reloading the document, and using "Original
Size". With the right sequence of actions, LO seems to think that the
"original size" is very small (1x1 pixel perhaps).)

Change-Id: I4e0852d2b367def5bc40baf95aac273d59731eec
2013-11-01 00:18:48 +02:00
Miklos Vajna
86ecd9560f writerfilter: remove unused WW8FontTable class in doctok
Change-Id: I649e21460ad00b2a364a8adc91061ba95a6623d9
2013-10-31 22:59:38 +01:00
Stephan Bergmann
42f8c6fecc Disambiguate where a "Source for ... not found!" error originates from
Change-Id: I424036d3a940fa53b1553c1c539bf1065cdc2759
2013-10-31 22:00:57 +01:00
Stephan Bergmann
2208fca2fe $installer::globals::macinstallfilename is already an absolute pathname
Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c
2013-10-31 21:59:04 +01:00
Stephan Bergmann
dd08ef89d5 Hack to find instdir/*/LibreOffice.app/Contents/LICENSE.html on Mac OS X
Change-Id: I3f2b12534b6d83e4ae2c2a61a6f81ddf8cdad2cc
2013-10-31 21:50:29 +01:00
Thomas Arnhold
326f3e40ba shell: mapix.h is not needed at all
Change-Id: I1a55a4c260b781f7427bf149d32f1cae6149fe9a
2013-10-31 21:07:02 +01:00
Thomas Arnhold
b4655065ad vcl: fix brace
Change-Id: Ib41c9521a8b8e5b8ebc170f9b7e45379a51f1bd5
2013-10-31 21:07:02 +01:00
I-Jui (Ray) Sung
0539e78686 Fixed a typo in the GPU Calc compiler.
Change-Id: I40994de5e445dbd6f3c5e6597a90e63b7dc3cbcf
2013-10-31 13:49:57 -05:00