Matúš Kukan
94b6882b80
fix gengal dependencies
...
Regression from 9555b5bdb9
Change-Id: I91a7efb207209020acef751ad4f766328dc92c57
2013-06-17 10:42:47 +02:00
Armin Le Grand
0994eb59a1
Resolves: #i121538# Disable FontWork dialog entries (slots)...
...
when CustomShapes are selected to avoid unwanted FontWork editing on these
shapes
(cherry picked from commit c73f0e910fcf3a940c24a639dba9b4ced2057399)
Conflicts:
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drwtxtsh.cxx
Change-Id: I6b702512c48e7b2376874b2e8184563d12d5c6e8
2013-06-17 09:27:40 +01:00
Armin Le Grand
881b79dc21
Resolves: #i113080# added test code, cleaned up a small inconsistency
...
(cherry picked from commit d7fa73b25f75796291432496d9bb8d7c80e82c8b)
Conflicts:
drawinglayer/source/tools/converters.cxx
Change-Id: Ia8edda4ca2c79bfc9d4a0962f99d8db581622a7d
2013-06-17 09:23:27 +01:00
Caolán McNamara
03427c780b
move now private headers to private location
...
Change-Id: Ibc3a6d446dd2bd49af916cbe1ca88e173ae414cb
2013-06-17 09:23:27 +01:00
Armin Le Grand
d1310b7628
Related: #i121532# unified processor2d usages from other modules
...
(cherry picked from commit f371f92c89d296207ef9a219518ba8caa481bcfe)
Conflicts:
drawinglayer/Library_drawinglayer.mk
drawinglayer/Package_inc.mk
drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
drawinglayer/source/processor2d/processor2dtools.cxx
svx/Package_inc.mk
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
svx/source/sdr/contact/objectcontactofpageview.cxx
svx/source/sdr/overlay/overlaymanager.cxx
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
svx/source/svdraw/svdedxv.cxx
sw/source/core/doc/notxtfrm.cxx
Change-Id: Iea4a79133f4375cb0625b187eeb3d727b50ff0fe
Related: #i121532# missing defaultprocessor3d.hxx breaks build
Revision 1440387 changed defaultprocessor3d.hxx to be no longer "delivered".
It is needed in svx by being included indirectly via cutfindprocessor3d.hxx.
Fixing the build breaker by "delivering" the missing header file again.
(cherry picked from commit 3bd3ea81c8d54109950b435225c3aac011d56c3d)
Conflicts:
drawinglayer/Package_inc.mk
Change-Id: If0dcea79cfff4cf20a1ca1af3d0a34f86eb2e24e
Related: #i121532# removed include to no longer existing file
(cherry picked from commit a4c602d9b5b17e220dbaa4dec2cef91d39945154)
Conflicts:
sw/source/core/doc/notxtfrm.cxx
Change-Id: I7dc2f99684fa285225dfdcfc7add553695b8412e
2013-06-17 09:23:26 +01:00
Tor Lillqvist
a074ee056a
Fix iOS cross-compilation
...
No idea why the filter-out here was needed at some point in time, but
at least now it broke cross-compilation for iOS.
Change-Id: I6c4d3f6151ac2821db5f79c3e4113400b740f7f3
2013-06-17 11:17:15 +03:00
Fridrich Štrba
919684989d
Fixing the joy of MSVC preprocessor
...
Change-Id: I4e97f93de568b1704a58ab5e5c47e85e09327779
2013-06-17 10:12:20 +02:00
Stefan Knorr
3d9e3cd2a2
Template Manager: Use actual template icons if no thumbnail exists
...
Change-Id: Ie1ee86a180701355886a340ea97940303f527422
Reviewed-on: https://gerrit.libreoffice.org/3278
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr >
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr >
2013-06-17 08:09:01 +00:00
Andras Timar
8a9a650065
fdo#65809 Sidama (sit-ET) index sorting
...
Change-Id: I1781c94cc67d4a2fa47bcf126195309590016b14
2013-06-17 09:12:35 +02:00
Stephan Bergmann
6c7ae36a25
PythonTest still does not work on Windows
...
Change-Id: I79e352efeb1ed3fe8dab53bfb31362ac2ce11b06
2013-06-17 09:04:14 +02:00
Fridrich Štrba
d6e12ac8f0
WPX_SEEK_END needs libwpd >= 0.9.5
...
Change-Id: I8f4e41d4f089d989a699e29bbb48a6fb749ff95a
2013-06-17 08:53:05 +02:00
Fridrich Štrba
0b27b03d03
min -> std::min in order to unbreak windows build
...
Change-Id: I4b7b2acf0f1c3173393841ae1047240e991fb837
2013-06-17 08:52:41 +02:00
Julien Nabet
e9fd9c2526
Cleaning: remove use of old edt1 from dlg.h (Windows)
...
edt1 was used before cmb13 (used from Win2K version)
So use only cmb13 + tweaks associated comments
See http://nabble.documentfoundation.org/Cppcheck-reassignment-of-edt1Id-because-isWin2000-has-been-removed-fpicker-module-td4061342.html
Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f
Reviewed-on: https://gerrit.libreoffice.org/4283
Tested-by: Andras Timar <atimar@suse.com >
Reviewed-by: Andras Timar <atimar@suse.com >
2013-06-17 06:25:19 +00:00
Xiaoli
99eee227ac
migrate check_index test from Java to Python
...
Change-Id: I5080cb0c3ca4b28d197137407da0d5f5b3d6c6d7
Reviewed-on: https://gerrit.libreoffice.org/4310
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de >
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de >
2013-06-17 04:09:22 +00:00
Andras Timar
76a901298e
l10n of additional colors in standard palette
...
Change-Id: I9200ce7f0e18491f2a1b8b60a43883df6dcb6cf2
2013-06-16 22:45:10 +02:00
Julien Nabet
2f4012a977
cppcheck: fix some uninitMemberVar in sw part
...
Change-Id: I6492f87b9ca04a67c738da1ea173df98e382951a
2013-06-16 22:35:02 +02:00
Tor Lillqvist
c22acb449f
Don't use deprecated API
...
Change-Id: I1dfc8998eeeda31648a4b4fe95d40117686a866b
2013-06-16 23:26:36 +03:00
Khaled Hosny
1733e4ad1c
Don't build icule library as we no longer use it
...
Change-Id: I25401eee45988bf4d156c11d9a5848c783204c02
2013-06-16 22:17:05 +02:00
Khaled Hosny
b6ecac9fb9
Bye Bye ICU Layout Engine
...
Change-Id: I0f887ba378f9dac45a3736e4d1789585651148d1
2013-06-16 22:17:00 +02:00
Tor Lillqvist
7aa42913bb
WaE: 'FSResolveAliasFile' is deprecated: first deprecated in OS X 10.8
...
Use the bookmark API instead.
Change-Id: I61fe91ea2c7287c52d45ddfee772ecfcfb5498b6
2013-06-16 23:11:47 +03:00
Tor Lillqvist
332bce15e7
Need the IOKit library now
...
Change-Id: Ib98fc2f683729d1c9fe6768c63a1d1a6614ba567
2013-06-16 23:11:47 +03:00
Julien Nabet
0a52587c7a
cppcheck: fix uninitMemberVar for postgresql part
...
Change-Id: Id37b961ff04ec9cebcc9d35434ccfdff0b512235
2013-06-16 21:39:39 +02:00
Jan Holesovsky
21acf9d636
Reduce scope.
...
Change-Id: I1cabfd0aad8aa00a50d5f854aca96fa27b635273
2013-06-16 21:37:46 +02:00
Jan Holesovsky
4043d6633b
sidebar: More focused tooltip text.
...
Change-Id: I92d5d82e1955f46ef1137d46956af43e5921d149
2013-06-16 21:31:39 +02:00
Jan Holesovsky
1abcfd8a9e
widget layout: Honor explicitly set tooltip text for toolbox items.
...
Change-Id: I067abb53783655dddc2130aa126dd032c803d58d
2013-06-16 21:31:38 +02:00
Jan Holesovsky
8eb89bc4be
sidebar: Make the Page panel more minimalistic.
...
Change-Id: Ic0a731142efc57ad0b6ba450188fff4108867f92
2013-06-16 21:31:38 +02:00
Jan Holesovsky
2825635ddc
sidebar: Make the Page panel resizable.
...
Change-Id: I5f700c085d8a53f38e3d548d1d9fcad9090bd6b8
2013-06-16 21:31:38 +02:00
Prashant Pandey
0813006e76
sidebar: Conversion to .ui for Page property panel.
...
Change-Id: Ie05831a6d4958b3bcef666454a4c02dfc5288fe2
2013-06-16 21:31:38 +02:00
Julien Nabet
02d58eb6e0
cppcheck: fix uninitMemberVar + remove macro
...
Change-Id: Ifce036595a8a5e95406c8a1752dbb77cfe735a3e
2013-06-16 21:30:09 +02:00
Armin Le Grand
3af1951e55
Resolves: #i122420# Re-activated the internal OpenOfficeToSystemFlavor
...
(cherry picked from commit 11d6690fddcebec67baba285f87e647241ebfd82)
Change-Id: I23c71470e587f8ece54aa9f2991634211ff3b4b5
2013-06-16 20:04:16 +01:00
Armin Le Grand
5aee0c13cc
Resolves: #i121532# enhanced visualisation of text edit&selection
...
D&D overhauled
(cherry picked from commit c6e63b6bbb6b4a63fe1302de57fc32cd28432378)
Conflicts:
drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
svx/Package_inc.mk
svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
svx/inc/svx/sdr/overlay/overlayobject.hxx
svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
svx/inc/svx/sdr/overlay/overlayrectangle.hxx
svx/inc/svx/sdr/overlay/overlaytools.hxx
svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
svx/inc/svx/svdview.hxx
svx/source/engine3d/view3d.cxx
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
svx/source/sdr/overlay/overlayhatchrect.cxx
svx/source/sdr/overlay/overlaypolypolygon.cxx
svx/source/sdr/overlay/overlaytools.cxx
svx/source/svdraw/svdcrtv.cxx
svx/source/svdraw/svdedxv.cxx
svx/source/svdraw/svdhdl.cxx
svx/source/svdraw/svdobj.cxx
svx/source/svdraw/svdview.cxx
sw/source/ui/dochdl/swdtflvr.cxx
Unname unused arguments to prevent WaE issues.
(cherry picked from commit 0735a61e631b8d4bb3d4e889bee436fb9e7c5734)
Change-Id: I3b1cf4754063985dc1b4adac44b33e52e200607f
e4288936cadd1f6e06bdf79611536d7114236b56
2013-06-16 20:01:56 +01:00
Ariel Constenla-Haile
9618c76270
Fix build breaker
...
(cherry picked from commit 6746e3ace000264274e9f587f7223906a864c27c)
Change-Id: I66697ce020ffbd00d667556e9684bfe62ce1f38f
2013-06-16 20:01:56 +01:00
Tor Lillqvist
52cc6555bc
Remove duplicated call to SalData::ensureThreadAutoreleasePool()
...
Change-Id: I788949fbec9eea3d65b9f063dec416e41ba4815b
2013-06-16 20:30:53 +03:00
Tor Lillqvist
e73882063c
WaE: 'UpdateSystemActivity' is deprecated: first deprecated in OS X 10.8
...
Instead use IOKit as described in
http://developer.apple.com/library/mac/#qa/qa1340/_index.html , said
to work in 10.6 or later, thus fine for us.
Change-Id: I1bfcc2b9bce6cdf5d7274e89f96b1739898fa735
2013-06-16 20:30:25 +03:00
Julien Nabet
7c5b0cde8c
cppcheck: fix duplicateExpression
...
(It seemed logical to me, hope I'm not wrong)
Change-Id: I2c1ffbe69b90655b260a7ecb41ab089b60b27b85
Reviewed-on: https://gerrit.libreoffice.org/4279
Reviewed-by: Michael Stahl <mstahl@redhat.com >
Tested-by: Michael Stahl <mstahl@redhat.com >
2013-06-16 16:38:44 +00:00
Miklos Vajna
f0ed219c8f
sw: move the textframe-table testcase from rtfimport to rtfexport
...
Change-Id: I7e9d26ec1f47d16e35e24fc4bd9482f5d899e79c
2013-06-16 18:34:09 +02:00
Jelle van der Waa
040710161c
fdo#43460 use isEmpty()
...
Change-Id: Ie33025fbd10f47efd6b97304b76b21166d4ee70e
Reviewed-on: https://gerrit.libreoffice.org/4307
Reviewed-by: Eike Rathke <erack@redhat.com >
Tested-by: Eike Rathke <erack@redhat.com >
2013-06-16 15:56:43 +00:00
Miklos Vajna
4c3d2dcdad
Add UI for fine dashed border type
...
Commit 7d632ff29e
added document model /
layout support for this, but UI was lacking.
First, add a new item to the list box in
SvxBorderTabPage::FillLineListBox_Impl(). Second, handle MAP_TWIP unit
in svtools::GetDashing() for STYLE_FINE_DASHED. Pick up some values that
give visually the fine dashed result when painted. (The original values
from 2f0d406911
in other cases seem to be
a bit consistent already anyway.)
Change-Id: Ibf1ed235d51515b065d23a6a5d5eef433162899f
2013-06-16 17:58:06 +02:00
Khaled Hosny
eb04af85a7
Fix PDF export with fallback fonts in Core Text
...
We need to pass the real font used to layout the glyphs in case it
differs from the requested font, otherwise we end with garbage in PDF
files.
Change-Id: I9caa8e60429e45ee864f5347fd9392f5e440864e
Reviewed-on: https://gerrit.libreoffice.org/4299
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org >
Tested-by: Khaled Hosny <khaledhosny@eglug.org >
2013-06-16 15:45:44 +00:00
Matteo Casalin
21e43f598e
Simplify SwPaM::GetTxt
...
Change-Id: Ic8905ff02852dab7f699c2a9f02a6252a5c42c7f
Reviewed-on: https://gerrit.libreoffice.org/4213
Reviewed-by: Michael Stahl <mstahl@redhat.com >
Tested-by: Michael Stahl <mstahl@redhat.com >
2013-06-16 15:45:05 +00:00
Khaled Hosny
3d12036000
Get rid of SalLayout::GetFallbackFontData()
...
This is only used in conjunction with SalLayout::GetNextGlyphs() in
vcl/source/gdi/pdfwriter_impl.cxx to retrieve the fallback font, if any,
used to layout the given glyph, but it is a very convoluted way to do a
straight forward thing, and hard to adapt for new SalLayout
implementations.
So now I just pass a fallback fonts array, when requested, in
GetNextGlyphs() itself.
Change-Id: I24e7931f64867a4fb4e7b728c65faa6198e24aba
Reviewed-on: https://gerrit.libreoffice.org/4285
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org >
Tested-by: Khaled Hosny <khaledhosny@eglug.org >
2013-06-16 15:30:01 +00:00
Xiaoli
7441d4bbdb
PyUno fixed crash in function isInstanceOfStructOrException()
...
when we try to call PyUNO_callable object that doesn't have __class__ attribute
Change-Id: Ia05f70d70f248d50aa141b09625f7ec50189e1dd
Reviewed-on: https://gerrit.libreoffice.org/4309
Reviewed-by: Michael Stahl <mstahl@redhat.com >
Tested-by: Michael Stahl <mstahl@redhat.com >
2013-06-16 15:29:04 +00:00
Markus Mohrhard
51a3574327
another merge error
...
Change-Id: Iec1f5d090581b1613782b521139387853e4c902f
2013-06-16 16:51:35 +02:00
Markus Mohrhard
9e87f75ee5
fix merge errors
...
Change-Id: I0d9cae8f5ac06a90f4e3e000c6a3648a5cefe839
2013-06-16 16:26:50 +02:00
Markus Mohrhard
7f73b52db7
some small improvements for the FILTERXML function
...
Change-Id: I4b4e814d90592f318afb3a9a6965ad8e3df07cae
2013-06-16 16:07:38 +02:00
Markus Mohrhard
a29d20932c
add initial version of WEBSERVICE function
...
Change-Id: I8a835278c0d1b8f3a463aa5765b145410605aba4
2013-06-16 16:07:37 +02:00
Markus Mohrhard
6e283043ee
use ASSERT_EQUAL to get better diagnostic message
...
Change-Id: I51d92e6d7a012bb9daf5eba5f982fa4bffbba28e
2013-06-16 15:59:06 +02:00
Markus Mohrhard
3b9620e18b
inital work on FILTERXML function
...
Change-Id: Ifb884a52b275df818812f8be6cd7650dcb97849d
2013-06-16 15:59:06 +02:00
Markus Mohrhard
de8a82d9ac
use the implicit conversion
...
Change-Id: I1d4739721c297e6d5605d93b6e86e114ea12db85
2013-06-16 15:38:04 +02:00
Miklos Vajna
ae85b56a9a
Import/export RTF_REVISIONS
...
File -> Properties -> Security -> Record Changes on the UI.
Change-Id: I96d321f407abd33e15a4a133e6723d48efa5bc53
2013-06-16 14:47:07 +02:00