From 4a2bbd40bdde77a41749a218c0b20b88b2c4dffd Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Fri, 28 Aug 2009 11:53:36 +0200 Subject: Do not set window tile from IOleInPlaceUIWindow::SetActiveObject() MSDN docs suggest that all containers ignore the object name parameter passed in this function. The tiltebar should always be set by the container application. Task-number: 204674 Reviewed-by: Trust Me --- src/activeqt/container/qaxwidget.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index e4c9d42..621c836 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -1535,9 +1535,10 @@ HRESULT WINAPI QAxClientSite::SetBorderSpace(LPCBORDERWIDTHS pborderwidths) HRESULT WINAPI QAxClientSite::SetActiveObject(IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { AX_DEBUG(QAxClientSite::SetActiveObject); - - if (pszObjName && widget) - widget->setWindowTitle(QString::fromWCharArray(pszObjName)); + + Q_UNUSED(pszObjName); + // we are ignoring the name of the object, as suggested by MSDN documentation + // for IOleInPlaceUIWindow::SetActiveObject(). if (m_spInPlaceActiveObject) { if (!inPlaceModelessEnabled) -- cgit v0.12