diff options
70 files changed, 90 insertions, 90 deletions
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 f7c1ac5b6060..4e2d2f7211ad 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 915d45b2fc54..c8ce2ef82a0b 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 f7c1ac5b6060..4e2d2f7211ad 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 90aad264c89d..425fac1f30a5 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/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx index 87d6dcbfe647..240498173226 100644 --- a/canvas/source/directx/dx_surfacebitmap.hxx +++ b/canvas/source/directx/dx_surfacebitmap.hxx @@ -122,7 +122,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 e535e9b7f871..014de5409e1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1182,7 +1182,7 @@ libo_FUZZ_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 8dfa93bd443f..ae5746ba279a 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -119,7 +119,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 68dbb8ee0df2..4ab6bd5a29e0 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/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index f44f5213b1e7..f0a3fde38fb4 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -208,7 +208,7 @@ namespace canvas This method recomputes the maCurrClipBounds and mbIsCurrClipRectangle members from the current clip and - transformation. IFF the clip changed from rectangular to + transformation. If the clip changed from rectangular to rectangular again, this method issues a sequence of optimized SpriteSurface::updateSprite() calls. @@ -258,22 +258,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 7118006ef71b..6cb3d06e3441 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -71,10 +71,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 21c9d0b1ba2a..159101b14362 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -52,7 +52,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/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h index 0a5f595cbb9d..917b023b72b9 100644 --- a/include/com/sun/star/uno/Any.h +++ b/include/com/sun/star/uno/Any.h @@ -341,7 +341,7 @@ template<> inline Any toAny(Any const & value); @param value a non-null pointer, receiving the extracted value if extraction succeeded (and left unmodified otherwise) - @return true iff extraction succeeded + @return true if extraction succeeded @since LibreOffice 5.3 */ diff --git a/include/comphelper/fileurl.hxx b/include/comphelper/fileurl.hxx index 9275d4abbfc4..7fade5d12e41 100644 --- a/include/comphelper/fileurl.hxx +++ b/include/comphelper/fileurl.hxx @@ -27,7 +27,7 @@ namespace comphelper { -// Return true iff url is an absolute URL of "file" scheme: +// Return true if url is an absolute URL of "file" scheme: COMPHELPER_DLLPUBLIC bool isFileUrl(OUString const & url); } diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index dcca91db86dd..4197e967000c 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); diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx index 0a1bee42f926..9926e186f496 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/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 767727146c63..f77099661b9f 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -294,7 +294,7 @@ JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo( that the changed setting may not be effective immediately.</p> @return - true iff a VM is running. + true if a VM is running. */ JVMFWK_DLLPUBLIC bool jfw_isVMRunning(); diff --git a/include/o3tl/any.hxx b/include/o3tl/any.hxx index 85fd28106419..743b7ac68bfb 100644 --- a/include/o3tl/any.hxx +++ b/include/o3tl/any.hxx @@ -101,7 +101,7 @@ template<typename T> inline boost::optional<T const> tryGetConverted( ">>=" are considered. The returned object is a proxy. Proxies can be either positive or negative. - Each proxy can be contextually converted to bool, yielding true iff the + Each proxy can be contextually converted to bool, yielding true if the proxy is positive. For a positive proxy P representing a value of requested type T, for any T other than void, the expression *P yields that value of type T. (Technically, the proxy is either a plain pointer or a diff --git a/include/onlineupdate/mozilla/TypeTraits.h b/include/onlineupdate/mozilla/TypeTraits.h index 16ef7ddb0cda..5aa6a7d7d2d6 100644 --- a/include/onlineupdate/mozilla/TypeTraits.h +++ b/include/onlineupdate/mozilla/TypeTraits.h @@ -298,7 +298,7 @@ struct IsReference /** * IsArithmetic determines whether a type is arithmetic. A type is arithmetic - * iff it is an integral type or a floating point type. + * if it is an integral type or a floating point type. * * mozilla::IsArithmetic<int>::value is true; * mozilla::IsArithmetic<double>::value is true; @@ -384,7 +384,7 @@ struct IsEmptyHelper /** * IsEmpty determines whether a type is a class (but not a union) that is empty. * - * A class is empty iff it and all its base classes have no non-static data + * A class is empty if it and all its base classes have no non-static data * members (except bit-fields of length 0) and no virtual member functions, and * no base class is empty or a virtual base class. * diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx index 0b2be13fbc30..6be8570bda1c 100644 --- a/include/registry/reader.hxx +++ b/include/registry/reader.hxx @@ -99,7 +99,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 != nullptr; diff --git a/include/registry/typereg_reader.hxx b/include/registry/typereg_reader.hxx index 64c2261f4e0e..440e2c91e601 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 e05b09634ede..a0c458afaff4 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 d4bde04d077e..c324641c6291 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 201f1b15722e..66cc75212c6c 100644 --- a/include/unotools/ucbhelper.hxx +++ b/include/unotools/ucbhelper.hxx @@ -43,7 +43,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 56fc0b4c905e..7e3c32770a56 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 @@ -376,7 +376,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 26c2d449d617..bc3c0d678ec0 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java @@ -66,7 +66,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 dbaf1de9c0d6..94ce8c74da47 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1578,7 +1578,7 @@ uno::Sequence< lang::Locale > SAL_CALL static bool IsEqSvcList( const uno::Sequence< OUString > &rList1, const uno::Sequence< OUString > &rList2 ) { - // returns true iff both sequences are equal + // returns 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 d7ef5623cd4e..f4980e687746 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -56,7 +56,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 52c028c133ba..53fa2079c787 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 a5b761e15d5d..2499f7767b39 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -256,7 +256,7 @@ public: ScDBData* findByIndex(sal_uInt16 nIndex); ScDBData* findByUpperName(const OUString& rName); iterator findByUpperName2(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(const iterator& itr); bool empty() const; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 437264636bc8..a23242893553 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -317,7 +317,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 45b96b5c4464..9416618d85f2 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -565,7 +565,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 8a8cd1eb88da..9380da5c64fd 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 cdcb20b84182..c42ba182a757 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 2b4f3535dfb6..6076eb1513d9 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -438,7 +438,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 initialized! - @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 4e23a6bfeedf..6cad54c61d55 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -168,7 +168,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) @@ -222,7 +222,7 @@ public: virtual void RemoveXmlIdForElement(Metadatable const&) 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 fa34dc6e498a..d99041c5032e 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -278,10 +278,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 @@ -927,7 +927,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/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index d7a36c7aac37..83915fa0367e 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1322,7 +1322,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) // Please fix this comment if you can: Note that the talk about "ODF version" around here is a // bit silly, as there should be nothing ODF-specific in this code, right? What we mean, I - // think, is "ODF version iff it is ODF that is the format the document is being stored as", and + // think, is "ODF version if it is ODF that is the format the document is being stored as", and // otherwise the "ODF version" is ignored. Not sure why such format-specific things needs to be // handled here. Digital signatures then complicate matters further, as it's only ODF 1.2 and // OOXML that have digital signatures. diff --git a/sfx2/source/inc/openuriexternally.hxx b/sfx2/source/inc/openuriexternally.hxx index 42013cd70609..163c2af30e36 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 7a7f63518c32..e0b3106035c5 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -626,7 +626,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 71971b65d0e9..c338a7999ce6 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/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 58ca3fe7c5af..99487da374b4 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1605,7 +1605,7 @@ sub collect_directories_from_filesarray { # Adding the modules to the module list! $alldirectoryhash{$destinationpath}->{'modules'} .= "," . $onefile->{'modules'}; - # Save file's gid iff this directory appears in only a single + # Save file's gid if this directory appears in only a single # file's FILELIST (so that unused directories will be filtered # out in remove_not_required_spellcheckerlanguage_files, based # on gid): diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index f23165e1d7bb..9ffee797df1f 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -463,7 +463,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 b2e41cd36d3d..86c6b9490b7d 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -801,7 +801,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 583c0b925821..33c3526e99b4 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -1982,7 +1982,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 efc13f4483ee..ce413e1b2464 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -897,7 +897,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 9941d97c9cfa..b0ddfdb9694b 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -308,7 +308,7 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const OUString &rName ) namespace { bool 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 0199290ee215..a5cd7e9365ee 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -112,7 +112,7 @@ bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev, } 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 { // Set of symbols, which should be treated as letters in StarMath Font // (to get a normal (non-clipped) SmRect in contrast to the other operators @@ -554,7 +554,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 6772d2ba2a8a..717d5cd7fc00 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -597,7 +597,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 ec712316751e..d712f49bd98a 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -172,14 +172,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 6a4b563a519c..981bce9ff7f2 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -282,7 +282,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 83fbbd2da269..f68137d8e717 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -94,7 +94,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 a3c3ea307233..0d5728612722 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 c590a6e5cab7..64530e3bda17 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -342,7 +342,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 e2b3c08fc15c..ddafc7ac07a5 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -279,7 +279,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 73b134eba59f..08c4ad1974f3 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -523,7 +523,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 e62807df07ad..49619f444ca2 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -5904,7 +5904,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; {NS_sprm::LN_CObjLocation, &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 b8b5eac1853e..adf5661bfa88 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -545,7 +545,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {NS_sprm::LN_CIdCharType, { 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) {NS_sprm::LN_CObjLocation, { 4, L_FIX} }, // "sprmCObjLocation" chp.fcObj;FC;long; {NS_sprm::LN_CFFtcAsciSymb, { 0, L_FIX} }, // "sprmCFFtcAsciSymb" ;;; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 0208a60a13cd..e82ddadd5d63 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -300,7 +300,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 b507c7c2ffac..284a01836a4c 100644 --- a/sw/source/uibase/wrtsh/navmgr.cxx +++ b/sw/source/uibase/wrtsh/navmgr.cxx @@ -123,7 +123,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 98cd4dbccf76..54b47d31b0f6 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -547,7 +547,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 af6f7f911141..1beddadff16b 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 9ca65e65b3b0..f4bebd5e5ce9 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -1208,7 +1208,7 @@ librdf_Repository::createGraph(const uno::Reference< rdf::XURI > & i_xGraphName) ::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/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index b6b74b8eac6e..a0fbc2651b16 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -290,7 +290,7 @@ void Application::Exception( ExceptionCategory nCategory ) 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 7e72c21719ac..0213a15a504a 100644 --- a/vcl/source/filter/jpeg/transupp.c +++ b/vcl/source/filter/jpeg/transupp.c @@ -1505,7 +1505,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 40c89dd83519..e91fea7b8351 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -207,7 +207,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 fc076998fa9b..8596f6c5a102 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4771,7 +4771,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 c086439bbdec..4affcd43fdf4 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); diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index f4696713908e..bcd1262b0726 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -98,7 +98,7 @@ class XMLTextListsHelper 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 2708d37bf18e..0303b14e3611 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -138,7 +138,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 10010ca83ec0..9edc02b1340c 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -223,7 +223,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( |