From d7a84ce8406096b455d81f50cd50ca2e877adc06 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 10 Mar 2015 09:07:06 +0200 Subject: vclwidget: only call dispose() once by using a new utility method in vcl::Window This means that we don't have to make all our dispose methods safe to call more than once. Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374 --- odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 2 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx | 2 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'odk/examples/DevelopersGuide') diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx index 0530fedb2aec..2c535c924be0 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx @@ -318,7 +318,7 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) checkDisposed(OConnection_BASE::rBHelper.bDisposed); } - dispose(); + disposeOnce(); } // XWarningsSupplier diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index c4847fe50db7..ba5127808ac5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -410,7 +410,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } - dispose(); + disposeOnce(); } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index bc84cc43c9d5..57ac76492579 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -133,7 +133,7 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) checkDisposed(OStatement_BASE::rBHelper.bDisposed); } - dispose(); + disposeOnce(); } -- cgit