From 38a035d6d827ce92c082770d0cbeefacf3c8b63c Mon Sep 17 00:00:00 2001
From: SimplestStudio <Oleg.Kozhukharenko@onlyoffice.com>
Date: Thu, 20 Feb 2025 12:26:32 +0200
Subject: [PATCH] [win-linux] fix bug 68624

---
 win-linux/src/ceditortools.cpp            | 7 +++----
 win-linux/src/components/asctabwidget.cpp | 5 +++--
 win-linux/src/windows/ceditorwindow_p.h   | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/win-linux/src/ceditortools.cpp b/win-linux/src/ceditortools.cpp
index 5e73e0ebb..aba28ae36 100644
--- a/win-linux/src/ceditortools.cpp
+++ b/win-linux/src/ceditortools.cpp
@@ -353,12 +353,11 @@ namespace CEditorTools
         if ( format == AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCXF ) {
             return AscEditorType::etDocumentMasterForm;
         } else
-        if ( format == AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF ) {
+        if ( format == AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF ||
+                   format == AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM ) {
             return AscEditorType::etPdf;
         } else
-        if ( (format > AVS_OFFICESTUDIO_FILE_DOCUMENT && format < AVS_OFFICESTUDIO_FILE_PRESENTATION) ||
-                format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF || format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA ||
-                    format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU )
+        if ( format > AVS_OFFICESTUDIO_FILE_DOCUMENT && format < AVS_OFFICESTUDIO_FILE_PRESENTATION )
             return AscEditorType::etDocument;
         else
         if ( format > AVS_OFFICESTUDIO_FILE_PRESENTATION && format < AVS_OFFICESTUDIO_FILE_SPREADSHEET )
diff --git a/win-linux/src/components/asctabwidget.cpp b/win-linux/src/components/asctabwidget.cpp
index 2948184d5..4470fe2f5 100644
--- a/win-linux/src/components/asctabwidget.cpp
+++ b/win-linux/src/components/asctabwidget.cpp
@@ -499,10 +499,10 @@ int CAscTabWidget::insertPanel(QWidget * panel, int index)
         case AscEditorType::etSpreadsheet:
             tabcolor =  QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabCellActive));
             break;
-        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etDocument:
             tabcolor =  QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabWordActive));
             break;
+        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etPdf:
             tabcolor =  QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabViewerActive));
             break;
@@ -856,6 +856,7 @@ void CAscTabWidget::applyDocumentChanging(int id, int type)
             m_pBar->setActiveTabColor(tabIndex,
                 QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabSlideActive)));
             break;
+        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etPdf:
             panel(tabIndex)->applyLoader("loader:style", "pdf");
             m_pBar->setActiveTabColor(tabIndex,
@@ -1277,10 +1278,10 @@ void CAscTabWidget::applyUITheme(const std::wstring& theme)
         case AscEditorType::etSpreadsheet:
             m_pBar->setActiveTabColor(i, tab_color.at(1));
             break;
-        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etDocument:
             m_pBar->setActiveTabColor(i, tab_color.at(0));
             break;
+        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etPdf:
             m_pBar->setActiveTabColor(i, QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabViewerActive)));
             break;
diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h
index 41bb9318e..e5acb7866 100644
--- a/win-linux/src/windows/ceditorwindow_p.h
+++ b/win-linux/src/windows/ceditorwindow_p.h
@@ -72,6 +72,7 @@ auto prepare_editor_css(AscEditorType type, const CTheme& theme) -> QString {
     case AscEditorType::etDocument: c = theme.value(CTheme::ColorRole::ecrTabWordActive); break;
     case AscEditorType::etPresentation: c = theme.value(CTheme::ColorRole::ecrTabSlideActive); break;
     case AscEditorType::etSpreadsheet: c = theme.value(CTheme::ColorRole::ecrTabCellActive); break;
+    case AscEditorType::etDocumentMasterForm:
     case AscEditorType::etPdf: c = theme.value(CTheme::ColorRole::ecrTabViewerActive); break;
     case AscEditorType::etDraw: c = theme.value(CTheme::ColorRole::ecrTabDrawActive); break;
     }
@@ -504,6 +505,7 @@ public:
             background = GetColorValueByRole(ecrTabCellActive);
             border = background;
             break;
+        case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etPdf:
             background = GetColorValueByRole(ecrTabViewerActive);
             border = background;