cid#1546472 COPY_INSTEAD_OF_MOVE
and cid#1546459 COPY_INSTEAD_OF_MOVE cid#1546452 COPY_INSTEAD_OF_MOVE cid#1546403 COPY_INSTEAD_OF_MOVE cid#1546396 COPY_INSTEAD_OF_MOVE cid#1546394 COPY_INSTEAD_OF_MOVE cid#1546338 COPY_INSTEAD_OF_MOVE cid#1546324 COPY_INSTEAD_OF_MOVE Change-Id: If61457cfaf1d7ce4a069bcecdc0cc657aeb43c68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
parent
6c91e70335
commit
4d01186dce
8 changed files with 10 additions and 16 deletions
|
@ -661,10 +661,10 @@ void ODatabaseExport::createRowSet()
|
|||
bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont)
|
||||
{
|
||||
bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty();
|
||||
OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName );
|
||||
const OUString& rTableName(bHaveDefaultTable ? m_sDefaultTableName : _rTableName);
|
||||
OCopyTableWizard aWizard(
|
||||
nullptr,
|
||||
sTableName,
|
||||
rTableName,
|
||||
bHaveDefaultTable ? CopyTableOperation::AppendData : CopyTableOperation::CopyDefinitionAndData,
|
||||
ODatabaseExport::TColumns(m_aDestColumns),
|
||||
m_vDestVector,
|
||||
|
|
|
@ -913,9 +913,7 @@ IMPL_LINK_NOARG(ScDataProviderDlg, TransformationSelectHdl, weld::ComboBox&, voi
|
|||
|
||||
sc::ExternalDataSource ScDataProviderDlg::getDataSource(ScDocument* pDoc)
|
||||
{
|
||||
OUString aURL = mxEditURL->get_text();
|
||||
OUString aProvider = mxProviderList->get_active_text();
|
||||
sc::ExternalDataSource aSource(aURL, aProvider, pDoc);
|
||||
sc::ExternalDataSource aSource(mxEditURL->get_text(), mxProviderList->get_active_text(), pDoc);
|
||||
|
||||
OUString aID = mxEditID->get_text();
|
||||
aSource.setID(aID);
|
||||
|
|
|
@ -552,8 +552,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved )
|
|||
{
|
||||
sheet::ActivationEvent aEvent;
|
||||
uno::Reference< sheet::XSpreadsheetView > xView(this);
|
||||
uno::Reference< uno::XInterface > xSource(xView, uno::UNO_QUERY);
|
||||
aEvent.Source = xSource;
|
||||
aEvent.Source.set(xView, uno::UNO_QUERY);
|
||||
aEvent.ActiveSheet = new ScTableSheetObj(pDocSh, rViewData.GetTabNo());
|
||||
// Listener's handler may remove it from the listeners list
|
||||
for (size_t i = aActivationListeners.size(); i > 0; --i)
|
||||
|
|
|
@ -1774,8 +1774,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
|
|||
|
||||
// Enter in own property array
|
||||
Property& rProp = rAllPropArray[ rPropCount ];
|
||||
OUString aFieldName = xField->getName();
|
||||
rProp.Name = aFieldName;
|
||||
rProp.Name = xField->getName();
|
||||
rProp.Handle = rPropCount;
|
||||
Type aFieldType( xPropType->getTypeClass(), xPropType->getName() );
|
||||
rProp.Type = aFieldType;
|
||||
|
|
|
@ -708,11 +708,10 @@ void SwTableShell::Execute(SfxRequest &rReq)
|
|||
aBoxSet.Get(
|
||||
RES_BOXATR_FORMAT ).GetValue() ));
|
||||
|
||||
OUString sCurText( rSh.GetTableBoxText() );
|
||||
pCoreSet->Put( SvxNumberInfoItem( pFormatter,
|
||||
aBoxSet.Get(
|
||||
RES_BOXATR_VALUE).GetValue(),
|
||||
sCurText, SID_ATTR_NUMBERFORMAT_INFO ));
|
||||
rSh.GetTableBoxText(), SID_ATTR_NUMBERFORMAT_INFO ));
|
||||
|
||||
SwWrtShell* pSh = &rSh;
|
||||
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
|
||||
|
|
|
@ -56,8 +56,7 @@ void ContentResultSetWrapper::impl_init_xRowOrigin(std::unique_lock<std::mutex>&
|
|||
if(m_xRowOrigin.is())
|
||||
return;
|
||||
|
||||
Reference< XRow > xOrgig( m_xResultSetOrigin, UNO_QUERY );
|
||||
m_xRowOrigin = xOrgig;
|
||||
m_xRowOrigin.set(m_xResultSetOrigin, UNO_QUERY);
|
||||
OSL_ENSURE( m_xRowOrigin.is(), "interface XRow is required" );
|
||||
}
|
||||
|
||||
|
|
|
@ -325,7 +325,7 @@ public:
|
|||
return m_aColorBitmap;
|
||||
}
|
||||
|
||||
void setOutline(basegfx::B2DPolyPolygon aOutline) { m_aOutline = aOutline; }
|
||||
void setOutline(const basegfx::B2DPolyPolygon& rOutline) { m_aOutline = rOutline; }
|
||||
const basegfx::B2DPolyPolygon& getOutline() const { return m_aOutline; }
|
||||
|
||||
void addCode( sal_Ucs i_cCode )
|
||||
|
|
|
@ -208,7 +208,7 @@ public:
|
|||
/**
|
||||
Add properties to the last cell of the row.
|
||||
*/
|
||||
void insertCellProperties(TablePropertyMapPtr pProps)
|
||||
void insertCellProperties(const TablePropertyMapPtr& pProps)
|
||||
{
|
||||
if (!mCells.empty())
|
||||
mCells.back()->insertProperties(pProps);
|
||||
|
@ -376,7 +376,7 @@ public:
|
|||
|
||||
@param pProps the properties to add
|
||||
*/
|
||||
void insertCellProperties(TablePropertyMapPtr pProps)
|
||||
void insertCellProperties(const TablePropertyMapPtr& pProps)
|
||||
{
|
||||
mpRow->insertCellProperties(pProps);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue