basctl, forms, svx: cleanup for new VclPtr API.

Change-Id: I3bfd7933d2cddf707662d10e9366e0c82f33d276

basctl/source/basicide/basicrenderable.cxx

@@ -86,7 +86,7 @@ VclPtr< Printer > Renderable::getPrinter()
     if( aValue >>= xRenderDevice )
     {
         VCLXDevice* pDevice = VCLXDevice::GetImplementation(xRenderDevice);
-        VclPtr< OutputDevice > pOut = pDevice ? pDevice->GetOutputDevice() : VclPtr< OutputDevice >;
+        VclPtr< OutputDevice > pOut = pDevice ? pDevice->GetOutputDevice() : VclPtr< OutputDevice >();
         pPrinter = dynamic_cast<Printer*>(pOut.get());
     }
     return pPrinter;

basctl/source/basicide/basicrenderable.hxx

@@ -36,7 +36,7 @@ class Renderable :
     VclPtr<BaseWindow>  mpWindow;
     osl::Mutex          maMutex;
 
-    Printer* getPrinter();
+    VclPtr<Printer> getPrinter();
 public:
     Renderable (BaseWindow*);
     virtual ~Renderable();

forms/source/richtext/richtextcontrol.cxx

@@ -314,7 +314,7 @@ namespace frm
     {
         {
             SolarMutexGuard aGuard;
-            VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl* >();
+            VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >();
 
             if ( pRichTextControl )
             {
@@ -340,7 +340,7 @@ namespace frm
     {
         SolarMutexGuard aGuard;
 
-        RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() );
+        VclPtr< RichTextControl > pControl = GetAs< RichTextControl >();
         if ( !pControl )
             return;
 
@@ -375,7 +375,7 @@ namespace frm
 
         if ( _rPropertyName == PROPERTY_BACKGROUNDCOLOR )
         {
-            RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() );
+            VclPtr< RichTextControl > pControl = GetAs< RichTextControl >();
             if ( !_rValue.hasValue() )
             {
                 pControl->SetBackgroundColor( );
@@ -401,7 +401,7 @@ namespace frm
         }
         else if ( _rPropertyName == PROPERTY_READONLY )
         {
-            RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() );
+            VclPtr< RichTextControl > pControl = GetAs< RichTextControl >();
             bool bReadOnly( pControl->IsReadOnly() );
             OSL_VERIFY( _rValue >>= bReadOnly );
             pControl->SetReadOnly( bReadOnly );
@@ -417,7 +417,7 @@ namespace frm
         }
         else if ( _rPropertyName == PROPERTY_HIDEINACTIVESELECTION )
         {
-            VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl* >();
+            VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >();
             bool bHide = pRichTextControl->GetHideInactiveSelection();
             OSL_VERIFY( _rValue >>= bHide );
             pRichTextControl->SetHideInactiveSelection( bHide );
@@ -469,7 +469,7 @@ namespace frm
 
     ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL )
     {
-        VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl* >();
+        VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >();
         OSL_PRECOND( pRichTextControl, "ORichTextPeer::implCreateDispatcher: invalid window!" );
         if ( !pRichTextControl )
             return SingleAttributeDispatcher( NULL );

svx/source/fmcomp/fmgridif.cxx

@@ -1398,7 +1398,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
         // this should not be (deadlock) critical, as by definition, every component should release
         // any own mutexes before notifying
 
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (!pGrid)
         return;
 
@@ -1518,7 +1518,7 @@ void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) th
 
 sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (!m_xCursor.is() || !pGrid)
         return sal_True;
 
@@ -1541,7 +1541,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception )
 
 void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     // we are not interested in move to insert row only in the resetted event
     // which is fired after positioning an the insert row
     if (pGrid && pGrid->IsOpen() && !::comphelper::getBOOL(Reference< XPropertySet > (_rEvent.Source, UNO_QUERY)->getPropertyValue(FM_PROP_ISNEW)))
@@ -1551,7 +1551,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio
 
 void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid && pGrid->IsOpen())
     {
         if (m_xCursor->rowUpdated() && !pGrid->IsCurrentAppending())
@@ -1654,7 +1654,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw(
 {
     SolarMutexGuard aGuard;
 
-    FmGridControl* pGrid = static_cast< FmGridControl* >( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     if (m_xColumns.is())
     {
@@ -1770,7 +1770,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
 {
     SolarMutexGuard aGuard;
 
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     // Handle Column beruecksichtigen
     if (!pGrid || !m_xColumns.is() || pGrid->IsInColumnMove())
@@ -1825,7 +1825,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept
 {
     SolarMutexGuard aGuard;
 
-    FmGridControl* pGrid    = static_cast<FmGridControl*>(GetWindow());
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     // Handle Column beruecksichtigen
     if (!pGrid || !m_xColumns.is() || pGrid->IsInColumnMove() || m_xColumns->getCount() == ((sal_Int32)pGrid->GetModelColCount()))
@@ -1842,7 +1842,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
 {
     SolarMutexGuard aGuard;
 
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     bool bVoid = !Value.hasValue();
 
@@ -2255,14 +2255,14 @@ void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridCont
 
 sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1;
 }
 
 
 void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid)
         pGrid->GoToColumnId(pGrid->GetColumnIdFromViewPos(nPos));
 }
@@ -2272,7 +2272,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti
 {
     SolarMutexGuard aGuard;
 
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid)
     {
         Reference< ::com::sun::star::view::XSelectionSupplier >  xSelSupplier(evt.Source, UNO_QUERY);
@@ -2340,7 +2340,7 @@ Reference< XEnumeration >  FmXGridPeer::createEnumeration() throw( RuntimeExcept
 
 sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid)
         return pGrid->GetViewColCount();
     else
@@ -2350,7 +2350,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception )
 
 Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (_nIndex < 0 ||
         _nIndex >= getCount() || !pGrid)
         throw IndexOutOfBoundsException();
@@ -2429,7 +2429,7 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException
 
 void FmXGridPeer::columnVisible(DbGridColumn* pColumn)
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId());
     Reference< ::com::sun::star::awt::XControl >  xControl(pColumn->GetCell());
@@ -2444,7 +2444,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn)
 
 void FmXGridPeer::columnHidden(DbGridColumn* pColumn)
 {
-    FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+    VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
 
     sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId());
     Reference< ::com::sun::star::awt::XControl >  xControl(pColumn->GetCell());
@@ -2599,7 +2599,7 @@ void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent
         {
             DBG_ASSERT(m_pDispatchers[i] == Event.Source, "FmXGridPeer::statusChanged : the event source is a little bit suspect !");
             m_pStateCache[i] = Event.IsEnabled;
-            FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() );
+            VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
             if (*pSlots != SID_FM_RECORD_UNDO)
                 pGrid->GetNavigationBar().InvalidateState(*pSlots);
             break;
@@ -2621,8 +2621,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr
     if ( !( _rSelection >>= aBookmarks ) )
         throw IllegalArgumentException();
 
-    FmGridControl* pVclControl = static_cast<FmGridControl*>(GetWindow());
-    return pVclControl->selectBookmarks(aBookmarks);
+    return GetAs< FmGridControl >()->selectBookmarks(aBookmarks);
 
     // TODO:
     // speaking strictly, we would have to adjust our model, as our ColumnSelection may have changed.
@@ -2635,7 +2634,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr
 
 Any SAL_CALL FmXGridPeer::getSelection(  ) throw (RuntimeException, std::exception)
 {
-    FmGridControl* pVclControl = static_cast<FmGridControl*>(GetWindow());
+    VclPtr< FmGridControl > pVclControl = GetAs< FmGridControl >();
     Sequence< Any > aSelectionBookmarks = pVclControl->getSelectionBookmarks();
     return makeAny(aSelectionBookmarks);
 }