3 files changed, 3 insertions, 6 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 52f290fdd3d8..7c6682e8bab5 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1405,8 +1405,7 @@ void ControlContainerBase::ImplRemoveControl( Reference< XControlModel >& rxMode
         removeControl( xCtrl );
         try
         {
-            Reference< XComponent > const xControlComp( xCtrl, UNO_QUERY_THROW );
-            xControlComp->dispose();
+            xCtrl->dispose();
         }
         catch (const Exception&)
         {
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 37e8b8fb6a0e..584f1b0ef4ee 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -187,8 +187,7 @@ namespace toolkit
         // dispose the removed column
         try
         {
-            Reference< XComponent > const xColComp( xColumn, UNO_QUERY_THROW );
-            xColComp->dispose();
+            xColumn->dispose();
         }
         catch( const Exception& )
         {
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index efbac8b28b54..26036c14a091 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -101,8 +101,7 @@ namespace
     {
         try
         {
-            Reference< XPropertySet > const xParentDelegator( i_parentModel, UNO_QUERY_THROW );
-            Reference< XPropertySetInfo > const xPSI( xParentDelegator->getPropertySetInfo() );
+            Reference< XPropertySetInfo > const xPSI( i_parentModel->getPropertySetInfo() );
             bool const isGeometryControlModel = xPSI.is() && xPSI->hasPropertyByName( OUString( "PositionX" ) );
 
             Reference< XInterface > xInstance;