diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2015-02-09 10:45:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-09 16:20:09 +0000 |
commit | 81cb993127d0e399b1c9888fe4f4655b831593d9 (patch) | |
tree | 9b705d165a2734ddd5bae2bb95ebe0742e3dd0fe | |
parent | 3a70ae03fee12e6b8ed87afba1095bc78f9a9812 (diff) |
Fix of a few typos
Change-Id: Ib2a311f0341d165a8f9d3f7a11ec36378fd69519
Reviewed-on: https://gerrit.libreoffice.org/14373
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | UnoControls/source/controls/progressmonitor.cxx | 4 | ||||
-rw-r--r-- | framework/inc/classes/wildcard.hxx | 2 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 4 | ||||
-rw-r--r-- | include/svx/svdmrkv.hxx | 2 | ||||
-rw-r--r-- | qadevOOo/runner/base/java_complex.java | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/container/_XNameReplace.java | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index df93a695c2d2..a2f19c350da3 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -862,12 +862,12 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, b if ( pSearchItem->sTopic == rTopic ) { - // We have found this topic ... return a valid pointer. + // We have found this topic... return a valid pointer. return pSearchItem; } } - // We have'nt found this topic ... return a nonvalid pointer. + // We haven't found this topic... return a nonvalid pointer. return NULL; } diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index 758fcae8fb27..c2bef274b3ab 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -28,7 +28,7 @@ namespace framework{ @short implement wildcard-mechanism for unicode @descr This class can be used to get information about the matching of a pattern to a given text. It's suitable for 8-Bit- AND 16-Bit-strings! - @ATTENTION This class is'nt threadsafe! + @ATTENTION This class isn't threadsafe! @devstatus deprecated *//*-*************************************************************************************************************/ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 5cdb57e50c0c..587a058965dc 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -680,7 +680,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw @seealso method getActiveFrame() @param "xFrame", reference to new active child. It must be an already existing child! - @onerror An assertion is thrown and element is ignored, if given frame is'nt already a child of us. + @onerror An assertion is thrown and element is ignored, if given frame isn't already a child of us. *//*-*****************************************************************************************************/ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) { @@ -702,7 +702,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra aWriteLock.clear(); /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - // Don't work, if "new" active frame is'nt different from current one! + // Don't work, if "new" active frame isn't different from current one! // (xFrame==NULL is allowed to UNSET it!) if( xActiveChild != xFrame ) { diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index e723a3768992..78d7e8494418 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -463,7 +463,7 @@ public: // - Hit tolarances: -// It have to be declared in logical coordinates. So please translate the +// It has to be declared in logical coordinates. So please translate the // wanted pixel value with PixelToLogic in Logical values. // Taking as example a logical value of 100: // - For a horizontal hairline (Object with height 0), the generated data is +/-100, i.e. diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java index b5cafa1041ab..f1f669825474 100644 --- a/qadevOOo/runner/base/java_complex.java +++ b/qadevOOo/runner/base/java_complex.java @@ -68,7 +68,7 @@ public class java_complex implements TestBase // the concept of the TimeOut depends on runner logs. If the runner log, // for example to start a test method, the timeout was reset. This is not // while the test itself log something like "open document...". -// An property of complex test could be that it have only one test method +// A property of complex test could be that it has only one test method // which works for several minutes. In this case the TimeOut get not trigger // and the office was killed. // In complex tests just use "ThreadTimeOut" as timeout. diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/tests/java/ifc/container/_XNameReplace.java index 1d593a83efff..c05f7f2f2a2c 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XNameReplace.java @@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime; * <li> <code>'NAMEREPLACE'</code> <b>optional</b>: <code>String</code> * relation which represents element name to be replaced. * Some Objects can't replace the firsr that comes along, i.e. -* SwXStyleFamily. It have some pool styles which can't be replaced. +* SwXStyleFamily. It has some pool styles which can't be replaced. * So the test need a special object to replace it by name. </li> * <li> <code>'XNameReplaceINDEX'</code> : For internal test * usage. Contains current thread number. </li> @@ -110,7 +110,7 @@ public class _XNameReplace extends MultiMethodTest { XNameAccess.class, oObj); oNames = oNameAccess.getElementNames(); /* Some Objects can't replace the firsr that comes along, i.e. - SwXStyleFamily. It have some pool styles which can't be replaced. + SwXStyleFamily. It has some pool styles which can't be replaced. So the test need a special object to replace it by name. */ log.println("get ObjRelation(\"NAMEREPLACE\")"); |