Ariel Constenla-Haile 1768904fd9 Related: #i121442# Read Statusbar merging configuration ...

(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882)

Conflicts:
	framework/inc/framework/addonsoptions.hxx
	framework/source/fwe/classes/addonsoptions.cxx

Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc

2013-05-21 14:01:17 +01:00

..

actiontriggerhelper.hxx

…

addonmenu.hxx

…

addonsoptions.hxx

Related: #i121442# Read Statusbar merging configuration

2013-05-21 14:01:17 +01:00

bmkmenu.hxx

…

configimporter.hxx

…

documentundoguard.hxx

…

eventsconfiguration.hxx

…

framelistanalyzer.hxx

…

fwedllapi.h

…

iguard.hxx

…

imageproducer.hxx

…

imutex.hxx

…

interaction.hxx

…

menuconfiguration.hxx

…

menuextensionsupplier.hxx

…

preventduplicateinteraction.hxx

…

sfxhelperfunctions.hxx

…

statusbarconfiguration.hxx

…

titlehelper.hxx

…

toolboxconfiguration.hxx

…

undomanagerhelper.hxx

…