Change-Id: I7ed2cef99e989aba387917fdeb16a82debd1053f

Change-Id: I922d27f584ef39d543ee2bba997680dbea06d95f

Change-Id: I25bf1a16768e964b2771099262215ea157e39358

Change-Id: I888d9efe8bad905c108a6c824f2e2c7228fdd56d

Change-Id: I2af8ab42eacdd1db7dfc6758c72fcd500b237ebc

Was omitted in ab0096ed

Change-Id: If3e1c141f02751ca7e6104ba21c246926fca843d

These were omitted in ba950a50 because
oox/source/xls/formulabase.cxx was moved to
source/filter/oox/formulabase.cxx

AVERAGEIF, AVERAGEIFS, COUNTIFS, SUMIFS

Merged from Apache OO, parts of
http://svn.apache.org/viewvc?rev=1381452&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Daniel Rentz [dr] <daniel.rentz@oracle.com>
Original Committer: Daniel Rentz [dr] <daniel.rentz@oracle.com>

 # HG changeset patch
 # User Daniel Rentz [dr] <daniel.rentz@oracle.com>
 # Date 1299664669 -3600
 # Node ID 89feb2fb2947d76a15e2de8bc1def1edf20e4f88
 # Parent  1bf6d73db8a4ee709aa4d9d9d827efafc9c611d2

Change-Id: I0756e1da4aa2acaefb86b5813e047b2768c192a1

Change-Id: I6c81fa0f1b8d7273541d5d9883b5fc96a5091bbd
Reviewed-on: https://gerrit.libreoffice.org/1080Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: I51fa0259df84327db7dd07ae9ed5b109d40b6660

Change-Id: Ib0fdf7f8916a9d31fbcbedad925361d0cbe03b10

Change-Id: I3118fb2a4d30e1626a05e9872b34a3c33bd487be

Change-Id: Idb1f2db3377bbbf71067a27944b2f07865798972

Added handling of svExternalSingleRef and svExternalDoubleRef for
SUMIFS, AVERAGEIFS and COUNTIFS.

Change-Id: I99bf6860f2bda5a99aeb85d4e4971032b1c7da0d

Change-Id: Id832383518af0dd77e401e40512a890265b5d83e

Merged from Apache OO with adaptions, parts of
http://svn.apache.org/viewvc?rev=1381446&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1284060031 -7200
 # Node ID 528da6bfd0daed4355d745590d5ac3a319b08fb4
 # Parent  237cb91dd986ff11eb100cc631206cda102e91f7

Change-Id: If456792f23429a80582a48b022d268e6179316a1

AVERAGEIF, AVERAGEIFS, COUNTIFS, SUMIFS

Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381452&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Daniel Rentz [dr] <daniel.rentz@oracle.com>
Original Committer: Daniel Rentz [dr] <daniel.rentz@oracle.com>

 # HG changeset patch
 # User Daniel Rentz [dr] <daniel.rentz@oracle.com>
 # Date 1299664669 -3600
 # Node ID 89feb2fb2947d76a15e2de8bc1def1edf20e4f88
 # Parent  1bf6d73db8a4ee709aa4d9d9d827efafc9c611d2

Change-Id: Ia70075284c5921faea58cae986e4e5eb090b1fab

Merged from Apache OO.
http://svn.apache.org/viewvc?rev=1381450&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1298043566 -3600
 # Node ID 346e0beefed21519bbb6545bccfea022dd75ed66
 # Parent  2416febcae5c81a24b40439f09f91e40a686b911

Change-Id: I5c2b6f9a34336a734bd96e067ec57a2f58d4488c

Merged from Apache OO.
http://svn.apache.org/viewvc?rev=1381449&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1297940971 -3600
 # Node ID 2416febcae5c81a24b40439f09f91e40a686b911
 # Parent  0d84fd3534ea7cda60f795f7dc5d99db58d8cc6e

Change-Id: I46835f0cef9bf83b76e7501a5291f7724b23f871

* For SUMIFS, AVERAGEIFS and COUNTIFS:
  * All ranges must be of same dimension and size.
  * Bail out if error encountered for any parameter, without calculating
    remaining parameters.
* Adapted ScParameterClassification to cope with paired repeated parameters.
* In function resource have a trailing blank for repeated parameters so the
  number is appended with a blank between.

Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381448&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1288820521 -3600
 # Node ID 79da8a1033b663c919f0dc48799f70256bffa497
 # Parent  02cf226fcde498f6fd926d45df497e9fb412fe0f

Change-Id: Ica4faa4e7a46cd5f480cb898785daa51a50ec23b

Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381447&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1288810126 -3600
 # Node ID 02cf226fcde498f6fd926d45df497e9fb412fe0f
 # Parent  528da6bfd0daed4355d745590d5ac3a319b08fb4

Change-Id: I08754653cd2ff20536ad3e9f260f747cb127ccdd

changes to commit bcf8581d3dbbfbc4d3e507371691378d8cab050a
* adapted IterateParametersIf() to current ScSumIf() code
* added AVERAGEIF to unit test
* moved ocAverageIf to proper position in parclass.cxx

Change-Id: I51c793570cea9c75faa9be13abd91e8df3b5fd5a

Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381445&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

slightly reworked patch by <makkica>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1284055400 -7200
 # Node ID 237cb91dd986ff11eb100cc631206cda102e91f7
 # Parent  1c32319bb02fdf173de6a609fca9f2e9c9f4c73a

Change-Id: Id168462272dc8d618513319ebab41fde5c728b08

Change-Id: I31ac7c7e11a7dcb4c99c9ef2890190bcd7b0fe26

Change-Id: I1f8fcdd78029344c735cd4364c8b081d692e2f4e

Change-Id: I73365ed32a47e41c6f58191ee111d9b05741b421

Change-Id: I916c78452dd3dc7f29940ce784ca79d687f375a0

Change-Id: Iaa9cc441c15acef0d5f0ee6bb230466c358e78c8

Change-Id: Ied2d9a80ec96d25a1479c03ac4e925c3be9ac8d1

Change-Id: Ic9d3a3a6cbf191a888dbb7aa6d7281379a0c2b46

Change-Id: Ie8fc421d4b9cc7340d5c634e3e2593795bf2be68

Change-Id: I4d5c955d1587e3ad4acfa1671c49d7bc68a6829a

Change-Id: Iae5dbc06e56bd7e82608434034014d305804bd18

This reverts commit 0743ccea.

This seems to be unnecessary and generates a lot of warning spam.

Conflicts:

	sd/source/ui/remotecontrol/BluetoothServer.cxx

Change-Id: Ib0cda3ca560a5ddc4ba86d5a0c80774a992d7296

Change-Id: I4c72c9155e7b2db12ccfbc9bd50e76e09fbf1276

Change-Id: I8f68addd1e94d658ed43b8c1a59bfd51ed9b71b8

Change-Id: I09a6ad82bbb54ce8329e8b2f6152e9f5a1880a68

Change-Id: Idcce1864902889bbbde00e5a9393195d4b591ce2

Change-Id: I7a47994fb74d2b7aa3e2069b91d02d7993ba993b

Change-Id: Ie87469d7553d1dcad49348c42d3cca99a43d709c