diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-23 06:24:04 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-02-25 11:15:22 +0100 |
| commit | 7e45e4bbaf9b6fcee72c255f8f1761620e70d2ba (patch) | |
| tree | 26df939d1d5dfe6babed386117686882a87f315c /xmloff | |
| parent | c8b1432e8fd2c6a7d3d0039816884f33dafb97cb (diff) | |
remove const property name member for "GraphicURL"
All of them should be removed however..
Change-Id: I83c9ec3c8d5f547b39528121a8d4be12aa1b911c
Reviewed-on: https://gerrit.libreoffice.org/50296
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/XMLReplacementImageContext.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/XMLReplacementImageContext.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index 217dbaba3aed..1885d46a7fe0 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -34,7 +34,6 @@ class XMLReplacementImageContext : public SvXMLImportContext css::uno::Reference < css::beans::XPropertySet > m_xPropSet; OUString m_sHRef; - const OUString m_sGraphicURL; public: diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index 21280f7c17f0..cbea729a59af 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -39,8 +39,7 @@ XMLReplacementImageContext::XMLReplacementImageContext( const Reference< XAttributeList > & rAttrList, const Reference< XPropertySet > & rPropSet ) : SvXMLImportContext( rImport, nPrfx, rLName ), - m_xPropSet( rPropSet ), - m_sGraphicURL("GraphicURL") + m_xPropSet( rPropSet ) { rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); @@ -93,8 +92,8 @@ void XMLReplacementImageContext::EndElement() Reference < XPropertySetInfo > xPropSetInfo = m_xPropSet->getPropertySetInfo(); - if( xPropSetInfo->hasPropertyByName( m_sGraphicURL ) ) - m_xPropSet->setPropertyValue( m_sGraphicURL, makeAny( sHRef ) ); + if( xPropSetInfo->hasPropertyByName("GraphicURL") ) + m_xPropSet->setPropertyValue("GraphicURL", makeAny( sHRef ) ); } SvXMLImportContextRef XMLReplacementImageContext::CreateChildContext( diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 75a192125d16..5ecbd9240a20 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1193,7 +1193,6 @@ XMLTextParagraphExport::XMLTextParagraphExport( sFrame("Frame"), sGraphicFilter("GraphicFilter"), sGraphicRotation("GraphicRotation"), - sGraphicURL("GraphicURL"), sHeight("Height"), sHoriOrient("HoriOrient"), sHoriOrientPosition("HoriOrientPosition"), @@ -3111,7 +3110,7 @@ void XMLTextParagraphExport::_exportTextGraphic( // xlink:href OUString sOrigURL; - rPropSet->getPropertyValue( sGraphicURL ) >>= sOrigURL; + rPropSet->getPropertyValue("GraphicURL") >>= sOrigURL; OUString sURL(GetExport().AddEmbeddedGraphicObject( sOrigURL )); // If there still is no url, then graphic is empty |