[Libreoffice-commits] core.git: framework/inc include/o3tl include/unotools sfx2/source starmath/source svx/source unotools/source vcl/source
Julien Nabet
serval2412 at yahoo.fr
Sat Jan 24 09:54:16 PST 2015
framework/inc/dispatch/closedispatcher.hxx | 2 +-
include/o3tl/cow_wrapper.hxx | 2 +-
include/unotools/configvaluecontainer.hxx | 2 +-
sfx2/source/control/templatelocalview.cxx | 12 ++++++------
starmath/source/view.cxx | 2 +-
svx/source/form/fmscriptingenv.cxx | 16 ++++++++--------
svx/source/inc/fmshimp.hxx | 2 +-
unotools/source/config/configvaluecontainer.cxx | 2 +-
vcl/source/filter/FilterConfigItem.cxx | 4 ++--
vcl/source/gdi/pdfextoutdevdata.cxx | 2 +-
vcl/source/window/floatwin.cxx | 2 +-
11 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 58702f9a3c1435dc082f9aceea00f8804de34ff6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Jan 24 18:53:37 2015 +0100
Typo: syncro->synchro
Change-Id: I0a377f3686e0f8d8f576aacbee49a392b039d3a5
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 192e2e8..25c19f1 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -91,7 +91,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
are not aware, that her request can kill its own environment ... */
boost::scoped_ptr<vcl::EventPoster> m_aAsyncCallback;
- /** @short used inside asyncronous callback to decide,
+ /** @short used inside asynchronous callback to decide,
which operation must be executed. */
EOperation m_eOperation;
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index b54f99d..7f11c55 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -83,7 +83,7 @@ namespace o3tl
Regarding thread safety: this wrapper is <em>not</em>
thread-safe per se, because cow_wrapper has no way of
- syncronizing the potentially many different cow_wrapper
+ synchronizing the potentially many different cow_wrapper
instances, that reference a single shared value_type
instance. That said, when passing
<code>ThreadSafeRefCountingPolicy</code> as the
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index c06f172..7ec278c 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -40,7 +40,7 @@ namespace utl
<p>The basic idea of this class is that it's clients (usually derived classes) simply register an
address in memory and a node path, and upon explicit request, the configuration value and the memory
- are syncronized.<br/>
+ are synchronized.<br/>
This means that when calling <method>read</method>, the current configuration values are copied into
the memory registered for them, and upon calling <method>write</method> the current values in memory
are set in the configuration nodes.</p>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 7fa5f06..ad14ae8 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -314,7 +314,7 @@ bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId)
}
else
{
- // Syncronize regions cache ids with SfxDocumentTemplates
+ // Synchronize regions cache ids with SfxDocumentTemplates
if (nRegionId != USHRT_MAX && (*pRegionIt)->mnRegionId > nRegionId)
--(*pRegionIt)->mnRegionId;
@@ -325,7 +325,7 @@ bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId)
if (nRegionId == USHRT_MAX)
return false;
- // Syncronize view regions ids with SfxDocumentTemplates
+ // Synchronize view regions ids with SfxDocumentTemplates
std::vector<ThumbnailViewItem*>::iterator pViewIt = mItemList.begin();
for ( pViewIt = mItemList.begin(); pViewIt != mItemList.end(); ++pViewIt)
{
@@ -434,7 +434,7 @@ bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_
}
else
{
- // Keep region document id syncronized with SfxDocumentTemplates
+ // Keep region document id synchronized with SfxDocumentTemplates
if (aIter->nDocId > pViewItem->mnDocId)
--aIter->nDocId;
@@ -442,7 +442,7 @@ bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_
}
}
- // Keep view document id syncronized with SfxDocumentTemplates
+ // Keep view document id synchronized with SfxDocumentTemplates
std::vector<ThumbnailViewItem*>::iterator pItemIter = mItemList.begin();
for (; pItemIter != mItemList.end(); ++pItemIter)
{
@@ -533,7 +533,7 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s
}
else
{
- // Keep region document id syncronized with SfxDocumentTemplates
+ // Keep region document id synchronized with SfxDocumentTemplates
if (pPropIter->nDocId > pViewItem->mnDocId)
--pPropIter->nDocId;
@@ -541,7 +541,7 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s
}
}
- // Keep view document id syncronized with SfxDocumentTemplates
+ // Keep view document id synchronized with SfxDocumentTemplates
std::vector<ThumbnailViewItem*>::iterator pItemIter = mItemList.begin();
for (; pItemIter != mItemList.end(); ++pItemIter)
{
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 9a66da7..6602586 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1990,7 +1990,7 @@ void SmViewShell::Activate( bool bIsMDIActivate )
{
//! Since there is no way to be informed if a "drag and drop"
//! event has taken place, we call SetText here in order to
- //! syncronize the GraphicWindow display with the text in the
+ //! synchronize the GraphicWindow display with the text in the
//! EditEngine.
SmDocShell *pDoc = GetDoc();
pDoc->SetText( pDoc->GetEditEngine().GetText( LINEEND_LF ) );
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index fb352bc..70a9480 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -127,13 +127,13 @@ namespace svxform
a clearable guard to our mutex. Must be the only active guard to our mutex.
@param _rEvent
the event to fire
- @param _pSyncronousResult
+ @param _pSynchronousResult
a place to take a possible result of the script call.
@precond
m_pScriptExecutor is not <NULL/>.
*/
- void impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult );
+ void impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult );
private:
DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
@@ -156,7 +156,7 @@ namespace svxform
virtual ~FormScriptingEnvironment();
// callback for FormScriptListener
- void doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSyncronousResult );
+ void doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSynchronousResult );
// IFormScriptingEnvironment
virtual void registerEventAttacherManager( const Reference< XEventAttacherManager >& _rxManager ) SAL_OVERRIDE;
@@ -715,12 +715,12 @@ namespace svxform
}
- void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult )
+ void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult )
{
OSL_PRECOND( m_pScriptExecutor, "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" );
_rGuard.clear();
- m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult );
+ m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSynchronousResult );
}
@@ -898,11 +898,11 @@ namespace svxform
}
- void FormScriptingEnvironment::doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSyncronousResult )
+ void FormScriptingEnvironment::doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSynchronousResult )
{
#if !HAVE_FEATURE_SCRIPTING
(void) _rEvent;
- (void) _pSyncronousResult;
+ (void) _pSynchronousResult;
(void) m_rFormModel;
#else
SolarMutexClearableGuard aSolarGuard;
@@ -973,7 +973,7 @@ namespace svxform
aSolarGuard.clear();
Any aIgnoreResult;
- pScript->invoke( _rEvent.Arguments, _pSyncronousResult ? *_pSyncronousResult : aIgnoreResult );
+ pScript->invoke( _rEvent.Arguments, _pSynchronousResult ? *_pSynchronousResult : aIgnoreResult );
pScript.reset();
{
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index ebb29c9..107311d 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -518,7 +518,7 @@ private:
SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
- // asyncronous cursor actions/navigation slot handling
+ // asynchronous cursor actions/navigation slot handling
public:
/** execute the given form slot
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 8a185b4..cf22ae9 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -147,7 +147,7 @@ namespace utl
//= functors on NodeValueAccessor instances
- /// base class for functors syncronizing between exchange locations and config sub nodes
+ /// base class for functors synchronizing between exchange locations and config sub nodes
struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void >
{
protected:
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index f0a431b..156dc67 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -122,8 +122,8 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree )
// creation arguments: commit mode
PropertyValue aModeArgument;
- bool bAsyncron = true;
- aAny <<= bAsyncron;
+ bool bAsynchron = true;
+ aAny <<= bAsynchron;
aModeArgument.Name = "lazywrite";
aModeArgument.Value = aAny;
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index ea3b130..ec0a416 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -582,7 +582,7 @@ void PDFExtOutDevData::PlayGlobalActions( PDFWriter& rWriter )
mpGlobalSyncData->PlayGlobalActions( rWriter );
}
-/* global actions, syncronisation to the recorded metafile isn't needed,
+/* global actions, synchronisation to the recorded metafile isn't needed,
all actions will be played after the last page was recorded
*/
//--->i56629
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 3734081..f7089c1 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -567,7 +567,7 @@ void FloatingWindow::ImplCallPopupModeEnd()
// PopupMode is finished
mbInPopupMode = false;
- // call Handler asyncron.
+ // call Handler asynchron.
if ( !mnPostId )
mnPostId = Application::PostUserEvent( LINK( this, FloatingWindow, ImplEndPopupModeHdl ) );
}
More information about the Libreoffice-commits
mailing list