1 files changed, 8 insertions, 9 deletions

diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index df143274ac32..5d38b50b1dce 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -436,7 +436,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
     }
 
     // set auto-styles for Area
-    uno::Reference<beans::XPropertySet> xProp(mrImportHelper.GetChartDocument()->getArea(), uno::UNO_QUERY);
+    uno::Reference<beans::XPropertySet> xProp = mrImportHelper.GetChartDocument()->getArea();
     mrImportHelper.FillAutoStyle(sAutoStyleName, xProp);
 }
 
@@ -677,10 +677,9 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram(
     //work around wrong writer ranges ( see Issue 58464 )
     {
         OUString aChartOleObjectName;
-        uno::Reference< frame::XModel > xModel(xNewDoc, uno::UNO_QUERY );
-        if( xModel.is() )
+        if( xNewDoc.is() )
         {
-            utl::MediaDescriptor aMediaDescriptor( xModel->getArgs() );
+            utl::MediaDescriptor aMediaDescriptor( xNewDoc->getArgs() );
 
             utl::MediaDescriptor::const_iterator aIt(
                 aMediaDescriptor.find( OUString(  "HierarchicalDocumentName" )));
@@ -823,7 +822,7 @@ void SchXMLChartContext::EndElement()
         if( xNewDoc->hasInternalDataProvider() )
             SchXMLTableHelper::applyTableToInternalDataProvider( maTable, xNewDoc );
 
-        bool bOlderThan2_3 = SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( Reference< frame::XModel >( xNewDoc, uno::UNO_QUERY ));
+        bool bOlderThan2_3 = SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( xNewDoc );
         bool bOldFileWithOwnDataFromRows = (bOlderThan2_3 && bHasOwnData && (meDataRowSource==chart::ChartDataRowSource_ROWS)); // in this case there are range addresses that are simply wrong.
 
         if( mbAllRangeAddressesAvailable && !bSpecialHandlingForDonutChart && !mbIsStockChart &&
@@ -886,7 +885,7 @@ void SchXMLChartContext::EndElement()
                 , SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
         }
 
-        SchXMLSeries2Context::initSeriesPropertySets( maSeriesDefaultsAndStyles, uno::Reference< frame::XModel >(xDoc, uno::UNO_QUERY ) );
+        SchXMLSeries2Context::initSeriesPropertySets( maSeriesDefaultsAndStyles, xDoc );
 
         //set defaults from diagram to the new series:
         //check whether we need to remove lines from symbol only charts
@@ -1056,7 +1055,7 @@ SvXMLImportContextRef SchXMLChartContext::CreateChildContext(
                 {
                     xProp->setPropertyValue("HasMainTitle", uno::makeAny(true) );
                 }
-                uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY );
+                uno::Reference< drawing::XShape > xTitleShape = xDoc->getTitle();
                 pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
                                                    rLocalName, maMainTitle, xTitleShape );
             }
@@ -1069,7 +1068,7 @@ SvXMLImportContextRef SchXMLChartContext::CreateChildContext(
                 {
                     xProp->setPropertyValue("HasSubTitle", uno::makeAny(true) );
                 }
-                uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY );
+                uno::Reference< drawing::XShape > xTitleShape = xDoc->getSubTitle();
                 pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
                                                    rLocalName, maSubTitle, xTitleShape );
             }
@@ -1117,7 +1116,7 @@ SvXMLImportContextRef SchXMLChartContext::CreateChildContext(
             {
                 uno::Reference< drawing::XDrawPageSupplier  > xSupp( xDoc, uno::UNO_QUERY );
                 if( xSupp.is())
-                    mxDrawPage.set( xSupp->getDrawPage(), uno::UNO_QUERY );
+                    mxDrawPage = xSupp->getDrawPage();
 
                 SAL_WARN_IF( !mxDrawPage.is(), "xmloff.chart", "Invalid Chart Page" );
             }