[Libreoffice-commits] core.git: postprocess/qa sw/source UnoControls/source

[Stephan Bergmann]

 UnoControls/source/controls/framecontrol.cxx |    2 +-
 postprocess/qa/services.cxx                  |    3 +--
 sw/source/uibase/utlui/unotools.cxx          |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 604df2f608c03a59be65822d27babf0b00714bd6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 23 09:39:07 2018 +0100

    [API CHANGE] Fix typo in prop implemented by stardiv.UnoControls.FrameControl
    
    There is exactly one implementation of css.frame.FrameControl (which demands a
    property named "ComponentUrl" not "ComponentURL"), and exactly one place where
    that property is used.  So switch those two places to use the spelling of the
    property name as documented in the UNOIDL service.  (Even though that can be
    considered an incompatible change, in the unlikely case that 3rd party code
    expects to be able to access the given implementation's property with the mis-
    spelled name.)
    
    Change-Id: I4fa3f21851b61079c09deea1a24aac22bc96f36f
    Reviewed-on: https://gerrit.libreoffice.org/51766
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 4c0a2f84864a..69afc639af71 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -344,7 +344,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
     // attention: properties need to be sorted by name!
     static OPropertyArrayHelper ourPropertyInfo(
                 {
-                    Property( "ComponentURL", PropertyHandle::Componenturl, cppu::UnoType<OUString>::get(),
+                    Property( "ComponentUrl", PropertyHandle::Componenturl, cppu::UnoType<OUString>::get(),
                             PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
                     Property( "Frame", PropertyHandle::Frame, cppu::UnoType<XFrame>::get(),
                             PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT ),
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 331f84c16c7a..232a537c4e7e 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -493,8 +493,7 @@ void Test::createInstance(
                     {"com.sun.star.comp.report.OFormattedField", "TextColor"},
                     {"com.sun.star.comp.report.OFormattedField", "TextLineColor"},
                     {"com.sun.star.comp.report.OFormattedField", "TreatAsNumber"},
-                    {"stardiv.Toolkit.UnoControlRoadmapModel", "Interactive"},
-                    {"stardiv.UnoControls.FrameControl", "ComponentUrl"}};
+                    {"stardiv.Toolkit.UnoControlRoadmapModel", "Interactive"}};
                 if (blacklist.find({implementationName, prop->getName()}) != blacklist.end()) {
                     continue;
                 }
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 0aac42591a7d..4d91348c8e28 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -147,7 +147,7 @@ void SwOneExampleFrame::CreateControl()
     xPrSet->setPropertyValue( "LoaderArguments", aArgs );
     //save and set readonly???
 
-    xPrSet->setPropertyValue("ComponentURL", aURL);
+    xPrSet->setPropertyValue("ComponentUrl", aURL);
 
     m_aLoadedIdle.Start();
     m_bServiceAvailable = true;