ou1cimx1#968038: Pixi Sharepoint DocApp word crash

7 files changed, 83 insertions, 12 deletions

diff --git a/src/systeminfo/qsystemdeviceinfo.cpp b/src/systeminfo/qsystemdeviceinfo.cpp
index 4d5e389b92..801d10a258 100644
--- a/src/systeminfo/qsystemdeviceinfo.cpp
+++ b/src/systeminfo/qsystemdeviceinfo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,8 +44,9 @@
 #include <QMetaType>
 
 QTM_BEGIN_NAMESPACE
-
+#ifndef Q_OS_SYMBIAN
 Q_GLOBAL_STATIC(QSystemDeviceInfoPrivate, deviceInfoPrivateSingleton)
+#endif
 
 #ifdef QT_SIMULATOR
 QSystemDeviceInfoPrivate *getSystemDeviceInfoPrivate() { return deviceInfoPrivateSingleton(); }
@@ -670,7 +671,14 @@ QSystemDeviceInfo::ProfileDetails::~ProfileDetails()
 */
 int QSystemDeviceInfo::ProfileDetails::messageRingtoneVolume() const
 {
+#ifdef Q_OS_SYMBIAN
+     QSystemDeviceInfoPrivate* deviceInfo = QSystemDeviceInfoPrivate::deviceinfoPrivateInstance();
+     int messageRingtoneVolume = deviceInfo->messageRingtoneVolume();
+     delete deviceInfo;
+     return messageRingtoneVolume;
+#else
     return deviceInfoPrivateSingleton()->messageRingtoneVolume();
+#endif
 }
 
 /*!
@@ -679,7 +687,14 @@ int QSystemDeviceInfo::ProfileDetails::messageRingtoneVolume() const
 */
 int QSystemDeviceInfo::ProfileDetails::voiceRingtoneVolume() const
 {
+#ifdef Q_OS_SYMBIAN
+     QSystemDeviceInfoPrivate* deviceInfo = QSystemDeviceInfoPrivate::deviceinfoPrivateInstance();
+     int voiceRingtoneVolume = deviceInfo->voiceRingtoneVolume();
+     delete deviceInfo;
+     return voiceRingtoneVolume;
+#else
     return deviceInfoPrivateSingleton()->voiceRingtoneVolume();
+#endif
 }
 
 /*!
@@ -688,7 +703,14 @@ int QSystemDeviceInfo::ProfileDetails::voiceRingtoneVolume() const
 */
 bool QSystemDeviceInfo::ProfileDetails::vibrationActive() const
 {
+#ifdef Q_OS_SYMBIAN
+     QSystemDeviceInfoPrivate* deviceInfo = QSystemDeviceInfoPrivate::deviceinfoPrivateInstance();
+     int vibrationActive = deviceInfo->vibrationActive();
+     delete deviceInfo;
+     return vibrationActive;
+#else
     return deviceInfoPrivateSingleton()->vibrationActive();
+#endif
 }
 
 #include "moc_qsystemdeviceinfo.cpp"
diff --git a/src/systeminfo/qsysteminfo_s60.cpp b/src/systeminfo/qsysteminfo_s60.cpp
index b78e0c4bad..04fd8aae17 100644
--- a/src/systeminfo/qsysteminfo_s60.cpp
+++ b/src/systeminfo/qsysteminfo_s60.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -438,6 +438,11 @@ bool QSystemInfoPrivate::hasFeatureSupported(QSystemInfo::Feature feature)
     return isFeatureSupported;
 }
 
+QSystemNetworkInfoPrivate* QSystemNetworkInfoPrivate::networkinfoPrivateInstance()
+{
+    return new QSystemNetworkInfoPrivate();
+}
+
 QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate(QObject *parent)
     : QSystemInfoPrivateBase(parent)
 {
@@ -1084,6 +1089,11 @@ QSystemDisplayInfo::BacklightState  QSystemDisplayInfoPrivate::backlightStatus(i
     return backlightState;
 }
 
+QSystemStorageInfoPrivate* QSystemStorageInfoPrivate::storageinfoPrivateInstance()
+{
+    return new QSystemStorageInfoPrivate();
+}
+
 QSystemStorageInfoPrivate::QSystemStorageInfoPrivate(QObject *parent)
     : QSystemInfoPrivateBase(parent)
 {
@@ -1280,6 +1290,11 @@ QSystemStorageInfo::StorageState QSystemStorageInfoPrivate::CheckDiskSpaceThresh
     return state;
 }
 
+QSystemDeviceInfoPrivate* QSystemDeviceInfoPrivate::deviceinfoPrivateInstance()
+{
+    return new QSystemDeviceInfoPrivate();
+}
+
 QSystemDeviceInfoPrivate::QSystemDeviceInfoPrivate(QObject *parent)
     : QSystemInfoPrivateBase(parent), m_profileEngine(NULL), m_proEngNotifyHandler(NULL),
     m_bluetoothRepository(NULL), m_bluetoothNotifyHandler(NULL)
diff --git a/src/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h
index 8a774960ae..38b5e20a98 100644
--- a/src/systeminfo/qsysteminfo_s60_p.h
+++ b/src/systeminfo/qsysteminfo_s60_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -145,7 +145,7 @@ class QSystemNetworkInfoPrivate : public QSystemInfoPrivateBase, public MTelepho
     Q_OBJECT
 
 public:
-
+    static QSystemNetworkInfoPrivate* networkinfoPrivateInstance();
     QSystemNetworkInfoPrivate(QObject *parent = 0);
     virtual ~QSystemNetworkInfoPrivate();
 
@@ -256,6 +256,7 @@ class QSystemStorageInfoPrivate : public QSystemInfoPrivateBase,
 private:
     QSystemStorageInfo::StorageState CheckDiskSpaceThresholdLimit(const QString &);
 public:
+    static QSystemStorageInfoPrivate* storageinfoPrivateInstance();
     QSystemStorageInfoPrivate(QObject *parent = 0);
     virtual ~QSystemStorageInfoPrivate();
     qlonglong totalDiskSpace(const QString &driveVolume);
@@ -310,7 +311,7 @@ class QSystemDeviceInfoPrivate : public QSystemInfoPrivateBase,
     Q_OBJECT
 
 public:
-
+    static QSystemDeviceInfoPrivate* deviceinfoPrivateInstance();
     QSystemDeviceInfoPrivate(QObject *parent = 0);
     virtual ~QSystemDeviceInfoPrivate();
 
diff --git a/src/systeminfo/qsystemnetworkinfo.cpp b/src/systeminfo/qsystemnetworkinfo.cpp
index 9b420883e9..d7599cf534 100644
--- a/src/systeminfo/qsystemnetworkinfo.cpp
+++ b/src/systeminfo/qsystemnetworkinfo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,7 +44,9 @@
 #include <QMetaType>
 
 QTM_BEGIN_NAMESPACE
+#ifndef Q_OS_SYMBIAN
 Q_GLOBAL_STATIC(QSystemNetworkInfoPrivate, netInfoPrivateSingleton)
+#endif
 
 #ifdef QT_SIMULATOR
 QSystemNetworkInfoPrivate *getSystemNetworkInfoPrivate() { return netInfoPrivateSingleton(); }
@@ -205,11 +207,21 @@ QSystemNetworkInfo::NetworkStatus QSystemNetworkInfo::networkStatus(QSystemNetwo
 */
 int QSystemNetworkInfo::networkSignalStrength(QSystemNetworkInfo::NetworkMode mode)
 {
+#ifdef Q_OS_SYMBIAN
+      QSystemNetworkInfoPrivate* networkInfo = QSystemNetworkInfoPrivate::networkinfoPrivateInstance();
+      QSystemNetworkInfo::NetworkStatus info = networkInfo->networkStatus(mode);
+    if (info == QSystemNetworkInfo::UndefinedStatus || info == QSystemNetworkInfo::NoNetworkAvailable)
+        return -1;
+    int signalStrength = networkInfo->networkSignalStrength(mode);
+    delete networkInfo;
+    return signalStrength;
+#else
     QSystemNetworkInfo::NetworkStatus info = netInfoPrivateSingleton()->networkStatus(mode);
     if (info == QSystemNetworkInfo::UndefinedStatus || info == QSystemNetworkInfo::NoNetworkAvailable)
         return -1;
 
     return netInfoPrivateSingleton()->networkSignalStrength(mode);
+#endif
 }
 
 /*!
@@ -297,7 +309,14 @@ QString QSystemNetworkInfo::homeMobileNetworkCode()
 */
 QString QSystemNetworkInfo::networkName(QSystemNetworkInfo::NetworkMode mode)
 {
+#ifdef Q_OS_SYMBIAN
+      QSystemNetworkInfoPrivate* networkInfo = QSystemNetworkInfoPrivate::networkinfoPrivateInstance();
+      QString networkName = networkInfo->networkName(mode);
+      delete networkInfo;
+      return networkName;
+#else
     return netInfoPrivateSingleton()->networkName(mode);
+#endif
 }
 
 /*!
diff --git a/src/systeminfo/qsystemstorageinfo.cpp b/src/systeminfo/qsystemstorageinfo.cpp
index 143629df63..5eb67fc3fb 100644
--- a/src/systeminfo/qsystemstorageinfo.cpp
+++ b/src/systeminfo/qsystemstorageinfo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,8 +44,9 @@
 #include <QMetaType>
 
 QTM_BEGIN_NAMESPACE
-
+#ifndef Q_OS_SYMBIAN
 Q_GLOBAL_STATIC(QSystemStorageInfoPrivate, storageInfoPrivateSingleton)
+#endif
 
 #ifdef QT_SIMULATOR
 QSystemStorageInfoPrivate *getSystemStorageInfoPrivate() { return storageInfoPrivateSingleton(); }
@@ -233,7 +234,14 @@ qlonglong QSystemStorageInfo::availableDiskSpace(const QString &drive)
 */
 QStringList QSystemStorageInfo::logicalDrives()
 {
+#ifdef Q_OS_SYMBIAN
+        QSystemStorageInfoPrivate* storageInfo = QSystemStorageInfoPrivate::storageinfoPrivateInstance();
+        QStringList drivelist = storageInfo->logicalDrives();
+        delete storageInfo;
+        return drivelist;
+#else
     return storageInfoPrivateSingleton()->logicalDrives();
+#endif
 }
 
 /*!
diff --git a/src/systeminfo/symbian/storagedisknotifier_s60.cpp b/src/systeminfo/symbian/storagedisknotifier_s60.cpp
index 24e9a623d0..06ca04e213 100644
--- a/src/systeminfo/symbian/storagedisknotifier_s60.cpp
+++ b/src/systeminfo/symbian/storagedisknotifier_s60.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -56,6 +56,7 @@ CStorageDiskNotifier* CStorageDiskNotifier::NewL()
 void CStorageDiskNotifier::ConstructL()
     {
     User::LeaveIfError(iFs.Connect());
+    User::LeaveIfError(iFs.ShareProtected());
     iStorageDiskNotifyHandler = CDiskNotifyHandler::NewL( *this, iFs );
     SubscribeStorageDiskNotificationL();
     }
diff --git a/src/systeminfo/symbian/storagestatus_s60.cpp b/src/systeminfo/symbian/storagestatus_s60.cpp
index 96526fc4e5..1ada686c31 100644
--- a/src/systeminfo/symbian/storagestatus_s60.cpp
+++ b/src/systeminfo/symbian/storagestatus_s60.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -46,24 +46,29 @@
 #include <driveinfo.h>
 #endif //SYMBIAN_3_1
 #include <f32file.h>
+#include "trace.h"
 
 
 CMMCStorageStatus::CMMCStorageStatus() : CActive(EPriorityStandard),
 m_previousDriveList(TDriveList())
 {
+TRACES ( qDebug() << "CMMCStorageStatus::CMMCStorageStatus++");
     CActiveScheduler::Add(this);
-    if (iFs.Connect() == KErrNone) {
+    if (iFs.Connect() == KErrNone && iFs.ShareProtected() == KErrNone) {
 #ifndef SYMBIAN_3_1
         m_previousDriveList.Copy(PopulateDriveList());
 #endif //SYMBIAN_3_1
         startMonitoring();
     }
+TRACES ( qDebug() << "CMMCStorageStatus::CMMCStorageStatus--");
 }
 
 CMMCStorageStatus::~CMMCStorageStatus()
 {
+TRACES ( qDebug() << "CMMCStorageStatus::~CMMCStorageStatus++");
     Cancel();
     iFs.Close();
+TRACES ( qDebug() << "CMMCStorageStatus::~CMMCStorageStatus--");
 }
 
 void CMMCStorageStatus::addObserver(MStorageStatusObserver *observer)