diff options
26 files changed, 56 insertions, 86 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 7402c58e87ca..268cf58145c3 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -47,9 +47,7 @@ using namespace ::com::sun::star; CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext ) - : svt::RoadmapWizard( pParent, - WizardButtonFlags::HELP | WizardButtonFlags::CANCEL | WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT | WizardButtonFlags::FINISH - ) + : svt::RoadmapWizard( pParent ) , m_xChartModel(xChartModel,uno::UNO_QUERY) , m_xCC( xContext ) , m_pTemplateProvider(nullptr) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 197c32199bf4..b9f5e1535920 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -106,7 +106,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ,const Reference< XComponentContext >& _rxORB ,const css::uno::Any& _aDataSourceName ) - :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) + :svt::RoadmapWizard( _pParent ) , m_pOutSet(nullptr) , m_bIsConnectable( false) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 3c74a32af415..445a7fa67e3f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -178,7 +178,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener() // ExtensionBox_Impl ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) : - IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ), + IExtensionListBox( pParent ), m_bHasScrollBar( false ), m_bHasActive( false ), m_bNeedsRecalc( true ), diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index a7b6c79df019..5eee1ca3037d 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -55,8 +55,7 @@ namespace abp using namespace ::com::sun::star::lang; OAddressBookSourcePilot::OAddressBookSourcePilot(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB) - :OAddressBookSourcePilot_Base( _pParent, - WizardButtonFlags::HELP | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS ) + :OAddressBookSourcePilot_Base( _pParent ) ,m_xORB(_rxORB) ,m_aNewDataSource(_rxORB) ,m_eNewDataSourceType( AST_INVALID ) diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index ea3be15c9754..4f9542458aca 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -36,7 +36,7 @@ class IExtensionListBox: public Control public: enum { ENTRY_NOTFOUND = -1 }; - IExtensionListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ): Control( pParent, nWinStyle ){} + IExtensionListBox( vcl::Window* pParent ): Control( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ){} /** @return The count of the entries in the list box. */ virtual sal_Int32 getItemCount() const = 0; diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 185581c26645..53b525ae6d9c 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -95,7 +95,7 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = nullptr); + FormattedField(vcl::Window* pParent, WinBits nStyle = 0); // Min-/Max-management bool HasMinValue() const { return m_bHasMin; } diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index f30b0df80be5..82e6081f3ad1 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -235,9 +235,6 @@ private: @param rVDev Virtual device to render everything into - @param nExponent - Number of repetitions per subdivision step, _must_ be greater than 1 - @param nNumTilesX Number of original tiles to generate in x direction @@ -260,7 +257,6 @@ private: */ bool SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, - int nExponent, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, @@ -328,10 +324,10 @@ protected: void SetSwapState(); public: - GraphicObject( const GraphicManager* pMgr = nullptr ); - GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = nullptr ); + GraphicObject(); + GraphicObject( const Graphic& rGraphic ); GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = nullptr ); - explicit GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr = nullptr ); + explicit GraphicObject( const OString& rUniqueID ); virtual ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); @@ -448,9 +444,6 @@ public: virtually start at this position. Concretely, only that many tiles are drawn to completely fill the given output area. - @param pAttr - Optional GraphicAttr - @param nFlags Optional rendering flags @@ -467,7 +460,6 @@ public: const Rectangle& rArea, const Size& rSize, const Size& rOffset, - const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, int nTileCacheSize1D=128 ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 91dc5af86312..d3a02da88687 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -146,8 +146,8 @@ class SvxIconChoiceCtrlColumnInfo sal_uInt16 nSubItem; public: - SvxIconChoiceCtrlColumnInfo( long nWd ) : - nWidth( nWd ), nSubItem( 0 ) {} + SvxIconChoiceCtrlColumnInfo() : + nWidth( 100 ), nSubItem( 0 ) {} SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); void SetWidth( long nWd ) { nWidth = nWd; } diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index cb6cfa9bed24..d68210041cec 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -39,7 +39,7 @@ class SVT_DLLPUBLIC JavaInteractionHandler: public css::task::XInteractionHandler { public: - JavaInteractionHandler(bool bReportErrorOnce = true); + JavaInteractionHandler(); // XInterface virtual css::uno::Any SAL_CALL queryInterface( diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 1fb57e32d73d..c028250b7938 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -67,12 +67,10 @@ namespace svt public: RoadmapWizard( vcl::Window* _pParent, - const WinBits i_nStyle, - WizardButtonFlags _nButtonFlags = WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP + const WinBits i_nStyle ); RoadmapWizard( - vcl::Window* _pParent, - WizardButtonFlags _nButtonFlags = WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP + vcl::Window* _pParent ); virtual ~RoadmapWizard( ); virtual void dispose() override; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 0a67f288290d..825b827a30b0 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -62,8 +62,7 @@ private: DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar *, void ); public: - ScrollableWindow( vcl::Window* pParent, - ScrollableWindowFlags = ScrollableWindowFlags::DEFAULT ); + ScrollableWindow( vcl::Window* pParent ); virtual ~ScrollableWindow(); virtual void dispose() override; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 25bbf74b8e91..166373a9a076 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -561,8 +561,7 @@ protected: // Recalculate all tabs depending on TreeListStyle and Bitmap sizes // Is called automatically when inserting/changing Bitmaps, changing the Model etc. virtual void SetTabs(); - void AddTab( long nPos, SvLBoxTabFlags nFlags=SvLBoxTabFlags::ADJUST_LEFT, - void* pUserData = nullptr ); + void AddTab( long nPos, SvLBoxTabFlags nFlags=SvLBoxTabFlags::ADJUST_LEFT ); sal_uInt16 TabCount() const { return aTabs.size(); } SvLBoxTab* GetFirstDynamicTab() const; SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index b23ffcdb163e..fd2e7c10e46a 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1203,7 +1203,7 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext *pOu const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0), - nullptr, GraphicManagerDrawFlags::STANDARD, + GraphicManagerDrawFlags::STANDARD, ::std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); } else diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index a46b6795670b..b83ef89724c4 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -291,7 +291,7 @@ class SvxIconChoiceCtrl_Impl bool bSelect, bool bSyncPaint ); - void RepaintEntries( SvxIconViewFlags nEntryFlagsMask ); + void RepaintSelectedEntries(); void SetListPositions(); void SetDefaultTextSize(); bool IsAutoArrange() const diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 4c6b9151dc93..2cd7332e4c0c 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -236,7 +236,7 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) if( (nWinStyle & WB_DETAILS)) { if (!m_pColumns) - SetColumn( 0, SvxIconChoiceCtrlColumnInfo( 100 )); + SetColumn( 0, SvxIconChoiceCtrlColumnInfo() ); } } @@ -685,7 +685,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec rRenderContext.Pop(); } -void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags nEntryFlagsMask) +void SvxIconChoiceCtrl_Impl::RepaintSelectedEntries() { const size_t nCount = pZOrderList->size(); if (!nCount) @@ -695,7 +695,7 @@ void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags nEntryFlagsMask) for (size_t nCur = 0; nCur < nCount; nCur++) { SvxIconChoiceCtrlEntry* pEntry = (*pZOrderList)[nCur]; - if (pEntry->GetFlags() & nEntryFlagsMask) + if (pEntry->GetFlags() & SvxIconViewFlags::SELECTED) { const Rectangle& rBoundRect = GetEntryBoundRect(pEntry); if (aOutRect.IsOver(rBoundRect)) @@ -1463,7 +1463,7 @@ void SvxIconChoiceCtrl_Impl::CheckScrollBars() void SvxIconChoiceCtrl_Impl::GetFocus() { - RepaintEntries( SvxIconViewFlags::SELECTED ); + RepaintSelectedEntries(); if( pCursor ) { pCursor->SetFlags( SvxIconViewFlags::FOCUSED ); @@ -1481,7 +1481,7 @@ void SvxIconChoiceCtrl_Impl::LoseFocus() // HideFocus (); // pView->Invalidate ( aFocus.aRect ); - RepaintEntries( SvxIconViewFlags::SELECTED ); + RepaintSelectedEntries(); } void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 373b19159e6d..946975ff2df6 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3319,11 +3319,11 @@ SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX ) return GetItem_Impl( pEntry, nX, &pDummyTab ); } -void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags, void* pUserData ) +void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags ) { nFocusWidth = -1; SvLBoxTab* pTab = new SvLBoxTab( nTabPos, nFlags ); - pTab->SetUserData( pUserData ); + pTab->SetUserData( nullptr ); aTabs.push_back( pTab ); if( nTreeFlags & SvTreeFlags::USESEL ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index deb22cda6b9b..910ed3df4a75 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -296,7 +296,7 @@ FormattedField::StaticFormatter::~StaticFormatter() } -FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter) +FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle) :SpinField(pParent, nStyle) ,m_aLastSelection(0,0) ,m_dMinValue(0) @@ -319,12 +319,6 @@ FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFor ,m_pLastOutputColor(nullptr) ,m_bUseInputStringForFormatting(false) { - - if (pInitialFormatter) - { - m_pFormatter = pInitialFormatter; - m_nFormatKey = 0; - } } VCL_BUILDER_FACTORY_ARGS(FormattedField, WB_BORDER | WB_SPIN) diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 1f0bfc153e5c..c6a709d4c3dd 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -65,10 +65,7 @@ private: public: /** This constructor sets an output device and fonts for all script types. */ SvtScriptedTextHelper_Impl( - OutputDevice& _rOutDevice, - vcl::Font* _pLatinFont, - vcl::Font* _pAsianFont, - vcl::Font* _pCmplxFont ); + OutputDevice& _rOutDevice ); /** Copy constructor. */ SvtScriptedTextHelper_Impl( const SvtScriptedTextHelper_Impl& _rCopy ); @@ -91,12 +88,11 @@ public: SvtScriptedTextHelper_Impl::SvtScriptedTextHelper_Impl( - OutputDevice& _rOutDevice, - vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont ) : + OutputDevice& _rOutDevice ) : mrOutDevice( _rOutDevice ), - maLatinFont( _pLatinFont ? *_pLatinFont : _rOutDevice.GetFont() ), - maAsianFont( _pAsianFont ? *_pAsianFont : _rOutDevice.GetFont() ), - maCmplxFont( _pCmplxFont ? *_pCmplxFont : _rOutDevice.GetFont() ), + maLatinFont( _rOutDevice.GetFont() ), + maAsianFont( _rOutDevice.GetFont() ), + maCmplxFont( _rOutDevice.GetFont() ), maDefltFont( _rOutDevice.GetFont() ) { } @@ -301,7 +297,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) : - mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, nullptr, nullptr, nullptr ) ) + mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice ) ) { } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 061bfb0a070f..6691a238b9f9 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -38,14 +38,13 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) } -ScrollableWindow::ScrollableWindow( vcl::Window* pParent, - ScrollableWindowFlags nFlags ) : +ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) : Window( pParent, WB_CLIPCHILDREN ), aVScroll( VclPtr<ScrollBar>::Create(this, WinBits(WB_VSCROLL | WB_DRAG)) ), aHScroll( VclPtr<ScrollBar>::Create(this, WinBits(WB_HSCROLL | WB_DRAG)) ), aCornerWin( VclPtr<ScrollBarBox>::Create(this) ) { - ImpInitialize( nFlags ); + ImpInitialize( ScrollableWindowFlags::DEFAULT ); } diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 24cba255f631..377bb27527ac 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -109,15 +109,15 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ) - :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle ) + :OWizardMachine( _pParent, i_nStyle, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); } - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ) - :OWizardMachine( _pParent, _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent ) + :OWizardMachine( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 42b2799f1d5e..7552caf077e6 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -71,23 +71,23 @@ void GraphicObject::ImplAfterDataChange() mpMgr->ImplCheckSizeOfSwappedInGraphics(this); } -GraphicObject::GraphicObject( const GraphicManager* pMgr ) : +GraphicObject::GraphicObject() : maLink (), maUserData () { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr ); + ImplSetGraphicManager( nullptr ); } -GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const Graphic& rGraphic ) : maGraphic ( rGraphic ), maLink (), maUserData () { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr ); + ImplSetGraphicManager( nullptr ); } GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : @@ -104,7 +104,7 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan SetSwapState(); } -GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const OString& rUniqueID ) : maLink (), maUserData () { @@ -113,7 +113,7 @@ GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pM // assign default properties ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr, &rUniqueID ); + ImplSetGraphicManager( nullptr, &rUniqueID ); // update properties ImplAssignGraphicData(); @@ -588,7 +588,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, - const Size& rOffset, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) + const Size& rOffset, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) { if( pOut == nullptr || rSize.Width() == 0 || rSize.Height() == 0 ) return; @@ -606,7 +606,7 @@ void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const while (((sal_Int64)rSize.Height() * nTileCacheSize1D) > SAL_MAX_UINT16) nTileCacheSize1D /= 2; - ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D ); + ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, nullptr, nFlags, nTileCacheSize1D ); } bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 645588499b09..67ead4c755e4 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1658,13 +1658,13 @@ struct ImplTileInfo }; -bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, +bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) { - if( nExponent <= 1 ) - return false; + // how many tiles to generate per recursion step + const int nExponent = 2; // determine MSB factor int nMSBFactor( 1 ); @@ -1878,9 +1878,6 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, const Size& rOffset, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) { - // how many tiles to generate per recursion step - enum{ SubdivisionExponent=2 }; - const MapMode aOutMapMode( pOut->GetMapMode() ); const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); bool bRet( false ); @@ -1903,7 +1900,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c aVDev->SetMapMode( aMapMode ); // draw bitmap content - if( ImplRenderTempTile( *aVDev.get(), SubdivisionExponent, nNumTilesInCacheX, + if( ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) { BitmapEx aTileBitmap( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) ); @@ -1918,7 +1915,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c else aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); - if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), SubdivisionExponent, nNumTilesInCacheX, + if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) { // Combine bitmap and alpha/mask diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index b03398755a2e..82b76e34acac 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -68,7 +68,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeEx { osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); if (!m_xHandler.is()) - m_xHandler.set( new JavaInteractionHandler(true/*bShowErrorsOnce*/)); + m_xHandler.set( new JavaInteractionHandler ); } retVal = makeAny(m_xHandler); diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index b1f8e452b0a6..f947a288eac3 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -45,9 +45,9 @@ using namespace com::sun::star::task; namespace svt { -JavaInteractionHandler::JavaInteractionHandler(bool bReportErrorOnce) : +JavaInteractionHandler::JavaInteractionHandler() : m_aRefCount(0), - m_bShowErrorsOnce(bReportErrorOnce), + m_bShowErrorsOnce(true), m_bJavaDisabled_Handled(false), m_bInvalidSettings_Handled(false), m_bJavaNotFound_Handled(false), diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a3043d437b16..73f68bd7de49 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2115,7 +2115,7 @@ void DrawGraphic( aAlignedPaintRect.SVRect(), aGrf.SSize(), Size( aPaintOffset.X(), aPaintOffset.Y() ), - nullptr, GraphicManagerDrawFlags::STANDARD, + GraphicManagerDrawFlags::STANDARD, std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); } // reset clipping at output device diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 968c71e201ee..9a0ff9047e44 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -39,8 +39,7 @@ using namespace svt; using namespace ::com::sun::star; SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rItem) : - RoadmapWizard(&rView.GetViewFrame()->GetWindow(), - WizardButtonFlags::NEXT|WizardButtonFlags::PREVIOUS|WizardButtonFlags::FINISH|WizardButtonFlags::CANCEL|WizardButtonFlags::HELP), + RoadmapWizard(&rView.GetViewFrame()->GetWindow()), m_pSwView(&rView), m_bDocumentLoad( false ), m_xConfigItem(rItem), |