From 5a7157d319477830426797532e02ac39d3b859f4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:29:03 +0200 Subject: Merging upstream version 4:24.2.1. Signed-off-by: Daniel Baumann --- vcl/inc/osx/salprn.h | 2 + vcl/inc/salprn.hxx | 3 + vcl/inc/skia/zone.hxx | 7 +- vcl/inc/unx/genprn.h | 2 + vcl/inc/win/salprn.h | 3 + vcl/osx/salprn.cxx | 5 + vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 10 +- vcl/qa/cppunit/pdfexport/data/LinkPages.fodt | 138 ++++++ vcl/qa/cppunit/pdfexport/pdfexport.cxx | 607 +++++++++++++++++++++++++++ vcl/qt5/QtWidget.cxx | 3 + vcl/source/app/salvtables.cxx | 6 + vcl/source/gdi/print.cxx | 8 + vcl/source/treelist/svimpbox.cxx | 2 + vcl/source/window/menu.cxx | 10 +- vcl/unx/generic/print/genprnpsp.cxx | 5 + vcl/unx/generic/printer/cpdmgr.cxx | 5 +- vcl/unx/gtk3/glomenu.cxx | 2 +- vcl/unx/gtk3/gtkinst.cxx | 22 + vcl/unx/gtk3/gtksalmenu.cxx | 7 +- vcl/unx/gtk3/salnativewidgets-gtk.cxx | 1 + vcl/win/gdi/salprn.cxx | 19 + vcl/win/window/salframe.cxx | 126 +++++- 22 files changed, 969 insertions(+), 24 deletions(-) create mode 100644 vcl/qa/cppunit/pdfexport/data/LinkPages.fodt (limited to 'vcl') diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 7bfd41787e..9c26e171db 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -82,6 +82,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter virtual sal_uInt32 GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* i_pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nPaperBin ) override; + virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperSource) override; virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) override; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 97a0fe13aa..ae0b313dab 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -82,6 +82,9 @@ public: virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) = 0; + virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperSource) = 0; + // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait diff --git a/vcl/inc/skia/zone.hxx b/vcl/inc/skia/zone.hxx index 6d503e7eb8..73fa477d52 100644 --- a/vcl/inc/skia/zone.hxx +++ b/vcl/inc/skia/zone.hxx @@ -13,19 +13,20 @@ #include #include - -#include +#include // Used around calls to Skia code to detect crashes in drivers. class VCL_DLLPUBLIC SkiaZone : public CrashZone { public: - SkiaZone() { assert(comphelper::SolarMutex::get()->IsCurrentThread()); } static void hardDisable(); static void relaxWatchdogTimings(); static const CrashWatchdogTimingsValues& getCrashWatchdogTimingsValues(); static void checkDebug(int nUnchanged, const CrashWatchdogTimingsValues& aTimingValues); static const char* name() { return "Skia"; } + +private: + SolarMutexGuard g; }; #endif // INCLUDED_VCL_INC_SKIA_ZONE_H diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index d030c46143..abe84b71ca 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -45,6 +45,8 @@ public: virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; + virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperSource) override; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override; }; diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index e1bbb665e2..b0ec1697c3 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -69,6 +69,9 @@ public: virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override; virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) override; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; + virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperSource) override; + virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override; }; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 9f9c8c08f3..3de45d9e80 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -265,6 +265,11 @@ OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uInt16 ) return OUString(); } +sal_uInt16 AquaSalInfoPrinter::GetPaperBinBySourceIndex( const ImplJobSetup*, sal_uInt16 ) +{ + return 0xffff; +} + sal_uInt32 AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapType i_nType ) { switch( i_nType ) diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx index dbe7ada758..ad2354b00e 100644 --- a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx +++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx @@ -40,7 +40,6 @@ public: } void setUp() override; - void tearDown() override; uno::Reference& getSecurityContext() { return mxSecurityContext; @@ -50,19 +49,12 @@ public: void VclFilterIpdfTest::setUp() { UnoApiTest::setUp(); - MacrosTest::setUpNssGpg(m_directories, "vcl_filter_ipdf"); + MacrosTest::setUpX509(m_directories, "vcl_filter_ipdf"); mxSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext); mxSecurityContext = mxSEInitializer->createSecurityContext(OUString()); } -void VclFilterIpdfTest::tearDown() -{ - MacrosTest::tearDownNssGpg(); - - UnoApiTest::tearDown(); -} - CPPUNIT_TEST_FIXTURE(VclFilterIpdfTest, testPDFAddVisibleSignatureLastPage) { // FIXME: the DPI check should be removed when either (1) the test is fixed to work with diff --git a/vcl/qa/cppunit/pdfexport/data/LinkPages.fodt b/vcl/qa/cppunit/pdfexport/data/LinkPages.fodt new file mode 100644 index 0000000000..50fff8bea4 --- /dev/null +++ b/vcl/qa/cppunit/pdfexport/data/LinkPages.fodt @@ -0,0 +1,138 @@ + + + 2024-01-23T14:35:36.0802902862024-01-24T17:29:01.312633690PT25M37S6LibreOfficeDev/24.8.0.0.alpha0$Linux_X86_64 LibreOffice_project/7ec73fbe5f902e790d437f0130e85c162b99b2322024-01-24T17:28:41.712753252PDF filestest file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + foo foo foo foo + foo foo foo foo + + + \ No newline at end of file diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index d5515facb5..d362a38553 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -2740,6 +2740,613 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf157816Link) CPPUNIT_ASSERT_EQUAL(static_cast(4), pAnnots->GetElements().size()); } +CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142806) +{ + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + + // Enable PDF/UA + uno::Sequence aFilterData( + comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) } })); + aMediaDescriptor["FilterData"] <<= aFilterData; + saveAsPDF(u"LinkPages.fodt"); + + vcl::filter::PDFDocument aDocument; + SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ); + CPPUNIT_ASSERT(aDocument.Read(aStream)); + + std::vector aPages = aDocument.GetPages(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), aPages.size()); + + vcl::filter::PDFObjectElement* pDocument(nullptr); + for (const auto& rDocElement : aDocument.GetElements()) + { + auto pObject1 = dynamic_cast(rDocElement.get()); + if (!pObject1) + continue; + auto pType1 = dynamic_cast(pObject1->Lookup("Type"_ostr)); + if (pType1 && pType1->GetValue() == "StructElem") + { + auto pS1 = dynamic_cast(pObject1->Lookup("S"_ostr)); + if (pS1 && pS1->GetValue() == "Document") + { + pDocument = pObject1; + } + } + } + CPPUNIT_ASSERT(pDocument); + + auto pKidsD = dynamic_cast(pDocument->Lookup("K"_ostr)); + CPPUNIT_ASSERT(pKidsD); + // assume there are no MCID ref at this level + auto pKidsDv = pKidsD->GetElements(); + auto pRefKidD0 = dynamic_cast(pKidsDv[0]); + CPPUNIT_ASSERT(pRefKidD0); + auto pObjectD0 = pRefKidD0->LookupObject(); + CPPUNIT_ASSERT(pObjectD0); + auto pTypeD0 = dynamic_cast(pObjectD0->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD0->GetValue()); + auto pSD0 = dynamic_cast(pObjectD0->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("H1"_ostr, pSD0->GetValue()); + + auto pKidsD0 = dynamic_cast(pObjectD0->Lookup("K"_ostr)); + CPPUNIT_ASSERT(pKidsD0); + auto pKidsD0v = pKidsD0->GetElements(); + + auto pRefKidD00 = dynamic_cast(pKidsD0v[0]); + CPPUNIT_ASSERT(pRefKidD00); + auto pObjectD00 = pRefKidD00->LookupObject(); + CPPUNIT_ASSERT(pObjectD00); + auto pTypeD00 = dynamic_cast(pObjectD00->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD00->GetValue()); + auto pSD00 = dynamic_cast(pObjectD00->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD00->GetValue()); + { + auto pKids = dynamic_cast(pObjectD00->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.693, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(240.455, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(350.855, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD01 = dynamic_cast(pKidsD0v[1]); + CPPUNIT_ASSERT(pRefKidD01); + auto pObjectD01 = pRefKidD01->LookupObject(); + CPPUNIT_ASSERT(pObjectD01); + auto pTypeD01 = dynamic_cast(pObjectD01->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD01->GetValue()); + auto pSD01 = dynamic_cast(pObjectD01->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD01->GetValue()); + { + auto pKids = dynamic_cast(pObjectD01->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(130.055, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(240.455, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD02 = dynamic_cast(pKidsD0v[2]); + CPPUNIT_ASSERT(pRefKidD02); + auto pObjectD02 = pRefKidD02->LookupObject(); + CPPUNIT_ASSERT(pObjectD02); + auto pTypeD02 = dynamic_cast(pObjectD02->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD02->GetValue()); + auto pSD02 = dynamic_cast(pObjectD02->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD02->GetValue()); + { + auto pKids = dynamic_cast(pObjectD02->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(362.855, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD03 = dynamic_cast(pKidsD0v[3]); + CPPUNIT_ASSERT(pRefKidD03); + auto pObjectD03 = pRefKidD03->LookupObject(); + CPPUNIT_ASSERT(pObjectD03); + auto pTypeD03 = dynamic_cast(pObjectD03->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD03->GetValue()); + auto pSD03 = dynamic_cast(pObjectD03->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD03->GetValue()); + { + auto pKids = dynamic_cast(pObjectD03->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(142.055, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(206.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + auto pRefKidD1 = dynamic_cast(pKidsDv[1]); + CPPUNIT_ASSERT(pRefKidD1); + auto pObjectD1 = pRefKidD1->LookupObject(); + CPPUNIT_ASSERT(pObjectD1); + auto pTypeD1 = dynamic_cast(pObjectD1->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD1->GetValue()); + auto pSD1 = dynamic_cast(pObjectD1->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Text#20body"_ostr, pSD1->GetValue()); + + auto pKidsD1 = dynamic_cast(pObjectD1->Lookup("K"_ostr)); + CPPUNIT_ASSERT(pKidsD1); + auto pKidsD1v = pKidsD1->GetElements(); + + auto pRefKidD10 = dynamic_cast(pKidsD1v[0]); + CPPUNIT_ASSERT(pRefKidD10); + auto pObjectD10 = pRefKidD10->LookupObject(); + CPPUNIT_ASSERT(pObjectD10); + auto pTypeD10 = dynamic_cast(pObjectD10->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD10->GetValue()); + auto pSD10 = dynamic_cast(pObjectD10->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD10->GetValue()); + { + auto pKids = dynamic_cast(pObjectD10->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.693, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(362.855, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD11 = dynamic_cast(pKidsD1v[1]); + CPPUNIT_ASSERT(pRefKidD11); + auto pObjectD11 = pRefKidD11->LookupObject(); + CPPUNIT_ASSERT(pObjectD11); + auto pTypeD11 = dynamic_cast(pObjectD11->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD11->GetValue()); + auto pSD11 = dynamic_cast(pObjectD11->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD11->GetValue()); + { + auto pKids = dynamic_cast(pObjectD11->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(140.005, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD12 = dynamic_cast(pKidsD1v[2]); + CPPUNIT_ASSERT(pRefKidD12); + auto pObjectD12 = pRefKidD12->LookupObject(); + CPPUNIT_ASSERT(pObjectD12); + auto pTypeD12 = dynamic_cast(pObjectD12->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD12->GetValue()); + auto pSD12 = dynamic_cast(pObjectD12->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD12->GetValue()); + { + auto pKids = dynamic_cast(pObjectD12->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(241.007, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(362.855, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + auto pRefKidD13 = dynamic_cast(pKidsD1v[3]); + CPPUNIT_ASSERT(pRefKidD13); + auto pObjectD13 = pRefKidD13->LookupObject(); + CPPUNIT_ASSERT(pObjectD13); + auto pTypeD13 = dynamic_cast(pObjectD13->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("StructElem"_ostr, pTypeD13->GetValue()); + auto pSD13 = dynamic_cast(pObjectD13->Lookup("S"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pSD13->GetValue()); + { + auto pKids = dynamic_cast(pObjectD13->Lookup("K"_ostr)); + auto nMCID(0); + auto nRef(0); + for (size_t i = 0; i < pKids->GetElements().size(); ++i) + { + auto pNum = dynamic_cast(pKids->GetElement(i)); + auto pObjR = dynamic_cast(pKids->GetElement(i)); + if (pNum) + { + ++nMCID; + } + if (pObjR) + { + ++nRef; + auto pOType + = dynamic_cast(pObjR->LookupElement("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("OBJR"_ostr, pOType->GetValue()); + auto pAnnotRef = dynamic_cast( + pObjR->LookupElement("Obj"_ostr)); + auto pAnnot = pAnnotRef->LookupObject(); + auto pAType + = dynamic_cast(pAnnot->Lookup("Type"_ostr)); + CPPUNIT_ASSERT_EQUAL("Annot"_ostr, pAType->GetValue()); + auto pASubtype + = dynamic_cast(pAnnot->Lookup("Subtype"_ostr)); + CPPUNIT_ASSERT_EQUAL("Link"_ostr, pASubtype->GetValue()); + auto pAContents = dynamic_cast( + pAnnot->Lookup("Contents"_ostr)); + CPPUNIT_ASSERT_EQUAL( + u"foo foo foo foo"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAContents)); + auto pStructParent = dynamic_cast( + pAnnot->Lookup("StructParent"_ostr)); + CPPUNIT_ASSERT(pStructParent); // every link must have it! + auto pARect + = dynamic_cast(pAnnot->Lookup("Rect"_ostr)); + CPPUNIT_ASSERT(pARect); + const auto& rElements = pARect->GetElements(); + CPPUNIT_ASSERT_EQUAL(static_cast(4), rElements.size()); + const auto* pNumL = dynamic_cast(rElements[0]); + CPPUNIT_ASSERT(pNumL); + CPPUNIT_ASSERT_DOUBLES_EQUAL(56.643, pNumL->GetValue(), 1e-3); + const auto* pNumT = dynamic_cast(rElements[1]); + CPPUNIT_ASSERT(pNumT); + CPPUNIT_ASSERT_DOUBLES_EQUAL(140.005, pNumT->GetValue(), 1e-3); + const auto* pNumR = dynamic_cast(rElements[2]); + CPPUNIT_ASSERT(pNumR); + CPPUNIT_ASSERT_DOUBLES_EQUAL(184.707, pNumR->GetValue(), 1e-3); + const auto* pNumB = dynamic_cast(rElements[3]); + CPPUNIT_ASSERT(pNumB); + CPPUNIT_ASSERT_DOUBLES_EQUAL(252.455, pNumB->GetValue(), 1e-3); + } + } + CPPUNIT_ASSERT_EQUAL(static_cast(1), nMCID); + CPPUNIT_ASSERT_EQUAL(static_cast(1), nRef); + } + + // the problem was that the links in follow frames were all missing + auto pAnnots0 = dynamic_cast(aPages[0]->Lookup("Annots"_ostr)); + CPPUNIT_ASSERT(pAnnots0); + CPPUNIT_ASSERT_EQUAL(static_cast(2), pAnnots0->GetElements().size()); + auto pAnnots1 = dynamic_cast(aPages[1]->Lookup("Annots"_ostr)); + CPPUNIT_ASSERT(pAnnots1); + CPPUNIT_ASSERT_EQUAL(static_cast(2), pAnnots1->GetElements().size()); + auto pAnnots2 = dynamic_cast(aPages[2]->Lookup("Annots"_ostr)); + CPPUNIT_ASSERT(pAnnots2); + CPPUNIT_ASSERT_EQUAL(static_cast(2), pAnnots2->GetElements().size()); + auto pAnnots3 = dynamic_cast(aPages[3]->Lookup("Annots"_ostr)); + CPPUNIT_ASSERT(pAnnots3); + CPPUNIT_ASSERT_EQUAL(static_cast(2), pAnnots3->GetElements().size()); +} + CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf115967) { aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx index a7c4f32e92..996a0a7cc9 100644 --- a/vcl/qt5/QtWidget.cxx +++ b/vcl/qt5/QtWidget.cxx @@ -697,6 +697,9 @@ bool QtWidget::handleEvent(QtFrame& rFrame, QWidget& rWidget, QEvent* pEvent) // is called below (s. tdf#122053) if (!pEvent->spontaneous()) { + // accept event so shortcut action (from menu) isn't triggered in addition + // to the processing for the spontaneous event further below + pEvent->accept(); return false; } diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 95beb907f6..50ecd194bd 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1068,6 +1068,12 @@ void SalInstanceToolbar::set_menu_item_active(const OUString& rIdent, bool bActi { if (bActive) { + MenuFlags nMenuFlags = pPopup->GetMenuFlags(); + if (officecfg::Office::Common::View::Menu::DontHideDisabledEntry::get()) + nMenuFlags &= ~MenuFlags::HideDisabledEntries; + else + nMenuFlags |= MenuFlags::HideDisabledEntries; + pPopup->SetMenuFlags(nMenuFlags); tools::Rectangle aRect = m_xToolBox->GetItemRect(nItemId); pPopup->Execute(m_xToolBox, aRect, PopupMenuFlags::ExecuteDown); } diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index eff94a9211..401d38118c 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1479,6 +1479,14 @@ OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const return OUString(); } +sal_uInt16 Printer::GetPaperBinBySourceIndex(sal_uInt16 nPaperSource) const +{ + if ( IsDisplayPrinter() ) + return 0; + + return mpInfoPrinter->GetPaperBinBySourceIndex( &maJobSetup.ImplGetConstData(), nPaperSource ); +} + void Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 0deea8f698..66c697e8af 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -387,6 +387,7 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta ) ShowCursor( false ); m_nFlags &= ~LBoxFlags::Filling; + m_pView->PaintImmediately(); m_pStartEntry = pNext; if( nRealDelta >= m_nVisibleCount ) @@ -424,6 +425,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta ) m_nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); + m_pView->PaintImmediately(); m_pStartEntry = pPrev; if( nRealDelta >= m_nVisibleCount ) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 82d630742a..a0a03be455 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2863,9 +2863,12 @@ bool PopupMenu::PrepareRun(const VclPtr& pParentWin, tools::Rectang if (bRealExecute) nPopupModeFlags |= FloatWinPopupFlags::NewLevel; + // MenuFlags get clobbered in the Activate function. Restore them after calling. + MenuFlags nMenuFlagsSaved = GetMenuFlags(); bInCallback = true; // set it here, if Activate overridden Activate(); bInCallback = false; + SetMenuFlags(nMenuFlagsSaved); if (pParentWin->isDisposed()) return false; @@ -2884,13 +2887,6 @@ bool PopupMenu::PrepareRun(const VclPtr& pParentWin, tools::Rectang else nMenuFlags &= ~MenuFlags::HideDisabledEntries; } - else - { - if (officecfg::Office::Common::View::Menu::DontHideDisabledEntry::get()) - nMenuFlags &= ~MenuFlags::HideDisabledEntries; - else - nMenuFlags |= MenuFlags::HideDisabledEntries; - } sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount(); if ( !nVisibleEntries ) diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 33990decad..ce5a45624d 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -638,6 +638,11 @@ OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_ return OUString(); } +sal_uInt16 PspSalInfoPrinter::GetPaperBinBySourceIndex( const ImplJobSetup*, sal_uInt16 ) +{ + return 0xffff; +} + sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, PrinterCapType nType ) { switch( nType ) diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx index 834c1383ef..03cf85a7b7 100644 --- a/vcl/unx/generic/printer/cpdmgr.cxx +++ b/vcl/unx/generic/printer/cpdmgr.cxx @@ -81,9 +81,9 @@ void CPDManager::onNameAcquired (GDBusConnection *connection, G_DBUS_CALL_FLAGS_NONE, -1, nullptr, nullptr, nullptr); - g_free(contents); g_object_unref(proxy); g_dbus_node_info_unref(introspection_data); + g_free(contents); } g_free(backend.second); } @@ -122,10 +122,10 @@ void CPDManager::printerAdded (GDBusConnection *connection, nullptr, nullptr); - g_free(contents); g_dbus_node_info_unref(introspection_data); std::pair new_backend (sender_name, proxy); current->addBackend(std::move(new_backend)); + g_free(contents); } } CPDPrinter *pDest = static_cast(malloc(sizeof(CPDPrinter))); @@ -262,6 +262,7 @@ CPDManager* CPDManager::tryLoadCPD() { std::pair new_tbackend (filename, contents); pManager->addTempBackend(new_tbackend); + g_free(contents); } } g_dir_close(dir); diff --git a/vcl/unx/gtk3/glomenu.cxx b/vcl/unx/gtk3/glomenu.cxx index a391649bbb..779d20f9b8 100644 --- a/vcl/unx/gtk3/glomenu.cxx +++ b/vcl/unx/gtk3/glomenu.cxx @@ -560,8 +560,8 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu, g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1); - g_object_unref (model); } + g_object_unref (model); } GLOMenu * diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index c76d6291ce..b8da4f7b7a 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -11097,10 +11097,16 @@ private: gtk_main_do_event(pKeyEvent); GdkEvent *pTriggerEvent = gtk_get_current_event(); + bool bEventOwnership = true; if (!pTriggerEvent) + { pTriggerEvent = pKeyEvent; + bEventOwnership = false; + } gtk_menu_popup_at_widget(m_pMenu, pWidget, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); + if (bEventOwnership) + gdk_event_free(pTriggerEvent); gdk_event_free(pKeyEvent); } @@ -11118,6 +11124,7 @@ private: { gdk_event_get_button(pEvent, &nButton); nTime = gdk_event_get_time(pEvent); + gdk_event_free(pEvent); } else { @@ -11459,8 +11466,12 @@ public: gtk_main_do_event(pKeyEvent); GdkEvent *pTriggerEvent = gtk_get_current_event(); + bool bEventOwnership = true; if (!pTriggerEvent) + { pTriggerEvent = pKeyEvent; + bEventOwnership = false; + } bool bSwapForRTL = SwapForRTL(pWidget); @@ -11478,6 +11489,8 @@ public: else gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_EAST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); } + if (bEventOwnership) + gdk_event_free(pTriggerEvent); gdk_event_free(pKeyEvent); } @@ -11500,6 +11513,7 @@ public: if (!gdk_event_get_button(pEvent, &nButton)) nButton = 0; nTime = gdk_event_get_time(pEvent); + gdk_event_free(pEvent); } else { @@ -14136,6 +14150,8 @@ private: #if !GTK_CHECK_VERSION(4, 0, 0) GdkEvent *pEvent = gtk_get_current_event(); m_bChangedByMouse = pEvent && categorizeEvent(pEvent) == VclInputFlags::MOUSE; + if (pEvent) + gdk_event_free(pEvent); #else //TODO maybe iterate over gtk_widget_observe_controllers looking for a motion controller #endif @@ -15500,7 +15516,10 @@ public: GtkTreePath* end_path; if (!gtk_tree_view_get_visible_range(m_pTreeView, &start_path, &end_path)) + { + g_object_thaw_notify(G_OBJECT(m_pTreeModel)); return; + } GtkInstanceTreeIter aGtkIter(nullptr); gtk_tree_model_get_iter(m_pTreeModel, &aGtkIter.iter, start_path); @@ -16963,6 +16982,8 @@ private: atk_object_set_description(pChild, OUStringToOString(sTooltipText, RTL_TEXTENCODING_UTF8).getStr()); g_object_unref(pChild); + gtk_tree_path_free(pPath); + #endif } @@ -20340,6 +20361,7 @@ public: bFindButtonTextRenderer = false; } } + g_list_free(cells); // Seeing as GtkCellRendererPixbuf no longer takes a surface, then insert our own replacement // to render that instead here diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index a510473650..ddfa5ef36b 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -125,6 +125,7 @@ static void RemoveDisabledItemsFromNativeMenu(GLOMenu* pMenu, GList** pOldComman g_free(pSubCommand); } } + g_object_unref(pSubMenuModel); } } @@ -830,6 +831,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& rNewItem) pImage = gtk_image_new_from_gicon(pIcon); #endif g_object_unref(pIcon); + g_bytes_unref(pBytes); } GtkWidget* pButton = AddButton(pImage); @@ -1361,7 +1363,8 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection, if ( aCurrentCommand == nullptr || g_strcmp0( aCurrentCommand, aCommand ) != 0 ) { - bool bOldHasSubmenu = g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos) != nullptr; + GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos); + bool bOldHasSubmenu = pSubMenuModel != nullptr; bSubMenuAddedOrRemoved = bOldHasSubmenu != bIsSubmenu; if (bSubMenuAddedOrRemoved) { @@ -1385,6 +1388,8 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection, g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand, pTarget ); pTarget = nullptr; } + if (bOldHasSubmenu) + g_object_unref(pSubMenuModel); g_free( aItemCommand ); } diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx index a3a82edaa1..bfdeed4238 100644 --- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx @@ -2332,6 +2332,7 @@ bool GtkSalGraphics::updateSettings(AllSettings& rSettings) gchar* pFontname = nullptr; g_object_get(pSettings, "gtk-font-name", &pFontname, nullptr); PangoFontDescription* pFontDesc = pango_font_description_from_string(pFontname); + g_free(pFontname); vcl::Font aFont(pango_to_vcl(pFontDesc, rSettings.GetUILanguageTag().getLocale())); pango_font_description_free(pFontDesc); #else diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index 3302efa2d9..065b060196 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -1196,6 +1196,25 @@ OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal return aPaperBinName; } +sal_uInt16 WinSalInfoPrinter::GetPaperBinBySourceIndex( const ImplJobSetup* pSetupData, sal_uInt16 nPaperSource ) +{ + DWORD nBins = ImplDeviceCaps( this, DC_BINNAMES, nullptr, pSetupData ); + if (nBins != GDI_ERROR) + { + auto pBuffer = std::make_unique(nBins); + DWORD nBins = ImplDeviceCaps( this, DC_BINS, reinterpret_cast(pBuffer.get()), pSetupData ); + if (nBins != GDI_ERROR) + { + for (DWORD nBin = 0; nBin < nBins; ++nBin) + { + if (nPaperSource == *(pBuffer.get() + nBin)) + return nBin; + } + } + } + return 0xffff; +} + sal_uInt32 WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) { DWORD nRet; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index cf2c8c6f8b..1eed596e6c 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -3522,6 +3522,125 @@ static void FlushIMBeforeShortCut(WinSalFrame* pFrame, SalEvent nEvent, sal_uInt } } +// When Num Lock is off, the key codes from NumPag come as arrows, PgUp/PgDn, etc. +static WORD NumPadFromArrows(WORD vk) +{ + switch (vk) + { + case VK_CLEAR: + return VK_NUMPAD5; + case VK_PRIOR: + return VK_NUMPAD9; + case VK_NEXT: + return VK_NUMPAD3; + case VK_END: + return VK_NUMPAD1; + case VK_HOME: + return VK_NUMPAD7; + case VK_LEFT: + return VK_NUMPAD4; + case VK_UP: + return VK_NUMPAD8; + case VK_RIGHT: + return VK_NUMPAD6; + case VK_DOWN: + return VK_NUMPAD2; + case VK_INSERT: + return VK_NUMPAD0; + default: + return vk; + } +} + +static bool HandleAltNumPadCode(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam) +{ + struct + { + bool started = false; + //static bool hex = false; // TODO: support HKEY_CURRENT_USER\Control Panel\Input Method\EnableHexNumpad + sal_UCS4 ch = 0; + bool wait_WM_CHAR = false; + void clear() + { + started = false; + ch = 0; + wait_WM_CHAR = false; + } + } static state; + + WORD vk = LOWORD(wParam); + WORD keyFlags = HIWORD(lParam); + + switch (nMsg) + { + case WM_CHAR: + if (state.wait_WM_CHAR && MapVirtualKeyW(LOBYTE(keyFlags), MAPVK_VSC_TO_VK) == VK_MENU) + { + state.clear(); + // Ignore it - it is synthetized (incorrect, truncated) character from system + return true; + } + + break; + + case WM_SYSKEYDOWN: + if (vk == VK_MENU) + { + if (!(keyFlags & KF_REPEAT)) + state.clear(); + state.started = true; + return true; + } + + if (!state.started) + break; + + if (keyFlags & KF_EXTENDED) + break; // NUMPAD numeric keys are *not* considered extended + + vk = NumPadFromArrows(vk); + if (vk >= VK_NUMPAD0 && vk <= VK_NUMPAD9) + return true; + + break; + + case WM_SYSKEYUP: + if (!state.started) + break; + + if (keyFlags & KF_EXTENDED) + break; // NUMPAD numeric keys are *not* considered extended + + vk = NumPadFromArrows(vk); + if (vk >= VK_NUMPAD0 && vk <= VK_NUMPAD9) + { + state.ch *= 10; + state.ch += vk - VK_NUMPAD0; + return true; + } + + break; + + case WM_KEYUP: + if (vk == VK_MENU && state.started && state.ch) + { + sal_UCS4 ch = state.ch; + state.clear(); + // Let system provide codes for values below 256 + if (ch >= 256 && rtl::isUnicodeCodePoint(ch)) + { + PostMessageW(hWnd, WM_UNICHAR, ch, 0); + state.wait_WM_CHAR = true; + } + return true; + } + break; + } + + state.clear(); + return false; +} + static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) { @@ -3531,7 +3650,9 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg, static sal_uInt16 nLastChar = 0; static ModKeyFlags nLastModKeyCode = ModKeyFlags::NONE; static bool bWaitForModKeyRelease = false; - sal_uInt16 nRepeat = LOWORD( lParam )-1; + sal_uInt16 nRepeat = LOWORD( lParam ); + if (nRepeat) + --nRepeat; sal_uInt16 nModCode = 0; // this key might have been relayed by SysChild and thus @@ -3544,6 +3665,9 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg, return false; } + if (HandleAltNumPadCode(hWnd, nMsg, wParam, lParam)) + return true; // no default processing + WinSalFrame* pFrame = GetWindowPtr( hWnd ); if ( !pFrame ) return false; -- cgit v1.2.3