[win-linux] for bug 73908, 73287

Author: SimplestStudio

win-linux/src/cprintdata.cpp

@@ -175,6 +175,9 @@ class CPrintData::CPrintDataPrivate : public QObject
 
                 paper_width = std::ceil(size["w"].toDouble(0));
                 paper_height = std::ceil(size["h"].toDouble(0));
+                if (page_orientation == QPageLayout::Landscape) {
+                    std::swap(paper_width, paper_height);
+                }
                 size_preset = size["preset"].toString();
             }
 

win-linux/src/platform_linux/gtkprintdialog.cpp

@@ -498,13 +498,10 @@ QDialog::DialogCode GtkPrintDialog::exec()
             m_printer->setPaperSize(QSizeF(width, height), qt_unit);
 
             GtkPageOrientation orient = gtk_page_setup_get_orientation(page_setup);
-            QPrinter::Orientation orient_arr[2] = {
-                QPrinter::Portrait,
-                QPrinter::Landscape
-            };
-            const int print_ornt = (int)orient;
-            m_printer->setOrientation((print_ornt == 0 || print_ornt == 2) ?
-                        orient_arr[0] : orient_arr[1]);
+            QPageLayout plt = m_printer->pageLayout();
+            plt.setOrientation((orient == GtkPageOrientation::GTK_PAGE_ORIENTATION_PORTRAIT ||
+                                orient == GtkPageOrientation::GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) ? QPageLayout::Portrait : QPageLayout::Landscape);
+            m_printer->setPageLayout(plt);
         }
         break;
     }

win-linux/src/platform_win/printdialog.cpp

@@ -487,7 +487,9 @@ QDialog::DialogCode PrintDialog::exec()
                 double height = double(pDevmode->dmPaperLength)/10;
                 QPageSize ps(QSizeF(width, height), QPageSize::Millimeter);
                 m_printer->setPageSize(ps);
-                m_printer->setPageOrientation(pDevmode->dmOrientation == DMORIENT_PORTRAIT ? QPageLayout::Portrait : QPageLayout::Landscape);
+                QPageLayout plt = m_printer->pageLayout();
+                plt.setOrientation(pDevmode->dmOrientation == DMORIENT_PORTRAIT ? QPageLayout::Portrait : QPageLayout::Landscape);
+                m_printer->setPageLayout(plt);
                 GlobalUnlock(dlg.hDevMode);
             }
 

win-linux/src/windows/ceditorwindow_p.h

@@ -646,8 +646,12 @@ class CEditorWindowPrivate : public CCefEventsGate
             }
 
             if ( !AscAppManager::printData().isQuickPrint() ) {
-                printer->setPageOrientation(AscAppManager::printData().pageOrientation());
+                // printer->setPageOrientation(AscAppManager::printData().pageOrientation());
                 printer->setPageSize(AscAppManager::printData().pageSize());
+                QPageLayout layout = printer->pageLayout();
+                layout.setOrientation(AscAppManager::printData().pageOrientation());
+                printer->setPageLayout(layout);
+                printer->setFullPage(true);
             }
 
 #ifdef _WIN32

win-linux/src/windows/cmainwindow.cpp

@@ -1368,8 +1368,11 @@ void CMainWindow::onDocumentPrint(void * opts)
         }
 
         if ( !AscAppManager::printData().isQuickPrint() ) {
-            printer->setPageOrientation(AscAppManager::printData().pageOrientation());
+            // printer->setPageOrientation(AscAppManager::printData().pageOrientation());
             printer->setPageSize(AscAppManager::printData().pageSize());
+            QPageLayout layout = printer->pageLayout();
+            layout.setOrientation(AscAppManager::printData().pageOrientation());
+            printer->setPageLayout(layout);
             printer->setFullPage(true);
         }