[Libreoffice-commits] core.git: sd/inc sd/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 1 07:49:35 UTC 2020
sd/inc/stlsheet.hxx | 4 ++--
sd/source/core/stlsheet.cxx | 12 ++++++------
sd/source/ui/annotations/annotationmanager.cxx | 10 +++++-----
sd/source/ui/annotations/annotationmanagerimpl.hxx | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 9742be3aff5436d242d78f71e2b6ec416692f337
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 16:19:22 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Sep 1 09:48:56 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: Id5aa544f169a13b52ebd126a71a7e5b8cc9e4ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101803
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 83bce2472c58..42f6a4e4bde4 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -39,7 +39,7 @@
#include "prlayout.hxx"
-class ModifyListenerForewarder;
+class ModifyListenerForwarder;
struct SfxItemPropertySimpleEntry;
typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
@@ -145,7 +145,7 @@ private:
/** broadcast helper for events */
::cppu::OBroadcastHelper mrBHelper;
- std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
+ std::unique_ptr< ModifyListenerForwarder > mpModifyListenerForwarder;
SdStyleSheet( const SdStyleSheet& ) = delete;
SdStyleSheet& operator=( const SdStyleSheet& ) = delete;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4c4703e188aa..616da711d329 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -106,10 +106,10 @@ static SvxItemPropertySet& GetStylePropertySet()
return aPropSet;
}
-class ModifyListenerForewarder : public SfxListener
+class ModifyListenerForwarder : public SfxListener
{
public:
- explicit ModifyListenerForewarder( SdStyleSheet* pStyleSheet );
+ explicit ModifyListenerForwarder( SdStyleSheet* pStyleSheet );
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
@@ -117,7 +117,7 @@ private:
SdStyleSheet* mpStyleSheet;
};
-ModifyListenerForewarder::ModifyListenerForewarder( SdStyleSheet* pStyleSheet )
+ModifyListenerForwarder::ModifyListenerForwarder( SdStyleSheet* pStyleSheet )
: mpStyleSheet( pStyleSheet )
{
if( pStyleSheet )
@@ -127,7 +127,7 @@ ModifyListenerForewarder::ModifyListenerForewarder( SdStyleSheet* pStyleSheet )
}
}
-void ModifyListenerForewarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
+void ModifyListenerForwarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
if( mpStyleSheet )
mpStyleSheet->notifyModifyListener();
@@ -800,8 +800,8 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
}
else
{
- if (!mpModifyListenerForewarder)
- mpModifyListenerForewarder.reset( new ModifyListenerForewarder( this ) );
+ if (!mpModifyListenerForwarder)
+ mpModifyListenerForwarder.reset( new ModifyListenerForwarder( this ) );
mrBHelper.addListener( cppu::UnoType<XModifyListener>::get(), xListener );
}
}
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 2f2f668a5f3e..80f6fba904c4 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -746,7 +746,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet)
}
}
-void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
+void AnnotationManagerImpl::SelectNextAnnotation(bool bForward)
{
ShowAnnotations( true );
@@ -758,7 +758,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
AnnotationVector aAnnotations( pPage->getAnnotations() );
- if( bForeward )
+ if( bForward )
{
if( xCurrent.is() )
{
@@ -804,7 +804,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
{
do
{
- pPage = GetNextPage( pPage, bForeward );
+ pPage = GetNextPage( pPage, bForward );
if( pPage && !pPage->getAnnotations().empty() )
{
@@ -817,7 +817,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
SfxDispatcher* pDispatcher = getDispatcher( mrBase );
if( pDispatcher )
- pDispatcher->Execute( bForeward ? SID_NEXT_POSTIT : SID_PREVIOUS_POSTIT );
+ pDispatcher->Execute( bForward ? SID_NEXT_POSTIT : SID_PREVIOUS_POSTIT );
return;
}
@@ -828,7 +828,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
// The question text depends on the search direction.
bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress;
const char* pStringId;
- if(bForeward)
+ if(bForward)
pStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW;
else
pStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index a41e8cc88b18..533b6658644c 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -72,7 +72,7 @@ public:
void ExecuteEditAnnotation(SfxRequest const & rReq);
void ExecuteReplyToAnnotation(SfxRequest const & rReq);
- void SelectNextAnnotation(bool bForeward);
+ void SelectNextAnnotation(bool bForward);
void SelectAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bEdit = false );
void GetSelectedAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation );
@@ -106,7 +106,7 @@ public:
void CreateTags();
void DisposeTags();
- SdPage* GetNextPage( SdPage const * pPage, bool bForeward );
+ SdPage* GetNextPage( SdPage const * pPage, bool bForward );
SdPage* GetCurrentPage();
More information about the Libreoffice-commits
mailing list