loplugin:staticcall

Change-Id: I41ecb2b80251f56823f6b59c0746ff50531e6c84

27 files changed, 62 insertions, 62 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index a4baf7d0d576..3ca609d6cdb0 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -156,7 +156,7 @@ namespace {
         DBG_ASSERT( _pView, "lcl_getControlContainer: invalid view!" );
         if ( _pView  && _pView->GetSdrPageView())
         {
-            xReturn = xReturn.query( _pView->GetSdrPageView()->GetControlContainer( *_pWin ) );
+            xReturn.set(_pView->GetSdrPageView()->GetControlContainer( *_pWin ), css::uno::UNO_QUERY);
         }
         return xReturn;
     }
@@ -706,7 +706,7 @@ bool AccessibleControlShape::ensureControlModelAccess()
     {
         Reference< XControlShape > xShape( mxShape, UNO_QUERY );
         if ( xShape.is() )
-            m_xControlModel = m_xControlModel.query( xShape->getControl() );
+            m_xControlModel.set(xShape->getControl(), css::uno::UNO_QUERY);
 
         if ( m_xControlModel.is() )
             m_xModelPropsMeta = m_xControlModel->getPropertySetInfo();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 1406ab09a10b..5ff095296070 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -594,7 +594,7 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
             else if (nIndex == INDENT_RIGHT_MARGIN)
                 nIndentValue = mpParaItem->GetRight();
 
-            double fValue = pEditWin->LogicToLogic(Size(nIndentValue, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+            double fValue = OutputDevice::LogicToLogic(Size(nIndentValue, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
             fValue = rtl::math::round(fValue / aUnitData.nTickUnit, aNoDecimalPlaces);
 
             SetQuickHelpText(OUString::number(fValue) + " " + sUnit);
@@ -610,9 +610,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
             if (aSelection.nAryPos + 1 >= aColumnItem.Count())
                 break;
 
-            double fStart = pEditWin->LogicToLogic(Size(aColumnItem[aSelection.nAryPos].nEnd,       0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+            double fStart = OutputDevice::LogicToLogic(Size(aColumnItem[aSelection.nAryPos].nEnd,       0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
             fStart = rtl::math::round(fStart / aUnitData.nTickUnit, aNoDecimalPlaces);
-            double fEnd   = pEditWin->LogicToLogic(Size(aColumnItem[aSelection.nAryPos + 1].nStart, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+            double fEnd   = OutputDevice::LogicToLogic(Size(aColumnItem[aSelection.nAryPos + 1].nStart, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
             fEnd = rtl::math::round(fEnd / aUnitData.nTickUnit, aNoDecimalPlaces);
 
             SetQuickHelpText(
@@ -630,7 +630,7 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
             else
                 break;
 
-            double fValue = pEditWin->LogicToLogic(Size(nLeft, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+            double fValue = OutputDevice::LogicToLogic(Size(nLeft, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
             fValue = rtl::math::round(fValue / aUnitData.nTickUnit, aNoDecimalPlaces);
             SetQuickHelpText(OUString::number(fValue) + " " + sUnit);
 
@@ -646,7 +646,7 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
             else
                 break;
 
-            double fValue = pEditWin->LogicToLogic(Size(nRight, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+            double fValue = OutputDevice::LogicToLogic(Size(nRight, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
             fValue = rtl::math::round(fValue / aUnitData.nTickUnit, aNoDecimalPlaces);
             SetQuickHelpText(OUString::number(fValue) + " " + sUnit);
 
@@ -2083,9 +2083,9 @@ long SvxRuler::RoundToCurrentMapMode(long lValue) const
     RulerUnitData aUnitData = GetCurrentRulerUnit();
     double aRoundingFactor = aUnitData.nTickUnit / aUnitData.nTick1;
 
-    long lNewValue = pEditWin->LogicToLogic(Size(lValue, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
+    long lNewValue = OutputDevice::LogicToLogic(Size(lValue, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
     lNewValue = (rtl::math::round(lNewValue / (double) aUnitData.nTickUnit * aRoundingFactor) / aRoundingFactor) * aUnitData.nTickUnit;
-    return pEditWin->LogicToLogic(Size(lNewValue, 0), GetCurrentMapMode(), pEditWin->GetMapMode()).Width();
+    return OutputDevice::LogicToLogic(Size(lNewValue, 0), GetCurrentMapMode(), pEditWin->GetMapMode()).Width();
 }
 
 void SvxRuler::ApplyIndents()
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 7455e6d31d34..7f74abd738dd 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -926,7 +926,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
             {
                 FormControlFactory factory;
 
-                OUString sLabel = factory.getDefaultUniqueName_ByComponentType(
+                OUString sLabel = FormControlFactory::getDefaultUniqueName_ByComponentType(
                     Reference< XNameAccess >( xCols, UNO_QUERY_THROW ), xNewCol );
                 xNewCol->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel ) );
                 xNewCol->setPropertyValue( FM_PROP_NAME, makeAny( sLabel ) );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index c12770ea9c94..217f19ffdf5e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1828,7 +1828,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
     Reference< XColumnsSupplier > xSuppColumns;
     CursorWrapper* pGridDataSource = pGrid->getDataSource();
     if ( pGridDataSource )
-        xSuppColumns = xSuppColumns.query( (Reference< XInterface >)( *pGridDataSource ) );
+        xSuppColumns.set((Reference< XInterface >)( *pGridDataSource ), css::uno::UNO_QUERY);
     Reference< XNameAccess > xColumnsByName;
     if ( xSuppColumns.is() )
         xColumnsByName = xSuppColumns->getColumns();
@@ -2147,7 +2147,7 @@ void FmXGridPeer::dispose() throw( RuntimeException, std::exception )
         xInterceptor->setSlaveDispatchProvider( NULL );
 
         // start over with the next chain element
-        xInterceptor = xInterceptor.query( xSlave );
+        xInterceptor.set(xSlave, css::uno::UNO_QUERY);
     }
 
     DisConnectFromDispatcher();
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 93f443966e92..36afdb92df14 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1365,7 +1365,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
     if (!m_aControlExchange.isDragSource())
         return DND_ACTION_NONE;
 
-    if (!m_aControlExchange->hasFormat(GetDataFlavorExVector()))
+    if (!OFilterItemExchange::hasFormat(GetDataFlavorExVector()))
         return DND_ACTION_NONE;
 
     // do we conain the formitem?
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index dbe759e29791..a1b2cf54b6da 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -567,10 +567,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
         :   DefaultFormComponentInspectorModel::createDefault( m_xInspectorContext );
 
     // an object inspector
-    m_xBrowserController = m_xBrowserController.query(
+    m_xBrowserController.set(
         ObjectInspector::createWithModel(
             m_xInspectorContext, m_xInspectorModel
-        ) );
+        ), css::uno::UNO_QUERY);
 
     if ( !m_xBrowserController.is() )
     {
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 290312ca8dd0..4b0ef8da207c 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -235,8 +235,8 @@ void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun:
 {
     // do not just copy, normalize it
     m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY );
-    m_xProperties = m_xProperties.query( m_xNormalizedIFace );
-    m_xChild = m_xChild.query( m_xNormalizedIFace );
+    m_xProperties.set(m_xNormalizedIFace, css::uno::UNO_QUERY);
+    m_xChild.set(m_xNormalizedIFace, css::uno::UNO_QUERY);
 }
 
 
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 04c1bc2099a5..2a7a4fb97356 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -587,7 +587,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
                     Reference< XDataSource > xFormDS(xConnAsChild->getParent(), UNO_QUERY);
                     if (xFormDS.is())
                     {
-                        xDSProps = xDSProps.query(xFormDS);
+                        xDSProps.set(xFormDS, css::uno::UNO_QUERY);
                         if (xDSProps.is())
                             xDSProps->getPropertyValue(FM_PROP_NAME) >>= sFormDataSourceName;
                     }
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 3a6b82d1e44e..0c53aec29382 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2028,8 +2028,8 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
     // TODO: this should happen elsewhere, but not here - shouldn't it?
     if ( !m_aCurrentSelection.empty() )
     {
-        Reference< XChild > xCur; if ( m_aCurrentSelection.size() == 1 ) xCur = xCur.query( *m_aCurrentSelection.begin() );
-        Reference< XChild > xNew; if ( _rSelection.size() == 1 ) xNew = xNew.query( *_rSelection.begin() );
+        Reference< XChild > xCur; if ( m_aCurrentSelection.size() == 1 ) xCur.set(*m_aCurrentSelection.begin(), css::uno::UNO_QUERY);
+        Reference< XChild > xNew; if ( _rSelection.size() == 1 ) xNew.set(*_rSelection.begin(), css::uno::UNO_QUERY);
 
         // is there nothing to be selected, or the parents differ, and the parent of the current object
         // is a selection supplier, then deselect
@@ -2600,7 +2600,7 @@ void FmXFormShell::UpdateForms( bool _bInvalidate )
     if ( pPage )
     {
         if ( m_pShell->m_bDesignMode )
-            xForms = xForms.query( pPage->GetForms( false ) );
+            xForms.set(pPage->GetForms( false ), css::uno::UNO_QUERY);
     }
 
     if ( m_xForms != xForms )
@@ -3887,7 +3887,7 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
 
         // load all forms
         Reference< XIndexAccess >  xForms;
-        xForms = xForms.query( _pPage->GetForms( false ) );
+        xForms.set(_pPage->GetForms( false ), css::uno::UNO_QUERY);
 
         if ( xForms.is() )
         {
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index fae746cd272b..594afb09fa6d 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -471,7 +471,7 @@ namespace svx
             {
                 Reference< XPropertySet > xModelProps;
                 if ( _rxControl.is() )
-                    xModelProps = xModelProps.query( _rxControl->getModel() );
+                    xModelProps.set(_rxControl->getModel(), css::uno::UNO_QUERY);
                 Reference< XPropertySetInfo > xModelPropInfo;
                 if ( xModelProps.is() )
                     xModelPropInfo = xModelProps->getPropertySetInfo();
@@ -1224,7 +1224,7 @@ namespace svx
 
         // remember this control
         m_xActiveControl = _rxControl;
-        m_xActiveTextComponent = m_xActiveTextComponent.query( _rxControl );
+        m_xActiveTextComponent.set(_rxControl, css::uno::UNO_QUERY);
         m_bActiveControlIsReadOnly = lcl_determineReadOnly( m_xActiveControl );
         m_bActiveControlIsRichText = lcl_isRichText( m_xActiveControl );
 
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 73459db395a7..aa17706b7d37 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -131,7 +131,7 @@ void displayException(const Any& _rExcept, Window* _pParent)
     try
     {
         // the parent window
-        Window* pParentWindow = _pParent ? _pParent : GetpApp()->GetDefDialogParent();
+        Window* pParentWindow = _pParent ? _pParent : Application::GetDefDialogParent();
         Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow);
 
         Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create(::comphelper::getProcessComponentContext(), "", xParentWindow, _rExcept);
@@ -253,9 +253,9 @@ void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResu
     else
         m_xMoveOperations   = _rxCursor;
 
-    m_xBookmarkOperations   = m_xBookmarkOperations.query( m_xMoveOperations );
-    m_xColumnsSupplier      = m_xColumnsSupplier.query( m_xMoveOperations );
-    m_xPropertyAccess       = m_xPropertyAccess.query( m_xMoveOperations );
+    m_xBookmarkOperations.set(m_xMoveOperations, css::uno::UNO_QUERY);
+    m_xColumnsSupplier.set(m_xMoveOperations, css::uno::UNO_QUERY);
+    m_xPropertyAccess.set(m_xMoveOperations, css::uno::UNO_QUERY);
 
     if ( !m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is() || !m_xPropertyAccess.is() )
     {   // all or nothing !!
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 37529548cbc0..28c9515d0728 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -1042,7 +1042,7 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
     if ( xCont.is() && xElem.is() )
     {
         // normalize
-        m_xElement = m_xElement.query( xElem );
+        m_xElement.set(xElem, css::uno::UNO_QUERY);
         if ( m_eAction == Removed )
         {
             if (m_nIndex >= 0)
@@ -1235,7 +1235,7 @@ void FmUndoModelReplaceAction::Undo()
         Reference< XChild > xCurrentAsChild( xCurrentModel, UNO_QUERY );
         Reference< XNameContainer > xCurrentsParent;
         if ( xCurrentAsChild.is() )
-            xCurrentsParent = xCurrentsParent.query( xCurrentAsChild->getParent() );
+            xCurrentsParent.set(xCurrentAsChild->getParent(), css::uno::UNO_QUERY);
         DBG_ASSERT( xCurrentsParent.is(), "FmUndoModelReplaceAction::Undo: invalid current model!" );
 
         if ( xCurrentsParent.is() )
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index af99789063b6..bef9eb2b65e6 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1154,7 +1154,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         {
             Reference< XChild > xChild( xConnection, UNO_QUERY );
             if ( xChild.is() )
-                xDataSource = xDataSource.query( xChild->getParent() );
+                xDataSource.set(xChild->getParent(), css::uno::UNO_QUERY);
         }
 
         // obtain the data source
@@ -1452,8 +1452,8 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
             FmFormObj *pControl = static_cast<FmFormObj*>(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, NULL, NULL ));
             controlSize.Width() = Fraction(controlSize.Width(), 1) * eTargetMode.GetScaleX();
             controlSize.Height() = Fraction(controlSize.Height(), 1) * eTargetMode.GetScaleY();
-            ::Point controlPos( pOutDev->LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) );
-            ::Rectangle controlRect( controlPos, pOutDev->LogicToLogic( controlSize, eSourceMode, eTargetMode ) );
+            ::Point controlPos( OutputDevice::LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) );
+            ::Rectangle controlRect( controlPos, OutputDevice::LogicToLogic( controlSize, eSourceMode, eTargetMode ) );
             pControl->SetLogicRect(controlRect);
 
             // set the button label
@@ -1536,7 +1536,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
     ::Size aDefSize(4000, 500);
     ::Size aDefImageSize(4000, 4000);
 
-    ::Size aRealSize = _rOutDev.LogicToLogic(aTextSize, eTargetMode, eSourceMode);
+    ::Size aRealSize = OutputDevice::LogicToLogic(aTextSize, eTargetMode, eSourceMode);
     aRealSize.Width() = std::max(aRealSize.Width(), aDefTxtSize.Width());
     aRealSize.Height()= aDefSize.Height();
 
@@ -1575,8 +1575,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
         }
 
         pLabel->SetLogicRect( ::Rectangle(
-            _rOutDev.LogicToLogic( ::Point( _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
-            _rOutDev.LogicToLogic( aRealSize, eSourceMode, eTargetMode )
+            OutputDevice::LogicToLogic( ::Point( _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
+            OutputDevice::LogicToLogic( aRealSize, eSourceMode, eTargetMode )
         ) );
     }
 
@@ -1616,8 +1616,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
     aControlSize.Height() = long(Fraction(aControlSize.Height(), 1) * eTargetMode.GetScaleY());
 
     pControl->SetLogicRect( ::Rectangle(
-        _rOutDev.LogicToLogic( ::Point( aRealSize.Width() + _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
-        _rOutDev.LogicToLogic( aControlSize, eSourceMode, eTargetMode )
+        OutputDevice::LogicToLogic( ::Point( aRealSize.Width() + _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
+        OutputDevice::LogicToLogic( aControlSize, eSourceMode, eTargetMode )
     ) );
 
     // some initializations
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index c4fb5435a210..fd3c9576a6a5 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -203,12 +203,12 @@ namespace svxform
                 Reference< XChild > xChild( _rxControlModel, UNO_QUERY );
                 Reference< XPropertySet > xForm;
                 if ( xChild.is() )
-                    xForm = xForm.query( xChild->getParent() );
+                    xForm.set(xChild->getParent(), css::uno::UNO_QUERY);
 
                 if ( Reference< XGridColumnFactory >( xForm, UNO_QUERY ).is() )
                 {   // hmm. the model is a grid column, in real
-                    xChild = xChild.query( xForm );
-                    xForm = xForm.query( xChild->getParent() );
+                    xChild.set(xForm, css::uno::UNO_QUERY);
+                    xForm.set(xChild->getParent(), css::uno::UNO_QUERY);
                 }
 
                 OSL_ENSURE( xForm.is(), "lcl_getDataSourceIndirectProperties: could not determine the form!" );
@@ -219,7 +219,7 @@ namespace svxform
 
                 Reference< XPropertySet > xDsProperties;
                 if ( !sDataSourceName.isEmpty() )
-                    xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext ) );
+                    xDsProperties.set(OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext ), css::uno::UNO_QUERY);
                 if ( xDsProperties.is() )
                     xDsProperties->getPropertyValue("Info") >>= aInfo;
             }
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index f0d6f225762a..171da47a3a72 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3586,7 +3586,7 @@ bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstIn
                 continue;
 
             _rFirstInvalidityExplanation = xValidator->explainInvalid( xValidatable->getCurrentValue() );
-            _rxFirstInvalidModel = _rxFirstInvalidModel.query( xValidatable );
+            _rxFirstInvalidModel.set(xValidatable, css::uno::UNO_QUERY);
             return false;
         }
     }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 477c393a94eb..7f51429f48ae 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -517,7 +517,7 @@ namespace svxform
                         }
                         break;
                         default:
-                            if (pFormShell->GetImpl()->isControlConversionSlot(nSlotId))
+                            if (FmXFormShell::isControlConversionSlot(nSlotId))
                             {
                                 FmControlData* pCurrent = (FmControlData*)(*m_arrCurrentSelection.begin())->GetUserData();
                                 if ( pFormShell->GetImpl()->executeControlConversionSlot( pCurrent->GetFormComponent(), nSlotId ) )
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index b76fc1e098ae..a1d7c036418f 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -260,7 +260,7 @@ public:
     void SetForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm )
     {
         m_xForm = xForm;
-        m_xContainer = m_xContainer.query( m_xForm );
+        m_xContainer.set(m_xForm, css::uno::UNO_QUERY);
         newObject( m_xForm );
     }
 
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index dfd033a86d74..f4896db3759f 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -112,7 +112,7 @@ namespace sdr
             }
             else
             {
-                aPrefSize = Application::GetDefaultDevice()->LogicToLogic(aPrefSize, GetGrafObject().GetGrafPrefMapMode(), MAP_100TH_MM);
+                aPrefSize = OutputDevice::LogicToLogic(aPrefSize, GetGrafObject().GetGrafPrefMapMode(), MAP_100TH_MM);
             }
 
             // decompose object matrix to get single values
@@ -204,7 +204,7 @@ namespace sdr
                 }
                 else
                 {
-                    aPrefSize = Application::GetDefaultDevice()->LogicToLogic(aPrefSize, aDraftBitmap.GetPrefMapMode(), MAP_100TH_MM);
+                    aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aDraftBitmap.GetPrefMapMode(), MAP_100TH_MM);
                 }
 
                 const double fBitmapScaling(2.0);
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index d236a9c55b76..54107f63e778 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1082,7 +1082,7 @@ namespace sdr { namespace contact {
 
         m_pOutputDeviceForWindow = &_rDevice;
         m_aControl = aControl;
-        m_xContainer = m_xContainer.query( _rPageView.getControlContainer( _rDevice ) );
+        m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY);
         DBG_ASSERT( (   m_xContainer.is()                                           // either have a XControlContainer
                     ||  (   ( !_rPageView.getControlContainer( _rDevice ).is() )    // or don't have any container,
                         &&  ( dynamic_cast< const Window* >( &_rDevice ) == NULL )  // which is allowed for non-Window instances only
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 1eb4279137da..68a313e9f834 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -80,7 +80,7 @@ namespace drawinglayer
                     }
                     else
                     {
-                        aPrefSize = Application::GetDefaultDevice()->LogicToLogic(aPrefSize, aGraphic.GetPrefMapMode(), MAP_100TH_MM);
+                        aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aGraphic.GetPrefMapMode(), MAP_100TH_MM);
                     }
 
                     const double fOffsetX((aScale.getX() - aPrefSize.getWidth()) / 2.0);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 70812acbf8b9..6ba59252e8a8 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -982,7 +982,7 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
     SdrFormatter aFmt((MapUnit)eCoreMetric,(MapUnit)ePresMetric);
     aFmt.TakeStr(nValue,rText);
     OUString aStr;
-    aFmt.TakeUnitStr((MapUnit)ePresMetric,aStr);
+    SdrFormatter::TakeUnitStr((MapUnit)ePresMetric,aStr);
     rText += " " + aStr;
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         OUString aStr2;
@@ -1374,7 +1374,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
         OUString aStr;
 
         aFmt.TakeStr(nValue, rText);
-        aFmt.TakeUnitStr((MapUnit)ePresMetric, aStr);
+        SdrFormatter::TakeUnitStr((MapUnit)ePresMetric, aStr);
         rText += aStr;
     }
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 8124d7562de8..9e5b5f44c638 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -3672,7 +3672,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
     if( MAP_PIXEL == rGraphicObject.GetPrefMapMode().GetMapUnit() )
         aGraphicSize = Application::GetDefaultDevice()->PixelToLogic( aGraphicSize, aMapMode100thmm );
     else
-        aGraphicSize = Application::GetDefaultDevice()->LogicToLogic( aGraphicSize, rGraphicObject.GetPrefMapMode(), aMapMode100thmm);
+        aGraphicSize = OutputDevice::LogicToLogic( aGraphicSize, rGraphicObject.GetPrefMapMode(), aMapMode100thmm);
 
     if( aGraphicSize.A() == 0 || aGraphicSize.B() == 0 )
         return false;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 62785952fc57..c8a7ae73feca 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1141,7 +1141,7 @@ bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
             long nHitTol = 2000;
             OutputDevice* pRef = pTextEditOutliner->GetRefDevice();
             if( pRef )
-                nHitTol = pRef->LogicToLogic( nHitTol, MAP_100TH_MM, pRef->GetMapMode().GetMapUnit() );
+                nHitTol = OutputDevice::LogicToLogic( nHitTol, MAP_100TH_MM, pRef->GetMapMode().GetMapUnit() );
 
             bOk = pTextEditOutliner->IsTextPos( aPnt, (sal_uInt16)nHitTol );
         }
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 0ff149354218..f8b3f627f0ad 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -176,7 +176,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind
                         eMeasureUnit = eModUIUnit;
 
                     if(bShowUnit)
-                        pModel->TakeUnitStr(eMeasureUnit, aStr);
+                        SdrModel::TakeUnitStr(eMeasureUnit, aStr);
                 }
             }
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 20d676dd8077..6b0fc19e78dd 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1137,7 +1137,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
                     if( aSet.GetItemState( pMap->nWID ) != SFX_ITEM_SET )
                     {
                         // Default aus ItemPool holen
-                        if(GetModel()->GetItemPool().IsWhich(pMap->nWID))
+                        if(SfxItemPool::IsWhich(pMap->nWID))
                             aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID));
                     }
 
@@ -1226,7 +1226,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow
                 if(!aSet.Count())
                 {
                     // Default aus ItemPool holen
-                    if(GetModel()->GetItemPool().IsWhich(pMap->nWID))
+                    if(SfxItemPool::IsWhich(pMap->nWID))
                         aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID));
                 }
 
@@ -1559,7 +1559,7 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk
 
         default:
         {
-            if(  GetModel()->GetItemPool().IsWhich(pMap->nWID) )
+            if( SfxItemPool::IsWhich(pMap->nWID) )
             {
                 SfxItemSet aSet( GetModel()->GetItemPool(), pMap->nWID, pMap->nWID);
                 aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID));
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index eeb664ffe9d1..6034d5e183db 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -206,7 +206,7 @@ namespace {
             else
             {
                 // use 100th mm for primitive bitmap converter tool
-                const Size aSize100th(Application::GetDefaultDevice()->LogicToLogic(rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MapMode(MAP_100TH_MM)));
+                const Size aSize100th(OutputDevice::LogicToLogic(rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MapMode(MAP_100TH_MM)));
 
                 aRange.expand(basegfx::B2DPoint(aSize100th.Width(), aSize100th.Height()));
             }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 202ac3aa267b..1dd3bbacb820 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -638,7 +638,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
                         }
                         else
                         {
-                            if(rSet.GetPool()->IsWhich(pEntry->nWID))
+                            if(SfxItemPool::IsWhich(pEntry->nWID))
                                 rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
                             // setzen
                             SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
@@ -1715,7 +1715,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
                 if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET )
                 {
                     // Default aus ItemPool holen
-                    if(mpModel->GetItemPool().IsWhich(pMap->nWID))
+                    if(SfxItemPool::IsWhich(pMap->nWID))
                         pSet->Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
                 }
 
@@ -1811,7 +1811,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
             if(!aSet.Count())
             {
                 // Default aus ItemPool holen
-                if(mpModel->GetItemPool().IsWhich(pMap->nWID))
+                if(SfxItemPool::IsWhich(pMap->nWID))
                     aSet.Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
             }
 
@@ -3096,7 +3096,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
     }
 
     // Default aus ItemPool holen
-    if(!mpModel->GetItemPool().IsWhich(pMap->nWID))
+    if(!SfxItemPool::IsWhich(pMap->nWID))
         throw beans::UnknownPropertyException();
 
     SfxItemSet aSet( mpModel->GetItemPool(),    pMap->nWID, pMap->nWID);