summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/android/androidinst.cxx8
-rw-r--r--vcl/headless/headlessinst.cxx5
-rw-r--r--vcl/headless/svpdummies.cxx2
-rw-r--r--vcl/inc/headless/svpdummies.hxx3
-rw-r--r--vcl/inc/unx/gensys.h3
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx3
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx3
-rw-r--r--vcl/ios/iosinst.cxx7
-rw-r--r--vcl/unx/generic/app/gensys.cxx2
-rw-r--r--vcl/unx/gtk/gtksys.cxx5
-rw-r--r--vcl/unx/gtk/salprn-gtk.cxx5
-rw-r--r--vcl/unx/x11/x11sys.cxx6
13 files changed, 21 insertions, 33 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 56d6c39a303a..a2cb49cb60aa 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -82,8 +82,7 @@ public:
virtual ~AndroidSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton );
+ const std::list< OUString >& rButtons );
};
SalSystem *AndroidSalInstance::CreateSalSystem()
@@ -204,10 +203,9 @@ void DestroySalInstance( SalInstance *pInst )
int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton )
+ const std::list< OUString >& rButtons )
{
- (void)rButtons; (void)nDefButton;
+ (void)rButtons;
LOGI("LibreOffice native dialog '%s': '%s'",
OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index d783cbade58d..e6f5cf03f5b3 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -28,10 +28,9 @@ public:
HeadlessSalSystem() : SvpSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton ) override
+ const std::list< OUString >& rButtons ) override
{
- (void)rButtons; (void)nDefButton;
+ (void)rButtons;
::fprintf(stdout, "LibreOffice - dialog '%s': '%s'",
OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 46ff2841a961..31a4de7fc171 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 >&, int )
+ const std::list< OUString >& )
{
return 0;
}
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index a14aabe2b447..ff304cc03579 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -59,8 +59,7 @@ public:
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton ) override;
+ const std::list< 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 fabc6937b586..8f4f71af5757 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -35,8 +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,
- int nDefButton ) = 0;
+ const std::list< OUString >& rButtons ) = 0;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage) override;
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 5ef0563592e1..d2fb5fab081d 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -34,7 +34,7 @@ private:
bool impl_doJob(
const OUString* i_pFileName, const OUString& i_rJobName,
const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
- int i_nCopies, bool i_bCollate, vcl::PrinterController& io_rController);
+ bool i_bCollate, vcl::PrinterController& io_rController);
private:
std::unique_ptr<GtkSalPrinter_Impl> m_xImpl;
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index d888bce5bca3..94e748887a12 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -32,8 +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,
- int nDefButton) override;
+ const std::list< 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 bcb97f7714af..d99542164545 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -37,8 +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,
- int nDefButton ) override;
+ const std::list< OUString >& rButtons ) override;
};
#endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index b2b090834d87..b4b6f1f9f0bd 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -73,8 +73,7 @@ public:
virtual ~IosSalSystem() {}
virtual int ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton );
+ const std::list< OUString >& rButtons );
};
SalSystem *IosSalInstance::CreateSalSystem()
@@ -185,11 +184,9 @@ void DestroySalInstance( SalInstance *pInst )
int IosSalSystem::ShowNativeDialog( const OUString& rTitle,
const OUString& rMessage,
- const std::list< OUString >& rButtons,
- int nDefButton )
+ const std::list< OUString >& rButtons )
{
(void)rButtons;
- (void)nDefButton;
NSLog(@"%@: %@", CreateNSString(rTitle), CreateNSString(rMessage));
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index b336a90561eb..dbcb1fffd4f8 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -99,7 +99,7 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri
aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::OK, false/*bUseResources*/ ) );
nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK;
- int nResult = ShowNativeDialog( rTitle, rMessage, aButtons, 0/*nDefButton*/ );
+ int nResult = ShowNativeDialog( rTitle, rMessage, aButtons );
return nResult != -1 ? nButtonIds[ nResult ] : 0;
}
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index 5c047e4453a8..7e46498e6461 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -269,8 +269,7 @@ static OString MapToGtkAccelerator(const OUString &rStr)
}
int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage,
- const std::list< OUString >& rButtonNames,
- int nDefaultButton)
+ const std::list< OUString >& rButtonNames)
{
OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8));
@@ -285,7 +284,7 @@ int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMes
std::list< OUString >::const_iterator it;
for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++);
- gtk_dialog_set_default_response (pDialog, nDefaultButton);
+ gtk_dialog_set_default_response (pDialog, 0/*nDefaultButton*/);
nButton = gtk_dialog_run (pDialog);
if (nButton < 0)
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 7ffbffb9c939..f82525481731 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -172,7 +172,6 @@ GtkSalPrinter::impl_doJob(
const OUString& i_rJobName,
const OUString& i_rAppName,
ImplJobSetup* const io_pSetupData,
- const int i_nCopies,
const bool i_bCollate,
vcl::PrinterController& io_rController)
{
@@ -180,7 +179,7 @@ GtkSalPrinter::impl_doJob(
io_rController.jobStarted();
const bool bJobStarted(
PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName,
- i_nCopies, i_bCollate, true, io_pSetupData))
+ 1/*i_nCopies*/, i_bCollate, true, io_pSetupData))
;
if (bJobStarted)
@@ -253,7 +252,7 @@ GtkSalPrinter::StartJob(
//To-Do, swap ps/pdf for gtk_printer_accepts_ps()/gtk_printer_accepts_pdf() ?
- return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, 1/*nCopies*/, bCollate, io_rController);
+ return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, bCollate, io_rController);
}
bool
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 69a626274a0c..19a9c41049eb 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 nDefButton )
+int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons )
{
int nRet = -1;
@@ -99,10 +99,10 @@ int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMes
sal_uInt16 nButton = 0;
for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
{
- aWarn->AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
+ aWarn->AddButton( *it, nButton+1, (nButton == 0) ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
nButton++;
}
- aWarn->SetFocusButton( (sal_uInt16)nDefButton+1 );
+ aWarn->SetFocusButton( (sal_uInt16)1 );
nRet = ((int)aWarn->Execute()) - 1;
generated by cgit (git 2.34.1) at 2024-12-26 12:49:17 +0000