[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source

[Tomaž Vajngerl]

 include/xmloff/txtparae.hxx                       |    1 -
 xmloff/inc/XMLReplacementImageContext.hxx         |    1 -
 xmloff/source/draw/XMLReplacementImageContext.cxx |    7 +++----
 xmloff/source/text/txtparae.cxx                   |    3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 7e45e4bbaf9b6fcee72c255f8f1761620e70d2ba
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Feb 23 06:24:04 2018 +0900

    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 at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 35c163014a62..9c3d27e3dd33 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -149,7 +149,6 @@ private:
     const OUString sFrame;
     const OUString sGraphicFilter;
     const OUString sGraphicRotation;
-    const OUString sGraphicURL;
     const OUString sHeight;
     const OUString sHoriOrient;
     const OUString sHoriOrientPosition;
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