[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Tue Nov 21 15:43:04 UTC 2017
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 16 +++++-----
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 2 -
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit a32eabb69af9fe7317fac794ec86e82fce178498
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 21 12:40:27 2017 +0000
Ovservation->Observation
Change-Id: I6e02df0d9619394f6a650b9ef6105bca0603c4af
Reviewed-on: https://gerrit.libreoffice.org/45032
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index f21817486544..5e954ddb92e0 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -57,7 +57,7 @@ void SelectionObserver::Context::Abort()
SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter)
- , mbIsOvservationActive(false)
+ , mbIsObservationActive(false)
, mbPageEventOccurred(false)
, maInsertedPages()
{
@@ -69,7 +69,7 @@ SelectionObserver::~SelectionObserver()
void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage)
{
- if ( ! mbIsOvservationActive)
+ if (!mbIsObservationActive)
return;
mbPageEventOccurred = true;
@@ -92,22 +92,22 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage)
void SelectionObserver::StartObservation()
{
- OSL_ASSERT(!mbIsOvservationActive);
+ OSL_ASSERT(!mbIsObservationActive);
maInsertedPages.clear();
- mbIsOvservationActive = true;
+ mbIsObservationActive = true;
}
void SelectionObserver::AbortObservation()
{
- OSL_ASSERT(mbIsOvservationActive);
- mbIsOvservationActive = false;
+ OSL_ASSERT(mbIsObservationActive);
+ mbIsObservationActive = false;
maInsertedPages.clear();
}
void SelectionObserver::EndObservation()
{
- OSL_ASSERT(mbIsOvservationActive);
- mbIsOvservationActive = false;
+ OSL_ASSERT(mbIsObservationActive);
+ mbIsObservationActive = false;
if (!mbPageEventOccurred)
return;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 1daf3593db6c..f65a06bf43e2 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -65,7 +65,7 @@ public:
private:
SlideSorter& mrSlideSorter;
- bool mbIsOvservationActive;
+ bool mbIsObservationActive;
bool mbPageEventOccurred;
::std::vector<const SdPage*> maInsertedPages;
More information about the Libreoffice-commits
mailing list