Fridrich Štrba 5373c145a2 OOops again :(

2011-03-28 12:00:36 +02:00

..

addonstoolbarmanager.cxx

fix mis-merge all-around.

2011-03-12 18:57:32 -06:00

addonstoolbarwrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

buttontoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

comboboxtoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

complextoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

controlmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

dropdownboxtoolbarcontroller.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:49:47 +01:00

edittoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

fontmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

fontsizemenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

footermenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

generictoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

headermenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

imagebuttontoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

langselectionmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

langselectionstatusbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

logoimagestatusbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

logotextstatusbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

macrosmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

menubarmanager.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:49:47 +01:00

menubarmerger.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

menubarwrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

newmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

objectmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

panelwindow.cxx

dockingwindows: #i112595# First refactoring version of the layout manager including skeleton classes for new docking windows

2010-06-22 11:12:01 +02:00

panelwrapper.cxx

fix mis-merge all-around.

2011-03-12 18:57:32 -06:00

popupmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

progressbarwrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

recentfilesmenucontroller.cxx

OOops again :(

2011-03-28 12:00:36 +02:00

simpletextstatusbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

spinfieldtoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

statusbar.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

statusbarmanager.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

statusbarwrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

statusindicatorinterfacewrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

togglebuttontoolbarcontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

toolbar.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

toolbarmanager.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

toolbarmerger.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

toolbarsmenucontroller.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

toolbarwrapper.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00

uicommanddescription.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-12 02:42:58 +01:00