Tsutomu Uchino 61ce018658 Resolves: #i86528# use the module manager to identify the context... ...

for addons menu merging

(cherry picked from commit 2aac0070dbef6c1ad7eeccf7d4015cdcbffe067e)

Conflicts:
	framework/source/classes/menumanager.cxx
	framework/source/fwe/classes/addonmenu.cxx
	framework/source/uielement/menubarmanager.cxx
	include/framework/addonmenu.hxx

Change-Id: I3b606671db3a4c6ba8ed2b850e01e1ac91db7581

2014-05-19 13:28:17 +01:00

..

framecontainer.cxx

Many spelling fixes: directories a* - g*.

2014-04-30 12:13:36 +01:00

fwktabwindow.cxx

framework: sal_Bool->bool

2014-04-07 13:53:49 +02:00

fwlresid.cxx

Kill superfluous vertical whitespace

2014-04-06 19:37:48 +03:00

menumanager.cxx

Resolves: #i86528# use the module manager to identify the context...

2014-05-19 13:28:17 +01:00

resource.src

remove com.sun.star.comp.framework.License

2014-03-14 11:47:08 +00:00

taskcreator.cxx

Typo: s/cant/can't/

2014-04-18 00:30:35 +03:00