[Libreoffice-commits] core.git: fpicker/source framework/inc framework/qa
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Oct 1 04:26:57 PDT 2015
fpicker/source/win32/filepicker/FileOpenDlg.hxx | 2 +-
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 8 ++++----
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 2 +-
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 2 +-
fpicker/source/win32/filepicker/getfilenamewrapper.cxx | 4 ++--
framework/inc/classes/propertysethelper.hxx | 2 +-
framework/inc/dispatch/closedispatcher.hxx | 4 ++--
framework/inc/dispatch/interceptionhelper.hxx | 4 ++--
framework/inc/helper/statusindicator.hxx | 2 +-
framework/inc/services/desktop.hxx | 10 +++++-----
framework/inc/threadhelp/gate.hxx | 6 +++---
framework/inc/threadhelp/transactionguard.hxx | 2 +-
framework/inc/threadhelp/transactionmanager.hxx | 2 +-
framework/inc/xml/acceleratorconfigurationwriter.hxx | 2 +-
framework/qa/complex/api_internal/CheckAPI.java | 6 +++---
15 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit a0649f316ec53e878b5c9ffef67adb712fe9935f
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Oct 1 13:22:58 2015 +0200
Fix typos
Change-Id: Id94c03249b2752e88499628b3ad12936b361bb2f
Reviewed-on: https://gerrit.libreoffice.org/18950
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
Tested-by: Oliver Specht <oliver.specht at cib.de>
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 92410ea..8f532b3 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -123,7 +123,7 @@ class CFileOpenDialog
{
public:
// ctor
- // bFileOpenDialog idicates if we want a FileOpen or FileSave
+ // bFileOpenDialog indicates if we want a FileOpen or FileSave
// dialog
// dwFlags see OPENFILENAME
// dwTemplateId - an ID for custom templates
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 08d947e..88d7aea 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1042,7 +1042,7 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)
::sal_Int16 nAction = rRequest->getArgumentOrDefault(PROP_CONTROL_ACTION, INVALID_CONTROL_ACTION);
css::uno::Any aValue = rRequest->getArgumentOrDefault(PROP_CONTROL_VALUE , css::uno::Any() );
- // dont check for right values here ...
+ // don't check for right values here ...
// most parameters are optional !
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -1115,7 +1115,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
{
::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );
- // dont check for right values here ...
+ // don't check for right values here ...
// most parameters are optional !
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -1151,7 +1151,7 @@ void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)
::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );
OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, OUString() );
- // dont check for right values here ...
+ // don't check for right values here ...
// most parameters are optional !
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -1171,7 +1171,7 @@ void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)
::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );
sal_Bool bEnabled = rRequest->getArgumentOrDefault(PROP_CONTROL_ENABLE, (sal_Bool)sal_True);
- // dont check for right values here ...
+ // don't check for right values here ...
// most parameters are optional !
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d852249..479d23d 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -566,7 +566,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
{
- // set the labels for all extendet controls
+ // set the labels for all extended controls
sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd));
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index f9cdd88..8ec5462 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -152,7 +152,7 @@ void SAL_CALL CAsyncEventNotifier::shutdown()
SetEvent(m_ResumeNotifying);
SetEvent(m_NotifyEvent);
- // releas the mutex here because the event
+ // release the mutex here because the event
// notifier thread may need it to finish
aGuard.clear();
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 35b8422..e8868b6 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -156,8 +156,8 @@ namespace /* private */
}
- // exceutes GetOpenFileName/GetSaveFileName in
- // a separat thread
+ // executes GetOpenFileName/GetSaveFileName in
+ // a separate thread
bool ThreadExecGetFileName(LPOPENFILENAME lpofn, bool bOpen, /*out*/ int& ExtErr)
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 241bfaf..0c15bb1 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -91,7 +91,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
/** set a new owner for this helper.
*
* This owner is used as source for all broadcasted events.
- * Further we hold it weak, because we dont wish to be disposed() .-)
+ * Further we hold it weak, because we don't wish to be disposed() .-)
*/
void impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster);
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index edce4d7..395b541 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -161,9 +161,9 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
/** @short a callback for asynchronous started operations.
- @descr As already mentione, we make internally all operations
+ @descr As already mentioned, we make internally all operations
asynchronous. Otherwise our callis kill its own environment
- during they call us ...
+ during they call us...
*/
DECL_LINK_TYPED( impl_asyncCallback, LinkParamNone*, void );
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index e2a9ad9..765fd4d 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -255,8 +255,8 @@ class InterceptionHelper : public ::cppu::WeakImplHelper<
/** @short Is called from our owner frame, in case he will be disposed.
- @descr We have to relaease all references to him then.
- Normally we will die by ref count too ...
+ @descr We have to release all references to him then.
+ Normally we will die by ref count too...
*/
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 032d244..62ba091 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -61,7 +61,7 @@ class StatusIndicator : public ::cppu::WeakImplHelper< css::task::XStatusIndica
/** @short weak reference to our factory
@descr All our interface calls will be forwarded
to a suitable c++ interface on this factory.
- But we dont hold our factory alive. They
+ But we don't hold our factory alive. They
correspond with e.g. with a Frame service and
will be owned by him. If the frame will be closed
he close our factory too ...
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 1d47522..3668429 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -429,7 +429,7 @@ class Desktop : private cppu::BaseMutex,
/** special terminate listener which loads images asynchronous for current open documents.
* Because internally it uses blocking system APIs ... it can't be guaranteed that
* running jobs can be cancelled successfully if the corressponding document will be closed ...
- * it will not hinder those documents on closing. Instead it let all jobs running ...
+ * it will not hinder those documents on closing. Instead it let all jobs running...
* but at least on terminate we have to wait for all those blocked requests.
* So these implementation must be a special terminate listener too .-(
*/
@@ -437,13 +437,13 @@ class Desktop : private cppu::BaseMutex,
/** special terminate listener shuting down the SfxApplication.
* Because these desktop instance closes documents and informs listener
- * only ... it does not really shutdown the whole application.
+ * only... it does not really shutdown the whole application.
*
- * Btw: That wouldnt be possible by design ... because Desktop.terminate()
- * has to return a boolean value about success ... it can't really shutdown the
+ * Btw: that wouldn't be possible by design... because Desktop.terminate()
+ * has to return a boolean value about success... it can't really shutdown the
* process .-)
*
- * So we uses a trick: A special listener (exactly these one here) listen for notifyTermination()
+ * So we uses a trick: a special listener (exactly these one here) listen for notifyTermination()
* and shutdown the process asynchronous. But desktop has to make this special
* notification as really last one ... Otherwise it can happen that asynchronous
* shutdown will be faster then all other code around Desktop.terminate() .-))
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 5917d3f..cb4a3fb 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -122,10 +122,10 @@ class Gate : private boost::noncopyable
if( m_bClosed )
{
// Then we must release used access lock -
- // because next call will block ...
- // and if we hold the access lock nobody else can use this object without a dadlock!
+ // because next call will block...
+ // and if we hold the access lock nobody else can use this object without a deadlock!
aLock.clear();
- // Wait for opening gate ...
+ // Wait for opening gate...
bSuccessful = ( m_aPassage.wait( pTimeOut ) == ::osl::Condition::result_ok );
}
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 543fe05..5c96595 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -27,7 +27,7 @@ namespace framework{
/*-************************************************************************************************************
@short implement a guard to support non breakable transactions
- @descr If you wish to support non breakable method calls without lockingf any mutex, rw-lock or
+ @descr If you wish to support non breakable method calls without locking any mutex, rw-lock or
something like that - you should use this guard implementation.
Initialize it at first in your method and don't release it till end of your function!
Your "transaction" is registered in ctor and automatically released in dtor.
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index b48ff30..393e130 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -66,7 +66,7 @@ enum ERejectReason
/*-************************************************************************************************************
@descr A transaction object should support throwing exceptions if user used it at wrong working mode.
e.g. We can throw a DisposedException if user try to work and our mode is E_CLOSE!
- But sometimes he dont need this feature - will handle it by himself.
+ But sometimes he doesn't need this feature - will handle it by himself.
Then we must differ between some exception-modi:
E_HARDEXCEPTIONS We throw exceptions for all working modes different from E_WORK!
E_SOFTEXCEPTIONS We throw exceptions for all working modes different from E_WORK AND E_INCLOSE!
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index c9f4324..d46b2e9 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -48,7 +48,7 @@ class AcceleratorConfigurationWriter
/** @short is used to map key codes to its
string representation.
- @descr To perform this operatio is
+ @descr To perform this operation is
created only one times and holded
alive forever ...*/
::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index 4b02188..7fd434e 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -39,9 +39,9 @@ import com.sun.star.task.XJob;
import com.sun.star.uno.UnoRuntime;
/**
- * This test executes the API tests internally in StarOffice. Prerequiste is
- * that a OOoRunner.jar is registered inseide of StarOffice. Adjust the joblist
- * inside of the ChekAPI.props to determine which tests will be executed.
+ * This test executes the API tests internally in LibreOffice. Prerequiste is
+ * that a OOoRunner.jar is registered inside of LibreOffice. Adjust the joblist
+ * inside of the CheckAPI.props to determine which tests will be executed.
*/
public class CheckAPI {
More information about the Libreoffice-commits
mailing list