Merge pull request 'Fix bug 68628' (#484) from fix/bug-68628 into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/484

Author: Oleg Kozhukharenko

win-linux/extras/projicons/src/jumplist.cpp

@@ -101,9 +101,8 @@ HRESULT _CreateShellLink(PCWSTR pszArguments, PCWSTR pszTitle, IShellLink **ppsl
 
 HRESULT _AddTasksToList(ICustomDestinationList *pcdl, const QStringList &list)
 {
-    pcdl->AppendKnownCategory(KDC_RECENT);
     IObjectCollection *poc;
-    HRESULT hr = CoCreateInstance(CLSID_EnumerableObjectCollection, NULL, CLSCTX_INPROC, IID_PPV_ARGS(&poc));
+    HRESULT hr = CoCreateInstance(CLSID_EnumerableObjectCollection, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&poc));
     if (SUCCEEDED(hr))
     {
         PCWSTR args[MAX_TASK_NUM] = {

win-linux/src/cascapplicationmanagerwrapper.cpp

@@ -1015,7 +1015,6 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector<wstring>& v
                     if ( _c_pos != std::wstring::npos )
                         open_opts.name = QString::fromStdWString(open_opts.wurl.substr(++_c_pos));
 
-                    Utils::addToRecent(open_opts.wurl);
 //                    open_opts.srctype = etLocalFile;
                 } else
                 if ( _error == EBADF && !open_in_new_window ) {
@@ -1133,8 +1132,24 @@ void CAscApplicationManagerWrapper::onDocumentReady(int uid)
     Association::instance().chekForAssociations(uid);
 #endif
 
-    if (uid > -1 && printData().printerCapabilitiesReady())
-        AscAppManager::sendCommandTo(GetViewById(uid), L"printer:config", printData().getPrinterCapabilitiesJson().toStdWString());
+    if (uid > -1) {
+        if (printData().printerCapabilitiesReady())
+            AscAppManager::sendCommandTo(GetViewById(uid), L"printer:config", printData().getPrinterCapabilitiesJson().toStdWString());
+
+        CAscTabData *data = nullptr;
+        if (CEditorWindow *editor = editorWindowFromViewId(uid)) {
+            data = editor->mainView()->data();
+        } else
+            if (mainWindow() && mainWindow()->holdView(uid)) {
+                int indx = mainWindow()->tabWidget()->tabIndexByView(uid);
+                if (indx > -1)
+                    data = mainWindow()->tabWidget()->panel(indx)->data();
+            }
+
+        if (data && data->isLocal() && !data->url().empty()) {
+            Utils::addToRecent(data->url());
+        }
+    }
 
     static bool check_printers = false;
     if (!check_printers) {

win-linux/src/cascapplicationmanagerwrapper_private.h

@@ -325,7 +325,6 @@ class CAscApplicationManagerWrapper_Private
                         CMessage::error(m_appmanager.mainWindow()->handle(),
                                         QObject::tr("File %1 cannot be opened or doesn't exists.").arg(_info.fileName()));
                     }
-                    else Utils::addToRecent(file_path);
                 }
 
                 return true;

win-linux/src/components/cdownloadwidget.cpp

@@ -349,7 +349,6 @@ void CDownloadWidget::downloadProcess(void * info)
                         Utils::openUrl(QUrl::fromLocalFile(path).toString());
                     } else {
                         AscAppManager::handleInputCmd({path.toStdWString()});
-                        Utils::addToRecent(path.toStdWString());
                     }
                 });
 

win-linux/src/windows/cmainwindow.cpp

@@ -956,7 +956,6 @@ void CMainWindow::doOpenLocalFile(COpenOptions& opts)
     int result = m_pTabs->openLocalDocument(opts, true);
     if ( !(result < 0) ) {
         toggleButtonMain(false, true);
-        Utils::addToRecent(opts.wurl);
     } else
     if (result == -255) {
         QTimer::singleShot(0, this, [=] {