[Libreoffice-commits] core.git: desktop/win32 framework/source np_sdk/inc np_sdk/mozsrc sal/inc sc/qa ucbhelper/source
Julien Nabet
serval2412 at yahoo.fr
Sat Feb 23 07:53:43 PST 2013
desktop/win32/source/applauncher/launcher.cxx | 2 +-
desktop/win32/source/wrapper.h | 4 ++--
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2 +-
np_sdk/inc/npfunctions.h | 4 ++--
np_sdk/mozsrc/npupp.h | 4 ++--
sal/inc/osl/file.h | 4 ++--
sc/qa/unit/subsequent_filters-test.cxx | 4 ++--
ucbhelper/source/client/content.cxx | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e3f141323eea90259248cef4576ddb267b9c2d06
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Feb 23 16:51:36 2013 +0100
Fix typos retreive/retrieve furture/future
Change-Id: I639c2970b2a88ca3d5aa1dcd2ad4ec047b4a369c
diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index c504af4..b09068d 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -78,7 +78,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
}
FreeLibrary(hinstDll);
- // Retreive startup info
+ // Retrieve startup info
STARTUPINFO aStartupInfo;
diff --git a/desktop/win32/source/wrapper.h b/desktop/win32/source/wrapper.h
index eb8f7b2..17b8106 100644
--- a/desktop/win32/source/wrapper.h
+++ b/desktop/win32/source/wrapper.h
@@ -64,7 +64,7 @@
extern "C" int Main()
{
- // Retreive startup info
+ // Retrieve startup info
STARTUPINFO aStartupInfo;
@@ -94,7 +94,7 @@ extern "C" int Main()
_tsplitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
_tmakepath( szApplicationName, szDrive, szDir, szFileName, BIN_EXT_STR );
- // Retreive actual environment
+ // Retrieve actual environment
TCHAR szBuffer[1024];
TCHAR szPathValue[1024] = TEXT("");
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 3bf232c..1c3852a 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1242,7 +1242,7 @@ void ToolbarLayoutManager::implts_reparentToolbars()
uno::Reference< awt::XWindow > xWindow;
try
{
- // We have to retreive the window reference with try/catch as it is
+ // We have to retrieve the window reference with try/catch as it is
// possible that all elements have been disposed!
xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY );
}
diff --git a/np_sdk/inc/npfunctions.h b/np_sdk/inc/npfunctions.h
index 90faa3c..6430533 100644
--- a/np_sdk/inc/npfunctions.h
+++ b/np_sdk/inc/npfunctions.h
@@ -214,11 +214,11 @@ typedef struct _NPNetscapeFuncs {
#ifdef XP_MACOSX
/*
* Mac OS X version(s) of NP_GetMIMEDescription(const char *)
- * These can be called to retreive MIME information from the plugin dynamically
+ * These can be called to retrieve MIME information from the plugin dynamically
*
* Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
* to get mime info from the plugin only on OSX and may not be supported
- * in furture version -- use NP_GetMIMEDescription instead
+ * in future version -- use NP_GetMIMEDescription instead
*/
enum
{
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
index 75fbdc2..320aa74 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/mozsrc/npupp.h
@@ -1161,11 +1161,11 @@ typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*,
/*
* Mac version(s) of NP_GetMIMEDescription(const char *)
- * These can be called to retreive MIME information from the plugin dynamically
+ * These can be called to retrieve MIME information from the plugin dynamically
*
* Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
* to get mime info from the plugin only on OSX and may not be supported
- * in furture version--use NP_GetMIMEDescription instead
+ * in future version--use NP_GetMIMEDescription instead
*/
enum
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index 8730270..e8277e2 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -361,7 +361,7 @@ typedef enum {
#define osl_File_Attribute_OthRead 0x00001000
#define osl_File_Attribute_OthExe 0x00002000
-/* Flags specifying which fields to retreive by osl_getFileStatus */
+/* Flags specifying which fields to retrieve by osl_getFileStatus */
#define osl_FileStatus_Mask_Type 0x00000001
#define osl_FileStatus_Mask_Attributes 0x00000002
@@ -545,7 +545,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getVolumeDeviceMountPath(
#define osl_Volume_Attribute_Case_Is_Preserved 0x00000040L
#define osl_Volume_Attribute_Case_Sensitive 0x00000080L
-/* Flags specifying which fields to retreive by osl_getVolumeInfo */
+/* Flags specifying which fields to retrieve by osl_getVolumeInfo */
#define osl_VolumeInfo_Mask_Attributes 0x00000001L
#define osl_VolumeInfo_Mask_TotalSpace 0x00000002L
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 7bec114..830116a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1329,10 +1329,10 @@ void ScFiltersTest::testChartImportODS()
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
CPPUNIT_ASSERT_MESSAGE("Failed to retrieve the drawing layer object.", pDrawLayer);
const SdrPage* pPage = pDrawLayer->GetPage(1); // for the 2nd sheet.
- CPPUNIT_ASSERT_MESSAGE("Failed to retreive the page object.", pPage);
+ CPPUNIT_ASSERT_MESSAGE("Failed to retrieve the page object.", pPage);
CPPUNIT_ASSERT_MESSAGE("This page should contain one drawing object.", pPage->GetObjCount() == 1);
const SdrObject* pObj = pPage->GetObj(0);
- CPPUNIT_ASSERT_MESSAGE("Failed to retreive the drawing object.", pObj);
+ CPPUNIT_ASSERT_MESSAGE("Failed to retrieve the drawing object.", pObj);
CPPUNIT_ASSERT_MESSAGE("This is not an OLE2 object.", pObj->GetObjIdentifier() == OBJ_OLE2);
const SdrOle2Obj& rOleObj = static_cast<const SdrOle2Obj&>(*pObj);
CPPUNIT_ASSERT_MESSAGE("This should be a chart object.", rOleObj.IsChart());
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index a32f3bb..18219f5 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1045,7 +1045,7 @@ sal_Bool Content::isFolder()
ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
rtl::OUString(
- "Unable to retreive value of property 'IsFolder'!" ),
+ "Unable to retrieve value of property 'IsFolder'!" ),
get() ) ),
m_xImpl->getEnvironment() );
@@ -1066,7 +1066,7 @@ sal_Bool Content::isDocument()
ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
rtl::OUString(
- "Unable to retreive value of property 'IsDocument'!" ),
+ "Unable to retrieve value of property 'IsDocument'!" ),
get() ) ),
m_xImpl->getEnvironment() );
More information about the Libreoffice-commits
mailing list