summaryrefslogtreecommitdiff
path: root/sw/source/uibase/dochdl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 12:14:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 13:52:30 +0200
commit12191a4f30078bb81c39a74a994ba7b2b410adaf (patch)
tree394626ae75e6b77e4159657847f894e4f7c9495b /sw/source/uibase/dochdl
parent3a9854a92923df8013ca832c48aa9f284bcb1adc (diff)
make loplugin constantparam smarter about string params
Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294 Reviewed-on: https://gerrit.libreoffice.org/37426 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/dochdl')
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 57270b8e2a31..28ae025eeb47 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -477,8 +477,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
m_pImageMap = new ImageMap( *rURL.GetMap() );
else if( !rURL.GetURL().isEmpty() )
m_pTargetURL = new INetImage( aEmptyOUStr, rURL.GetURL(),
- rURL.GetTargetFrameName(),
- aEmptyOUStr );
+ rURL.GetTargetFrameName() );
}
}
@@ -1003,8 +1002,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
else if( !rURL.GetURL().isEmpty() )
{
m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
- rURL.GetTargetFrameName(),
- aEmptyOUStr );
+ rURL.GetTargetFrameName() );
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}
@@ -1969,7 +1967,7 @@ bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData,
case SwPasteSdr::Replace:
if( rSh.IsObjSelected() )
{
- rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic );
+ rSh.ReplaceSdrObj( sURL, &aGraphic );
Point aPt( pPt ? *pPt : rSh.GetCursorDocPos() );
SwTransferable::SetSelInShell( rSh, true, &aPt );
}
@@ -2442,7 +2440,7 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
if( pStream != nullptr &&
!pStream->GetError() &&
// mba: no BaseURL for clipboard functionality
- aMap.Read( *pStream, IMAP_FORMAT_DETECT, OUString() ) == IMAP_ERR_OK &&
+ aMap.Read( *pStream, IMAP_FORMAT_DETECT ) == IMAP_ERR_OK &&
aMap.GetIMapObjectCount() )
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
@@ -3141,8 +3139,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
else if( !rURL.GetURL().isEmpty() )
{
m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
- rURL.GetTargetFrameName(),
- aEmptyOUStr );
+ rURL.GetTargetFrameName() );
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}