diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 13 | ||||
| -rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index d8aa351314e2..e8c422914628 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -44,13 +44,12 @@ namespace svx using namespace ::comphelper; OColumnTransferable::OColumnTransferable(const OUString& _rDatasource - ,const OUString& _rConnectionResource ,const OUString& _rCommand ,const OUString& _rFieldName ,ColumnTransferFormatFlags _nFormats) :m_nFormatFlags(_nFormats) { - implConstruct(_rDatasource,_rConnectionResource, css::sdb::CommandType::TABLE, _rCommand, _rFieldName); + implConstruct(_rDatasource,OUString(), css::sdb::CommandType::TABLE, _rCommand, _rFieldName); } @@ -371,23 +370,21 @@ namespace svx ODataAccessObjectTransferable::ODataAccessObjectTransferable( const OUString& _rDatasource - ,const OUString& _rConnectionResource - ,const sal_Int32 _nCommandType + ,const sal_Int32 _nCommandType ,const OUString& _rCommand ) { - construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand); + construct(_rDatasource,OUString(),_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand); } ODataAccessObjectTransferable::ODataAccessObjectTransferable( const OUString& _rDatasource - ,const OUString& _rConnectionResource - ,const sal_Int32 _nCommandType + ,const sal_Int32 _nCommandType ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection) { OSL_ENSURE(_rxConnection.is(),"Wrong ctor used.!"); - construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,_rxConnection,(CommandType::COMMAND == _nCommandType),_rCommand); + construct(_rDatasource,OUString(),_nCommandType,_rCommand,_rxConnection,(CommandType::COMMAND == _nCommandType),_rCommand); } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index b8b7d0d612b4..44ab7ac9da0e 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -165,7 +165,7 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* return true; } -bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) +bool SdrExchangeView::Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); @@ -193,7 +193,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt pObj->SetMergedItemSet(aTempAttr); - pObj->NbcSetText(rInput,rBaseURL,eFormat); + pObj->NbcSetText(rInput,OUString(),eFormat); pObj->FitFrameToTextSize(); Size aSiz(pObj->GetLogicRect().GetSize()); MapUnit eMap=mpModel->GetScaleUnit(); |