341894 Commits

Author SHA1 Message Date
Nikhil Walvekar
3cf58da99e fdo#70942 Preserve original shape type, if shape contains text.
Currently we change shape type to textframe if a shape contains
text. Due to this shape information is not preserved when file
is saved.

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

Change-Id: I7af3ce29f857d6fa2ceab0350937d91638361e7c
2014-01-13 18:17:42 +01:00
Stephan Bergmann
8313f68355 Work around G_DEFINE_TYPE -Werror,-Wunused-function
At least G_DEFINE_TYPE from glib2-devel-2.38.2-2.fc20.x86_64
/usr/include/glib-2.0/gobject/gtype.h defines unsed *_get_instance_private
functions.

Change-Id: I47211b6451d9699c7b8741555f3ad11a09e411bf
2014-01-13 18:16:30 +01:00
Stephan Bergmann
2147034810 Filter out GCC-ism for Clang
At least mariadb-5.5.34-2.fc20.x86_64 "mysql_config --cflags" somewhat
unhelpfully includes GCC-specific -fstack-protector-strong which at least Clang
trunk towards 3.5 does not understand.

Change-Id: Ic38104323b6d9275384effdf21d1885c0720edb0
2014-01-13 18:16:30 +01:00
Eike Rathke
9570a27d3e resolved fdo#73555 compile statistics templates using English grammar
The statistics templates' formula expressions are setup using English
function names, so compile the resulting expressions using an English
grammar merged with the current address conventions.

Change-Id: I7c782a42d007daeaaf99463beb8aa580c05c7363
2014-01-13 18:08:52 +01:00
Stephan Bergmann
01f3186c4b SvTreeListBox::ExpandingHdl should return bool
Change-Id: I39a854910299ab2e7c64beabda381bb9f0bd2891
2014-01-13 18:08:07 +01:00
YogeshBharate
b23867abd8 fdo#73247: Code fixed for Shape rotation not preserved in RT
Problem Description:
- When we create the shape with text, rotated it with some angle,
the rotation angle is not preserved after roundtrip.

Implementation:
- Use the FrameInteroGrabBag to preserve  the rotation angle.

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

Change-Id: I8a44e82d21f08ecb221cdbfef73f02a652f2bad3
2014-01-13 18:03:41 +01:00
Vinaya Mandke
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
Adam Co
4a68f12691 Renamed 'SwRedline' to 'SwRangeRedline'
This is in preparation to adding more types of 'SwRedlines'.

Change-Id: Id61217ed3c4622f7689427ea9f30e364f6bb65d1
Reviewed-on: https://gerrit.libreoffice.org/7410
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-13 16:40:46 +00:00
YogeshBharate
dbd42432c7 fdo#69613: Code changes for TOC with flag '\x' should get preserved after RT.
Issue :
	TOC field flag '\x' was not getting preserved after RT.

Implementation :
	Provided import & export support for TOC field flag '\x'.

XML file difference :
	In document.xml,

Before:
	‒<w:r w:rsidR="00A9725D">
	‒<w:instrText xml:space="preserve">
	  TOC \o "1-3"
	</w:instrText>
	</w:r>
	‒<w:r w:rsidR="008A34F6">
	‒<w:instrText>
	  \h
	</w:instrText>
	</w:r>
	‒<w:r w:rsidR="00A9725D">
	‒<w:instrText xml:space="preserve">
	  \x
	</w:instrText>
After:
	‒<w:instrText>
	  TOC \x \o "1-3" \h
	</w:instrText>

Conflicts:
	sw/inc/tox.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/unocore/unoidx.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/ui/index/cntex.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
	https://gerrit.libreoffice.org/7257

Change-Id: I8f196446a3beb8deea6b7ddde50e16c9cea73cd9
2014-01-13 17:08:01 +01:00
Maxim Monastirsky
1b00be2ed1 Keep in sync with desktop_strings[] in salplug.cxx
Items should have the same order. Only that way KDE4
will get the correct icon theme. (A regression of commit
cea7cca5c8db3f273ed2c14efde45ff0e73dee7a)

Change-Id: Id8ba6fadd312d5ff782de7011694fc58cdfae312
Reviewed-on: https://gerrit.libreoffice.org/7288
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-13 15:45:29 +00:00
Ulrich Kitzinger
2f2d9e3799 Let the list of bookmarks in the 'Edit bookmarks' dialog be resizable
Change-Id: I09279f4d35238e6ab2d7b3e27e711dfe7fd74211
Reviewed-on: https://gerrit.libreoffice.org/7399
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-13 15:40:29 +00:00
Stefan Ring
4bde4a0d56 Translate some old german comments
I doubt that they will actually be useful, and I mostly don't understand what
they are supposed to mean, but it's still better to have them in english.

This changeset is meant as a test patch. I intend to do a few more translations
if this goes well.

Change-Id: I6530501b1307aef352dcc851f6536645afeaaebf
Reviewed-on: https://gerrit.libreoffice.org/7343
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-13 15:28:51 +00:00
Miklos Vajna
06e3fdebea writerfilter: clean up redundant bool
Change-Id: I10d514617bf06c677ef5cc0bb9d6d6250abe911b
2014-01-13 16:25:38 +01:00
PriyankaGaikwad
5b6a41f446 fdo#69613:Fix for TOC field flag 'b' should preserved after RT.
(This is partial fix for this bug)

Implementation :
 Provided import & export support for TOC field flag '\b'.

XML file difference :
Before :
<w:instrText>
 TOC
</w:instrText>

After :
<w:instrText>
 TOC \b "bookmark111" \o "1-9" \o "1-9" \h
</w:instrText>

Conflicts:
	sw/inc/tox.hxx
	sw/inc/unomap.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/unocore/unomap.cxx
	sw/source/filter/ww8/ww8atr.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
	https://gerrit.libreoffice.org/7256

Change-Id: I194ba95ca8f25234c0d2a14570fd47eac518b9c5
2014-01-13 16:21:22 +01:00
Stephan Bergmann
a66b24f3cb -Wunused-variable
Change-Id: I1913eaf265a4cbe8a8658c9b465a6f0e6b53f7e5
2014-01-13 15:28:02 +01:00
Caolán McNamara
6d2ffbaece Related: rhbz#1047871 conditional formatting doesn't fit on screen
Change-Id: I886030c056fe802279f9e16c6f85736b0c4587c6
2014-01-13 13:54:51 +00:00
Caolán McNamara
09dc581359 drop unnecessary tools/string.hxx includes
Change-Id: I2439ed19b554381f80e882aacbac05167622df92
2014-01-13 13:54:51 +00:00
Caolán McNamara
e13b06b129 ReadUniStringLine never called without explicit length
Change-Id: I1811cf798a9e4b9d2704cccb59213034d2dc2626
2014-01-13 13:54:50 +00:00
YogeshBharate
8e634d0d55 fdo#69613: Code changes for TOC with flag '\w' should get preserved after RT.
Issue :
	TOC field flag '\w' was not getting preserved after RT.

Implementation :
	Provided import & export support for TOC field flag '\w'.

XML file difference :
In document.xml,

Before - <w:instrText>
		TOC \o "1-3" \h \z \w
	</w:instrText>

After - <w:instrText>
		TOC \w \o "1-3" \o "1-3" \h
	</w:instrText>

Conflicts:
	sw/inc/tox.hxx
	sw/inc/unomap.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/unocore/unomap.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/ui/index/cntex.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
	https://gerrit.libreoffice.org/7238

Change-Id: Ia5d602c6db0b59933d325058ce2d8111e4f03df5
2014-01-13 14:46:30 +01:00
Stephan Bergmann
a401dc5dcf SalDisplay::Dispatch shall apparently return bool
Change-Id: I46ab0ef04b598a4154659f9a1e1cbb2164023b63
2014-01-13 14:26:21 +01:00
Stephan Bergmann
3c8d74eb3f Handle osl_createThread failure
Change-Id: I58144461d3941359f8ea6c2bd547486b2c8ae81a
2014-01-13 14:25:20 +01:00
Stephan Bergmann
a675873cb2 fdo#73436 Let SdXImpressDocument handle css.drawing.* requests directly
...instead of handing off to base class, so that potential wrapping in SdXShape
(in create) is not skipped.

Change-Id: I57fb10ef478688a5a0c1c3c736efbd55a7172423
2014-01-13 14:24:36 +01:00
Michael Stahl
c6d5433c67 Revert "fdo#32530 calc:alignment depend on 1st char direct"
This reverts commit f08c1edc0a99e0c29fb1614162d3e88c5660e092.

This commit causes sc_macros_test to fail with "Assertion
`!"meHorJustResult does not match getAlignmentFromContext()"' failed."
and Eike has expressed some doubts about it too so revert it for now.
2014-01-13 13:27:30 +01:00
Caolán McNamara
2b7d8a50fe longparas: stop tuncating large html files
Change-Id: I0ad9422d574c8629953fd95f0d334617c042c60f
2014-01-13 11:55:14 +00:00
Caolán McNamara
57ec4a841a longparas: drop xub_StrLen from fields
Change-Id: Icd6dbc9b374df3e528dc22afa07be72d7fc89ca7
2014-01-13 11:50:56 +00:00
Caolán McNamara
62b2451a1d longparas: weed out xub_StrLen in pdf writer
Change-Id: I3570f653ec44edcf0a215ffcac2017b9a5a3544a
2014-01-13 11:47:08 +00:00
Caolán McNamara
9407f45186 longparas: STRING_LEN here means text len, so expand to just that
Change-Id: Iec55f8976ca180e380c9679c561aae61c0607520
2014-01-13 11:33:58 +00:00
Tsutomu Uchino
77e7702250 Resolves: #i72591# fix from mouse button to mouse pointer...
in documentation of mouseMoved method

Patch By: christianjunker@gmail.com
(cherry picked from commit a66c0e11c326a072f0cb609af35d5e9d77fd3b63)

Change-Id: Ia39fc56d4459f303cd48e5654d8ff35155cceb4a
2014-01-13 11:29:47 +00:00
Caolán McNamara
0198f54d25 longparas: make OutputDevice::GetGlyphBoundRects safe
Change-Id: I3dbb42b14a03c5bd98ebc1f67963ffe4c5e4b6b8
2014-01-13 11:22:58 +00:00
Caolán McNamara
b78d6544eb Related: #i91494# same for CTL as CJK
Change-Id: I6dc5a720762e7c3cd7ccddeb607c386b7f68178e
2014-01-13 11:14:40 +00:00
Tsutomu Uchino
c1516d668f Resolves: #i91494# use the same font height for CJK text...
with Western in drawing object on Calc drawing layer

(cherry picked from commit 0635f5cb82f0bb0717b8e74cded79a6fbb0f064c)

Change-Id: Icc5f4e5a51a9b1d3a3f7f9715e3192015996c4fe
2014-01-13 11:13:37 +00:00
Caolán McNamara
30bb1eddba longparas: drop 16bit string limits in meta text actions
Change-Id: I35144034f002cdaaa759a84731aae5fa48c6aa5a
2014-01-13 11:02:34 +00:00
Caolán McNamara
2265c8789c longparas: STRING_LEN gets expanded to string len, so just use str len
Change-Id: I161a94b58c328988bfbfac2922a12d79ec83a9eb
2014-01-13 10:19:19 +00:00
Caolán McNamara
deecab601a longparas: xub_StrLen->sal_Int32
Change-Id: I171caa791e1d2a0baa4444a460a7f20ad5428571
2014-01-13 10:04:18 +00:00
Caolán McNamara
c364fc1fc3 longparas: xub_StrLen to sal_Int32
Change-Id: Ib3eb5f9df112696b326bb30e4deed49d37f30c86
2014-01-13 09:50:11 +00:00
Caolán McNamara
1b7a5c634a disentangle CalcSize
Change-Id: I42248ff611dbe7c109076da5d548717898341be3
2014-01-13 09:50:11 +00:00
Caolán McNamara
89f7e4ec62 longparas: drop STRING_MAXLEN limit in TextEngine
Change-Id: Ib0f72e1fc0938ca286d0131b7bb1a00499ada7d4
2014-01-13 09:50:11 +00:00
Caolán McNamara
3e749d7867 longparas: drop STRING_MAXLEN limit in TextDoc
Change-Id: Iabe74f423c2d65bad637e56e5ab44dd808d41df1
2014-01-13 09:50:11 +00:00
Caolán McNamara
2a44ab09d7 longparas: STRING_LEN->EDIT_NOLIMIT
Change-Id: I4ca1875bf4afa228c1617b4590a3a56f71de57c8
2014-01-13 09:50:10 +00:00
Caolán McNamara
9ceccaaa4d longparas: xub_StrLen to sal_Int32
Change-Id: I93af34cd936510ee14ca1eead55a7abc3036554b
2014-01-13 09:50:10 +00:00
Caolán McNamara
cd4a1e79cd make mnCursorPos a sal_Int32
Change-Id: I37743b6c310acc70ceb9d08f502dcd7a96a436e4
2014-01-13 09:50:10 +00:00
Miklos Vajna
9ae3ad2142 DOCX export: fix nested comments
Change-Id: I9e252ab5645de8f88d0d4c6c0023402d86dd2e9e
2014-01-13 09:53:32 +01:00
Stephan Bergmann
38ab09ecea Clean up #if GTK_CHECK_VERSION(3,0,0)
Change-Id: Idad6d064a20b0be83aebb8bf72013a65acb2d322
2014-01-13 09:46:47 +01:00
Julien Nabet
a14b4d2dfd cppcheck: fix some redundantAssignment
Change-Id: I9ea73bada743b195d778b17038137e9089d03404
2014-01-12 22:26:20 +01:00
Julien Nabet
df1005452c cppcheck: Add missing right parenthesis
Change-Id: I960ac0348bda310652edf36c0acc08f26c328946
2014-01-12 22:08:46 +01:00
Caolán McNamara
69a945d0db longparas: these 0xFFFF are STRING_LEN
Change-Id: I9501efae520a994baaf675f70f3570d9ba3233aa
2014-01-12 20:09:32 +00:00
Caolán McNamara
f042e84e63 longparas: nStart and nEnd are always overwritten
so simplify to the reality, which conveniently removes some
hard-coded 0xFFFF and STRING_LEN uses

Change-Id: I4fc014a972f6a157c18f8194c410b7cbff03de4a
2014-01-12 20:09:32 +00:00
Caolán McNamara
ad4f00a992 longparas: raise 16bit Impl_IMEInfos limits to 32bit
Change-Id: I2196119a8205892724f0d8b75a05940666839642
2014-01-12 20:09:32 +00:00
Caolán McNamara
40a8208e67 longparas: raise 16bit cursor pos limit to 32bit
Change-Id: I08e4e954d4f07800d23b50d3fc933b1d2984eca0
2014-01-12 20:09:31 +00:00
Miklos Vajna
c253a64e55 writerfilter: drop most never generated FIB tokens from doctok
Keep wIdent and lcbSttbfUssr for now, as they are special being the
first / last.

Change-Id: Ib6172fd0b76c4a9e8fbe1ebafc20a7adcb105eab
2014-01-12 19:50:00 +01:00