diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-26 13:51:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:32 +0100 |
| commit | 10abe2354c23ea07eb94a9cd89511ff77189256f (patch) | |
| tree | 4f80b102a0e419fe0c8d2ff450e95b2d6e23bc86 | |
| parent | 90b4587de53164158d3ad94f981e9ce9f310842d (diff) | |
adapt for changes
Change-Id: If63af9edf9afea73e8b2e5f2f35024fd43a54a99
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 6 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 0bad66574ebf..06cf218802da 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -31,16 +31,16 @@ $(eval $(call gb_Executable_set_include,ui-previewer,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_api,ui-previewer,\ +$(eval $(call gb_Executable_use_api,ui-previewer,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_static_libs,ui-previewer,\ +$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ vclmain \ )) -$(eval $(call gb_Executable_add_linked_libs,ui-previewer,\ +$(eval $(call gb_Executable_use_libraries,ui-previewer,\ comphelper \ cppu \ cppuhelper \ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 909a2dbe885e..b3b3eb9fc861 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -9831,13 +9831,11 @@ void Window::take_properties(Window &rOther) mpWindowImpl->mbDisableAccessibleLabeledByRelation = pWindowImpl->mbDisableAccessibleLabeledByRelation; mpWindowImpl->mbHelpTextDynamic = pWindowImpl->mbHelpTextDynamic; mpWindowImpl->mbFakeFocusSet = pWindowImpl->mbFakeFocusSet; - mpWindowImpl->mbInterceptChildWindowKeyDown = pWindowImpl->mbInterceptChildWindowKeyDown; mpWindowImpl->mbHexpand = pWindowImpl->mbHexpand; mpWindowImpl->mbVexpand = pWindowImpl->mbVexpand; mpWindowImpl->meHalign = pWindowImpl->meHalign; mpWindowImpl->meValign = pWindowImpl->meValign; - std::swap(m_aWidgetProperties, rOther.m_aWidgetProperties); bool bHasBorderWindow = mpWindowImpl->mpBorderWindow; |