[Libreoffice-commits] core.git: vcl/unx
dilekuzulmez
dilekuzulmez at gmail.com
Mon Feb 6 08:10:18 UTC 2017
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1cf15a4cdde09972e78baee704014099433ac43e
Author: dilekuzulmez <dilekuzulmez at gmail.com>
Date: Fri Feb 3 15:36:42 2017 +0300
tdf#43157 Clean up OSL_ASSERT, DBG_ASSERT, etc.
Change-Id: I37b62b7cc4b26789e961148c0411615ef1c2ffa1
Reviewed-on: https://gerrit.libreoffice.org/33884
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 0b7549a..3be630d 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -66,7 +66,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
OString aTxt = unicodetouri( aDirectory );
if( aTxt.isEmpty() ){
@@ -86,7 +86,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory()
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
gchar* pCurrentFolder =
gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) );
@@ -100,7 +100,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory()
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
gchar* pSelectedFolder =
gtk_file_chooser_get_uri( GTK_FILE_CHOOSER( m_pDialog ) );
@@ -120,7 +120,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle )
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
@@ -131,7 +131,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute()
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
sal_Int16 retVal = 0;
@@ -170,7 +170,7 @@ void SAL_CALL SalGtkFolderPicker::cancel()
{
SolarMutexGuard g;
- OSL_ASSERT( m_pDialog != nullptr );
+ assert( m_pDialog != nullptr );
// TODO m_pImpl->cancel();
}
More information about the Libreoffice-commits
mailing list