summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/app/drwtrans.cxx8
-rw-r--r--sc/source/ui/app/seltrans.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx4
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx4
4 files changed, 9 insertions, 9 deletions
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