Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4078
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/4078/1
fdo#60724 change spelling error REMOVEABLE -> REMOVABLE II
Change-Id: I0057b9174af6a83f3fde0e27c3a91a4aeca95873
---
M idlc/inc/idlc/astattribute.hxx
M idlc/inc/idlc/idlctypes.hxx
M idlc/source/astdump.cxx
M idlc/source/errorhandler.cxx
M idlc/source/parser.y
M idlc/source/scanner.l
M idlc/test/parser/attribute.tests
M include/comphelper/propertybag.hxx
M include/registry/types.h
M include/svtools/imagemgr.hrc
M padmin/source/padialog.cxx
M padmin/source/padialog.hrc
M padmin/source/padialog.src
M qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
M registry/source/regimpl.cxx
M registry/tools/regcompare.cxx
M sfx2/source/control/templateremoteview.cxx
M stoc/source/registry_tdprovider/tdservice.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/imagemgr.cxx
M svtools/source/misc/imagemgr.src
M unoidl/source/legacyprovider.cxx
22 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 7f88e49..7cc3a65 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -90,7 +90,7 @@
sal_Bool isMayBeDefault() const
{ return ((m_flags & AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT); }
sal_Bool isRemoveable() const
- { return ((m_flags & AF_REMOVEABLE) == AF_REMOVEABLE); }
+ { return ((m_flags & AF_REMOVABLE) == AF_REMOVABLE); }
sal_Bool dumpBlob(
typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex);
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 32214d6..842ef68 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -87,7 +87,7 @@
#define AF_TRANSIENT 0x0020
#define AF_MAYBEAMBIGUOUS 0x0040
#define AF_MAYBEDEFAULT 0x0080
-#define AF_REMOVEABLE 0x0100
+#define AF_REMOVABLE 0x0100
#define AF_ATTRIBUTE 0x0200
#define AF_PROPERTY 0x0400
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index fd5e2db..492714c 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -366,7 +366,7 @@
}
if (isRemoveable())
{
- accessMode |= RT_ACCESS_REMOVEABLE;
+ accessMode |= RT_ACCESS_REMOVABLE;
}
OUString name(OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8));
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 390d76e..f591f0b 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -456,7 +456,7 @@
flagStr += "'maybeambiguous'";
if ( (flag & AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT )
flagStr += "'maybedefault'";
- if ( (flag & AF_REMOVEABLE) == AF_REMOVEABLE )
+ if ( (flag & AF_REMOVABLE) == AF_REMOVABLE )
flagStr += "'removable'";
if ( (flag & AF_ATTRIBUTE) == AF_ATTRIBUTE )
flagStr += "'attribute'";
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 528bc96..7bfdea2 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -271,7 +271,7 @@
%token IDL_PROPERTY
%token IDL_RAISES
%token IDL_READONLY
-%token IDL_REMOVEABLE
+%token IDL_REMOVABLE
%token IDL_SERVICE
%token IDL_SEQUENCE
%token IDL_SINGLETON
@@ -848,10 +848,10 @@
idlc()->setParseState(PS_MayBeDefaultSeen);
$$ = AF_MAYBEDEFAULT;
}
- | IDL_REMOVEABLE
+ | IDL_REMOVABLE
{
idlc()->setParseState(PS_RemoveableSeen);
- $$ = AF_REMOVEABLE;
+ $$ = AF_REMOVABLE;
}
| error ']'
{
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 51204b8..d13160e 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -307,7 +307,7 @@
property return IDL_PROPERTY;
raises return IDL_RAISES;
readonly return IDL_READONLY;
-removable return IDL_REMOVEABLE;
+removable return IDL_REMOVABLE;
service return IDL_SERVICE;
sequence return IDL_SEQUENCE;
singleton return IDL_SINGLETON;
diff --git a/idlc/test/parser/attribute.tests b/idlc/test/parser/attribute.tests
index 1e9b28d..bc6753f 100644
--- a/idlc/test/parser/attribute.tests
+++ b/idlc/test/parser/attribute.tests
@@ -194,7 +194,7 @@
EXPECT FAILURE "attribute.tests 23":
interface I1 {
- [attribute, removeable] long a;
+ [attribute, removable] long a;
};
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 92c0026..1be1309 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -118,7 +118,7 @@
@throws UnknownPropertyException
if the bag does not contain a property with the given name
@throws NotRemoveableException
- if the property with the given name is not removeable, as indicated
+ if the property with the given name is not removable, as indicated
by the property attributes used in a previous <code>addProperty</code>
call.
*/
diff --git a/include/registry/types.h b/include/registry/types.h
index 0ad7977..7c40740 100644
--- a/include/registry/types.h
+++ b/include/registry/types.h
@@ -123,7 +123,7 @@
@see RT_ACCESS_TRANSIENT
@see RT_ACCESS_MAYBEAMBIGUOUS
@see RT_ACCESS_MAYBEDEFAULT
- @see RT_ACCESS_REMOVEABLE
+ @see RT_ACCESS_REMOVABLE
@see RT_ACCESS_ATTRIBUTE
@see RT_ACCESS_PROPERTY
@see RT_ACCESS_CONST
@@ -153,7 +153,7 @@
/// @see com::sun::star::beans::PropertyAttribute
#define RT_ACCESS_MAYBEDEFAULT 0x0080
/// @see com::sun::star::beans::PropertyAttribute
-#define RT_ACCESS_REMOVEABLE 0x0100
+#define RT_ACCESS_REMOVABLE 0x0100
/// @see com::sun::star::beans::PropertyAttribute
#define RT_ACCESS_ATTRIBUTE 0x0200
/// specifies that the field is a property
diff --git a/include/svtools/imagemgr.hrc b/include/svtools/imagemgr.hrc
index 1d86788..766e6ee 100644
--- a/include/svtools/imagemgr.hrc
+++ b/include/svtools/imagemgr.hrc
@@ -44,7 +44,7 @@
#define IMG_WRITER (IMAGELIST_START + 86)
#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87)
#define IMG_FIXEDDEV (IMAGELIST_START + 88)
-#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89)
+#define IMG_REMOVABLEDEV (IMAGELIST_START + 89)
#define IMG_CDROMDEV (IMAGELIST_START + 90)
#define IMG_NETWORKDEV (IMAGELIST_START + 91)
#define IMG_TABLE (IMAGELIST_START + 112)
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index fe61848..1bb7661 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -600,7 +600,7 @@
if( ! m_rPIManager.removePrinter( aPrinter ) )
{
- String aText( PaResId( RID_ERR_PRINTERNOTREMOVEABLE ) );
+ String aText( PaResId( RID_ERR_PRINTERNOTREMOVABLE ) );
aText.SearchAndReplace( String( "%s" ), aPrinter );
ErrorBox aBox( this, WB_OK | WB_DEF_OK, aText );
aBox.Execute();
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index d64c8db..a0abb87 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -67,7 +67,7 @@
#define RID_PA_TXT_TESTPAGE_PRINTED 1005
-#define RID_ERR_PRINTERNOTREMOVEABLE 1006
+#define RID_ERR_PRINTERNOTREMOVABLE 1006
#define RID_ERR_NOWRITE 1009
#define RID_ERR_NOPRINTER 1013
#define RID_QRY_PRTNAME 1022
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 07e02c6..1293ccd 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -453,7 +453,7 @@
Text [ en-US ] = "The driver \"%s\" is used by your default printer. Therefore, it cannot be
removed.";
};
-String RID_ERR_PRINTERNOTREMOVEABLE
+String RID_ERR_PRINTERNOTREMOVABLE
{
Text [ en-US ] = "The printer %s cannot be removed.";
};
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
index 1c8028f..5befa68 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
@@ -246,7 +246,7 @@
exp=false;
try {
- log.println("remove not removeable property '" + propertyNotRemovable + "'") ;
+ log.println("remove not removable property '" + propertyNotRemovable + "'") ;
oObj.removeProperty(propertyNotRemovable);
} catch (NotRemoveableException ex) {
log.println("OK: expected Exception was thrown: " + ex.toString());
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index c87191f..42d3a72 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -104,7 +104,7 @@
printFieldOrReferenceFlag(
&flags, RT_ACCESS_MAYBEDEFAULT, "maybedefault", &first);
printFieldOrReferenceFlag(
- &flags, RT_ACCESS_REMOVEABLE, "removeable", &first);
+ &flags, RT_ACCESS_REMOVABLE, "removable", &first);
printFieldOrReferenceFlag(
&flags, RT_ACCESS_ATTRIBUTE, "attribute", &first);
printFieldOrReferenceFlag(
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 4aac38d..d849b2a 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -344,7 +344,7 @@
{
ret += OString(ret.isEmpty() ? "MAYBEDEFAULT" : ",MAYBEDEFAULT");
}
- if ( (fieldAccess & RT_ACCESS_REMOVEABLE) == RT_ACCESS_REMOVEABLE )
+ if ( (fieldAccess & RT_ACCESS_REMOVABLE) == RT_ACCESS_REMOVABLE )
{
ret += OString(ret.isEmpty() ? "REMOVABLE" : ",REMOVABLE");
}
diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx
index ea97350..5b31179 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -40,7 +40,7 @@
ROW_TARGET_URL,
ROW_IS_HIDDEN,
ROW_IS_REMOTE,
- ROW_IS_REMOVEABLE
+ ROW_IS_REMOVABLE
};
TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool
bDisableTransientChildren)
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx
b/stoc/source/registry_tdprovider/tdservice.cxx
index 190ad7a..509a058 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -258,7 +258,7 @@
nAttribs |= beans::PropertyAttribute::MAYBEAMBIGUOUS;
if ( nFlags & RT_ACCESS_MAYBEDEFAULT )
nAttribs |= beans::PropertyAttribute::MAYBEDEFAULT;
- if ( nFlags & RT_ACCESS_REMOVEABLE )
+ if ( nFlags & RT_ACCESS_REMOVABLE )
nAttribs |= beans::PropertyAttribute::REMOVABLE;
OSL_ENSURE( !(nFlags & RT_ACCESS_PROPERTY),
diff --git a/svtools/source/contnr/contentenumeration.cxx
b/svtools/source/contnr/contentenumeration.cxx
index 4a0db74..6fe1037 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -50,7 +50,7 @@
#define ROW_IS_HIDDEN 7
#define ROW_IS_VOLUME 8
#define ROW_IS_REMOTE 9
-#define ROW_IS_REMOVEABLE 10
+#define ROW_IS_REMOVABLE 10
#define ROW_IS_FLOPPY 11
#define ROW_IS_COMPACTDISC 12
@@ -244,7 +244,7 @@
pData->mbIsFolder = xRow->getBoolean( ROW_IS_FOLDER ) &&
!xRow->wasNull();
pData->mbIsVolume = xRow->getBoolean( ROW_IS_VOLUME ) &&
!xRow->wasNull();
pData->mbIsRemote = xRow->getBoolean( ROW_IS_REMOTE ) &&
!xRow->wasNull();
- pData->mbIsRemoveable = xRow->getBoolean( ROW_IS_REMOVEABLE ) &&
!xRow->wasNull();
+ pData->mbIsRemoveable = xRow->getBoolean( ROW_IS_REMOVABLE ) &&
!xRow->wasNull();
pData->mbIsFloppy = xRow->getBoolean( ROW_IS_FLOPPY ) &&
!xRow->wasNull();
pData->mbIsCompactDisc = xRow->getBoolean( ROW_IS_COMPACTDISC ) &&
!xRow->wasNull();
pData->SetNewTitle( xRow->getString( ROW_TITLE ) );
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 8ad8e56..286fd7a 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -339,7 +339,7 @@
else if ( aVolumeInfo.m_bIsCompactDisc )
nRet = IMG_CDROMDEV;
else if ( aVolumeInfo.m_bIsRemoveable )
- nRet = IMG_REMOVEABLEDEV;
+ nRet = IMG_REMOVABLEDEV;
else if ( aVolumeInfo.m_bIsVolume )
nRet = IMG_FIXEDDEV;
}
@@ -629,7 +629,7 @@
else if ( rInfo.m_bIsCompactDisc )
nImage = IMG_CDROMDEV;
else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsFloppy )
- nImage = IMG_REMOVEABLEDEV;
+ nImage = IMG_REMOVABLEDEV;
else if ( rInfo.m_bIsVolume )
nImage = IMG_FIXEDDEV;
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 1924c28..e11dee5 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -71,7 +71,7 @@
IMG_PCT ; \
IMG_PCX ; \
IMG_PNG ; \
- IMG_REMOVEABLEDEV ; \
+ IMG_REMOVABLEDEV ; \
IMG_SGF ; \
IMG_SGV ; \
IMG_SIM ; \
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 17b95dc..e78dfe5 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -564,7 +564,7 @@
attrs |= AccumulationBasedServiceEntity::Property::
ATTRIBUTE_MAYBE_DEFAULT;
}
- if ((acc & RT_ACCESS_REMOVEABLE) != 0) {
+ if ((acc & RT_ACCESS_REMOVABLE) != 0) {
attrs |= AccumulationBasedServiceEntity::Property::
ATTRIBUTE_REMOVABLE;
}
--
To view, visit https://gerrit.libreoffice.org/4078
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0057b9174af6a83f3fde0e27c3a91a4aeca95873
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <thomas@arnhold.org>
Context
- [PATCH] fdo#60724 change spelling error REMOVEABLE -> REMOVABLE II · Thomas Arnhold (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.