diff options
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/ole/VisualBasic/Module1.vb | 2 | ||||
| -rw-r--r-- | extensions/test/pgp/readme.txt | 2 | ||||
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 2 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 2 | ||||
| -rw-r--r-- | include/sfx2/shell.hxx | 2 | ||||
| -rw-r--r-- | qadevOOo/tests/java/ifc/frame/_XFrame.java | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/DocumentLayoutManager.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 2 | ||||
| -rw-r--r-- | wizards/com/sun/star/wizards/web/WWD_Events.py | 2 |
11 files changed, 12 insertions, 10 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 86adb0289ff2..bc2319fef812 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1481,7 +1481,7 @@ short UpdateRequiredDialog::Execute() //be disabled because they are in a read only repository. However, disabling extensions //is now always possible because the registration data of all repositories //are in the user installation. - //Therfore all extensions could be displayed and all the handling around m_bHasLockedEntries + //Therefore all extensions could be displayed and all the handling around m_bHasLockedEntries //could be removed. if ( m_bHasLockedEntries ) { diff --git a/extensions/test/ole/VisualBasic/Module1.vb b/extensions/test/ole/VisualBasic/Module1.vb index 4295ee64eb28..ae3ca7fa4c93 100644 --- a/extensions/test/ole/VisualBasic/Module1.vb +++ b/extensions/test/ole/VisualBasic/Module1.vb @@ -201,7 +201,7 @@ Public Sub Main() objOleTest.testout_methodUHyper(outUHyper)
objOleTest.testout_methodString(outString)
objOleTest.testout_methodChar(outChar)
- 'outCharAsString is a string. Therfore the returned sal_Unicode value of 65 will be converted
+ 'outCharAsString is a string. Therefore the returned sal_Unicode value of 65 will be converted
'to a string "65"
objOleTest.testout_methodChar(outCharAsString)
objOleTest.testout_methodAny(outAny)
diff --git a/extensions/test/pgp/readme.txt b/extensions/test/pgp/readme.txt index bb5943474bf4..ccb26d365b48 100644 --- a/extensions/test/pgp/readme.txt +++ b/extensions/test/pgp/readme.txt @@ -23,7 +23,7 @@ Please note the semicolons! Office/user/config/javarc under SystemClasspath. -There is a bug with jdk1.1.8, therfore use 1.2 instead. +There is a bug with jdk1.1.8, therefore use 1.2 instead. The TestPGP is called without ;iiop; : diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 4c55ecec1baf..f78714e366c0 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0)) $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ external/libvisio/vsd-msvc-max.patch.1 \ external/libvisio/ubsan.patch \ + external/libvisio/char-background.patch \ + external/libvisio/import-theme-color.patch \ )) ifeq ($(COM_GCC_IS_CLANG),TRUE) diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 076dcb620a0a..464b302d169c 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -244,7 +244,7 @@ bool MenuBarMerger::ReplaceMenuItem( const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { - // There is no replace available. Therfore we first have to + // There is no replace available. Therefore we first have to // remove the old menu entry, pMenu->RemoveItem( nPos ); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 43c79d29088c..aae874ac2bc9 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -513,7 +513,7 @@ public: this must be set directly from one derived SfxShell class and ny derivatives of SfxObjectShell. - The SfxShell class itself does not have any SfxItemPool, therfore a + The SfxShell class itself does not have any SfxItemPool, therefore a null-pointer is returned. */ SfxItemPool& SfxShell::GetPool() const diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java index 6d462eb983bf..137405d7bbda 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrame.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java @@ -454,7 +454,7 @@ public class _XFrame extends MultiMethodTest { * Test calls the method, then result is checked.<p> * Has <b> OK </b> status if method returns true, and values, set by the * method are nulls, or if method returns false, and values are not changed. - * This method destroy the object. Therfore all other methods have to be + * This method destroy the object. Therefore all other methods have to be * executed before : * <ul> * <li> <code> getName() </code> diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 14dc9ab54ced..13e50de4b859 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -343,7 +343,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat( SwDoc* pSrcDoc = const_cast<SwDoc*>(rSource.GetDoc()); // May we copy this object? - // We may, unless it's 1) it's a control (and therfore a draw) + // We may, unless it's 1) it's a control (and therefore a draw) // 2) anchored in a header/footer // 3) anchored (to paragraph?) bool bMayNotCopy = false; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index bb451899c2ff..877a111b9cf1 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2461,7 +2461,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) // This happens only for percentage values for the table itself. // In this case, the columns get the correct width even if the // the sum of the relative withs is smaller than the available - // width in TWIP. Therfore, we can use the relative width. + // width in TWIP. Therefore, we can use the relative width. nWidth = nRelWidth > USHRT_MAX ? USHRT_MAX : nRelWidth; } if( nRelWidth != nWidth && nRelWidth && nCols ) diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5c90ae2600b8..c70bc1bff2f6 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -428,7 +428,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, do { //get the intermediate certificate - //the returned value is const ! Therfore it does not need to be freed + //the returned value is const ! Therefore it does not need to be freed //with ne_ssl_cert_free, which takes a non-const argument issuerCert = ne_ssl_cert_signedby( issuerCert ); if ( NULL == issuerCert ) diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py index ed37193853aa..fbe439a86df4 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.py +++ b/wizards/com/sun/star/wizards/web/WWD_Events.py @@ -41,7 +41,7 @@ from com.sun.star.container import NoSuchElementException ''' This class implements the ui-events of the web wizard. -it is therfore sorted to steps. +it is therefore sorted to steps. not much application-logic here - just plain methods which react to events. The only exception are the finish methods with the save |