diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-24 14:41:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-24 14:44:57 +0200 |
| commit | 96bd18f692f933b328facf75eb200114bb55eee7 (patch) | |
| tree | 21c39e18db9b6d501b36972c9df93c553d2aa493 /offapi/UnoApi_offapi.mk | |
| parent | f5bf0fa958a709394be833584ed610a2d759ca32 (diff) | |
fdo#67213 - crash on opening AutoText dialog (Ctrl+F3
Revert "fdo#46808, Convert frame::FrameControl service to new style"
This reverts commit 32eaa77db33b3b1f5793e92167b9f8c2708ea543.
Conflicts:
UnoControls/source/controls/framecontrol.cxx
UnoControls/source/inc/framecontrol.hxx
.. because I can't work out how it causes fdo#67213 - I suspect my
changes might be interacting with UNO aggregation, which
is always tricky.
Change-Id: Icd14f9a7df98585393c5527a3817e05c26246de9
Diffstat (limited to 'offapi/UnoApi_offapi.mk')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 2232124d1035..747a305f1dac 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -199,7 +199,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DispatchRecorderSupplier \ DocumentTemplates \ Frame \ - FrameControl \ FrameLoaderFactory \ GlobalEventBroadcaster \ LayoutManager \ @@ -944,6 +943,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ DesktopTask \ DesktopTasks \ DispatchProvider \ + FrameControl \ FrameLoader \ FramesContainer \ PopupMenuController \ @@ -2586,7 +2586,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrame \ XFrame2 \ XFrameActionListener \ - XFrameControl \ XFrameLoader \ XFrameLoaderQuery \ XFrameSetModel \ |