69 Commits

Author SHA1 Message Date
Noel Grandin
7001ca25ec merge LineProperties with chart::ErrorBar
Change-Id: Ic3490a15339ff981e90a86cb69c206c231db9161
Reviewed-on: https://gerrit.libreoffice.org/26932
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-05 10:51:09 +00:00
Noel Grandin
64354e6479 merge BibTabPage with BibGeneralPage
Change-Id: I16a80e7e98fdd2be08b5a8ce586b709a3720e694
Reviewed-on: https://gerrit.libreoffice.org/26929
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-05 09:44:26 +00:00
Noel Grandin
b9854c60c6 merge tdoc_ucp::OfficeDocumentsEventListener with
tdoc_ucp::ContentProvider

Change-Id: I4c743ce3d61d048ae9cf762462d9042337cd9d47
Reviewed-on: https://gerrit.libreoffice.org/26903
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-05 08:24:39 +00:00
Noel Grandin
add9a35ba6 merge CGMOutAct with CGMImpressOutAct
Change-Id: I4d3d59b6c34edef9cd5bfd460f6379e4d1afa460
Reviewed-on: https://gerrit.libreoffice.org/26930
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-05 08:24:18 +00:00
Noel Grandin
dac06d9cb0 merge svt::StoreString with svt::StoreContentURL
Change-Id: I6f2a7102c697cecc96e8b950b499bc9b0f91240e
Reviewed-on: https://gerrit.libreoffice.org/26904
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-05 06:32:27 +00:00
Noel Grandin
f81316af4f merge sdr::event::EventHandler with sdr::event::TimerEventHandler
Change-Id: Id81c6b67d95d976dae417cf225bd43347c716d06
Reviewed-on: https://gerrit.libreoffice.org/26905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-04 12:55:14 +00:00
Noel Grandin
6964c17415 merge sfx2::IXmlIdRegistrySupplier with SfxObjectShell
Change-Id: I7e8bad6b1c944f14b850b91b902b82613c26faeb
Reviewed-on: https://gerrit.libreoffice.org/26899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-04 12:28:41 +00:00
Noel Grandin
c752aad433 merge vcl::DisplayConnectionDispatch with vcl::DisplayConnection
Change-Id: I0eb83905896e1d7549a5bd4adde45e9d69209401
Reviewed-on: https://gerrit.libreoffice.org/26888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-04 12:21:58 +00:00
Noel Grandin
3459ab4a5d merge ftp::ResultSetFactory with ResultSetFactoryI
Change-Id: I061145fefef33aa3e7349adf7da03222c3b2a911
Reviewed-on: https://gerrit.libreoffice.org/26898
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-04 10:58:42 +00:00
Noel Grandin
20b9cbd0e5 merge toolkit::NameContainer_Impl with toolkit::ScriptEventContainer
Change-Id: I14e9401056e31ee9d4ad5945a73ca31969430b4c
Reviewed-on: https://gerrit.libreoffice.org/26891
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-04 10:55:08 +00:00
Stephan Bergmann
ed49818ab0 Clean up OContainerListenerAdapter
* elide OContainerListenerAdapter_BASE
* no need for protected members

Change-Id: I70095dadc4b1f42f04c8ea76b2236bf99a226da9
2016-06-24 10:29:48 +02:00
Noel Grandin
febeefc6c7 loplugin:mergeclasses SfxMacroTabPage
Change-Id: I74790c665fbd191914291365ce711fea9f1cf320
Reviewed-on: https://gerrit.libreoffice.org/26147
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-10 08:28:36 +00:00
Noel Grandin
fc7e6d8445 loplugin:mergeclasses SdrItemBrowser
Change-Id: I90c6006be05f182fd442ce8d3641f4f17cdb6793
2016-06-10 09:13:36 +02:00
Noel Grandin
c6d0a104aa update mergeclasses results
and do one trivial merge

Change-Id: Iff30553f73de946c74fa6b082928e7d47adadd04
2016-06-10 09:13:36 +02:00
Stephan Bergmann
a57049915d Avoid reserved identifiers
Change-Id: I263603fb81d368ebc8450b2d8cc01752fcd3f29d
2016-04-22 10:13:56 +02:00
Stephan Bergmann
9c38c84c48 Avoid reserved identifiers
Change-Id: I438a7f28ba6bc68ec4e6244a4343e4040ab1b997
2016-04-07 07:57:12 +02:00
Caolán McNamara
4ebe249104 drop basebmp entirely now
Change-Id: I534848c4be8eadf86b7f31ac742a80982405f56f
2016-01-20 09:43:28 +00:00
Jan Holesovsky
007543f967 sc: Merge ScMultiTextWnd into ScTextWnd.
Change-Id: I21ed0e37feec0e7c078c2e284b7f4169f0cff432
2015-12-11 10:43:00 +01:00
Noel Grandin
7e1bb64f14 loplugin:mergeclasses OOXMLPropertyImpl into OOXMLProperty
Change-Id: I1447cfc76c529332450c90a21b6525d3103fe852
2015-12-07 11:01:59 +02:00
Noel Grandin
9f0f30fa35 loplugin:mergeclasses, merge OOXMLPropertyImpl into OOXMLProperty
Change-Id: I73eb7e664c0a53f135c06c3d8ea450bd9493c780
2015-12-07 11:01:58 +02:00
Noel Grandin
25120e73f9 loplugin:mergeclasses, OOXMLTableImpl into OOXMLTable
Change-Id: I28f6d317ca02cf23341358f9520de273af603bd7
2015-11-30 10:04:03 +02:00
Noel Grandin
5c142dd31d loplugin:mergeclass, fix and update results
Change-Id: I0660833db69604c5c4dd3c5826f1baac3086e052
2015-11-11 13:48:34 +02:00
Noel Grandin
609b227873 fix tdf#95488, crash in report wizard
This reverts commit bb76b8f10697f3d5ca1f9a2f19902b043bd61cd7
"loplugin:mergeclasses"

Change-Id: Ib65459ab45cd4cefa859ed75f9ddc4f070879b1d
2015-11-05 12:02:00 +02:00
Noel Grandin
ec20e65469 loplugin:mergeclasses, merge IControlContext with OBrowserListBox
Change-Id: Ib3e54c9fe8d9445ad799e4b06c41443093af87fb
2015-10-13 10:07:50 +02:00
Noel Grandin
38b4b7590d loplugin:mergeclasses, merge OOdbcLibWrapper with OOdbcEnumeration
Change-Id: I2e564e90c11bb46022a5e258ad013aeb2fe4ca2e
2015-10-13 10:07:50 +02:00
Noel Grandin
ade2ba503f loplugin:mergeclasses, merge ILabelProvider with LabelProvider
Change-Id: I8fb231b4189c09d8e049855d38b0f1eb518ac2b9
2015-10-13 10:07:50 +02:00
Noel Grandin
3e5f9c0343 loplugin:mergeclasses, merge IImageProvider with ImageProvider
Change-Id: I6af8b1ab9198439af60e38a9adc6bdd29d20ab52
2015-10-13 10:07:49 +02:00
Noel Grandin
9abb98e019 loplugin:mergeclass, merge CompareLine with SwCompareLine
Change-Id: Id423939377e6ebb0881a9a7361d6baedbf87931c
2015-10-13 10:07:49 +02:00
Noel Grandin
e1d7a84955 loplugin:mergeclasses
Change-Id: I935c6144a7731091e7fdb0a818b54f30d3304f2e
2015-10-12 09:13:34 +02:00
Noel Grandin
8d811d701f loplugin:mergeclasses
Change-Id: I672d277a8d2dc6b57b299679e7e98348f9dbde30
2015-10-12 09:13:34 +02:00
Noel Grandin
1d8806120f loplugin:mergeclasses
Change-Id: I31fe981dac14bd732ee68ee1a2e475dd1b0498a2
2015-10-12 09:13:34 +02:00
Noel Grandin
6b34ac2419 loplugin:mergeclasses
Change-Id: Ic02d59708670949c3342566753882eebd086438f
2015-10-12 09:13:34 +02:00
Noel Grandin
06e4a98990 loplugin:mergeclasses
Change-Id: I6266369912413d51c9f1595b13dca97d3d74225f
2015-10-12 09:13:34 +02:00
Noel Grandin
f8ba308cd7 loplugin:mergeclasses
Change-Id: Id6e39c2c20ab3da5a8b8628f99a940b896feff78
2015-10-12 09:13:33 +02:00
Noel Grandin
523eaf4888 loplugin:mergeclasses
Change-Id: Ia4c09c5b835e77eaa2d4c0d8c74f146feb0905be
2015-10-12 09:13:33 +02:00
Noel Grandin
48532dfa60 loplugin:mergeclasses
Change-Id: I1ce2e31e4dae780612e51b3806ee6044be9cf4bb
2015-10-12 09:13:33 +02:00
Noel Grandin
529f15859b loplugin:mergeclasses
Change-Id: I660b102e0e053e632ea6f1880e92652bc1ed5e5e
2015-10-12 09:13:33 +02:00
Noel Grandin
0f88736128 loplugin:mergeclasses
Change-Id: Icd01de71fe87e0bf17eba39f5b00fc9a46765509
2015-10-12 09:13:33 +02:00
Noel Grandin
3e6ff89b5c loplugin:mergeclasses
Change-Id: Ia4ae4f17fba9775fc53618ab1662c10e37ee4be3
2015-10-12 09:13:33 +02:00
Noel Grandin
14421f20dc improve the mergeclasses loplugin
Change-Id: Icbb873c4ac15ef146b126b97f45eabdc53cd4c1a
2015-10-12 09:13:32 +02:00
Noel Grandin
527a9a1146 loplugin:mergeclasses
Change-Id: I555e3db911a97e798ce9f10c76d7fe187ea550a7
2015-10-12 09:13:32 +02:00
Caolán McNamara
71bb6d6b72 Revert "loplugin:mergeclasses" to fix mac build
because fontsubst.cxx is not built on mac.

move PreMatchFontSubstitution to PhysicalFontCollection.cxx ?

This reverts commit 349700228e4449ace956b30bc65208b9196f0a78.

Change-Id: I007f24313ddfd0eb3db3fd599abcf1eae3da4e9c
2015-10-07 12:57:44 +01:00
Noel Grandin
bb76b8f106 loplugin:mergeclasses
Change-Id: I8f5c2ae658f8784233db98f752b6f9fa53110195
2015-10-07 12:32:23 +02:00
Noel Grandin
5dbbb498b5 loplugin:mergeclasses
Change-Id: I0ac98a6fafb48b2be00973ae9fd34f4bc756cd7f
2015-10-07 12:32:23 +02:00
Noel Grandin
a3eacae95a loplugin:mergeclasses
Change-Id: Icf1731dfbd16d85decd2aaf80be4841ac37007fd
2015-10-07 12:32:23 +02:00
Noel Grandin
349700228e loplugin:mergeclasses
Change-Id: I9f56beebae1ea02a8914b7b25fe7565f7b0df053
2015-10-07 12:32:23 +02:00
Noel Grandin
64d0de92ab loplugin:mergeclasses
Change-Id: If8fabc79f4cbef6fc0d164bbe2f6136f1d1f00af
2015-10-07 12:32:23 +02:00
Noel Grandin
8b98c8b32c loplugin:mergeclasses
Change-Id: I52446e517c2315516ea74a30767393ff32960799
2015-10-07 08:27:27 +02:00
Noel Grandin
77f884064d loplugin:mergeclasses
Change-Id: I14985f98989861d74b3904ab79f3ced5a3d96f73
2015-10-07 08:27:26 +02:00
Noel Grandin
44a46d4f3b loplugin:mergeclasses
Change-Id: I28d8bd79f266df7e9ea420f7238ed332ec4205a9
2015-10-07 08:27:26 +02:00