cid#1546281 COPY_INSTEAD_OF_MOVE
and cid#1546278 COPY_INSTEAD_OF_MOVE cid#1546276 COPY_INSTEAD_OF_MOVE cid#1546247 COPY_INSTEAD_OF_MOVE cid#1546244 COPY_INSTEAD_OF_MOVE cid#1546243 COPY_INSTEAD_OF_MOVE cid#1546220 COPY_INSTEAD_OF_MOVE cid#1546209 COPY_INSTEAD_OF_MOVE cid#1546207 COPY_INSTEAD_OF_MOVE cid#1546206 COPY_INSTEAD_OF_MOVE cid#1546205 COPY_INSTEAD_OF_MOVE cid#1546197 COPY_INSTEAD_OF_MOVE cid#1546180 COPY_INSTEAD_OF_MOVE cid#1546172 COPY_INSTEAD_OF_MOVE cid#1546165 COPY_INSTEAD_OF_MOVE cid#1546164 COPY_INSTEAD_OF_MOVE cid#1546158 COPY_INSTEAD_OF_MOVE cid#1546151 COPY_INSTEAD_OF_MOVE cid#1546135 COPY_INSTEAD_OF_MOVE cid#1546132 COPY_INSTEAD_OF_MOVE cid#1546129 COPY_INSTEAD_OF_MOVE cid#1546128 COPY_INSTEAD_OF_MOVE cid#1546122 COPY_INSTEAD_OF_MOVE cid#1546117 COPY_INSTEAD_OF_MOVE cid#1546113 COPY_INSTEAD_OF_MOVE cid#1546106 COPY_INSTEAD_OF_MOVE cid#1546099 COPY_INSTEAD_OF_MOVE cid#1546091 COPY_INSTEAD_OF_MOVE cid#1546085 COPY_INSTEAD_OF_MOVE cid#1546069 COPY_INSTEAD_OF_MOVE cid#1546063 COPY_INSTEAD_OF_MOVE cid#1546062 COPY_INSTEAD_OF_MOVE cid#1546058 COPY_INSTEAD_OF_MOVE cid#1546056 COPY_INSTEAD_OF_MOVE cid#1546051 COPY_INSTEAD_OF_MOVE cid#1546040 COPY_INSTEAD_OF_MOVE cid#1546030 COPY_INSTEAD_OF_MOVE cid#1546028 COPY_INSTEAD_OF_MOVE cid#1546015 COPY_INSTEAD_OF_MOVE cid#1546001 COPY_INSTEAD_OF_MOVE Change-Id: Ib954c92a300fc323b29f27880fdf8bc46ed98862 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160520 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
@@ -78,8 +78,7 @@ ScaleData AxisHelper::createDefaultScale()
|
||||
aScaleData.AxisType = chart2::AxisType::REALNUMBER;
|
||||
aScaleData.AutoDateAxis = true;
|
||||
aScaleData.ShiftedCategoryPosition = false;
|
||||
Sequence< SubIncrement > aSubIncrements{ SubIncrement() };
|
||||
aScaleData.IncrementData.SubIncrements = aSubIncrements;
|
||||
aScaleData.IncrementData.SubIncrements = { SubIncrement() };
|
||||
return aScaleData;
|
||||
}
|
||||
|
||||
|
||||
@@ -659,9 +659,8 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
|
||||
}
|
||||
if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
|
||||
{
|
||||
FontMetric aFontMetric = pList->Get(
|
||||
pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
|
||||
vcl::Font aFont(aFontMetric);
|
||||
vcl::Font aFont(pList->Get(
|
||||
pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE));
|
||||
aFmt.SetBulletFont(&aFont);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -603,9 +603,8 @@ bool SVGFilter::filterWriterOrCalc( const Sequence< PropertyValue >& rDescriptor
|
||||
// Select only one draw page
|
||||
uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( mxSrcDoc, uno::UNO_QUERY );
|
||||
uno::Reference<drawing::XDrawPages> xDrawPages = xDrawPagesSupplier->getDrawPages();
|
||||
uno::Reference< drawing::XDrawPage > xDrawPage( xDrawPages->getByIndex(0), uno::UNO_QUERY );
|
||||
mSelectedPages.resize( 1 );
|
||||
mSelectedPages[0] = xDrawPage;
|
||||
mSelectedPages[0].set(xDrawPages->getByIndex(0), uno::UNO_QUERY);
|
||||
|
||||
bool bGotSelection = xSelection->getSelection() >>= maShapeSelection;
|
||||
|
||||
|
||||
@@ -49,10 +49,9 @@ namespace XSLT
|
||||
m_rootStream = createTempFile();
|
||||
Sequence<Any> args{ Any(m_rootStream->getInputStream()) };
|
||||
|
||||
Reference<XNameContainer> cont(
|
||||
m_storage.set(
|
||||
Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW)
|
||||
->createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", args), UNO_QUERY);
|
||||
m_storage = cont;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -684,8 +684,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, const OUString&, rIdent, void
|
||||
|
||||
if ( pPasswordRequest->isPassword() )
|
||||
{
|
||||
OUString aNewPass = pPasswordRequest->getPassword();
|
||||
Sequence<OUString> aPasswd { aNewPass };
|
||||
Sequence<OUString> aPasswd { pPasswordRequest->getPassword() };
|
||||
|
||||
m_xMasterPasswd->addPersistent(
|
||||
sUrl, sUserName, aPasswd, xInteractionHandler );
|
||||
|
||||
@@ -1195,13 +1195,12 @@ void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& Res
|
||||
rElementType.bModified = true;
|
||||
|
||||
Reference< XUIConfigurationManager > xThis(this);
|
||||
Reference< XInterface > xIfac( xThis, UNO_QUERY );
|
||||
|
||||
// Create event to notify listener about replaced element settings
|
||||
ui::ConfigurationEvent aEvent;
|
||||
aEvent.ResourceURL = ResourceURL;
|
||||
aEvent.Accessor <<= xThis;
|
||||
aEvent.Source = xIfac;
|
||||
aEvent.Source.set(xThis, UNO_QUERY);
|
||||
aEvent.ReplacedElement <<= xOldSettings;
|
||||
aEvent.Element <<= pDataSettings->xSettings;
|
||||
|
||||
|
||||
@@ -967,14 +967,13 @@ void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceU
|
||||
rElementType.bModified = true;
|
||||
|
||||
Reference< XUIConfigurationManager > xThis(this);
|
||||
Reference< XInterface > xIfac( xThis, UNO_QUERY );
|
||||
|
||||
// Create event to notify listener about replaced element settings
|
||||
ConfigurationEvent aEvent;
|
||||
|
||||
aEvent.ResourceURL = ResourceURL;
|
||||
aEvent.Accessor <<= xThis;
|
||||
aEvent.Source = xIfac;
|
||||
aEvent.Source.set(xThis, UNO_QUERY);
|
||||
aEvent.ReplacedElement <<= xOldSettings;
|
||||
aEvent.Element <<= pDataSettings->xSettings;
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ struct OUStringAndHashCode
|
||||
OUString maString;
|
||||
sal_Int32 mnHashCode;
|
||||
|
||||
OUStringAndHashCode(OUString s) : maString(s), mnHashCode(maString.hashCode()) {}
|
||||
OUStringAndHashCode(OUString s) : maString(std::move(s)), mnHashCode(maString.hashCode()) {}
|
||||
};
|
||||
struct OUStringAndHashCodeEqual
|
||||
{
|
||||
|
||||
@@ -269,7 +269,7 @@ public:
|
||||
};
|
||||
|
||||
GraphicExport(sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFilterBase, DocumentType eDocumentType)
|
||||
: mpFS(pFS)
|
||||
: mpFS(std::move(pFS))
|
||||
, mpFilterBase(pFilterBase)
|
||||
, meDocumentType(eDocumentType)
|
||||
{}
|
||||
@@ -353,7 +353,7 @@ protected:
|
||||
public:
|
||||
DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = nullptr )
|
||||
: meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS(std::move( pFS )), mpFB( pFB ), mbIsBackgroundDark( false ), mbPlaceholder(false) {}
|
||||
void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
|
||||
void SetFS(const ::sax_fastparser::FSHelperPtr& pFS) { mpFS = pFS; }
|
||||
const ::sax_fastparser::FSHelperPtr& GetFS() const { return mpFS; }
|
||||
::oox::core::XmlFilterBase* GetFB() { return mpFB; }
|
||||
DocumentType GetDocumentType() const { return meDocumentType; }
|
||||
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
|
||||
ShapeLocation getShapeLocation() const { return meShapeLocation; };
|
||||
void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; };
|
||||
void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; }
|
||||
void setPlaceholder(const oox::drawingml::ShapePtr& pPlaceholder) { mpPlaceholder = pPlaceholder; }
|
||||
void setModelId( const OUString& rId ) { msModelId = rId; }
|
||||
|
||||
/// Flags shape as having a non-empty spPr tag
|
||||
|
||||
@@ -142,8 +142,7 @@ void LngParser::ReadLine(std::string_view rLine_in,
|
||||
{
|
||||
OString sLang(o3tl::trim(o3tl::getToken(rLine_in, 0, '=')));
|
||||
if (!sLang.isEmpty()) {
|
||||
OString sText(o3tl::getToken(rLine_in,1, '"'));
|
||||
rText_inout[sLang] = sText;
|
||||
rText_inout[sLang] = OString(o3tl::getToken(rLine_in, 1, '"'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -498,9 +498,7 @@ void LwpHeadLayout::RegisterStyle()
|
||||
//if the layout is relative to para, the layout will be registered in para
|
||||
if (!xLayout->IsRelativeAnchored())
|
||||
xLayout->DoRegisterStyle();
|
||||
rtl::Reference<LwpVirtualLayout> xNext(
|
||||
dynamic_cast<LwpVirtualLayout*>(xLayout->GetNext().obj().get()));
|
||||
xLayout = xNext;
|
||||
xLayout.set(dynamic_cast<LwpVirtualLayout*>(xLayout->GetNext().obj().get()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -117,8 +117,7 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
|
||||
|
||||
//Get the xfcontainer for the next para
|
||||
pParaCont = xPara->GetXFContainer();
|
||||
rtl::Reference<LwpPara> xNext(dynamic_cast<LwpPara*>(xPara->GetNext().obj().get()));
|
||||
xPara = xNext;
|
||||
xPara.set(dynamic_cast<LwpPara*>(xPara->GetNext().obj().get()));
|
||||
}
|
||||
|
||||
//process frame which anchor is to cell after converter all the para
|
||||
|
||||
@@ -1152,7 +1152,7 @@ XclExpChText::XclExpChText( const XclExpChRoot& rRoot ) :
|
||||
{
|
||||
}
|
||||
|
||||
void XclExpChText::SetFont( XclExpChFontRef xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId )
|
||||
void XclExpChText::SetFont(const XclExpChFontRef& xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId)
|
||||
{
|
||||
mxFont = xFont;
|
||||
maData.maTextComplexColor = rComplexColor;
|
||||
@@ -2922,7 +2922,7 @@ XclExpChAxis::XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ) :
|
||||
maData.mnType = nAxisType;
|
||||
}
|
||||
|
||||
void XclExpChAxis::SetFont( XclExpChFontRef xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId )
|
||||
void XclExpChAxis::SetFont(const XclExpChFontRef& xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId)
|
||||
{
|
||||
mxFont = xFont;
|
||||
if( mxTick )
|
||||
|
||||
@@ -473,7 +473,7 @@ public:
|
||||
virtual ~XclExpChFontBase();
|
||||
|
||||
/** Derived classes set font color and color identifier to internal data structures. */
|
||||
virtual void SetFont( XclExpChFontRef xFont, const model::ComplexColor& rComplexColor, sal_uInt32 nColorId ) = 0;
|
||||
virtual void SetFont(const XclExpChFontRef& xFont, const model::ComplexColor& rComplexColor, sal_uInt32 nColorId) = 0;
|
||||
/** Derived classes set text rotation to internal data structures. */
|
||||
virtual void SetRotation( sal_uInt16 nRotation ) = 0;
|
||||
|
||||
@@ -496,7 +496,7 @@ public:
|
||||
explicit XclExpChText( const XclExpChRoot& rRoot );
|
||||
|
||||
/** Sets font color and color identifier to internal data structures. */
|
||||
virtual void SetFont( XclExpChFontRef xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId ) override;
|
||||
virtual void SetFont(const XclExpChFontRef& xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId) override;
|
||||
/** Sets text rotation to internal data structures. */
|
||||
virtual void SetRotation( sal_uInt16 nRotation ) override;
|
||||
|
||||
@@ -1020,7 +1020,7 @@ public:
|
||||
explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType );
|
||||
|
||||
/** Sets font color and color identifier to internal data structures. */
|
||||
virtual void SetFont( XclExpChFontRef xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId ) override;
|
||||
virtual void SetFont(const XclExpChFontRef& xFont, model::ComplexColor const& rComplexColor, sal_uInt32 nColorId) override;
|
||||
/** Sets text rotation to internal data structures. */
|
||||
virtual void SetRotation( sal_uInt16 nRotation ) override;
|
||||
|
||||
@@ -1137,7 +1137,7 @@ public:
|
||||
/** Removes the last created data series object from the series list. */
|
||||
void RemoveLastSeries();
|
||||
/** Stores a CHTEXT group that describes a data point label. */
|
||||
void SetDataLabel( XclExpChTextRef const & xText );
|
||||
void SetDataLabel(const XclExpChTextRef& xText);
|
||||
/** Sets the plot area position and size to manual mode. */
|
||||
void SetManualPlotArea();
|
||||
|
||||
|
||||
@@ -665,7 +665,7 @@ public:
|
||||
/** Sets this object to the specified data point position. */
|
||||
void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx );
|
||||
/** Sets type and text formatting for a data point label (CHTEXT group). */
|
||||
void SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; }
|
||||
void SetDataLabel(const XclImpChTextRef& xLabel) { mxLabel = xLabel; }
|
||||
|
||||
/** Updates default data format for series group. */
|
||||
void UpdateGroupFormat( const XclChExtTypeInfo& rTypeInfo );
|
||||
@@ -788,7 +788,7 @@ public:
|
||||
/** Sets a data point or series format (CHDATAFORMAT group) for this series. */
|
||||
void SetDataFormat( const XclImpChDataFormatRef& xDataFmt );
|
||||
/** Sets a label text (CHTEXT group) attached to a series or data point. */
|
||||
void SetDataLabel( const XclImpChTextRef& xLabel );
|
||||
void SetDataLabel(const XclImpChTextRef& xLabel);
|
||||
/** Adds error bar settings from the passed series to the own series. */
|
||||
void AddChildSeries( const XclImpChSeries& rSeries );
|
||||
/** Updates missing series formatting by using default formatting from axes sets. */
|
||||
|
||||
@@ -332,10 +332,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp
|
||||
uno::Sequence<OUString> aSeq(nCount);
|
||||
OUString* pAry = aSeq.getArray();
|
||||
for (size_t i=0; i<nCount; ++i)
|
||||
{
|
||||
OUString aEntry((*pUserList)[i].GetString());
|
||||
pAry[i] = aEntry;
|
||||
}
|
||||
pAry[i] = (*pUserList)[i].GetString();
|
||||
aRet <<= aSeq;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -417,8 +417,7 @@ void StringResourceImpl::newLocale( const Locale& locale )
|
||||
for( const auto& rEntry : rSourceMap )
|
||||
{
|
||||
OUString aId = rEntry.first;
|
||||
OUString aStr = rEntry.second;
|
||||
rTargetMap[ aId ] = aStr;
|
||||
rTargetMap[ aId ] = rEntry.second;
|
||||
}
|
||||
|
||||
const IdToIndexMap& rSourceIndexMap = pCopyFromItem->m_aIdToIndexMap;
|
||||
|
||||
@@ -116,17 +116,14 @@ void TemplateLocalView::Populate()
|
||||
|
||||
for (sal_uInt16 j = 0; j < nEntries; ++j)
|
||||
{
|
||||
OUString aName = mpDocTemplates->GetName(i,j);
|
||||
OUString aURL = mpDocTemplates->GetPath(i,j);
|
||||
|
||||
TemplateItemProperties aProperties;
|
||||
aProperties.nId = j+1;
|
||||
aProperties.nDocId = j;
|
||||
aProperties.nRegionId = i;
|
||||
aProperties.aName = aName;
|
||||
aProperties.aPath = aURL;
|
||||
aProperties.aName = mpDocTemplates->GetName(i, j);
|
||||
aProperties.aPath = mpDocTemplates->GetPath(i, j);
|
||||
aProperties.aRegionName = aRegionName;
|
||||
aProperties.aThumbnail = TemplateLocalView::fetchThumbnail(aURL,
|
||||
aProperties.aThumbnail = TemplateLocalView::fetchThumbnail(aProperties.aPath,
|
||||
mnThumbnailWidth,
|
||||
mnThumbnailHeight);
|
||||
|
||||
|
||||
@@ -40,10 +40,9 @@
|
||||
|
||||
void SfxPreviewWin_Impl::SetObjectShell(SfxObjectShell const * pObj)
|
||||
{
|
||||
std::shared_ptr<GDIMetaFile> xFile = pObj
|
||||
xMetaFile = pObj
|
||||
? pObj->GetPreviewMetaFile()
|
||||
: std::shared_ptr<GDIMetaFile>();
|
||||
xMetaFile = xFile;
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
|
||||
@@ -58,8 +58,8 @@ SlideOverlayButton::SlideOverlayButton(css::uno::Reference<css::rendering::XBitm
|
||||
const UnoViewContainer& rViewContainer)
|
||||
: mxIconBitmap(std::move(xIconBitmap))
|
||||
, mrEventMultiplexer(rEventMultiplexer)
|
||||
, mpPosition(pPosition)
|
||||
, mClickHandler(clickHandler)
|
||||
, mpPosition(std::move(pPosition))
|
||||
, mClickHandler(std::move(clickHandler))
|
||||
, mrScreenUpdater(rScreenUpdater)
|
||||
{
|
||||
for (const auto& pView : rViewContainer)
|
||||
|
||||
@@ -716,8 +716,7 @@ bool SmDocShell::Save()
|
||||
if( mpTree )
|
||||
ArrangeFormula();
|
||||
|
||||
Reference<css::frame::XModel> xModel(GetModel());
|
||||
SmXMLExportWrapper aEquation(xModel);
|
||||
SmXMLExportWrapper aEquation(GetModel());
|
||||
aEquation.SetFlat(false);
|
||||
return aEquation.Export(*GetMedium());
|
||||
}
|
||||
|
||||
@@ -1776,8 +1776,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
|
||||
Property& rProp = rAllPropArray[ rPropCount ];
|
||||
rProp.Name = xField->getName();
|
||||
rProp.Handle = rPropCount;
|
||||
Type aFieldType( xPropType->getTypeClass(), xPropType->getName() );
|
||||
rProp.Type = aFieldType;
|
||||
rProp.Type = Type(xPropType->getTypeClass(), xPropType->getName());
|
||||
FieldAccessMode eAccessMode = xField->getAccessMode();
|
||||
rProp.Attributes = (eAccessMode == FieldAccessMode_READONLY ||
|
||||
eAccessMode == FieldAccessMode_CONST)
|
||||
|
||||
@@ -173,13 +173,11 @@ void getMacroFromAny(
|
||||
if (eType == STARBASIC)
|
||||
{
|
||||
// create macro and return
|
||||
SvxMacro aMacro(sMacroVal, sLibVal, eType);
|
||||
rMacro = aMacro;
|
||||
rMacro = SvxMacro(sMacroVal, sLibVal, eType);
|
||||
}
|
||||
else if (eType == EXTENDED_STYPE)
|
||||
{
|
||||
SvxMacro aMacro(sScriptVal, sScript);
|
||||
rMacro = aMacro;
|
||||
rMacro = SvxMacro(sScriptVal, sScript);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -334,13 +332,10 @@ void SvEventDescriptor::getByName(
|
||||
const SvMacroItemId nEvent )
|
||||
{
|
||||
const SvxMacroItem& rItem = getMacroItem();
|
||||
if( rItem.HasMacro( nEvent ) )
|
||||
if (rItem.HasMacro(nEvent))
|
||||
rMacro = rItem.GetMacro(nEvent);
|
||||
else
|
||||
{
|
||||
SvxMacro aEmptyMacro("", "");
|
||||
rMacro = aEmptyMacro;
|
||||
}
|
||||
rMacro = SvxMacro("", "");
|
||||
}
|
||||
|
||||
SvDetachedEventDescriptor::SvDetachedEventDescriptor(
|
||||
|
||||
@@ -809,8 +809,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
|
||||
}
|
||||
if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
|
||||
{
|
||||
FontMetric aFontMetric = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
|
||||
vcl::Font aFont(aFontMetric);
|
||||
vcl::Font aFont(pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE));
|
||||
aFmt.SetBulletFont(&aFont);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1542,8 +1542,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
|
||||
else
|
||||
{
|
||||
// return nothing
|
||||
uno::Any aAny;
|
||||
aRet = aAny;
|
||||
aRet = uno::Any();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ SwVbaContentControlListEntry::SwVbaContentControlListEntry(
|
||||
const uno::Reference<uno::XComponentContext>& rContext, std::shared_ptr<SwContentControl> pCC,
|
||||
size_t nZIndex)
|
||||
: SwVbaContentControlListEntry_BASE(rParent, rContext)
|
||||
, m_pCC(pCC)
|
||||
, m_pCC(std::move(pCC))
|
||||
, m_nZIndex(nZIndex)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -956,11 +956,10 @@ void SwSrcEditWindow::SetFont()
|
||||
}
|
||||
const SvxFontListItem* pFontListItem =
|
||||
static_cast<const SvxFontListItem* >(m_pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ));
|
||||
const FontList* pList = pFontListItem->GetFontList();
|
||||
FontMetric aFontMetric = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
|
||||
const FontList* pList = pFontListItem->GetFontList();
|
||||
vcl::Font aFont(pList->Get(sFontName, WEIGHT_NORMAL, ITALIC_NONE));
|
||||
|
||||
const vcl::Font& rFont = GetTextEngine()->GetFont();
|
||||
vcl::Font aFont(aFontMetric);
|
||||
Size aSize(rFont.GetFontSize());
|
||||
//font height is stored in point and set in twip
|
||||
aSize.setHeight(
|
||||
|
||||
@@ -902,8 +902,7 @@ void UpdateFieldContent(SfxRequest& rReq, SwWrtShell& rWrtSh)
|
||||
});
|
||||
|
||||
comphelper::SequenceAsHashMap aMap(aField);
|
||||
auto aName = aMap["Name"].get<OUString>();
|
||||
rRefmark.GetRefName() = aName;
|
||||
rRefmark.GetRefName() = aMap["Name"].get<OUString>();
|
||||
|
||||
OUString aContent = aMap["Content"].get<OUString>();
|
||||
auto pTextRefMark = const_cast<SwTextRefMark*>(rRefmark.GetTextRefMark());
|
||||
|
||||
@@ -22,7 +22,7 @@ using namespace css;
|
||||
using namespace css::uno;
|
||||
|
||||
UnoApiXmlTest::UnoApiXmlTest(OUString path)
|
||||
: UnoApiTest(path)
|
||||
: UnoApiTest(std::move(path))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -77,9 +77,7 @@ void ContentResultSetWrapper::impl_init_xPropertySetOrigin(std::unique_lock<std:
|
||||
if( m_xPropertySetOrigin.is() )
|
||||
return;
|
||||
|
||||
Reference< XPropertySet > xOrig( m_xResultSetOrigin, UNO_QUERY );
|
||||
|
||||
m_xPropertySetOrigin = xOrig;
|
||||
m_xPropertySetOrigin.set(m_xResultSetOrigin, UNO_QUERY);
|
||||
OSL_ENSURE( m_xPropertySetOrigin.is(), "interface XPropertySet is required" );
|
||||
}
|
||||
|
||||
|
||||
@@ -1566,11 +1566,10 @@ void HierarchyContent::transfer(
|
||||
// 1) Create new child content.
|
||||
|
||||
|
||||
OUString aType = xSource->isFolder()
|
||||
ucb::ContentInfo aContentInfo;
|
||||
aContentInfo.Type = xSource->isFolder()
|
||||
? HIERARCHY_FOLDER_CONTENT_TYPE
|
||||
: HIERARCHY_LINK_CONTENT_TYPE;
|
||||
ucb::ContentInfo aContentInfo;
|
||||
aContentInfo.Type = aType;
|
||||
aContentInfo.Attributes = 0;
|
||||
|
||||
// Note: The static cast is okay here, because its sure that
|
||||
|
||||
@@ -63,17 +63,15 @@ ZipPackageHelper::ZipPackageHelper(
|
||||
Any(beans::NamedValue("StorageFormat", Any(ZIP_STORAGE_FORMAT_STRING)))
|
||||
};
|
||||
|
||||
Reference< XHierarchicalNameAccess > xHNameAccess(
|
||||
mxHNameAccess.set(
|
||||
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
|
||||
"com.sun.star.packages.comp.ZipPackage",
|
||||
aArguments, mxContext ), UNO_QUERY);
|
||||
mxHNameAccess = xHNameAccess;
|
||||
|
||||
if( !mxHNameAccess.is() )
|
||||
return;
|
||||
|
||||
Reference<XSingleServiceFactory> xFactory(mxHNameAccess, UNO_QUERY);
|
||||
mxFactory = xFactory;
|
||||
mxFactory.set(mxHNameAccess, UNO_QUERY);
|
||||
|
||||
// get root zip folder
|
||||
mxHNameAccess->getByHierarchicalName( "/" ) >>= mxRootFolder;
|
||||
|
||||
@@ -5395,8 +5395,7 @@ GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G
|
||||
xTransferable = new GtkDnDTransferable(pDrop);
|
||||
#endif
|
||||
}
|
||||
css::uno::Sequence<css::datatransfer::DataFlavor> aFormats = xTransferable->getTransferDataFlavors();
|
||||
aEvent.SupportedDataFlavors = aFormats;
|
||||
aEvent.SupportedDataFlavors = xTransferable->getTransferDataFlavors();
|
||||
fire_dragEnter(aEvent);
|
||||
m_bInDrag = true;
|
||||
}
|
||||
|
||||
@@ -271,11 +271,10 @@ EmbeddedFontHandler::~EmbeddedFontHandler()
|
||||
|
||||
void EmbeddedFontHandler::lcl_attribute( Id name, Value& val )
|
||||
{
|
||||
OUString sValue = val.getString();
|
||||
switch( name )
|
||||
{
|
||||
case NS_ooxml::LN_CT_FontRel_fontKey:
|
||||
m_fontKey = sValue;
|
||||
m_fontKey = val.getString();
|
||||
break;
|
||||
case NS_ooxml::LN_CT_Rel_id:
|
||||
break;
|
||||
|
||||
@@ -324,7 +324,7 @@ public:
|
||||
|
||||
@param pProperties properties of the row to be ended
|
||||
*/
|
||||
void endRow(TablePropertyMapPtr pProperties)
|
||||
void endRow(const TablePropertyMapPtr& pProperties)
|
||||
{
|
||||
mpRow->insertProperties(pProperties);
|
||||
mRows.push_back(mpRow);
|
||||
|
||||
@@ -160,11 +160,9 @@ void EPUBExportFilter::CreateMetafiles(std::vector<exp::FixedLayoutPage>& rPageM
|
||||
SvMemoryStream aMemoryStream;
|
||||
SvmWriter aWriter(aMemoryStream);
|
||||
aWriter.Write(rGDIMetaFile);
|
||||
uno::Sequence<sal_Int8> aSequence(static_cast<const sal_Int8*>(aMemoryStream.GetData()),
|
||||
aMemoryStream.Tell());
|
||||
|
||||
exp::FixedLayoutPage aPage;
|
||||
aPage.aMetafile = aSequence;
|
||||
aPage.aMetafile = uno::Sequence<sal_Int8>(
|
||||
static_cast<const sal_Int8*>(aMemoryStream.GetData()), aMemoryStream.Tell());
|
||||
aPage.aCssPixels = aCss;
|
||||
aPage.aChapterNames = aRenderer.getChapterNames();
|
||||
rPageMetafiles.push_back(aPage);
|
||||
|
||||
@@ -582,10 +582,9 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SchXMLAxisContext::cre
|
||||
{
|
||||
case XML_ELEMENT(CHART, XML_TITLE):
|
||||
{
|
||||
Reference< drawing::XShape > xTitleShape = getTitleShape();
|
||||
return new SchXMLTitleContext( m_rImportHelper, GetImport(),
|
||||
m_aCurrentAxis.aTitle,
|
||||
xTitleShape );
|
||||
getTitleShape() );
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user