From 762c52346f8e6a6b91fe1c758494b2c152361e73 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 22 Jun 2017 18:10:16 +0200 Subject: emfplus: finetuning, UnitTest, not active by default Change-Id: Ie085ad2610a306c7f9c44551114041d0950d1af5 --- .../source/processor2d/vclmetafileprocessor2d.cxx | 19 +++++++++++++++++-- .../source/processor2d/vclpixelprocessor2d.cxx | 12 +++++++----- drawinglayer/source/tools/emfphelperdata.hxx | 6 ------ drawinglayer/source/tools/wmfemfhelper.cxx | 12 ------------ 4 files changed, 24 insertions(+), 25 deletions(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 38c196f53b8f..93c6bd0033bb 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1710,10 +1710,9 @@ namespace drawinglayer } case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D : { - static bool bUseMetaFilePrimitiveDecomposition(true); const primitive2d::MetafilePrimitive2D& aMetafile = static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate); - if(bUseMetaFilePrimitiveDecomposition && !aMetafile.getMetaFile().GetUseCanvas()) + if(!aMetafile.getMetaFile().GetUseCanvas()) { // Use new Metafile decomposition. // TODO EMF+ stuffed into METACOMMENT support required @@ -1721,8 +1720,24 @@ namespace drawinglayer } else { +#ifdef DBG_UTIL + // switch to test EMFPlus-enhanced MetafileDecomposition, don't do + // this by default in debug mode + static bool bTestEMFPDecomposition(false); + + if (bTestEMFPDecomposition) + { + process(rCandidate); + } + else + { + // direct draw of MetaFile + RenderMetafilePrimitive2D(aMetafile); + } +#else // DBG_UTIL // direct draw of MetaFile, use default processing RenderMetafilePrimitive2D(aMetafile); +#endif // DBG_UTIL } break; diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 177c780f212f..039986566d00 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -505,11 +505,13 @@ namespace drawinglayer else { #ifdef DBG_UTIL - // switch to test EMFPlus-enhanced MetafileDecomposition - static bool bTestEMFPDecomposition(true); - // switch to show the new visualization color.-changed behind - // the original output vor visual testing - static bool bUseChangedColorObject(true); + // switch to test EMFPlus-enhanced MetafileDecomposition, don't do + // this by default in debug mode + static bool bTestEMFPDecomposition(false); + + // switch to show the new visualization color changed behind + // the original output vor visual testing, also not by default in debug mode + static bool bUseChangedColorObject(false); if (bTestEMFPDecomposition) { diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx index a700df8dac6c..67f423436fa4 100644 --- a/drawinglayer/source/tools/emfphelperdata.hxx +++ b/drawinglayer/source/tools/emfphelperdata.hxx @@ -25,8 +25,6 @@ #include #include #include -//#include -//#include // predefines class SvStream; @@ -252,10 +250,6 @@ namespace emfplushelper // readers void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false); bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget); - - /// data holders access -// wmfemfhelper::TargetHolders& getTargetHolders() const { return mrTargetHolders; } -// wmfemfhelper::PropertyHolders& getPropertyHolders() const { return mrPropertyHolders; } }; } diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 4c7a298b912f..f10c05724f60 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -18,16 +18,9 @@ */ #include - -//#include -//#include -//#include #include #include -//#include -//#include #include -//#include #include #include #include @@ -37,24 +30,19 @@ #include #include #include -//#include #include #include #include #include #include #include -//#include #include -//#include #include #include -//#include #include #include #include #include -//#include #include #include #include -- cgit LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/basctl/source/basicide/basidesh.cxx
AgeCommit message (Expand)Author
2023-10-19Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: basctlStephan Bergmann
2023-02-16SfxViewShell::GetViewFrame never returns null, change to a referenceCaolán McNamara
2023-02-16SfxViewShell never takes a null SfxViewFrame*Caolán McNamara
2023-02-08tdf#147488 BASIC: Create empty module when an empty library is selectedRafael Lima
2022-12-08tdf#152078 Enable Ctrl+Wheel zoom in Basic code editorRafael Lima
2022-12-05tdf#86568 Move the scrollbar to the EditWindow in Basic IDERafael Lima
2022-12-01tdf#152078 Add a Zoom slider to the Basic IDERafael Lima
2022-08-18Move tools/diagnose_ex.h to comphelper/diagnose_ex.hxxStephan Bergmann
2022-08-08these two scrollbars don't meet, so drop the junction boxCaolán McNamara
2022-08-05tdf#117388 use native scrollbar under gtk in basic editorCaolán McNamara
2021-04-09remove need for an intermediate vcl::WindowCaolán McNamara
2021-01-21Resolves: tdf#133345 Macros Editor IDE: no dialogbox tabsCaolán McNamara
2020-11-24loplugin:stringviewparam extend to comparison operatorsNoel
2020-08-27Fix a nonsense changeMike Kaganski
2020-08-14loplugin:simplifybool moreNoel Grandin
2020-05-28loplugin:simplifybool in accessibility..basicNoel Grandin
2020-04-18loplugin:flatten in basctlNoel Grandin
2020-02-19weld WatchWindow panelCaolán McNamara
2020-02-13Restore simple undo and redo buttons for the basctl moduleMaxim Monastirsky
2020-02-11add some more libs to libmergedNoel Grandin
2020-02-07property browser appearing as a blank area when changing modulesCaolán McNamara
2020-01-22tdf#42949 Fix IWYU warnings in basctl/Gabor Kelemen
2019-10-09tdf#114441 changed some sal_uLong to better fitting typesChristian Barth
2019-09-28loplugin:virtualdead in basctlNoel Grandin
2019-08-27loplugin:referencecasting find more redundant static_castNoel Grandin
2019-06-14remove some unused includesCaolán McNamara
2019-03-25tdf#42949 Fix IWYU warnings in include/sfx2/[a-D]*Gabor Kelemen
2019-03-11i#119731 Hyperlink Control on dialog EditorShubham Goyal
2019-03-08tdf#53524 Create UNO grid control- dialog editorShubham Goyal
2018-12-08Rename files for ToolBox ComboBoxes in BasicIDEtagezi
2018-07-13merge IUndoManager into SfxUndoManagerNoel Grandin
2018-04-03pass area param to DBG_UNHANDLED_EXCEPTIONNoel Grandin
2018-03-13SDI: don't #define/#undef names of actual classes for slot headersMike Kaganski
2018-02-25convert remaining InfoBox to weld::MessageDialogCaolán McNamara
2018-02-24Modernize a bit accessibility and basctlJulien Nabet
2018-02-16ofz#6311 still problems with SdrEdgeObj listening to same obj at start as endCaolán McNamara
2018-01-12More loplugin:cstylecast: basctlStephan Bergmann
2017-10-10basctl: consistently use "" and <> in include directivesMike Kaganski
2017-09-08clang-tidy modernize-use-emplace in b*Noel Grandin