Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2505
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/2505/1
fdo#60724 change spelling error REMOVEABLE -> REMOVABLE
Only applies to PropertyAttribute::REMOVEABLE, and all instances in comments.
All other instances of the misspelling have remained the same.
Example: AF_REMOVEABLE.
Change-Id: I391f4101bbc3e06689318235a37d616065bc1686
---
M comphelper/source/property/opropertybag.cxx
M comphelper/source/property/propertybag.cxx
M configmgr/source/access.cxx
M dbaccess/source/core/dataaccess/datasource.cxx
M dbaccess/source/filter/xml/xmlExport.cxx
M filter/source/config/cache/filtercache.cxx
M forms/qa/integration/forms/FormPropertyBags.java
M forms/source/component/propertybaghelper.cxx
M offapi/com/sun/star/form/FormComponent.idl
M oox/source/docprop/docprophandler.cxx
M qadevOOo/runner/util/dbg.java
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/docinf.cxx
M stoc/source/registry_tdprovider/tdservice.cxx
M stoc/source/tdmanager/tdmgr_check.cxx
M svtools/source/svhtml/parhtml.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/ui/vba/vbavariables.cxx
M ucb/source/core/ucbstore.cxx
M ucb/source/ucp/webdav/webdavcontent.cxx
M ucbhelper/source/provider/contenthelper.cxx
M unodevtools/source/skeletonmaker/javacompskeleton.cxx
M unodevtools/source/unodevtools/typeblob.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M xmloff/source/forms/elementimport.cxx
M xmloff/source/forms/propertyexport.cxx
27 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/comphelper/source/property/opropertybag.cxx
b/comphelper/source/property/opropertybag.cxx
index ebb3dfa..f7418ba 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -499,7 +499,7 @@
if ( m_bAutoAddProperties )
{
// add the property
- sal_Int16 nAttributes = PropertyAttribute::BOUND |
PropertyAttribute::REMOVEABLE | PropertyAttribute::MAYBEDEFAULT;
+ sal_Int16 nAttributes = PropertyAttribute::BOUND |
PropertyAttribute::REMOVABLE | PropertyAttribute::MAYBEDEFAULT;
addProperty( *pName, nAttributes, pProperty->Value );
continue;
}
diff --git a/comphelper/source/property/propertybag.cxx
b/comphelper/source/property/propertybag.cxx
index 44285bf..bd519ed 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -151,7 +151,7 @@
{
const Property& rProp = getProperty( _rName );
// will throw an UnknownPropertyException if necessary
- if ( ( rProp.Attributes & PropertyAttribute::REMOVEABLE ) == 0 )
+ if ( ( rProp.Attributes & PropertyAttribute::REMOVABLE ) == 0 )
throw NotRemoveableException( ::rtl::OUString(), NULL );
const sal_Int32 nHandle = rProp.Handle;
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index c5f7d4b..3d554bf 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -2197,7 +2197,7 @@
css::beans::PropertyAttribute::CONSTRAINED |
(nillable ? css::beans::PropertyAttribute::MAYBEVOID : 0) |
(getRootAccess()->isUpdate()
- ? (removable ? css::beans::PropertyAttribute::REMOVEABLE : 0)
+ ? (removable ? css::beans::PropertyAttribute::REMOVABLE : 0)
: css::beans::PropertyAttribute::READONLY))); //TODO: MAYBEDEFAULT
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index d858c4f..42cc640 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -478,7 +478,7 @@
PropertyAttributeCache::const_iterator pos = m_rAttribs.find(
_rProp.Name );
OSL_ENSURE( pos != m_rAttribs.end(), "IsDefaultAndNotRemoveable:
illegal property name!" );
if ( pos != m_rAttribs.end() )
- bRemoveable = ( ( pos->second & PropertyAttribute::REMOVEABLE
) != 0 );
+ bRemoveable = ( ( pos->second & PropertyAttribute::REMOVABLE )
!= 0 );
return !bRemoveable;
}
@@ -871,8 +871,8 @@
The method takes a property bag, and a sequence of property values to
set for this bag.
Upon return, every property which is not part of the given sequence is
- <ul><li>removed from the bag, if it's a removeable property</li>
- <li><em>or</em>reset to its default value, if it's not a
removeable property</li>
+ <ul><li>removed from the bag, if it's a removable property</li>
+ <li><em>or</em>reset to its default value, if it's not a removable
property</li>
</ul>.
@param _rxPropertyBag
@@ -912,7 +912,7 @@
// this property is not to be set, but currently exists in the
bag.
// -> Remove it, or reset it to the default.
- if ( ( pExistentProperty->Attributes &
PropertyAttribute::REMOVEABLE ) != 0 )
+ if ( ( pExistentProperty->Attributes &
PropertyAttribute::REMOVABLE ) != 0 )
xPropertyContainer->removeProperty(
pExistentProperty->Name );
else
xPropertyState->setPropertyToDefault(
pExistentProperty->Name );
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 53fbca5..7afd9be 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -389,9 +389,9 @@
if ( eToken == XML_TOKEN_INVALID )
{
- // for properties which are not REMOVEABLE, we care for their
state, and
+ // for properties which are not REMOVABLE, we care for their
state, and
// only export them if they're not DEFAULTed
- if ( ( pProperties->Attributes & PropertyAttribute::REMOVEABLE
) == 0 )
+ if ( ( pProperties->Attributes & PropertyAttribute::REMOVABLE
) == 0 )
{
PropertyState ePropertyState =
xSettingsState->getPropertyState( pProperties->Name );
if ( PropertyState_DEFAULT_VALUE == ePropertyState )
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 206ff6d..4380e3a 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -558,7 +558,7 @@
css::beans::Property aDescription = xItem->getAsProperty();
sal_Bool bFinalized = ((aDescription.Attributes &
css::beans::PropertyAttribute::READONLY ) ==
css::beans::PropertyAttribute::READONLY );
- sal_Bool bMandatory = ((aDescription.Attributes &
css::beans::PropertyAttribute::REMOVEABLE) !=
css::beans::PropertyAttribute::REMOVEABLE);
+ sal_Bool bMandatory = ((aDescription.Attributes &
css::beans::PropertyAttribute::REMOVABLE) !=
css::beans::PropertyAttribute::REMOVABLE);
rItem[PROPNAME_FINALIZED] <<= bFinalized;
rItem[PROPNAME_MANDATORY] <<= bMandatory;
diff --git a/forms/qa/integration/forms/FormPropertyBags.java
b/forms/qa/integration/forms/FormPropertyBags.java
index baa2b7b..47f5054 100644
--- a/forms/qa/integration/forms/FormPropertyBags.java
+++ b/forms/qa/integration/forms/FormPropertyBags.java
@@ -103,8 +103,8 @@
propContainer.addProperty( "SomeNumericValue",
PropertyAttribute.BOUND, new Integer( 42 ) );
XPropertySetInfo propertyInfo = textFieldModel.getPropertySetInfo();
- assure( "Per service definition, dynamic properties are expected to be
forced to be removeable",
- ( propertyInfo.getPropertyByName("SomeBoundText").Attributes &
PropertyAttribute.REMOVEABLE ) != 0 );
+ assure( "Per service definition, dynamic properties are expected to be
forced to be removable",
+ ( propertyInfo.getPropertyByName("SomeBoundText").Attributes &
PropertyAttribute.REMOVABLE ) != 0 );
// a second addition of a property with an existent name should be
rejected
boolean caughtExpected = false;
diff --git a/forms/source/component/propertybaghelper.cxx
b/forms/source/component/propertybaghelper.cxx
index a9ababe..e36e8fd 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -194,9 +194,9 @@
throw PropertyExistException( _rName,
m_rContext.getPropertiesInterface() );
//----------------------------------------------
- // normalize the REMOVEABLE attribute - the FormComponent service
- // requires that all dynamic properties are REMOVEABLE
- _nAttributes |= PropertyAttribute::REMOVEABLE;
+ // normalize the REMOVABLE attribute - the FormComponent service
+ // requires that all dynamic properties are REMOVABLE
+ _nAttributes |= PropertyAttribute::REMOVABLE;
//----------------------------------------------
// find a free handle
@@ -214,11 +214,11 @@
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
- // check whether it's removeable at all
+ // check whether it's removable at all
Reference< XMultiPropertySet > xMe(
m_rContext.getPropertiesInterface(), UNO_QUERY_THROW );
Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(),
UNO_QUERY_THROW );
Property aProperty( xPSI->getPropertyByName( _rName ) );
- if ( ( aProperty.Attributes & PropertyAttribute::REMOVEABLE ) == 0 )
+ if ( ( aProperty.Attributes & PropertyAttribute::REMOVABLE ) == 0 )
throw NotRemoveableException( _rName, xMe );
m_aDynamicProperties.removeProperty( _rName );
diff --git a/offapi/com/sun/star/form/FormComponent.idl
b/offapi/com/sun/star/form/FormComponent.idl
index 66f8c37..3ab1545 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -78,7 +78,7 @@
use by other instances.</p>
<p>Note that dynamic properties added to a form component are, by
definition,
- removable. That is, the <member
scope="com::sun::star::beans">PropertyAttribute::REMOVEABLE</member>
+ removable. That is, the <member
scope="com::sun::star::beans">PropertyAttribute::REMOVABLE</member>
will always be set, even if you do not specify it in the
<member
scope="com::sun::star::beans">XPropertyContainer::addProperty</member> call.</p>
diff --git a/oox/source/docprop/docprophandler.cxx
b/oox/source/docprop/docprophandler.cxx
index d0aa157..d81199f 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -74,7 +74,7 @@
try
{
xUserProps->addProperty( m_aCustomPropertyName,
- beans::PropertyAttribute::REMOVEABLE, aAny );
+ beans::PropertyAttribute::REMOVABLE, aAny );
}
catch( beans::PropertyExistException& )
{
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index 6b8f26a..9530746 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -192,8 +192,8 @@
if ((attr & PropertyAttribute.READONLY) != 0)
out.println("\t-READONLY");
- if ((attr & PropertyAttribute.REMOVEABLE) != 0)
- out.println("\t-REMOVEABLE");
+ if ((attr & PropertyAttribute.REMOVABLE) != 0)
+ out.println("\t-REMOVABLE");
if ((attr & PropertyAttribute.TRANSIENT) != 0)
out.println("\t-TRANSIENT");
diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java
b/sfx2/qa/complex/sfx2/DocumentProperties.java
index 35f9b09..17faed7 100644
--- a/sfx2/qa/complex/sfx2/DocumentProperties.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
@@ -351,16 +351,16 @@
dur.Seconds = 555;
dur.MilliSeconds = 444;
- udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, b);
- udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE,
dur);
- udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t);
- udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE,
date);
- udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE,
dt);
- udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new
Double(d));
- udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar");
- udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar");
+ udpc.addProperty("Frobnicate", PropertyAttribute.REMOVABLE, b);
+ udpc.addProperty("FrobDuration", PropertyAttribute.REMOVABLE, dur);
+ udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVABLE, t);
+ udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVABLE, date);
+ udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVABLE, dt);
+ udpc.addProperty("Pi", PropertyAttribute.REMOVABLE, new Double(d));
+ udpc.addProperty("Foo", PropertyAttribute.REMOVABLE, "bar");
+ udpc.addProperty("Removed", PropertyAttribute.REMOVABLE, "bar");
// #i94175#: empty property name is valid ODF 1.1
- udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek");
+ udpc.addProperty("", PropertyAttribute.REMOVABLE, "eeeeek");
try {
udpc.removeProperty("Info 1");
udpc.removeProperty("Removed");
@@ -369,7 +369,7 @@
}
try {
- udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE,
+ udpc.addProperty("Forbidden", PropertyAttribute.REMOVABLE,
new String[] { "foo", "bar" });
fail("inserting value of non-supported type did not fail");
} catch (IllegalTypeException e) {
@@ -454,14 +454,14 @@
xMB.addModifyListener(listener);
xDP.setAuthor("not me");
assertTrue("Listener Author", listener.reset());
- udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo");
+ udpc.addProperty("Listener", PropertyAttribute.REMOVABLE, "foo");
assertTrue("Listener UserDefined Add", listener.reset());
udps.setPropertyValue("Listener", "bar");
assertTrue("Listener UserDefined Set", listener.reset());
udpc.removeProperty("Listener");
assertTrue("Listener UserDefined Remove", listener.reset());
xMB.removeModifyListener(listener);
- udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo");
+ udpc.addProperty("Listener2", PropertyAttribute.REMOVABLE, "foo");
assertTrue("Removed Listener UserDefined Add", !listener.reset());
System.out.println("...done");
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index cfecf3f..8e0d05b 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1337,7 +1337,7 @@
}
try {
m_xUserDefined->addProperty(name,
- css::beans::PropertyAttribute::REMOVEABLE, any);
+ css::beans::PropertyAttribute::REMOVABLE, any);
} catch (const css::beans::PropertyExistException &) {
DBG_WARNING1("SfxDocumentMetaData: duplicate: %s",
OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index e58afd7..d1b1561 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -156,7 +156,7 @@
try
{
xUserDefined->addProperty( aPropName,
- beans::PropertyAttribute::REMOVEABLE, aPropValue );
+ beans::PropertyAttribute::REMOVABLE, aPropValue );
}
catch (const uno::Exception&)
{
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx
b/stoc/source/registry_tdprovider/tdservice.cxx
index 185ae87..585a026 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -282,7 +282,7 @@
if ( nFlags & RT_ACCESS_MAYBEDEFAULT )
nAttribs |= beans::PropertyAttribute::MAYBEDEFAULT;
if ( nFlags & RT_ACCESS_REMOVEABLE )
- nAttribs |= beans::PropertyAttribute::REMOVEABLE;
+ nAttribs |= beans::PropertyAttribute::REMOVABLE;
OSL_ENSURE( !(nFlags & RT_ACCESS_PROPERTY),
"### RT_ACCESS_PROPERTY is unexpected here!" );
diff --git a/stoc/source/tdmanager/tdmgr_check.cxx
b/stoc/source/tdmanager/tdmgr_check.cxx
index c9679dd..ff9e763 100644
--- a/stoc/source/tdmanager/tdmgr_check.cxx
+++ b/stoc/source/tdmanager/tdmgr_check.cxx
@@ -88,8 +88,8 @@
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("MAYBEAMBIGUOUS, ") );
if ((attributes & beans::PropertyAttribute::MAYBEDEFAULT) != 0)
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("MAYBEDEFAULT, ") );
- if ((attributes & beans::PropertyAttribute::REMOVEABLE) != 0)
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("REMOVEABLE, ") );
+ if ((attributes & beans::PropertyAttribute::REMOVABLE) != 0)
+ buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("REMOVABLE, ") );
if ((attributes & beans::PropertyAttribute::OPTIONAL) != 0)
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("OPTIONAL") );
else if (buf.getLength() > 0)
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index 68232e5..2c3b25e 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2203,7 +2203,7 @@
= i_xDocProps->getUserDefinedProperties();
try {
xUDProps->addProperty(aName,
- beans::PropertyAttribute::REMOVEABLE,
+ beans::PropertyAttribute::REMOVABLE,
uno::makeAny(::rtl::OUString(aContent)));
AddMetaUserDefined(aName);
bChanged = true;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8145ef9..463698e 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4133,7 +4133,7 @@
aValue <<= ::rtl::OUString(aDocValueStrings[i]);
try {
xUserDefinedProps->addProperty( name,
- beans::PropertyAttribute::REMOVEABLE,
+ beans::PropertyAttribute::REMOVABLE,
aValue );
} catch (const uno::Exception &) {
// ignore
diff --git a/sw/source/ui/vba/vbavariables.cxx
b/sw/source/ui/vba/vbavariables.cxx
index 33e61c3..3ab7e95 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -69,7 +69,7 @@
else
aValue <<= rtl::OUString();
uno::Reference< beans::XPropertyContainer > xPropertyContainer(
mxUserDefined, uno::UNO_QUERY_THROW );
- xPropertyContainer->addProperty( rName,
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVEABLE,
aValue );
+ xPropertyContainer->addProperty( rName,
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVABLE,
aValue );
return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable(
getParent(), mxContext, mxUserDefined, rName ) ) );
}
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 6fdffba..f717faf 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1704,8 +1704,8 @@
}
}
- // Property is always removeable.
- Attributes |= PropertyAttribute::REMOVEABLE;
+ // Property is always removable.
+ Attributes |= PropertyAttribute::REMOVABLE;
// Add property.
@@ -1852,7 +1852,7 @@
if ( !xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
throw UnknownPropertyException();
- // Property removeable?
+ // Property removable?
try
{
OUString aFullAttrName = aFullPropName;
@@ -1862,9 +1862,9 @@
if ( xRootHierNameAccess->getByHierarchicalName( aFullAttrName )
>>= nAttribs )
{
- if ( !( nAttribs & PropertyAttribute::REMOVEABLE ) )
+ if ( !( nAttribs & PropertyAttribute::REMOVABLE ) )
{
- // Not removeable!
+ // Not removable!
throw NotRemoveableException();
}
}
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 8d2ec5d..c624de8 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -835,16 +835,16 @@
uno::Reference< ucb::XCommandEnvironment > xEnv;
#if 0
- // @@@ REMOVEABLE z.Z. nicht richtig an der PropSetInfo gesetzt!!!
+ // @@@ REMOVABLE z.Z. nicht richtig an der PropSetInfo gesetzt!!!
try
{
beans::Property aProp
= getPropertySetInfo( xEnv, sal_False /* don't cache data */ )
->getPropertyByName( Name );
- if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) )
+ if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVABLE ) )
{
- // Not removeable!
+ // Not removable!
throw beans::NotRemoveableException();
}
}
diff --git a/ucbhelper/source/provider/contenthelper.cxx
b/ucbhelper/source/provider/contenthelper.cxx
index d292218..c9ce548 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -577,8 +577,8 @@
if ( xContainer.is() )
{
- // Property is always removeable.
- Attributes |= beans::PropertyAttribute::REMOVEABLE;
+ // Property is always removable.
+ Attributes |= beans::PropertyAttribute::REMOVABLE;
try
{
@@ -642,9 +642,9 @@
beans::Property aProp
= getPropertySetInfo( xEnv )->getPropertyByName( Name );
- if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) )
+ if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVABLE ) )
{
- // Not removeable!
+ // Not removable!
throw beans::NotRemoveableException();
}
}
@@ -684,7 +684,7 @@
catch ( beans::NotRemoveableException const & )
{
OSL_FAIL(
- "ContentImplHelper::removeProperty - Unremoveable!" );
+ "ContentImplHelper::removeProperty - Unremovable!" );
throw;
}
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 772a55a..4ddaf59 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -194,7 +194,7 @@
/* com::sun::star::beans::PropertyValue::READONLY */ 16,
/* com::sun::star::beans::PropertyValue::MAYBEAMBIGIOUS */ 32,
/* com::sun::star::beans::PropertyValue::MAYBEDEFAULT */ 64,
- /* com::sun::star::beans::PropertyValue::REMOVEABLE */ 128,
+ /* com::sun::star::beans::PropertyValue::REMOVABLE */ 128,
/* com::sun::star::beans::PropertyValue::OPTIONAL */ 256 };
for (sal_uInt16 i = 0; i < 9; i++)
@@ -228,7 +228,7 @@
attributeValue.append("PropertyAttribute.MAYBEDEFAULT");
break;
case 128:
- attributeValue.append("PropertyAttribute.REMOVEABLE");
+ attributeValue.append("PropertyAttribute.REMOVABLE");
break;
case 256:
attributeValue.append("PropertyAttribute.OPTIONAL");
diff --git a/unodevtools/source/unodevtools/typeblob.cxx
b/unodevtools/source/unodevtools/typeblob.cxx
index d877e44..5841d90 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -265,7 +265,7 @@
propertyFlags |= RT_ACCESS_MAYBEAMBIGUOUS;
case PropertyAttribute::MAYBEDEFAULT:
propertyFlags |= RT_ACCESS_MAYBEDEFAULT;
- case PropertyAttribute::REMOVEABLE:
+ case PropertyAttribute::REMOVABLE:
propertyFlags |= RT_ACCESS_REMOVEABLE;
case PropertyAttribute::OPTIONAL:
propertyFlags |= RT_ACCESS_OPTIONAL;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 077ce50..af59f99 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3846,7 +3846,7 @@
if (m_xDocumentProperties.is())
{
uno::Reference<beans::XPropertyContainer> xUserDefinedProperties =
m_xDocumentProperties->getUserDefinedProperties();
- xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVEABLE,
+ xUserDefinedProperties->addProperty(aName,
beans::PropertyAttribute::REMOVABLE,
uno::makeAny(m_aStates.top().aDestinationText.makeStringAndClear()));
}
}
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 559b427..5f046fe 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -372,7 +372,7 @@
xDynamicProperties->addProperty(
aPropValues->Name,
- PropertyAttribute::BOUND |
PropertyAttribute::REMOVEABLE,
+ PropertyAttribute::BOUND |
PropertyAttribute::REMOVABLE,
aPropValues->Value
);
diff --git a/xmloff/source/forms/propertyexport.cxx
b/xmloff/source/forms/propertyexport.cxx
index 070a192..c86c6ac 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -85,7 +85,7 @@
bool bIsDefaultValue = m_xPropertyState.is()
&& ( PropertyState_DEFAULT_VALUE ==
m_xPropertyState->getPropertyState( i_propertyName ) );
bool bIsDynamicProperty = m_xPropertyInfo.is()
- && ( ( m_xPropertyInfo->getPropertyByName(
i_propertyName ).Attributes & PropertyAttribute::REMOVEABLE ) != 0 );
+ && ( ( m_xPropertyInfo->getPropertyByName(
i_propertyName ).Attributes & PropertyAttribute::REMOVABLE ) != 0 );
return ( !bIsDefaultValue || bIsDynamicProperty );
}
@@ -249,7 +249,7 @@
// no read-only props
if ( ( pProperties->Attributes & PropertyAttribute::READONLY ) !=
0 )
// except they're dynamically added
- if ( ( pProperties->Attributes & PropertyAttribute::REMOVEABLE
) == 0 )
+ if ( ( pProperties->Attributes & PropertyAttribute::REMOVABLE
) == 0 )
continue;
m_aRemainingProps.insert(pProperties->Name);
}
--
To view, visit https://gerrit.libreoffice.org/2505
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I391f4101bbc3e06689318235a37d616065bc1686
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Kenneth Beck <overlordkb....@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
