diff options
59 files changed, 1958 insertions, 2106 deletions
diff --git a/.clang-format b/.clang-format index 338e8d627121..797f22404a09 100644 --- a/.clang-format +++ b/.clang-format @@ -16,6 +16,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false DerivePointerBinding: false ExperimentalAutoDetectBinPacking: false IndentCaseLabels: true +KeepEmptyLinesAtTheStartOfBlocks: false MaxEmptyLinesToKeep: 1 NamespaceIndentation: None ObjCSpaceBeforeProtocolList: true diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx index 2276c962532d..eb8d864ff21b 100644 --- a/include/svx/ClassificationCommon.hxx +++ b/include/svx/ClassificationCommon.hxx @@ -18,27 +18,33 @@ #include <sfx2/classificationhelper.hxx> #include <com/sun/star/beans/XPropertyContainer.hpp> -namespace svx { -namespace classification { - -SVX_DLLPUBLIC OUString convertClassificationResultToString(std::vector<svx::ClassificationResult> const & rResults); - -SVX_DLLPUBLIC OUString getProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer, - OUString const & rName); - -SVX_DLLPUBLIC bool containsProperty(css::uno::Sequence<css::beans::Property> const & rProperties, - OUString const & rName); - -SVX_DLLPUBLIC void removeAllProperties(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer); - -SVX_DLLPUBLIC bool addOrInsertDocumentProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer, - OUString const & rsKey, OUString const & rsValue); - -SVX_DLLPUBLIC void insertFullTextualRepresentationAsDocumentProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer, - sfx::ClassificationKeyCreator const & rKeyCreator, - std::vector<svx::ClassificationResult> const & rResults); - -}} // end svx::classification namespace +namespace svx +{ +namespace classification +{ +SVX_DLLPUBLIC OUString +convertClassificationResultToString(std::vector<svx::ClassificationResult> const& rResults); + +SVX_DLLPUBLIC OUString +getProperty(css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer, + OUString const& rName); + +SVX_DLLPUBLIC bool containsProperty(css::uno::Sequence<css::beans::Property> const& rProperties, + OUString const& rName); + +SVX_DLLPUBLIC void +removeAllProperties(css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer); + +SVX_DLLPUBLIC bool addOrInsertDocumentProperty( + css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer, + OUString const& rsKey, OUString const& rsValue); + +SVX_DLLPUBLIC void insertFullTextualRepresentationAsDocumentProperty( + css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer, + sfx::ClassificationKeyCreator const& rKeyCreator, + std::vector<svx::ClassificationResult> const& rResults); +} +} // end svx::classification namespace #endif // INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX diff --git a/include/test/sheet/xsheetcellrange.hxx b/include/test/sheet/xsheetcellrange.hxx index 5f44d21dd0dd..42ce2d094c4c 100644 --- a/include/test/sheet/xsheetcellrange.hxx +++ b/include/test/sheet/xsheetcellrange.hxx @@ -17,7 +17,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetCellRange { public: diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx index f87d80a78a47..8164da251975 100644 --- a/include/test/sheet/xsheetcellrangecontainer.hxx +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -20,7 +20,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer { public: diff --git a/include/test/sheet/xsheetcellranges.hxx b/include/test/sheet/xsheetcellranges.hxx index 2024ec5f25e9..4f21f446c21f 100644 --- a/include/test/sheet/xsheetcellranges.hxx +++ b/include/test/sheet/xsheetcellranges.hxx @@ -17,7 +17,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetCellRanges { public: diff --git a/include/test/sheet/xsheetcondition.hxx b/include/test/sheet/xsheetcondition.hxx index c25eae86858c..c69625f445de 100644 --- a/include/test/sheet/xsheetcondition.hxx +++ b/include/test/sheet/xsheetcondition.hxx @@ -17,7 +17,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetCondition { public: diff --git a/include/test/sheet/xsheetconditionalentries.hxx b/include/test/sheet/xsheetconditionalentries.hxx index 25a51325ea87..673e7ceb1784 100644 --- a/include/test/sheet/xsheetconditionalentries.hxx +++ b/include/test/sheet/xsheetconditionalentries.hxx @@ -20,7 +20,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetConditionalEntries { public: diff --git a/include/test/sheet/xsheetconditionalentry.hxx b/include/test/sheet/xsheetconditionalentry.hxx index 775c55b5858b..d143f784342e 100644 --- a/include/test/sheet/xsheetconditionalentry.hxx +++ b/include/test/sheet/xsheetconditionalentry.hxx @@ -17,7 +17,6 @@ namespace apitest { - class OOO_DLLPUBLIC_TEST XSheetConditionalEntry { public: diff --git a/include/tools/XmlWalker.hxx b/include/tools/XmlWalker.hxx index 4d4bc88f363c..85507f46583d 100644 --- a/include/tools/XmlWalker.hxx +++ b/include/tools/XmlWalker.hxx @@ -14,8 +14,8 @@ #include <tools/stream.hxx> #include <memory> -namespace tools { - +namespace tools +{ struct XmlWalkerImpl; /** diff --git a/include/tools/XmlWriter.hxx b/include/tools/XmlWriter.hxx index c454f4139803..15a3a0013912 100644 --- a/include/tools/XmlWriter.hxx +++ b/include/tools/XmlWriter.hxx @@ -14,8 +14,8 @@ #include <tools/stream.hxx> #include <memory> -namespace tools { - +namespace tools +{ struct XmlWriterImpl; /** @@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC XmlWriter final { private: std::unique_ptr<XmlWriterImpl> mpImpl; -public: +public: XmlWriter(SvStream* pStream); ~XmlWriter(); diff --git a/sc/qa/extras/sctableconditionalentryobj.cxx b/sc/qa/extras/sctableconditionalentryobj.cxx index 4895d03dc9e1..ad39a74ef20e 100644 --- a/sc/qa/extras/sctableconditionalentryobj.cxx +++ b/sc/qa/extras/sctableconditionalentryobj.cxx @@ -33,8 +33,8 @@ using namespace css; using namespace css::uno; using namespace com::sun::star; -namespace sc_apitest { - +namespace sc_apitest +{ #define NUMBER_OF_TESTS 5 class ScTableConditionalEntryObj : public CalcUnoApiTest, @@ -44,7 +44,7 @@ class ScTableConditionalEntryObj : public CalcUnoApiTest, public: ScTableConditionalEntryObj(); - virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; virtual void tearDown() override; @@ -63,39 +63,39 @@ public: private: static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; - + static uno::Reference<lang::XComponent> mxComponent; }; sal_Int32 ScTableConditionalEntryObj::nTest = 0; -uno::Reference< lang::XComponent > ScTableConditionalEntryObj::mxComponent; +uno::Reference<lang::XComponent> ScTableConditionalEntryObj::mxComponent; ScTableConditionalEntryObj::ScTableConditionalEntryObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { } -uno::Reference< uno::XInterface > ScTableConditionalEntryObj::init() +uno::Reference<uno::XInterface> ScTableConditionalEntryObj::init() { // create a calc document if (!mxComponent.is()) mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); - uno::Reference< container::XIndexAccess > xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); xSheet->getCellByPosition(5, 5)->setValue(15); xSheet->getCellByPosition(1, 4)->setValue(10); xSheet->getCellByPosition(2, 0)->setValue(-5.15); - uno::Reference< beans::XPropertySet > xPropSet(xSheet, uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries; - xSheetConditionalEntries.set(xPropSet->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xPropSet(xSheet, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries; + xSheetConditionalEntries.set(xPropSet->getPropertyValue(SC_UNONAME_CONDFMT), + uno::UNO_QUERY_THROW); - uno::Sequence< beans::PropertyValue > aPropValue(5); + uno::Sequence<beans::PropertyValue> aPropValue(5); aPropValue[0].Name = SC_UNONAME_STYLENAME; aPropValue[0].Value <<= OUString("Result2"); aPropValue[1].Name = SC_UNONAME_FORMULA1; @@ -108,7 +108,8 @@ uno::Reference< uno::XInterface > ScTableConditionalEntryObj::init() aPropValue[4].Value <<= table::CellAddress(0, 1, 5); xSheetConditionalEntries->addNew(aPropValue); - uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry(xSheetConditionalEntries->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetConditionalEntry> xSheetConditionalEntry( + xSheetConditionalEntries->getByIndex(0), uno::UNO_QUERY_THROW); return xSheetConditionalEntry; } diff --git a/sc/qa/extras/sctableconditionalformatobj.cxx b/sc/qa/extras/sctableconditionalformatobj.cxx index e8a66552516b..b1ba62f93c53 100644 --- a/sc/qa/extras/sctableconditionalformatobj.cxx +++ b/sc/qa/extras/sctableconditionalformatobj.cxx @@ -32,18 +32,17 @@ using namespace css; using namespace css::uno; using namespace com::sun::star; -namespace sc_apitest { - +namespace sc_apitest +{ #define NUMBER_OF_TESTS 3 -class ScTableConditionalFormatObj : public CalcUnoApiTest, - public apitest::XSheetConditionalEntries +class ScTableConditionalFormatObj : public CalcUnoApiTest, public apitest::XSheetConditionalEntries { public: ScTableConditionalFormatObj(); - virtual uno::Reference< uno::XInterface > init() override; - virtual uno::Sequence< beans::PropertyValue > createCondition(const sal_Int32 nr) override; + virtual uno::Reference<uno::XInterface> init() override; + virtual uno::Sequence<beans::PropertyValue> createCondition(const sal_Int32 nr) override; virtual void setUp() override; virtual void tearDown() override; @@ -58,37 +57,37 @@ public: private: static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; - + static uno::Reference<lang::XComponent> mxComponent; }; sal_Int32 ScTableConditionalFormatObj::nTest = 0; -uno::Reference< lang::XComponent > ScTableConditionalFormatObj::mxComponent; +uno::Reference<lang::XComponent> ScTableConditionalFormatObj::mxComponent; ScTableConditionalFormatObj::ScTableConditionalFormatObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { } -uno::Reference< uno::XInterface > ScTableConditionalFormatObj::init() +uno::Reference<uno::XInterface> ScTableConditionalFormatObj::init() { // create a calc document if (!mxComponent.is()) mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); - uno::Reference< container::XIndexAccess > xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); xSheet->getCellByPosition(5, 5)->setValue(15); xSheet->getCellByPosition(1, 4)->setValue(10); xSheet->getCellByPosition(2, 0)->setValue(-5.15); - uno::Reference< beans::XPropertySet > xPropSet(xSheet, uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries; - xSheetConditionalEntries.set(xPropSet->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xPropSet(xSheet, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries; + xSheetConditionalEntries.set(xPropSet->getPropertyValue(SC_UNONAME_CONDFMT), + uno::UNO_QUERY_THROW); xSheetConditionalEntries->addNew(createCondition(5)); xSheetConditionalEntries->addNew(createCondition(2)); @@ -96,9 +95,9 @@ uno::Reference< uno::XInterface > ScTableConditionalFormatObj::init() return xSheetConditionalEntries; } -uno::Sequence< beans::PropertyValue > ScTableConditionalFormatObj::createCondition(const sal_Int32 nr) +uno::Sequence<beans::PropertyValue> ScTableConditionalFormatObj::createCondition(const sal_Int32 nr) { - uno::Sequence< beans::PropertyValue > aPropValue(5); + uno::Sequence<beans::PropertyValue> aPropValue(5); aPropValue[0].Name = SC_UNONAME_STYLENAME; aPropValue[0].Value <<= OUString("Result2"); aPropValue[1].Name = SC_UNONAME_FORMULA1; diff --git a/sc/qa/extras/sctablevalidationobj.cxx b/sc/qa/extras/sctablevalidationobj.cxx index 4b6b27622615..1fe21046071b 100644 --- a/sc/qa/extras/sctablevalidationobj.cxx +++ b/sc/qa/extras/sctablevalidationobj.cxx @@ -26,8 +26,8 @@ using namespace css; using namespace css::uno; using namespace com::sun::star; -namespace sc_apitest { - +namespace sc_apitest +{ #define NUMBER_OF_TESTS 4 class ScTableValidationObj : public CalcUnoApiTest, public apitest::XSheetCondition @@ -35,7 +35,7 @@ class ScTableValidationObj : public CalcUnoApiTest, public apitest::XSheetCondit public: ScTableValidationObj(); - virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; virtual void tearDown() override; @@ -51,36 +51,35 @@ public: private: static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; - + static uno::Reference<lang::XComponent> mxComponent; }; sal_Int32 ScTableValidationObj::nTest = 0; -uno::Reference< lang::XComponent > ScTableValidationObj::mxComponent; +uno::Reference<lang::XComponent> ScTableValidationObj::mxComponent; ScTableValidationObj::ScTableValidationObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { } -uno::Reference< uno::XInterface > ScTableValidationObj::init() +uno::Reference<uno::XInterface> ScTableValidationObj::init() { // create a calc document if (!mxComponent.is()) mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); - uno::Reference< container::XIndexAccess > xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); xSheet->getCellByPosition(5, 5)->setValue(15); xSheet->getCellByPosition(1, 4)->setValue(10); xSheet->getCellByPosition(2, 0)->setValue(-5.15); - uno::Reference< beans::XPropertySet > xPropSet(xSheet, uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSheetCondition > xSheetCondition; + uno::Reference<beans::XPropertySet> xPropSet(xSheet, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetCondition> xSheetCondition; CPPUNIT_ASSERT(xPropSet->getPropertyValue("Validation") >>= xSheetCondition); return xSheetCondition; diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx index 4d5d74938d5b..15734d7adc11 100644 --- a/svx/source/dialog/ClassificationCommon.cxx +++ b/svx/source/dialog/ClassificationCommon.cxx @@ -14,14 +14,15 @@ using namespace css; -namespace svx { -namespace classification { - -OUString convertClassificationResultToString(std::vector<svx::ClassificationResult> const & rResults) +namespace svx +{ +namespace classification +{ +OUString convertClassificationResultToString(std::vector<svx::ClassificationResult> const& rResults) { OUString sRepresentation = ""; - for (svx::ClassificationResult const & rResult : rResults) + for (svx::ClassificationResult const& rResult : rResults) { switch (rResult.meType) { @@ -30,17 +31,18 @@ OUString convertClassificationResultToString(std::vector<svx::ClassificationResu case svx::ClassificationType::MARKING: case svx::ClassificationType::TEXT: sRepresentation += rResult.msName; - break; + break; case svx::ClassificationType::PARAGRAPH: sRepresentation += " "; - break; + break; } } return sRepresentation; } -OUString getProperty(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer, OUString const & rName) +OUString getProperty(uno::Reference<beans::XPropertyContainer> const& rxPropertyContainer, + OUString const& rName) { try { @@ -54,18 +56,18 @@ OUString getProperty(uno::Reference<beans::XPropertyContainer> const & rxPropert return OUString(); } -bool containsProperty(uno::Sequence<beans::Property> const & rProperties, OUString const & rName) +bool containsProperty(uno::Sequence<beans::Property> const& rProperties, OUString const& rName) { - return std::find_if(rProperties.begin(), rProperties.end(), [&](const beans::Property& rProperty) - { - return rProperty.Name == rName; - }) != rProperties.end(); + return std::find_if(rProperties.begin(), rProperties.end(), + [&](const beans::Property& rProperty) { return rProperty.Name == rName; }) + != rProperties.end(); } -void removeAllProperties(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer) +void removeAllProperties(uno::Reference<beans::XPropertyContainer> const& rxPropertyContainer) { uno::Reference<beans::XPropertySet> xPropertySet(rxPropertyContainer, uno::UNO_QUERY); - uno::Sequence<beans::Property> aProperties = xPropertySet->getPropertySetInfo()->getProperties(); + uno::Sequence<beans::Property> aProperties + = xPropertySet->getPropertySetInfo()->getProperties(); for (const beans::Property& rProperty : aProperties) { @@ -73,7 +75,9 @@ void removeAllProperties(uno::Reference<beans::XPropertyContainer> const & rxPro } } -bool addOrInsertDocumentProperty(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer, OUString const & rsKey, OUString const & rsValue) +bool addOrInsertDocumentProperty( + uno::Reference<beans::XPropertyContainer> const& rxPropertyContainer, OUString const& rsKey, + OUString const& rsValue) { uno::Reference<beans::XPropertySet> xPropertySet(rxPropertyContainer, uno::UNO_QUERY); @@ -82,7 +86,8 @@ bool addOrInsertDocumentProperty(uno::Reference<beans::XPropertyContainer> const if (containsProperty(xPropertySet->getPropertySetInfo()->getProperties(), rsKey)) xPropertySet->setPropertyValue(rsKey, uno::makeAny(rsValue)); else - rxPropertyContainer->addProperty(rsKey, beans::PropertyAttribute::REMOVABLE, uno::makeAny(rsValue)); + rxPropertyContainer->addProperty(rsKey, beans::PropertyAttribute::REMOVABLE, + uno::makeAny(rsValue)); } catch (const uno::Exception& /*rException*/) { @@ -91,14 +96,16 @@ bool addOrInsertDocumentProperty(uno::Reference<beans::XPropertyContainer> const return true; } -void insertFullTextualRepresentationAsDocumentProperty(uno::Reference<beans::XPropertyContainer> const & rxPropertyContainer, - sfx::ClassificationKeyCreator const & rKeyCreator, - std::vector<svx::ClassificationResult> const & rResults) +void insertFullTextualRepresentationAsDocumentProperty( + uno::Reference<beans::XPropertyContainer> const& rxPropertyContainer, + sfx::ClassificationKeyCreator const& rKeyCreator, + std::vector<svx::ClassificationResult> const& rResults) { OUString sString = convertClassificationResultToString(rResults); - addOrInsertDocumentProperty(rxPropertyContainer, rKeyCreator.makeFullTextualRepresentationKey(), sString); + addOrInsertDocumentProperty(rxPropertyContainer, rKeyCreator.makeFullTextualRepresentationKey(), + sString); } - -}} // end svx::classification namespace +} +} // end svx::classification namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/sheet/xsheetcellrange.cxx b/test/source/sheet/xsheetcellrange.cxx index 46f0e64b0e8e..660bba5963a0 100644 --- a/test/source/sheet/xsheetcellrange.cxx +++ b/test/source/sheet/xsheetcellrange.cxx @@ -21,7 +21,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetCellRange::testGetSpreadsheet() { uno::Reference<sheet::XSheetCellRange> xSheetCellRange(init(), UNO_QUERY_THROW); diff --git a/test/source/sheet/xsheetcellrangecontainer.cxx b/test/source/sheet/xsheetcellrangecontainer.cxx index 05e630ab3f6e..be3c7453a2a0 100644 --- a/test/source/sheet/xsheetcellrangecontainer.cxx +++ b/test/source/sheet/xsheetcellrangecontainer.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetCellRangeContainer::testAddRemoveRangeAddress() { uno::Reference<sheet::XSheetCellRangeContainer> xSCRC(init(), UNO_QUERY_THROW); diff --git a/test/source/sheet/xsheetcellranges.cxx b/test/source/sheet/xsheetcellranges.cxx index 046541d02c23..cf785634b3a5 100644 --- a/test/source/sheet/xsheetcellranges.cxx +++ b/test/source/sheet/xsheetcellranges.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetCellRanges::testGetCells() { uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW); diff --git a/test/source/sheet/xsheetcondition.cxx b/test/source/sheet/xsheetcondition.cxx index 402902700a79..a5bc07079b71 100644 --- a/test/source/sheet/xsheetcondition.cxx +++ b/test/source/sheet/xsheetcondition.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetCondition::testGetSetFormula1() { uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW); diff --git a/test/source/sheet/xsheetconditionalentries.cxx b/test/source/sheet/xsheetconditionalentries.cxx index b464303310cc..2d50310fec34 100644 --- a/test/source/sheet/xsheetconditionalentries.cxx +++ b/test/source/sheet/xsheetconditionalentries.cxx @@ -23,7 +23,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetConditionalEntries::testAddNew() { uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(), diff --git a/test/source/sheet/xsheetconditionalentry.cxx b/test/source/sheet/xsheetconditionalentry.cxx index e72c95a12129..d5a4e51af0f9 100644 --- a/test/source/sheet/xsheetconditionalentry.cxx +++ b/test/source/sheet/xsheetconditionalentry.cxx @@ -20,7 +20,6 @@ using namespace com::sun::star::uno; namespace apitest { - void XSheetConditionalEntry::testGetSetStyleName() { uno::Reference<sheet::XSheetConditionalEntry> xSheetConditionalEntry(init(), UNO_QUERY_THROW); diff --git a/tools/source/xml/XmlWalker.cxx b/tools/source/xml/XmlWalker.cxx index 9bec6d9dd534..61aedee7e6e4 100644 --- a/tools/source/xml/XmlWalker.cxx +++ b/tools/source/xml/XmlWalker.cxx @@ -15,17 +15,18 @@ #include <libxml/xmlstring.h> #include <vector> -namespace tools { - +namespace tools +{ struct XmlWalkerImpl { XmlWalkerImpl() : mpDocPtr(nullptr) , mpRoot(nullptr) , mpCurrent(nullptr) - {} + { + } - xmlDocPtr mpDocPtr; + xmlDocPtr mpDocPtr; xmlNodePtr mpRoot; xmlNodePtr mpCurrent; @@ -34,7 +35,8 @@ struct XmlWalkerImpl XmlWalker::XmlWalker() : mpImpl(o3tl::make_unique<XmlWalkerImpl>()) -{} +{ +} XmlWalker::~XmlWalker() { @@ -67,7 +69,8 @@ OString XmlWalker::content() OString aContent; if (mpImpl->mpCurrent->xmlChildrenNode != nullptr) { - xmlChar* pContent = xmlNodeListGetString(mpImpl->mpDocPtr, mpImpl->mpCurrent->xmlChildrenNode, 1); + xmlChar* pContent + = xmlNodeListGetString(mpImpl->mpDocPtr, mpImpl->mpCurrent->xmlChildrenNode, 1); aContent = OString(reinterpret_cast<const char*>(pContent)); xmlFree(pContent); } @@ -97,15 +100,9 @@ OString XmlWalker::attribute(OString sName) return aAttributeContent; } -void XmlWalker::next() -{ - mpImpl->mpCurrent = mpImpl->mpCurrent->next; -} +void XmlWalker::next() { mpImpl->mpCurrent = mpImpl->mpCurrent->next; } -bool XmlWalker::isValid() const -{ - return mpImpl->mpCurrent != nullptr; -} +bool XmlWalker::isValid() const { return mpImpl->mpCurrent != nullptr; } } // end tools namespace diff --git a/tools/source/xml/XmlWriter.cxx b/tools/source/xml/XmlWriter.cxx index 014252bc39aa..5952dde13c96 100644 --- a/tools/source/xml/XmlWriter.cxx +++ b/tools/source/xml/XmlWriter.cxx @@ -12,10 +12,10 @@ #include <libxml/xmlwriter.h> -namespace tools { - -namespace { - +namespace tools +{ +namespace +{ int funcWriteCallback(void* pContext, const char* sBuffer, int nLen) { SvStream* pStream = static_cast<SvStream*>(pContext); @@ -36,7 +36,8 @@ struct XmlWriterImpl XmlWriterImpl(SvStream* pStream) : mpStream(pStream) , mpWriter(nullptr) - {} + { + } SvStream* mpStream; xmlTextWriterPtr mpWriter; @@ -44,18 +45,19 @@ struct XmlWriterImpl XmlWriter::XmlWriter(SvStream* pStream) : mpImpl(o3tl::make_unique<XmlWriterImpl>(pStream)) -{} +{ +} XmlWriter::~XmlWriter() { - if (mpImpl && mpImpl->mpWriter != nullptr) endDocument(); } bool XmlWriter::startDocument() { - xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO(funcWriteCallback, funcCloseCallback, mpImpl->mpStream, nullptr); + xmlOutputBufferPtr xmlOutBuffer + = xmlOutputBufferCreateIO(funcWriteCallback, funcCloseCallback, mpImpl->mpStream, nullptr); mpImpl->mpWriter = xmlNewTextWriter(xmlOutBuffer); if (mpImpl->mpWriter == nullptr) return false; @@ -78,12 +80,9 @@ void XmlWriter::startElement(const OString& sName) xmlFree(xmlName); } -void XmlWriter::endElement() -{ - xmlTextWriterEndElement(mpImpl->mpWriter); -} +void XmlWriter::endElement() { xmlTextWriterEndElement(mpImpl->mpWriter); } -void XmlWriter::attribute(const OString& name, const OString & value) +void XmlWriter::attribute(const OString& name, const OString& value) { xmlChar* xmlName = xmlCharStrdup(name.getStr()); xmlChar* xmlValue = xmlCharStrdup(value.getStr()); diff --git a/vcl/inc/qt5/Qt5Font.hxx b/vcl/inc/qt5/Qt5Font.hxx index d8981578831a..789c925a104c 100644 --- a/vcl/inc/qt5/Qt5Font.hxx +++ b/vcl/inc/qt5/Qt5Font.hxx @@ -31,13 +31,16 @@ class VCL_DLLPUBLIC Qt5Font : public QFont hb_font_t* m_pHbFont; public: - Qt5Font( const FontSelectPattern& rFSP) - : m_aFontSelData( rFSP ), m_pHbFont( nullptr ) {} + Qt5Font(const FontSelectPattern& rFSP) + : m_aFontSelData(rFSP) + , m_pHbFont(nullptr) + { + } virtual ~Qt5Font(); - hb_font_t* GetHbFont() const { return m_pHbFont; } - void SetHbFont( hb_font_t* pHbFont ) { m_pHbFont = pHbFont; } - const FontSelectPattern& GetFontSelData() const { return m_aFontSelData; } + hb_font_t* GetHbFont() const { return m_pHbFont; } + void SetHbFont(hb_font_t* pHbFont) { m_pHbFont = pHbFont; } + const FontSelectPattern& GetFontSelData() const { return m_aFontSelData; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx index 6fcff9e05663..0f312e0057e2 100644 --- a/vcl/qt5/Qt5Bitmap.cxx +++ b/vcl/qt5/Qt5Bitmap.cxx @@ -25,117 +25,96 @@ #include <QtCore/QVector> #include <QtGui/QColor> -Qt5Bitmap::Qt5Bitmap() -{ -} +Qt5Bitmap::Qt5Bitmap() {} -Qt5Bitmap::Qt5Bitmap( const QImage &rImage ) -{ - m_pImage.reset( new QImage( rImage ) ); -} +Qt5Bitmap::Qt5Bitmap(const QImage& rImage) { m_pImage.reset(new QImage(rImage)); } -Qt5Bitmap::~Qt5Bitmap() -{ -} +Qt5Bitmap::~Qt5Bitmap() {} -bool Qt5Bitmap::Create( const Size& rSize, sal_uInt16 nBitCount, - const BitmapPalette& rPal ) +bool Qt5Bitmap::Create(const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal) { - assert( - (nBitCount == 1 - || nBitCount == 4 - || nBitCount == 8 - || nBitCount == 16 - || nBitCount == 24 - || nBitCount == 32) - && "Unsupported BitCount!"); + assert((nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount == 16 || nBitCount == 24 + || nBitCount == 32) + && "Unsupported BitCount!"); - if ( nBitCount == 1 ) - assert( 2 == rPal.GetEntryCount() ); - if ( nBitCount == 4 ) - assert( 16 == rPal.GetEntryCount() ); - if ( nBitCount == 8 ) - assert( 256 == rPal.GetEntryCount() ); + if (nBitCount == 1) + assert(2 == rPal.GetEntryCount()); + if (nBitCount == 4) + assert(16 == rPal.GetEntryCount()); + if (nBitCount == 8) + assert(256 == rPal.GetEntryCount()); - if ( nBitCount == 4 ) + if (nBitCount == 4) { m_pImage.reset(); m_aSize = rSize; m_nScanline = rSize.Width() / 2 + (rSize.Width() % 2) ? 0 : 1; - m_pBuffer.reset( new sal_uInt8[ m_nScanline * rSize.Height() ] ); + m_pBuffer.reset(new sal_uInt8[m_nScanline * rSize.Height()]); } else { - m_pImage.reset( new QImage( toQSize( rSize ), getBitFormat( nBitCount ) ) ); + m_pImage.reset(new QImage(toQSize(rSize), getBitFormat(nBitCount))); m_pBuffer.reset(); } m_aPalette = rPal; auto count = rPal.GetEntryCount(); - if( nBitCount != 4 && count ) + if (nBitCount != 4 && count) { - QVector<QRgb> aColorTable( count ); - for ( unsigned i = 0; i < count; ++i ) - aColorTable[ i ] = qRgb( rPal[ i ].GetRed(), - rPal[ i ].GetGreen(), rPal[ i ].GetBlue() ); - m_pImage->setColorTable( aColorTable ); + QVector<QRgb> aColorTable(count); + for (unsigned i = 0; i < count; ++i) + aColorTable[i] = qRgb(rPal[i].GetRed(), rPal[i].GetGreen(), rPal[i].GetBlue()); + m_pImage->setColorTable(aColorTable); } return true; } -bool Qt5Bitmap::Create( const SalBitmap& rSalBmp ) +bool Qt5Bitmap::Create(const SalBitmap& rSalBmp) { - const Qt5Bitmap *pBitmap = static_cast< const Qt5Bitmap*>( &rSalBmp ); - if ( pBitmap->m_pImage.get() ) + const Qt5Bitmap* pBitmap = static_cast<const Qt5Bitmap*>(&rSalBmp); + if (pBitmap->m_pImage.get()) { - m_pImage.reset( new QImage( *pBitmap->m_pImage.get() ) ); + m_pImage.reset(new QImage(*pBitmap->m_pImage.get())); m_pBuffer.reset(); } else { m_aSize = pBitmap->m_aSize; m_nScanline = pBitmap->m_nScanline; - m_pBuffer.reset( new sal_uInt8[ m_nScanline * m_aSize.Height() ] ); - memcpy( m_pBuffer.get(), pBitmap->m_pBuffer.get(), m_nScanline ); + m_pBuffer.reset(new sal_uInt8[m_nScanline * m_aSize.Height()]); + memcpy(m_pBuffer.get(), pBitmap->m_pBuffer.get(), m_nScanline); m_pImage.reset(); } m_aPalette = pBitmap->m_aPalette; return true; } -bool Qt5Bitmap::Create( const SalBitmap& rSalBmp, - SalGraphics* pSalGraphics ) +bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, SalGraphics* pSalGraphics) { - const Qt5Bitmap *pBitmap = static_cast< const Qt5Bitmap *>( &rSalBmp ); - Qt5Graphics *pGraphics = static_cast< Qt5Graphics* >( pSalGraphics ); - QImage *pImage = pGraphics->m_pQImage; - m_pImage.reset( new QImage( pBitmap->m_pImage->convertToFormat( pImage->format() ) ) ); + const Qt5Bitmap* pBitmap = static_cast<const Qt5Bitmap*>(&rSalBmp); + Qt5Graphics* pGraphics = static_cast<Qt5Graphics*>(pSalGraphics); + QImage* pImage = pGraphics->m_pQImage; + m_pImage.reset(new QImage(pBitmap->m_pImage->convertToFormat(pImage->format()))); m_pBuffer.reset(); return true; } -bool Qt5Bitmap::Create( const SalBitmap& rSalBmp, - sal_uInt16 nNewBitCount ) +bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount) { - assert( - (nNewBitCount == 1 - || nNewBitCount == 4 - || nNewBitCount == 8 - || nNewBitCount == 16 - || nNewBitCount == 24 - || nNewBitCount == 32) - && "Unsupported BitCount!"); + assert((nNewBitCount == 1 || nNewBitCount == 4 || nNewBitCount == 8 || nNewBitCount == 16 + || nNewBitCount == 24 || nNewBitCount == 32) + && "Unsupported BitCount!"); - const Qt5Bitmap *pBitmap = static_cast< const Qt5Bitmap *>( &rSalBmp ); - if ( pBitmap->m_pBuffer.get() ) + const Qt5Bitmap* pBitmap = static_cast<const Qt5Bitmap*>(&rSalBmp); + if (pBitmap->m_pBuffer.get()) return false; - m_pImage.reset( new QImage( pBitmap->m_pImage->convertToFormat( getBitFormat( nNewBitCount ) ) ) ); + m_pImage.reset(new QImage(pBitmap->m_pImage->convertToFormat(getBitFormat(nNewBitCount)))); return true; } -bool Qt5Bitmap::Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, - Size& rSize, bool bMask ) +bool Qt5Bitmap::Create(const css::uno::Reference<css::rendering::XBitmapCanvas>& rBitmapCanvas, + Size& rSize, bool bMask) { return false; } @@ -148,32 +127,32 @@ void Qt5Bitmap::Destroy() Size Qt5Bitmap::GetSize() const { - if ( m_pBuffer.get() ) + if (m_pBuffer.get()) return m_aSize; - else if ( m_pImage.get() ) - return toSize( m_pImage->size() ); + else if (m_pImage.get()) + return toSize(m_pImage->size()); return Size(); } sal_uInt16 Qt5Bitmap::GetBitCount() const { - if ( m_pBuffer.get() ) + if (m_pBuffer.get()) return 4; - else if ( m_pImage.get() ) - return getFormatBits( m_pImage->format() ); + else if (m_pImage.get()) + return getFormatBits(m_pImage->format()); return 0; } -BitmapBuffer* Qt5Bitmap::AcquireBuffer( BitmapAccessMode nMode ) +BitmapBuffer* Qt5Bitmap::AcquireBuffer(BitmapAccessMode nMode) { static const BitmapPalette aEmptyPalette; - if ( !(m_pImage.get() || m_pBuffer.get()) ) + if (!(m_pImage.get() || m_pBuffer.get())) return nullptr; BitmapBuffer* pBuffer = new BitmapBuffer; - if ( m_pBuffer.get() ) + if (m_pBuffer.get()) { pBuffer->mnWidth = m_aSize.Width(); pBuffer->mnHeight = m_aSize.Height(); @@ -185,12 +164,12 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer( BitmapAccessMode nMode ) { pBuffer->mnWidth = m_pImage->width(); pBuffer->mnHeight = m_pImage->height(); - pBuffer->mnBitCount = getFormatBits( m_pImage->format() ); + pBuffer->mnBitCount = getFormatBits(m_pImage->format()); pBuffer->mpBits = m_pImage->bits(); pBuffer->mnScanlineSize = m_pImage->bytesPerLine(); } - switch( pBuffer->mnBitCount ) + switch (pBuffer->mnBitCount) { case 1: pBuffer->mnFormat = ScanlineFormat::N1BitLsbPal | ScanlineFormat::TopDown; @@ -207,9 +186,9 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer( BitmapAccessMode nMode ) case 16: { #ifdef OSL_BIGENDIAN - pBuffer->mnFormat= ScanlineFormat::N16BitTcMsbMask | ScanlineFormat::TopDown; + pBuffer->mnFormat = ScanlineFormat::N16BitTcMsbMask | ScanlineFormat::TopDown; #else - pBuffer->mnFormat= ScanlineFormat::N16BitTcLsbMask | ScanlineFormat::TopDown; + pBuffer->mnFormat = ScanlineFormat::N16BitTcLsbMask | ScanlineFormat::TopDown; #endif ColorMaskElement aRedMask(0xf800); // 5 aRedMask.CalcMaskShift(); @@ -236,37 +215,31 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer( BitmapAccessMode nMode ) return pBuffer; } -void Qt5Bitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) +void Qt5Bitmap::ReleaseBuffer(BitmapBuffer* pBuffer, BitmapAccessMode nMode) { m_aPalette = pBuffer->maPalette; auto count = m_aPalette.GetEntryCount(); - if( pBuffer->mnBitCount != 4 && count ) + if (pBuffer->mnBitCount != 4 && count) { - QVector<QRgb> aColorTable( count ); - for ( unsigned i = 0; i < count; ++i ) - aColorTable[ i ] = qRgb( m_aPalette[ i ].GetRed(), - m_aPalette[ i ].GetGreen(), m_aPalette[ i ].GetBlue() ); - m_pImage->setColorTable( aColorTable ); + QVector<QRgb> aColorTable(count); + for (unsigned i = 0; i < count; ++i) + aColorTable[i] + = qRgb(m_aPalette[i].GetRed(), m_aPalette[i].GetGreen(), m_aPalette[i].GetBlue()); + m_pImage->setColorTable(aColorTable); } delete pBuffer; } -bool Qt5Bitmap::GetSystemData( BitmapSystemData& rData ) -{ - return false; -} +bool Qt5Bitmap::GetSystemData(BitmapSystemData& rData) { return false; } -bool Qt5Bitmap::ScalingSupported() const -{ - return false; -} +bool Qt5Bitmap::ScalingSupported() const { return false; } -bool Qt5Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) +bool Qt5Bitmap::Scale(const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag) { return false; } -bool Qt5Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) +bool Qt5Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol) { return false; } diff --git a/vcl/qt5/Qt5Bitmap.hxx b/vcl/qt5/Qt5Bitmap.hxx index 99c9641db789..c8d35e2050cc 100644 --- a/vcl/qt5/Qt5Bitmap.hxx +++ b/vcl/qt5/Qt5Bitmap.hxx @@ -27,43 +27,41 @@ class QImage; class VCL_DLLPUBLIC Qt5Bitmap : public SalBitmap { - std::unique_ptr< QImage > m_pImage; - BitmapPalette m_aPalette; + std::unique_ptr<QImage> m_pImage; + BitmapPalette m_aPalette; // for 4bit support - std::unique_ptr< sal_uInt8 > m_pBuffer; - Size m_aSize; - sal_uInt32 m_nScanline; + std::unique_ptr<sal_uInt8> m_pBuffer; + Size m_aSize; + sal_uInt32 m_nScanline; public: Qt5Bitmap(); - Qt5Bitmap( const QImage& rQImage ); + Qt5Bitmap(const QImage& rQImage); virtual ~Qt5Bitmap() override; - const QImage* GetQImage() const { return m_pImage.get(); } + const QImage* GetQImage() const { return m_pImage.get(); } - virtual bool Create( const Size& rSize, - sal_uInt16 nBitCount, - const BitmapPalette& rPal ) override; - virtual bool Create( const SalBitmap& rSalBmp ) override; - virtual bool Create( const SalBitmap& rSalBmp, - SalGraphics* pGraphics ) override; - virtual bool Create( const SalBitmap& rSalBmp, - sal_uInt16 nNewBitCount ) override; - virtual bool Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas, - Size& rSize, - bool bMask = false ) override; - virtual void Destroy() final override; - virtual Size GetSize() const override; - virtual sal_uInt16 GetBitCount() const override; + virtual bool Create(const Size& rSize, sal_uInt16 nBitCount, + const BitmapPalette& rPal) override; + virtual bool Create(const SalBitmap& rSalBmp) override; + virtual bool Create(const SalBitmap& rSalBmp, SalGraphics* pGraphics) override; + virtual bool Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount) override; + virtual bool Create(const css::uno::Reference<css::rendering::XBitmapCanvas>& rBitmapCanvas, + Size& rSize, bool bMask = false) override; + virtual void Destroy() final override; + virtual Size GetSize() const override; + virtual sal_uInt16 GetBitCount() const override; - virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) override; - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; - virtual bool GetSystemData( BitmapSystemData& rData ) override; + virtual BitmapBuffer* AcquireBuffer(BitmapAccessMode nMode) override; + virtual void ReleaseBuffer(BitmapBuffer* pBuffer, BitmapAccessMode nMode) override; + virtual bool GetSystemData(BitmapSystemData& rData) override; - virtual bool ScalingSupported() const override; - virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + virtual bool ScalingSupported() const override; + virtual bool Scale(const double& rScaleX, const double& rScaleY, + BmpScaleFlag nScaleFlag) override; + virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor, + sal_uLong nTol) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx index 3d524bd11c71..7fdae2cc0a9c 100644 --- a/vcl/qt5/Qt5Data.cxx +++ b/vcl/qt5/Qt5Data.cxx @@ -24,13 +24,13 @@ #include <unx/x11_cursors/salcursors.h> -Qt5Data::Qt5Data( SalInstance *pInstance ) - : GenericUnixSalData( SAL_DATA_QT5, pInstance ) +Qt5Data::Qt5Data(SalInstance* pInstance) + : GenericUnixSalData(SAL_DATA_QT5, pInstance) { - for (QCursor* & rpCsr : m_aCursors) + for (QCursor*& rpCsr : m_aCursors) rpCsr = nullptr; - ImplSVData *pSVData = ImplGetSVData(); + ImplSVData* pSVData = ImplGetSVData(); // draw toolbars on separate lines pSVData->maNWFData.mbDockingAreaSeparateTB = true; @@ -38,169 +38,160 @@ Qt5Data::Qt5Data( SalInstance *pInstance ) Qt5Data::~Qt5Data() { - for (QCursor* & rpCsr : m_aCursors) + for (QCursor*& rpCsr : m_aCursors) delete rpCsr; } -static QCursor* getQCursorFromXBM( const unsigned char *pBitmap, - const unsigned char *pMask, - int nWidth, int nHeight, - int nXHot, int nYHot ) +static QCursor* getQCursorFromXBM(const unsigned char* pBitmap, const unsigned char* pMask, + int nWidth, int nHeight, int nXHot, int nYHot) { QBitmap aPixmap; - aPixmap.loadFromData( pBitmap, nWidth * nHeight / 8, "XPM" ); + aPixmap.loadFromData(pBitmap, nWidth * nHeight / 8, "XPM"); QBitmap aMask; - aMask.loadFromData( pMask, nWidth * nHeight / 8, "XPM" ); - aPixmap.setMask( aMask ); - return new QCursor( aPixmap, nXHot, nYHot ); + aMask.loadFromData(pMask, nWidth * nHeight / 8, "XPM"); + aPixmap.setMask(aMask); + return new QCursor(aPixmap, nXHot, nYHot); } -#define MAKE_CURSOR( vcl_name, name ) \ - case vcl_name: \ - pCursor = getQCursorFromXBM( name##curs##_bits, name##mask##_bits, \ - name##curs_width, name##curs_height, \ - name##curs_x_hot, name##curs_y_hot ); \ +#define MAKE_CURSOR(vcl_name, name) \ + case vcl_name: \ + pCursor = getQCursorFromXBM(name##curs##_bits, name##mask##_bits, name##curs_width, \ + name##curs_height, name##curs_x_hot, name##curs_y_hot); \ break -#define MAP_BUILTIN( vcl_name, qt_enum ) \ - case vcl_name: \ - pCursor = new QCursor( qt_enum ); \ +#define MAP_BUILTIN(vcl_name, qt_enum) \ + case vcl_name: \ + pCursor = new QCursor(qt_enum); \ break -QCursor& Qt5Data::getCursor( PointerStyle ePointerStyle ) +QCursor& Qt5Data::getCursor(PointerStyle ePointerStyle) { - if ( !m_aCursors[ ePointerStyle ] ) + if (!m_aCursors[ePointerStyle]) { - QCursor *pCursor = nullptr; + QCursor* pCursor = nullptr; - switch( ePointerStyle ) + switch (ePointerStyle) { - MAP_BUILTIN( PointerStyle::Arrow, Qt::ArrowCursor ); - MAP_BUILTIN( PointerStyle::Text, Qt::IBeamCursor ); - MAP_BUILTIN( PointerStyle::Help, Qt::WhatsThisCursor ); - MAP_BUILTIN( PointerStyle::Cross, Qt::CrossCursor ); - MAP_BUILTIN( PointerStyle::Wait, Qt::WaitCursor ); - MAP_BUILTIN( PointerStyle::NSize, Qt::SizeVerCursor ); - MAP_BUILTIN( PointerStyle::SSize, Qt::SizeVerCursor ); - MAP_BUILTIN( PointerStyle::WSize, Qt::SizeHorCursor ); - MAP_BUILTIN( PointerStyle::ESize, Qt::SizeHorCursor ); - - MAP_BUILTIN( PointerStyle::NWSize, Qt::SizeFDiagCursor ); - MAP_BUILTIN( PointerStyle::NESize, Qt::SizeBDiagCursor ); - MAP_BUILTIN( PointerStyle::SWSize, Qt::SizeBDiagCursor ); - MAP_BUILTIN( PointerStyle::SESize, Qt::SizeFDiagCursor ); + MAP_BUILTIN(PointerStyle::Arrow, Qt::ArrowCursor); + MAP_BUILTIN(PointerStyle::Text, Qt::IBeamCursor); + MAP_BUILTIN(PointerStyle::Help, Qt::WhatsThisCursor); + MAP_BUILTIN(PointerStyle::Cross, Qt::CrossCursor); + MAP_BUILTIN(PointerStyle::Wait, Qt::WaitCursor); + MAP_BUILTIN(PointerStyle::NSize, Qt::SizeVerCursor); + MAP_BUILTIN(PointerStyle::SSize, Qt::SizeVerCursor); + MAP_BUILTIN(PointerStyle::WSize, Qt::SizeHorCursor); + MAP_BUILTIN(PointerStyle::ESize, Qt::SizeHorCursor); + + MAP_BUILTIN(PointerStyle::NWSize, Qt::SizeFDiagCursor); + MAP_BUILTIN(PointerStyle::NESize, Qt::SizeBDiagCursor); + MAP_BUILTIN(PointerStyle::SWSize, Qt::SizeBDiagCursor); + MAP_BUILTIN(PointerStyle::SESize, Qt::SizeFDiagCursor); #if 0 MAP_BUILTIN( PointerStyle::WindowNSize, GDK_TOP_SIDE ); MAP_BUILTIN( PointerStyle::WindowSSize, GDK_BOTTOM_SIDE ); MAP_BUILTIN( PointerStyle::WindowWSize, GDK_LEFT_SIDE ); MAP_BUILTIN( PointerStyle::WindowESize, GDK_RIGHT_SIDE ); #endif - MAP_BUILTIN( PointerStyle::WindowNWSize, Qt::SizeFDiagCursor ); - MAP_BUILTIN( PointerStyle::WindowNESize, Qt::SizeBDiagCursor ); - MAP_BUILTIN( PointerStyle::WindowSWSize, Qt::SizeBDiagCursor ); - MAP_BUILTIN( PointerStyle::WindowSESize, Qt::SizeFDiagCursor ); + MAP_BUILTIN(PointerStyle::WindowNWSize, Qt::SizeFDiagCursor); + MAP_BUILTIN(PointerStyle::WindowNESize, Qt::SizeBDiagCursor); + MAP_BUILTIN(PointerStyle::WindowSWSize, Qt::SizeBDiagCursor); + MAP_BUILTIN(PointerStyle::WindowSESize, Qt::SizeFDiagCursor); - MAP_BUILTIN( PointerStyle::HSizeBar, Qt::SizeHorCursor ); - MAP_BUILTIN( PointerStyle::VSizeBar, Qt::SizeVerCursor ); + MAP_BUILTIN(PointerStyle::HSizeBar, Qt::SizeHorCursor); + MAP_BUILTIN(PointerStyle::VSizeBar, Qt::SizeVerCursor); - MAP_BUILTIN( PointerStyle::RefHand, Qt::OpenHandCursor ); - MAP_BUILTIN( PointerStyle::Hand, Qt::OpenHandCursor ); + MAP_BUILTIN(PointerStyle::RefHand, Qt::OpenHandCursor); + MAP_BUILTIN(PointerStyle::Hand, Qt::OpenHandCursor); #if 0 MAP_BUILTIN( PointerStyle::Pen, GDK_PENCIL ); #endif - MAP_BUILTIN( PointerStyle::HSplit, Qt::SizeHorCursor ); - MAP_BUILTIN( PointerStyle::VSplit, Qt::SizeVerCursor ); - - MAP_BUILTIN( PointerStyle::Move, Qt::SizeAllCursor ); - - MAP_BUILTIN( PointerStyle::Null, Qt::BlankCursor ); - MAKE_CURSOR( PointerStyle::Magnify, magnify_ ); - MAKE_CURSOR( PointerStyle::Fill, fill_ ); - MAKE_CURSOR( PointerStyle::MoveData, movedata_ ); - MAKE_CURSOR( PointerStyle::CopyData, copydata_ ); - MAKE_CURSOR( PointerStyle::MoveFile, movefile_ ); - MAKE_CURSOR( PointerStyle::CopyFile, copyfile_ ); - MAKE_CURSOR( PointerStyle::MoveFiles, movefiles_ ); - MAKE_CURSOR( PointerStyle::CopyFiles, copyfiles_ ); - MAKE_CURSOR( PointerStyle::NotAllowed, nodrop_ ); - MAKE_CURSOR( PointerStyle::Rotate, rotate_ ); - MAKE_CURSOR( PointerStyle::HShear, hshear_ ); - MAKE_CURSOR( PointerStyle::VShear, vshear_ ); - MAKE_CURSOR( PointerStyle::DrawLine, drawline_ ); - MAKE_CURSOR( PointerStyle::DrawRect, drawrect_ ); - MAKE_CURSOR( PointerStyle::DrawPolygon, drawpolygon_ ); - MAKE_CURSOR( PointerStyle::DrawBezier, drawbezier_ ); - MAKE_CURSOR( PointerStyle::DrawArc, drawarc_ ); - MAKE_CURSOR( PointerStyle::DrawPie, drawpie_ ); - MAKE_CURSOR( PointerStyle::DrawCircleCut, drawcirclecut_ ); - MAKE_CURSOR( PointerStyle::DrawEllipse, drawellipse_ ); - MAKE_CURSOR( PointerStyle::DrawConnect, drawconnect_ ); - MAKE_CURSOR( PointerStyle::DrawText, drawtext_ ); - MAKE_CURSOR( PointerStyle::Mirror, mirror_ ); - MAKE_CURSOR( PointerStyle::Crook, crook_ ); - MAKE_CURSOR( PointerStyle::Crop, crop_ ); - MAKE_CURSOR( PointerStyle::MovePoint, movepoint_ ); - MAKE_CURSOR( PointerStyle::MoveBezierWeight, movebezierweight_ ); - MAKE_CURSOR( PointerStyle::DrawFreehand, drawfreehand_ ); - MAKE_CURSOR( PointerStyle::DrawCaption, drawcaption_ ); - MAKE_CURSOR( PointerStyle::LinkData, linkdata_ ); - MAKE_CURSOR( PointerStyle::MoveDataLink, movedlnk_ ); - MAKE_CURSOR( PointerStyle::CopyDataLink, copydlnk_ ); - MAKE_CURSOR( PointerStyle::LinkFile, linkfile_ ); - MAKE_CURSOR( PointerStyle::MoveFileLink, moveflnk_ ); - MAKE_CURSOR( PointerStyle::CopyFileLink, copyflnk_ ); - MAKE_CURSOR( PointerStyle::Chart, chart_ ); - MAKE_CURSOR( PointerStyle::Detective, detective_ ); - MAKE_CURSOR( PointerStyle::PivotCol, pivotcol_ ); - MAKE_CURSOR( PointerStyle::PivotRow, pivotrow_ ); - MAKE_CURSOR( PointerStyle::PivotField, pivotfld_ ); - MAKE_CURSOR( PointerStyle::PivotDelete, pivotdel_ ); - MAKE_CURSOR( PointerStyle::Chain, chain_ ); - MAKE_CURSOR( PointerStyle::ChainNotAllowed, chainnot_ ); - MAKE_CURSOR( PointerStyle::AutoScrollN, asn_ ); - MAKE_CURSOR( PointerStyle::AutoScrollS, ass_ ); - MAKE_CURSOR( PointerStyle::AutoScrollW, asw_ ); - MAKE_CURSOR( PointerStyle::AutoScrollE, ase_ ); - MAKE_CURSOR( PointerStyle::AutoScrollNW, asnw_ ); - MAKE_CURSOR( PointerStyle::AutoScrollNE, asne_ ); - MAKE_CURSOR( PointerStyle::AutoScrollSW, assw_ ); - MAKE_CURSOR( PointerStyle::AutoScrollSE, asse_ ); - MAKE_CURSOR( PointerStyle::AutoScrollNS, asns_ ); - MAKE_CURSOR( PointerStyle::AutoScrollWE, aswe_ ); - MAKE_CURSOR( PointerStyle::AutoScrollNSWE, asnswe_ ); - MAKE_CURSOR( PointerStyle::TextVertical, vertcurs_ ); - - MAKE_CURSOR( PointerStyle::TabSelectS, tblsels_ ); - MAKE_CURSOR( PointerStyle::TabSelectE, tblsele_ ); - MAKE_CURSOR( PointerStyle::TabSelectSE, tblselse_ ); - MAKE_CURSOR( PointerStyle::TabSelectW, tblselw_ ); - MAKE_CURSOR( PointerStyle::TabSelectSW, tblselsw_ ); - - MAKE_CURSOR( PointerStyle::HideWhitespace, hidewhitespace_ ); - MAKE_CURSOR( PointerStyle::ShowWhitespace, showwhitespace_ ); - default: - break; + MAP_BUILTIN(PointerStyle::HSplit, Qt::SizeHorCursor); + MAP_BUILTIN(PointerStyle::VSplit, Qt::SizeVerCursor); + + MAP_BUILTIN(PointerStyle::Move, Qt::SizeAllCursor); + + MAP_BUILTIN(PointerStyle::Null, Qt::BlankCursor); + MAKE_CURSOR(PointerStyle::Magnify, magnify_); + MAKE_CURSOR(PointerStyle::Fill, fill_); + MAKE_CURSOR(PointerStyle::MoveData, movedata_); + MAKE_CURSOR(PointerStyle::CopyData, copydata_); + MAKE_CURSOR(PointerStyle::MoveFile, movefile_); + MAKE_CURSOR(PointerStyle::CopyFile, copyfile_); + MAKE_CURSOR(PointerStyle::MoveFiles, movefiles_); + MAKE_CURSOR(PointerStyle::CopyFiles, copyfiles_); + MAKE_CURSOR(PointerStyle::NotAllowed, nodrop_); + MAKE_CURSOR(PointerStyle::Rotate, rotate_); + MAKE_CURSOR(PointerStyle::HShear, hshear_); + MAKE_CURSOR(PointerStyle::VShear, vshear_); + MAKE_CURSOR(PointerStyle::DrawLine, drawline_); + MAKE_CURSOR(PointerStyle::DrawRect, drawrect_); + MAKE_CURSOR(PointerStyle::DrawPolygon, drawpolygon_); + MAKE_CURSOR(PointerStyle::DrawBezier, drawbezier_); + MAKE_CURSOR(PointerStyle::DrawArc, drawarc_); + MAKE_CURSOR(PointerStyle::DrawPie, drawpie_); + MAKE_CURSOR(PointerStyle::DrawCircleCut, drawcirclecut_); + MAKE_CURSOR(PointerStyle::DrawEllipse, drawellipse_); + MAKE_CURSOR(PointerStyle::DrawConnect, drawconnect_); + MAKE_CURSOR(PointerStyle::DrawText, drawtext_); + MAKE_CURSOR(PointerStyle::Mirror, mirror_); + MAKE_CURSOR(PointerStyle::Crook, crook_); + MAKE_CURSOR(PointerStyle::Crop, crop_); + MAKE_CURSOR(PointerStyle::MovePoint, movepoint_); + MAKE_CURSOR(PointerStyle::MoveBezierWeight, movebezierweight_); + MAKE_CURSOR(PointerStyle::DrawFreehand, drawfreehand_); + MAKE_CURSOR(PointerStyle::DrawCaption, drawcaption_); + MAKE_CURSOR(PointerStyle::LinkData, linkdata_); + MAKE_CURSOR(PointerStyle::MoveDataLink, movedlnk_); + MAKE_CURSOR(PointerStyle::CopyDataLink, copydlnk_); + MAKE_CURSOR(PointerStyle::LinkFile, linkfile_); + MAKE_CURSOR(PointerStyle::MoveFileLink, moveflnk_); + MAKE_CURSOR(PointerStyle::CopyFileLink, copyflnk_); + MAKE_CURSOR(PointerStyle::Chart, chart_); + MAKE_CURSOR(PointerStyle::Detective, detective_); + MAKE_CURSOR(PointerStyle::PivotCol, pivotcol_); + MAKE_CURSOR(PointerStyle::PivotRow, pivotrow_); + MAKE_CURSOR(PointerStyle::PivotField, pivotfld_); + MAKE_CURSOR(PointerStyle::PivotDelete, pivotdel_); + MAKE_CURSOR(PointerStyle::Chain, chain_); + MAKE_CURSOR(PointerStyle::ChainNotAllowed, chainnot_); + MAKE_CURSOR(PointerStyle::AutoScrollN, asn_); + MAKE_CURSOR(PointerStyle::AutoScrollS, ass_); + MAKE_CURSOR(PointerStyle::AutoScrollW, asw_); + MAKE_CURSOR(PointerStyle::AutoScrollE, ase_); + MAKE_CURSOR(PointerStyle::AutoScrollNW, asnw_); + MAKE_CURSOR(PointerStyle::AutoScrollNE, asne_); + MAKE_CURSOR(PointerStyle::AutoScrollSW, assw_); + MAKE_CURSOR(PointerStyle::AutoScrollSE, asse_); + MAKE_CURSOR(PointerStyle::AutoScrollNS, asns_); + MAKE_CURSOR(PointerStyle::AutoScrollWE, aswe_); + MAKE_CURSOR(PointerStyle::AutoScrollNSWE, asnswe_); + MAKE_CURSOR(PointerStyle::TextVertical, vertcurs_); + + MAKE_CURSOR(PointerStyle::TabSelectS, tblsels_); + MAKE_CURSOR(PointerStyle::TabSelectE, tblsele_); + MAKE_CURSOR(PointerStyle::TabSelectSE, tblselse_); + MAKE_CURSOR(PointerStyle::TabSelectW, tblselw_); + MAKE_CURSOR(PointerStyle::TabSelectSW, tblselsw_); + + MAKE_CURSOR(PointerStyle::HideWhitespace, hidewhitespace_); + MAKE_CURSOR(PointerStyle::ShowWhitespace, showwhitespace_); + default: + break; } - if( !pCursor ) + if (!pCursor) { - pCursor = new QCursor( Qt::ArrowCursor ); - SAL_WARN( "vcl.qt5", "pointer " << static_cast<int>(ePointerStyle) << "not implemented" ); + pCursor = new QCursor(Qt::ArrowCursor); + SAL_WARN("vcl.qt5", "pointer " << static_cast<int>(ePointerStyle) << "not implemented"); } - m_aCursors[ ePointerStyle ] = pCursor; + m_aCursors[ePointerStyle] = pCursor; } - return *m_aCursors[ ePointerStyle ]; + return *m_aCursors[ePointerStyle]; } +void Qt5Data::ErrorTrapPush() {} -void Qt5Data::ErrorTrapPush() -{ -} - -bool Qt5Data::ErrorTrapPop( bool bIgnoreError ) -{ - return false; -} +bool Qt5Data::ErrorTrapPop(bool bIgnoreError) { return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Data.hxx b/vcl/qt5/Qt5Data.hxx index 75e1a813e1f9..a63d243b6967 100644 --- a/vcl/qt5/Qt5Data.hxx +++ b/vcl/qt5/Qt5Data.hxx @@ -31,13 +31,13 @@ class Qt5Data : public GenericUnixSalData o3tl::enumarray<PointerStyle, QCursor*> m_aCursors; public: - explicit Qt5Data( SalInstance *pInstance ); + explicit Qt5Data(SalInstance* pInstance); virtual ~Qt5Data() override; virtual void ErrorTrapPush() override; - virtual bool ErrorTrapPop( bool bIgnoreError = true ) override; + virtual bool ErrorTrapPop(bool bIgnoreError = true) override; - QCursor& getCursor( PointerStyle ePointerStyle ); + QCursor& getCursor(PointerStyle ePointerStyle); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx index 8ad5e2b0c040..01a45d359600 100644 --- a/vcl/qt5/Qt5Font.cxx +++ b/vcl/qt5/Qt5Font.cxx @@ -19,8 +19,6 @@ #include <qt5/Qt5Font.hxx> -Qt5Font::~Qt5Font() -{ -} +Qt5Font::~Qt5Font() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx index 347f6bb58ba5..6d7074bbbb51 100644 --- a/vcl/qt5/Qt5FontFace.cxx +++ b/vcl/qt5/Qt5FontFace.cxx @@ -31,67 +31,62 @@ using namespace vcl; -Qt5FontFace::Qt5FontFace( const Qt5FontFace& rSrc ) - : PhysicalFontFace( rSrc ) - , m_aFontId( rSrc.m_aFontId ) +Qt5FontFace::Qt5FontFace(const Qt5FontFace& rSrc) + : PhysicalFontFace(rSrc) + , m_aFontId(rSrc.m_aFontId) { - if( rSrc.m_xCharMap.is() ) + if (rSrc.m_xCharMap.is()) m_xCharMap = rSrc.m_xCharMap; } -Qt5FontFace* Qt5FontFace::fromQFont( const QFont &rFont ) +Qt5FontFace* Qt5FontFace::fromQFont(const QFont& rFont) { FontAttributes aFA; - aFA.SetFamilyName( toOUString( rFont.family() ) ); - aFA.SetStyleName( toOUString( rFont.styleName() ) ); - aFA.SetItalic( rFont.italic() ? ITALIC_NORMAL : ITALIC_NONE ); + aFA.SetFamilyName(toOUString(rFont.family())); + aFA.SetStyleName(toOUString(rFont.styleName())); + aFA.SetItalic(rFont.italic() ? ITALIC_NORMAL : ITALIC_NONE); - return new Qt5FontFace( aFA, rFont.toString() ) ; + return new Qt5FontFace(aFA, rFont.toString()); } -Qt5FontFace::Qt5FontFace( const FontAttributes& rFA, const QString &rFontID ) - : PhysicalFontFace( rFA ) - , m_aFontId( rFontID ) - , m_bFontCapabilitiesRead( false ) +Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const QString& rFontID) + : PhysicalFontFace(rFA) + , m_aFontId(rFontID) + , m_bFontCapabilitiesRead(false) { } -Qt5FontFace::~Qt5FontFace() -{ -} +Qt5FontFace::~Qt5FontFace() {} -sal_IntPtr Qt5FontFace::GetFontId() const -{ - return reinterpret_cast<sal_IntPtr>( &m_aFontId ); -} +sal_IntPtr Qt5FontFace::GetFontId() const { return reinterpret_cast<sal_IntPtr>(&m_aFontId); } const FontCharMapRef Qt5FontFace::GetFontCharMap() const { - if( m_xCharMap.is() ) + if (m_xCharMap.is()) return m_xCharMap; QFont aFont; - aFont.fromString( m_aFontId ); - QRawFont aRawFont( QRawFont::fromFont( aFont ) ); - QByteArray aCMapTable = aRawFont.fontTable( "cmap" ); - if ( aCMapTable.isEmpty() ) + aFont.fromString(m_aFontId); + QRawFont aRawFont(QRawFont::fromFont(aFont)); + QByteArray aCMapTable = aRawFont.fontTable("cmap"); + if (aCMapTable.isEmpty()) { m_xCharMap = new FontCharMap(); return m_xCharMap; } CmapResult aCmapResult; - if( ParseCMAP( reinterpret_cast<const unsigned char*>( aCMapTable.data() ), - aCMapTable.size(), aCmapResult ) ) - m_xCharMap = new FontCharMap( aCmapResult ); + if (ParseCMAP(reinterpret_cast<const unsigned char*>(aCMapTable.data()), aCMapTable.size(), + aCmapResult)) + m_xCharMap = new FontCharMap(aCmapResult); return m_xCharMap; } -bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const { // read this only once per font - if( m_bFontCapabilitiesRead ) + if (m_bFontCapabilitiesRead) { rFontCapabilities = m_aFontCapabilities; return rFontCapabilities.oUnicodeRange || rFontCapabilities.oCodePageRange; @@ -99,28 +94,23 @@ bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) m_bFontCapabilitiesRead = true; QFont aFont; - aFont.fromString( m_aFontId ); - QRawFont aRawFont( QRawFont::fromFont( aFont ) ); - QByteArray aOS2Table = aRawFont.fontTable( "OS/2" ); - if ( !aOS2Table.isEmpty() ) + aFont.fromString(m_aFontId); + QRawFont aRawFont(QRawFont::fromFont(aFont)); + QByteArray aOS2Table = aRawFont.fontTable("OS/2"); + if (!aOS2Table.isEmpty()) { - vcl::getTTCoverage( m_aFontCapabilities.oUnicodeRange, - m_aFontCapabilities.oCodePageRange, - reinterpret_cast<const unsigned char*>( aOS2Table.data() ), - aOS2Table.size() ); + vcl::getTTCoverage(m_aFontCapabilities.oUnicodeRange, m_aFontCapabilities.oCodePageRange, + reinterpret_cast<const unsigned char*>(aOS2Table.data()), + aOS2Table.size()); } rFontCapabilities = m_aFontCapabilities; return rFontCapabilities.oUnicodeRange || rFontCapabilities.oCodePageRange; } -PhysicalFontFace* Qt5FontFace::Clone() const -{ - return new Qt5FontFace( *this ); -} +PhysicalFontFace* Qt5FontFace::Clone() const { return new Qt5FontFace(*this); } -LogicalFontInstance* Qt5FontFace::CreateFontInstance( const FontSelectPattern& rFSD ) const +LogicalFontInstance* Qt5FontFace::CreateFontInstance(const FontSelectPattern& rFSD) const { - return new LogicalFontInstance( rFSD ); + return new LogicalFontInstance(rFSD); } - diff --git a/vcl/qt5/Qt5FontFace.hxx b/vcl/qt5/Qt5FontFace.hxx index 7cfbdf8be702..259b95939556 100644 --- a/vcl/qt5/Qt5FontFace.hxx +++ b/vcl/qt5/Qt5FontFace.hxx @@ -34,29 +34,29 @@ class QFont; class Qt5FontFace : public PhysicalFontFace { public: - virtual ~Qt5FontFace() override; + virtual ~Qt5FontFace() override; - static Qt5FontFace* fromQFont( const QFont &rFont ); + static Qt5FontFace* fromQFont(const QFont& rFont); - PhysicalFontFace* Clone() const override; - LogicalFontInstance* CreateFontInstance( const FontSelectPattern& ) const override; - sal_IntPtr GetFontId() const override; + PhysicalFontFace* Clone() const override; + LogicalFontInstance* CreateFontInstance(const FontSelectPattern&) const override; + sal_IntPtr GetFontId() const override; - int GetFontTable( const char pTagName[5], unsigned char* ) const; + int GetFontTable(const char pTagName[5], unsigned char*) const; - const FontCharMapRef GetFontCharMap() const; - bool GetFontCapabilities( vcl::FontCapabilities &rFontCapabilities ) const; - bool HasChar( sal_uInt32 cChar ) const; + const FontCharMapRef GetFontCharMap() const; + bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const; + bool HasChar(sal_uInt32 cChar) const; protected: - Qt5FontFace( const Qt5FontFace& ); - Qt5FontFace( const FontAttributes& rFA, const QString &rFontID ); + Qt5FontFace(const Qt5FontFace&); + Qt5FontFace(const FontAttributes& rFA, const QString& rFontID); private: - const QString m_aFontId; - mutable FontCharMapRef m_xCharMap; - mutable vcl::FontCapabilities m_aFontCapabilities; - mutable bool m_bFontCapabilitiesRead; + const QString m_aFontId; + mutable FontCharMapRef m_xCharMap; + mutable vcl::FontCapabilities m_aFontCapabilities; + mutable bool m_bFontCapabilitiesRead; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index fa28ae55eaf2..3f2ea2da7ba3 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -39,30 +39,30 @@ #include <cairo.h> #include <headless/svpgdi.hxx> -static void SvpDamageHandler( void *handle, - sal_Int32 nExtentsX, sal_Int32 nExtentsY, - sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight ) +static void SvpDamageHandler(void* handle, sal_Int32 nExtentsX, sal_Int32 nExtentsY, + sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) { - Qt5Frame* pThis = static_cast< Qt5Frame* >( handle ); - pThis->Damage( nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight ); + Qt5Frame* pThis = static_cast<Qt5Frame*>(handle); + pThis->Damage(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight); } -Qt5Frame::Qt5Frame( Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo ) - : m_bUseCairo( bUseCairo ) - , m_bGraphicsInUse( false ) - , m_ePointerStyle( PointerStyle::Arrow ) - , m_bDefaultSize( true ) - , m_bDefaultPos( true ) +Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) + : m_bUseCairo(bUseCairo) + , m_bGraphicsInUse(false) + , m_ePointerStyle(PointerStyle::Arrow) + , m_bDefaultSize(true) + , m_bDefaultPos(true) { - Qt5Instance *pInst = static_cast<Qt5Instance*>( GetSalData()->m_pInstance ); - pInst->insertFrame( this ); + Qt5Instance* pInst = static_cast<Qt5Instance*>(GetSalData()->m_pInstance); + pInst->insertFrame(this); m_aDamageHandler.handle = this; m_aDamageHandler.damaged = ::SvpDamageHandler; - if( nStyle & SalFrameStyleFlags::DEFAULT ) // ensure default style + if (nStyle & SalFrameStyleFlags::DEFAULT) // ensure default style { - nStyle |= SalFrameStyleFlags::MOVEABLE | SalFrameStyleFlags::SIZEABLE | SalFrameStyleFlags::CLOSEABLE; + nStyle |= SalFrameStyleFlags::MOVEABLE | SalFrameStyleFlags::SIZEABLE + | SalFrameStyleFlags::CLOSEABLE; nStyle &= ~SalFrameStyleFlags::FLOAT; } @@ -70,131 +70,127 @@ Qt5Frame::Qt5Frame( Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo m_pParent = pParent; Qt::WindowFlags aWinFlags; - if ( !(nStyle & SalFrameStyleFlags::SYSTEMCHILD) ) + if (!(nStyle & SalFrameStyleFlags::SYSTEMCHILD)) { - if( nStyle & SalFrameStyleFlags::INTRO ) + if (nStyle & SalFrameStyleFlags::INTRO) aWinFlags |= Qt::SplashScreen; - else if( nStyle & (SalFrameStyleFlags::FLOAT | - SalFrameStyleFlags::TOOLTIP) ) + else if (nStyle & (SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::TOOLTIP)) aWinFlags |= Qt::ToolTip; - else if( (nStyle & SalFrameStyleFlags::FLOAT) && - ! (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) ) + else if ((nStyle & SalFrameStyleFlags::FLOAT) + && !(nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION)) aWinFlags |= Qt::Popup; - else if( nStyle & SalFrameStyleFlags::DIALOG && pParent ) + else if (nStyle & SalFrameStyleFlags::DIALOG && pParent) aWinFlags |= Qt::Dialog; - else if( nStyle & SalFrameStyleFlags::TOOLWINDOW ) + else if (nStyle & SalFrameStyleFlags::TOOLWINDOW) aWinFlags |= Qt::Tool; - else if( (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) ) + else if ((nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION)) aWinFlags |= Qt::Window | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus; else aWinFlags |= Qt::Window; } - m_pQWidget.reset( new Qt5Widget( *this, pParent ? pParent->GetQWidget() : nullptr, aWinFlags ) ); + m_pQWidget.reset(new Qt5Widget(*this, pParent ? pParent->GetQWidget() : nullptr, aWinFlags)); if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG)) { - QWindow *pParentWindow = pParent->GetQWidget()->window()->windowHandle(); - QWindow *pChildWindow = m_pQWidget->window()->windowHandle(); - if ( pParentWindow != pChildWindow ) - pChildWindow->setTransientParent( pParentWindow ); + QWindow* pParentWindow = pParent->GetQWidget()->window()->windowHandle(); + QWindow* pChildWindow = m_pQWidget->window()->windowHandle(); + if (pParentWindow != pChildWindow) + pChildWindow->setTransientParent(pParentWindow); } } Qt5Frame::~Qt5Frame() { - Qt5Instance *pInst = static_cast<Qt5Instance*>( GetSalData()->m_pInstance ); - pInst->eraseFrame( this ); + Qt5Instance* pInst = static_cast<Qt5Instance*>(GetSalData()->m_pInstance); + pInst->eraseFrame(this); } -void Qt5Frame::Damage( sal_Int32 nExtentsX, sal_Int32 nExtentsY, - sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) const +void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth, + sal_Int32 nExtentsHeight) const { - m_pQWidget->update( nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight ); + m_pQWidget->update(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight); } void Qt5Frame::TriggerPaintEvent() { - QSize aSize( m_pQWidget->size() ); - SalPaintEvent aPaintEvt( 0, 0, aSize.width(), aSize.height(), true ); - CallCallback( SalEvent::Paint, &aPaintEvt ); + QSize aSize(m_pQWidget->size()); + SalPaintEvent aPaintEvt(0, 0, aSize.width(), aSize.height(), true); + CallCallback(SalEvent::Paint, &aPaintEvt); } -void Qt5Frame::TriggerPaintEvent( QRect aRect ) +void Qt5Frame::TriggerPaintEvent(QRect aRect) { - SalPaintEvent aPaintEvt( aRect.x(), aRect.y(), - aRect.width(), aRect.height(), true ); - CallCallback( SalEvent::Paint, &aPaintEvt ); + SalPaintEvent aPaintEvt(aRect.x(), aRect.y(), aRect.width(), aRect.height(), true); + CallCallback(SalEvent::Paint, &aPaintEvt); } SalGraphics* Qt5Frame::AcquireGraphics() { - if( m_bGraphicsInUse ) + if (m_bGraphicsInUse) return nullptr; m_bGraphicsInUse = true; - if( m_bUseCairo ) + if (m_bUseCairo) { - if( !m_pSvpGraphics.get() ) + if (!m_pSvpGraphics.get()) { int width = m_pQWidget->size().width(); int height = m_pQWidget->size().height(); - m_pSvpGraphics.reset( new SvpSalGraphics() ); - m_pSurface.reset( cairo_image_surface_create( CAIRO_FORMAT_ARGB32, width, height )); - m_pSvpGraphics->setSurface( m_pSurface.get(), basegfx::B2IVector(width, height) ); - cairo_surface_set_user_data( m_pSurface.get(), SvpSalGraphics::getDamageKey(), - &m_aDamageHandler, nullptr ); + m_pSvpGraphics.reset(new SvpSalGraphics()); + m_pSurface.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height)); + m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width, height)); + cairo_surface_set_user_data(m_pSurface.get(), SvpSalGraphics::getDamageKey(), + &m_aDamageHandler, nullptr); TriggerPaintEvent(); } return m_pSvpGraphics.get(); } else { - if( !m_pQt5Graphics.get() ) + if (!m_pQt5Graphics.get()) { - m_pQt5Graphics.reset( new Qt5Graphics( this ) ); - m_pQImage.reset( new QImage( m_pQWidget->size(), Qt5_DefaultFormat32 ) ); - m_pQt5Graphics->ChangeQImage( m_pQImage.get() ); + m_pQt5Graphics.reset(new Qt5Graphics(this)); + m_pQImage.reset(new QImage(m_pQWidget->size(), Qt5_DefaultFormat32)); + m_pQt5Graphics->ChangeQImage(m_pQImage.get()); TriggerPaintEvent(); } return m_pQt5Graphics.get(); } } -void Qt5Frame::ReleaseGraphics( SalGraphics* pSalGraph ) +void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph) { - (void) pSalGraph; - if( m_bUseCairo ) - assert( pSalGraph == m_pSvpGraphics.get() ); + (void)pSalGraph; + if (m_bUseCairo) + assert(pSalGraph == m_pSvpGraphics.get()); else - assert( pSalGraph == m_pQt5Graphics.get() ); + assert(pSalGraph == m_pQt5Graphics.get()); m_bGraphicsInUse = false; } -bool Qt5Frame::PostEvent( ImplSVEvent* pData ) +bool Qt5Frame::PostEvent(ImplSVEvent* pData) { - Qt5Instance *pInst = static_cast<Qt5Instance*>( GetSalData()->m_pInstance ); - pInst->PostEvent( this, pData, SalEvent::UserEvent ); + Qt5Instance* pInst = static_cast<Qt5Instance*>(GetSalData()->m_pInstance); + pInst->PostEvent(this, pData, SalEvent::UserEvent); return true; } -void Qt5Frame::SetTitle( const OUString& rTitle ) +void Qt5Frame::SetTitle(const OUString& rTitle) { - m_pQWidget->window()->setWindowTitle( toQString( rTitle ) ); + m_pQWidget->window()->setWindowTitle(toQString(rTitle)); } -void Qt5Frame::SetIcon( sal_uInt16 nIcon ) +void Qt5Frame::SetIcon(sal_uInt16 nIcon) { - if( m_nStyle & (SalFrameStyleFlags::PLUG | - SalFrameStyleFlags::SYSTEMCHILD | - SalFrameStyleFlags::FLOAT | - SalFrameStyleFlags::INTRO | - SalFrameStyleFlags::OWNERDRAWDECORATION) - || !m_pQWidget->isWindow() ) + if (m_nStyle & (SalFrameStyleFlags::PLUG | SalFrameStyleFlags::SYSTEMCHILD + | SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::INTRO + | SalFrameStyleFlags::OWNERDRAWDECORATION) + || !m_pQWidget->isWindow()) return; - const char * appicon; + const char* appicon; if (nIcon == SV_ICON_ID_TEXT) appicon = "libreoffice-writer"; @@ -211,91 +207,83 @@ void Qt5Frame::SetIcon( sal_uInt16 nIcon ) else appicon = "libreoffice-startcenter"; - QIcon aIcon = QIcon::fromTheme( appicon ); - m_pQWidget->window()->setWindowIcon( aIcon ); + QIcon aIcon = QIcon::fromTheme(appicon); + m_pQWidget->window()->setWindowIcon(aIcon); } -void Qt5Frame::SetMenu( SalMenu* pMenu ) -{ -} +void Qt5Frame::SetMenu(SalMenu* pMenu) {} -void Qt5Frame::DrawMenuBar() -{ -} +void Qt5Frame::DrawMenuBar() {} -void Qt5Frame::SetExtendedFrameStyle( SalExtStyle nExtStyle ) -{ -} +void Qt5Frame::SetExtendedFrameStyle(SalExtStyle nExtStyle) {} -void Qt5Frame::Show( bool bVisible, bool bNoActivate ) +void Qt5Frame::Show(bool bVisible, bool bNoActivate) { - assert( m_pQWidget.get() ); - m_pQWidget->setVisible( bVisible ); + assert(m_pQWidget.get()); + m_pQWidget->setVisible(bVisible); } -void Qt5Frame::SetMinClientSize( long nWidth, long nHeight ) +void Qt5Frame::SetMinClientSize(long nWidth, long nHeight) { - if( ! isChild() ) - m_pQWidget->setMinimumSize( nWidth, nHeight ); + if (!isChild()) + m_pQWidget->setMinimumSize(nWidth, nHeight); } -void Qt5Frame::SetMaxClientSize( long nWidth, long nHeight ) +void Qt5Frame::SetMaxClientSize(long nWidth, long nHeight) { - if( ! isChild() ) - m_pQWidget->setMaximumSize( nWidth, nHeight ); + if (!isChild()) + m_pQWidget->setMaximumSize(nWidth, nHeight); } void Qt5Frame::Center() { - if ( m_pParent ) + if (m_pParent) { - QWidget *pWindow = m_pParent->GetQWidget()->window(); - m_pQWidget->move( - pWindow->frameGeometry().topLeft() + - pWindow->rect().center() - m_pQWidget->rect().center() ); + QWidget* pWindow = m_pParent->GetQWidget()->window(); + m_pQWidget->move(pWindow->frameGeometry().topLeft() + pWindow->rect().center() + - m_pQWidget->rect().center()); } } Size Qt5Frame::CalcDefaultSize() { - assert( m_pQWidget->isWindow() ); - QScreen *pScreen = m_pQWidget->windowHandle()->screen(); - if( !pScreen ) + assert(m_pQWidget->isWindow()); + QScreen* pScreen = m_pQWidget->windowHandle()->screen(); + if (!pScreen) return Size(); - return bestmaxFrameSizeForScreenSize( toSize( pScreen->size() ) ); + return bestmaxFrameSizeForScreenSize(toSize(pScreen->size())); } void Qt5Frame::SetDefaultSize() { Size aDefSize = CalcDefaultSize(); - SetPosSize( 0, 0, aDefSize.Width(), aDefSize.Height(), - SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT ); + SetPosSize(0, 0, aDefSize.Width(), aDefSize.Height(), + SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); } -void Qt5Frame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) +void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags) { - if( !m_pQWidget->isWindow() || isChild( true, false ) ) + if (!m_pQWidget->isWindow() || isChild(true, false)) return; - - if( (nFlags & ( SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT )) && - (nWidth > 0 && nHeight > 0 ) // sometimes stupid things happen - ) + if ((nFlags & (SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT)) + && (nWidth > 0 && nHeight > 0) // sometimes stupid things happen + ) { m_bDefaultSize = false; - if( isChild( false ) || !m_pQWidget->isMaximized() ) + if (isChild(false) || !m_pQWidget->isMaximized()) { - m_pQWidget->resize( nWidth, nHeight ); + m_pQWidget->resize(nWidth, nHeight); } } - else if( m_bDefaultSize ) + else if (m_bDefaultSize) SetDefaultSize(); m_bDefaultSize = false; - if( nFlags & ( SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y ) ) + if (nFlags & (SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y)) { - if( m_pParent ) + if (m_pParent) { QRect aRect = m_pParent->GetQWidget()->geometry(); nX += aRect.x(); @@ -303,92 +291,87 @@ void Qt5Frame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt } m_bDefaultPos = false; - m_pQWidget->move( nX, nY ); + m_pQWidget->move(nX, nY); } - else if( m_bDefaultPos ) + else if (m_bDefaultPos) Center(); m_bDefaultPos = false; } -void Qt5Frame::GetClientSize( long& rWidth, long& rHeight ) +void Qt5Frame::GetClientSize(long& rWidth, long& rHeight) { rWidth = m_pQWidget->width(); rHeight = m_pQWidget->height(); } -void Qt5Frame::GetWorkArea( tools::Rectangle& rRect ) +void Qt5Frame::GetWorkArea(tools::Rectangle& rRect) { - if( !m_pQWidget->isWindow() ) + if (!m_pQWidget->isWindow()) return; - QScreen *pScreen = m_pQWidget->windowHandle()->screen(); - if( !pScreen ) + QScreen* pScreen = m_pQWidget->windowHandle()->screen(); + if (!pScreen) return; QSize aSize = pScreen->availableVirtualSize(); - rRect = tools::Rectangle( 0, 0, aSize.width(), aSize.height() ); + rRect = tools::Rectangle(0, 0, aSize.width(), aSize.height()); } -SalFrame* Qt5Frame::GetParent() const -{ - return m_pParent; -} +SalFrame* Qt5Frame::GetParent() const { return m_pParent; } -void Qt5Frame::SetWindowState( const SalFrameState* pState ) +void Qt5Frame::SetWindowState(const SalFrameState* pState) { - if( !m_pQWidget->isWindow() || !pState || isChild( true, false ) ) + if (!m_pQWidget->isWindow() || !pState || isChild(true, false)) return; - const WindowStateMask nMaxGeometryMask = - WindowStateMask::X | WindowStateMask::Y | - WindowStateMask::Width | WindowStateMask::Height | - WindowStateMask::MaximizedX | WindowStateMask::MaximizedY | - WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight; + const WindowStateMask nMaxGeometryMask + = WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width | WindowStateMask::Height + | WindowStateMask::MaximizedX | WindowStateMask::MaximizedY + | WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight; - if( (pState->mnMask & WindowStateMask::State) && - (pState->mnState & WindowStateState::Maximized) && - (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask ) + if ((pState->mnMask & WindowStateMask::State) && (pState->mnState & WindowStateState::Maximized) + && (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask) m_pQWidget->showMaximized(); - else if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y | - WindowStateMask::Width | WindowStateMask::Height ) ) + else if (pState->mnMask & (WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width + | WindowStateMask::Height)) { sal_uInt16 nPosSizeFlags = 0; QPoint aPos = m_pQWidget->pos(); QPoint aParentPos; - if( m_pParent ) + if (m_pParent) aParentPos = m_pParent->GetQWidget()->window()->pos(); long nX = pState->mnX - aParentPos.x(); long nY = pState->mnY - aParentPos.y(); - if( pState->mnMask & WindowStateMask::X ) + if (pState->mnMask & WindowStateMask::X) nPosSizeFlags |= SAL_FRAME_POSSIZE_X; else nX = aPos.x() - aParentPos.x(); - if( pState->mnMask & WindowStateMask::Y ) + if (pState->mnMask & WindowStateMask::Y) nPosSizeFlags |= SAL_FRAME_POSSIZE_Y; else nY = aPos.y() - aParentPos.y(); - if( pState->mnMask & WindowStateMask::Width ) + if (pState->mnMask & WindowStateMask::Width) nPosSizeFlags |= SAL_FRAME_POSSIZE_WIDTH; - if( pState->mnMask & WindowStateMask::Height ) + if (pState->mnMask & WindowStateMask::Height) nPosSizeFlags |= SAL_FRAME_POSSIZE_HEIGHT; - SetPosSize( nX, nY, pState->mnWidth, pState->mnHeight, nPosSizeFlags ); + SetPosSize(nX, nY, pState->mnWidth, pState->mnHeight, nPosSizeFlags); } - else if( pState->mnMask & WindowStateMask::State && ! isChild() ) + else if (pState->mnMask & WindowStateMask::State && !isChild()) { - if( (pState->mnState & WindowStateState::Minimized) && m_pQWidget->isWindow() ) + if ((pState->mnState & WindowStateState::Minimized) && m_pQWidget->isWindow()) m_pQWidget->showMinimized(); else m_pQWidget->showNormal(); } } -bool Qt5Frame::GetWindowState( SalFrameState* pState ) +bool Qt5Frame::GetWindowState(SalFrameState* pState) { pState->mnState = WindowStateState::Normal; - pState->mnMask = WindowStateMask::State; - if( m_pQWidget->isMinimized() || !m_pQWidget->windowHandle() ) + pState->mnMask = WindowStateMask::State; + if (m_pQWidget->isMinimized() || !m_pQWidget->windowHandle()) pState->mnState |= WindowStateState::Minimized; - else if( m_pQWidget->isMaximized() ) + else if (m_pQWidget->isMaximized()) { pState->mnState |= WindowStateState::Maximized; } @@ -399,147 +382,89 @@ bool Qt5Frame::GetWindowState( SalFrameState* pState ) pState->mnY = rect.y(); pState->mnWidth = rect.width(); pState->mnHeight = rect.height(); - pState->mnMask |= WindowStateMask::X | - WindowStateMask::Y | - WindowStateMask::Width | - WindowStateMask::Height; + pState->mnMask |= WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width + | WindowStateMask::Height; } - return true; } -void Qt5Frame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) -{ -} +void Qt5Frame::ShowFullScreen(bool bFullScreen, sal_Int32 nDisplay) {} -void Qt5Frame::StartPresentation( bool bStart ) -{ -} +void Qt5Frame::StartPresentation(bool bStart) {} -void Qt5Frame::SetAlwaysOnTop( bool bOnTop ) -{ -} +void Qt5Frame::SetAlwaysOnTop(bool bOnTop) {} -void Qt5Frame::ToTop( SalFrameToTop nFlags ) -{ -} +void Qt5Frame::ToTop(SalFrameToTop nFlags) {} -void Qt5Frame::SetPointer( PointerStyle ePointerStyle ) +void Qt5Frame::SetPointer(PointerStyle ePointerStyle) { - QWindow *pWindow = m_pQWidget->window()->windowHandle(); - if( !pWindow ) + QWindow* pWindow = m_pQWidget->window()->windowHandle(); + if (!pWindow) return; - if( ePointerStyle == m_ePointerStyle ) + if (ePointerStyle == m_ePointerStyle) return; m_ePointerStyle = ePointerStyle; - pWindow->setCursor( static_cast<Qt5Data*>( GetSalData() )->getCursor( ePointerStyle ) ); + pWindow->setCursor(static_cast<Qt5Data*>(GetSalData())->getCursor(ePointerStyle)); } -void Qt5Frame::CaptureMouse( bool bMouse ) -{ -} +void Qt5Frame::CaptureMouse(bool bMouse) {} -void Qt5Frame::SetPointerPos( long nX, long nY ) -{ -} +void Qt5Frame::SetPointerPos(long nX, long nY) {} -void Qt5Frame::Flush() -{ -} +void Qt5Frame::Flush() {} -void Qt5Frame::Flush( const tools::Rectangle& rRect ) -{ -} +void Qt5Frame::Flush(const tools::Rectangle& rRect) {} -void Qt5Frame::SetInputContext( SalInputContext* pContext ) -{ -} +void Qt5Frame::SetInputContext(SalInputContext* pContext) {} -void Qt5Frame::EndExtTextInput( EndExtTextInputFlags nFlags ) -{ -} +void Qt5Frame::EndExtTextInput(EndExtTextInputFlags nFlags) {} -OUString Qt5Frame::GetKeyName( sal_uInt16 nKeyCode ) -{ - return OUString(); -} +OUString Qt5Frame::GetKeyName(sal_uInt16 nKeyCode) { return OUString(); } -bool Qt5Frame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) +bool Qt5Frame::MapUnicodeToKeyCode(sal_Unicode aUnicode, LanguageType aLangType, + vcl::KeyCode& rKeyCode) { return false; } -LanguageType Qt5Frame::GetInputLanguage() -{ - return LANGUAGE_DONTKNOW; -} +LanguageType Qt5Frame::GetInputLanguage() { return LANGUAGE_DONTKNOW; } -void Qt5Frame::UpdateSettings( AllSettings& rSettings ) -{ -} +void Qt5Frame::UpdateSettings(AllSettings& rSettings) {} -void Qt5Frame::Beep() -{ -} +void Qt5Frame::Beep() {} -const SystemEnvData* Qt5Frame::GetSystemData() const -{ - return nullptr; -} +const SystemEnvData* Qt5Frame::GetSystemData() const { return nullptr; } SalFrame::SalPointerState Qt5Frame::GetPointerState() { SalPointerState aState; QPoint pos = QCursor::pos(); - aState.maPos = Point( pos.x(), pos.y() ); - aState.mnState = GetMouseModCode( qApp->mouseButtons() ) | - GetKeyModCode( qApp->keyboardModifiers() ); + aState.maPos = Point(pos.x(), pos.y()); + aState.mnState + = GetMouseModCode(qApp->mouseButtons()) | GetKeyModCode(qApp->keyboardModifiers()); return aState; } -KeyIndicatorState Qt5Frame::GetIndicatorState() -{ - return KeyIndicatorState(); -} +KeyIndicatorState Qt5Frame::GetIndicatorState() { return KeyIndicatorState(); } -void Qt5Frame::SimulateKeyPress( sal_uInt16 nKeyCode ) -{ -} +void Qt5Frame::SimulateKeyPress(sal_uInt16 nKeyCode) {} -void Qt5Frame::SetParent( SalFrame* pNewParent ) -{ - m_pParent = static_cast< Qt5Frame* >( pNewParent ); -} +void Qt5Frame::SetParent(SalFrame* pNewParent) { m_pParent = static_cast<Qt5Frame*>(pNewParent); } -bool Qt5Frame::SetPluginParent( SystemParentData* pNewParent ) -{ - return false; -} +bool Qt5Frame::SetPluginParent(SystemParentData* pNewParent) { return false; } -void Qt5Frame::ResetClipRegion() -{ -} +void Qt5Frame::ResetClipRegion() {} -void Qt5Frame::BeginSetClipRegion( sal_uLong nRects ) -{ -} +void Qt5Frame::BeginSetClipRegion(sal_uLong nRects) {} -void Qt5Frame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) -{ -} +void Qt5Frame::UnionClipRegion(long nX, long nY, long nWidth, long nHeight) {} -void Qt5Frame::EndSetClipRegion() -{ -} +void Qt5Frame::EndSetClipRegion() {} -void Qt5Frame::SetScreenNumber( unsigned int ) -{ -} +void Qt5Frame::SetScreenNumber(unsigned int) {} -void Qt5Frame::SetApplicationID(const OUString &) -{ -} +void Qt5Frame::SetApplicationID(const OUString&) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Frame.hxx b/vcl/qt5/Qt5Frame.hxx index 5863c925a83b..b5f31387b3e2 100644 --- a/vcl/qt5/Qt5Frame.hxx +++ b/vcl/qt5/Qt5Frame.hxx @@ -33,106 +33,104 @@ class QPaintDevice; class QImage; class SvpSalGraphics; -class Qt5Frame - : public SalFrame +class Qt5Frame : public SalFrame { friend class Qt5Widget; - std::unique_ptr< QWidget > m_pQWidget; + std::unique_ptr<QWidget> m_pQWidget; - const bool m_bUseCairo; - std::unique_ptr< QImage > m_pQImage; - std::unique_ptr< Qt5Graphics > m_pQt5Graphics; - UniqueCairoSurface m_pSurface; - std::unique_ptr< SvpSalGraphics> m_pSvpGraphics; - DamageHandler m_aDamageHandler; + const bool m_bUseCairo; + std::unique_ptr<QImage> m_pQImage; + std::unique_ptr<Qt5Graphics> m_pQt5Graphics; + UniqueCairoSurface m_pSurface; + std::unique_ptr<SvpSalGraphics> m_pSvpGraphics; + DamageHandler m_aDamageHandler; - bool m_bGraphicsInUse; - SalFrameStyleFlags m_nStyle; - Qt5Frame *m_pParent; - PointerStyle m_ePointerStyle; + bool m_bGraphicsInUse; + SalFrameStyleFlags m_nStyle; + Qt5Frame* m_pParent; + PointerStyle m_ePointerStyle; - bool m_bDefaultSize; - bool m_bDefaultPos; + bool m_bDefaultSize; + bool m_bDefaultPos; - void Center(); - Size CalcDefaultSize(); - void SetDefaultSize(); + void Center(); + Size CalcDefaultSize(); + void SetDefaultSize(); - bool isChild( bool bPlug = true, bool bSysChild = true ) + bool isChild(bool bPlug = true, bool bSysChild = true) { SalFrameStyleFlags nMask = SalFrameStyleFlags::NONE; - if( bPlug ) + if (bPlug) nMask |= SalFrameStyleFlags::PLUG; - if( bSysChild ) + if (bSysChild) nMask |= SalFrameStyleFlags::SYSTEMCHILD; return bool(m_nStyle & nMask); } void TriggerPaintEvent(); - void TriggerPaintEvent( QRect aRect ); + void TriggerPaintEvent(QRect aRect); public: - Qt5Frame( Qt5Frame* pParent, - SalFrameStyleFlags nSalFrameStyle, - bool bUseCairo ); + Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nSalFrameStyle, bool bUseCairo); virtual ~Qt5Frame() override; QWidget* GetQWidget() const { return m_pQWidget.get(); } - void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, - sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) const; - - virtual SalGraphics* AcquireGraphics() override; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; - - virtual bool PostEvent(ImplSVEvent* pData) override; - - virtual void SetTitle( const OUString& rTitle ) override; - virtual void SetIcon( sal_uInt16 nIcon ) override; - virtual void SetMenu( SalMenu* pMenu ) override; - virtual void DrawMenuBar() override; - - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override; - virtual void Show( bool bVisible, bool bNoActivate = false ) override; - virtual void SetMinClientSize( long nWidth, long nHeight ) override; - virtual void SetMaxClientSize( long nWidth, long nHeight ) override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override; - virtual void GetClientSize( long& rWidth, long& rHeight ) override; - virtual void GetWorkArea( tools::Rectangle& rRect ) override; - virtual SalFrame* GetParent() const override; - virtual void SetWindowState( const SalFrameState* pState ) override; - virtual bool GetWindowState( SalFrameState* pState ) override; - virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override; - virtual void StartPresentation( bool bStart ) override; - virtual void SetAlwaysOnTop( bool bOnTop ) override; - virtual void ToTop( SalFrameToTop nFlags ) override; - virtual void SetPointer( PointerStyle ePointerStyle ) override; - virtual void CaptureMouse( bool bMouse ) override; - virtual void SetPointerPos( long nX, long nY ) override; - virtual void Flush() override; - virtual void Flush( const tools::Rectangle& rRect ) override; - virtual void SetInputContext( SalInputContext* pContext ) override; - virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override; - virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override; - virtual LanguageType GetInputLanguage() override; - virtual void UpdateSettings( AllSettings& rSettings ) override; - virtual void Beep() override; + void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth, + sal_Int32 nExtentsHeight) const; + + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics(SalGraphics* pGraphics) override; + + virtual bool PostEvent(ImplSVEvent* pData) override; + + virtual void SetTitle(const OUString& rTitle) override; + virtual void SetIcon(sal_uInt16 nIcon) override; + virtual void SetMenu(SalMenu* pMenu) override; + virtual void DrawMenuBar() override; + + virtual void SetExtendedFrameStyle(SalExtStyle nExtStyle) override; + virtual void Show(bool bVisible, bool bNoActivate = false) override; + virtual void SetMinClientSize(long nWidth, long nHeight) override; + virtual void SetMaxClientSize(long nWidth, long nHeight) override; + virtual void SetPosSize(long nX, long nY, long nWidth, long nHeight, + sal_uInt16 nFlags) override; + virtual void GetClientSize(long& rWidth, long& rHeight) override; + virtual void GetWorkArea(tools::Rectangle& rRect) override; + virtual SalFrame* GetParent() const override; + virtual void SetWindowState(const SalFrameState* pState) override; + virtual bool GetWindowState(SalFrameState* pState) override; + virtual void ShowFullScreen(bool bFullScreen, sal_Int32 nDisplay) override; + virtual void StartPresentation(bool bStart) override; + virtual void SetAlwaysOnTop(bool bOnTop) override; + virtual void ToTop(SalFrameToTop nFlags) override; + virtual void SetPointer(PointerStyle ePointerStyle) override; + virtual void CaptureMouse(bool bMouse) override; + virtual void SetPointerPos(long nX, long nY) override; + virtual void Flush() override; + virtual void Flush(const tools::Rectangle& rRect) override; + virtual void SetInputContext(SalInputContext* pContext) override; + virtual void EndExtTextInput(EndExtTextInputFlags nFlags) override; + virtual OUString GetKeyName(sal_uInt16 nKeyCode) override; + virtual bool MapUnicodeToKeyCode(sal_Unicode aUnicode, LanguageType aLangType, + vcl::KeyCode& rKeyCode) override; + virtual LanguageType GetInputLanguage() override; + virtual void UpdateSettings(AllSettings& rSettings) override; + virtual void Beep() override; virtual const SystemEnvData* GetSystemData() const override; - virtual SalPointerState GetPointerState() override; - virtual KeyIndicatorState GetIndicatorState() override; - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) override; - virtual void SetParent( SalFrame* pNewParent ) override; - virtual bool SetPluginParent( SystemParentData* pNewParent ) override; - virtual void ResetClipRegion() override; - virtual void BeginSetClipRegion( sal_uLong nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; - virtual void EndSetClipRegion() override; - - virtual void SetScreenNumber( unsigned int ) override; - virtual void SetApplicationID(const OUString &) override; - + virtual SalPointerState GetPointerState() override; + virtual KeyIndicatorState GetIndicatorState() override; + virtual void SimulateKeyPress(sal_uInt16 nKeyCode) override; + virtual void SetParent(SalFrame* pNewParent) override; + virtual bool SetPluginParent(SystemParentData* pNewParent) override; + virtual void ResetClipRegion() override; + virtual void BeginSetClipRegion(sal_uLong nRects) override; + virtual void UnionClipRegion(long nX, long nY, long nWidth, long nHeight) override; + virtual void EndSetClipRegion() override; + + virtual void SetScreenNumber(unsigned int) override; + virtual void SetApplicationID(const OUString&) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx index eae47c5f21e9..72226fbc308f 100644 --- a/vcl/qt5/Qt5Graphics.cxx +++ b/vcl/qt5/Qt5Graphics.cxx @@ -47,68 +47,61 @@ Qt5Graphics::~Qt5Graphics() { // release the text styles for (int i = 0; i < MAX_FALLBACK; ++i) - delete m_pTextStyle[ i ]; + delete m_pTextStyle[i]; } -void Qt5Graphics::ChangeQImage( QImage *pQImage ) +void Qt5Graphics::ChangeQImage(QImage* pQImage) { m_pQImage = pQImage; ResetClipRegion(); } -SalGraphicsImpl* Qt5Graphics::GetImpl() const -{ - return nullptr; -} +SalGraphicsImpl* Qt5Graphics::GetImpl() const { return nullptr; } -SystemGraphicsData Qt5Graphics::GetGraphicsData() const -{ - return SystemGraphicsData(); -} +SystemGraphicsData Qt5Graphics::GetGraphicsData() const { return SystemGraphicsData(); } -bool Qt5Graphics::supportsOperation( OutDevSupportType eType ) const +bool Qt5Graphics::supportsOperation(OutDevSupportType eType) const { - switch( eType ) + switch (eType) { - case OutDevSupportType::B2DDraw: - case OutDevSupportType::TransparentRect: - return true; - default: - return false; + case OutDevSupportType::B2DDraw: + case OutDevSupportType::TransparentRect: + return true; + default: + return false; } } #if ENABLE_CAIRO_CANVAS -bool Qt5Graphics::SupportsCairo() const -{ - return false; -} +bool Qt5Graphics::SupportsCairo() const { return false; } -cairo::SurfaceSharedPtr Qt5Graphics::CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const +cairo::SurfaceSharedPtr +Qt5Graphics::CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const { return nullptr; } -cairo::SurfaceSharedPtr Qt5Graphics::CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const +cairo::SurfaceSharedPtr Qt5Graphics::CreateSurface(const OutputDevice& rRefDevice, int x, int y, + int width, int height) const { return nullptr; } -cairo::SurfaceSharedPtr Qt5Graphics::CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const +cairo::SurfaceSharedPtr Qt5Graphics::CreateBitmapSurface(const OutputDevice& rRefDevice, + const BitmapSystemData& rData, + const Size& rSize) const { return nullptr; } -css::uno::Any Qt5Graphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const +css::uno::Any Qt5Graphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, + const basegfx::B2ISize& rSize) const { return css::uno::Any(); } -SystemFontData Qt5Graphics::GetSysFontData( int nFallbacklevel ) const -{ - return SystemFontData(); -} +SystemFontData Qt5Graphics::GetSysFontData(int nFallbacklevel) const { return SystemFontData(); } #endif diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx index 9ffe2c47e461..daf1ff0bb748 100644 --- a/vcl/qt5/Qt5Graphics.hxx +++ b/vcl/qt5/Qt5Graphics.hxx @@ -39,174 +39,169 @@ class Qt5Graphics : public SalGraphics friend class Qt5Bitmap; friend class Qt5Painter; - Qt5Frame *m_pFrame; - QImage *m_pQImage; - QRegion m_aClipRegion; - QPainterPath m_aClipPath; - SalColor m_aLineColor; - SalColor m_aFillColor; - QPainter::CompositionMode m_eCompositionMode; + Qt5Frame* m_pFrame; + QImage* m_pQImage; + QRegion m_aClipRegion; + QPainterPath m_aClipPath; + SalColor m_aLineColor; + SalColor m_aFillColor; + QPainter::CompositionMode m_eCompositionMode; - PhysicalFontCollection *m_pFontCollection; - const Qt5FontFace *m_pFontData[ MAX_FALLBACK ]; - Qt5Font *m_pTextStyle[ MAX_FALLBACK ]; - SalColor m_aTextColor; + PhysicalFontCollection* m_pFontCollection; + const Qt5FontFace* m_pFontData[MAX_FALLBACK]; + Qt5Font* m_pTextStyle[MAX_FALLBACK]; + SalColor m_aTextColor; - Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage ); + Qt5Graphics(Qt5Frame* pFrame, QImage* pQImage); public: - Qt5Graphics( Qt5Frame *pFrame ) - : Qt5Graphics( pFrame, nullptr ) {} - Qt5Graphics( QImage *pQImage ) - : Qt5Graphics( nullptr, pQImage ) {} + Qt5Graphics(Qt5Frame* pFrame) + : Qt5Graphics(pFrame, nullptr) + { + } + Qt5Graphics(QImage* pQImage) + : Qt5Graphics(nullptr, pQImage) + { + } virtual ~Qt5Graphics() override; - void ChangeQImage( QImage *pImage ); + void ChangeQImage(QImage* pImage); virtual SalGraphicsImpl* GetImpl() const override; virtual SystemGraphicsData GetGraphicsData() const override; - virtual bool supportsOperation( OutDevSupportType ) const override; + virtual bool supportsOperation(OutDevSupportType) const override; #if ENABLE_CAIRO_CANVAS - virtual bool SupportsCairo() const override; - virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override; - virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, - int x, int y, int width, int height) const override; - virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, - const BitmapSystemData& rData, const Size& rSize) const override; - virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, - const basegfx::B2ISize& rSize) const override; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const override; + virtual bool SupportsCairo() const override; + virtual cairo::SurfaceSharedPtr + CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override; + virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, + int width, int height) const override; + virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, + const BitmapSystemData& rData, + const Size& rSize) const override; + virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, + const basegfx::B2ISize& rSize) const override; + virtual SystemFontData GetSysFontData(int nFallbacklevel) const override; #endif // ENABLE_CAIRO_CANVAS // GDI - virtual bool setClipRegion( const vcl::Region& ) override; - virtual void ResetClipRegion() override; - - virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; - virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) override; - virtual bool drawPolyPolygon( const basegfx::B2DPolyPolygon&, double fTransparency ) override; - virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const PolyFlags* pFlgAry ) override; - virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const PolyFlags* pFlgAry ) override; - virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const PolyFlags* const* pFlgAry ) override; - virtual bool drawPolyLine( - const basegfx::B2DPolygon&, - double fTransparency, - const basegfx::B2DVector& rLineWidths, - basegfx::B2DLineJoin, - css::drawing::LineCap eLineCap, - double fMiterMinimumAngle) override; - virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override; - - virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, bool bWindowInvalidate ) override; - - virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; - virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override; - virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap ) override; - virtual void drawMask( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - SalColor nMaskColor ) override; - - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override; - virtual SalColor getPixel( long nX, long nY ) override; - - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override; - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; - - virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override; - - virtual bool blendBitmap( const SalTwoRect&, - const SalBitmap& rBitmap ) override; - - virtual bool blendAlphaBitmap( const SalTwoRect&, - const SalBitmap& rSrcBitmap, - const SalBitmap& rMaskBitmap, - const SalBitmap& rAlphaBitmap ) override; - - virtual bool drawAlphaBitmap( const SalTwoRect&, - const SalBitmap& rSourceBitmap, - const SalBitmap& rAlphaBitmap ) override; - - bool drawTransformedBitmap( - const basegfx::B2DPoint& rNull, - const basegfx::B2DPoint& rX, - const basegfx::B2DPoint& rY, - const SalBitmap& rSourceBitmap, - const SalBitmap* pAlphaBitmap) override; - - virtual bool drawAlphaRect( long nX, long nY, long nWidth, - long nHeight, sal_uInt8 nTransparency ) override; - - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; - virtual sal_uInt16 GetBitCount() const override; - virtual long GetGraphicsWidth() const override; - - virtual void SetLineColor() override; - virtual void SetLineColor( SalColor nSalColor ) override; - virtual void SetFillColor() override; - virtual void SetFillColor( SalColor nSalColor ) override; - virtual void SetXORMode( bool bSet ) override; - virtual void SetROPLineColor( SalROPColor nROPColor ) override; - virtual void SetROPFillColor( SalROPColor nROPColor ) override; + virtual bool setClipRegion(const vcl::Region&) override; + virtual void ResetClipRegion() override; + + virtual void drawPixel(long nX, long nY) override; + virtual void drawPixel(long nX, long nY, SalColor nSalColor) override; + virtual void drawLine(long nX1, long nY1, long nX2, long nY2) override; + virtual void drawRect(long nX, long nY, long nWidth, long nHeight) override; + virtual void drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry) override; + virtual void drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry) override; + virtual void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints, + PCONSTSALPOINT* pPtAry) override; + virtual bool drawPolyPolygon(const basegfx::B2DPolyPolygon&, double fTransparency) override; + virtual bool drawPolyLineBezier(sal_uInt32 nPoints, const SalPoint* pPtAry, + const PolyFlags* pFlgAry) override; + virtual bool drawPolygonBezier(sal_uInt32 nPoints, const SalPoint* pPtAry, + const PolyFlags* pFlgAry) override; + virtual bool drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints, + const SalPoint* const* pPtAry, + const PolyFlags* const* pFlgAry) override; + virtual bool drawPolyLine(const basegfx::B2DPolygon&, double fTransparency, + const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, + css::drawing::LineCap eLineCap, double fMiterMinimumAngle) override; + virtual bool drawGradient(const tools::PolyPolygon&, const Gradient&) override; + + virtual void copyArea(long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, + long nSrcHeight, bool bWindowInvalidate) override; + + virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override; + virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override; + virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, + const SalBitmap& rTransparentBitmap) override; + virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, + SalColor nMaskColor) override; + + virtual SalBitmap* getBitmap(long nX, long nY, long nWidth, long nHeight) override; + virtual SalColor getPixel(long nX, long nY) override; + + virtual void invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override; + virtual void invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) override; + + virtual bool drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr, + sal_uLong nSize) override; + + virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; + + virtual bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, + const SalBitmap& rMaskBitmap, + const SalBitmap& rAlphaBitmap) override; + + virtual bool drawAlphaBitmap(const SalTwoRect&, const SalBitmap& rSourceBitmap, + const SalBitmap& rAlphaBitmap) override; + + bool drawTransformedBitmap(const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, + const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, + const SalBitmap* pAlphaBitmap) override; + + virtual bool drawAlphaRect(long nX, long nY, long nWidth, long nHeight, + sal_uInt8 nTransparency) override; + + virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override; + virtual sal_uInt16 GetBitCount() const override; + virtual long GetGraphicsWidth() const override; + + virtual void SetLineColor() override; + virtual void SetLineColor(SalColor nSalColor) override; + virtual void SetFillColor() override; + virtual void SetFillColor(SalColor nSalColor) override; + virtual void SetXORMode(bool bSet) override; + virtual void SetROPLineColor(SalROPColor nROPColor) override; + virtual void SetROPFillColor(SalROPColor nROPColor) override; // Text rendering + font support - virtual void SetTextColor( SalColor nSalColor ) override; - virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override; - virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override; + virtual void SetTextColor(SalColor nSalColor) override; + virtual void SetFont(const FontSelectPattern*, int nFallbackLevel) override; + virtual void GetFontMetric(ImplFontMetricDataRef&, int nFallbackLevel) override; virtual const FontCharMapRef GetFontCharMap() const override; - virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; - virtual void GetDevFontList( PhysicalFontCollection* ) override; - virtual void ClearDevFontCache() override; - virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; - virtual bool CreateFontSubset( const OUString& rToFile, - const PhysicalFontFace* pFont, - const sal_GlyphId* pGlyphIds, - const sal_uInt8* pEncoding, - sal_Int32* pWidths, - int nGlyphs, - FontSubsetInfo& rInfo // out parameter - ) override; - - virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; - - virtual void GetGlyphWidths( const PhysicalFontFace*, - bool bVertical, - std::vector< sal_Int32 >& rWidths, - Ucs2UIntMap& rUnicodeEnc ) override; - - virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override; - virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override; - - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; - virtual void DrawTextLayout( const CommonSalLayout& ) override; + virtual bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const override; + virtual void GetDevFontList(PhysicalFontCollection*) override; + virtual void ClearDevFontCache() override; + virtual bool AddTempDevFont(PhysicalFontCollection*, const OUString& rFileURL, + const OUString& rFontName) override; + virtual bool CreateFontSubset(const OUString& rToFile, const PhysicalFontFace* pFont, + const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncoding, + sal_Int32* pWidths, int nGlyphs, + FontSubsetInfo& rInfo // out parameter + ) override; - // Native control support + virtual const void* GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) override; + virtual void FreeEmbedFontData(const void* pData, long nDataLen) override; + + virtual void GetGlyphWidths(const PhysicalFontFace*, bool bVertical, + std::vector<sal_Int32>& rWidths, Ucs2UIntMap& rUnicodeEnc) override; + + virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override; + virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override; - virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) override; - virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, - const Point& aPos, bool& rIsInside ) override; - virtual bool drawNativeControl( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, - ControlState nState, const ImplControlValue& aValue, - const OUString& aCaption ) override; - virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const OUString& aCaption, - tools::Rectangle &rNativeBoundingRegion, - tools::Rectangle &rNativeContentRegion ) override; + virtual SalLayout* GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) override; + virtual void DrawTextLayout(const CommonSalLayout&) override; + + // Native control support + virtual bool IsNativeControlSupported(ControlType nType, ControlPart nPart) override; + virtual bool hitTestNativeControl(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, const Point& aPos, + bool& rIsInside) override; + virtual bool drawNativeControl(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, ControlState nState, + const ImplControlValue& aValue, + const OUString& aCaption) override; + virtual bool getNativeControlRegion(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, ControlState nState, + const ImplControlValue& aValue, const OUString& aCaption, + tools::Rectangle& rNativeBoundingRegion, + tools::Rectangle& rNativeContentRegion) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx index 42b6b3caf729..a55b8dda235a 100644 --- a/vcl/qt5/Qt5Graphics_Controls.cxx +++ b/vcl/qt5/Qt5Graphics_Controls.cxx @@ -19,31 +19,28 @@ #include "Qt5Graphics.hxx" -bool Qt5Graphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) -{ - return false; -} +bool Qt5Graphics::IsNativeControlSupported(ControlType nType, ControlPart nPart) { return false; } -bool Qt5Graphics::hitTestNativeControl( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, - const Point& aPos, bool& rIsInside ) +bool Qt5Graphics::hitTestNativeControl(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, const Point& aPos, + bool& rIsInside) { return false; } -bool Qt5Graphics::drawNativeControl( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, - ControlState nState, const ImplControlValue& aValue, - const OUString& aCaption ) +bool Qt5Graphics::drawNativeControl(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, ControlState nState, + const ImplControlValue& aValue, const OUString& aCaption) { return false; } -bool Qt5Graphics::getNativeControlRegion( ControlType nType, ControlPart nPart, - const tools::Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const OUString& aCaption, - tools::Rectangle &rNativeBoundingRegion, - tools::Rectangle &rNativeContentRegion ) +bool Qt5Graphics::getNativeControlRegion(ControlType nType, ControlPart nPart, + const tools::Rectangle& rControlRegion, + ControlState nState, const ImplControlValue& aValue, + const OUString& aCaption, + tools::Rectangle& rNativeBoundingRegion, + tools::Rectangle& rNativeContentRegion) { return false; } diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx index a1e407e088e1..4d7f8cf1a8b9 100644 --- a/vcl/qt5/Qt5Graphics_GDI.cxx +++ b/vcl/qt5/Qt5Graphics_GDI.cxx @@ -27,125 +27,123 @@ #include <QtGui/QWindow> #include <QtWidgets/QWidget> -static const basegfx::B2DPoint aHalfPointOfs ( 0.5, 0.5 ); +static const basegfx::B2DPoint aHalfPointOfs(0.5, 0.5); -static void AddPolygonToPath( QPainterPath& rPath, - const basegfx::B2DPolygon& rPolygon, - bool bClosePath, bool bPixelSnap, bool bLineDraw ) +static void AddPolygonToPath(QPainterPath& rPath, const basegfx::B2DPolygon& rPolygon, + bool bClosePath, bool bPixelSnap, bool bLineDraw) { // short circuit if there is nothing to do const int nPointCount = rPolygon.count(); - if( nPointCount <= 0 ) + if (nPointCount <= 0) return; const bool bHasCurves = rPolygon.areControlPointsUsed(); - for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ ) + for (int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++) { int nClosedIdx = nPointIdx; - if( nPointIdx >= nPointCount ) + if (nPointIdx >= nPointCount) { // prepare to close last curve segment if needed - if( bClosePath && (nPointIdx == nPointCount) ) + if (bClosePath && (nPointIdx == nPointCount)) nClosedIdx = 0; else break; } - basegfx::B2DPoint aPoint = rPolygon.getB2DPoint( nClosedIdx ); + basegfx::B2DPoint aPoint = rPolygon.getB2DPoint(nClosedIdx); - if( bPixelSnap ) + if (bPixelSnap) { // snap device coordinates to full pixels - aPoint.setX( basegfx::fround( aPoint.getX() ) ); - aPoint.setY( basegfx::fround( aPoint.getY() ) ); + aPoint.setX(basegfx::fround(aPoint.getX())); + aPoint.setY(basegfx::fround(aPoint.getY())); } - if( bLineDraw ) + if (bLineDraw) aPoint += aHalfPointOfs; - if( !nPointIdx ) + if (!nPointIdx) { // first point => just move there - rPath.moveTo( aPoint.getX(), aPoint.getY() ); + rPath.moveTo(aPoint.getX(), aPoint.getY()); continue; } bool bPendingCurve = false; - if( bHasCurves ) + if (bHasCurves) { - bPendingCurve = rPolygon.isNextControlPointUsed( nPrevIdx ); - bPendingCurve |= rPolygon.isPrevControlPointUsed( nClosedIdx ); + bPendingCurve = rPolygon.isNextControlPointUsed(nPrevIdx); + bPendingCurve |= rPolygon.isPrevControlPointUsed(nClosedIdx); } - if( !bPendingCurve ) // line segment - rPath.lineTo( aPoint.getX(), aPoint.getY() ); - else // cubic bezier segment + if (!bPendingCurve) // line segment + rPath.lineTo(aPoint.getX(), aPoint.getY()); + else // cubic bezier segment { - basegfx::B2DPoint aCP1 = rPolygon.getNextControlPoint( nPrevIdx ); - basegfx::B2DPoint aCP2 = rPolygon.getPrevControlPoint( nClosedIdx ); - if( bLineDraw ) + basegfx::B2DPoint aCP1 = rPolygon.getNextControlPoint(nPrevIdx); + basegfx::B2DPoint aCP2 = rPolygon.getPrevControlPoint(nClosedIdx); + if (bLineDraw) { aCP1 += aHalfPointOfs; aCP2 += aHalfPointOfs; } - rPath.cubicTo( aCP1.getX(), aCP1.getY(), - aCP2.getX(), aCP2.getY(), aPoint.getX(), aPoint.getY() ); + rPath.cubicTo(aCP1.getX(), aCP1.getY(), aCP2.getX(), aCP2.getY(), aPoint.getX(), + aPoint.getY()); } } - if( bClosePath ) + if (bClosePath) rPath.closeSubpath(); } -static bool AddPolyPolygonToPath( QPainterPath& rPath, - const basegfx::B2DPolyPolygon& rPolyPoly, - bool bPixelSnap, bool bLineDraw ) +static bool AddPolyPolygonToPath(QPainterPath& rPath, const basegfx::B2DPolyPolygon& rPolyPoly, + bool bPixelSnap, bool bLineDraw) { const int nPolyCount = rPolyPoly.count(); - if( nPolyCount <= 0 ) + if (nPolyCount <= 0) return false; - for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx ) + for (int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx) { - const basegfx::B2DPolygon rPolygon = rPolyPoly.getB2DPolygon( nPolyIdx ); - AddPolygonToPath( rPath, rPolygon, true, bPixelSnap, bLineDraw ); + const basegfx::B2DPolygon rPolygon = rPolyPoly.getB2DPolygon(nPolyIdx); + AddPolygonToPath(rPath, rPolygon, true, bPixelSnap, bLineDraw); } return true; } -bool Qt5Graphics::setClipRegion( const vcl::Region& rRegion ) +bool Qt5Graphics::setClipRegion(const vcl::Region& rRegion) { - if ( rRegion.IsRectangle() ) + if (rRegion.IsRectangle()) { - m_aClipRegion = toQRect( rRegion.GetBoundRect() ); - if ( !m_aClipPath.isEmpty() ) + m_aClipRegion = toQRect(rRegion.GetBoundRect()); + if (!m_aClipPath.isEmpty()) { QPainterPath aPath; - m_aClipPath.swap( aPath ); + m_aClipPath.swap(aPath); } } - else if( !rRegion.HasPolyPolygonOrB2DPolyPolygon() ) + else if (!rRegion.HasPolyPolygonOrB2DPolyPolygon()) { QRegion aQRegion; RectangleVector aRectangles; - rRegion.GetRegionRectangles( aRectangles ); - for ( auto & rRect : aRectangles ) - aQRegion += toQRect( rRect ); + rRegion.GetRegionRectangles(aRectangles); + for (auto& rRect : aRectangles) + aQRegion += toQRect(rRect); m_aClipRegion = aQRegion; - if ( !m_aClipPath.isEmpty() ) + if (!m_aClipPath.isEmpty()) { QPainterPath aPath; - m_aClipPath.swap( aPath ); + m_aClipPath.swap(aPath); } } else { QPainterPath aPath; - const basegfx::B2DPolyPolygon aPolyClip( rRegion.GetAsB2DPolyPolygon() ); - AddPolyPolygonToPath( aPath, aPolyClip, !getAntiAliasB2DDraw(), false ); - m_aClipPath.swap( aPath ); - if ( !m_aClipRegion.isEmpty() ) + const basegfx::B2DPolyPolygon aPolyClip(rRegion.GetAsB2DPolyPolygon()); + AddPolyPolygonToPath(aPath, aPolyClip, !getAntiAliasB2DDraw(), false); + m_aClipPath.swap(aPath); + if (!m_aClipRegion.isEmpty()) { QRegion aRegion; - m_aClipRegion.swap( aRegion ); + m_aClipRegion.swap(aRegion); } } return true; @@ -153,358 +151,345 @@ bool Qt5Graphics::setClipRegion( const vcl::Region& rRegion ) void Qt5Graphics::ResetClipRegion() { - m_aClipRegion = QRegion( m_pQImage->rect() ); - if ( !m_aClipPath.isEmpty() ) + m_aClipRegion = QRegion(m_pQImage->rect()); + if (!m_aClipPath.isEmpty()) { QPainterPath aPath; - m_aClipPath.swap( aPath ); + m_aClipPath.swap(aPath); } } -void Qt5Graphics::drawPixel( long nX, long nY ) +void Qt5Graphics::drawPixel(long nX, long nY) { - Qt5Painter aPainter( *this ); - aPainter.drawPoint( nX, nY ); - aPainter.update( nX, nY, 1, 1 ); + Qt5Painter aPainter(*this); + aPainter.drawPoint(nX, nY); + aPainter.update(nX, nY, 1, 1); } -void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor ) +void Qt5Graphics::drawPixel(long nX, long nY, SalColor nSalColor) { - Qt5Painter aPainter( *this ); - aPainter.setPen( QColor( QRgb( nSalColor ) ) ); - aPainter.setPen( Qt::SolidLine ); - aPainter.drawPoint( nX, nY ); - aPainter.update( nX, nY, 1, 1 ); + Qt5Painter aPainter(*this); + aPainter.setPen(QColor(QRgb(nSalColor))); + aPainter.setPen(Qt::SolidLine); + aPainter.drawPoint(nX, nY); + aPainter.update(nX, nY, 1, 1); } -void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) +void Qt5Graphics::drawLine(long nX1, long nY1, long nX2, long nY2) { - Qt5Painter aPainter( *this ); - aPainter.drawLine( nX1, nY1, nX2, nY2 ); + Qt5Painter aPainter(*this); + aPainter.drawLine(nX1, nY1, nX2, nY2); long tmp; - if ( nX1 > nX2 ) + if (nX1 > nX2) { tmp = nX1; nX1 = nX2; nX2 = tmp; } - if ( nY1 > nY2 ) + if (nY1 > nY2) { tmp = nY1; nY1 = nY2; nY2 = tmp; } - aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 ); + aPainter.update(nX1, nY1, nX2 - nX1, nY2 - nY1); } -void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight ) +void Qt5Graphics::drawRect(long nX, long nY, long nWidth, long nHeight) { - if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor ) + if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor) return; - Qt5Painter aPainter( *this, true ); - if ( SALCOLOR_NONE != m_aFillColor ) - aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() ); + Qt5Painter aPainter(*this, true); + if (SALCOLOR_NONE != m_aFillColor) + aPainter.fillRect(nX, nY, nWidth, nHeight, aPainter.brush()); else - aPainter.drawRect( nX, nY, nWidth, nHeight ); - aPainter.update( nX, nY, nWidth, nHeight ); + aPainter.drawRect(nX, nY, nWidth, nHeight); + aPainter.update(nX, nY, nWidth, nHeight); } -void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void Qt5Graphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry) { - if ( 0 == nPoints ) + if (0 == nPoints) return; - Qt5Painter aPainter( *this ); - QPoint *pPoints = new QPoint[ nPoints ]; - QPoint aTopLeft( pPtAry->mnX, pPtAry->mnY ); + Qt5Painter aPainter(*this); + QPoint* pPoints = new QPoint[nPoints]; + QPoint aTopLeft(pPtAry->mnX, pPtAry->mnY); QPoint aBottomRight = aTopLeft; - for ( sal_uInt32 i = 0; i < nPoints; ++i, ++pPtAry ) + for (sal_uInt32 i = 0; i < nPoints; ++i, ++pPtAry) { - pPoints[ i ] = QPoint( pPtAry->mnX, pPtAry->mnY ); - if ( pPtAry->mnX < aTopLeft.x() ) - aTopLeft.setX( pPtAry->mnX ); - if ( pPtAry->mnY < aTopLeft.y() ) - aTopLeft.setY( pPtAry->mnY ); - if ( pPtAry->mnX > aBottomRight.x() ) - aBottomRight.setX( pPtAry->mnX ); - if ( pPtAry->mnY > aBottomRight.y()) - aBottomRight.setY( pPtAry->mnY ); + pPoints[i] = QPoint(pPtAry->mnX, pPtAry->mnY); + if (pPtAry->mnX < aTopLeft.x()) + aTopLeft.setX(pPtAry->mnX); + if (pPtAry->mnY < aTopLeft.y()) + aTopLeft.setY(pPtAry->mnY); + if (pPtAry->mnX > aBottomRight.x()) + aBottomRight.setX(pPtAry->mnX); + if (pPtAry->mnY > aBottomRight.y()) + aBottomRight.setY(pPtAry->mnY); } - aPainter.drawPolyline( pPoints, nPoints ); - delete [] pPoints; - aPainter.update( QRect( aTopLeft, aBottomRight ) ); + aPainter.drawPolyline(pPoints, nPoints); + delete[] pPoints; + aPainter.update(QRect(aTopLeft, aBottomRight)); } -void Qt5Graphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void Qt5Graphics::drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry) { - Qt5Painter aPainter( *this, true ); - QPolygon aPolygon( nPoints ); - for ( sal_uInt32 i = 0; i < nPoints; ++i, ++pPtAry ) - aPolygon.setPoint( i, pPtAry->mnX, pPtAry->mnY ); - aPainter.drawPolygon( aPolygon ); - aPainter.update( aPolygon.boundingRect() ); + Qt5Painter aPainter(*this, true); + QPolygon aPolygon(nPoints); + for (sal_uInt32 i = 0; i < nPoints; ++i, ++pPtAry) + aPolygon.setPoint(i, pPtAry->mnX, pPtAry->mnY); + aPainter.drawPolygon(aPolygon); + aPainter.update(aPolygon.boundingRect()); } -void Qt5Graphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) +void Qt5Graphics::drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints, + PCONSTSALPOINT* pPtAry) { } -bool Qt5Graphics::drawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, - double fTransparency ) +bool Qt5Graphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, double fTransparency) { // ignore invisible polygons - if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor ) + if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor) return true; - if( (fTransparency >= 1.0) || (fTransparency < 0) ) + if ((fTransparency >= 1.0) || (fTransparency < 0)) return true; QPainterPath aPath; // ignore empty polygons - if( !AddPolyPolygonToPath( aPath, rPolyPoly, !getAntiAliasB2DDraw(), - m_aLineColor != SALCOLOR_NONE ) ) + if (!AddPolyPolygonToPath(aPath, rPolyPoly, !getAntiAliasB2DDraw(), + m_aLineColor != SALCOLOR_NONE)) return true; - Qt5Painter aPainter( *this, true, 255 * (1.0 - fTransparency) ); - aPainter.drawPath( aPath ); - aPainter.update( aPath.boundingRect() ); + Qt5Painter aPainter(*this, true, 255 * (1.0 - fTransparency)); + aPainter.drawPath(aPath); + aPainter.update(aPath.boundingRect()); return true; } -bool Qt5Graphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const PolyFlags* pFlgAry ) +bool Qt5Graphics::drawPolyLineBezier(sal_uInt32 nPoints, const SalPoint* pPtAry, + const PolyFlags* pFlgAry) { return false; } -bool Qt5Graphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const PolyFlags* pFlgAry ) +bool Qt5Graphics::drawPolygonBezier(sal_uInt32 nPoints, const SalPoint* pPtAry, + const PolyFlags* pFlgAry) { return false; } -bool Qt5Graphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, - const SalPoint* const* pPtAry, const PolyFlags* const* pFlgAry ) +bool Qt5Graphics::drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints, + const SalPoint* const* pPtAry, + const PolyFlags* const* pFlgAry) { return false; } -bool Qt5Graphics::drawPolyLine( const basegfx::B2DPolygon& rPolyLine, - double fTransparency, - const basegfx::B2DVector& rLineWidths, - basegfx::B2DLineJoin eLineJoin, - css::drawing::LineCap eLineCap, - double fMiterMinimumAngle ) +bool Qt5Graphics::drawPolyLine(const basegfx::B2DPolygon& rPolyLine, double fTransparency, + const basegfx::B2DVector& rLineWidths, + basegfx::B2DLineJoin eLineJoin, css::drawing::LineCap eLineCap, + double fMiterMinimumAngle) { - if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor ) + if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor) return true; - if( basegfx::B2DLineJoin::NONE == eLineJoin ) + if (basegfx::B2DLineJoin::NONE == eLineJoin) return false; // short circuit if there is nothing to do const int nPointCount = rPolyLine.count(); - if( nPointCount <= 0 ) + if (nPointCount <= 0) return true; // setup poly-polygon path QPainterPath aPath; - AddPolygonToPath( aPath, rPolyLine, rPolyLine.isClosed(), - !getAntiAliasB2DDraw(), true ); + AddPolygonToPath(aPath, rPolyLine, rPolyLine.isClosed(), !getAntiAliasB2DDraw(), true); - Qt5Painter aPainter( *this, false, 255 * (1.0 - fTransparency) ); + Qt5Painter aPainter(*this, false, 255 * (1.0 - fTransparency)); // setup line attributes QPen aPen = aPainter.pen(); - aPen.setWidth( rLineWidths.getX() ); + aPen.setWidth(rLineWidths.getX()); - switch( eLineJoin ) + switch (eLineJoin) { - case basegfx::B2DLineJoin::NONE: std::abort(); return false; - case basegfx::B2DLineJoin::Bevel: aPen.setJoinStyle( Qt::BevelJoin ); break; - case basegfx::B2DLineJoin::Round: aPen.setJoinStyle( Qt::RoundJoin ); break; - case basegfx::B2DLineJoin::Miter: - aPen.setMiterLimit( 1.0 / sin(fMiterMinimumAngle / 2.0) ); - aPen.setJoinStyle( Qt::MiterJoin ); - break; + case basegfx::B2DLineJoin::NONE: + std::abort(); + return false; + case basegfx::B2DLineJoin::Bevel: + aPen.setJoinStyle(Qt::BevelJoin); + break; + case basegfx::B2DLineJoin::Round: + aPen.setJoinStyle(Qt::RoundJoin); + break; + case basegfx::B2DLineJoin::Miter: + aPen.setMiterLimit(1.0 / sin(fMiterMinimumAngle / 2.0)); + aPen.setJoinStyle(Qt::MiterJoin); + break; } - switch(eLineCap) + switch (eLineCap) { - default: // css::drawing::LineCap_BUTT: - aPen.setCapStyle( Qt::FlatCap ); break; - case css::drawing::LineCap_ROUND: aPen.setCapStyle( Qt::RoundCap ); break; - case css::drawing::LineCap_SQUARE: aPen.setCapStyle( Qt::SquareCap ); break; + default: // css::drawing::LineCap_BUTT: + aPen.setCapStyle(Qt::FlatCap); + break; + case css::drawing::LineCap_ROUND: + aPen.setCapStyle(Qt::RoundCap); + break; + case css::drawing::LineCap_SQUARE: + aPen.setCapStyle(Qt::SquareCap); + break; } - aPainter.setPen( aPen ); - aPainter.drawPath( aPath ); - aPainter.update( aPath.boundingRect() ); + aPainter.setPen(aPen); + aPainter.drawPath(aPath); + aPainter.update(aPath.boundingRect()); return true; } -bool Qt5Graphics::drawGradient( const tools::PolyPolygon&, const Gradient& ) -{ - return false; -} +bool Qt5Graphics::drawGradient(const tools::PolyPolygon&, const Gradient&) { return false; } -void Qt5Graphics::copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, bool bWindowInvalidate ) +void Qt5Graphics::copyArea(long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, + long nSrcHeight, bool bWindowInvalidate) { - if ( nDestX == nSrcX && nDestY == nSrcY ) + if (nDestX == nSrcX && nDestY == nSrcY) return; - SalTwoRect aTR( nSrcX, nSrcY, nSrcWidth, nSrcHeight, - nDestX, nDestY, nSrcWidth, nSrcHeight ); - copyBits( aTR, this ); + SalTwoRect aTR(nSrcX, nSrcY, nSrcWidth, nSrcHeight, nDestX, nDestY, nSrcWidth, nSrcHeight); + copyBits(aTR, this); } -void Qt5Graphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) +void Qt5Graphics::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) { - if( rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 - || rPosAry.mnDestWidth <= 0 || rPosAry.mnDestHeight <= 0 ) + if (rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 || rPosAry.mnDestWidth <= 0 + || rPosAry.mnDestHeight <= 0) return; - assert( rPosAry.mnSrcWidth == rPosAry.mnDestWidth ); - assert( rPosAry.mnSrcHeight == rPosAry.mnDestHeight ); + assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth); + assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight); QImage aImage, *pImage = &aImage; - if ( !pSrcGraphics || this == pSrcGraphics ) + if (!pSrcGraphics || this == pSrcGraphics) { - if ( rPosAry.mnDestX == rPosAry.mnSrcX - && rPosAry.mnDestY == rPosAry.mnSrcY ) + if (rPosAry.mnDestX == rPosAry.mnSrcX && rPosAry.mnDestY == rPosAry.mnSrcY) return; - aImage = pImage->copy( rPosAry.mnSrcX, rPosAry.mnSrcY, - rPosAry.mnSrcWidth, rPosAry.mnSrcHeight ); + aImage + = pImage->copy(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight); } else - pImage = static_cast< Qt5Graphics* >( pSrcGraphics )->m_pQImage; - - Qt5Painter aPainter( *this ); - aPainter.drawImage( QPoint( rPosAry.mnDestX, rPosAry.mnDestY ), - *pImage, QRect( rPosAry.mnSrcX, rPosAry.mnSrcY, - rPosAry.mnSrcWidth, rPosAry.mnSrcHeight) ); - aPainter.update( rPosAry.mnDestX, rPosAry.mnDestY, - rPosAry.mnDestWidth, rPosAry.mnDestHeight ); + pImage = static_cast<Qt5Graphics*>(pSrcGraphics)->m_pQImage; + + Qt5Painter aPainter(*this); + aPainter.drawImage( + QPoint(rPosAry.mnDestX, rPosAry.mnDestY), *pImage, + QRect(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight)); + aPainter.update(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); } -void Qt5Graphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) +void Qt5Graphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) { - if( rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 - || rPosAry.mnDestWidth <= 0 || rPosAry.mnDestHeight <= 0 ) + if (rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 || rPosAry.mnDestWidth <= 0 + || rPosAry.mnDestHeight <= 0) return; - assert( rPosAry.mnSrcWidth == rPosAry.mnDestWidth ); - assert( rPosAry.mnSrcHeight == rPosAry.mnDestHeight ); + assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth); + assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight); - Qt5Painter aPainter( *this ); + Qt5Painter aPainter(*this); - const QImage *pImage = static_cast< const Qt5Bitmap* >( &rSalBitmap )->GetQImage(); - assert( pImage ); + const QImage* pImage = static_cast<const Qt5Bitmap*>(&rSalBitmap)->GetQImage(); + assert(pImage); - aPainter.drawImage( QPoint( rPosAry.mnDestX, rPosAry.mnDestY ), - *pImage, QRect( rPosAry.mnSrcX, rPosAry.mnSrcY, - rPosAry.mnSrcWidth, rPosAry.mnSrcHeight) ); - aPainter.update( rPosAry.mnDestX, rPosAry.mnDestY, - rPosAry.mnDestWidth, rPosAry.mnDestHeight ); + aPainter.drawImage( + QPoint(rPosAry.mnDestX, rPosAry.mnDestY), *pImage, + QRect(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight)); + aPainter.update(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); } -void Qt5Graphics::drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap ) +void Qt5Graphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, + const SalBitmap& rTransparentBitmap) { - if( rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 - || rPosAry.mnDestWidth <= 0 || rPosAry.mnDestHeight <= 0 ) + if (rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 || rPosAry.mnDestWidth <= 0 + || rPosAry.mnDestHeight <= 0) return; - assert( rPosAry.mnSrcWidth == rPosAry.mnDestWidth ); - assert( rPosAry.mnSrcHeight == rPosAry.mnDestHeight ); + assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth); + assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight); } -void Qt5Graphics::drawMask( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, - SalColor nMaskColor ) +void Qt5Graphics::drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, + SalColor nMaskColor) { - if( rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 - || rPosAry.mnDestWidth <= 0 || rPosAry.mnDestHeight <= 0 ) + if (rPosAry.mnSrcWidth <= 0 || rPosAry.mnSrcHeight <= 0 || rPosAry.mnDestWidth <= 0 + || rPosAry.mnDestHeight <= 0) return; - assert( rPosAry.mnSrcWidth == rPosAry.mnDestWidth ); - assert( rPosAry.mnSrcHeight == rPosAry.mnDestHeight ); + assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth); + assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight); } -SalBitmap* Qt5Graphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) +SalBitmap* Qt5Graphics::getBitmap(long nX, long nY, long nWidth, long nHeight) { - return new Qt5Bitmap( m_pQImage->copy( nX, nY, nWidth, nHeight ) ); + return new Qt5Bitmap(m_pQImage->copy(nX, nY, nWidth, nHeight)); } -SalColor Qt5Graphics::getPixel( long nX, long nY ) -{ - return m_pQImage->pixel( nX, nY ); -} +SalColor Qt5Graphics::getPixel(long nX, long nY) { return m_pQImage->pixel(nX, nY); } -void Qt5Graphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) -{ -} +void Qt5Graphics::invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) {} -void Qt5Graphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) -{ -} +void Qt5Graphics::invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) {} -bool Qt5Graphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) +bool Qt5Graphics::drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize) { return false; } -bool Qt5Graphics::blendBitmap( const SalTwoRect&, - const SalBitmap& rBitmap ) -{ - return false; -} +bool Qt5Graphics::blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) { return false; } -bool Qt5Graphics::blendAlphaBitmap( const SalTwoRect&, - const SalBitmap& rSrcBitmap, - const SalBitmap& rMaskBitmap, - const SalBitmap& rAlphaBitmap ) +bool Qt5Graphics::blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, + const SalBitmap& rMaskBitmap, const SalBitmap& rAlphaBitmap) { return false; } -static bool getAlphaImage( const SalBitmap& rSourceBitmap, - const SalBitmap& rAlphaBitmap, - QImage &rAlphaImage ) +static bool getAlphaImage(const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap, + QImage& rAlphaImage) { if (rAlphaBitmap.GetBitCount() != 8 && rAlphaBitmap.GetBitCount() != 1) { - SAL_WARN( "vcl.gdi", "unsupported alpha depth case: " - << rAlphaBitmap.GetBitCount() ); + SAL_WARN("vcl.gdi", "unsupported alpha depth case: " << rAlphaBitmap.GetBitCount()); return false; } - const QImage *pBitmap = static_cast< const Qt5Bitmap* >( &rSourceBitmap )->GetQImage(); - const QImage *pAlpha = static_cast< const Qt5Bitmap* >( &rAlphaBitmap )->GetQImage(); - rAlphaImage = pBitmap->convertToFormat( Qt5_DefaultFormat32 ); + const QImage* pBitmap = static_cast<const Qt5Bitmap*>(&rSourceBitmap)->GetQImage(); + const QImage* pAlpha = static_cast<const Qt5Bitmap*>(&rAlphaBitmap)->GetQImage(); + rAlphaImage = pBitmap->convertToFormat(Qt5_DefaultFormat32); - if ( rAlphaBitmap.GetBitCount() == 8 ) + if (rAlphaBitmap.GetBitCount() == 8) { - for (int y = 0; y < rAlphaImage.height(); ++y ) + for (int y = 0; y < rAlphaImage.height(); ++y) { - uchar* image_line = rAlphaImage.scanLine( y ); - const uchar* alpha_line = pAlpha->scanLine( y ); - for (int x = 0; x < rAlphaImage.width(); ++x, image_line += 4 ) - image_line[ 3 ] = 255 - alpha_line[ x ]; + uchar* image_line = rAlphaImage.scanLine(y); + const uchar* alpha_line = pAlpha->scanLine(y); + for (int x = 0; x < rAlphaImage.width(); ++x, image_line += 4) + image_line[3] = 255 - alpha_line[x]; } } else { - for (int y = 0; y < rAlphaImage.height(); ++y ) + for (int y = 0; y < rAlphaImage.height(); ++y) { - uchar* image_line = rAlphaImage.scanLine( y ); - const uchar* alpha_line = pAlpha->scanLine( y ); - for (int x = 0; x < rAlphaImage.width(); ++x, image_line += 4 ) + uchar* image_line = rAlphaImage.scanLine(y); + const uchar* alpha_line = pAlpha->scanLine(y); + for (int x = 0; x < rAlphaImage.width(); ++x, image_line += 4) { - if ( x && !(x % 8) ) + if (x && !(x % 8)) ++alpha_line; - if ( 0 == (*alpha_line & (1 << (x % 8))) ) + if (0 == (*alpha_line & (1 << (x % 8)))) image_line[0] = 0; } } @@ -513,64 +498,60 @@ static bool getAlphaImage( const SalBitmap& rSourceBitmap, return true; } -bool Qt5Graphics::drawAlphaBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSourceBitmap, - const SalBitmap& rAlphaBitmap ) +bool Qt5Graphics::drawAlphaBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSourceBitmap, + const SalBitmap& rAlphaBitmap) { QImage aImage; - if ( !getAlphaImage( rSourceBitmap, rAlphaBitmap, aImage ) ) + if (!getAlphaImage(rSourceBitmap, rAlphaBitmap, aImage)) return false; - Qt5Painter aPainter( *this ); - aPainter.drawImage( QPoint( rPosAry.mnDestX, rPosAry.mnDestY ), - aImage, QRect( rPosAry.mnSrcX, rPosAry.mnSrcY, - rPosAry.mnSrcWidth, rPosAry.mnSrcHeight) ); + Qt5Painter aPainter(*this); + aPainter.drawImage( + QPoint(rPosAry.mnDestX, rPosAry.mnDestY), aImage, + QRect(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight)); return true; } -bool Qt5Graphics::drawTransformedBitmap( const basegfx::B2DPoint& rNull, - const basegfx::B2DPoint& rX, - const basegfx::B2DPoint& rY, - const SalBitmap& rSourceBitmap, - const SalBitmap* pAlphaBitmap ) +bool Qt5Graphics::drawTransformedBitmap(const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, + const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, + const SalBitmap* pAlphaBitmap) { QImage aImage; - if ( pAlphaBitmap && !getAlphaImage( rSourceBitmap, *pAlphaBitmap, aImage ) ) + if (pAlphaBitmap && !getAlphaImage(rSourceBitmap, *pAlphaBitmap, aImage)) return false; else { - const QImage *pBitmap = static_cast< const Qt5Bitmap* >( &rSourceBitmap )->GetQImage(); - aImage = pBitmap->convertToFormat( Qt5_DefaultFormat32 ); + const QImage* pBitmap = static_cast<const Qt5Bitmap*>(&rSourceBitmap)->GetQImage(); + aImage = pBitmap->convertToFormat(Qt5_DefaultFormat32); } - Qt5Painter aPainter( *this ); + Qt5Painter aPainter(*this); const basegfx::B2DVector aXRel = rX - rNull; const basegfx::B2DVector aYRel = rY - rNull; - aPainter.setTransform( QTransform( - aXRel.getX() / aImage.width(), aXRel.getY() / aImage.width(), - aYRel.getX() / aImage.height(), aYRel.getY() / aImage.height(), - rNull.getX(), rNull.getY() )); - aPainter.drawImage( QPoint(0, 0), aImage ); - aPainter.update( aImage.rect() ); + aPainter.setTransform(QTransform(aXRel.getX() / aImage.width(), aXRel.getY() / aImage.width(), + aYRel.getX() / aImage.height(), aYRel.getY() / aImage.height(), + rNull.getX(), rNull.getY())); + aPainter.drawImage(QPoint(0, 0), aImage); + aPainter.update(aImage.rect()); return true; } -bool Qt5Graphics::drawAlphaRect( long nX, long nY, long nWidth, - long nHeight, sal_uInt8 nTransparency ) +bool Qt5Graphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, + sal_uInt8 nTransparency) { - if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor ) + if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor) return true; - Qt5Painter aPainter( *this, true, nTransparency ); - if ( SALCOLOR_NONE != m_aFillColor ) - aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() ); + Qt5Painter aPainter(*this, true, nTransparency); + if (SALCOLOR_NONE != m_aFillColor) + aPainter.fillRect(nX, nY, nWidth, nHeight, aPainter.brush()); else - aPainter.drawRect( nX, nY, nWidth, nHeight ); - aPainter.update( nX, nY, nWidth, nHeight ); + aPainter.drawRect(nX, nY, nWidth, nHeight); + aPainter.update(nX, nY, nWidth, nHeight); return true; } -void Qt5Graphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) +void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) { char* pForceDpi; if ((pForceDpi = getenv("SAL_FORCEDPI"))) @@ -580,58 +561,36 @@ void Qt5Graphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) return; } - if ( !m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle() ) + if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle()) return; - QScreen *pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); + QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); rDPIX = pScreen->physicalDotsPerInchX(); rDPIY = pScreen->physicalDotsPerInchY(); } -sal_uInt16 Qt5Graphics::GetBitCount() const -{ - return getFormatBits( m_pQImage->format() ); -} +sal_uInt16 Qt5Graphics::GetBitCount() const { return getFormatBits(m_pQImage->format()); } -long Qt5Graphics::GetGraphicsWidth() const -{ - return m_pQImage->width(); -} +long Qt5Graphics::GetGraphicsWidth() const { return m_pQImage->width(); } -void Qt5Graphics::SetLineColor() -{ - m_aLineColor = SALCOLOR_NONE; -} +void Qt5Graphics::SetLineColor() { m_aLineColor = SALCOLOR_NONE; } -void Qt5Graphics::SetLineColor( SalColor nSalColor ) -{ - m_aLineColor = nSalColor; -} +void Qt5Graphics::SetLineColor(SalColor nSalColor) { m_aLineColor = nSalColor; } -void Qt5Graphics::SetFillColor() -{ - m_aFillColor = SALCOLOR_NONE; -} +void Qt5Graphics::SetFillColor() { m_aFillColor = SALCOLOR_NONE; } -void Qt5Graphics::SetFillColor( SalColor nSalColor ) -{ - m_aFillColor = nSalColor; -} +void Qt5Graphics::SetFillColor(SalColor nSalColor) { m_aFillColor = nSalColor; } -void Qt5Graphics::SetXORMode( bool bSet ) +void Qt5Graphics::SetXORMode(bool bSet) { - if ( bSet ) + if (bSet) m_eCompositionMode = QPainter::CompositionMode_Xor; else m_eCompositionMode = QPainter::CompositionMode_SourceOver; } -void Qt5Graphics::SetROPLineColor( SalROPColor nROPColor ) -{ -} +void Qt5Graphics::SetROPLineColor(SalROPColor nROPColor) {} -void Qt5Graphics::SetROPFillColor( SalROPColor nROPColor ) -{ -} +void Qt5Graphics::SetROPFillColor(SalROPColor nROPColor) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index 0053a56c412d..cc69ae956ef0 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -30,135 +30,120 @@ #include <QtGui/QRawFont> #include <QtCore/QStringList> -void Qt5Graphics::SetTextColor( SalColor nSalColor ) -{ - m_aTextColor = nSalColor; -} +void Qt5Graphics::SetTextColor(SalColor nSalColor) { m_aTextColor = nSalColor; } -void Qt5Graphics::SetFont( const FontSelectPattern* pReqFont, int nFallbackLevel ) +void Qt5Graphics::SetFont(const FontSelectPattern* pReqFont, int nFallbackLevel) { // release the text styles for (int i = nFallbackLevel; i < MAX_FALLBACK; ++i) { - if ( !m_pTextStyle[ i ] ) + if (!m_pTextStyle[i]) break; - delete m_pTextStyle[ i ]; - m_pTextStyle[ i ] = nullptr; + delete m_pTextStyle[i]; + m_pTextStyle[i] = nullptr; } - if( !pReqFont ) + if (!pReqFont) // handle release-font-resources request - m_pFontData[ nFallbackLevel ] = nullptr; + m_pFontData[nFallbackLevel] = nullptr; else { - m_pFontData[ nFallbackLevel ] = static_cast<const Qt5FontFace*>( pReqFont->mpFontData ); - m_pTextStyle[ nFallbackLevel ] = new Qt5Font( *pReqFont ); + m_pFontData[nFallbackLevel] = static_cast<const Qt5FontFace*>(pReqFont->mpFontData); + m_pTextStyle[nFallbackLevel] = new Qt5Font(*pReqFont); } } -void Qt5Graphics::GetFontMetric( ImplFontMetricDataRef &rFMD, int nFallbackLevel ) +void Qt5Graphics::GetFontMetric(ImplFontMetricDataRef& rFMD, int nFallbackLevel) { - QRawFont aRawFont( QRawFont::fromFont( *m_pTextStyle[ nFallbackLevel ] ) ); + QRawFont aRawFont(QRawFont::fromFont(*m_pTextStyle[nFallbackLevel])); - QByteArray aHheaTable = aRawFont.fontTable( "hhea" ); - std::vector<uint8_t> rHhea(aHheaTable.data(), aHheaTable.data() + aHheaTable.size() ); + QByteArray aHheaTable = aRawFont.fontTable("hhea"); + std::vector<uint8_t> rHhea(aHheaTable.data(), aHheaTable.data() + aHheaTable.size()); - QByteArray aOs2Table = aRawFont.fontTable( "OS/2" ); - std::vector<uint8_t> rOS2(aHheaTable.data(), aHheaTable.data() + aHheaTable.size() ); + QByteArray aOs2Table = aRawFont.fontTable("OS/2"); + std::vector<uint8_t> rOS2(aHheaTable.data(), aHheaTable.data() + aHheaTable.size()); - rFMD->ImplCalcLineSpacing( rHhea, rOS2, aRawFont.unitsPerEm() ); + rFMD->ImplCalcLineSpacing(rHhea, rOS2, aRawFont.unitsPerEm()); - rFMD->SetWidth( aRawFont.averageCharWidth() ); + rFMD->SetWidth(aRawFont.averageCharWidth()); - const QChar nKashidaCh[ 2 ] = { 0x06, 0x40 }; + const QChar nKashidaCh[2] = { 0x06, 0x40 }; quint32 nKashidaGid = 0; QPointF aPoint; int nNumGlyphs; - if( aRawFont.glyphIndexesForChars( nKashidaCh, 1, &nKashidaGid, &nNumGlyphs ) - && aRawFont.advancesForGlyphIndexes( &nKashidaGid, &aPoint, 1 ) ) - rFMD->SetMinKashida( lrint(aPoint.rx()) ); + if (aRawFont.glyphIndexesForChars(nKashidaCh, 1, &nKashidaGid, &nNumGlyphs) + && aRawFont.advancesForGlyphIndexes(&nKashidaGid, &aPoint, 1)) + rFMD->SetMinKashida(lrint(aPoint.rx())); } const FontCharMapRef Qt5Graphics::GetFontCharMap() const { - if( !m_pFontData[ 0 ] ) - return FontCharMapRef( new FontCharMap() ); - return m_pFontData[ 0 ]->GetFontCharMap(); + if (!m_pFontData[0]) + return FontCharMapRef(new FontCharMap()); + return m_pFontData[0]->GetFontCharMap(); } -bool Qt5Graphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool Qt5Graphics::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const { - if( !m_pFontData[ 0 ] ) + if (!m_pFontData[0]) return false; - return m_pFontData[ 0 ]->GetFontCapabilities( rFontCapabilities ); + return m_pFontData[0]->GetFontCapabilities(rFontCapabilities); } -void Qt5Graphics::GetDevFontList( PhysicalFontCollection* pPFC ) +void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC) { m_pFontCollection = pPFC; - if ( pPFC->Count() ) + if (pPFC->Count()) return; QFontDatabase aFDB; - for ( auto& family : aFDB.families() ) - for ( auto& style : aFDB.styles( family ) ) + for (auto& family : aFDB.families()) + for (auto& style : aFDB.styles(family)) { // Just get any size - we don't care QList<int> sizes = aFDB.smoothSizes(family, style); - pPFC->Add( Qt5FontFace::fromQFont( aFDB.font( family, style, *sizes.begin() ) ) ); + pPFC->Add(Qt5FontFace::fromQFont(aFDB.font(family, style, *sizes.begin()))); } } -void Qt5Graphics::ClearDevFontCache() -{ -} +void Qt5Graphics::ClearDevFontCache() {} -bool Qt5Graphics::AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) +bool Qt5Graphics::AddTempDevFont(PhysicalFontCollection*, const OUString& rFileURL, + const OUString& rFontName) { return false; } -bool Qt5Graphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, - const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncoding, - sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) +bool Qt5Graphics::CreateFontSubset(const OUString& rToFile, const PhysicalFontFace* pFont, + const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncoding, + sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo) { return false; } -const void* Qt5Graphics::GetEmbedFontData( const PhysicalFontFace*, long* pDataLen ) +const void* Qt5Graphics::GetEmbedFontData(const PhysicalFontFace*, long* pDataLen) { return nullptr; } -void Qt5Graphics::FreeEmbedFontData( const void* pData, long nDataLen ) -{ -} +void Qt5Graphics::FreeEmbedFontData(const void* pData, long nDataLen) {} -void Qt5Graphics::GetGlyphWidths( const PhysicalFontFace* pPFF, bool bVertical, - std::vector< sal_Int32 >& rWidths, - Ucs2UIntMap& rUnicodeEnc ) +void Qt5Graphics::GetGlyphWidths(const PhysicalFontFace* pPFF, bool bVertical, + std::vector<sal_Int32>& rWidths, Ucs2UIntMap& rUnicodeEnc) { } -bool Qt5Graphics::GetGlyphBoundRect( const GlyphItem&, tools::Rectangle& ) -{ - return false; -} +bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) { return false; } -bool Qt5Graphics::GetGlyphOutline( const GlyphItem&, basegfx::B2DPolyPolygon& ) -{ - return false; -} +bool Qt5Graphics::GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) { return false; } -SalLayout* Qt5Graphics::GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) +SalLayout* Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) { - if( m_pTextStyle[ nFallbackLevel ] ) - return new CommonSalLayout( *m_pTextStyle[ nFallbackLevel ] ); + if (m_pTextStyle[nFallbackLevel]) + return new CommonSalLayout(*m_pTextStyle[nFallbackLevel]); return nullptr; } -void Qt5Graphics::DrawTextLayout( const CommonSalLayout& ) -{ -} +void Qt5Graphics::DrawTextLayout(const CommonSalLayout&) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index 4e36c6684936..c61a29a01935 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -41,17 +41,17 @@ #include <headless/svpdummies.hxx> #include <headless/svpbmp.hxx> -Qt5Instance::Qt5Instance( SalYieldMutex* pMutex, bool bUseCairo ) - : SalGenericInstance( pMutex ) - , m_postUserEventId( -1 ) - , m_bUseCairo( bUseCairo ) +Qt5Instance::Qt5Instance(SalYieldMutex* pMutex, bool bUseCairo) + : SalGenericInstance(pMutex) + , m_postUserEventId(-1) + , m_bUseCairo(bUseCairo) { m_postUserEventId = QEvent::registerEventType(); // this one needs to be blocking, so that the handling in main thread // is processed before the thread emitting the signal continues - connect( this, SIGNAL( ImplYieldSignal( bool, bool )), - this, SLOT( ImplYield( bool, bool )), Qt::BlockingQueuedConnection ); + connect(this, SIGNAL(ImplYieldSignal(bool, bool)), this, SLOT(ImplYield(bool, bool)), + Qt::BlockingQueuedConnection); } Qt5Instance::~Qt5Instance() @@ -59,108 +59,95 @@ Qt5Instance::~Qt5Instance() // force freeing the QApplication before freeing the arguments, // as it uses references to the provided arguments! m_pQApplication.reset(); - for( int i = 0; i < *m_pFakeArgc; i++ ) - free( m_pFakeArgvFreeable[i] ); + for (int i = 0; i < *m_pFakeArgc; i++) + free(m_pFakeArgvFreeable[i]); } -SalFrame* Qt5Instance::CreateChildFrame( SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle ) +SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) { - return new Qt5Frame( nullptr, nStyle, m_bUseCairo ); + return new Qt5Frame(nullptr, nStyle, m_bUseCairo); } -SalFrame* Qt5Instance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) +SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) { - assert( !pParent || dynamic_cast<Qt5Frame*>( pParent ) ); - return new Qt5Frame( static_cast<Qt5Frame*>( pParent ), nStyle, m_bUseCairo ); + assert(!pParent || dynamic_cast<Qt5Frame*>(pParent)); + return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo); } -void Qt5Instance::DestroyFrame( SalFrame* pFrame ) -{ - delete pFrame; -} +void Qt5Instance::DestroyFrame(SalFrame* pFrame) { delete pFrame; } -SalObject* Qt5Instance::CreateObject( SalFrame* pParent, SystemWindowData*, bool bShow ) +SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, bool bShow) { - assert( !pParent || dynamic_cast<Qt5Frame*>( pParent ) ); - return new Qt5Object( static_cast<Qt5Frame*>( pParent ), bShow ); + assert(!pParent || dynamic_cast<Qt5Frame*>(pParent)); + return new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow); } -void Qt5Instance::DestroyObject( SalObject* pObject ) -{ - delete pObject; -} +void Qt5Instance::DestroyObject(SalObject* pObject) { delete pObject; } -SalVirtualDevice* Qt5Instance::CreateVirtualDevice( SalGraphics* /* pGraphics */, - long &nDX, long &nDY, - DeviceFormat eFormat, - const SystemGraphicsData* /* pData */ ) +SalVirtualDevice* Qt5Instance::CreateVirtualDevice(SalGraphics* /* pGraphics */, long& nDX, + long& nDY, DeviceFormat eFormat, + const SystemGraphicsData* /* pData */) { - if ( m_bUseCairo ) + if (m_bUseCairo) { - SvpSalVirtualDevice *pVD = new SvpSalVirtualDevice( eFormat, 1 ); - pVD->SetSize( nDX, nDY ); + SvpSalVirtualDevice* pVD = new SvpSalVirtualDevice(eFormat, 1); + pVD->SetSize(nDX, nDY); return pVD; } else { - Qt5VirtualDevice* pVD = new Qt5VirtualDevice( eFormat, 1 ); - pVD->SetSize( nDX, nDY ); + Qt5VirtualDevice* pVD = new Qt5VirtualDevice(eFormat, 1); + pVD->SetSize(nDX, nDY); return pVD; } } -SalTimer* Qt5Instance::CreateSalTimer() -{ - return new Qt5Timer(); -} +SalTimer* Qt5Instance::CreateSalTimer() { return new Qt5Timer(); } -SalSystem* Qt5Instance::CreateSalSystem() -{ - return new SvpSalSystem(); -} +SalSystem* Qt5Instance::CreateSalSystem() { return new SvpSalSystem(); } SalBitmap* Qt5Instance::CreateSalBitmap() { - if ( m_bUseCairo ) + if (m_bUseCairo) return new SvpSalBitmap(); else return new Qt5Bitmap(); } -bool Qt5Instance::ImplYield( bool bWait, bool bHandleAllCurrentEvents ) +bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents) { - bool wasEvent = DispatchUserEvents( bHandleAllCurrentEvents ); - if ( !bHandleAllCurrentEvents && wasEvent ) + bool wasEvent = DispatchUserEvents(bHandleAllCurrentEvents); + if (!bHandleAllCurrentEvents && wasEvent) return true; /** * Quoting the Qt docs: [QAbstractEventDispatcher::processEvents] processes * pending events that match flags until there are no more events to process. */ - QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance( qApp->thread()); - if ( bWait && !wasEvent ) - wasEvent = dispatcher->processEvents( QEventLoop::WaitForMoreEvents ); + QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance(qApp->thread()); + if (bWait && !wasEvent) + wasEvent = dispatcher->processEvents(QEventLoop::WaitForMoreEvents); else - wasEvent = dispatcher->processEvents( QEventLoop::AllEvents ) || wasEvent; + wasEvent = dispatcher->processEvents(QEventLoop::AllEvents) || wasEvent; return wasEvent; } bool Qt5Instance::DoYield(bool bWait, bool bHandleAllCurrentEvents) { bool bWasEvent = false; - if( qApp->thread() == QThread::currentThread() ) + if (qApp->thread() == QThread::currentThread()) { - bWasEvent = ImplYield( bWait, bHandleAllCurrentEvents ); - if ( bWasEvent ) + bWasEvent = ImplYield(bWait, bHandleAllCurrentEvents); + if (bWasEvent) m_aWaitingYieldCond.set(); } else { { SolarMutexReleaser aReleaser; - bWasEvent = Q_EMIT ImplYieldSignal( false, bHandleAllCurrentEvents ); + bWasEvent = Q_EMIT ImplYieldSignal(false, bHandleAllCurrentEvents); } - if ( !bWasEvent && bWait ) + if (!bWasEvent && bWait) { m_aWaitingYieldCond.reset(); SolarMutexReleaser aReleaser; @@ -171,125 +158,108 @@ bool Qt5Instance::DoYield(bool bWait, bool bHandleAllCurrentEvents) return bWasEvent; } -bool Qt5Instance::AnyInput( VclInputFlags nType ) -{ - return false; -} +bool Qt5Instance::AnyInput(VclInputFlags nType) { return false; } -SalSession* Qt5Instance::CreateSalSession() -{ - return nullptr; -} +SalSession* Qt5Instance::CreateSalSession() { return nullptr; } -OUString Qt5Instance::GetConnectionIdentifier() -{ - return OUString(); -} +OUString Qt5Instance::GetConnectionIdentifier() { return OUString(); } -void Qt5Instance::AddToRecentDocumentList(const OUString&, const OUString&, const OUString&) -{ -} +void Qt5Instance::AddToRecentDocumentList(const OUString&, const OUString&, const OUString&) {} -OpenGLContext* Qt5Instance::CreateOpenGLContext() -{ - return nullptr; -} +OpenGLContext* Qt5Instance::CreateOpenGLContext() { return nullptr; } -bool Qt5Instance::IsMainThread() const -{ - return qApp->thread() != QThread::currentThread(); -} +bool Qt5Instance::IsMainThread() const { return qApp->thread() != QThread::currentThread(); } void Qt5Instance::TriggerUserEventProcessing() { - QApplication::postEvent(this, new QEvent(QEvent::Type( m_postUserEventId ))); + QApplication::postEvent(this, new QEvent(QEvent::Type(m_postUserEventId))); } -void Qt5Instance::ProcessEvent( SalUserEvent aEvent ) +void Qt5Instance::ProcessEvent(SalUserEvent aEvent) { - aEvent.m_pFrame->CallCallback( aEvent.m_nEvent, aEvent.m_pData ); + aEvent.m_pFrame->CallCallback(aEvent.m_nEvent, aEvent.m_pData); } extern "C" { - VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance() - { - OString aVersion( qVersion() ); - SAL_INFO( "vcl.qt5", "qt version string is " << aVersion ); +VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance() +{ + OString aVersion(qVersion()); + SAL_INFO("vcl.qt5", "qt version string is " << aVersion); - QApplication *pQApplication; - char **pFakeArgvFreeable = nullptr; + QApplication* pQApplication; + char** pFakeArgvFreeable = nullptr; - int nFakeArgc = 2; - const sal_uInt32 nParams = osl_getCommandArgCount(); - OString aDisplay; - OUString aParam, aBin; + int nFakeArgc = 2; + const sal_uInt32 nParams = osl_getCommandArgCount(); + OString aDisplay; + OUString aParam, aBin; - for ( sal_uInt32 nIdx = 0; nIdx < nParams; ++nIdx ) + for (sal_uInt32 nIdx = 0; nIdx < nParams; ++nIdx) + { + osl_getCommandArg(nIdx, &aParam.pData); + if (aParam != "-display") + continue; + if (!pFakeArgvFreeable) { - osl_getCommandArg( nIdx, &aParam.pData ); - if ( aParam != "-display" ) - continue; - if ( !pFakeArgvFreeable ) - { - pFakeArgvFreeable = new char*[ nFakeArgc + 2 ]; - pFakeArgvFreeable[ nFakeArgc++ ] = strdup( "-display" ); - } - else - free( pFakeArgvFreeable[ nFakeArgc ] ); - - ++nIdx; - osl_getCommandArg( nIdx, &aParam.pData ); - aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() ); - pFakeArgvFreeable[ nFakeArgc ] = strdup( aDisplay.getStr() ); + pFakeArgvFreeable = new char*[nFakeArgc + 2]; + pFakeArgvFreeable[nFakeArgc++] = strdup("-display"); } - if ( !pFakeArgvFreeable ) - pFakeArgvFreeable = new char*[ nFakeArgc ]; else - nFakeArgc++; + free(pFakeArgvFreeable[nFakeArgc]); - osl_getExecutableFile( &aParam.pData ); - osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); - OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() ); - pFakeArgvFreeable[ 0 ] = strdup( aExec.getStr() ); - pFakeArgvFreeable[ 1 ] = strdup( "--nocrashhandler" ); + ++nIdx; + osl_getCommandArg(nIdx, &aParam.pData); + aDisplay = OUStringToOString(aParam, osl_getThreadTextEncoding()); + pFakeArgvFreeable[nFakeArgc] = strdup(aDisplay.getStr()); + } + if (!pFakeArgvFreeable) + pFakeArgvFreeable = new char*[nFakeArgc]; + else + nFakeArgc++; - char **pFakeArgv = new char*[ nFakeArgc ]; - for( int i = 0; i < nFakeArgc; i++ ) - pFakeArgv[ i ] = pFakeArgvFreeable[ i ]; + osl_getExecutableFile(&aParam.pData); + osl_getSystemPathFromFileURL(aParam.pData, &aBin.pData); + OString aExec = OUStringToOString(aBin, osl_getThreadTextEncoding()); + pFakeArgvFreeable[0] = strdup(aExec.getStr()); + pFakeArgvFreeable[1] = strdup("--nocrashhandler"); - char* session_manager = nullptr; - if( getenv( "SESSION_MANAGER" ) != nullptr ) - { - session_manager = strdup( getenv( "SESSION_MANAGER" )); - unsetenv( "SESSION_MANAGER" ); - } + char** pFakeArgv = new char*[nFakeArgc]; + for (int i = 0; i < nFakeArgc; i++) + pFakeArgv[i] = pFakeArgvFreeable[i]; - int * pFakeArgc = new int; - *pFakeArgc = nFakeArgc; - pQApplication = new QApplication( *pFakeArgc, pFakeArgv ); + char* session_manager = nullptr; + if (getenv("SESSION_MANAGER") != nullptr) + { + session_manager = strdup(getenv("SESSION_MANAGER")); + unsetenv("SESSION_MANAGER"); + } - if( session_manager != nullptr ) - { - // coverity[tainted_string] - trusted source for setenv - setenv( "SESSION_MANAGER", session_manager, 1 ); - free( session_manager ); - } + int* pFakeArgc = new int; + *pFakeArgc = nFakeArgc; + pQApplication = new QApplication(*pFakeArgc, pFakeArgv); - QApplication::setQuitOnLastWindowClosed(false); + if (session_manager != nullptr) + { + // coverity[tainted_string] - trusted source for setenv + setenv("SESSION_MANAGER", session_manager, 1); + free(session_manager); + } - const bool bUseCairo = (nullptr != getenv( "SAL_VCL_QT5_USE_CAIRO" )); - Qt5Instance* pInstance = new Qt5Instance( new SalYieldMutex(), bUseCairo ); + QApplication::setQuitOnLastWindowClosed(false); - // initialize SalData - new Qt5Data( pInstance ); + const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO")); + Qt5Instance* pInstance = new Qt5Instance(new SalYieldMutex(), bUseCairo); - pInstance->m_pQApplication.reset( pQApplication ); - pInstance->m_pFakeArgvFreeable.reset( pFakeArgvFreeable ); - pInstance->m_pFakeArgv.reset( pFakeArgv ); - pInstance->m_pFakeArgc.reset( pFakeArgc ); + // initialize SalData + new Qt5Data(pInstance); - return pInstance; - } + pInstance->m_pQApplication.reset(pQApplication); + pInstance->m_pFakeArgvFreeable.reset(pFakeArgvFreeable); + pInstance->m_pFakeArgv.reset(pFakeArgv); + pInstance->m_pFakeArgc.reset(pFakeArgc); + + return pInstance; +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Instance.hxx b/vcl/qt5/Qt5Instance.hxx index 0fea7673b59c..22005d91e978 100644 --- a/vcl/qt5/Qt5Instance.hxx +++ b/vcl/qt5/Qt5Instance.hxx @@ -30,10 +30,7 @@ class QApplication; class SalYieldMutex; class SalFrame; -class Qt5Instance - : public QObject - , public SalGenericInstance - , public SalUserEventList +class Qt5Instance : public QObject, public SalGenericInstance, public SalUserEventList { Q_OBJECT @@ -42,65 +39,67 @@ class Qt5Instance const bool m_bUseCairo; public: - std::unique_ptr< QApplication > m_pQApplication; - std::unique_ptr< char*[] > m_pFakeArgvFreeable; - std::unique_ptr< char*[] > m_pFakeArgv; - std::unique_ptr< int > m_pFakeArgc; + std::unique_ptr<QApplication> m_pQApplication; + std::unique_ptr<char* []> m_pFakeArgvFreeable; + std::unique_ptr<char* []> m_pFakeArgv; + std::unique_ptr<int> m_pFakeArgc; private Q_SLOTS: - bool ImplYield( bool bWait, bool bHandleAllCurrentEvents ); + bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); Q_SIGNALS: - bool ImplYieldSignal( bool bWait, bool bHandleAllCurrentEvents ); + bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); public: - explicit Qt5Instance( SalYieldMutex* pMutex, bool bUseCairo = false ); + explicit Qt5Instance(SalYieldMutex* pMutex, bool bUseCairo = false); virtual ~Qt5Instance() override; - virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; - virtual void DestroyFrame( SalFrame* pFrame ) override; + virtual SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override; + virtual SalFrame* CreateChildFrame(SystemParentData* pParent, + SalFrameStyleFlags nStyle) override; + virtual void DestroyFrame(SalFrame* pFrame) override; - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override; - virtual void DestroyObject( SalObject* pObject ) override; + virtual SalObject* CreateObject(SalFrame* pParent, SystemWindowData* pWindowData, + bool bShow) override; + virtual void DestroyObject(SalObject* pObject) override; - virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long &nDX, long &nDY, - DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; + virtual SalVirtualDevice* + CreateVirtualDevice(SalGraphics* pGraphics, long& nDX, long& nDY, DeviceFormat eFormat, + const SystemGraphicsData* pData = nullptr) override; - virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pSetupData ) override; - virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override; - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; - virtual void DestroyPrinter( SalPrinter* pPrinter ) override; - virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) override; - virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override; - virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override; - virtual OUString GetDefaultPrinter() override; - virtual void PostPrintersChanged() override; + virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pQueueInfo, + ImplJobSetup* pSetupData) override; + virtual void DestroyInfoPrinter(SalInfoPrinter* pPrinter) override; + virtual SalPrinter* CreatePrinter(SalInfoPrinter* pInfoPrinter) override; + virtual void DestroyPrinter(SalPrinter* pPrinter) override; + virtual void GetPrinterQueueInfo(ImplPrnQueueList* pList) override; + virtual void GetPrinterQueueState(SalPrinterQueueInfo* pInfo) override; + virtual void DeletePrinterQueueInfo(SalPrinterQueueInfo* pInfo) override; + virtual OUString GetDefaultPrinter() override; + virtual void PostPrintersChanged() override; - virtual SalTimer* CreateSalTimer() override; - virtual SalSystem* CreateSalSystem() override; - virtual SalBitmap* CreateSalBitmap() override; + virtual SalTimer* CreateSalTimer() override; + virtual SalSystem* CreateSalSystem() override; + virtual SalBitmap* CreateSalBitmap() override; - virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override; - virtual bool AnyInput( VclInputFlags nType ) override; + virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override; + virtual bool AnyInput(VclInputFlags nType) override; - virtual SalSession* CreateSalSession() override; + virtual SalSession* CreateSalSession() override; - virtual OpenGLContext* CreateOpenGLContext() override; + virtual OpenGLContext* CreateOpenGLContext() override; - virtual OUString GetConnectionIdentifier() override; + virtual OUString GetConnectionIdentifier() override; - virtual void AddToRecentDocumentList( const OUString& rFileUrl, const OUString& rMimeType, - const OUString& rDocumentService ) override; + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, + const OUString& rDocumentService) override; - virtual GenPspGraphics *CreatePrintGraphics() override; + virtual GenPspGraphics* CreatePrintGraphics() override; - virtual bool IsMainThread() const override; - - virtual void TriggerUserEventProcessing() override; - virtual void ProcessEvent( SalUserEvent aEvent ) override; + virtual bool IsMainThread() const override; + virtual void TriggerUserEventProcessing() override; + virtual void ProcessEvent(SalUserEvent aEvent) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx index 4c1afd4f482f..67b0c0c87a22 100644 --- a/vcl/qt5/Qt5Instance_Print.cxx +++ b/vcl/qt5/Qt5Instance_Print.cxx @@ -37,54 +37,57 @@ using namespace psp; * static helpers */ -static OUString getPdfDir( const PrinterInfo& rInfo ) +static OUString getPdfDir(const PrinterInfo& rInfo) { OUString aDir; sal_Int32 nIndex = 0; - while( nIndex != -1 ) + while (nIndex != -1) { - OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( aToken.startsWith( "pdf=" ) ) + OUString aToken(rInfo.m_aFeatures.getToken(0, ',', nIndex)); + if (aToken.startsWith("pdf=")) { sal_Int32 nPos = 0; - aDir = aToken.getToken( 1, '=', nPos ); - if( aDir.isEmpty() ) - aDir = OStringToOUString( OString( getenv( "HOME" ) ), osl_getThreadTextEncoding() ); + aDir = aToken.getToken(1, '=', nPos); + if (aDir.isEmpty()) + aDir = OStringToOUString(OString(getenv("HOME")), osl_getThreadTextEncoding()); break; } } return aDir; } -inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778)+0.5); } +inline int PtTo10Mu(int nPoints) { return (int)((((double)nPoints) * 35.27777778) + 0.5); } -static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData ) +static void copyJobDataToJobSetup(ImplJobSetup* pJobSetup, JobData& rData) { - pJobSetup->SetOrientation( rData.m_eOrientation == orientation::Landscape ? Orientation::Landscape : Orientation::Portrait ); + pJobSetup->SetOrientation(rData.m_eOrientation == orientation::Landscape + ? Orientation::Landscape + : Orientation::Portrait); // copy page size OUString aPaper; int width, height; - rData.m_aContext.getPageSize( aPaper, width, height ); - pJobSetup->SetPaperFormat( PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 )) ); - pJobSetup->SetPaperWidth( 0 ); - pJobSetup->SetPaperHeight( 0 ); - if( pJobSetup->GetPaperFormat() == PAPER_USER ) + rData.m_aContext.getPageSize(aPaper, width, height); + pJobSetup->SetPaperFormat( + PaperInfo::fromPSName(OUStringToOString(aPaper, RTL_TEXTENCODING_ISO_8859_1))); + pJobSetup->SetPaperWidth(0); + pJobSetup->SetPaperHeight(0); + if (pJobSetup->GetPaperFormat() == PAPER_USER) { // transform to 100dth mm - width = PtTo10Mu( width ); - height = PtTo10Mu( height ); + width = PtTo10Mu(width); + height = PtTo10Mu(height); - if( rData.m_eOrientation == psp::orientation::Portrait ) + if (rData.m_eOrientation == psp::orientation::Portrait) { - pJobSetup->SetPaperWidth( width ); - pJobSetup->SetPaperHeight( height ); + pJobSetup->SetPaperWidth(width); + pJobSetup->SetPaperHeight(height); } else { - pJobSetup->SetPaperWidth( height ); - pJobSetup->SetPaperHeight( width ); + pJobSetup->SetPaperWidth(height); + pJobSetup->SetPaperHeight(width); } } @@ -92,174 +95,155 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData ) const PPDKey* pKey = nullptr; const PPDValue* pValue = nullptr; - pJobSetup->SetPaperBin( 0xffff ); - if( rData.m_pParser ) - pKey = rData.m_pParser->getKey( OUString( "InputSlot" ) ); - if( pKey ) - pValue = rData.m_aContext.getValue( pKey ); - if( pKey && pValue ) + pJobSetup->SetPaperBin(0xffff); + if (rData.m_pParser) + pKey = rData.m_pParser->getKey(OUString("InputSlot")); + if (pKey) + pValue = rData.m_aContext.getValue(pKey); + if (pKey && pValue) { int nPaperBin; - for( nPaperBin = 0; - pValue != pKey->getValue( nPaperBin ) && - nPaperBin < pKey->countValues(); - nPaperBin++ ); + for (nPaperBin = 0; pValue != pKey->getValue(nPaperBin) && nPaperBin < pKey->countValues(); + nPaperBin++) + ; pJobSetup->SetPaperBin( - (nPaperBin == pKey->countValues() - || pValue == pKey->getDefaultValue()) - ? 0xffff : nPaperBin); + (nPaperBin == pKey->countValues() || pValue == pKey->getDefaultValue()) ? 0xffff + : nPaperBin); } // copy duplex pKey = nullptr; pValue = nullptr; - pJobSetup->SetDuplexMode( DuplexMode::Unknown ); - if( rData.m_pParser ) - pKey = rData.m_pParser->getKey( OUString( "Duplex" ) ); - if( pKey ) - pValue = rData.m_aContext.getValue( pKey ); - if( pKey && pValue ) + pJobSetup->SetDuplexMode(DuplexMode::Unknown); + if (rData.m_pParser) + pKey = rData.m_pParser->getKey(OUString("Duplex")); + if (pKey) + pValue = rData.m_aContext.getValue(pKey); + if (pKey && pValue) { - if( pValue->m_aOption.equalsIgnoreAsciiCase( "None" ) || - pValue->m_aOption.startsWithIgnoreAsciiCase( "Simplex" ) - ) + if (pValue->m_aOption.equalsIgnoreAsciiCase("None") + || pValue->m_aOption.startsWithIgnoreAsciiCase("Simplex")) { - pJobSetup->SetDuplexMode( DuplexMode::Off ); + pJobSetup->SetDuplexMode(DuplexMode::Off); } - else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexNoTumble" ) ) + else if (pValue->m_aOption.equalsIgnoreAsciiCase("DuplexNoTumble")) { - pJobSetup->SetDuplexMode( DuplexMode::LongEdge ); + pJobSetup->SetDuplexMode(DuplexMode::LongEdge); } - else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexTumble" ) ) + else if (pValue->m_aOption.equalsIgnoreAsciiCase("DuplexTumble")) { - pJobSetup->SetDuplexMode( DuplexMode::ShortEdge ); + pJobSetup->SetDuplexMode(DuplexMode::ShortEdge); } } // copy the whole context - if( pJobSetup->GetDriverData() ) - rtl_freeMemory( const_cast<sal_uInt8*>(pJobSetup->GetDriverData()) ); + if (pJobSetup->GetDriverData()) + rtl_freeMemory(const_cast<sal_uInt8*>(pJobSetup->GetDriverData())); sal_uInt32 nBytes; void* pBuffer = nullptr; - if( rData.getStreamBuffer( pBuffer, nBytes ) ) + if (rData.getStreamBuffer(pBuffer, nBytes)) { - pJobSetup->SetDriverDataLen( nBytes ); - pJobSetup->SetDriverData( static_cast<sal_uInt8*>(pBuffer) ); + pJobSetup->SetDriverDataLen(nBytes); + pJobSetup->SetDriverData(static_cast<sal_uInt8*>(pBuffer)); } else { - pJobSetup->SetDriverDataLen( 0 ); - pJobSetup->SetDriverData( nullptr ); + pJobSetup->SetDriverDataLen(0); + pJobSetup->SetDriverData(nullptr); } } -SalInfoPrinter* Qt5Instance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pJobSetup ) +SalInfoPrinter* Qt5Instance::CreateInfoPrinter(SalPrinterQueueInfo* pQueueInfo, + ImplJobSetup* pJobSetup) { // create and initialize SalInfoPrinter Qt5InfoPrinter* pPrinter = new Qt5InfoPrinter; - if( pJobSetup ) + if (pJobSetup) { - PrinterInfoManager& rManager( PrinterInfoManager::get() ); - PrinterInfo aInfo( rManager.getPrinterInfo( pQueueInfo->maPrinterName ) ); + PrinterInfoManager& rManager(PrinterInfoManager::get()); + PrinterInfo aInfo(rManager.getPrinterInfo(pQueueInfo->maPrinterName)); pPrinter->m_aJobData = aInfo; - pPrinter->m_aPrinterGfx.Init( pPrinter->m_aJobData ); + pPrinter->m_aPrinterGfx.Init(pPrinter->m_aJobData); - if( pJobSetup->GetDriverData() ) - JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), - pJobSetup->GetDriverDataLen(), aInfo ); + if (pJobSetup->GetDriverData()) + JobData::constructFromStreamBuffer(pJobSetup->GetDriverData(), + pJobSetup->GetDriverDataLen(), aInfo); - pJobSetup->SetSystem( JOBSETUP_SYSTEM_UNIX ); - pJobSetup->SetPrinterName( pQueueInfo->maPrinterName ); - pJobSetup->SetDriver( aInfo.m_aDriverName ); - copyJobDataToJobSetup( pJobSetup, aInfo ); + pJobSetup->SetSystem(JOBSETUP_SYSTEM_UNIX); + pJobSetup->SetPrinterName(pQueueInfo->maPrinterName); + pJobSetup->SetDriver(aInfo.m_aDriverName); + copyJobDataToJobSetup(pJobSetup, aInfo); } return pPrinter; } -void Qt5Instance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) -{ - delete pPrinter; -} +void Qt5Instance::DestroyInfoPrinter(SalInfoPrinter* pPrinter) { delete pPrinter; } -SalPrinter* Qt5Instance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) +SalPrinter* Qt5Instance::CreatePrinter(SalInfoPrinter* pInfoPrinter) { // create and initialize SalPrinter - Qt5Printer* pPrinter = new Qt5Printer( pInfoPrinter ); + Qt5Printer* pPrinter = new Qt5Printer(pInfoPrinter); pPrinter->m_aJobData = static_cast<Qt5InfoPrinter*>(pInfoPrinter)->m_aJobData; return pPrinter; } -void Qt5Instance::DestroyPrinter( SalPrinter* pPrinter ) -{ - delete pPrinter; -} +void Qt5Instance::DestroyPrinter(SalPrinter* pPrinter) { delete pPrinter; } -void Qt5Instance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) +void Qt5Instance::GetPrinterQueueInfo(ImplPrnQueueList* pList) { - PrinterInfoManager& rManager( PrinterInfoManager::get() ); - static const char* pNoSyncDetection = getenv( "SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION" ); - if( ! pNoSyncDetection || ! *pNoSyncDetection ) + PrinterInfoManager& rManager(PrinterInfoManager::get()); + static const char* pNoSyncDetection = getenv("SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION"); + if (!pNoSyncDetection || !*pNoSyncDetection) { // #i62663# synchronize possible asynchronouse printer detection now - rManager.checkPrintersChanged( true ); + rManager.checkPrintersChanged(true); } - ::std::vector< OUString > aPrinters; - rManager.listPrinters( aPrinters ); + ::std::vector<OUString> aPrinters; + rManager.listPrinters(aPrinters); - for( ::std::vector< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) + for (::std::vector<OUString>::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it) { - const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) ); + const PrinterInfo& rInfo(rManager.getPrinterInfo(*it)); // create new entry SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; - pInfo->maPrinterName = *it; - pInfo->maDriver = rInfo.m_aDriverName; - pInfo->maLocation = rInfo.m_aLocation; - pInfo->maComment = rInfo.m_aComment; - pInfo->mpSysData = nullptr; + pInfo->maPrinterName = *it; + pInfo->maDriver = rInfo.m_aDriverName; + pInfo->maLocation = rInfo.m_aLocation; + pInfo->maComment = rInfo.m_aComment; + pInfo->mpSysData = nullptr; sal_Int32 nIndex = 0; - while( nIndex != -1 ) + while (nIndex != -1) { - OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( aToken.startsWith( "pdf=" ) ) + OUString aToken(rInfo.m_aFeatures.getToken(0, ',', nIndex)); + if (aToken.startsWith("pdf=")) { - pInfo->maLocation = getPdfDir( rInfo ); + pInfo->maLocation = getPdfDir(rInfo); break; } } - pList->Add( pInfo ); + pList->Add(pInfo); } } -void Qt5Instance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) -{ - delete pInfo; -} +void Qt5Instance::DeletePrinterQueueInfo(SalPrinterQueueInfo* pInfo) { delete pInfo; } -void Qt5Instance::GetPrinterQueueState( SalPrinterQueueInfo* ) -{ -} +void Qt5Instance::GetPrinterQueueState(SalPrinterQueueInfo*) {} OUString Qt5Instance::GetDefaultPrinter() { - PrinterInfoManager& rManager( PrinterInfoManager::get() ); + PrinterInfoManager& rManager(PrinterInfoManager::get()); return rManager.getDefaultPrinter(); } -void Qt5Instance::PostPrintersChanged() -{ -} +void Qt5Instance::PostPrintersChanged() {} -GenPspGraphics *Qt5Instance::CreatePrintGraphics() -{ - return new GenPspGraphics(); -} +GenPspGraphics* Qt5Instance::CreatePrintGraphics() { return new GenPspGraphics(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx index ad7dfea8817e..887b949e4c42 100644 --- a/vcl/qt5/Qt5Object.cxx +++ b/vcl/qt5/Qt5Object.cxx @@ -23,63 +23,49 @@ #include <QtWidgets/QWidget> -Qt5Object::Qt5Object( Qt5Frame* pParent, bool bShow ) - : m_pParent( pParent ) +Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow) + : m_pParent(pParent) { - if ( !m_pParent || !pParent->GetQWidget() ) + if (!m_pParent || !pParent->GetQWidget()) return; - m_pQWidget.reset( new QWidget( pParent->GetQWidget() ) ); - if ( bShow ) + m_pQWidget.reset(new QWidget(pParent->GetQWidget())); + if (bShow) m_pQWidget->show(); } -Qt5Object::~Qt5Object() -{ -} +Qt5Object::~Qt5Object() {} void Qt5Object::ResetClipRegion() { - if ( m_pQWidget.get() ) - m_pRegion = QRegion( m_pQWidget->geometry() ); + if (m_pQWidget.get()) + m_pRegion = QRegion(m_pQWidget->geometry()); else m_pRegion = QRegion(); } -void Qt5Object::BeginSetClipRegion( sal_uLong ) -{ - m_pRegion = QRegion(); -} +void Qt5Object::BeginSetClipRegion(sal_uLong) { m_pRegion = QRegion(); } -void Qt5Object::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) +void Qt5Object::UnionClipRegion(long nX, long nY, long nWidth, long nHeight) { - m_pRegion += QRect( nX, nY, nWidth, nHeight ); + m_pRegion += QRect(nX, nY, nWidth, nHeight); } void Qt5Object::EndSetClipRegion() { - if ( m_pQWidget.get() ) - m_pRegion = m_pRegion.intersected( m_pQWidget->geometry() ); -} - -void Qt5Object::SetPosSize( long nX, long nY, long nWidth, long nHeight ) -{ - + if (m_pQWidget.get()) + m_pRegion = m_pRegion.intersected(m_pQWidget->geometry()); } -void Qt5Object::Show( bool bVisible ) -{ - if( m_pQWidget ) - m_pQWidget->setVisible( bVisible ); -} +void Qt5Object::SetPosSize(long nX, long nY, long nWidth, long nHeight) {} -void Qt5Object::SetForwardKey( bool bEnable ) +void Qt5Object::Show(bool bVisible) { + if (m_pQWidget) + m_pQWidget->setVisible(bVisible); } -const SystemEnvData* Qt5Object::GetSystemData() const -{ - return nullptr; -} +void Qt5Object::SetForwardKey(bool bEnable) {} +const SystemEnvData* Qt5Object::GetSystemData() const { return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Object.hxx b/vcl/qt5/Qt5Object.hxx index b66f55063d2c..df62016aded1 100644 --- a/vcl/qt5/Qt5Object.hxx +++ b/vcl/qt5/Qt5Object.hxx @@ -31,26 +31,26 @@ class Qt5Frame; class Qt5Object : public SalObject { - SystemEnvData m_aSystemData; - std::unique_ptr< QWidget > m_pQWidget; - Qt5Frame* m_pParent; - QRegion m_pRegion; + SystemEnvData m_aSystemData; + std::unique_ptr<QWidget> m_pQWidget; + Qt5Frame* m_pParent; + QRegion m_pRegion; public: - Qt5Object( Qt5Frame* pParent, bool bShow ); + Qt5Object(Qt5Frame* pParent, bool bShow); virtual ~Qt5Object() override; - virtual void ResetClipRegion() override; - virtual void BeginSetClipRegion( sal_uLong nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; - virtual void EndSetClipRegion() override; + virtual void ResetClipRegion() override; + virtual void BeginSetClipRegion(sal_uLong nRects) override; + virtual void UnionClipRegion(long nX, long nY, long nWidth, long nHeight) override; + virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; - virtual void Show( bool bVisible ) override; + virtual void SetPosSize(long nX, long nY, long nWidth, long nHeight) override; + virtual void Show(bool bVisible) override; - virtual void SetForwardKey( bool bEnable ) override; + virtual void SetForwardKey(bool bEnable) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData* GetSystemData() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Painter.cxx b/vcl/qt5/Qt5Painter.cxx index ab7789f854e5..5bf0db22b3f0 100644 --- a/vcl/qt5/Qt5Painter.cxx +++ b/vcl/qt5/Qt5Painter.cxx @@ -21,36 +21,34 @@ #include <QtGui/QColor> -Qt5Painter::Qt5Painter( Qt5Graphics &rGraphics, - bool bPrepareBrush, sal_uInt8 nTransparency ) - : m_rGraphics( rGraphics ) +Qt5Painter::Qt5Painter(Qt5Graphics& rGraphics, bool bPrepareBrush, sal_uInt8 nTransparency) + : m_rGraphics(rGraphics) { - if ( rGraphics.m_pQImage ) - begin( rGraphics.m_pQImage ); + if (rGraphics.m_pQImage) + begin(rGraphics.m_pQImage); else { - assert( rGraphics.m_pFrame ); - begin( rGraphics.m_pFrame->GetQWidget() ); + assert(rGraphics.m_pFrame); + begin(rGraphics.m_pFrame->GetQWidget()); } - if ( !rGraphics.m_aClipPath.isEmpty() ) - setClipPath( rGraphics.m_aClipPath ); + if (!rGraphics.m_aClipPath.isEmpty()) + setClipPath(rGraphics.m_aClipPath); else - setClipRegion( rGraphics.m_aClipRegion ); - if ( SALCOLOR_NONE != rGraphics.m_aLineColor ) + setClipRegion(rGraphics.m_aClipRegion); + if (SALCOLOR_NONE != rGraphics.m_aLineColor) { - QColor aColor = QColor::fromRgb( QRgb( rGraphics.m_aLineColor ) ); - aColor.setAlpha( nTransparency ); - setPen( aColor ); + QColor aColor = QColor::fromRgb(QRgb(rGraphics.m_aLineColor)); + aColor.setAlpha(nTransparency); + setPen(aColor); } else - setPen( Qt::NoPen ); - if ( bPrepareBrush && SALCOLOR_NONE != rGraphics.m_aFillColor ) + setPen(Qt::NoPen); + if (bPrepareBrush && SALCOLOR_NONE != rGraphics.m_aFillColor) { - QColor aColor = QColor::fromRgb( QRgb( rGraphics.m_aFillColor ) ); - aColor.setAlpha( nTransparency ); - setBrush( Qt::SolidPattern ); - setBrush( aColor ); + QColor aColor = QColor::fromRgb(QRgb(rGraphics.m_aFillColor)); + aColor.setAlpha(nTransparency); + setBrush(Qt::SolidPattern); + setBrush(aColor); } - setCompositionMode( rGraphics.m_eCompositionMode ); + setCompositionMode(rGraphics.m_eCompositionMode); } - diff --git a/vcl/qt5/Qt5Painter.hxx b/vcl/qt5/Qt5Painter.hxx index 864ac38fbb0f..3434d80741a4 100644 --- a/vcl/qt5/Qt5Painter.hxx +++ b/vcl/qt5/Qt5Painter.hxx @@ -28,38 +28,34 @@ class Qt5Painter final : public QPainter { - Qt5Graphics &m_rGraphics; - QRegion m_aRegion; + Qt5Graphics& m_rGraphics; + QRegion m_aRegion; public: - Qt5Painter( Qt5Graphics& rGraphics, bool bPrepareBrush = false, - sal_uInt8 nTransparency = 255 ); + Qt5Painter(Qt5Graphics& rGraphics, bool bPrepareBrush = false, sal_uInt8 nTransparency = 255); ~Qt5Painter() { - if ( m_rGraphics.m_pFrame && !m_aRegion.isEmpty() ) - m_rGraphics.m_pFrame->GetQWidget()->update( m_aRegion ); + if (m_rGraphics.m_pFrame && !m_aRegion.isEmpty()) + m_rGraphics.m_pFrame->GetQWidget()->update(m_aRegion); } void update(int nx, int ny, int nw, int nh) { - if ( m_rGraphics.m_pFrame ) - m_aRegion += QRect( nx, ny, nw, nh ); + if (m_rGraphics.m_pFrame) + m_aRegion += QRect(nx, ny, nw, nh); } - void update(const QRect &rRect) + void update(const QRect& rRect) { - if ( m_rGraphics.m_pFrame ) + if (m_rGraphics.m_pFrame) m_aRegion += rRect; } - void update(const QRectF &rRectF) - { - update( rRectF.toAlignedRect() ); - } + void update(const QRectF& rRectF) { update(rRectF.toAlignedRect()); } void update() { - if ( m_rGraphics.m_pFrame ) + if (m_rGraphics.m_pFrame) m_aRegion += m_rGraphics.m_pFrame->GetQWidget()->rect(); } }; diff --git a/vcl/qt5/Qt5Printer.cxx b/vcl/qt5/Qt5Printer.cxx index ad457a0904ba..31b305d6d340 100644 --- a/vcl/qt5/Qt5Printer.cxx +++ b/vcl/qt5/Qt5Printer.cxx @@ -19,13 +19,10 @@ #include "Qt5Printer.hxx" -bool Qt5InfoPrinter::Setup( SalFrame*, ImplJobSetup* ) -{ - return false; -} +bool Qt5InfoPrinter::Setup(SalFrame*, ImplJobSetup*) { return false; } -Qt5Printer::Qt5Printer( SalInfoPrinter* pInfoPrinter ) - : PspSalPrinter( pInfoPrinter ) +Qt5Printer::Qt5Printer(SalInfoPrinter* pInfoPrinter) + : PspSalPrinter(pInfoPrinter) { } diff --git a/vcl/qt5/Qt5Printer.hxx b/vcl/qt5/Qt5Printer.hxx index 635f880561b5..ecbf1ad92410 100644 --- a/vcl/qt5/Qt5Printer.hxx +++ b/vcl/qt5/Qt5Printer.hxx @@ -27,13 +27,13 @@ class ImplJobSetup; class Qt5InfoPrinter : public PspSalInfoPrinter { public: - virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override; + virtual bool Setup(SalFrame* pFrame, ImplJobSetup* pSetupData) override; }; class Qt5Printer : public PspSalPrinter { public: - Qt5Printer( SalInfoPrinter* pInfoPrinter ); + Qt5Printer(SalInfoPrinter* pInfoPrinter); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx index 3e0b11bc983e..a43a876fdb8d 100644 --- a/vcl/qt5/Qt5Timer.cxx +++ b/vcl/qt5/Qt5Timer.cxx @@ -25,41 +25,28 @@ Qt5Timer::Qt5Timer() { - m_aTimer.setSingleShot( true ); + m_aTimer.setSingleShot(true); // run the timer itself in the main / creator thread - connect( &m_aTimer, SIGNAL( timeout() ), - this, SLOT( timeoutActivated() ), Qt::QueuedConnection ); + connect(&m_aTimer, SIGNAL(timeout()), this, SLOT(timeoutActivated()), Qt::QueuedConnection); // QTimer::start() can be called only in its creator thread - connect( this, SIGNAL( startTimerSignal() ), - this, SLOT( startTimer() ), Qt::QueuedConnection ); + connect(this, SIGNAL(startTimerSignal()), this, SLOT(startTimer()), Qt::QueuedConnection); } -Qt5Timer::~Qt5Timer() -{ -} +Qt5Timer::~Qt5Timer() {} -void Qt5Timer::timeoutActivated() -{ - CallCallback(); -} +void Qt5Timer::timeoutActivated() { CallCallback(); } -void Qt5Timer::startTimer() -{ - m_aTimer.start(); -} +void Qt5Timer::startTimer() { m_aTimer.start(); } -void Qt5Timer::Start( sal_uIntPtr nMS ) +void Qt5Timer::Start(sal_uIntPtr nMS) { - m_aTimer.setInterval( nMS ); - if( qApp->thread() == QThread::currentThread() ) + m_aTimer.setInterval(nMS); + if (qApp->thread() == QThread::currentThread()) startTimer(); else Q_EMIT startTimerSignal(); } -void Qt5Timer::Stop() -{ - m_aTimer.stop(); -} +void Qt5Timer::Stop() { m_aTimer.stop(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Timer.hxx b/vcl/qt5/Qt5Timer.hxx index cdf890dd86ed..74f9ea712019 100644 --- a/vcl/qt5/Qt5Timer.hxx +++ b/vcl/qt5/Qt5Timer.hxx @@ -26,7 +26,7 @@ class Qt5Timer final : public QObject, public SalTimer { Q_OBJECT - QTimer m_aTimer; + QTimer m_aTimer; private Q_SLOTS: void timeoutActivated(); @@ -39,7 +39,7 @@ public: Qt5Timer(); virtual ~Qt5Timer() override; - virtual void Start( sal_uIntPtr nMS ) override; + virtual void Start(sal_uIntPtr nMS) override; virtual void Stop() override; }; diff --git a/vcl/qt5/Qt5Tools.cxx b/vcl/qt5/Qt5Tools.cxx index ec090a69dcbd..dc809675e790 100644 --- a/vcl/qt5/Qt5Tools.cxx +++ b/vcl/qt5/Qt5Tools.cxx @@ -23,33 +23,30 @@ #include <vcl/event.hxx> -void CairoDeleter::operator()(cairo_surface_t *pSurface) const -{ - cairo_surface_destroy( pSurface ); -} +void CairoDeleter::operator()(cairo_surface_t* pSurface) const { cairo_surface_destroy(pSurface); } -sal_uInt16 GetKeyModCode( Qt::KeyboardModifiers eKeyModifiers ) +sal_uInt16 GetKeyModCode(Qt::KeyboardModifiers eKeyModifiers) { sal_uInt16 nCode = 0; - if( eKeyModifiers & Qt::ShiftModifier ) + if (eKeyModifiers & Qt::ShiftModifier) nCode |= KEY_SHIFT; - if( eKeyModifiers & Qt::ControlModifier ) + if (eKeyModifiers & Qt::ControlModifier) nCode |= KEY_MOD1; - if( eKeyModifiers & Qt::AltModifier ) + if (eKeyModifiers & Qt::AltModifier) nCode |= KEY_MOD2; - if( eKeyModifiers & Qt::MetaModifier ) + if (eKeyModifiers & Qt::MetaModifier) nCode |= KEY_MOD3; return nCode; } -sal_uInt16 GetMouseModCode( Qt::MouseButtons eButtons ) +sal_uInt16 GetMouseModCode(Qt::MouseButtons eButtons) { sal_uInt16 nCode = 0; - if( eButtons & Qt::LeftButton ) + if (eButtons & Qt::LeftButton) nCode |= MOUSE_LEFT; - if( eButtons & Qt::MidButton ) + if (eButtons & Qt::MidButton) nCode |= MOUSE_MIDDLE; - if( eButtons & Qt::RightButton ) + if (eButtons & Qt::RightButton) nCode |= MOUSE_RIGHT; return nCode; } diff --git a/vcl/qt5/Qt5Tools.hxx b/vcl/qt5/Qt5Tools.hxx index b45f3c6c0738..bfd604993fd0 100644 --- a/vcl/qt5/Qt5Tools.hxx +++ b/vcl/qt5/Qt5Tools.hxx @@ -38,54 +38,56 @@ inline OUString toOUString(const QString& s) inline QString toQString(const OUString& s) { - return QString::fromUtf16( - reinterpret_cast<ushort const *>(s.getStr()), s.getLength()); + return QString::fromUtf16(reinterpret_cast<ushort const*>(s.getStr()), s.getLength()); } -inline QRect toQRect( const tools::Rectangle& rRect ) +inline QRect toQRect(const tools::Rectangle& rRect) { - return QRect( rRect.Left(), rRect.Top(), - rRect.GetWidth(), rRect.GetHeight() ); + return QRect(rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight()); } -inline QSize toQSize( const Size& rSize ) -{ - return QSize( rSize.Width(), rSize.Height() ); -} +inline QSize toQSize(const Size& rSize) { return QSize(rSize.Width(), rSize.Height()); } -inline Size toSize( const QSize& rSize ) -{ - return Size( rSize.width(), rSize.height() ); -} +inline Size toSize(const QSize& rSize) { return Size(rSize.width(), rSize.height()); } static constexpr QImage::Format Qt5_DefaultFormat32 = QImage::Format_ARGB32; -inline QImage::Format getBitFormat( sal_uInt16 nBitCount ) +inline QImage::Format getBitFormat(sal_uInt16 nBitCount) { - switch ( nBitCount ) + switch (nBitCount) { - case 1 : return QImage::Format_Mono; - case 8 : return QImage::Format_Indexed8; - case 16 : return QImage::Format_RGB16; - case 24 : return QImage::Format_RGB888; - case 32 : return Qt5_DefaultFormat32; - default : - std::abort(); - break; + case 1: + return QImage::Format_Mono; + case 8: + return QImage::Format_Indexed8; + case 16: + return QImage::Format_RGB16; + case 24: + return QImage::Format_RGB888; + case 32: + return Qt5_DefaultFormat32; + default: + std::abort(); + break; } return QImage::Format_Invalid; } -inline sal_uInt16 getFormatBits( QImage::Format eFormat ) +inline sal_uInt16 getFormatBits(QImage::Format eFormat) { - switch ( eFormat ) + switch (eFormat) { - case QImage::Format_Mono : return 1; - case QImage::Format_Indexed8 : return 8; - case QImage::Format_RGB16 : return 16; - case QImage::Format_RGB888 : return 24; - case Qt5_DefaultFormat32 : return 32; - default : + case QImage::Format_Mono: + return 1; + case QImage::Format_Indexed8: + return 8; + case QImage::Format_RGB16: + return 16; + case QImage::Format_RGB888: + return 24; + case Qt5_DefaultFormat32: + return 32; + default: std::abort(); return 0; } @@ -94,12 +96,12 @@ inline sal_uInt16 getFormatBits( QImage::Format eFormat ) typedef struct _cairo_surface cairo_surface_t; struct CairoDeleter { - void operator()(cairo_surface_t *pSurface) const; + void operator()(cairo_surface_t* pSurface) const; }; typedef std::unique_ptr<cairo_surface_t, CairoDeleter> UniqueCairoSurface; -sal_uInt16 GetKeyModCode( Qt::KeyboardModifiers eKeyModifiers ); -sal_uInt16 GetMouseModCode( Qt::MouseButtons eButtons ); +sal_uInt16 GetKeyModCode(Qt::KeyboardModifiers eKeyModifiers); +sal_uInt16 GetMouseModCode(Qt::MouseButtons eButtons); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5VirtualDevice.cxx b/vcl/qt5/Qt5VirtualDevice.cxx index 51ba1782c331..aa8ae4958e0c 100644 --- a/vcl/qt5/Qt5VirtualDevice.cxx +++ b/vcl/qt5/Qt5VirtualDevice.cxx @@ -24,81 +24,71 @@ #include <QtGui/QImage> -Qt5VirtualDevice::Qt5VirtualDevice( DeviceFormat eFormat, double fScale ) - : m_eFormat( eFormat ) - , m_fScale( fScale ) +Qt5VirtualDevice::Qt5VirtualDevice(DeviceFormat eFormat, double fScale) + : m_eFormat(eFormat) + , m_fScale(fScale) { } -Qt5VirtualDevice::~Qt5VirtualDevice() -{ -} +Qt5VirtualDevice::~Qt5VirtualDevice() {} SalGraphics* Qt5VirtualDevice::AcquireGraphics() { - assert( m_pImage ); - Qt5Graphics* pGraphics = new Qt5Graphics( m_pImage.get() ); - m_aGraphics.push_back( pGraphics ); + assert(m_pImage); + Qt5Graphics* pGraphics = new Qt5Graphics(m_pImage.get()); + m_aGraphics.push_back(pGraphics); return pGraphics; } -void Qt5VirtualDevice::ReleaseGraphics( SalGraphics* pGraphics ) +void Qt5VirtualDevice::ReleaseGraphics(SalGraphics* pGraphics) { - m_aGraphics.remove( dynamic_cast<Qt5Graphics*>( pGraphics ) ); + m_aGraphics.remove(dynamic_cast<Qt5Graphics*>(pGraphics)); delete pGraphics; } -bool Qt5VirtualDevice::SetSize( long nNewDX, long nNewDY ) +bool Qt5VirtualDevice::SetSize(long nNewDX, long nNewDY) { - return SetSizeUsingBuffer( nNewDX, nNewDY, nullptr ); + return SetSizeUsingBuffer(nNewDX, nNewDY, nullptr); } -bool Qt5VirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, - sal_uInt8 * pBuffer ) +bool Qt5VirtualDevice::SetSizeUsingBuffer(long nNewDX, long nNewDY, sal_uInt8* pBuffer) { - if( nNewDX == 0 ) + if (nNewDX == 0) nNewDX = 1; - if( nNewDY == 0 ) + if (nNewDY == 0) nNewDY = 1; - if( m_pImage && m_aFrameSize.getX() != nNewDX - && m_aFrameSize.getY() != nNewDY ) + if (m_pImage && m_aFrameSize.getX() != nNewDX && m_aFrameSize.getY() != nNewDY) return true; - m_aFrameSize = basegfx::B2IVector( nNewDX, nNewDY ); + m_aFrameSize = basegfx::B2IVector(nNewDX, nNewDY); nNewDX *= m_fScale; nNewDY *= m_fScale; if (m_eFormat == DeviceFormat::BITMASK) { - m_pImage.reset( new QImage( nNewDX, nNewDY, QImage::Format_Mono ) ); + m_pImage.reset(new QImage(nNewDX, nNewDY, QImage::Format_Mono)); } else { - if ( pBuffer ) - m_pImage.reset( new QImage( pBuffer, nNewDX, nNewDY, Qt5_DefaultFormat32 ) ); + if (pBuffer) + m_pImage.reset(new QImage(pBuffer, nNewDX, nNewDY, Qt5_DefaultFormat32)); else - m_pImage.reset( new QImage( nNewDX, nNewDY, Qt5_DefaultFormat32 ) ); + m_pImage.reset(new QImage(nNewDX, nNewDY, Qt5_DefaultFormat32)); } - m_pImage->setDevicePixelRatio( m_fScale ); + m_pImage->setDevicePixelRatio(m_fScale); // update device in existing graphics - for( auto pQt5Graph : m_aGraphics ) - pQt5Graph->ChangeQImage( m_pImage.get() ); + for (auto pQt5Graph : m_aGraphics) + pQt5Graph->ChangeQImage(m_pImage.get()); return true; } -long Qt5VirtualDevice::GetWidth() const -{ - return m_pImage ? m_aFrameSize.getX() : 0; -} +long Qt5VirtualDevice::GetWidth() const { return m_pImage ? m_aFrameSize.getX() : 0; } -long Qt5VirtualDevice::GetHeight() const -{ - return m_pImage ? m_aFrameSize.getY() : 0; -} +long Qt5VirtualDevice::GetHeight() const { return m_pImage ? m_aFrameSize.getY() : 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5VirtualDevice.hxx b/vcl/qt5/Qt5VirtualDevice.hxx index 23d464d43751..56f3107e4cc7 100644 --- a/vcl/qt5/Qt5VirtualDevice.hxx +++ b/vcl/qt5/Qt5VirtualDevice.hxx @@ -31,24 +31,22 @@ enum class DeviceFormat; class Qt5VirtualDevice : public SalVirtualDevice { - std::list< Qt5Graphics* > m_aGraphics; - std::unique_ptr< QImage > m_pImage; - DeviceFormat m_eFormat; - basegfx::B2IVector m_aFrameSize; - double m_fScale; + std::list<Qt5Graphics*> m_aGraphics; + std::unique_ptr<QImage> m_pImage; + DeviceFormat m_eFormat; + basegfx::B2IVector m_aFrameSize; + double m_fScale; public: - Qt5VirtualDevice( DeviceFormat eFormat, double fScale ); + Qt5VirtualDevice(DeviceFormat eFormat, double fScale); virtual ~Qt5VirtualDevice() override; // SalVirtualDevice - virtual SalGraphics* AcquireGraphics() override; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics(SalGraphics* pGraphics) override; - virtual bool SetSize( long nNewDX, long nNewDY ) override; - virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, - sal_uInt8 * pBuffer - ) override; + virtual bool SetSize(long nNewDX, long nNewDY) override; + virtual bool SetSizeUsingBuffer(long nNewDX, long nNewDY, sal_uInt8* pBuffer) override; // SalGeometryProvider virtual long GetWidth() const override; diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx index 8d55aaa6832b..c1cb8e7ce9ff 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/Qt5Widget.cxx @@ -36,125 +36,120 @@ #include <cairo.h> #include <headless/svpgdi.hxx> -Qt5Widget::Qt5Widget( Qt5Frame &rFrame, QWidget *parent, Qt::WindowFlags f ) - : QWidget( parent, f ) - , m_pFrame( &rFrame ) +Qt5Widget::Qt5Widget(Qt5Frame& rFrame, QWidget* parent, Qt::WindowFlags f) + : QWidget(parent, f) + , m_pFrame(&rFrame) { create(); - setMouseTracking( true ); - setFocusPolicy( Qt::StrongFocus ); + setMouseTracking(true); + setFocusPolicy(Qt::StrongFocus); } -Qt5Widget::~Qt5Widget() -{ -} +Qt5Widget::~Qt5Widget() {} -void Qt5Widget::paintEvent( QPaintEvent *pEvent ) +void Qt5Widget::paintEvent(QPaintEvent* pEvent) { - QPainter p( this ); - if( m_pFrame->m_bUseCairo ) + QPainter p(this); + if (m_pFrame->m_bUseCairo) { - cairo_surface_t *pSurface = m_pFrame->m_pSurface.get(); - cairo_surface_flush( pSurface ); + cairo_surface_t* pSurface = m_pFrame->m_pSurface.get(); + cairo_surface_flush(pSurface); - QImage aImage( cairo_image_surface_get_data( pSurface ), - size().width(), size().height(), Qt5_DefaultFormat32 ); - p.drawImage( pEvent->rect().topLeft(), aImage, pEvent->rect() ); + QImage aImage(cairo_image_surface_get_data(pSurface), size().width(), size().height(), + Qt5_DefaultFormat32); + p.drawImage(pEvent->rect().topLeft(), aImage, pEvent->rect()); } else - p.drawImage( pEvent->rect().topLeft(), - *m_pFrame->m_pQImage, pEvent->rect() ); + p.drawImage(pEvent->rect().topLeft(), *m_pFrame->m_pQImage, pEvent->rect()); } -void Qt5Widget::resizeEvent( QResizeEvent* ) +void Qt5Widget::resizeEvent(QResizeEvent*) { - if( m_pFrame->m_bUseCairo ) + if (m_pFrame->m_bUseCairo) { int width = size().width(); int height = size().height(); - cairo_surface_t *pSurface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, width, height ); - cairo_surface_set_user_data( pSurface, SvpSalGraphics::getDamageKey(), - &m_pFrame->m_aDamageHandler, nullptr ); - m_pFrame->m_pSvpGraphics->setSurface( pSurface, basegfx::B2IVector(width, height) ); - m_pFrame->m_pSurface.reset( pSurface ); + cairo_surface_t* pSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cairo_surface_set_user_data(pSurface, SvpSalGraphics::getDamageKey(), + &m_pFrame->m_aDamageHandler, nullptr); + m_pFrame->m_pSvpGraphics->setSurface(pSurface, basegfx::B2IVector(width, height)); + m_pFrame->m_pSurface.reset(pSurface); } else { - QImage *pImage = new QImage( size(), Qt5_DefaultFormat32 ); - m_pFrame->m_pQt5Graphics->ChangeQImage( pImage ); - m_pFrame->m_pQImage.reset( pImage ); + QImage* pImage = new QImage(size(), Qt5_DefaultFormat32); + m_pFrame->m_pQt5Graphics->ChangeQImage(pImage); + m_pFrame->m_pQImage.reset(pImage); } - m_pFrame->CallCallback( SalEvent::Resize, nullptr ); + m_pFrame->CallCallback(SalEvent::Resize, nullptr); } -void Qt5Widget::handleMouseButtonEvent( QMouseEvent *pEvent, bool bReleased ) +void Qt5Widget::handleMouseButtonEvent(QMouseEvent* pEvent, bool bReleased) { SalMouseEvent aEvent; - switch( pEvent->button() ) + switch (pEvent->button()) { - case Qt::LeftButton: aEvent.mnButton = MOUSE_LEFT; break; - case Qt::MidButton: aEvent.mnButton = MOUSE_MIDDLE; break; - case Qt::RightButton: aEvent.mnButton = MOUSE_RIGHT; break; - default: return; + case Qt::LeftButton: + aEvent.mnButton = MOUSE_LEFT; + break; + case Qt::MidButton: + aEvent.mnButton = MOUSE_MIDDLE; + break; + case Qt::RightButton: + aEvent.mnButton = MOUSE_RIGHT; + break; + default: + return; } - aEvent.mnTime = pEvent->timestamp(); - aEvent.mnX = (long) pEvent->pos().x(); - aEvent.mnY = (long) pEvent->pos().y(); - aEvent.mnCode = GetKeyModCode( pEvent->modifiers() ) | - GetMouseModCode( pEvent->buttons() ); + aEvent.mnTime = pEvent->timestamp(); + aEvent.mnX = (long)pEvent->pos().x(); + aEvent.mnY = (long)pEvent->pos().y(); + aEvent.mnCode = GetKeyModCode(pEvent->modifiers()) | GetMouseModCode(pEvent->buttons()); SalEvent nEventType; - if ( bReleased ) + if (bReleased) nEventType = SalEvent::MouseButtonUp; else nEventType = SalEvent::MouseButtonDown; - m_pFrame->CallCallback( nEventType, &aEvent ); + m_pFrame->CallCallback(nEventType, &aEvent); } -void Qt5Widget::mousePressEvent( QMouseEvent *pEvent ) -{ - handleMouseButtonEvent( pEvent, false ); -} +void Qt5Widget::mousePressEvent(QMouseEvent* pEvent) { handleMouseButtonEvent(pEvent, false); } -void Qt5Widget::mouseReleaseEvent( QMouseEvent *pEvent ) -{ - handleMouseButtonEvent( pEvent, true ); -} +void Qt5Widget::mouseReleaseEvent(QMouseEvent* pEvent) { handleMouseButtonEvent(pEvent, true); } -void Qt5Widget::mouseMoveEvent( QMouseEvent *pEvent ) +void Qt5Widget::mouseMoveEvent(QMouseEvent* pEvent) { SalMouseEvent aEvent; aEvent.mnTime = pEvent->timestamp(); - aEvent.mnX = pEvent->pos().x(); - aEvent.mnY = pEvent->pos().y(); - aEvent.mnCode = GetKeyModCode( pEvent->modifiers() ) | - GetMouseModCode( pEvent->buttons() ); + aEvent.mnX = pEvent->pos().x(); + aEvent.mnY = pEvent->pos().y(); + aEvent.mnCode = GetKeyModCode(pEvent->modifiers()) | GetMouseModCode(pEvent->buttons()); aEvent.mnButton = 0; - m_pFrame->CallCallback( SalEvent::MouseMove, &aEvent ); + m_pFrame->CallCallback(SalEvent::MouseMove, &aEvent); pEvent->accept(); } -void Qt5Widget::wheelEvent( QWheelEvent *pEvent ) +void Qt5Widget::wheelEvent(QWheelEvent* pEvent) { SalWheelMouseEvent aEvent; aEvent.mnTime = pEvent->timestamp(); - aEvent.mnX = pEvent->pos().x(); - aEvent.mnY = pEvent->pos().y(); - aEvent.mnCode = GetKeyModCode( pEvent->modifiers() ) | - GetMouseModCode( pEvent->buttons() ); + aEvent.mnX = pEvent->pos().x(); + aEvent.mnY = pEvent->pos().y(); + aEvent.mnCode = GetKeyModCode(pEvent->modifiers()) | GetMouseModCode(pEvent->buttons()); int nDelta = pEvent->angleDelta().x(); aEvent.mbHorz = true; - if ( !nDelta ) + if (!nDelta) { nDelta = pEvent->angleDelta().y(); aEvent.mbHorz = false; } - if ( !nDelta ) + if (!nDelta) return; nDelta /= 8; @@ -162,117 +157,189 @@ void Qt5Widget::wheelEvent( QWheelEvent *pEvent ) aEvent.mnNotchDelta = nDelta > 0 ? 1 : -1; aEvent.mnScrollLines = 3; - m_pFrame->CallCallback( SalEvent::WheelMouse, &aEvent ); + m_pFrame->CallCallback(SalEvent::WheelMouse, &aEvent); pEvent->accept(); } -void Qt5Widget::moveEvent( QMoveEvent* ) -{ - m_pFrame->CallCallback( SalEvent::Move, nullptr ); -} +void Qt5Widget::moveEvent(QMoveEvent*) { m_pFrame->CallCallback(SalEvent::Move, nullptr); } -void Qt5Widget::showEvent( QShowEvent* ) +void Qt5Widget::showEvent(QShowEvent*) { - QSize aSize( m_pFrame->m_pQWidget->size() ); - SalPaintEvent aPaintEvt( 0, 0, aSize.width(), aSize.height(), true ); - m_pFrame->CallCallback( SalEvent::Paint, &aPaintEvt ); + QSize aSize(m_pFrame->m_pQWidget->size()); + SalPaintEvent aPaintEvt(0, 0, aSize.width(), aSize.height(), true); + m_pFrame->CallCallback(SalEvent::Paint, &aPaintEvt); } -static sal_uInt16 GetKeyCode( int keyval ) +static sal_uInt16 GetKeyCode(int keyval) { sal_uInt16 nCode = 0; - if( keyval >= Qt::Key_0 && keyval <= Qt::Key_9 ) - nCode = KEY_0 + ( keyval - Qt::Key_0 ); - else if( keyval >= Qt::Key_A && keyval <= Qt::Key_Z ) - nCode = KEY_A + ( keyval - Qt::Key_A ); - else if( keyval >= Qt::Key_F1 && keyval <= Qt::Key_F26 ) + if (keyval >= Qt::Key_0 && keyval <= Qt::Key_9) + nCode = KEY_0 + (keyval - Qt::Key_0); + else if (keyval >= Qt::Key_A && keyval <= Qt::Key_Z) + nCode = KEY_A + (keyval - Qt::Key_A); + else if (keyval >= Qt::Key_F1 && keyval <= Qt::Key_F26) nCode = KEY_F1 + (keyval - Qt::Key_F1); else { - switch( keyval ) + switch (keyval) { - case Qt::Key_Down: nCode = KEY_DOWN; break; - case Qt::Key_Up: nCode = KEY_UP; break; - case Qt::Key_Left: nCode = KEY_LEFT; break; - case Qt::Key_Right: nCode = KEY_RIGHT; break; - case Qt::Key_Home: nCode = KEY_HOME; break; - case Qt::Key_End: nCode = KEY_END; break; - case Qt::Key_PageUp: nCode = KEY_PAGEUP; break; - case Qt::Key_PageDown: nCode = KEY_PAGEDOWN; break; - case Qt::Key_Return: nCode = KEY_RETURN; break; - case Qt::Key_Escape: nCode = KEY_ESCAPE; break; - case Qt::Key_Tab: nCode = KEY_TAB; break; - case Qt::Key_Backspace: nCode = KEY_BACKSPACE; break; - case Qt::Key_Space: nCode = KEY_SPACE; break; - case Qt::Key_Insert: nCode = KEY_INSERT; break; - case Qt::Key_Delete: nCode = KEY_DELETE; break; - case Qt::Key_Plus: nCode = KEY_ADD; break; - case Qt::Key_Minus: nCode = KEY_SUBTRACT; break; - case Qt::Key_Asterisk: nCode = KEY_MULTIPLY; break; - case Qt::Key_Slash: nCode = KEY_DIVIDE; break; - case Qt::Key_Period: nCode = KEY_POINT; break; - case Qt::Key_Comma: nCode = KEY_COMMA; break; - case Qt::Key_Less: nCode = KEY_LESS; break; - case Qt::Key_Greater: nCode = KEY_GREATER; break; - case Qt::Key_Equal: nCode = KEY_EQUAL; break; - case Qt::Key_Find: nCode = KEY_FIND; break; - case Qt::Key_Menu: nCode = KEY_CONTEXTMENU; break; - case Qt::Key_Help: nCode = KEY_HELP; break; - case Qt::Key_Undo: nCode = KEY_UNDO; break; - case Qt::Key_Redo: nCode = KEY_REPEAT; break; - case Qt::Key_Cancel: nCode = KEY_F11; break; - case Qt::Key_AsciiTilde: nCode = KEY_TILDE; break; - case Qt::Key_QuoteLeft: nCode = KEY_QUOTELEFT; break; - case Qt::Key_BracketLeft: nCode = KEY_BRACKETLEFT; break; - case Qt::Key_BracketRight: nCode = KEY_BRACKETRIGHT; break; - case Qt::Key_Semicolon: nCode = KEY_SEMICOLON; break; - case Qt::Key_Copy: nCode = KEY_COPY; break; - case Qt::Key_Cut: nCode = KEY_CUT; break; - case Qt::Key_Open: nCode = KEY_OPEN; break; - case Qt::Key_Paste: nCode = KEY_PASTE; break; + case Qt::Key_Down: + nCode = KEY_DOWN; + break; + case Qt::Key_Up: + nCode = KEY_UP; + break; + case Qt::Key_Left: + nCode = KEY_LEFT; + break; + case Qt::Key_Right: + nCode = KEY_RIGHT; + break; + case Qt::Key_Home: + nCode = KEY_HOME; + break; + case Qt::Key_End: + nCode = KEY_END; + break; + case Qt::Key_PageUp: + nCode = KEY_PAGEUP; + break; + case Qt::Key_PageDown: + nCode = KEY_PAGEDOWN; + break; + case Qt::Key_Return: + nCode = KEY_RETURN; + break; + case Qt::Key_Escape: + nCode = KEY_ESCAPE; + break; + case Qt::Key_Tab: + nCode = KEY_TAB; + break; + case Qt::Key_Backspace: + nCode = KEY_BACKSPACE; + break; + case Qt::Key_Space: + nCode = KEY_SPACE; + break; + case Qt::Key_Insert: + nCode = KEY_INSERT; + break; + case Qt::Key_Delete: + nCode = KEY_DELETE; + break; + case Qt::Key_Plus: + nCode = KEY_ADD; + break; + case Qt::Key_Minus: + nCode = KEY_SUBTRACT; + break; + case Qt::Key_Asterisk: + nCode = KEY_MULTIPLY; + break; + case Qt::Key_Slash: + nCode = KEY_DIVIDE; + break; + case Qt::Key_Period: + nCode = KEY_POINT; + break; + case Qt::Key_Comma: + nCode = KEY_COMMA; + break; + case Qt::Key_Less: + nCode = KEY_LESS; + break; + case Qt::Key_Greater: + nCode = KEY_GREATER; + break; + case Qt::Key_Equal: + nCode = KEY_EQUAL; + break; + case Qt::Key_Find: + nCode = KEY_FIND; + break; + case Qt::Key_Menu: + nCode = KEY_CONTEXTMENU; + break; + case Qt::Key_Help: + nCode = KEY_HELP; + break; + case Qt::Key_Undo: + nCode = KEY_UNDO; + break; + case Qt::Key_Redo: + nCode = KEY_REPEAT; + break; + case Qt::Key_Cancel: + nCode = KEY_F11; + break; + case Qt::Key_AsciiTilde: + nCode = KEY_TILDE; + break; + case Qt::Key_QuoteLeft: + nCode = KEY_QUOTELEFT; + break; + case Qt::Key_BracketLeft: + nCode = KEY_BRACKETLEFT; + break; + case Qt::Key_BracketRight: + nCode = KEY_BRACKETRIGHT; + break; + case Qt::Key_Semicolon: + nCode = KEY_SEMICOLON; + break; + case Qt::Key_Copy: + nCode = KEY_COPY; + break; + case Qt::Key_Cut: + nCode = KEY_CUT; + break; + case Qt::Key_Open: + nCode = KEY_OPEN; + break; + case Qt::Key_Paste: + nCode = KEY_PASTE; + break; } } return nCode; } -bool Qt5Widget::handleKeyEvent( QKeyEvent *pEvent, bool bDown ) +bool Qt5Widget::handleKeyEvent(QKeyEvent* pEvent, bool bDown) { SalKeyEvent aEvent; - aEvent.mnCharCode = (pEvent->text().isEmpty() ? 0 : pEvent->text().at( 0 ).unicode()); - aEvent.mnRepeat = 0; - aEvent.mnCode = GetKeyCode( pEvent->key() ); - aEvent.mnCode |= GetKeyModCode( pEvent->modifiers() ); + aEvent.mnCharCode = (pEvent->text().isEmpty() ? 0 : pEvent->text().at(0).unicode()); + aEvent.mnRepeat = 0; + aEvent.mnCode = GetKeyCode(pEvent->key()); + aEvent.mnCode |= GetKeyModCode(pEvent->modifiers()); bool bStopProcessingKey; - if ( bDown ) - bStopProcessingKey = m_pFrame->CallCallback( SalEvent::KeyInput, &aEvent ); + if (bDown) + bStopProcessingKey = m_pFrame->CallCallback(SalEvent::KeyInput, &aEvent); else - bStopProcessingKey = m_pFrame->CallCallback( SalEvent::KeyUp, &aEvent ); + bStopProcessingKey = m_pFrame->CallCallback(SalEvent::KeyUp, &aEvent); return bStopProcessingKey; } -void Qt5Widget::keyPressEvent( QKeyEvent *pEvent ) +void Qt5Widget::keyPressEvent(QKeyEvent* pEvent) { - if ( handleKeyEvent( pEvent, true ) ) + if (handleKeyEvent(pEvent, true)) pEvent->accept(); } -void Qt5Widget::keyReleaseEvent( QKeyEvent *pEvent ) +void Qt5Widget::keyReleaseEvent(QKeyEvent* pEvent) { - if ( handleKeyEvent( pEvent, false ) ) + if (handleKeyEvent(pEvent, false)) pEvent->accept(); } -void Qt5Widget::focusInEvent( QFocusEvent* ) -{ - m_pFrame->CallCallback( SalEvent::GetFocus, nullptr ); -} +void Qt5Widget::focusInEvent(QFocusEvent*) { m_pFrame->CallCallback(SalEvent::GetFocus, nullptr); } -void Qt5Widget::focusOutEvent( QFocusEvent* ) +void Qt5Widget::focusOutEvent(QFocusEvent*) { - m_pFrame->CallCallback( SalEvent::LoseFocus, nullptr ); + m_pFrame->CallCallback(SalEvent::LoseFocus, nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Widget.hxx b/vcl/qt5/Qt5Widget.hxx index 8ba955e8cf69..83077796298f 100644 --- a/vcl/qt5/Qt5Widget.hxx +++ b/vcl/qt5/Qt5Widget.hxx @@ -32,33 +32,30 @@ class QResizeEvent; class QShowEvent; class QWheelEvent; -class Qt5Widget - : public QWidget +class Qt5Widget : public QWidget { Q_OBJECT - Qt5Frame *m_pFrame; + Qt5Frame* m_pFrame; - bool handleKeyEvent( QKeyEvent*, bool ); - void handleMouseButtonEvent( QMouseEvent*, bool ); + bool handleKeyEvent(QKeyEvent*, bool); + void handleMouseButtonEvent(QMouseEvent*, bool); - virtual void focusInEvent( QFocusEvent* ) override; - virtual void focusOutEvent( QFocusEvent* ) override; - virtual void keyPressEvent( QKeyEvent* ) override; - virtual void keyReleaseEvent( QKeyEvent* ) override; - virtual void mouseMoveEvent( QMouseEvent*) override; - virtual void mousePressEvent( QMouseEvent*) override; - virtual void mouseReleaseEvent( QMouseEvent*) override; - virtual void moveEvent( QMoveEvent* ) override; - virtual void paintEvent( QPaintEvent* ) override; - virtual void resizeEvent( QResizeEvent* ) override; - virtual void showEvent( QShowEvent* ) override; - virtual void wheelEvent( QWheelEvent* ) override; + virtual void focusInEvent(QFocusEvent*) override; + virtual void focusOutEvent(QFocusEvent*) override; + virtual void keyPressEvent(QKeyEvent*) override; + virtual void keyReleaseEvent(QKeyEvent*) override; + virtual void mouseMoveEvent(QMouseEvent*) override; + virtual void mousePressEvent(QMouseEvent*) override; + virtual void mouseReleaseEvent(QMouseEvent*) override; + virtual void moveEvent(QMoveEvent*) override; + virtual void paintEvent(QPaintEvent*) override; + virtual void resizeEvent(QResizeEvent*) override; + virtual void showEvent(QShowEvent*) override; + virtual void wheelEvent(QWheelEvent*) override; public: - Qt5Widget( Qt5Frame &rFrame, - QWidget *parent = Q_NULLPTR, - Qt::WindowFlags f = Qt::WindowFlags() ); + Qt5Widget(Qt5Frame& rFrame, QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); virtual ~Qt5Widget() override; }; diff --git a/vcl/qt5/tst_exclude_posted_events.hxx b/vcl/qt5/tst_exclude_posted_events.hxx index c07ca895a9dc..d12c012e4547 100644 --- a/vcl/qt5/tst_exclude_posted_events.hxx +++ b/vcl/qt5/tst_exclude_posted_events.hxx @@ -26,42 +26,41 @@ const QEvent::Type eventType = QEvent::User; -class TestExcludePostedEvents - : public QObject +class TestExcludePostedEvents : public QObject { Q_OBJECT - public: - TestExcludePostedEvents(); - virtual bool event( QEvent* e ) override; - bool processed; +public: + TestExcludePostedEvents(); + virtual bool event(QEvent* e) override; + bool processed; }; TestExcludePostedEvents::TestExcludePostedEvents() - : processed( false ) + : processed(false) { } -bool TestExcludePostedEvents::event( QEvent* e ) +bool TestExcludePostedEvents::event(QEvent* e) { - if( e->type() == eventType ) + if (e->type() == eventType) processed = true; - return QObject::event( e ); + return QObject::event(e); } -#define QVERIFY(a) \ - if (!a) return 1; +#define QVERIFY(a) \ + if (!a) \ + return 1; static int tst_excludePostedEvents() { TestExcludePostedEvents test; - QCoreApplication::postEvent( &test, new QEvent( eventType )); + QCoreApplication::postEvent(&test, new QEvent(eventType)); QEventLoop loop; - loop.processEvents(QEventLoop::ExcludeUserInputEvents - | QEventLoop::ExcludeSocketNotifiers -// | QEventLoop::WaitForMoreEvents - | QEventLoop::X11ExcludeTimers); - QVERIFY( !test.processed ); + loop.processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers + // | QEventLoop::WaitForMoreEvents + | QEventLoop::X11ExcludeTimers); + QVERIFY(!test.processed); loop.processEvents(); - QVERIFY( test.processed ); + QVERIFY(test.processed); return 0; } diff --git a/vcl/qt5/tst_exclude_socket_notifiers.hxx b/vcl/qt5/tst_exclude_socket_notifiers.hxx index d0acafede239..7f4d2e3d6244 100644 --- a/vcl/qt5/tst_exclude_socket_notifiers.hxx +++ b/vcl/qt5/tst_exclude_socket_notifiers.hxx @@ -26,55 +26,53 @@ #include <QtCore/QSocketNotifier> #include <unistd.h> -class TestExcludeSocketNotifiers - : public QObject +class TestExcludeSocketNotifiers : public QObject { Q_OBJECT - public: - TestExcludeSocketNotifiers( const int* pipes ); - virtual ~TestExcludeSocketNotifiers() override; - bool received; - public slots: - void slotReceived(); - private: - const int* pipes; +public: + TestExcludeSocketNotifiers(const int* pipes); + virtual ~TestExcludeSocketNotifiers() override; + bool received; +public slots: + void slotReceived(); + +private: + const int* pipes; }; -TestExcludeSocketNotifiers::TestExcludeSocketNotifiers( const int* thePipes ) - : received( false ) - , pipes( thePipes ) +TestExcludeSocketNotifiers::TestExcludeSocketNotifiers(const int* thePipes) + : received(false) + , pipes(thePipes) { } TestExcludeSocketNotifiers::~TestExcludeSocketNotifiers() { - close( pipes[ 0 ] ); - close( pipes[ 1 ] ); + close(pipes[0]); + close(pipes[1]); } -void TestExcludeSocketNotifiers::slotReceived() -{ - received = true; -} +void TestExcludeSocketNotifiers::slotReceived() { received = true; } -#define QVERIFY(a) \ - if (!a) return 1; +#define QVERIFY(a) \ + if (!a) \ + return 1; static int tst_processEventsExcludeSocket() { - int pipes[ 2 ]; - if( pipe( pipes ) < 0 ) + int pipes[2]; + if (pipe(pipes) < 0) return 1; - TestExcludeSocketNotifiers test( pipes ); - QSocketNotifier notifier( pipes[ 0 ], QSocketNotifier::Read ); - QObject::connect( ¬ifier, SIGNAL( activated( int )), &test, SLOT( slotReceived())); + TestExcludeSocketNotifiers test(pipes); + QSocketNotifier notifier(pipes[0], QSocketNotifier::Read); + QObject::connect(¬ifier, SIGNAL(activated(int)), &test, SLOT(slotReceived())); char dummy = 'a'; - if( 1 != write( pipes[ 1 ], &dummy, 1 ) ) + if (1 != write(pipes[1], &dummy, 1)) return 1; QEventLoop loop; - loop.processEvents( QEventLoop::ExcludeSocketNotifiers ); - QVERIFY( !test.received ); + loop.processEvents(QEventLoop::ExcludeSocketNotifiers); + QVERIFY(!test.received); loop.processEvents(); - QVERIFY( test.received ); + QVERIFY(test.received); return 0; } diff --git a/vcl/source/helper/errcode.cxx b/vcl/source/helper/errcode.cxx index e1554020fced..0e1d9430e1c7 100644 --- a/vcl/source/helper/errcode.cxx +++ b/vcl/source/helper/errcode.cxx @@ -21,9 +21,7 @@ VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err) { - os << err.toHexString() - << "(" - << (err.IsWarning() ? "Warning" : "Error"); + os << err.toHexString() << "(" << (err.IsWarning() ? "Warning" : "Error"); if (err.IsDynamic()) os << " Dynamic"; else @@ -31,50 +29,129 @@ VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err) os << " Area:"; switch (err.GetArea()) { - case ErrCodeArea::Io: os << "Io"; break; - case ErrCodeArea::Sv: os << "Sv"; break; - case ErrCodeArea::Sfx: os << "Sfx"; break; - case ErrCodeArea::Inet: os << "Inet"; break; - case ErrCodeArea::Vcl: os << "Vcl"; break; - case ErrCodeArea::Svx: os << "Svx"; break; - case ErrCodeArea::So: os << "So"; break; - case ErrCodeArea::Sbx: os << "Sbx"; break; - case ErrCodeArea::Db: os << "Db"; break; - case ErrCodeArea::Java: os << "Java"; break; - case ErrCodeArea::Uui: os << "Uui"; break; - case ErrCodeArea::Lib2: os << "Lib2"; break; - case ErrCodeArea::Chaos: os << "Chaos"; break; - case ErrCodeArea::Sc: os << "Sc"; break; - case ErrCodeArea::Sd: os << "Sd"; break; - case ErrCodeArea::Sw: os << "Sw"; break; - default: os << "Unknown"; + case ErrCodeArea::Io: + os << "Io"; + break; + case ErrCodeArea::Sv: + os << "Sv"; + break; + case ErrCodeArea::Sfx: + os << "Sfx"; + break; + case ErrCodeArea::Inet: + os << "Inet"; + break; + case ErrCodeArea::Vcl: + os << "Vcl"; + break; + case ErrCodeArea::Svx: + os << "Svx"; + break; + case ErrCodeArea::So: + os << "So"; + break; + case ErrCodeArea::Sbx: + os << "Sbx"; + break; + case ErrCodeArea::Db: + os << "Db"; + break; + case ErrCodeArea::Java: + os << "Java"; + break; + case ErrCodeArea::Uui: + os << "Uui"; + break; + case ErrCodeArea::Lib2: + os << "Lib2"; + break; + case ErrCodeArea::Chaos: + os << "Chaos"; + break; + case ErrCodeArea::Sc: + os << "Sc"; + break; + case ErrCodeArea::Sd: + os << "Sd"; + break; + case ErrCodeArea::Sw: + os << "Sw"; + break; + default: + os << "Unknown"; } os << " Class:"; switch (err.GetClass()) { - case ErrCodeClass::NONE: os << "NONE"; break; - case ErrCodeClass::Abort: os << "Abort"; break; - case ErrCodeClass::General: os << "General"; break; - case ErrCodeClass::NotExists: os << "NotExists"; break; - case ErrCodeClass::AlreadyExists: os << "AlreadyExists"; break; - case ErrCodeClass::Access: os << "Access"; break; - case ErrCodeClass::Path: os << "Path"; break; - case ErrCodeClass::Locking: os << "Locking"; break; - case ErrCodeClass::Parameter: os << "Parameter"; break; - case ErrCodeClass::Space: os << "Space"; break; - case ErrCodeClass::NotSupported: os << "NotSupported"; break; - case ErrCodeClass::Read: os << "Read"; break; - case ErrCodeClass::Write: os << "Write"; break; - case ErrCodeClass::Unknown: os << "Unknown"; break; - case ErrCodeClass::Version: os << "Version"; break; - case ErrCodeClass::Format: os << "Format"; break; - case ErrCodeClass::Create: os << "Create"; break; - case ErrCodeClass::Import: os << "Import"; break; - case ErrCodeClass::Export: os << "Export"; break; - case ErrCodeClass::So: os << "So"; break; - case ErrCodeClass::Sbx: os << "Sbx"; break; - case ErrCodeClass::Runtime: os << "Runtime"; break; - case ErrCodeClass::Compiler: os << "Compiler"; break; + case ErrCodeClass::NONE: + os << "NONE"; + break; + case ErrCodeClass::Abort: + os << "Abort"; + break; + case ErrCodeClass::General: + os << "General"; + break; + case ErrCodeClass::NotExists: + os << "NotExists"; + break; + case ErrCodeClass::AlreadyExists: + os << "AlreadyExists"; + break; + case ErrCodeClass::Access: + os << "Access"; + break; + case ErrCodeClass::Path: + os << "Path"; + break; + case ErrCodeClass::Locking: + os << "Locking"; + break; + case ErrCodeClass::Parameter: + os << "Parameter"; + break; + case ErrCodeClass::Space: + os << "Space"; + break; + case ErrCodeClass::NotSupported: + os << "NotSupported"; + break; + case ErrCodeClass::Read: + os << "Read"; + break; + case ErrCodeClass::Write: + os << "Write"; + break; + case ErrCodeClass::Unknown: + os << "Unknown"; + break; + case ErrCodeClass::Version: + os << "Version"; + break; + case ErrCodeClass::Format: + os << "Format"; + break; + case ErrCodeClass::Create: + os << "Create"; + break; + case ErrCodeClass::Import: + os << "Import"; + break; + case ErrCodeClass::Export: + os << "Export"; + break; + case ErrCodeClass::So: + os << "So"; + break; + case ErrCodeClass::Sbx: + os << "Sbx"; + break; + case ErrCodeClass::Runtime: + os << "Runtime"; + break; + case ErrCodeClass::Compiler: + os << "Compiler"; + break; } os << " Code:" << OUString::number(err.GetRest()); } diff --git a/vcl/workben/scrtffuzzer.cxx b/vcl/workben/scrtffuzzer.cxx index 9961389a83a2..5221ef045a17 100644 --- a/vcl/workben/scrtffuzzer.cxx +++ b/vcl/workben/scrtffuzzer.cxx @@ -13,9 +13,9 @@ #include <com/sun/star/ucb/XUniversalContentBroker.hpp> #include "commonfuzzer.hxx" -extern "C" bool TestImportCalcRTF(SvStream &rStream); +extern "C" bool TestImportCalcRTF(SvStream& rStream); -extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) +extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) { if (__lsan_disable) __lsan_disable(); @@ -23,12 +23,16 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) CommonInitialize(argc, argv); // initialise unconfigured UCB: - css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb(comphelper::getProcessServiceFactory()-> - createInstance("com.sun.star.ucb.UniversalContentBroker"), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb( + comphelper::getProcessServiceFactory()->createInstance( + "com.sun.star.ucb.UniversalContentBroker"), + css::uno::UNO_QUERY_THROW); css::uno::Sequence<css::uno::Any> aArgs(1); aArgs[0] <<= OUString("NoConfig"); - css::uno::Reference<css::ucb::XContentProvider> xFileProvider(comphelper::getProcessServiceFactory()-> - createInstanceWithArguments("com.sun.star.ucb.FileContentProvider", aArgs), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::ucb::XContentProvider> xFileProvider( + comphelper::getProcessServiceFactory()->createInstanceWithArguments( + "com.sun.star.ucb.FileContentProvider", aArgs), + css::uno::UNO_QUERY_THROW); xUcb->registerContentProvider(xFileProvider, "file", true); if (__lsan_enable) diff --git a/vcl/workben/xlsfuzzer.cxx b/vcl/workben/xlsfuzzer.cxx index 07eaa008caf4..014e7b917aca 100644 --- a/vcl/workben/xlsfuzzer.cxx +++ b/vcl/workben/xlsfuzzer.cxx @@ -13,9 +13,9 @@ #include <com/sun/star/ucb/XUniversalContentBroker.hpp> #include "commonfuzzer.hxx" -extern "C" bool TestImportXLS(SvStream &rStream); +extern "C" bool TestImportXLS(SvStream& rStream); -extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) +extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) { if (__lsan_disable) __lsan_disable(); @@ -23,12 +23,16 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) CommonInitialize(argc, argv); // initialise unconfigured UCB: - css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb(comphelper::getProcessServiceFactory()-> - createInstance("com.sun.star.ucb.UniversalContentBroker"), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb( + comphelper::getProcessServiceFactory()->createInstance( + "com.sun.star.ucb.UniversalContentBroker"), + css::uno::UNO_QUERY_THROW); css::uno::Sequence<css::uno::Any> aArgs(1); aArgs[0] <<= OUString("NoConfig"); - css::uno::Reference<css::ucb::XContentProvider> xFileProvider(comphelper::getProcessServiceFactory()-> - createInstanceWithArguments("com.sun.star.ucb.FileContentProvider", aArgs), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::ucb::XContentProvider> xFileProvider( + comphelper::getProcessServiceFactory()->createInstanceWithArguments( + "com.sun.star.ucb.FileContentProvider", aArgs), + css::uno::UNO_QUERY_THROW); xUcb->registerContentProvider(xFileProvider, "file", true); if (__lsan_enable) |