Replace list by vector for ShowNativeDialog (vcl)
Change-Id: I1101c5b5426507ce8e5fd1ed34930f385f527775
Reviewed-on: https://gerrit.libreoffice.org/44639
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 7bf1833..ae03995 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -82,7 +82,7 @@ public:
virtual ~AndroidSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons );
const std::vector< OUString >& rButtons );
};
SalSystem *AndroidSalInstance::CreateSalSystem()
@@ -203,7 +203,7 @@ void DestroySalInstance( SalInstance *pInst )
int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons )
const std::vector< OUString >& rButtons )
{
(void)rButtons;
LOGI("LibreOffice native dialog '%s': '%s'",
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 299c5f7d..a5f1c6e 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -28,7 +28,7 @@ public:
HeadlessSalSystem() : SvpSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons ) override
const std::vector< OUString >& rButtons ) override
{
(void)rButtons;
::fprintf(stdout, "LibreOffice - dialog '%s': '%s'",
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index e7e9220..54fa5ec 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -59,7 +59,7 @@ tools::Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScree
}
int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
const std::list< OUString >& )
const std::vector< OUString >& )
{
return 0;
}
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index ff304cc..419cc54 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -59,7 +59,7 @@ public:
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons ) override;
const std::vector< OUString >& rButtons ) override;
};
#endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
diff --git a/vcl/inc/unx/gensys.h b/vcl/inc/unx/gensys.h
index 8f4f71a..5d42e798 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -23,7 +23,7 @@
#include <salsys.hxx>
#include <salframe.hxx>
#include <vclpluginapi.h>
#include <list>
#include <vector>
/*
* Helps de-tangle the rather horrible ShowNativeMessageBox API
@@ -35,7 +35,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
virtual ~SalGenericSystem() override;
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons ) = 0;
const std::vector< OUString >& rButtons ) = 0;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage) override;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 9f4fae3..31440f0 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -33,7 +33,7 @@
#include <saltimer.hxx>
#include <o3tl/enumarray.hxx>
#include <list>
#include <vector>
namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleEventListener; } } } }
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 083c046..8c07ad6 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -32,7 +32,7 @@ public:
virtual tools::Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen) override;
virtual int ShowNativeDialog (const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons) override;
const std::vector< OUString >& rButtons) override;
SalX11Screen GetDisplayDefaultXScreen()
{ return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
int GetDisplayXScreenCount();
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index d995421..1dc4a76 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -37,7 +37,7 @@ public:
virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons ) override;
const std::vector< OUString >& rButtons ) override;
};
#endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index fd5647f1..7fed7a4 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -73,7 +73,7 @@ public:
virtual ~IosSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons );
const std::vector< OUString >& rButtons );
};
SalSystem *IosSalInstance::CreateSalSystem()
@@ -184,7 +184,7 @@ void DestroySalInstance( SalInstance *pInst )
int IosSalSystem::ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
const std::list< OUString >& rButtons )
const std::vector< OUString >& rButtons )
{
(void)rButtons;
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index dbcb1ff..3f2dfef 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -92,7 +92,7 @@ SalGenericSystem::~SalGenericSystem()
int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUString& rMessage )
{
std::list< OUString > aButtons;
std::vector< OUString > aButtons;
int nButtonIds[5] = {0}, nBut = 0;
ImplHideSplash();
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index d01eaa1..928755f 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -269,7 +269,7 @@ static OString MapToGtkAccelerator(const OUString &rStr)
}
int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage,
const std::list< OUString >& rButtonNames)
const std::vector< OUString >& rButtonNames)
{
OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8));
@@ -281,9 +281,8 @@ int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMes
"text", aMessage.getStr(),
nullptr));
int nButton = 0;
std::list< OUString >::const_iterator it;
for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++);
for (auto const& buttonName : rButtonNames)
gtk_dialog_add_button (pDialog, MapToGtkAccelerator(buttonName).getStr(), nButton++);
gtk_dialog_set_default_response (pDialog, 0/*nDefaultButton*/);
nButton = gtk_dialog_run (pDialog);
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 69e4a03..fd1b08c 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -84,7 +84,7 @@ tools::Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScree
return aRet;
}
int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons )
int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::vector< OUString >& rButtons )
{
int nRet = -1;
@@ -97,9 +97,9 @@ int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMes
aWarn->Clear();
sal_uInt16 nButton = 0;
for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
for (auto const& button : rButtons)
{
aWarn->AddButton( *it, nButton+1, (nButton == 0) ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
aWarn->AddButton( button, nButton+1, (nButton == 0) ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
nButton++;
}
aWarn->SetFocusButton( (sal_uInt16)1 );
