summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2019-08-19 01:30:26 +0800
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2019-08-19 22:56:40 +0800
commit739c370522df4d48898b924e3c29957054f71a78 (patch)
tree58d2dc1ff49f8638198ccebec28d58cfe3db70fa /sd/source
parent147ae53b68844aa1b088926931f958e30888ffda (diff)
uitest: pass OUString by const reference and formatting fixes
Change-Id: I55eca745a84998c74e2d925ed53af20382d98289
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx11
-rw-r--r--sd/source/ui/slidesorter/model/SlideSorterModel.cxx9
2 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a97ccb7d0588..069836e790cb 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -113,12 +113,12 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet);
namespace {
-void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString& action)
+void collectUIInformation(const std::map<OUString, OUString>& aParameters, const OUString& rAction)
{
EventDescription aDescription;
aDescription.aID = "impress_win_or_draw_win";
aDescription.aParameters = aParameters;
- aDescription.aAction = action;
+ aDescription.aAction = rAction;
aDescription.aKeyWord = "ImpressWindowUIObject";
aDescription.aParent = "MainWindow";
@@ -938,7 +938,7 @@ void SlotManager::RenameSlide(const SfxRequest& rRequest)
}
OUString aNewName;
aNameDlg->GetName( aNewName );
- collectUIInformation({{"OldName",aOldName},{"NewName",aNewName}},"RENAME");
+ collectUIInformation({{"OldName", aOldName}, {"NewName", aNewName}}, "RENAME");
aNameDlg.disposeAndClear();
}
// Tell the slide sorter about the name change (necessary for
@@ -1105,7 +1105,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
PageSelector::UpdateLock aUpdateLock (mrSlideSorter);
mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
mrSlideSorter.GetController().GetPageSelector().SelectPage(pNewPage);
- collectUIInformation({{"POS", OUString::number(nInsertionIndex+2)}},"Insert_New_Page_or_Slide");
+ collectUIInformation({{"POS", OUString::number(nInsertionIndex + 2)}}, "Insert_New_Page_or_Slide");
}
void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
@@ -1152,7 +1152,8 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
{
rSelector.SelectPage(it);
}
- collectUIInformation({{"POS", OUString::number(nInsertPosition+2)}},"Duplicate");
+
+ collectUIInformation({{"POS", OUString::number(nInsertPosition + 2)}}, "Duplicate");
}
void SlotManager::ChangeSlideExclusionState (
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 7811c3b08e68..5b9f41fea0d8 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -106,12 +106,12 @@ namespace {
namespace {
-void collectUIInformation(const OUString& num,const OUString& action)
+void collectUIInformation(const OUString& num, const OUString& rAction)
{
EventDescription aDescription;
aDescription.aID = "impress_win_or_draw_win";
aDescription.aParameters = {{"POS", num}};
- aDescription.aAction = action;
+ aDescription.aAction = rAction;
aDescription.aKeyWord = "ImpressWindowUIObject";
aDescription.aParent = "MainWindow";
@@ -632,9 +632,8 @@ bool SlideSorterModel::DeleteSlide (const SdPage* pPage)
bMarkedSelected = (*iter)->HasState(PageDescriptor::ST_Selected);
maPageDescriptors.erase(iter);
UpdateIndices(nIndex);
- }
- if(nIndex>=0){
- collectUIInformation(OUString::number(nIndex+1),"Delete_Slide_or_Page");
+
+ collectUIInformation(OUString::number(nIndex + 1), "Delete_Slide_or_Page");
}
return bMarkedSelected;
}