summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:28:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:32:00 +0100
commitd3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch)
treee9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
parent45979047abbd9da7a29401f298e8ef9ab58ad337 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx')
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 78682cb738aa..49ab71d25388 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -53,7 +53,7 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
{
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
- NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ nullptr, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, nullptr );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -68,7 +68,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
OString aTxt = unicodetouri( aDirectory );
if( aTxt.isEmpty() ){
@@ -88,7 +88,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeE
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
gchar* pCurrentFolder =
gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) );
@@ -102,7 +102,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExceptio
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
gchar* pSelectedFolder =
gtk_file_chooser_get_uri( GTK_FILE_CHOOSER( m_pDialog ) );
@@ -123,7 +123,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno:
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
@@ -135,7 +135,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
SolarMutexGuard g;
OSL_TRACE( "1: HERE WE ARE");
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
sal_Int16 retVal = 0;
@@ -173,7 +173,7 @@ void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::ex
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != NULL );
+ OSL_ASSERT( m_pDialog != nullptr );
// TODO m_pImpl->cancel();
}