Change-Id: I75e4566509d1851e7405d1738ffeaf58261233ea

Also do not be fatal on clash with binfilter and just warn the user that
mergelib was disabled in favor of binfilter if he has both enabled.

Change-Id: I3b683a948e00b1134c10881c5ec442e6380f2822

Change-Id: I5bdcad692678b9debb77db4ec08223d38e5c01c5

this adds "Page " to the page number info in the statusbar and to the
scrollbar's tooltip in the page preview mode.

Change-Id: Ia1dda0e98777465ef87364f12437449ca7787510

Change-Id: I5c21a407bcae1b668976b94a757d564120973b1a

Hopefully this will allow us to track methods we don't or can't implement ( although we let them actually exectute )

Change-Id: I53c74054ffea6cfa8e45aa4583f51c03f33991ee

Change-Id: I4cbc0fbf17aa80db4b19df630d6f18f97b9f6982

Change-Id: I2992c89f70aebfcae5795c9f21d3cca48cbea4ae

SwCaptionOptPage can be added either to SwCaptionOptDlg or OfaTreeOptionsDialog

Change-Id: I0cedfc27f8d1f1bbf5e19dce2f438fc782cd5832

Wrong fix: GetParent can return pointer to SwCaptionOptDlg which is
derived from SfxSingleTabDialog.
This reverts commit a5546942.

it turns out that GetParent() returns pointer to OfaTreeOptionsDialog,
not SfxSingleTabDialog. Disabling OK button in the options dialog does
not make any sense, so the patch removes that code.

Change-Id: I76618d89f904a6eac80fc08072dcde007b2d9c34

Change-Id: I16d45284cfb4ab8d239ea5e9a326160a742c4bf1

Change-Id: I7f5e15f4d5e285a85e01fdeaede747e88d08510d

Change-Id: Ie5f050bf5f672a35d9629dcfb039d9fff7470cab

Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0

Change-Id: I9bf304a791b62f6b96711eb058f302cadfdb276a

Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05

Change-Id: I586a31a5d563ea8a11282836ca1d54b0c8be1bf4
Signed-off-by: Arnaud Versini <arnaud.versini@gmail.com>

Change-Id: I41d452aa4892606d127e9565cf83c21f78a67392

Change-Id: Ibcd63b7a74f6a6afb0ac1195218125fea26a0482

Change-Id: Ia1afbfd027bf473f23b83239562f542d0157d549

Change-Id: Ia57ab6bfa9e7fa663b699627cec07d19a378b293

Make rtl uuid cppunit work
- removed call to simpleheader.hxx
- added call in Module_sal.mk for rtl_uuid
- created mk for cppunittest for sal_rtl_uuid
Second patch:
- removed makefile.mk as Stephan suggested
- modified CppunitTest_sal_rtl_uuid.mk header

Change-Id: If090843203e38d3eced14941b58e6122d27bdb09
Reviewed-on: https://gerrit.libreoffice.org/422Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>

This is a follow-up patch of 06f61121.

Since the rebasing process is not finished yet, I submit it to
Gerrit, so that the changes are available for later when they can
be applied again to the related files.

Change-Id: I047ade3f9a6b3927ddab8b94a53113b17483c06f
Reviewed-on: https://gerrit.libreoffice.org/486Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>

This is a follow-up patch to 06f61121.

However, since the rebasing process is not done yet, I submit it to
Gerrit, so that the changes are available as soon as they can be
applied again to the related files.

Change-Id: I61292e9d893839bd2f8b18a521a30e670f80f05b
Reviewed-on: https://gerrit.libreoffice.org/484Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>

Eike and I reviewed the patch at the same time. However, he was was
faster ;-) Consequently, with this commit I include the fixes for
my remarks previously done in Gerrit as well as for Eike's comments.

This is a follow-up patch of 06f61121.

Change-Id: I6ee721f15852e1023c8b3e4f0b580435ee52c0c6

Change-Id: I31b7b6b0cd4ac67c059729e68b50c92b865930b0

Because the "fix" for i#8288 only set the point of the cursor and not
the mark, it can happen that after a Replace All weird things are
selected; fix that (and i#8288 properly) by using the SwCrsrShell stack,
and don't do it when searching in the selection.
This cannot be done in SwCrsrShell itself because ExecSearch sets the
cursor to the beginning/end of the document already.
(regression from cda75d6f)

Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213

Change-Id: I9fede393b5a0fb6bd2fe0425f6a4b60b754aeb0b

Since 4623c603 the assertions in
lcl_IsLessStart/lcl_IsLessEnd trigger spuriously, because the comparison
is invoked always now even on identical pointers, while the SvArray only
invoked it if the 2 hints didn't have the same address; move the
assertion to SwpHintsArray::Check().

Change-Id: Ida6c8e268452343ed3e90410636703c6baffbabd

Change-Id: I3c5cf65bee50ec0511031b50e1b9f5589491e6bd

Change-Id: Ib2f73d679ac4a6164142a370ce6d55c6de41117c

..only to share one class with fastsax in sax, where it's not used.
The link dependency is ugly, mostly for libmerged.
Use static library.
Another option would be to link fastsax against expwrap.

Change-Id: Ia85b01150959e2472d1ac04013b8b9a27232a070

Change-Id: Ic7f2233ae55f8c5505c5b325aef973b0d0c65730
Reviewed-on: https://gerrit.libreoffice.org/479Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Instead of distributing bazillions of localized templates, that
contain only a few translatable strings, we try to localize them
runtime. This is the initial patch that does the heavy-lifting.
It has some rough edges, but the feature will be polished by
freezing of LibreOffice 3.7.

Change-Id: I535b3bff1f5706afebd21d017c01e2b4745b7cfb

Change-Id: I90b4f71fb74da59c6c578ccd0e9b62f14620d4e6

Change-Id: Iac9a2715b8a0a517f502c56ef0652e316bd76f52

Change-Id: I4f3e6f2c07d1ef55464646a5ab313c305f4a22e8

Change-Id: Ia3440508b929b37dd4aa5d045445ca7b73bb85d9

Change-Id: I568be2e912d5700ef5d24443e48cf7d0a384292a