Commit Graph

54 Commits

Author SHA1 Message Date
ffa9a802ea coverity#1028261 Uncaught exception
Change-Id: I7dd08c182657084ffa635e1960f4d0def6d7a6bb
2014-06-18 11:12:11 +01:00
5e80dd672f Move a few more headers that are included only in sfx2 to sfx2
Change-Id: I8bd81a45f5ef1b76fce1563b06e05a4eefcff0ec
2014-05-06 15:01:31 +03:00
417a537d97 some more hrc cleanup
Change-Id: Ia7db5d7b52aadd158584ffaa06e777d8b02f9820
2014-04-24 11:58:13 +02:00
702f9c5176 huge hrc and src file cleanup
* mostly fallout from ui conversion
* some completely unused defines from src files
* lots of unused HID ids

Change-Id: I976561205798db3d06ee139de6223f638e58f47a
Reviewed-on: https://gerrit.libreoffice.org/9142
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
2014-04-23 22:49:57 +00:00
567ef6d578 Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
7b2c8b9771 remove unused code in sfx2::sidebar
sfx2::sidebar::ContextList::IsEmpty()
sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*> > const&)
sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext const&) const
sfx2::sidebar::EnumContext::GetContext() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()

Change-Id: I285567320677a831b2b786f4f73b000eed39987b
2014-03-03 08:58:59 +02:00
8792ec7b21 Remove visual noise from include
Conflicts:
	include/framework/preventduplicateinteraction.hxx
	include/sfx2/sfxbasecontroller.hxx
	include/sfx2/sfxbasemodel.hxx
	include/toolkit/awt/vclxtabpagemodel.hxx
	include/vcl/field.hxx
	include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 09:51:32 -06:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
d7f3dced12 remove unused code in sfx2::sidebar
removes these methods:
sfx2::sidebar::Context::EvaluateMatch(std::vector<sfx2::sidebar::Context>)
sfx2::sidebar::EnumContext::EvaluateMatch(std::vector<sfx2::sidebar::EnumContext>)

Change-Id: I14314d526a5306530d0381ca8bf6ab150d3dd5a0
2014-02-26 08:54:53 +02:00
04683f1488 Window::Notify should return bool
Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
2014-01-17 16:42:29 +01:00
f74149bc21 Fix some typos for "height"
Change-Id: Ibe1fdd7a63ff09097cfe053279d779592d389539
2013-11-25 23:03:11 +01:00
7219a08b5f use standard css namespace prefix
Change-Id: I820faaa0dac1707f3224b981dae0bc6be5894503
2013-11-13 09:08:08 +02:00
ba137a363c S2A macro is unused
Change-Id: Ia0caf81179289e565d69215d32cc132337b806cd
2013-11-13 09:08:08 +02:00
9c5a91efdb expand out the A2S macro
Which is not doing anything useful anymore.

Change-Id: I83422e811d52a77b65655924c07b55dd7229449c
2013-11-13 09:08:08 +02:00
dc8fcd5090 fdo#65108 inter-module includes <> include/sfx2
Change-Id: Id2dc67262eb91cb6c7ca030e334e3623d7535d45
2013-11-09 18:48:43 -06:00
1beabca95b remove local css namespace definitions
As we have it globally in sal/types.h those are not necessary.

Change-Id: I18bba2c763c4680c4fa7fde4c5158953b5cfad82
2013-10-28 15:16:17 +01:00
dbddac3261 fixincludeguards.sh: include/s*
Change-Id: I57fcfd442d2b5815e7c07a9cbd660f3698168dee
2013-10-23 23:22:29 +02:00
f852bda5ec clean up some include guards
Conflicts:
	sw/source/ui/inc/content.hxx

Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6
Reviewed-on: https://gerrit.libreoffice.org/6388
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-23 10:28:07 +00:00
3962122a58 callcatcher: update unused code
Change-Id: Ia2452eb82139039e1e6dc98e61ffb32b4091b94f
2013-10-15 10:22:24 +01:00
69c842a4f3 update unusedcode list
Change-Id: I201985753fc53f037807e7870c6786a442717d6e
2013-10-09 13:17:28 +01:00
03b52b5405 Resolves: #i123276# Properly forward Deactivate() call...
and still don't broadcast context change.

(cherry picked from commit 520cc667c80cea6bb48422825250b72ff36bb4ef)

Conflicts:
	sd/source/ui/view/drviews1.cxx
	sfx2/inc/sfx2/shell.hxx
	sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
	sfx2/source/control/shell.cxx
	sfx2/source/sidebar/ContextChangeBroadcaster.cxx

Change-Id: I753009041a999bc31a0528e37f0a499897f311c5
2013-10-02 16:03:55 +01:00
ca0169340c sfx2: fix sfx2::sidebar::Theme lifecycle
It's a horrible idea to have global VCL Images, since that will
inevitably crash on shutdown when the static dtor runs after
DeInitVCL, which breaks ~every JunitTest now.

0x00002af6750d2d51 in rtl::Reference<sfx2::sidebar::Theme>::~Reference (this=0x2af6756ceb28 <sfx2::sidebar::Theme::mpInstance>, __in_chrg=<optimized out>)

Try to fix that by moving the global sidebar::Theme instance to
SfxApplication where it can hopefully be deleted before shutdown.

Change-Id: Ia78f1e458699335b53a741b6463ce48af69584a7
2013-09-21 18:17:27 +02:00
50cbbc7f3a Resolves: #i122470# Fixed programmatic triggered switching of sidebar decks
(cherry picked from commit 7b26aba94e5544937f1e37e34915bcb276bc3c27)

Conflicts:
	sd/sdi/sdraw.sdi
	sd/source/ui/framework/tools/FrameworkHelper.cxx
	sd/source/ui/inc/framework/FrameworkHelper.hxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drviews6.cxx
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sidebar/Sidebar.hxx

Change-Id: Ic6b518e734fe59a7b713e85e934487347b847c5a
2013-09-20 16:35:29 +01:00
d023339c2f Turn sidebar back to non-experimental
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
2013-09-20 16:35:29 +01:00
46906b68c4 callcatcher: update unused code
One of the SfxTabDialog ResID ctors is now gone, progress. Equally pleasing is
that the last use of the old PercentField is gone now as well, so that can be
removed and the new PercentFieldWrap can be renamed as PercentField to take its
place

Change-Id: I7a706e98d4dfdc3541da73c3375ee067a799b4bd
2013-08-18 12:34:13 +01:00
087f0d5fee mbParentIsBorder is always false, follow logical consequences of that
Change-Id: I6283a3d4df91447d15b62e738be07961ac00ef56
2013-08-16 13:59:31 +01:00
16b35898c3 callcatcher: another layer of unused methods
Change-Id: I70e84f691bcf1b1e1025fd5a534c275633f865d1
2013-08-11 11:28:47 +01:00
bfafc8c3a1 callcatcher: update unused code
mostly ResId using ctors left stranded post .ui conversion

Change-Id: I06689eea30ee9146ba05294f52056c0d263695f5
2013-08-10 12:25:10 +01:00
822577f412 callcatcher: update unused code
Change-Id: Id12614722ed106ca595df13d22b6c5e315deb2ac
2013-07-20 19:27:57 +01:00
3c29fdd21e accidental push of merge in progress, sigh
This reverts commit c61c5a240314f1899a2160a97e00e2108104e4bd.
2013-07-05 13:59:06 +01:00
c61c5a2403 Related: #i122635# Add layouting to some sidebar panels.
(cherry picked from commit 4f9ac2af7157786ee6fba46551bd6782730d8b55)

Conflicts:
	sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
	sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
	svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
	svx/source/sidebar/text/TextPropertyPanel.hrc
	svx/source/sidebar/text/TextPropertyPanel.src
	sw/source/ui/sidebar/PagePropertyPanel.cxx

Change-Id: I94bfc87c9eeddd0c39bd979dd26b11c95b1e3c72
2013-07-05 13:07:30 +01:00
e7d0b21458 add missing modelines.
Change-Id: Ia0472d4dbce203f0b813e353b4b29f9dc9618664
2013-06-16 02:57:07 +01:00
edbca87dea widget layout: Allow specification of size request for toolbox items.
Change-Id: I4b2f1ca9eb0b5bdb77e16a969918dd4f6afefb53
2013-06-15 14:42:09 +02:00
11c00f1fdd Fix -Werror,-Wunused-private-field
Change-Id: Idcba9e9bc6210250a37950a2b927b9b74cc57c4f
2013-06-06 08:31:34 +02:00
3b55196fb0 Resolves: #i122433# The sidebar ControllerItem can now...
give access to the extended help text for commands

(cherry picked from commit 3f483a9219b9135f9f854d62b4ad0512d3752660)

Conflicts:
	sfx2/inc/sfx2/sidebar/ControllerItem.hxx

Change-Id: I22668e6f9c1c7aed174a43d7d3e04829dc6733ae

Related: #i122433# fix build breaker

 invalid use of incomplete type 'struct Help'

(cherry picked from commit 797e399967ffb1c28b8c32d328f5f57d79a8caf3)

Change-Id: Ifde6fede9b91eb828c665a5a720b93171108e17b
2013-06-04 11:09:21 +01:00
e66be44b69 sidebar: Restrict the minimal width of the sidebar.
Change-Id: I99051830c4393b420125332e787c3abdc5a6aa61
2013-06-02 04:54:55 +02:00
74221eb249 sidebar: Allow creation of SidebarToolBoxes via .ui.
Change-Id: If8789fd423a609a18514e5a798df5b5992dac34f
2013-06-02 04:54:54 +02:00
21747cae6a Resolves: #i122387# Use the right tool box for font color in text sidebar
(cherry picked from commit 08159967126946849906827ceadd802053d132c0)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: If40d3dee7c11e4ea6b01d40d713280e1dc19484d

Unname unused argument to prevent compiler warnings.

(cherry picked from commit f68dfc2cc8754d9cf72ae1b09f119e683ad44124)

Change-Id: I6450c6e46d5971abc871ed378d2ad6307e8f7a3e
2013-05-28 17:03:22 +01:00
8f3cec9d7a fdo#46808, Convert ui:*AcceleratorConfiguration to new style
The services already existed, they just needed IDL files.

API CHANGE:
   The return type of XUIConfigurationManager#getShortcutManager()
   is now XAcceleratorConfiguration instead of XInterface.
   This should not be a problem because XUIConfigurationManager is
   unpublished and the client code was relying on the service
   returning that type.

Change-Id: I399fe35de3394b02a4166b75eb7ff93b28be8bef
2013-05-28 08:10:23 +02:00
76ca8f7f17 Resolves: #i122315# Disable 'More Options' buttons when...
their commands are disabled

(cherry picked from commit 10e1831ad2e9597c5197bafb6e03b098f8e81454)

Conflicts:
	sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
	sfx2/source/sidebar/SidebarToolBox.cxx
	sfx2/source/sidebar/TitleBar.cxx

Change-Id: Iff83e024bd58ce4a6f27a8cde66b287d3bf710a3
2013-05-21 16:46:52 +01:00
edaca7c6e1 Resolves: #i121960# Improve creation of toolbox/toolbar controllers
(cherry picked from commit 3608a33d8362cbc44a2eb7203b7d1bffe481c7ab)

Conflicts:
	sfx2/inc/sfx2/sidebar/ControlFactory.hxx
	sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
	sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
	sfx2/inc/sfx2/sidebar/Tools.hxx
	sfx2/source/sidebar/ToolBoxBackground.cxx

Change-Id: I833a33bbc58ebe46bd28c6d97a4d76329f1f0186
2013-05-21 16:36:07 +01:00
66a5cc468c Only register and use the Sidebar if it is globally enabled. 2013-05-20 11:33:39 +01:00
c6b5466cea various build fixes
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
2013-05-20 11:33:36 +01:00
5429bcb3f0 setPosSizePixel->SetPosSizePixel
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
2013-05-20 11:33:36 +01:00
a9626f143a Resolves: #i122302# Use tool bar controls for color controls...
in text property panel

(cherry picked from commit 3b252796e1126b5ec1216082f55b8d12017eaeb1)

Conflicts:
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sidebar/ControlFactory.hxx
	sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
	sfx2/inc/sfx2/sidebar/EnumContext.hxx
	sfx2/source/sidebar/SidebarToolBox.cxx
	svx/source/sidebar/insert/InsertPropertyPanel.cxx
	svx/source/sidebar/insert/InsertPropertyPanel.hxx
	svx/source/sidebar/text/TextPropertyPanel.cxx

Change-Id: Ifa1947c9e9bfdc3635dbb5b0c7a79f8ead613a90
2013-05-20 11:33:35 +01:00
2a2d384121 Resolves: #i122056# adding another Writer variant for sidebar context handling
Patch by: Ariel
Review by: Oliver
(cherry picked from commit 4a87b75b86e4c932b5230cb7caecf6f00e40a096)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: I51cd1d63ddd23a0907f1781c46891b6f5c9870c5
2013-05-20 11:33:34 +01:00
893dd19959 Resolves: #i122047# Adding virtual destructors to interfaces...
to prevent problems with older compilers

(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)

Conflicts:
	sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
	sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
	sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx

Change-Id: I2bf548fd7ff16db58938273bc4b60ad83325b376
2013-05-20 11:33:32 +01:00
b97fb5ca15 Related: #i122082# Disable controls of text property sidebar...
panel for disabled document parts

(cherry picked from commit ffcc8c326640dfbc6b765cd25875adf9e0ab66ad)

Conflicts:
	sfx2/inc/sfx2/sidebar/ControllerItem.hxx
	svx/source/sidebar/text/TextPropertyPanel.cxx

Change-Id: I9f38c71c6415f3d255b5607a67a110bca47358b0

Related: #i122082# Remove temporary change

(cherry picked from commit f213ea43fac43326a643f30ff13abd9d77f6aed7)

Change-Id: I157542fd5dbbda17b63900be9a41782ee581309c
2013-05-20 11:33:31 +01:00
1571b47603 Resolves: #i122218# Add new sidebar panel...
for inserting shapes into Draw documents

(cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b)

Conflicts:
	sd/source/ui/view/drviewsa.cxx
	sfx2/Package_inc.mk
	svx/inc/svx/dialogs.hrc

Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar

(cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec)

Conflicts:
	sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc

Related: #i122218# Added more missing files

(cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7)

fix up to build

Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301
2013-05-20 11:33:28 +01:00
611c6c3a4e Related: #i122056# Added another Writer variant to sidebar...
context handling.

(cherry picked from commit 542f0ff097c0e3eb71a1ad19f6d46a9860e754d9)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: Ib88f75d3dfdba5c14c2d3c747e90eecd00e6f249
2013-05-20 11:33:26 +01:00