summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-08-28 11:53:36 +0200
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-08-28 11:53:36 +0200
commit4a2bbd40bdde77a41749a218c0b20b88b2c4dffd (patch)
tree4093fbf81007d2dada99c1ee79551fdea6727b3b /src/activeqt
parent2d668d870d4acd90e0ee4ff27e65e92fd311ce22 (diff)
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
Diffstat (limited to 'src/activeqt')
-rw-r--r--src/activeqt/container/qaxwidget.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index e4c9d42197..621c836247 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)