diff options
| -rw-r--r-- | sd/inc/sdpage.hxx | 2 | ||||
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
| -rw-r--r-- | svx/source/engine3d/view3d.cxx | 10 | ||||
| -rw-r--r-- | svx/source/form/ParseContext.cxx | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index c29d2c84ebe2..4c4c3b9ca88a 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -245,7 +245,7 @@ public: void setTransitionFadeColor( sal_Int32 nTransitionFadeColor ); double getTransitionDuration() const { return mfTransitionDuration;} - void setTransitionDuration( double fTranstionDuration ); + void setTransitionDuration( double fTransitionDuration ); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const ::tools::Rectangle& rOldBoundRect) override; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index b477b03e1930..2f8f36c2b682 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -520,9 +520,9 @@ void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) ActionChanged(); } -void SdPage::setTransitionDuration ( double fTranstionDuration ) +void SdPage::setTransitionDuration ( double fTransitionDuration ) { - mfTransitionDuration = fTranstionDuration; + mfTransitionDuration = fTransitionDuration; ActionChanged(); } diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index c9f64e2c8125..ff9f8538b899 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -2032,7 +2032,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationDialog::createDefaultSet() pSet->setPropertyDefaultValue( nHandleCurrentPage, aEmpty ); pSet->setPropertyDefaultValue( nHandleSoundURL, aEmpty ); - pSet->setPropertyDefaultValue( nHandleSoundVolumne, makeAny( 1.0) ); + pSet->setPropertyDefaultValue( nHandleSoundVolume, makeAny( 1.0) ); pSet->setPropertyDefaultValue( nHandleSoundEndAfterSlide, makeAny( sal_Int32(0) ) ); pSet->setPropertyDefaultValue( nHandleCommand, makeAny( sal_Int16(0) ) ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 64272633505d..ea8ebaed3158 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -58,7 +58,7 @@ const sal_Int32 nHandleTextReverse = 26; const sal_Int32 nHandleCurrentPage = 27; const sal_Int32 nHandleSoundURL = 28; -const sal_Int32 nHandleSoundVolumne = 29; +const sal_Int32 nHandleSoundVolume = 29; const sal_Int32 nHandleSoundEndAfterSlide = 30; const sal_Int32 nHandleCommand = 31; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 5e80435051bd..f7bfc28fca55 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1140,7 +1140,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationPane::createSelectionSet() if( pEffect->getAudio().is() ) { aSoundSource = pEffect->getAudio()->getSource(); - addValue( pSet, nHandleSoundVolumne, makeAny( pEffect->getAudio()->getVolume() ) ); + addValue( pSet, nHandleSoundVolume, makeAny( pEffect->getAudio()->getVolume() ) ); // todo addValue( pSet, nHandleSoundEndAfterSlide, makeAny( pEffect->getAudio()->getEndAfterSlide() ) ); // this is now stored at the XCommand parameter sequence } diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 2a03587f1fe2..f572b92d1c0e 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1573,26 +1573,26 @@ void E3dView::CheckPossibilities() return; const size_t nMarkCnt = GetMarkedObjectCount(); - bool bCoumpound = false; + bool bCompound = false; bool b3DObject = false; - for(size_t nObjs = 0; (nObjs < nMarkCnt) && !bCoumpound; ++nObjs) + for(size_t nObjs = 0; (nObjs < nMarkCnt) && !bCompound; ++nObjs) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(dynamic_cast< const E3dCompoundObject* >(pObj)) - bCoumpound = true; + bCompound = true; if(dynamic_cast< const E3dObject* >(pObj)) b3DObject = true; } // So far: there are two or more of any objects selected. See if // compound objects are involved. If yes, ban grouping. - if(m_bGroupPossible && bCoumpound) + if(m_bGroupPossible && bCompound) m_bGroupPossible = false; if(m_bUnGroupPossible && b3DObject) m_bUnGroupPossible = false; - if(m_bGrpEnterPossible && bCoumpound) + if(m_bGrpEnterPossible && bCompound) m_bGrpEnterPossible = false; } diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index e16b614efba3..d86892ac804a 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -144,7 +144,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS namespace { - ::osl::Mutex& getSafteyMutex() + ::osl::Mutex& getSafetyMutex() { static ::osl::Mutex s_aSafety; return s_aSafety; @@ -177,7 +177,7 @@ namespace OParseContextClient::OParseContextClient() { - ::osl::MutexGuard aGuard( getSafteyMutex() ); + ::osl::MutexGuard aGuard( getSafetyMutex() ); if ( 1 == osl_atomic_increment( &getCounter() ) ) { // first instance getSharedContext( new OSystemParseContext, false ); @@ -187,7 +187,7 @@ OParseContextClient::OParseContextClient() OParseContextClient::~OParseContextClient() { - ::osl::MutexGuard aGuard( getSafteyMutex() ); + ::osl::MutexGuard aGuard( getSafetyMutex() ); if ( 0 == osl_atomic_decrement( &getCounter() ) ) delete getSharedContext(nullptr,true); } |