diff options
52 files changed, 179 insertions, 208 deletions
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index e5d1e1f4cb55..ee92dfa591cb 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -90,7 +90,7 @@ bool ChartTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, c else if ( nFormat == SotClipboardFormatId::GDIMETAFILE ) { Graphic aGraphic( m_xMetaFileGraphic ); - bResult = SetGDIMetaFile( aGraphic.GetGDIMetaFile(), rFlavor ); + bResult = SetGDIMetaFile( aGraphic.GetGDIMetaFile() ); } else if( nFormat == SotClipboardFormatId::BITMAP ) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 0686504c8099..6983e70fbe14 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1250,7 +1250,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) break; long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), false); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X()); long nCorrectRowCount = GetRowCount(); if (GetOptions() & DbGridControlOptions::Insert) @@ -1344,7 +1344,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if ( IsDropFormatSupported( SotClipboardFormatId::STRING ) ) { long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), false); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X()); long nCorrectRowCount = GetRowCount(); if (GetOptions() & DbGridControlOptions::Insert) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 1e07be29d9ea..42d50aa5b153 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -393,9 +393,9 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const tools::Rectangle& { TTablePrivilegeMap::const_iterator aFind = findPrivilege(m_nDataPos); if(aFind != m_aPrivMap.end()) - PaintTristate(rDev, rRect, isAllowed(nColumnId,aFind->second.nRights) ? TRISTATE_TRUE : TRISTATE_FALSE,isAllowed(nColumnId,aFind->second.nWithGrant)); + PaintTristate(rRect, isAllowed(nColumnId,aFind->second.nRights) ? TRISTATE_TRUE : TRISTATE_FALSE,isAllowed(nColumnId,aFind->second.nWithGrant)); else - PaintTristate(rDev, rRect, TRISTATE_FALSE, false); + PaintTristate(rRect, TRISTATE_FALSE, false); } else { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 8c37af77531f..7058f2d7caf2 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1220,7 +1220,7 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& long nRow = GetRealRow(m_nSeekRow); if (nRow == BROW_VIS_ROW) - PaintTristate(rDev, rRect, pEntry->IsVisible() ? TRISTATE_TRUE : TRISTATE_FALSE); + PaintTristate(rRect, pEntry->IsVisible() ? TRISTATE_TRUE : TRISTATE_FALSE); else rDev.DrawText(rRect, GetCellText(nRow, nColumnId),DrawTextFlags::VCenter); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 58689dab7c81..0617373ba52e 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -506,8 +506,7 @@ public: bool bComplete = false ) const; long GetRowAtYPosPixel( long nY, bool bRelToBrowser = true ) const; - sal_uInt16 GetColumnAtXPosPixel( long nX, - bool bRelToBrowser = true ) const; + sal_uInt16 GetColumnAtXPosPixel( long nX ) const; // invalidations void Clear(); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 0a144c69e6a9..c71d57e42461 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -579,7 +579,7 @@ namespace svt virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const override; - void PaintTristate(OutputDevice& rDev, const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; + void PaintTristate(const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; void AsynchGetFocus(); // secure starting of StartEditHdl diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 22c65ff2a329..6693bc20328d 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -509,7 +509,6 @@ private: const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const GraphicManagerDrawFlags nFlags, bool& rCached ); @@ -519,7 +518,6 @@ private: const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const GraphicManagerDrawFlags nFlags, BitmapEx* pBmpEx = nullptr ); static bool SVT_DLLPRIVATE ImplCreateOutput( @@ -528,7 +526,6 @@ private: const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const GraphicManagerDrawFlags nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index be4c5af01bb3..2867ebff6b94 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -256,7 +256,7 @@ private: SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, - const tools::Rectangle& rItemRect, const tools::Rectangle* pRect, DrawFlags nFlags); + const tools::Rectangle& rItemRect, const tools::Rectangle* pRect); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, const tools::Rectangle* pRect); SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos, diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 33c302bc8b42..979741af0f85 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -68,8 +68,7 @@ struct HTMLOutFuncs OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); - SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); + SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color& ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&, const HTMLOutEvent *pEventTable, bool bOutStarBasic, diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 710069c1baf9..44719ee41b98 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -211,9 +211,7 @@ protected: const Point& rPos, OutputDevice& rDev ); - static OUString GetEntryText( - SvxIconChoiceCtrlEntry* pEntry, - bool bInplaceEdit ); + static OUString GetEntryText( SvxIconChoiceCtrlEntry* pEntry ); virtual void FillLayoutData() const override; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index c4703e53b9d6..c9db0cbf5a46 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -156,7 +156,7 @@ public: SvViewDataItem* pViewData = nullptr) override; virtual SvLBoxItemType GetType() const override; - bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); + bool ClickHdl( SvTreeListEntry* ); virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 849c756a1feb..26f78e6f69f9 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -349,7 +349,7 @@ private: SVT_DLLPRIVATE void ImplSelect(); SVT_DLLPRIVATE void ImplActivatePage(); SVT_DLLPRIVATE bool ImplDeactivatePage(); - SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); + SVT_DLLPRIVATE void ImplPrePaint(); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); DECL_DLLPRIVATE_LINK(ImplClickHdl, Button*, void); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 317b65c37932..3135bf2a7f8d 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -129,7 +129,7 @@ private: void implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry* pThisOnly = nullptr, bool bHighlight = false); void implHighlightEntry(vcl::RenderContext& rRenderContext, int nHighlightEntry); - void implHighlightAtPosition(const MouseEvent& rMEvt, bool bMBDown); + void implHighlightAtPosition(const MouseEvent& rMEvt); void implChangeHighlightEntry( int nEntry ); void implSelectEntry( int nSelectedEntry ); diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 623721180bae..8a9e0bb180ea 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -217,13 +217,13 @@ protected: bool HasFormat( SotClipboardFormatId nFormat ); void ClearFormats(); - bool SetAny( const css::uno::Any& rAny, const css::datatransfer::DataFlavor& rFlavor ); + bool SetAny( const css::uno::Any& rAny ); bool SetString( const OUString& rString, const css::datatransfer::DataFlavor& rFlavor ); bool SetBitmapEx( const BitmapEx& rBitmap, const css::datatransfer::DataFlavor& rFlavor ); - bool SetGDIMetaFile( const GDIMetaFile& rMtf, const css::datatransfer::DataFlavor& rFlavor ); - bool SetGraphic( const Graphic& rGraphic, const css::datatransfer::DataFlavor& rFlavor ); - bool SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& rFlavor ); - bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& rFlavor ); + bool SetGDIMetaFile( const GDIMetaFile& rMtf ); + bool SetGraphic( const Graphic& rGraphic ); + bool SetImageMap( const ImageMap& rIMap ); + bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc ); bool SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ); bool SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ); bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); @@ -333,7 +333,7 @@ public: bool GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); bool GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ); - bool GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc ); + bool GetTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ); bool GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ); bool GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); @@ -342,7 +342,7 @@ public: bool GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); bool GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ); - bool GetFileList( const css::datatransfer::DataFlavor& rFlavor, FileList& rFileList ); + bool GetFileList( FileList& rFileList ); css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx index 98c437651269..7ce4814e6b83 100644 --- a/include/svtools/unoimap.hxx +++ b/include/svtools/unoimap.hxx @@ -30,7 +30,7 @@ SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapRectangle SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance(); SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( const css::uno::Reference< css::uno::XInterface >& xImageMap, ImageMap& rMap ); diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 8ebf62f1f20c..980f8f26d077 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -54,7 +54,7 @@ namespace rptui SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == OGroupExchange::getReportGroupId() ) { - return SetAny(uno::makeAny(m_aGroupRow),rFlavor); + return SetAny(uno::makeAny(m_aGroupRow)); } return false; } diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index bd448f8e92e5..fabbef658eac 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -57,7 +57,7 @@ void OReportExchange::AddSupportedFormats() bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ ) { const SotClipboardFormatId nFormatId = SotExchange::GetFormat(_rFlavor); - return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements), _rFlavor ); + return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements) ); } bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index fc81f99cd695..8fca4aee4228 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -370,7 +370,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c pModel->SetSwapGraphicsMode( SdrSwapGraphicsMode::PURGE ); } - bOK = SetAny( aOleData.GetAny(rFlavor, rDestDoc), rFlavor ); + bOK = SetAny( aOleData.GetAny(rFlavor, rDestDoc) ); if( pModel ) pModel->SetSwapGraphicsMode( nOldSwapMode ); @@ -383,7 +383,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c { if ( nFormat == SotClipboardFormatId::LINKSRCDESCRIPTOR || nFormat == SotClipboardFormatId::OBJECTDESCRIPTOR ) { - bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor ); + bOK = SetTransferableObjectDescriptor( aObjDesc ); } else if ( nFormat == SotClipboardFormatId::DRAWING ) { @@ -400,7 +400,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c OSL_ENSURE( pPv, "pPv not there..." ); aView.MarkAllObj( pPv ); if ( nFormat == SotClipboardFormatId::GDIMETAFILE ) - bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true), rFlavor ); + bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true) ); else bOK = SetBitmapEx( aView.GetMarkedObjBitmapEx(true), rFlavor ); } @@ -416,7 +416,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c if (pObject && pObject->GetObjIdentifier() == OBJ_GRAF) { SdrGrafObj* pGraphObj = static_cast<SdrGrafObj*>(pObject); - bOK = SetGraphic( pGraphObj->GetGraphic(), rFlavor ); + bOK = SetGraphic( pGraphObj->GetGraphic() ); } } } diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 08a42296a749..ed181469bd70 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -396,7 +396,7 @@ bool ScSelectionTransferObj::GetData( { TransferableDataHelper aHelper( xSource ); uno::Any aAny = aHelper.GetAny(rFlavor, rDestDoc); - bOK = SetAny( aAny, rFlavor ); + bOK = SetAny( aAny ); } return bOK; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index ee615ff36a07..04364d2ef5f6 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -254,7 +254,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt { if ( nFormat == SotClipboardFormatId::LINKSRCDESCRIPTOR || nFormat == SotClipboardFormatId::OBJECTDESCRIPTOR ) { - bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor ); + bOK = SetTransferableObjectDescriptor( aObjDesc ); } else if ( ( nFormat == SotClipboardFormatId::RTF || nFormat == SotClipboardFormatId::RICHTEXT || nFormat == SotClipboardFormatId::EDITENGINE ) && @@ -387,7 +387,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt aMtf.Stop(); aMtf.WindStart(); - bOK = SetGDIMetaFile( aMtf, rFlavor ); + bOK = SetGDIMetaFile( aMtf ); } else if ( nFormat == SotClipboardFormatId::EMBED_SOURCE ) { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 68d2f123fecc..36a33957c118 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -696,7 +696,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) xImageMap.set(SvUnoImageMap_createInstance( rIMap, GetSupportedMacroItems() )); } else - xImageMap = SvUnoImageMap_createInstance( GetSupportedMacroItems() ); + xImageMap = SvUnoImageMap_createInstance(); } aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap ); } @@ -967,7 +967,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName if ( aPropertyName == SC_UNONAME_IMAGEMAP ) { // default: empty ImageMap - uno::Reference< uno::XInterface > xImageMap(SvUnoImageMap_createInstance( GetSupportedMacroItems() )); + uno::Reference< uno::XInterface > xImageMap(SvUnoImageMap_createInstance()); aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap ); } else diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 3a5f63fa5a13..0126407f8f38 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -482,9 +482,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo // TODO/LATER: support all the graphical formats, the embedded object scenario should not have separated handling if( nFormat == SotClipboardFormatId::GDIMETAFILE && mpGraphic ) - bOK = SetGDIMetaFile( mpGraphic->GetGDIMetaFile(), rFlavor ); + bOK = SetGDIMetaFile( mpGraphic->GetGDIMetaFile() ); else - bOK = SetAny( mpOLEDataHelper->GetAny(rFlavor, rDestDoc), rFlavor ); + bOK = SetAny( mpOLEDataHelper->GetAny(rFlavor, rDestDoc) ); if( mpSdDrawDocumentIntern ) mpSdDrawDocumentIntern->SetSwapGraphicsMode( nOldSwapMode ); @@ -493,7 +493,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo { if( ( nFormat == SotClipboardFormatId::LINKSRCDESCRIPTOR || nFormat == SotClipboardFormatId::OBJECTDESCRIPTOR ) && mpObjDesc ) { - bOK = SetTransferableObjectDescriptor( *mpObjDesc, rFlavor ); + bOK = SetTransferableObjectDescriptor( *mpObjDesc ); } else if( nFormat == SotClipboardFormatId::DRAWING ) { @@ -529,7 +529,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo const bool bToggleOnlineSpell = mpSdDrawDocumentIntern && mpSdDrawDocumentIntern->GetOnlineSpell(); if (bToggleOnlineSpell) mpSdDrawDocumentIntern->SetOnlineSpell(false); - bOK = SetGDIMetaFile( mpSdViewIntern->GetMarkedObjMetaFile( true ), rFlavor ); + bOK = SetGDIMetaFile( mpSdViewIntern->GetMarkedObjMetaFile( true ) ); if (bToggleOnlineSpell) mpSdDrawDocumentIntern->SetOnlineSpell(true); } @@ -552,11 +552,11 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo } else if( ( nFormat == SotClipboardFormatId::SVXB ) && mpGraphic ) { - bOK = SetGraphic( *mpGraphic, rFlavor ); + bOK = SetGraphic( *mpGraphic ); } else if( ( nFormat == SotClipboardFormatId::SVIM ) && mpImageMap ) { - bOK = SetImageMap( *mpImageMap, rFlavor ); + bOK = SetImageMap( *mpImageMap ); } else if( mpBookmark ) { @@ -832,7 +832,7 @@ void SdTransferable::SetView(const ::sd::View* pView) StartListening(*const_cast<sd::View*>(mpSdView)); } -bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFlavor) +bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& /*rFlavor*/) { if ( pModel ) { @@ -844,7 +844,7 @@ bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFla { SvMemoryStream aMemStm( 65535, 65535 ); sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); - return SetAny( Any( Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ), rFlavor ); + return SetAny( Any( Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ) ); } } } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 6e5a7a14a722..614592536d9a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -125,7 +125,7 @@ bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const css::datatransfer::Da case SotClipboardFormatId::TREELISTBOX: { css::uno::Any aTreeListBoxData; // empty for now - SetAny(aTreeListBoxData, rFlavor); + SetAny(aTreeListBoxData); return true; } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index bb89af1985b0..da02589c0526 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -802,7 +802,7 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName } else { - xImageMap = SvUnoImageMap_createInstance(ImplGetSupportedMacroItems() ); + xImageMap = SvUnoImageMap_createInstance(); } } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 9d96fcda4fa9..501825344785 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1520,7 +1520,7 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol sal_uInt16 nFirstPos = nFirstCol; sal_uInt16 nWidth = (sal_uInt16)pColumn->Width(); sal_uInt16 nLastPos = GetColumnAtXPosPixel( - pDataWin->GetSizePixel().Width()-nWidth, false ); + pDataWin->GetSizePixel().Width()-nWidth ); sal_uInt16 nFrozen = FrozenColCount(); if ( bMakeVisible && nLastPos && nNewPos >= nFrozen && ( nNewPos < nFirstPos || nNewPos > nLastPos ) ) @@ -2072,7 +2072,7 @@ tools::Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const } -sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const +sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX ) const { // accumulate the widths of the visible columns diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index d5dfefab7c94..2c6842681b36 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -1200,18 +1200,11 @@ namespace svt } - void EditBrowseBox::PaintTristate(OutputDevice&, const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled) const + void EditBrowseBox::PaintTristate(const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled) const { pCheckBoxPaint->GetBox().SetState(eState); pCheckBoxPaint->SetPosSizePixel(rRect.TopLeft(), rRect.GetSize()); - // First update the parent, preventing that while painting this window - // an update for the parent is done (because it's in the queue already) - // which may lead to hiding this window immediately -// #95598# comment out OJ -/* if (pCheckBoxPaint->GetParent()) - pCheckBoxPaint->GetParent()->Update(); -*/ pCheckBoxPaint->GetBox().Enable(_bEnabled); pCheckBoxPaint->Show(); pCheckBoxPaint->SetParentUpdateMode( false ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 3b35978460b4..7faf1a707fcd 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -242,11 +242,11 @@ class SvxIconChoiceCtrl_Impl } void InitScrollBarBox(); void ToggleSelection( SvxIconChoiceCtrlEntry* ); - void DeselectAllBut( SvxIconChoiceCtrlEntry*, bool bPaintSync = false ); + void DeselectAllBut( SvxIconChoiceCtrlEntry* ); void Center( SvxIconChoiceCtrlEntry* pEntry ) const; void StopEditTimer() { aEditIdle.Stop(); } void StartEditTimer() { aEditIdle.Start(); } - void CallSelectHandler( SvxIconChoiceCtrlEntry* ); + void CallSelectHandler(); void SelectRect( SvxIconChoiceCtrlEntry* pEntry1, SvxIconChoiceCtrlEntry* pEntry2, @@ -281,8 +281,7 @@ class SvxIconChoiceCtrl_Impl void CancelUserEvents(); void EntrySelected( SvxIconChoiceCtrlEntry* pEntry, - bool bSelect, - bool bSyncPaint + bool bSelect ); void RepaintSelectedEntries(); void SetListPositions(); @@ -327,8 +326,7 @@ public: void SelectEntry( SvxIconChoiceCtrlEntry*, bool bSelect, - bool bAddToSelection = false, - bool bSyncPaint = false + bool bAddToSelection = false ); void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); bool MouseButtonDown( const MouseEvent& ); @@ -339,8 +337,7 @@ public: SvxIconChoiceCtrlEntry* pOldCursor, SvxIconChoiceCtrlEntry* pNewCursor, bool bMod1, - bool bShift, - bool bPaintSync + bool bShift ); bool KeyInput( const KeyEvent& ); void Resize(); @@ -381,9 +378,9 @@ public: const OUString* pStr = nullptr ); - long CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const; - long CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const; - Size CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const; + long CalcBoundingWidth() const; + long CalcBoundingHeight() const; + Size CalcBoundingSize() const; void FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry ); void SetBoundingRect_Impl( SvxIconChoiceCtrlEntry* pEntry, @@ -415,7 +412,7 @@ public: void SetGrid( const Size& ); Size GetMinGrid() const; void Scroll( long nDeltaX, long nDeltaY ); - const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const; + const Size& GetItemSize( IcnViewFieldType ) const; void HideDDIcon(); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index a57732f9b6a6..d2d34011fb42 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -359,7 +359,7 @@ void SvxIconChoiceCtrl_Impl::SetListPositions() } void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool bSelect, - bool bAdd, bool bSyncPaint ) + bool bAdd ) { if( eSelectionMode == SelectionMode::NONE ) return; @@ -369,7 +369,7 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b if ( !( nFlags & IconChoiceFlags::ClearingSelection ) ) { nFlags |= IconChoiceFlags::ClearingSelection; - DeselectAllBut( pEntry, true ); + DeselectAllBut( pEntry ); nFlags &= ~IconChoiceFlags::ClearingSelection; } } @@ -382,20 +382,20 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b nEntryFlags |= SvxIconViewFlags::SELECTED; pEntry->AssignFlags( nEntryFlags ); nSelectionCount++; - CallSelectHandler( pEntry ); + CallSelectHandler(); } else { nEntryFlags &= ~( SvxIconViewFlags::SELECTED); pEntry->AssignFlags( nEntryFlags ); nSelectionCount--; - CallSelectHandler( nullptr ); + CallSelectHandler(); } - EntrySelected( pEntry, bSelect, bSyncPaint ); + EntrySelected( pEntry, bSelect ); } } -void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool bSelect, bool /*bSyncPaint*/) +void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool bSelect) { // When using SingleSelection, make sure that the cursor is always placed // over the (only) selected entry. (But only if a cursor exists.) @@ -739,7 +739,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt) if( rMEvt.IsShift() && eSelectionMode != SelectionMode::Single ) { if( pEntry ) - SetCursor_Impl( pCursor, pEntry, rMEvt.IsMod1(), rMEvt.IsShift(), true); + SetCursor_Impl( pCursor, pEntry, rMEvt.IsMod1(), rMEvt.IsShift() ); return true; } @@ -803,7 +803,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt) if( rMEvt.GetClicks() == 2 ) { DeselectAllBut( pEntry ); - SelectEntry( pEntry, true, false, true ); + SelectEntry( pEntry, true, false ); pHdlEntry = pEntry; pView->ClickIcon(); } @@ -843,9 +843,9 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt) { if( !bSelected ) { - DeselectAllBut( pEntry, true /* paint synchronously */ ); + DeselectAllBut( pEntry ); SetCursor( pEntry ); - SelectEntry( pEntry, true, false, true ); + SelectEntry( pEntry, true, false ); } else { @@ -890,7 +890,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt ) { DeselectAllBut( pDocEntry ); SetCursor( pDocEntry ); - SelectEntry( pDocEntry, true, false, true ); + SelectEntry( pDocEntry, true, false ); bHandled = true; } } @@ -916,7 +916,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt ) // set focus on Icon SvxIconChoiceCtrlEntry* pOldCursor = pCursor; - SetCursor_Impl( pOldCursor, pHdlEntry, false, false, true ); + SetCursor_Impl( pOldCursor, pHdlEntry, false, false ); pHdlEntry = nullptr; } @@ -940,7 +940,7 @@ bool SvxIconChoiceCtrl_Impl::MouseMove( const MouseEvent& rMEvt ) } void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor, - SvxIconChoiceCtrlEntry* pNewCursor, bool bMod1, bool bShift, bool bPaintSync ) + SvxIconChoiceCtrlEntry* pNewCursor, bool bMod1, bool bShift ) { if( pNewCursor ) { @@ -957,7 +957,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor, } } if( bDeselectAll ) - DeselectAllBut( pFilterEntry, bPaintSync ); + DeselectAllBut( pFilterEntry ); ShowCursor( false ); MakeEntryVisible( pNewCursor ); SetCursor( pNewCursor ); @@ -980,7 +980,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor, } else { - SelectEntry( pCursor, true, false, bPaintSync ); + SelectEntry( pCursor, true, false ); aCurSelectionRect = GetEntryBoundRect( pCursor ); CallEventListeners( VclEventId::ListboxSelect, pCursor ); } @@ -1000,7 +1000,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) SvxIconChoiceCtrlEntry* pNewCursor = GetEntry( nPos ); SvxIconChoiceCtrlEntry* pOldCursor = pCursor; if ( pNewCursor != pOldCursor ) - SetCursor_Impl( pOldCursor, pNewCursor, false, false, false ); + SetCursor_Impl( pOldCursor, pNewCursor, false, false ); return true; } @@ -1036,7 +1036,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) pNewCursor = pImpCursor->GoUpDown(pCursor,false); else pNewCursor = pImpCursor->GoPageUpDown(pCursor,false); - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); if( !pNewCursor ) { tools::Rectangle aRect( GetEntryBoundRect( pCursor ) ); @@ -1066,7 +1066,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) pNewCursor=pImpCursor->GoUpDown( pCursor,true ); else pNewCursor=pImpCursor->GoPageUpDown( pCursor,true ); - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); if ( bChooseWithCursor && pNewCursor != nullptr) { @@ -1082,7 +1082,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) if( pCursor ) { pNewCursor=pImpCursor->GoLeftRight(pCursor,true ); - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); } break; @@ -1091,7 +1091,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) { MakeEntryVisible( pCursor ); pNewCursor = pImpCursor->GoLeftRight(pCursor,false ); - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); if( !pNewCursor ) { tools::Rectangle aRect( GetEntryBoundRect(pCursor)); @@ -1190,7 +1190,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) if( pCursor ) { pNewCursor = aEntries[ aEntries.size() - 1 ]; - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); } break; @@ -1198,7 +1198,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) if( pCursor ) { pNewCursor = aEntries[ 0 ]; - SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true ); + SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); } break; @@ -1558,7 +1558,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const tools::Rectangle& rRect, { if (eItem == IcnViewFieldType::Text) { - OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false); + OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry); rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags); @@ -1593,7 +1593,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR); - OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry, false)); + OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry)); tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, false, &aEntryText)); tools::Rectangle aBmpRect(CalcBmpRect(pEntry, &rPos)); @@ -1705,7 +1705,7 @@ void SvxIconChoiceCtrl_Impl::SetNoSelection() if( !(nFlags & IconChoiceFlags::ClearingSelection )) { nFlags |= IconChoiceFlags::ClearingSelection; - DeselectAllBut( nullptr, true ); + DeselectAllBut( nullptr ); nFlags &= ~IconChoiceFlags::ClearingSelection; } } @@ -1799,7 +1799,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p { OUString aEntryText; if( !pStr ) - aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry, bEdit ); + aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry ); else aEntryText = *pStr; @@ -1854,10 +1854,9 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p } -long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) const +long SvxIconChoiceCtrl_Impl::CalcBoundingWidth() const { - long nStringWidth = GetItemSize( pEntry, IcnViewFieldType::Text ).Width(); -// nStringWidth += 2*LROFFS_TEXT; + long nStringWidth = GetItemSize( IcnViewFieldType::Text ).Width(); long nWidth = 0; switch( nWinBits & (VIEWMODE_MASK) ) @@ -1876,9 +1875,9 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) return nWidth; } -long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry ) const +long SvxIconChoiceCtrl_Impl::CalcBoundingHeight() const { - long nStringHeight = GetItemSize( pEntry, IcnViewFieldType::Text).Height(); + long nStringHeight = GetItemSize(IcnViewFieldType::Text).Height(); long nHeight = 0; switch( nWinBits & (VIEWMODE_MASK) ) @@ -1903,10 +1902,9 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry return nHeight; } -Size SvxIconChoiceCtrl_Impl::CalcBoundingSize( SvxIconChoiceCtrlEntry* pEntry ) const +Size SvxIconChoiceCtrl_Impl::CalcBoundingSize() const { - return Size( CalcBoundingWidth( pEntry ), - CalcBoundingHeight( pEntry ) ); + return Size( CalcBoundingWidth(), CalcBoundingHeight() ); } void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart() @@ -1964,7 +1962,7 @@ void SvxIconChoiceCtrl_Impl::FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry ) AdjustVirtSize( pEntry->aRect ); return; } - Size aSize( CalcBoundingSize( pEntry ) ); + Size aSize( CalcBoundingSize() ); Point aPos(pGridMap->GetGridRect(pGridMap->GetUnoccupiedGrid()).TopLeft()); SetBoundingRect_Impl( pEntry, aPos, aSize ); } @@ -2267,8 +2265,7 @@ void SvxIconChoiceCtrl_Impl::ToggleSelection( SvxIconChoiceCtrlEntry* pEntry ) SelectEntry( pEntry, bSel, true ); } -void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot, - bool bPaintSync ) +void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot ) { ClearSelectedRectList(); @@ -2279,7 +2276,7 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryN { SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ]; if( pEntry != pThisEntryNot && pEntry->IsSelected() ) - SelectEntry( pEntry, false, true, bPaintSync ); + SelectEntry( pEntry, false, true ); } pAnchor = nullptr; nFlags &= (~IconChoiceFlags::AddMode); @@ -2402,7 +2399,7 @@ void SvxIconChoiceCtrl_Impl::SetDefaultTextSize() void SvxIconChoiceCtrl_Impl::Center( SvxIconChoiceCtrlEntry* pEntry ) const { pEntry->aRect = pEntry->aGridRect; - Size aSize( CalcBoundingSize( pEntry ) ); + Size aSize( CalcBoundingSize() ); if( nWinBits & WB_ICON ) { // center horizontally @@ -2431,8 +2428,7 @@ void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY ) } -const Size& SvxIconChoiceCtrl_Impl::GetItemSize( SvxIconChoiceCtrlEntry*, - IcnViewFieldType eItem ) const +const Size& SvxIconChoiceCtrl_Impl::GetItemSize( IcnViewFieldType eItem ) const { if (eItem == IcnViewFieldType::Text) return aDefaultTextSize; @@ -2589,7 +2585,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange( { pEntry = GetEntry( i ); if( pEntry->IsSelected() ) - SelectEntry( pEntry, false, true, true ); + SelectEntry( pEntry, false, true ); } } @@ -2598,7 +2594,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange( { pEntry = GetEntry( i ); if( ! pEntry->IsSelected() ) - SelectEntry( pEntry, true, true, true ); + SelectEntry( pEntry, true, true ); } if ( ! bAdd ) @@ -2610,7 +2606,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange( { pEntry = GetEntry( i ); if( pEntry->IsSelected() ) - SelectEntry( pEntry, false, true, true ); + SelectEntry( pEntry, false, true ); } } } @@ -2814,7 +2810,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) SetNoSelection(); pCurEditedEntry = pEntry; - OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, true ) ); + OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) ); tools::Rectangle aRect( CalcTextRect( pEntry, nullptr, true, &aEntryText ) ); MakeVisible( aRect ); Point aPos( aRect.TopLeft() ); @@ -2916,13 +2912,11 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const void SvxIconChoiceCtrl_Impl::SelectAll() { - bool bPaint = true; - size_t nCount = aEntries.size(); for( size_t nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ]; - SelectEntry( pEntry, true/*bSelect*/, true, bPaint ); + SelectEntry( pEntry, true/*bSelect*/, true ); } nFlags &= (~IconChoiceFlags::AddMode); pAnchor = nullptr; @@ -3271,7 +3265,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) return false; OUString sQuickHelpText = pEntry->GetQuickHelpText(); - OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) ); + OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) ); tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, false, &aEntryText ) ); if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) return false; @@ -3384,7 +3378,7 @@ void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEn } } -void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* ) +void SvxIconChoiceCtrl_Impl::CallSelectHandler() { // When single-click mode is active, the selection handler should be called // synchronously, as the selection is automatically taken away once the diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 41c113867ffd..7a7f6d29d7b0 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -107,7 +107,7 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po rDev.DrawImage( rPos, pEntry->GetImage() ); } -OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool ) +OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry ) { return pEntry->GetText(); } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index d6b3980bd9db..092f4cdaa021 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1458,7 +1458,7 @@ long SvImpLBox::GetEntryLine( SvTreeListEntry* pEntry ) const return nFirstVisPos; } -void SvImpLBox::SetEntryHeight( short /* nHeight */ ) +void SvImpLBox::SetEntryHeight() { SetNodeBmpYOffset( GetExpandedNodeBmp() ); SetNodeBmpYOffset( GetCollapsedNodeBmp() ); @@ -1862,7 +1862,7 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) // ****** Control the control animation -bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /*nY*/) +bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry) { SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab); if (pItem && pItem->GetType() == SvLBoxItemType::Button) @@ -1917,7 +1917,7 @@ bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt ) pActiveButton->SetStateHilighted( false ); long nMouseX = rMEvt.GetPosPixel().X(); if (pEntry == pActiveEntry && pView->GetItem(pActiveEntry, nMouseX) == pActiveButton) - pActiveButton->ClickHdl(pView, pActiveEntry); + pActiveButton->ClickHdl(pActiveEntry); InvalidateEntry(pActiveEntry); if (pCursor == pActiveEntry) ShowCursor(true); @@ -1955,7 +1955,7 @@ bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) } // false == hit no node button -bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /* nY */ ) +bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry ) { bool bRet = false; @@ -2005,7 +2005,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) long nY = GetEntryLine( pEntry ); // Node-Button? - if( ButtonDownCheckExpand( rMEvt, pEntry, nY ) ) + if( ButtonDownCheckExpand( rMEvt, pEntry ) ) return; if( !EntryReallyHit(pEntry,aPos,nY)) @@ -2059,7 +2059,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) else { // CheckButton? (TreeListBox: Check + Info) - if( ButtonDownCheckCtrl(rMEvt, pEntry, nY) ) + if( ButtonDownCheckCtrl(rMEvt, pEntry) ) return; // Inplace-Editing? } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 6b7d4e4b96df..7e1cb420a7d7 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -271,7 +271,7 @@ SvLBoxItemType SvLBoxButton::GetType() const return SvLBoxItemType::Button; } -bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry ) +bool SvLBoxButton::ClickHdl( SvTreeListEntry* pEntry ) { if ( CheckModification() ) { diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 844dc178cc65..bd8d55e3a1b6 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -48,8 +48,8 @@ struct SvListView::Impl void InitTable(); void RemoveViewData( SvTreeListEntry* pParent ); - void ActionMoving(SvTreeListEntry* pEntry, SvTreeListEntry* pTargetPrnt, sal_uLong nChildPos); - void ActionMoved(SvTreeListEntry* pEntry, SvTreeListEntry* pTargetPrnt, sal_uLong nChildPos); + void ActionMoving(SvTreeListEntry* pEntry); + void ActionMoved(); void ActionInserted(SvTreeListEntry* pEntry); void ActionInsertedTree(SvTreeListEntry* pEntry); void ActionRemoving(SvTreeListEntry* pEntry); @@ -1292,7 +1292,7 @@ void SvListView::ModelHasEntryInvalidated( SvTreeListEntry*) { } -void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLong) +void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry ) { SvTreeListEntry* pParent = pEntry->pParent; DBG_ASSERT(pParent,"Model not consistent"); @@ -1306,9 +1306,7 @@ void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sa m_bVisPositionsValid = false; } -void SvListView::Impl::ActionMoved( SvTreeListEntry* /* pEntry */ , - SvTreeListEntry* /* pTargetPrnt */ , - sal_uLong /* nChildPos */ ) +void SvListView::Impl::ActionMoved() { m_nVisibleCount = 0; m_bVisPositionsValid = false; @@ -1426,10 +1424,10 @@ void SvListView::ModelNotification( SvListAction nActionId, SvTreeListEntry* pEn break; case SvListAction::MOVING: ModelIsMoving( pEntry1, pEntry2, nPos ); - m_pImpl->ActionMoving( pEntry1, pEntry2, nPos ); + m_pImpl->ActionMoving( pEntry1 ); break; case SvListAction::MOVED: - m_pImpl->ActionMoved( pEntry1, pEntry2, nPos ); + m_pImpl->ActionMoved(); ModelHasMoved( pEntry1 ); break; case SvListAction::CLEARING: diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index cfe4dc630c9b..287b727ff53c 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2155,7 +2155,7 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) { nEntryHeight = nHeightMax; Control::SetFont( GetFont() ); - pImpl->SetEntryHeight( nHeightMax ); + pImpl->SetEntryHeight(); } } @@ -2169,7 +2169,7 @@ void SvTreeListBox::SetEntryHeight( short nHeight, bool bForce ) else nTreeFlags &= ~SvTreeFlags::FIXEDHEIGHT; Control::SetFont( GetFont() ); - pImpl->SetEntryHeight( nHeight ); + pImpl->SetEntryHeight(); } } @@ -2185,7 +2185,7 @@ void SvTreeListBox::AdjustEntryHeight( const Image& rBmp ) if( aSize.Height() > nEntryHeight ) { nEntryHeight = (short)aSize.Height() + nEntryHeightOffs; - pImpl->SetEntryHeight( nEntryHeight ); + pImpl->SetEntryHeight(); } } @@ -2195,7 +2195,7 @@ void SvTreeListBox::AdjustEntryHeight() if( aSize.Height() > nEntryHeight ) { nEntryHeight = (short)aSize.Height() + nEntryHeightOffs; - pImpl->SetEntryHeight( nEntryHeight ); + pImpl->SetEntryHeight(); } } @@ -2449,7 +2449,7 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic ) nEntryHeightOffs = nOffsLogic; nEntryHeight = nEntryHeight + nOffsLogic; AdjustEntryHeightAndRecalc(); - pImpl->SetEntryHeight( nEntryHeight ); + pImpl->SetEntryHeight(); } } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 0b5bc8de630c..37bd3683895b 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -275,7 +275,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) } void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, - const tools::Rectangle& rItemRect, const tools::Rectangle* pRect, DrawFlags ) + const tools::Rectangle& rItemRect, const tools::Rectangle* pRect ) { ImplControlValue aControlValue(0); tools::Rectangle aCtrlRegion; @@ -609,7 +609,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos bool bHigh, const tools::Rectangle* pRect ) { tools::Rectangle aRect = ImplGetItemRect(nPos); - ImplDrawItem(rRenderContext, nPos, bHigh, aRect, pRect, DrawFlags::NONE ); + ImplDrawItem(rRenderContext, nPos, bHigh, aRect, pRect ); } void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd) @@ -977,7 +977,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, aItemRect.Right() = 16000; vcl::Region aRegion( aRect ); pDev->SetClipRegion( aRegion ); - ImplDrawItem(*pDev, i, false, aItemRect, &aRect, nFlags ); + ImplDrawItem(*pDev, i, false, aItemRect, &aRect ); pDev->SetClipRegion(); } diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 11c2e938dd18..b459522cc7b3 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1149,7 +1149,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& r if (!nItemCount) return; - ImplPrePaint(rRenderContext); + ImplPrePaint(); Color aFaceColor, aSelectColor, aFaceTextColor, aSelectTextColor; const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); @@ -1528,7 +1528,7 @@ bool TabBar::ImplDeactivatePage() return bRet; } -void TabBar::ImplPrePaint(vcl::RenderContext& /*rRenderContext*/) +void TabBar::ImplPrePaint() { sal_uInt16 nItemCount = mpImpl->getItemSize(); if (!nItemCount) diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index f419975e1cc7..92d23b77f701 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -847,7 +847,7 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry ) void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) { - implHighlightAtPosition(rMEvt, true); + implHighlightAtPosition(rMEvt); implSelectEntry(mpImpl->mnHighlightedEntry); } @@ -862,11 +862,11 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) if (!IsVisible()) return; - implHighlightAtPosition(rMEvt, false); + implHighlightAtPosition(rMEvt); } -void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDown*/) +void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt) { long nMouseY = rMEvt.GetPosPixel().Y(); Size aOutSz = GetOutputSizePixel(); diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index c018a533dc4e..fe31de3fb51e 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -172,7 +172,7 @@ public: bool HasGraphicObjectReference( const GraphicObject& rObj ); void TryToSwapIn(); - void GraphicObjectWasSwappedOut( const GraphicObject& rObj ); + void GraphicObjectWasSwappedOut(); void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); }; @@ -364,7 +364,7 @@ void GraphicCacheEntry::TryToSwapIn() maGraphicObjectList.front()->FireSwapInRequest(); } -void GraphicCacheEntry::GraphicObjectWasSwappedOut( const GraphicObject& /*rObj*/ ) +void GraphicCacheEntry::GraphicObjectWasSwappedOut() { mbSwappedAll = true; @@ -989,7 +989,7 @@ void GraphicCache::GraphicObjectWasSwappedOut( const GraphicObject& rObj ) GraphicCacheEntry* pEntry = ImplGetCacheEntry( rObj ); if( pEntry ) - pEntry->GraphicObjectWasSwappedOut( rObj ); + pEntry->GraphicObjectWasSwappedOut(); } void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj ) diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 15ca2242f68f..35288085a287 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -127,7 +127,7 @@ bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& { // cached/direct drawing if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) ) - bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached ); + bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, rCached ); else bRet = rCached = true; } @@ -232,7 +232,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ) bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const GraphicManagerDrawFlags nFlags, bool& rCached ) + bool& rCached ) { const Graphic& rGraphic = rObj.GetGraphic(); bool bRet = false; @@ -250,7 +250,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, { BitmapEx aDstBmpEx; - if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) ) + if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, &aDstBmpEx ) ) { rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); bRet = true; @@ -258,7 +258,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, } if( !bRet ) - bRet = ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags ); + bRet = ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr ); } else { @@ -269,7 +269,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, GDIMetaFile aDstMtf; BitmapEx aContainedBmpEx; - if( ImplCreateOutput( pOut, rPt, rSz, rSrcMtf, rAttr, nFlags, aDstMtf, aContainedBmpEx ) ) + if( ImplCreateOutput( pOut, rPt, rSz, rSrcMtf, rAttr, aDstMtf, aContainedBmpEx ) ) { if( !!aContainedBmpEx ) { @@ -277,7 +277,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, // bitmap (allows caching the resulting pixmap). BitmapEx aDstBmpEx; - if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) ) + if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, &aDstBmpEx ) ) { rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); bRet = true; @@ -872,7 +872,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, const Point& rPoint, const Size& rSize, const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes, - const GraphicManagerDrawFlags /*nFlags*/, BitmapEx* pBmpEx ) + BitmapEx* pBmpEx ) { sal_uInt16 nRot10 = rAttributes.GetRotation() % 3600; @@ -1089,7 +1089,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx, bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const GraphicManagerDrawFlags /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) + GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) { const Size aNewSize( rMtf.GetPrefSize() ); diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index c2dc34ff6293..929e714ed7a9 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -172,10 +172,10 @@ private: void SetAnchorSelection( SvTreeListEntry* pOld, SvTreeListEntry* pNewCursor ); void BeginDrag(); - bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long nY ); + bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry ); bool MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry ); bool ButtonUpCheckCtrl( const MouseEvent& rMEvt ); - bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry*,long nY ); + bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry* ); bool EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, long nLine); void InitScrollBarBox(); @@ -271,7 +271,7 @@ public: void GetFocus(); void LoseFocus(); virtual void UpdateAll( bool bInvalidateCompleteView ); - void SetEntryHeight( short nHeight ); + void SetEntryHeight(); void InvalidateEntry( SvTreeListEntry* ); void RecalcFocusRect(); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index c91350006246..3994929b69b0 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -94,7 +94,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo { TransferableObjectDescriptor aDesc; FillTransferableObjectDescriptor( aDesc, m_xObj, m_pGraphic, m_nAspect ); - bRet = SetTransferableObjectDescriptor( aDesc, rFlavor ); + bRet = SetTransferableObjectDescriptor( aDesc ); } else if( nFormat == SotClipboardFormatId::EMBED_SOURCE ) { @@ -142,7 +142,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo bRet = ( aSeq.getLength() > 0 ); if( bRet ) { - SetAny( uno::Any(aSeq), rFlavor ); + SetAny( uno::Any(aSeq) ); } } else @@ -164,7 +164,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo uno::Any aAny; aAny <<= uno::Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); - SetAny( aAny, rFlavor ); + SetAny( aAny ); bRet = true; } else if ( ( nFormat == SotClipboardFormatId::BITMAP || nFormat == SotClipboardFormatId::PNG ) && m_pGraphic ) @@ -177,7 +177,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo if ( xTransferable.is() ) { uno::Any aAny = xTransferable->getTransferData( rFlavor ); - SetAny( aAny, rFlavor ); + SetAny( aAny ); bRet = true; } } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 19d87badf38a..437745bc9106 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -621,7 +621,7 @@ void TransferableHelper::ClearFormats() } -bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) +bool TransferableHelper::SetAny( const Any& rAny ) { maAny = rAny; return( maAny.hasValue() ); @@ -678,7 +678,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo } -bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) +bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf ) { if( rMtf.GetActionSize() ) { @@ -692,7 +692,7 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlav } -bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) +bool TransferableHelper::SetGraphic( const Graphic& rGraphic ) { if( rGraphic.GetType() != GraphicType::NONE ) { @@ -708,7 +708,7 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& } -bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& ) +bool TransferableHelper::SetImageMap( const ImageMap& rIMap ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -720,8 +720,7 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatran } -bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, - const css::datatransfer::DataFlavor& ) +bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc ) { PrepareOLE( rDesc ); @@ -1779,11 +1778,11 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ) { DataFlavor aFlavor; - return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( aFlavor, rDesc ) ); + return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( rDesc ) ); } -bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) +bool TransferableDataHelper::GetTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) { rDesc = *mxObjDesc; return true; @@ -1957,13 +1956,11 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ) { DataFlavor aFlavor; - return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( aFlavor, rFileList ) ); + return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( rFileList ) ); } -bool TransferableDataHelper::GetFileList( - const css::datatransfer::DataFlavor&, - FileList& rFileList ) +bool TransferableDataHelper::GetFileList( FileList& rFileList ) { tools::SvRef<SotStorageStream> xStm; bool bRet = false; diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 49da3de0e482..34a55d768d58 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -376,7 +376,7 @@ bool TransferDataContainer::GetData( TDataCntnrEntry_Impl& rEntry = (TDataCntnrEntry_Impl&)*aIter; if( nFmtId == rEntry.nId ) { - bFnd = SetAny( rEntry.aAny, rFlavor ); + bFnd = SetAny( rEntry.aAny ); break; } } @@ -400,7 +400,7 @@ bool TransferDataContainer::GetData( case SotClipboardFormatId::BITMAP: case SotClipboardFormatId::GDIMETAFILE: if( pImpl->pGrf ) - bFnd = SetGraphic( *pImpl->pGrf, rFlavor ); + bFnd = SetGraphic( *pImpl->pGrf ); break; default: break; } diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index ccfd5da20a82..c52207e10f32 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -581,8 +581,7 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nL } -SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor, - rtl_TextEncoding ) +SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor ) { rStream.WriteCharPtr( "\"#" ); if( rColor.GetColor() == COL_AUTO ) diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index c2bf4a7145da..388b6240cb82 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -505,7 +505,7 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents() class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel > { public: - explicit SvUnoImageMap( const SvEventDescription* pSupportedMacroItems ); + explicit SvUnoImageMap(); SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); bool fillImageMap( ImageMap& rMap ) const; @@ -542,7 +542,7 @@ private: UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMap ); -SvUnoImageMap::SvUnoImageMap( const SvEventDescription* ) +SvUnoImageMap::SvUnoImageMap() { } @@ -706,9 +706,9 @@ Reference< XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEvent return static_cast<XWeak*>(new SvUnoImageMapObject( IMAP_OBJ_POLYGON, pSupportedMacroItems )); } -Reference< XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ) +Reference< XInterface > SvUnoImageMap_createInstance() { - return static_cast<XWeak*>(new SvUnoImageMap( pSupportedMacroItems )); + return static_cast<XWeak*>(new SvUnoImageMap); } Reference< XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ) diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index fd7dd49164c9..d8aa351314e2 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -230,7 +230,7 @@ namespace svx default: break; } if (nFormatId == getDescriptorFormatId()) - return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); + return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ) ); return false; } @@ -463,7 +463,7 @@ namespace svx case SotClipboardFormatId::DBACCESS_TABLE: case SotClipboardFormatId::DBACCESS_QUERY: case SotClipboardFormatId::DBACCESS_COMMAND: - return SetAny( makeAny(m_aDescriptor.createPropertyValueSequence()), rFlavor ); + return SetAny( makeAny(m_aDescriptor.createPropertyValueSequence()) ); case SotClipboardFormatId::SBA_DATAEXCHANGE: return SetString(m_sCompatibleObjectDescription, rFlavor); @@ -630,7 +630,7 @@ namespace svx const SotClipboardFormatId nFormatId = SotExchange::GetFormat(_rFlavor); if (nFormatId == getDescriptorFormatId()) { - return SetAny( makeAny( m_aDescriptors ), _rFlavor ); + return SetAny( makeAny( m_aDescriptors ) ); } return false; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 52641245b1b2..63d18d266100 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -89,7 +89,7 @@ namespace svx { const SotClipboardFormatId nFormatId = SotExchange::GetFormat(_rFlavor); if ( nFormatId == getDescriptorFormatId(true) || nFormatId == getDescriptorFormatId(false) ) - return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); + return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ) ); return false; } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 0c39405586d8..13eb30bc31e0 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -287,12 +287,12 @@ namespace svxform aCompleteInfo.getArray()[ 0 ] <<= m_xFormsRoot; aCompleteInfo.getArray()[ 1 ] <<= m_aControlPaths; - SetAny( makeAny( aCompleteInfo ), _rFlavor ); + SetAny( makeAny( aCompleteInfo ) ); } else if ( getHiddenControlModelsFormatId() == nFormatId ) { // just need to transfer the models - SetAny( makeAny( m_aHiddenControlModels ), _rFlavor ); + SetAny( makeAny( m_aHiddenControlModels ) ); } else return OLocalExchange::GetData(_rFlavor, rDestDoc); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index b06ff79c1dc0..b49b042317e6 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -520,7 +520,7 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons else if( ( SotClipboardFormatId::SVIM == nFormat ) && mpImageMap ) { // TODO/MBA: do we need a BaseURL here?! - bRet = SetImageMap( *mpImageMap, rFlavor ); + bRet = SetImageMap( *mpImageMap ); } else if( ( SotClipboardFormatId::SIMPLE_FILE == nFormat ) && mpURL ) { @@ -528,11 +528,11 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons } else if( ( SotClipboardFormatId::SVXB == nFormat ) && mpGraphicObject ) { - bRet = SetGraphic( mpGraphicObject->GetGraphic(), rFlavor ); + bRet = SetGraphic( mpGraphicObject->GetGraphic() ); } else if( ( SotClipboardFormatId::GDIMETAFILE == nFormat ) && mpGraphicObject ) { - bRet = SetGDIMetaFile( mpGraphicObject->GetGraphic().GetGDIMetaFile(), rFlavor ); + bRet = SetGDIMetaFile( mpGraphicObject->GetGraphic().GetGDIMetaFile() ); } else if( ( SotClipboardFormatId::BITMAP == nFormat ) && mpGraphicObject ) { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d6005f1730ed..1eef03d8a148 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2630,7 +2630,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " " OOO_STRING_SVTOOLS_HTML_O_color "="; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.m_eDestEnc ).WriteChar( '>' ); + HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor ).WriteChar( '>' ); } else HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false ); diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 6195eac9c0b6..2af0c66397fd 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -274,7 +274,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("="); rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.m_eDestEnc ); + HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor ); } if (!sOut.isEmpty()) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 5596225a6245..040fdd5b86e4 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -878,7 +878,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat, Color aColor( pColorItem->GetValue() ); if( COL_AUTO == aColor.GetColor() ) aColor.SetColor( COL_BLACK ); - HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.m_eDestEnc ); + HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor ); if( RES_POOLCOLL_STANDARD==pFormat->GetPoolFormatId() ) rHWrt.m_pDfltColor = new Color( aColor ); } @@ -1211,7 +1211,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('='); Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - HTMLOutFuncs::Out_Color( Strm(), rBackColor, m_eDestEnc); + HTMLOutFuncs::Out_Color( Strm(), rBackColor); } if( !bGraphic ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 5e8827da34e5..c14b15d19d96 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -495,7 +495,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo TransferableDataHelper aD( new SvEmbedTransferHelper( xObj, pOLEGraph, nAspect ) ); uno::Any aAny = aD.GetAny(rFlavor, rDestDoc); if( aAny.hasValue() ) - bOK = SetAny( aAny, rFlavor ); + bOK = SetAny( aAny ); } // the following solution will be used in the case when the object can not generate the image @@ -505,7 +505,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo { pOLEGraph = FindOLEReplacementGraphic(); if ( pOLEGraph ) - bOK = SetGDIMetaFile( pOLEGraph->GetGDIMetaFile(), rFlavor ); + bOK = SetGDIMetaFile( pOLEGraph->GetGDIMetaFile() ); } } else @@ -519,7 +519,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::OBJECTDESCRIPTOR: case SotClipboardFormatId::LINKSRCDESCRIPTOR: - bOK = SetTransferableObjectDescriptor( m_aObjDesc, rFlavor ); + bOK = SetTransferableObjectDescriptor( m_aObjDesc ); break; case SotClipboardFormatId::DRAWING: @@ -558,12 +558,12 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::SVXB: if( m_eBufferType & TransferBufferType::Graphic && m_pOrigGraphic ) - bOK = SetGraphic( *m_pOrigGraphic, rFlavor ); + bOK = SetGraphic( *m_pOrigGraphic ); break; case SotClipboardFormatId::GDIMETAFILE: if( m_eBufferType & TransferBufferType::Graphic ) - bOK = SetGDIMetaFile( m_pClpGraphic->GetGDIMetaFile(), rFlavor ); + bOK = SetGDIMetaFile( m_pClpGraphic->GetGDIMetaFile() ); break; case SotClipboardFormatId::BITMAP: case SotClipboardFormatId::PNG: @@ -574,7 +574,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo case SotClipboardFormatId::SVIM: if( m_pImageMap ) - bOK = SetImageMap( *m_pImageMap, rFlavor ); + bOK = SetImageMap( *m_pImageMap ); break; case SotClipboardFormatId::INET_IMAGE: |