summaryrefslogtreecommitdiff
path: root/include/vcl/syswin.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-24 18:06:08 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-24 18:14:32 +0100
commit6c7b85c2001edacd4f722a8cc87ad9df0385f94b (patch)
tree2c0a062a38969b53e7a9ae3eac51f92dfcb88702 /include/vcl/syswin.hxx
parent18a0d519440b42cd90c628730b2e404b4203e8eb (diff)
Avoid bad downcasts to VclBox
At least in CppunitTest_smoektest there is a case where SystemWindow::setOptimalLayoutSize tries to downcast a VclGrid as a VclBox (stack top below), and that even appears to be unnecessary as the only place that requires the downcast is the Dialog::settingOptimalLayoutSize override. So maybe it is guaranteed that GetWindow(WINDOW_FIRSTCHILD) is a VclBox if this is a Dialog, but need not be the case if this is not a Dialog? Or the real bug is elsewhere... SystemWindow::setOptimalLayoutSize() SystemWindow::DoInitialLayout() FloatingWindow::StateChanged(StateChangedType) SfxFloatingWindow::StateChanged(StateChangedType) SmToolBoxWindow::StateChanged(StateChangedType) vcl::Window::ImplCallInitShow() vcl::Window::Show(bool, unsigned short) SfxChildWindow::Show(unsigned short) SfxWorkWindow::HidePopups_Impl(bool, bool, unsigned short) SfxDispatcher::DoActivate_Impl(bool, SfxViewFrame*) SfxViewFrame::DoActivate(bool, SfxViewFrame*) SfxApplication::SetViewFrame_Impl(SfxViewFrame*) SfxViewFrame::SetViewFrame(SfxViewFrame*) SfxViewFrame::MakeActive_Impl(bool) SfxBaseController::ConnectSfxFrame_Impl(SfxBaseController::ConnectSfxFrame) SfxBaseController::attachFrame(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) (anonymous namespace)::SfxFrameLoader_Impl::impl_createDocumentView(com::sun::star::uno::Reference<com::sun::star::frame::XModel2> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, comphelper::NamedValueCollection const&, rtl::OUString const&) (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) framework::LoadEnv::impl_loadContent() framework::LoadEnv::startLoading() framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ... Change-Id: I786ad451fdf73eca22860695a614ee5b889a83cd
Diffstat (limited to 'include/vcl/syswin.hxx')
-rw-r--r--include/vcl/syswin.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 1f29d45f0613..e164af894545 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -29,7 +29,6 @@ class ModalDialog;
class MenuBar;
class TaskPaneList;
class VclContainer;
-class VclBox;
// - Icon-Types -
#define ICON_LO_DEFAULT 1
@@ -168,7 +167,7 @@ protected:
void SetWindowStateData( const WindowStateData& rData );
- virtual void settingOptimalLayoutSize(VclBox *pBox);
+ virtual void settingOptimalLayoutSize(Window *pBox);
SAL_DLLPRIVATE void DoInitialLayout();
public: