chart2/source/controller/main/ChartController_Tools.cxx | 2 -
chart2/source/controller/main/ChartTransferable.cxx | 2 -
include/vcl/transfer.hxx | 6 ++--
sc/source/ui/app/drwtrans.cxx | 2 -
sc/source/ui/app/transobj.cxx | 2 -
sc/source/ui/view/viewfun3.cxx | 2 -
sc/source/ui/view/viewfun5.cxx | 2 -
sd/source/ui/app/sdxfer.cxx | 2 -
sd/source/ui/view/sdview3.cxx | 2 -
svtools/source/misc/embedtransfer.cxx | 2 -
svx/source/gallery2/galmisc.cxx | 2 -
sw/source/uibase/dochdl/swdtflvr.cxx | 2 -
vcl/source/treelist/transfer.cxx | 21 ++++++----------
13 files changed, 23 insertions(+), 26 deletions(-)
New commits:
commit 136db25f73a9b884e52334fbe63725942ae624eb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Aug 28 16:57:39 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Aug 28 18:49:09 2025 +0200
vcl: Rename TransferableDataHelper::{G,S}etBitmap(Ex)
Since
commit 9540041bdd523de3265a893184fd816574f352e2
Date: Mon Aug 25 08:21:53 2025 +0200
BitmapEx->Bitmap in vcl
, TransferableDataHelper::GetBitmapEx and
TransferableDataHelper::SetBitmapEx return/take
Bitmap instead of BitmapEx.
Rename the methods accordingly.
Change-Id: I90bd73fa538952572d7c7a90a9604e01412272ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190335
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 093fb6f61be9..4453af107879 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -576,7 +576,7 @@ void ChartController::executeDispatch_Paste()
{
// bitmap (non-graphic-manager)
Bitmap aBmp;
- if( aDataHelper.GetBitmapEx( SotClipboardFormatId::BITMAP, aBmp ))
+ if (aDataHelper.GetBitmap(SotClipboardFormatId::BITMAP, aBmp))
aGraphic = Graphic( aBmp );
}
else if( aDataHelper.HasFormat( SotClipboardFormatId::STRING ))
diff --git a/chart2/source/controller/main/ChartTransferable.cxx
b/chart2/source/controller/main/ChartTransferable.cxx
index 7cfe2a5ae0ff..100effb23938 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -97,7 +97,7 @@ bool ChartTransferable::GetData( const
css::datatransfer::DataFlavor& rFlavor, c
else if( nFormat == SotClipboardFormatId::BITMAP )
{
Graphic aGraphic( m_xMetaFileGraphic );
- bResult = SetBitmapEx( aGraphic.GetBitmap(), rFlavor );
+ bResult = SetBitmap(aGraphic.GetBitmap(), rFlavor);
}
}
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 7e4ed34c8fd6..7f49e279a0a9 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -231,7 +231,7 @@ protected:
bool SetAny( const css::uno::Any& rAny );
bool SetString( const OUString& rString );
- bool SetBitmapEx( const Bitmap& rBitmap, const
css::datatransfer::DataFlavor& rFlavor );
+ bool SetBitmap(const Bitmap& rBitmap, const
css::datatransfer::DataFlavor& rFlavor);
bool SetGDIMetaFile( const GDIMetaFile& rMtf );
bool SetGraphic( const Graphic& rGraphic );
bool SetImageMap( const ImageMap& rIMap );
@@ -314,8 +314,8 @@ public:
bool GetString( SotClipboardFormatId nFormat,
OUString& rStr ) const;
bool GetString( const
css::datatransfer::DataFlavor& rFlavor, OUString& rStr ) const;
- bool GetBitmapEx( SotClipboardFormatId nFormat,
Bitmap& rBmp ) const;
- bool GetBitmapEx( const
css::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp ) const;
+ bool GetBitmap(SotClipboardFormatId nFormat,
Bitmap& rBmp) const;
+ bool GetBitmap(const css::datatransfer::DataFlavor&
rFlavor, Bitmap& rBmp) const;
/** Return as GDI metafile.
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 18f90407e3b4..fea6ecf01960 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -375,7 +375,7 @@ bool ScDrawTransferObj::GetData( const
css::datatransfer::DataFlavor& rFlavor, c
if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true) );
else
- bOK = SetBitmapEx( aView.GetMarkedObjBitmap(true), rFlavor );
+ bOK = SetBitmap(aView.GetMarkedObjBitmap(true), rFlavor);
}
else if ( nFormat == SotClipboardFormatId::SVXB )
{
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 4cba890faa89..15c87e5e41eb 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -438,7 +438,7 @@ bool ScTransferObj::GetData( const
datatransfer::DataFlavor& rFlavor, const OUSt
pVirtDev->SetMapMode( MapMode( MapUnit::MapPixel, Point(), aScale,
aScale ) );
Bitmap aBmp( pVirtDev->GetBitmap( Point(),
pVirtDev->GetOutputSize() ) );
- bOK = SetBitmapEx( aBmp, rFlavor );
+ bOK = SetBitmap(aBmp, rFlavor);
}
else if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
{
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 33153652fb04..08f64f75bdc5 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -819,7 +819,7 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
Bitmap aBmp;
ScDrawView* pScDrawView = GetScDrawView();
- if( pScDrawView && aDataHelper.GetBitmapEx(
SotClipboardFormatId::BITMAP, aBmp ) )
+ if (pScDrawView && aDataHelper.GetBitmap(SotClipboardFormatId::BITMAP,
aBmp))
{
const OUString aBeginUndo(ScResId(STR_UNDO_DRAGDROP));
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index e7ffd3cf2027..4a6168e0c08a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -229,7 +229,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId
nFormatId,
else if (nFormatId == SotClipboardFormatId::BITMAP || nFormatId ==
SotClipboardFormatId::PNG || nFormatId == SotClipboardFormatId::JPEG)
{
Bitmap aBmp;
- if( aDataHelper.GetBitmapEx( SotClipboardFormatId::BITMAP, aBmp ) )
+ if (aDataHelper.GetBitmap(SotClipboardFormatId::BITMAP, aBmp))
bRet = PasteBitmap( aPos, aBmp );
}
else if (nFormatId == SotClipboardFormatId::GDIMETAFILE)
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 8f9b879d3b2e..7ca68edc6bd8 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -508,7 +508,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
const bool bToggleOnlineSpell = mpSdDrawDocumentIntern &&
mpSdDrawDocumentIntern->GetOnlineSpell();
if (bToggleOnlineSpell)
mpSdDrawDocumentIntern->SetOnlineSpell(false);
- bOK = SetBitmapEx( mpSdViewIntern->GetMarkedObjBitmap(true),
rFlavor );
+ bOK = SetBitmap(mpSdViewIntern->GetMarkedObjBitmap(true),
rFlavor);
if (bToggleOnlineSpell)
mpSdDrawDocumentIntern->SetOnlineSpell(true);
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index da293e013bb8..9cecfbd017a8 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1318,7 +1318,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
Bitmap aBmp;
// get basic Bitmap data
- rDataHelper.GetBitmapEx(SotClipboardFormatId::BITMAP, aBmp);
+ rDataHelper.GetBitmap(SotClipboardFormatId::BITMAP, aBmp);
if(aBmp.IsEmpty())
{
diff --git a/svtools/source/misc/embedtransfer.cxx
b/svtools/source/misc/embedtransfer.cxx
index 9f2f9891054e..6c462857d48c 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -167,7 +167,7 @@ bool SvEmbedTransferHelper::GetData( const
css::datatransfer::DataFlavor& rFlavo
}
else if ( ( nFormat == SotClipboardFormatId::BITMAP || nFormat
== SotClipboardFormatId::PNG ) && m_oGraphic )
{
- bRet = SetBitmapEx( m_oGraphic->GetBitmap(), rFlavor );
+ bRet = SetBitmap(m_oGraphic->GetBitmap(), rFlavor);
}
else if ( m_xObj.is() &&
::svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b3e7f51f5989..be0546891420 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -492,7 +492,7 @@ bool GalleryTransferable::GetData( const
datatransfer::DataFlavor& rFlavor, cons
else if( ( SotClipboardFormatId::BITMAP == nFormat ||
SotClipboardFormatId::PNG == nFormat)
&& mpGraphicObject )
{
- bRet = SetBitmapEx( mpGraphicObject->GetGraphic().GetBitmap(), rFlavor
);
+ bRet = SetBitmap(mpGraphicObject->GetGraphic().GetBitmap(), rFlavor);
}
return bRet;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 8a65bfec9331..bbd0fe4ac382 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -669,7 +669,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
case SotClipboardFormatId::PNG:
// Neither pClpBitmap nor pClpGraphic are necessarily set
if( (m_eBufferType & TransferBufferType::Graphic) && (m_oClpBitmap
|| m_oClpGraphic))
- bOK = SetBitmapEx( (m_oClpBitmap ? m_oClpBitmap :
m_oClpGraphic)->GetBitmap(), rFlavor );
+ bOK = SetBitmap((m_oClpBitmap ? m_oClpBitmap :
m_oClpGraphic)->GetBitmap(), rFlavor);
break;
case SotClipboardFormatId::SVIM:
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 6870f0c1ab5b..91948d023de4 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -708,8 +708,7 @@ bool TransferableHelper::SetString( const OUString& rString
)
return maAny.hasValue();
}
-
-bool TransferableHelper::SetBitmapEx( const Bitmap& rBitmap, const DataFlavor&
rFlavor )
+bool TransferableHelper::SetBitmap(const Bitmap& rBitmap, const DataFlavor&
rFlavor)
{
if( !rBitmap.IsEmpty() )
{
@@ -1521,8 +1520,7 @@ bool TransferableDataHelper::GetString( const DataFlavor&
rFlavor, OUString& rSt
return bRet;
}
-
-bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat,
Bitmap& rBmp ) const
+bool TransferableDataHelper::GetBitmap(SotClipboardFormatId nFormat, Bitmap&
rBmp) const
{
if(SotClipboardFormatId::BITMAP == nFormat)
{
@@ -1531,7 +1529,7 @@ bool TransferableDataHelper::GetBitmapEx(
SotClipboardFormatId nFormat, Bitmap&
if(SotExchange::GetFormatDataFlavor(SotClipboardFormatId::PNG,
aFlavor))
{
- if(GetBitmapEx(aFlavor, rBmp))
+ if (GetBitmap(aFlavor, rBmp))
{
return true;
}
@@ -1540,7 +1538,7 @@ bool TransferableDataHelper::GetBitmapEx(
SotClipboardFormatId nFormat, Bitmap&
// then JPEG
if(SotExchange::GetFormatDataFlavor(SotClipboardFormatId::JPEG,
aFlavor))
{
- if(GetBitmapEx(aFlavor, rBmp))
+ if (GetBitmap(aFlavor, rBmp))
{
return true;
}
@@ -1548,11 +1546,10 @@ bool TransferableDataHelper::GetBitmapEx(
SotClipboardFormatId nFormat, Bitmap&
}
DataFlavor aFlavor;
- return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) &&
GetBitmapEx( aFlavor, rBmp ) );
+ return (SotExchange::GetFormatDataFlavor(nFormat, aFlavor) &&
GetBitmap(aFlavor, rBmp));
}
-
-bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, Bitmap&
rBmp ) const
+bool TransferableDataHelper::GetBitmap(const DataFlavor& rFlavor, Bitmap&
rBmp) const
{
std::unique_ptr<SvStream> xStm = GetSotStorageStream(rFlavor);
DataFlavor aSubstFlavor;
@@ -1743,7 +1740,7 @@ bool TransferableDataHelper::GetGraphic( const
css::datatransfer::DataFlavor& rF
// try to get PNG first
Bitmap aBmp;
- bRet = GetBitmapEx( aFlavor, aBmp );
+ bRet = GetBitmap(aFlavor, aBmp);
if( bRet )
rGraphic = aBmp;
}
@@ -1764,7 +1761,7 @@ bool TransferableDataHelper::GetGraphic( const
css::datatransfer::DataFlavor& rF
{
Bitmap aBitmap;
- bRet = GetBitmapEx(aFlavor, aBitmap);
+ bRet = GetBitmap(aFlavor, aBitmap);
if (bRet)
rGraphic = aBitmap;
}
@@ -1773,7 +1770,7 @@ bool TransferableDataHelper::GetGraphic( const
css::datatransfer::DataFlavor& rF
{
Bitmap aBmp;
- bRet = GetBitmapEx( aFlavor, aBmp );
+ bRet = GetBitmap(aFlavor, aBmp);
if( bRet )
rGraphic = aBmp;
}
