/salhelper/

Conflicts:
	sw/inc/unodraw.hxx
	sw/inc/unoframe.hxx
	sw/sdi/swriter.sdi
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/filter/ww8/rtfexportfilter.cxx
	sw/source/ui/inc/unotxvw.hxx
	sw/source/ui/lingu/hyp.cxx
	sw/source/ui/lingu/sdrhhcwrap.cxx
	sw/source/ui/uno/swdetect.hxx

Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw: Avoid linking in a lot of, mostly UI related, code for mobile platforms. 2014-02-18T08:37:17+00:00 Matúš Kukan matus.kukan@collabora.com 2014-02-18T08:25:02+00:00 bac3b0c12e11438166e28358e04d4e175a3e09f2 Change-Id: Ic49a22140233e72e6f1e103558825970f1ee3df3

Change-Id: Ic49a22140233e72e6f1e103558825970f1ee3df3

remove sfx2/appuno.hxx 2014-01-15T14:11:49+00:00 Matúš Kukan matus.kukan@collabora.com 2014-01-15T09:31:09+00:00 0a2d80f754cecc5075b2808e292360a8b13835fc Change-Id: Ibfcd2954b20def05d2a7db36f5ccc0b570305441

Change-Id: Ibfcd2954b20def05d2a7db36f5ccc0b570305441

Bin comments that claim to say why some header is included 2013-10-22T13:56:28+00:00 Tor Lillqvist tml@collabora.com 2013-10-22T12:58:57+00:00 a7724966ab4fc8cd680a20e4f2a65f276e001a39 They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c

They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c

[API CHANGE]: PreView -> Preview, including .uno:PrintPagePreView. 2013-10-16T14:57:22+00:00 Jan Holesovsky kendy@collabora.com 2013-10-16T14:36:45+00:00 66013a154bd2dccc0db1edd14197ce419ba9a614 Will be .uno:PrintPagePreview going forward. Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6

Will be .uno:PrintPagePreview going forward.

Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6

Turn sidebar back to non-experimental 2013-09-20T15:35:29+00:00 Caolán McNamara caolanm@redhat.com 2013-09-19T13:55:24+00:00 d023339c2f85555212bdb9804854dcc2c403b50e This reverts commit 7ce2a89f4f8fa84232896766276cb3433ada239c. Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a revert d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46 Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718 Revert "sidebar: disable impress task pane if sidebar is enabled." This reverts commit ee1726bfdba483623d496a3bcc09089e8b55cd65. revert 54d820a7815af03a248c1aa424fae9bf9a4881f4 Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1 Revert "Only register and use the Sidebar if it is globally enabled." This reverts commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e. Conflicts: sfx2/source/view/viewfrm.cxx Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96 Revert "disable sidebar menu option if it is disabled." This reverts commit 05f0eb57618d090fa45011120a907a3b1157accb. Revert "finally get the taskpane rendering again" This reverts commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I248cc9a769695cde19e78774d42ce666dc685599 Revert "don't throw up the sidebar on start." This reverts commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4. Conflicts: officecfg/registry/data/org/openoffice/Office/Views.xcu Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8 Revert "update to the right service name for new URLs." This reverts commit 55f49970f4085e3a1498961edabd5303bd6bea6c. Conflicts: sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021 Revert "tentatively restore more UNO / task-pane goo ..." This reverts commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu Change-Id: I7e62f27329af033df811549436718648a6447dea Revert "more reverts, first cut at making sidebar optional." This reverts commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd. Revert "add experimental option for sidebar to 'Advanced' pane." This reverts commit 54d820a7815af03a248c1aa424fae9bf9a4881f4. Conflicts: cui/source/options/optjava.cxx sd/source/ui/framework/module/ImpressModule.cxx Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f Revert "Restore FrameworkHelper taskpane URLs." This reverts commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c. more foo Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57 really go to town on it Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4

This reverts commit 7ce2a89f4f8fa84232896766276cb3433ada239c.

Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a

revert d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46

Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718

Revert "sidebar: disable impress task pane if sidebar is enabled."

This reverts commit ee1726bfdba483623d496a3bcc09089e8b55cd65.

revert 54d820a7815af03a248c1aa424fae9bf9a4881f4

Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1

Revert "Only register and use the Sidebar if it is globally enabled."

This reverts commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e.

Conflicts:
	sfx2/source/view/viewfrm.cxx

Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96

Revert "disable sidebar menu option if it is disabled."

This reverts commit 05f0eb57618d090fa45011120a907a3b1157accb.

Revert "finally get the taskpane rendering again"

This reverts commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Impress.xcu
	sd/source/ui/framework/factories/TaskPanelFactory.cxx
	sd/source/ui/framework/tools/FrameworkHelper.cxx

Change-Id: I248cc9a769695cde19e78774d42ce666dc685599

Revert "don't throw up the sidebar on start."

This reverts commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Views.xcu

Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8

Revert "update to the right service name for new URLs."

This reverts commit 55f49970f4085e3a1498961edabd5303bd6bea6c.

Conflicts:
	sd/source/ui/framework/tools/FrameworkHelper.cxx

Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021

Revert "tentatively restore more UNO / task-pane goo ..."

This reverts commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Impress.xcu

Change-Id: I7e62f27329af033df811549436718648a6447dea

Revert "more reverts, first cut at making sidebar optional."

This reverts commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd.

Revert "add experimental option for sidebar to 'Advanced' pane."

This reverts commit 54d820a7815af03a248c1aa424fae9bf9a4881f4.

Conflicts:
	cui/source/options/optjava.cxx
	sd/source/ui/framework/module/ImpressModule.cxx

Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f

Revert "Restore FrameworkHelper taskpane URLs."

This reverts commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c.

more foo

Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57

really go to town on it

Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4