sc/source/core/data/document.cxx | 2 +- sc/source/ui/view/viewdata.cxx | 2 +- sc/source/ui/view/viewfun2.cxx | 2 +- sc/source/ui/view/viewfun3.cxx | 2 +- sc/source/ui/view/viewfunc.cxx | 2 +- sw/source/core/edit/edtab.cxx | 2 +- sw/source/uibase/dochdl/swdtflvr.cxx | 2 +- sw/source/uibase/wrtsh/wrtsh1.cxx | 2 +- vcl/source/uitest/logger.cxx | 10 +++++----- vcl/source/uitest/uiobject.cxx | 20 ++++++++++---------- 10 files changed, 23 insertions(+), 23 deletions(-)
New commits: commit fb4360cf8c18ab1c4d7e1631f7d5101342573739 Author: Ahmed ElShreif <aelshre...@gmail.com> AuthorDate: Sun Aug 18 12:24:08 2019 -0500 Commit: Ahmed ElShreif <aelshre...@gmail.com> CommitDate: Sun Aug 18 12:54:50 2019 -0500 uitest: Fix Jenkins errors while building Change-Id: I51b849d39d541ac5af372d969de8c5d39edefc0a diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index d0a6043c7565..26e44b2a1784 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -109,7 +109,7 @@ using ::std::set; namespace { -void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString action) +void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString& action) { EventDescription aDescription; aDescription.aID = "grid_window"; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d5b80a363cb9..9152d61b4a5e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -97,7 +97,7 @@ void lcl_LOKRemoveWindow(ScTabViewShell* pTabViewShell, ScSplitPos eWhich) namespace { -void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString action) +void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString& action) { EventDescription aDescription; aDescription.aID = "grid_window"; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index f01fbff2ccf6..eccd19f2b215 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -104,7 +104,7 @@ using ::editeng::SvxBorderLine; namespace { -void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString action) +void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString& action) { EventDescription aDescription; aDescription.aID = "grid_window"; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index d818f2389d60..0e3e8de2fba5 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -80,7 +80,7 @@ using namespace com::sun::star; namespace { -void collectUIInformation(const std::map<OUString, OUString>& aParameters,OUString action) +void collectUIInformation(const std::map<OUString, OUString>& aParameters,OUString& action) { EventDescription aDescription; aDescription.aID = "grid_window"; diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index b664263aafdc..83cc4bc4f618 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -112,7 +112,7 @@ ScViewFunc::~ScViewFunc() namespace { -void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString action) +void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString& action) { EventDescription aDescription; aDescription.aID = "grid_window"; diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 905b426f3d26..b4dfa6ce4bff 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; namespace { -void collectUIInformation(const OUString action,const OUString aParameters) +void collectUIInformation(const OUString& action,const OUString& aParameters) { EventDescription aDescription; aDescription.aAction = action; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index e97ca1523eff..abe92248c1d7 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -164,7 +164,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; namespace { -void collectUIInformation(const OUString action,const OUString aParameters) +void collectUIInformation(const OUString& action,const OUString& aParameters) { EventDescription aDescription; aDescription.aAction = action; diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index b4e836b6dc35..42241f4c8b01 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -121,7 +121,7 @@ using namespace sw::mark; using namespace com::sun::star; namespace { -void collectUIInformation(const OUString action,const OUString aParameters) +void collectUIInformation(const OUString& action,const OUString& aParameters) { EventDescription aDescription; aDescription.aAction = action; diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx index cf63dd6ca70b..724b38c70a5b 100644 --- a/vcl/source/uitest/logger.cxx +++ b/vcl/source/uitest/logger.cxx @@ -259,12 +259,12 @@ void UITestLogger::logKeyInput(VclPtr<vcl::Window> const & xUIElement, const Key OUString aContent; if(pUIObject->get_type()=="EditUIObject"){ - if(aParentID=="") + if( aParentID.isEmpty() ) { VclPtr <vcl::Window> pParent_top = get_top_parent(xUIElement); aParentID= pParent_top->get_id(); } - if(aParentID==""){ + if( aParentID.isEmpty() ){ aContent = aContent+"Type on '" + rID + "' " + aKeyCode; } else{ @@ -287,12 +287,12 @@ void UITestLogger::logKeyInput(VclPtr<vcl::Window> const & xUIElement, const Key aContent = "Type on draw " + aKeyCode ; } else{ - if(aParentID=="") + if( aParentID.isEmpty() ) { VclPtr <vcl::Window> pParent_top = get_top_parent(xUIElement); aParentID= pParent_top->get_id(); } - if(aParentID==""){ + if(aParentID.isEmpty() ){ aContent = "Type on '" + rID + "' " + aKeyCode ; } else{ @@ -362,7 +362,7 @@ void UITestLogger::logEvent(const EventDescription& rDescription) else if(rDescription.aAction=="SIDEBAR"){ aLogLine = "From SIDEBAR Choose " + aParameterString; } - else if(rDescription.aAction=="SELECT" && rDescription.aID==""){ + else if(rDescription.aAction=="SELECT" && rDescription.aID.isEmpty() ){ aLogLine = "Select " + aParameterString; } else if(rDescription.aID=="writer_edit"){ diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index c6cdd58e39b4..4cf489ae8943 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -617,7 +617,7 @@ OUString ButtonUIObject::get_action(VclEventId nEvent) const return "Start database" ; } else{ - if (get_top_parent(mxButton)->get_id()==""){ + if ( get_top_parent(mxButton)->get_id().isEmpty() ){ //This part because if we don't have parent return "Click on '" + mxButton->get_id() ; } @@ -746,7 +746,7 @@ OUString EditUIObject::get_action(VclEventId nEvent) const const Selection& rSelection = mxEdit->GetSelection(); long nMin = rSelection.Min(); long nMax = rSelection.Max(); - if(get_top_parent(mxEdit)->get_id()==""){ + if( get_top_parent(mxEdit)->get_id().isEmpty() ) { //This part because if we don't have parent return "Select in '" + mxEdit->get_id() + @@ -875,7 +875,7 @@ OUString CheckBoxUIObject::get_action(VclEventId nEvent) const { if (nEvent == VclEventId::CheckboxToggle) { - if(get_top_parent(mxCheckBox)->get_id()==""){ + if( get_top_parent(mxCheckBox)->get_id().isEmpty() ){ //This part because if we don't have parent return "Toggle '" + mxCheckBox->get_id() + "' CheckBox"; } @@ -929,7 +929,7 @@ OUString RadioButtonUIObject::get_action(VclEventId nEvent) const { if (nEvent == VclEventId::RadiobuttonToggle) { - if(get_top_parent(mxRadioButton)->get_id()==""){ + if( get_top_parent(mxRadioButton)->get_id().isEmpty() ){ //This part because if we don't have parent return "Select '" + mxRadioButton->get_id() + "' RadioButton"; } @@ -1039,7 +1039,7 @@ OUString ListBoxUIObject::get_action(VclEventId nEvent) const if (nEvent == VclEventId::ListboxSelect) { sal_Int32 nPos = mxListBox->GetSelectedEntryPos(); - if(get_top_parent(mxListBox)->get_id()==""){ + if( get_top_parent(mxListBox)->get_id().isEmpty() ){ //This part because if we don't have parent return "Select element with position " + OUString::number(nPos) + " in '" + mxListBox->get_id(); @@ -1049,7 +1049,7 @@ OUString ListBoxUIObject::get_action(VclEventId nEvent) const } else if (nEvent == VclEventId::ListboxFocus) { - if(get_top_parent(mxListBox)->get_id()=="") + if( get_top_parent(mxListBox)->get_id().isEmpty() ) { //This part because if we don't have parent return this->get_type() + " Action:FOCUS Id:" + mxListBox->get_id(); @@ -1124,7 +1124,7 @@ OUString ComboBoxUIObject::get_action(VclEventId nEvent) const if (nEvent == VclEventId::ComboboxSelect) { sal_Int32 nPos = mxComboBox->GetSelectedEntryPos(); - if (get_top_parent(mxComboBox)->get_id()==""){ + if ( get_top_parent(mxComboBox)->get_id().isEmpty() ){ //This part because if we don't have parent return "Select in '" + mxComboBox->get_id() + "' ComboBox item number " + OUString::number(nPos); @@ -1244,7 +1244,7 @@ OUString SpinFieldUIObject::get_action(VclEventId nEvent) const { if (nEvent == VclEventId::SpinfieldUp) { - if(get_top_parent(mxSpinField)->get_id()=="") + if( get_top_parent(mxSpinField)->get_id().isEmpty() ) { //This part because if we don't have parent return "Increase '" + mxSpinField->get_id(); @@ -1254,7 +1254,7 @@ OUString SpinFieldUIObject::get_action(VclEventId nEvent) const } else if (nEvent == VclEventId::SpinfieldDown) { - if(get_top_parent(mxSpinField)->get_id()=="") + if( get_top_parent(mxSpinField)->get_id().isEmpty() ) { //This part because if we don't have parent return "Decrease '" + mxSpinField->get_id(); @@ -1323,7 +1323,7 @@ OUString TabControlUIObject::get_action(VclEventId nEvent) const { sal_Int32 nPageId = mxTabControl->GetCurPageId(); - if(get_top_parent(mxTabControl)->get_id()==""){ + if( get_top_parent(mxTabControl)->get_id().isEmpty() ){ //This part because if we don't have parent return "Choose Tab number " + OUString::number(mxTabControl->GetPagePos(nPageId)) + " in '" + mxTabControl->get_id(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits