[Libreoffice-commits] core.git: 3 commits - bridges/source bridges/test canvas/source configure.ac cppu/source desktop/source include/basebmp include/canvas include/codemaker include/comphelper include/cppuhelper include/registry include/uno include/unotools jurt/com linguistic/source salhelper/source sal/osl scaddins/source sc/inc sc/source sfx2/source slideshow/source slideshow/test solenv/gbuild starmath/source stoc/source sw/inc sw/source ucb/source udkapi/com unoxml/source vcl/headless vcl/source vcl/unx writerfilter/source xmerge/source xmloff/inc xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Tue Jun 23 11:32:56 PDT 2015
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2 -
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx | 2 -
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx | 2 -
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx | 2 -
bridges/source/cpp_uno/mingw_x86-64/abi.hxx | 2 -
bridges/test/java_remote/Bug107753_Test.java | 4 +--
canvas/source/directx/dx_surfacebitmap.hxx | 2 -
configure.ac | 2 -
cppu/source/threadpool/thread.cxx | 2 -
desktop/source/deployment/inc/lockfile.hxx | 2 -
include/basebmp/accessorfunctors.hxx | 4 +--
include/canvas/base/canvascustomspritehelper.hxx | 12 +++++-----
include/codemaker/exceptiontree.hxx | 4 +--
include/codemaker/generatedtypeset.hxx | 2 -
include/comphelper/propertybag.hxx | 2 -
include/cppuhelper/supportsservice.hxx | 2 -
include/registry/reader.hxx | 2 -
include/registry/typereg_reader.hxx | 4 +--
include/registry/writer.h | 12 +++++-----
include/uno/dispatcher.h | 2 -
include/unotools/ucbhelper.hxx | 2 -
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 2 -
jurt/com/sun/star/lib/uno/protocols/urp/Cache.java | 2 -
linguistic/source/lngsvcmgr.cxx | 2 -
sal/osl/w32/file.cxx | 2 -
salhelper/source/thread.cxx | 2 -
sc/inc/dbdata.hxx | 2 -
sc/source/filter/xml/xmlimprt.cxx | 2 -
scaddins/source/analysis/analysishelper.cxx | 2 -
scaddins/source/pricing/black_scholes.cxx | 2 -
scaddins/source/pricing/black_scholes.hxx | 2 -
sfx2/source/doc/DocumentMetadataAccess.cxx | 2 -
sfx2/source/doc/Metadatable.cxx | 4 +--
sfx2/source/doc/SfxDocumentMetaData.cxx | 6 ++---
sfx2/source/inc/openuriexternally.hxx | 2 -
slideshow/source/engine/animationnodes/basenode.cxx | 2 -
slideshow/test/tests.hxx | 4 +--
solenv/gbuild/Extension.mk | 2 -
starmath/source/edit.cxx | 2 -
starmath/source/mathmlimport.cxx | 2 -
starmath/source/node.cxx | 2 -
starmath/source/parse.cxx | 2 -
starmath/source/rect.cxx | 4 +--
stoc/source/security/access_controller.cxx | 2 -
sw/inc/ndhints.hxx | 4 +--
sw/inc/ndtxt.hxx | 2 -
sw/inc/node.hxx | 2 -
sw/source/core/inc/UndoSection.hxx | 2 -
sw/source/core/txtnode/thints.cxx | 2 -
sw/source/core/undo/unsect.cxx | 2 -
sw/source/filter/ww8/wrtww8.hxx | 2 -
sw/source/filter/ww8/ww8par6.cxx | 2 -
sw/source/filter/ww8/ww8scan.cxx | 2 -
sw/source/filter/xml/xmlimp.cxx | 2 -
sw/source/uibase/wrtsh/navmgr.cxx | 2 -
ucb/source/ucp/ftp/ftpdirp.cxx | 2 -
udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl | 2 -
unoxml/source/rdf/librdf_repository.cxx | 2 -
vcl/headless/svpgdi.cxx | 2 -
vcl/source/app/svapp.cxx | 2 -
vcl/source/filter/jpeg/transupp.c | 2 -
vcl/unx/generic/app/i18n_status.cxx | 2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java | 4 +--
xmloff/inc/txtlists.hxx | 2 -
xmloff/source/chart/contexts.cxx | 2 -
xmloff/source/draw/sdxmlimp.cxx | 2 -
67 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit abd7ad8bff9b1874e3903aa55f33ef887d95096a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Jun 23 20:32:05 2015 +0200
Wrong comment with 'sal_True' instead of 'true'
Change-Id: If1aa0f0b84c900d4c4b8378359d6e8e24e868934
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 9b4cc9f..caa7d09 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1653,7 +1653,7 @@ uno::Sequence< lang::Locale > SAL_CALL
static bool IsEqSvcList( const uno::Sequence< OUString > &rList1,
const uno::Sequence< OUString > &rList2 )
{
- // returns sal_True if both sequences are equal
+ // returns true if both sequences are equal
bool bRes = false;
sal_Int32 nLen = rList1.getLength();
commit 338161a41d6e01b8e8d8752d9a38cc5c7a63f288
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Jun 23 20:31:06 2015 +0200
Typo: repsent->represent
Change-Id: I8affe5b6f388edf063460dabed743f16917d75e9
diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index c83d5f1..8dc4e5f 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -32,7 +32,7 @@ import test.lib.TestBed;
*
* <p>Bug #107753# "Java UNO: Proxies should implement intuitive semantics of
* equals and hashCode" requests that two proxies are equal if they represent
- * the same UNO object. This implies that if two proxies repsent the same UNO
+ * the same UNO object. This implies that if two proxies represent the same UNO
* object, they must have the same hash code.</p>
*/
public final class Bug107753_Test extends ComplexTestCase {
commit cf92da3d6e1de14756efe3f1ee79f393a2f3787d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Jun 23 20:30:11 2015 +0200
Typo: iff->if
Change-Id: I3fc60856b5a56e71d70b55c89323be074bdec3b3
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 36de6da..e3745ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -252,7 +252,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
}
/* Examine the argument and return set number of register required in each
- class. Return 0 iff parameter should be passed in memory. */
+ class. Return 0 if parameter should be passed in memory. */
bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw ()
{
enum x86_64_reg_class classes[MAX_CLASSES];
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index 915d45b..c8ce2ef 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -40,7 +40,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
Examine the argument and return set number of register required in each
class.
- Return false iff parameter should be passed in memory.
+ Return false if parameter should be passed in memory.
*/
bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw ();
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
index 36de6da..e3745ee 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
@@ -252,7 +252,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
}
/* Examine the argument and return set number of register required in each
- class. Return 0 iff parameter should be passed in memory. */
+ class. Return 0 if parameter should be passed in memory. */
bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw ()
{
enum x86_64_reg_class classes[MAX_CLASSES];
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
index 90aad26..425fac1 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx
@@ -40,7 +40,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
Examine the argument and return set number of register required in each
class.
- Return false iff parameter should be passed in memory.
+ Return false if parameter should be passed in memory.
*/
bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw ();
diff --git a/bridges/source/cpp_uno/mingw_x86-64/abi.hxx b/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
index 09d2c97..d5715cb 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/abi.hxx
@@ -40,7 +40,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
Examine the argument and return set number of register required in each
class.
- Return false iff parameter should be passed in memory.
+ Return false if parameter should be passed in memory.
*/
bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw ();
diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java
index 34e5112..c83d5f1 100644
--- a/bridges/test/java_remote/Bug107753_Test.java
+++ b/bridges/test/java_remote/Bug107753_Test.java
@@ -31,7 +31,7 @@ import test.lib.TestBed;
* Test case for bug #107753#.
*
* <p>Bug #107753# "Java UNO: Proxies should implement intuitive semantics of
- * equals and hashCode" requests that two proxies are equal iff they represent
+ * equals and hashCode" requests that two proxies are equal if they represent
* the same UNO object. This implies that if two proxies repsent the same UNO
* object, they must have the same hash code.</p>
*/
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index fa37707..7703233 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -125,7 +125,7 @@ namespace dxcanvas
// indicates whether the associated surface needs
// to refresh its contents or not. in other words,
- // this flag is set iff both representations are
+ // this flag is set if both representations are
// out of sync.
mutable bool mbIsSurfaceDirty;
diff --git a/configure.ac b/configure.ac
index 4afc1d4..81d20cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1075,7 +1075,7 @@ AC_ARG_ENABLE(runtime-optimizations,
AS_HELP_STRING([--disable-runtime-optimizations],
[Statically disable certain runtime optimizations (like rtl/alloc.h or
JVM JIT) that are known to interact badly with certain dynamic analysis
- tools (like -fsanitize=address or Valgrind). By default, disabled iff
+ tools (like -fsanitize=address or Valgrind). By default, disabled if
CC contains "-fsanitize=*". (For Valgrind, those runtime optimizations
are typically disabled dynamically via RUNNING_ON_VALGRIND.)]))
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index d1d448f..ff4bbfd 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -118,7 +118,7 @@ namespace cppu_threadpool {
bool ORequestThread::launch()
{
// Assumption is that osl::Thread::create returns normally with a true
- // return value iff it causes osl::Thread::run to start executing:
+ // return value if it causes osl::Thread::run to start executing:
acquire();
ThreadAdmin & rThreadAdmin = m_aThreadPool->getThreadAdmin();
osl::ClearableMutexGuard g(rThreadAdmin.m_mutex);
diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx
index f3f1da2..cb7aae8 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -64,7 +64,7 @@ namespace desktop {
typedef bool (* fpExecWarning)( Lockfile * that );
// checks the lockfile, asks user when lockfile is
- // found (iff gui) and returns false when we may not continue
+ // found (if gui) and returns false when we may not continue
bool check( fpExecWarning execWarning );
// removes the lockfile
diff --git a/include/basebmp/accessorfunctors.hxx b/include/basebmp/accessorfunctors.hxx
index 02e3aba..44cecee 100644
--- a/include/basebmp/accessorfunctors.hxx
+++ b/include/basebmp/accessorfunctors.hxx
@@ -80,7 +80,7 @@ template< typename T,
{
typedef typename make_unsigned<T>::type unsigned_T;
- // mask will be 0, iff m == 0, and 1 otherwise
+ // mask will be 0, if m == 0, and 1 otherwise
const T mask( unsigned_cast<T>(m | -m) >> (sizeof(unsigned_T)*8 - 1) );
return v1*static_cast<M>(1-mask) + v2*mask;
}
@@ -96,7 +96,7 @@ template< typename T,
{
typedef typename make_unsigned<T>::type unsigned_T;
- // mask will be 0, iff m == 0, and 1 otherwise
+ // mask will be 0, if m == 0, and 1 otherwise
const T mask( unsigned_cast<T>(m | -m) >> (sizeof(unsigned_T)*8 - 1) );
return v1*mask + v2*static_cast<M>(1-mask);
}
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index fe29f5c..1d9c24b 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -262,22 +262,22 @@ namespace canvas
*/
mutable bool mbIsContentFullyOpaque;
- /// True, iff mfAlpha has changed
+ /// True, if mfAlpha has changed
mutable bool mbAlphaDirty;
- /// True, iff maPosition has changed
+ /// True, if maPosition has changed
mutable bool mbPositionDirty;
- /// True, iff maTransform has changed
+ /// True, if maTransform has changed
mutable bool mbTransformDirty;
- /// True, iff mxClipPoly has changed
+ /// True, if mxClipPoly has changed
mutable bool mbClipDirty;
- /// True, iff mnPriority has changed
+ /// True, if mnPriority has changed
mutable bool mbPrioDirty;
- /// True, iff mbActive has changed
+ /// True, if mbActive has changed
mutable bool mbVisibilityDirty;
};
}
diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx
index 091ff03..b97286c 100644
--- a/include/codemaker/exceptiontree.hxx
+++ b/include/codemaker/exceptiontree.hxx
@@ -70,10 +70,10 @@ private:
exception com.sun.star.uno.RuntimeException and its subtypes are pruned
completely from the hierarchy. Each node of the hierarchy is represented by
an instance of ExceptionTreeNode, where name gives the name of the UNO
- exception type, present is true iff the given exception type is a member of
+ exception type, present is true if the given exception type is a member of
the set S, and children contains all the relevant direct subtypes of the
given exception type, in no particular order (for nodes other than the root
- node it holds that children is non-empty iff present is false).
+ node it holds that children is non-empty if present is false).
*/
class ExceptionTree {
public:
diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index ca4ad24..1a08e89 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -54,7 +54,7 @@ public:
@param type a UNO type registry name
- @return true iff the given type has already been generated
+ @return true if the given type has already been generated
*/
bool contains(OString const & type) const
{ return m_set.find(type) != m_set.end(); }
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 484246a..1c72940 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -51,7 +51,7 @@ namespace comphelper
/** allow adding property with empty string as name
(by default, such names are rejected with IllegalActionException).
@param i_isAllowed
- iff true, empty property name will be allowed
+ if true, empty property name will be allowed
*/
void setAllowEmptyPropertyName(bool i_isAllowed = true);
diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx
index 10dcfb5..d1aa6eb 100644
--- a/include/cppuhelper/supportsservice.hxx
+++ b/include/cppuhelper/supportsservice.hxx
@@ -33,7 +33,7 @@ namespace cppu {
@param name the service name to test
- @return true iff the sequence returned by the given implementation's
+ @return true if the sequence returned by the given implementation's
getSupportedServices method contains the given name
@since LibreOffice 4.0
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index 67888df..d877f38 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -116,7 +116,7 @@ public:
/**
Returns whether this type reader is valid.
- @return true iff this type reader is valid
+ @return true if this type reader is valid
*/
bool isValid() const {
return m_handle != 0;
diff --git a/include/registry/typereg_reader.hxx b/include/registry/typereg_reader.hxx
index 64c2261..440e2c9 100644
--- a/include/registry/typereg_reader.hxx
+++ b/include/registry/typereg_reader.hxx
@@ -51,7 +51,7 @@
not be null; if the given binary blob is malformed, or of a version larger
than <code>maxVersion</code>, null is returned
- @return false iff an out-of-memory condition occurred, in which case
+ @return false if an out-of-memory condition occurred, in which case
<code>result</code> is left unchanged, and no type reader is created
@since UDK 3.2.0
@@ -296,7 +296,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldTypeName(
@param value an out-parameter obtaining the field value's value; must not be
null
- @return false iff an out-of-memory condition occurred, in which case
+ @return false if an out-of-memory condition occurred, in which case
<code>type</code> and <code>value</code> are left unchanged
@since UDK 3.2.0
diff --git a/include/registry/writer.h b/include/registry/writer.h
index e05b096..a0c458a 100644
--- a/include/registry/writer.h
+++ b/include/registry/writer.h
@@ -89,7 +89,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTE
@param typeName the super type name; must not be null
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
@@ -119,7 +119,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
@param valueValue the value of the value of the field
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
@@ -150,7 +150,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setFieldData(
@param exceptionCount the number of exceptions of the method
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
@@ -179,7 +179,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData(
@param typeName the type name of the parameter; must not be null
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
@@ -202,7 +202,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
@param typeName the exception type name; must not be null
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
@@ -228,7 +228,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
@param typeName the type name of the reference; must not be null
- @return false iff an out-of-memory condition occurred, in which case the type
+ @return false if an out-of-memory condition occurred, in which case the type
writer is not modified
@since UDK 3.2.0
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index d4bde04..c324641 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.h
@@ -31,7 +31,7 @@ struct _typelib_TypeDescription;
struct _uno_Interface;
/** Function pointer declaration for the binary C uno dispatch function. Any pure out or return
- value will be constructed by the callee, iff no exception is signalled.
+ value will be constructed by the callee, if no exception is signalled.
If an exception is signalled, the any *ppException is properly constructed by the callee,
otherwise the pointer *ppException is set to 0.
An attribute get call is indicated by a non-null return pointer.
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 6234e8e..027c638 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -44,7 +44,7 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(OUString const & url);
UNOTOOLS_DLLPUBLIC bool IsFolder(OUString const & url);
/// @param title must not be null
-/// @return true iff title has been set (i.e., if obtaining the "Title" property
+/// @return true if title has been set (i.e., if obtaining the "Title" property
/// of the given content yields a non-void value without raising a
/// non-RuntimeException; RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC bool GetTitle(
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 0dcc75d..e6d4cd9 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -374,7 +374,7 @@ public class java_remote_bridge
String[] oid = new String[1];
object = _java_environment.registerInterface(object, oid, type);
if (!proxyFactory.isProxy(object)) {
- // This branch must be taken iff object either is no proxy at
+ // This branch must be taken if object either is no proxy at
// all or a proxy from some other bridge. There are objects
// that behave like objects for this bridge but that are not
// detected as such by proxyFactory.isProxy. The only known
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java b/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
index 544a064..aef3e19 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
@@ -65,7 +65,7 @@ final class Cache {
first = e;
}
} else {
- // Reached iff maxSize == 0:
+ // Reached if maxSize == 0:
return NOT_CACHED;
}
map.put(content, e);
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 3824b91..9b4cc9f 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1653,7 +1653,7 @@ uno::Sequence< lang::Locale > SAL_CALL
static bool IsEqSvcList( const uno::Sequence< OUString > &rList1,
const uno::Sequence< OUString > &rList2 )
{
- // returns sal_True iff both sequences are equal
+ // returns sal_True if both sequences are equal
bool bRes = false;
sal_Int32 nLen = rList1.getLength();
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 181e041c..da1b3c0 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -60,7 +60,7 @@ struct FileHandle_Impl
*/
enum StateBits
{
- STATE_SEEKABLE = 1, /* open() sets, iff regular file */
+ STATE_SEEKABLE = 1, /* open() sets, if regular file */
STATE_READABLE = 2, /* open() sets, read() requires */
STATE_WRITEABLE = 4, /* open() sets, write() requires */
STATE_MODIFIED = 8 /* write() sets, flush() resets */
diff --git a/salhelper/source/thread.cxx b/salhelper/source/thread.cxx
index 52c028c..53fa207 100644
--- a/salhelper/source/thread.cxx
+++ b/salhelper/source/thread.cxx
@@ -20,7 +20,7 @@ salhelper::Thread::Thread(char const * name): name_(name) {}
void salhelper::Thread::launch() {
SAL_INFO("salhelper.thread", "launch " << name_);
// Assumption is that osl::Thread::create returns normally with a true
- // return value iff it causes osl::Thread::run to start executing:
+ // return value if it causes osl::Thread::run to start executing:
acquire();
try {
if (!create()) {
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 66b0532..a844b09 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -180,7 +180,7 @@ public:
const_iterator end() const;
ScDBData* findByIndex(sal_uInt16 nIndex);
ScDBData* findByUpperName(const OUString& rName);
- // Takes ownership of p iff it returns true:
+ // Takes ownership of p if it returns true:
SAL_WARN_UNUSED_RESULT bool insert(ScDBData* p);
void erase(iterator itr);
void erase(const ScDBData& r);
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 2ddf1a6..28fc577 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -300,7 +300,7 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
- // behave like meta base class iff we encounter office:meta
+ // behave like meta base class if we encounter office:meta
const SvXMLTokenMap& rTokenMap = GetScImport().GetDocElemTokenMap();
if ( XML_TOK_DOC_META == rTokenMap.Get( i_nPrefix, i_rLocalName ) ) {
return SvXMLMetaDocumentContext::CreateChildContext(
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index f5cd27c..419408b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -560,7 +560,7 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDat
// is to be understood as "inclusive the lower bound, exclusive in upper bound".
assert(nYear1 == nYear2 || nYear1 + 1 == nYear2);
- // as a consequence, nYearDifferent iff nYear2 == nYear + 1, and
+ // as a consequence, nYearDifferent if nYear2 == nYear + 1, and
// there are only two possible 29 Februaries to consider:
// "29 February nYear1" and "29 February nYear2"
diff --git a/scaddins/source/pricing/black_scholes.cxx b/scaddins/source/pricing/black_scholes.cxx
index 95fa888..9788559 100644
--- a/scaddins/source/pricing/black_scholes.cxx
+++ b/scaddins/source/pricing/black_scholes.cxx
@@ -888,7 +888,7 @@ double prob_hit(double S, double vol, double mu,
}
// probability of being in-the-money, ie payoff is greater zero,
-// assuming payoff(S_T) > 0 iff S_T in [B1, B2]
+// assuming payoff(S_T) > 0 if S_T in [B1, B2]
// this the same as the price of a cash or nothing option
// with no discounting
double prob_in_money(double S, double vol, double mu,
diff --git a/scaddins/source/pricing/black_scholes.hxx b/scaddins/source/pricing/black_scholes.hxx
index cdcb20b..c42ba18 100644
--- a/scaddins/source/pricing/black_scholes.hxx
+++ b/scaddins/source/pricing/black_scholes.hxx
@@ -130,7 +130,7 @@ double prob_hit(double S, double vol, double mu,
// probability of being in-the-money, ie payoff is greater zero,
-// assuming payoff(S_T) > 0 iff S_T in [B1, B2]
+// assuming payoff(S_T) > 0 if S_T in [B1, B2]
double prob_in_money(double S, double vol, double mu,
double tau, double B1, double B2);
double prob_in_money(double S, double vol, double mu,
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 228f578..a29b22c 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -448,7 +448,7 @@ mkException( OUString const & i_rMessage,
<li>ignore the error and continue</li>
<li>retry the action that led to the error</li></ul></p>
N.B.: must not be called before DMA is fully initalized!
- @returns true iff caller should retry
+ @returns true if caller should retry
*/
static bool
handleError( ucb::InteractiveAugmentedIOException const & i_rException,
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 59dfb8a..9f253e5 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -175,7 +175,7 @@ public:
</p>
@returns
- true iff the element has successfully been registered
+ true if the element has successfully been registered
*/
virtual bool TryRegisterMetadatable(Metadatable& i_xObject,
OUString const& i_rStreamName, OUString const& i_rIdref)
@@ -229,7 +229,7 @@ public:
virtual void RemoveXmlIdForElement(Metadatable const&) SAL_OVERRIDE;
/** register i_rCopy as a copy of i_rSource,
- with precedence iff i_bCopyPrecedesSource is true */
+ with precedence if i_bCopyPrecedesSource is true */
void RegisterCopy(Metadatable const& i_rSource, Metadatable & i_rCopy,
const bool i_bCopyPrecedesSource);
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 54b4a90..2c681be 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -334,10 +334,10 @@ protected:
const css::uno::Sequence<css::beans::PropertyValue> & i_rMedium) const;
/// get text of standard meta data element
OUString SAL_CALL getMetaText(const char* i_name) const;
- /// set text of standard meta data element iff not equal to existing text
+ /// set text of standard meta data element if not equal to existing text
bool SAL_CALL setMetaText(const char* i_name,
const OUString & i_rValue);
- /// set text of standard meta data element iff not equal to existing text
+ /// set text of standard meta data element if not equal to existing text
void SAL_CALL setMetaTextAndNotify(const char* i_name,
const OUString & i_rValue);
/// get text of standard meta data element's attribute
@@ -1002,7 +1002,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
return std::make_pair(comphelper::containerToSequence(values), attrs);
}
-// remove the given element from the DOM, and iff i_pAttrs != 0 insert new one
+// remove the given element from the DOM, and if i_pAttrs != 0 insert new one
void SAL_CALL
SfxDocumentMetaData::updateElement(const char *i_name,
std::vector<std::pair<const char *, OUString> >* i_pAttrs)
diff --git a/sfx2/source/inc/openuriexternally.hxx b/sfx2/source/inc/openuriexternally.hxx
index 42013cd..163c2af 100644
--- a/sfx2/source/inc/openuriexternally.hxx
+++ b/sfx2/source/inc/openuriexternally.hxx
@@ -25,7 +25,7 @@ namespace sfx2 {
/// given handleSystemShellExecuteException is false (in which case the
/// exception is re-thrown).
///
-/// @return true iff execution was successful
+/// @return true if execution was successful
bool openUriExternally(
OUString const & uri, bool handleSystemShellExecuteException);
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 4940a83..207db3b 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -633,7 +633,7 @@ void BaseNode::notifyEndListeners() const
// notify state change
maContext.mrEventMultiplexer.notifyAnimationEnd( mpSelf );
- // notify main sequence end (iff we're the main
+ // notify main sequence end (if we're the main
// sequence root node). This is because the main
// sequence determines the active duration of the
// slide. All other sequences are secondary, in that
diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx
index 1cf44c8..1cbfd31 100644
--- a/slideshow/test/tests.hxx
+++ b/slideshow/test/tests.hxx
@@ -29,11 +29,11 @@ namespace basegfx{ class B1DRange; class B2DRange; class B2DVector; }
class TestView : public slideshow::internal::UnoView
{
public:
- /// true iff clear() has been called
+ /// true if clear() has been called
virtual bool isClearCalled() const = 0;
virtual std::vector<std::pair<basegfx::B2DVector,double> > getCreatedSprites() const = 0;
virtual basegfx::B1DRange getPriority() const = 0;
- /// true iff setClip was called (on and off)
+ /// true if setClip was called (on and off)
virtual bool wasClipSet() const = 0;
virtual basegfx::B2DRange getBounds() const = 0;
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index bcfa256..8119ffd 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -464,7 +464,7 @@ endef
# establish the dependency that actually causes inclusion of the compiled help
# into the .oxt, for one language; in principle, this would only need to be done
-# once per language iff the extension uses any help -- currently it is done from
+# once per language if the extension uses any help -- currently it is done from
# each individual gb_Extension_add_helpfile call (and thus requires $strip
# to remove duplicates from FILES)
# $(1): extension identifier
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index eb544ad..77ab030 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -908,7 +908,7 @@ void SmEditWindow::SelPrevMark()
}
bool SmEditWindow::HasMark(const OUString& rText)
- // returns true iff 'rText' contains a mark
+ // returns true if 'rText' contains a mark
{
return rText.indexOf("<?>") != -1;
}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 9514aab..d667e8a 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1825,7 +1825,7 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
- // behave like meta base class iff we encounter office:meta
+ // behave like meta base class if we encounter office:meta
if ( XML_NAMESPACE_OFFICE == i_nPrefix &&
i_rLocalName == GetXMLToken(XML_META) )
{
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 9e66810..f4153a5 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1149,7 +1149,7 @@ double Det(const Point &rHeading1, const Point &rHeading2)
}
-/// Is true iff the point 'rPoint1' belongs to the straight line through 'rPoint2'
+/// Is true if the point 'rPoint1' belongs to the straight line through 'rPoint2'
/// and has the direction vector 'rHeading2'
bool IsPointInLine(const Point &rPoint1,
const Point &rPoint2, const Point &rHeading2)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 4bafb9a..0363eb4 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -320,7 +320,7 @@ static const sal_Unicode aDelimiterTable[] =
};
bool SmParser::IsDelimiter( const OUString &rTxt, sal_Int32 nPos )
- // returns 'true' iff cChar is '\0' or a delimiter
+ // returns 'true' if cChar is '\0' or a delimiter
{
assert(nPos <= rTxt.getLength()); //index out of range
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index ad8a2e4..2bd9626 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -49,7 +49,7 @@ static sal_Unicode const aMathAlpha[] =
};
bool SmIsMathAlpha(const OUString &rText)
- // true iff symbol (from StarMath Font) should be treated as letter
+ // true if symbol (from StarMath Font) should be treated as letter
{
if (rText.isEmpty())
return false;
@@ -526,7 +526,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
long SmRect::OrientedDist(const Point &rPoint) const
// return oriented distance of rPoint to the current rectangle,
- // especially the return value is <= 0 iff the point is inside the
+ // especially the return value is <= 0 if the point is inside the
// rectangle.
// For simplicity the maximum-norm is used.
{
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index c59153f..1cfd10b 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -645,7 +645,7 @@ PermissionCollection AccessController::getEffectivePermissions(
}
// call on policy
- // iff this is a recurring call for the default user, then grant all permissions
+ // if this is a recurring call for the default user, then grant all permissions
t_rec_vec * rec = static_cast< t_rec_vec * >( m_rec.getData() );
if (rec) // tls entry exists => this is recursive call
{
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 44c853b..cae02bb 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -216,14 +216,14 @@ public:
SwRegHistory* GetHistory() const { return m_pHistory; }
/// try to insert the hint
- /// @return true iff hint successfully inserted
+ /// @return true if hint successfully inserted
bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
bool HasFootnote() const { return m_bFootnote; }
bool IsInSplitNode() const { return m_bInSplitNode; }
- /// calc current value of m_bHasHiddenParaField, returns true iff changed
+ /// calc current value of m_bHasHiddenParaField, returns true if changed
bool CalcHiddenParaField();
DECL_FIXEDMEMPOOL_NEWDEL(SwpHints)
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 94ffd6a..a91bf34 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -288,7 +288,7 @@ public:
/// initialize the hints after file loading (which takes shortcuts)
void FileLoadedInitHints();
- /// Insert pAttr into hints array. @return true iff inserted successfully
+ /// Insert pAttr into hints array. @return true if inserted successfully
bool InsertHint( SwTextAttr * const pAttr,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
/// create new text attribute from rAttr and insert it
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index bc8f8d0..e454aea 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwNode
#endif
/// all SwFrameFormat that are anchored at the node
- /// invariant: SwFrameFormat is in the list iff
+ /// invariant: SwFrameFormat is in the list if
/// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node
std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys;
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 16f1f11..e9a6ee01 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -34,7 +34,7 @@ class SwUndoInsSection : public SwUndo, private SwUndRng
{
private:
const ::std::unique_ptr<SwSectionData> m_pSectionData;
- const ::std::unique_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX
+ const ::std::unique_ptr<SwTOXBase> m_pTOXBase; /// set if section is TOX
const ::std::unique_ptr<SfxItemSet> m_pAttrSet;
::std::unique_ptr<SwHistory> m_pHistory;
::std::unique_ptr<SwRedlineData> m_pRedlData;
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 669ab94..4b55a4c 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -351,7 +351,7 @@ splitting of exising hints that is necessary for backward compatibility.
@param rNode the text node
@param rHint the hint to be inserted
- @returns true iff hint was successfully inserted
+ @returns true if hint was successfully inserted
*/
bool
SwpHints::TryInsertNesting( SwTextNode & rNode, SwTextAttrNesting & rNewHint )
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 722510d..35ae84c 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -275,7 +275,7 @@ class SwUndoDelSection
{
private:
::std::unique_ptr<SwSectionData> const m_pSectionData; /// section not TOX
- ::std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX
+ ::std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set if section is TOX
::std::unique_ptr<SfxItemSet> const m_pAttrSet;
std::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo;
sal_uLong const m_nStartNode;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 8691bfa..0a1c380 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -511,7 +511,7 @@ public:
SwWW8WrGrf* m_pGrf;
const SwAttrSet* m_pStyAttr; // StyleAttr for Tabs
const SwModify* m_pOutFormatNode; // write Format or Node
- const SwFormat *m_pCurrentStyle; // iff bStyDef=true, then this store the current style
+ const SwFormat *m_pCurrentStyle; // if bStyDef=true, then this store the current style
MainTextPlcDrawObj *m_pSdrObjs; // Draw-/Fly-Objects
HdFtPlcDrawObj *m_pHFSdrObjs; // Draw-/Fly-Objects in header or footer
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 45a41a2..803ebcd 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5758,7 +5758,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x2A0C, &SwWW8ImplReader::Read_CharHighlight},//"sprmCHighlight"
//chp.fHighlight,
//chp.icoHighlight;ico
- //(fHighlight is set to 1 iff
+ //(fHighlight is set to 1 if
//ico is not 0);byte;
{0x680E, &SwWW8ImplReader::Read_PicLoc}, //"sprmCObjLocation" chp.fcObj;
//FC;long;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 69bbbd5..94bd458f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -550,7 +550,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x480B, { 0, L_FIX} }, // "sprmCIdCharType" obsolete: not applicable in
// Word97 and later versions;;;
{0x2A0C, { 1, L_FIX} }, // "sprmCHighlight" chp.fHighlight,
- // chp.icoHighlight;ico (fHighlight is set to 1 iff
+ // chp.icoHighlight;ico (fHighlight is set to 1 if
// ico is not 0)
{0x680E, { 4, L_FIX} }, // "sprmCObjLocation" chp.fcObj;FC;long;
{0x2A10, { 0, L_FIX} }, // "sprmCFFtcAsciSymb" ;;;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 981eb59..18e0a85 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -304,7 +304,7 @@ SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext(
}
}
- // behave like meta base class iff we encounter office:meta
+ // behave like meta base class if we encounter office:meta
if ( XML_TOK_DOC_META == rTokenMap.Get( nPrefix, rLocalName ) ) {
return SvXMLMetaDocumentContext::CreateChildContext(
nPrefix, rLocalName, xAttrList );
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx
index 1811532..9621e8d 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -95,7 +95,7 @@ void SwNavigationMgr::goBack() {
// We are adding the current Point to the navigation history
// so we could later navigate forward to it
- // The addEntry() method returns true iff we should decrement
+ // The addEntry() method returns true if we should decrement
// the index before navigating back
if (addEntry(*pPaM->GetPoint()) ) {
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index d5d7d93..64dcac4 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -548,7 +548,7 @@ bool FTPDirectoryParser::parseDOS (
*
* For directories, the returned name is the <filename> part; for non-
* directory files, the returned name is the <filename "." filetype> part.
- * An entry is a directory iff its filetype is "DIR" (ignoring case).
+ * An entry is a directory if its filetype is "DIR" (ignoring case).
*
* The READ, WRITE, and ISLINK mode bits are not supported.
*
diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
index af6f7f9..1beddad 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
@@ -41,7 +41,7 @@ interface XInterfaceAttributeTypeDescription2:
/**
Returns whether this object reflects a bound attribute.
- @return `TRUE` iff this object reflects a bound attribute
+ @return `TRUE` if this object reflects a bound attribute
*/
boolean isBound();
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 2b20ce0..8a6b31e 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -1299,7 +1299,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
// NB: librdf does not have a concept of graphs as such;
- // a librdf named graph exists iff the model contains a statement with
+ // a librdf named graph exists if the model contains a statement with
// the graph name as context
if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 13f93cf..ac45c64 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -195,7 +195,7 @@ SvpSalGraphics::ClipUndoHandle::~ClipUndoHandle()
m_rGfx.m_aDevice = m_aDevice;
}
-// setup a clip rectangle -only- iff we have to; if aRange
+// setup a clip rectangle -only- if we have to; if aRange
// is entirely contained inside an existing clip frame, we
// will avoid setting up the clip bitmap. Similarly if the
// range doesn't appear at all we return true to avoid
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 536e81b..bb1ae14 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -299,7 +299,7 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
void Application::Abort( const OUString& rErrorText )
{
- //HACK: Dump core iff --norestore command line argument is given (assuming
+ //HACK: Dump core if --norestore command line argument is given (assuming
// this process is run by developers who are interested in cores, vs. end
// users who are not):
bool dumpCore = false;
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index b6e2898..fbc32a3 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1593,7 +1593,7 @@ jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
if (option != JCOPYOPT_NONE) {
jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);
}
- /* Save all types of APPn markers iff ALL option */
+ /* Save all types of APPn markers if ALL option */
if (option == JCOPYOPT_ALL) {
for (m = 0; m < 16; m++)
jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index bb77762..a26a889 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -209,7 +209,7 @@ Point XIMStatusWindow::updatePosition()
&aChild );
// TODO: Currently, place the status window to the (physical) left of
- // the cursor iff in vertical mode (assuming that the columns in
+ // the cursor if in vertical mode (assuming that the columns in
// vertical mode are always written from right to left, this causes the
// status window to keep out of the text already written). This
// heuristic would break if there is ever a vertical mode in which the
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 42b5715..47a60e8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4459,7 +4459,7 @@ void DomainMapper_Impl::StartOrEndBookmark( const OUString& rId )
{
/*
* Add the dummy paragraph to handle section properties
- * iff the first element in the section is a table. If the dummy para is not added yet, then add it;
+ * if the first element in the section is a table. If the dummy para is not added yet, then add it;
* So bookmark is not attached to the wrong paragraph.
*/
if(getTableManager( ).isInCell() && m_nTableDepth == 0 && GetIsFirstParagraphInSection()
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
index 33cab9f..6b33aa6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
@@ -135,7 +135,7 @@ public class DocumentMergerImpl implements DocumentMerger {
// try to match the workSheet
Node matchingWorkSheet = matchWorkSheet(workSheet, workSheetList1);
- // add the new WorkSheet to the original document iff match not found
+ // add the new WorkSheet to the original document if match not found
if (matchingWorkSheet == null) {
Node cloneNode = XmlUtil.deepClone(officeBody, workSheet);
officeBody.appendChild(cloneNode);
@@ -180,4 +180,4 @@ public class DocumentMergerImpl implements DocumentMerger {
return matchSheet;
}
-}
\ No newline at end of file
+}
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 891fb79..423f254 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -98,7 +98,7 @@ class XMLTextListsHelper : private boost::noncopyable
const OUString& i_ListId,
sal_Int16 & io_rLevel, const OUString& i_StyleName);
- /// get ID of the last numbered-paragraph iff it has given style-name
+ /// get ID of the last numbered-paragraph if it has given style-name
OUString GetNumberedParagraphListId(
const sal_uInt16 i_Level,
const OUString& i_StyleName);
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 7c212e5..c924807 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -148,7 +148,7 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
- // behave like meta base class iff we encounter office:meta
+ // behave like meta base class if we encounter office:meta
const SvXMLTokenMap& rTokenMap =
mrImportHelper.GetDocElemTokenMap();
if ( XML_TOK_DOC_META == rTokenMap.Get( i_nPrefix, i_rLocalName ) ) {
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index b38d117..9c066aa 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -240,7 +240,7 @@ SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
- // behave like meta base class iff we encounter office:meta
+ // behave like meta base class if we encounter office:meta
const SvXMLTokenMap& rTokenMap = GetSdImport().GetDocElemTokenMap();
if ( XML_TOK_DOC_META == rTokenMap.Get( i_nPrefix, i_rLocalName ) ) {
return SvXMLMetaDocumentContext::CreateChildContext(
More information about the Libreoffice-commits
mailing list