Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I52399b2f47deefb6212f2f376c8ec3cf98ea2340
|
|
This commit also does the conversion when reading the data from a data source
using the mail merge wizard.
(cherry picked from commit 076e4afc61b216e34959bd4e3701f1fa19972d5c)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: Ia14417507b6ddce955fec26142a42ce51f77de4e
|
|
doc start
In theory, it was a problem to have the table cursor around when having
the selection outside the table; but it didn't cause a problem so far.
However, when the table has one or more empty cells, we really need to
leave table mode, otherwise only the table gets selected.
Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41
(cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
|
|
footnotes
ExtendedSelectAll() was originally invented to e.g. select the whole
document, change the language of the selection and then inmediately
(before the layout is updated) undo the selection.
When using it for "select all and doc starts with a table" purposes,
then footnotes shouldn't be selected, just like those are not selected
either, when the doc starts with a normal paragraph. Their anchor is
still selected, and that's enough to have correct delete and copy&paste.
Change-Id: I4fc49db628054a4b8a46effc2d0328eaabcaa9f8
(cherry picked from commit 959711f1276106b0aaee69ab660f1b0d3ece5bbc)
Conflicts:
sw/source/core/crsr/crsrsh.cxx
sw/source/core/edit/eddel.cxx
|
|
SwWrtShell::SelAll() can now detect if the body text starts with a
table, and if so, it explicitly selects the whole document, not just the
first cell of the starting table.
Also, SwCrsrShell::EndAction() now checks for this "select all and doc
starts with table" situation, and if that's the case, it activates a
special select all mode, so layout can act accordingly.
(cherry picked from commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821)
Conflicts:
sw/source/core/crsr/crsrsh.cxx
sw/source/core/layout/trvlfrm.cxx
fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor ...
... is outside that table
(cherry picked from commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9)
fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table
If the whole document is selected and the document starts with a table,
then we used to delete the contents of the document, except the starting
table, which was just cleared. Change this and do what is expected:
remove the table as well, so the document will have a single empty
paragraph only.
(cherry picked from commit 0fb4adcff534e3841cf6df0e2363fb0797af7022)
Conflicts:
sw/source/core/edit/eddel.cxx
fdo#37606 SwEditShell: fix copying when doc starts with a table ...
... and the whole document was selected
The problem is that the cursor starts at the first cell of the starting
table, but when copying, we want to copy the preceding startnode and
tablenode as well.
(cherry picked from commit 49505336a629a75f4fb48bbe0c532b402e857ed4)
fdo#37606 testcase
(cherry picked from commit f5fa78d75abac3dbe0f9edf9e9106f63ca5dca53)
Conflicts:
sw/qa/extras/odfimport/odfimport.cxx
Change-Id: I60d34906a90a5143163e516f618648cf7178430e
Conflicts:
sw/CppunitTest_sw_odfimport.mk
sw/inc/viewsh.hxx
sw/qa/extras/odfimport/odfimport.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/view/vnew.cxx
|
|
The document itself is stupid and uses a SURROUND_THROUGH object with a number
of empty lines that make it act is if it in fact was SURROUND_NONE, rather
than actually disabling wrapping for the object and be done with it.
But the difference was that Word still managed to fit those empty lines
next to the object into the little space that was there, while LO already
considered the space too small. So keep a compatibility setting for Word
documents in order to avoid problems with such lame documents and hopefully
that's enough.
Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
|
|
Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942
|
|
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
|
|
pPostIt is 0 when we have a large document, and the layout is not yet
ready for a later part of the document, having a comment. Just don't try
to delete such comments, better than a crash.
(cherry picked from commit 9a7641451dad5c73a936de5361aa3c3f148132d0)
Change-Id: I5fd5c908bc7b1feba926214863e84391b9037484
Reviewed-on: https://gerrit.libreoffice.org/3757
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
|
|
This partially reverts commits 1eee77f2c2b4fa5f693708218c74a8f3909649a6
and 51f9e894f46e718200a14bcd61e9e44c64bc5396.
(cherry picked from commit d92932744fdbaa78cec8dd8b991d5f442f6eef4b)
Conflicts:
sw/source/core/doc/acmplwrd.cxx
sw/source/ui/docvw/edtwin.cxx
Change-Id: Ie6a1202e139a0eb30cac482a2bb528ef70c7797f
Reviewed-on: https://gerrit.libreoffice.org/3580
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Tag libreoffice-4.0.3.2
Conflicts:
basic/qa/cppunit/test_vba.cxx
basic/source/runtime/step2.cxx
dictionaries
helpcontent2
instsetoo_native/util/openoffice.lst
libvisio/UnpackedTarball_visio.mk
sc/source/ui/vba/vbaapplication.cxx
sc/source/ui/vba/vbavalidation.cxx
solenv/inc/minor.mk
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
translations
Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
|
|
This adds a dropdown to the 'Open' toolbar tool.
Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318
|
|
http://people.freedesktop.org/~vmiklos/2013/watermark-field-click.odt is
a reproducer, double-click was catched by the fly frame from the header,
so the field edit dialog didn't appear.
Change-Id: Ibd3ea382085fa4cbdc1af73d4be1e5c053a81eaa
(cherry picked from commit 61f467c8974d6b6face41e7027d75ae4ddb6fdb2)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
|
|
The intention is to get similar behavior as
61f467c8974d6b6face41e7027d75ae4ddb6fdb2, except this applies to single
clicks, while that one affected only double-click.
Change-Id: Idddc26aa8cd064f89fb4f99b3ad7a5430ac455bc
(cherry picked from commits a996678ed30804e16103e1cfdc439c8546e5d3b0 and
e76e2c4ce76457e518b007b970e1b0c2742f8d6e)
|
|
Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b
Reviewed-on: https://gerrit.libreoffice.org/3043
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
|
|
Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b
Reviewed-on: https://gerrit.libreoffice.org/3042
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
In RTL UI, comment window is RTL and editbox’s (editeng) default writing
direction is LTR.
and i suspect, the bug is result of this RTL & LTR mix-up.
Change-Id: If3af4ae428b67151d66661907b9e60a97049e0e6
Reviewed-on: https://gerrit.libreoffice.org/2831
Reviewed-by: abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa>
Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
(cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8)
Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
fix fdo#62050: for impress
Impress is also affected by fdo#62050.
In RTL UI, comment window is RTL and editbox’s (editeng) default
writing direction is LTR.
I suspect, bug is result of this RTL & LTR mix-up.
Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
Reviewed-on: https://gerrit.libreoffice.org/2922
Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
(cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506)
Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
|
|
- remove PD_FIRST and GetFirstFmt:
This flag makes no sense at all, since there are no "first-only"
page styles (while there are left-only/right-only).
- instead add a parameter to GetLeftFmt/GetRightFmt to request a
first page format, if such exists and is not shared
(regression from 02a934d03b101ce463a232f9cbb7b43e684de37e
and fa0f42bafbf24e9141ddee728b160b5ab47077f2)
Change-Id: I4d50c2c0cc4f3cf231eacba891df22d0bcf6c4df
(cherry picked from commit 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a)
Reviewed-on: https://gerrit.libreoffice.org/2764
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
(cherry picked from commit 75d6eec4be88194126d31fc0f235cd3a303936bd)
Reviewed-on: https://gerrit.libreoffice.org/2813
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
I also merged (manually) the changes of the cleanup
commit of Michael Stahl ( commit id 859e94294bdfd8595c88dd7f14da09ead8b32a45 )
Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Reviewed-on: https://gerrit.libreoffice.org/2572
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-on: https://gerrit.libreoffice.org/2777
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
- remove PD_FIRST and GetFirstFmt:
This flag makes no sense at all, since there are no "first-only"
page styles (while there are left-only/right-only).
- instead add a parameter to GetLeftFmt/GetRightFmt to request a
first page format, if such exists and is not shared
(regression from 02a934d03b101ce463a232f9cbb7b43e684de37e
and fa0f42bafbf24e9141ddee728b160b5ab47077f2)
Change-Id: I4d50c2c0cc4f3cf231eacba891df22d0bcf6c4df
(cherry picked from commit 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a)
Reviewed-on: https://gerrit.libreoffice.org/2764
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
|
|
* sw/inc/numrule.hxx
* sw/source/core/doc/number.cxx
* sw/source/filter/ww8/attributeoutputbase.hxx
* sw/source/filter/ww8/escher.hxx
* sw/source/filter/ww8/rtfattributeoutput.cxx
* sw/source/filter/ww8/rtfattributeoutput.hxx
* sw/source/filter/ww8/rtfexport.hxx
* sw/source/filter/ww8/rtfexport.cxx
* sw/source/filter/ww8/writerhelper.cxx
* sw/source/filter/ww8/writerhelper.hxx
* sw/source/filter/ww8/wrtw8esh.cxx
* sw/source/filter/ww8/wrtw8nds.cxx
* sw/source/filter/ww8/wrtw8num.cxx
* sw/source/filter/ww8/wrtww8.cxx
* sw/source/filter/ww8/wrtww8.hxx
* sw/source/filter/ww8/wrtww8gr.cxx
* sw/source/filter/ww8/ww8attributeoutput.hxx
* sw/source/filter/ww8/ww8par.cxx
* sw/source/filter/ww8/ww8par.hxx
* sw/source/filter/ww8/ww8par3.cxx
* sw/source/ui/wrtsh/wrtsh1.cxx
Graphic Bullets Fidelity
Patch by: chengjh,<chengjh@apache.org>
Found by: chengjh,<chengjh@apache.org>
Review by: Fan Zheng,<zheng.easyfan@gmail.com>
Conflicts:
sw/inc/numrule.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/wrtw8nds.cxx
Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197
Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
|
|
Unfortunately selecting the field in SwEditWin::MouseButtonDown()
prevents the click field handling code in SwEditWin::MouseButtonUp()
from running. Instead select the field in MouseButtonUp and
SwWrtShell::ClickToField(), which seems to work better.
(regression from 94721b2aec614e0d99504138d484b2ad6cd550c7)
Conflicts:
sw/source/ui/wrtsh/wrtsh2.cxx
Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5
(cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671)
Reviewed-on: https://gerrit.libreoffice.org/2286
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
|
|
This solves the conflicting requirements:
If the annotation has focus ("in annotation mode"), then we want to
be read-only only in case the comment anchor is inside a protected
section, or so. Ignoring the fact that in the main document, the cursor
is right before the annotation anchor, which is a read-only position.
OTOH, if the annotation has no focus and the cursor position is before
the annotation anchor position, then we do want to be read-only.
With this commit, the first case passes around a boolean flag, so the
annotation frame won't be read-only without a reason.
(cherry picked from commit 9104d5e8905c2ec2b576b5ca452d3e23d5555e49)
Conflicts:
sw/inc/pam.hxx
sw/source/core/crsr/pam.cxx
Change-Id: I25781a4501f752f7c4d024795d57b884cb800547
Reviewed-on: https://gerrit.libreoffice.org/2163
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
Change-Id: Ie78819590bca52f36406022a3954651c42c52540
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
(regression from f7d681dc34e60eb8532403079d007ca1250f4941)
Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40
(cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96)
Reviewed-on: https://gerrit.libreoffice.org/2119
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: I35968241a79db0aabe06e25c0efac2aa3d1c5b84
Reviewed-on: https://gerrit.libreoffice.org/1984
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
SwEditWin::MouseButtonDown: the selection of fields was messed up by a
call to rSh.SetCursor near the bottom of the method. This used to be
fixed up by SwEditWin::MouseButtonUp previously, but that was broken
with commit dcb080347ca127044313bbb3c11c37761cc2a7a2.
To fix that move the field selection code to a place where it prevents
the other code from running, in the hope that it is not necessary.
Also it does not make any sense to select whole words when clicking on a
field, just selecting the field seems much better.
Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e
(cherry picked from commit 94721b2aec614e0d99504138d484b2ad6cd550c7)
Reviewed-on: https://gerrit.libreoffice.org/1925
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Backport needed to fix build after backport of 2b9edadd637ea52293473e63062d334371bc83af .
Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
|
|
Try to prevent pushing of SfxShells from this function via EndAllAction
and SwView::AttrChangedNotify() by setting a ridiculous pre-exising
global bNoInterrupt variable.
Change-Id: I9c91ca882891c8dfcd9dc08ba197233cfefddefd
(cherry picked from commit beacee6fad46aa2c8fc813bb0150e5c7a5175b26)
Reviewed-on: https://gerrit.libreoffice.org/1722
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
regression since 0157f0b1ba364f7f9af2aacd1be9fbb5ddec2b4d
my belief was that OK_Impl was only called in one
place, in sw/source/ui/fmtui/tmpdlg.cxx, so I
merged the use there into OK_Impl, but of course
there was another use in sfx2/source/dialog/tabdlg.cxx
Given that OK_Impl only called PrepareLeaveCurrentPage originally...
a) replace OK_Impl in sfx2/source/dialog/tabdlg.cxx
with PrepareLeaveCurrentPage, a no-op from the original state.
b) add an Apply method that does what I want, i.e.
call ok without closing the dialog, so we can retain
the fix of fdo#38606 to have "apply" immediately
apply the effect of pressing "ok" without closing
and reopening the dialog
Change-Id: I57e2e41c07ab9bf89ada98d1b9c3336db3493f19
(cherry picked from commit 8fd85527981e3a6a915192aaea6f1595ea9f037c)
Reviewed-on: https://gerrit.libreoffice.org/1729
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
|
|
Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
(cherry picked from commit a5dc04633d79f5abee85d919e097983117d2abd4)
Reviewed-on: https://gerrit.libreoffice.org/1697
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
(cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
Conflicts:
svtools/Library_svt.mk
q#
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
Signed-off-by: Cor Nouws <oolst@nouenoff.nl>
Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org>
Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case. In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.
This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
(cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1)
|
|
Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54
(cherry picked from commit d14f7e4ec48f9a9eee0585fb5ee72512e9f4bd19)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Wrong bracketing, item is put at a which-id of sal_false.
Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d
Reviewed-on: https://gerrit.libreoffice.org/1498
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 06bdc1e3ae8e93154dc9b9487691b547348c8634)
|
|
No idea how to reproduce it; pSwView is checked before use except here.
(possibly regression from 2f9f480b22f2fff59d9c48b4b46706c3d5223e66)
Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0
(cherry picked from commit 1c52268a5bc6d79c6ee1344e4e341c7e3820d4e0)
|
|
UseOnPage got changed in commit
fa0f42bafbf24e9141ddee728b160b5ab47077f2, but SvxPageUsage got
unchanged. Given that right now other applications don't support first
page headers / footers, leave SvxPageUsage unchanged and provide
conversion methods between the two types.
(cherry picked from commit bee957fc48867aa1b98b8672b02a187a461f4e38)
|
|
Change-Id: I17139da65d0adbdaaa2c7bafb066fc6f74c42700
|
|
i.e. don't close and reopen, just stay open
Change-Id: I11cdc492e3c4adfb75c9a0dfa52e5ba351914858
|
|
The magic WB_TABSTOP bit is the one that allows a widget to be accepted as a
candidate for getting focus when pressing tab
(cherry picked from commit 166d8257979aac6775319a9e1f305bc94df97e29)
Conflicts:
svx/source/dialog/fontlb.cxx
Change-Id: I7d964bae6b84184ccbc4652d66cf3d2637566405
|
|
Change-Id: I36054bf58f857b104abd83913d45f32f0c930c19
|
|
The command to show hidden styles again was missing.
Change-Id: Ic25b0cfc4d021d949124b8c4ef4016d6dba7e39f
|
|
Change-Id: Ie0018bde73eed6049d1ef2287157b86151766e83
|
|
Change-Id: I8ff97ad9ecc6367d98dc31829f82d074f99f5934
|
|
Change-Id: I49e9d40d942dd7a23bebaa4783b0ff59e06890b0
|
|
This interface has been deprecated since OpenOffice.org initial CVS
import, and there does not appear to have been an implementation of it,
though strangely there was client code using it until 2007.
EXISTENCE: published key "/UCR/com/sun/star/util/XArchiver" exists only
in registry 1
Change-Id: I8efa29a3d375d7c5c77ae47592b23bec4072d7a0
|
|
regression from cad9afa15f53d547733fa55f1353772f6d696611
Change-Id: I1aa36bf86969a5a90456817d360d59125948e519
|
|
Change-Id: I1138314eba33dc8cf8d1f60e77ac419b4550bbcc
|
|
This service was obsoleted by CWS printerpullpages: the implementation
in Writer was defunct in OpenOffice.org 3.3 and completely removed in
OpenOffice.org 3.4.
Change-Id: Ia4dd6f1f1d8fc399583032b44d99663532409b5c
EXISTENCE: published key "/UCR/com/sun/star/text/PrintPreviewSettings" exists only in registry 1
SERVICE: /UCR/com/sun/star/text/DocumentSettings
service1 contains 1 more references as service2
incompatible change: Reference 2 ('PrintPreviewSettings') in 'r1' is not longer a reference of this service in 'r2'
|