loplugin:staticcall

Change-Id: I670fbcd83e368f2821d37a392cbc007b1f4cd55e

25 files changed, 37 insertions, 37 deletions

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index e682d6aca14b..cd65d0987af2 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -85,7 +85,7 @@ void ScMacrosTest::testMSP()
     ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell);
     CPPUNIT_ASSERT(xDocSh != NULL);
 
-    pFoundShell->CallXScript(
+    SfxObjectShell::CallXScript(
         xComponent,
         "vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basic&location=document",
         aParams, aRet, aOutParamIndex, aOutParam);
@@ -118,7 +118,7 @@ void ScMacrosTest::testStarBasic()
     ScDocShell* xDocSh = static_cast<ScDocShell*>(pFoundShell);
     ScDocument* pDoc = xDocSh->GetDocument();
 
-    pFoundShell->CallXScript(
+    SfxObjectShell::CallXScript(
         xComponent,
         "vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document",
         aParams, aRet, aOutParamIndex, aOutParam);
@@ -261,7 +261,7 @@ void ScMacrosTest::testVba()
         CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
         std::cout << "about to invoke vba test in " << OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
 
-        pFoundShell->CallXScript(
+        SfxObjectShell::CallXScript(
             xComponent, testInfo[i].sMacroUrl, aParams, aRet, aOutParamIndex,
             aOutParam);
         OUString aStringRes;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c59431cde88c..5ed260e6871b 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3360,7 +3360,7 @@ void ScInterpreter::ScMacro()
         }
 
         SbxDataType eResType = refRes->GetType();
-        if( pVar->GetError() )
+        if( SbxBase::GetError() )
         {
             SetError( errNoValue);
         }
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 4c5bdb98bab9..81f8cd3be35c 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1077,8 +1077,8 @@ bool XclExpXmlStream::exportDocument()
     aRoot.GetOldRoot().pER = &aRoot;
     aRoot.GetOldRoot().eDateiTyp = Biff8;
     // Get the viewsettings before processing
-    if( pShell->GetViewData() )
-        pShell->GetViewData()->WriteExtOptions( mpRoot->GetExtDocOptions() );
+    if( ScDocShell::GetViewData() )
+        ScDocShell::GetViewData()->WriteExtOptions( mpRoot->GetExtDocOptions() );
 
     OUString const workbook = "xl/workbook.xml";
     PushStream( CreateOutputStream( workbook, workbook,
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 33eca254ca0b..5051ee0f013d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3909,7 +3909,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads
                 if (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899)
                 {
                     OUStringBuffer sDate;
-                    GetMM100UnitConverter().convertDateTime(sDate, 0.0, aNullDate);
+                    SvXMLUnitConverter::convertDateTime(sDate, 0.0, aNullDate);
                     AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_VALUE, sDate.makeStringAndClear());
                     SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true);
                 }
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 947ae2f05757..c5a5eb465b36 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1377,7 +1377,7 @@ void ScMultiTextWnd::InitEditEngine()
 
     {
         SfxItemSet* pSet = new SfxItemSet( pEditEngine->GetEmptyItemSet() );
-        pEditEngine->SetFontInfoInItemSet( *pSet, aTextFont );
+        EditEngine::SetFontInfoInItemSet( *pSet, aTextFont );
         lcl_ExtendEditFontAttribs( *pSet );
         // turn off script spacing to match DrawText output
         pSet->Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) );
@@ -1754,7 +1754,7 @@ void ScTextWnd::StartEditEngine()
 
         {
             SfxItemSet* pSet = new SfxItemSet( pEditEngine->GetEmptyItemSet() );
-            pEditEngine->SetFontInfoInItemSet( *pSet, aTextFont );
+            EditEngine::SetFontInfoInItemSet( *pSet, aTextFont );
             lcl_ExtendEditFontAttribs( *pSet );
             // turn off script spacing to match DrawText output
             pSet->Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) );
@@ -1996,7 +1996,7 @@ void ScTextWnd::MakeDialogEditView()
     pEditEngine->SetPaperSize( Size( bIsRTL ? USHRT_MAX : THESIZE, 300 ) );
 
     SfxItemSet* pSet = new SfxItemSet( pEditEngine->GetEmptyItemSet() );
-    pEditEngine->SetFontInfoInItemSet( *pSet, aTextFont );
+    EditEngine::SetFontInfoInItemSet( *pSet, aTextFont );
     lcl_ExtendEditFontAttribs( *pSet );
     if ( bIsRTL )
         lcl_ModifyRTLDefaults( *pSet );
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 60dd912d4eb5..d3a0c9c5a8e8 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -152,7 +152,7 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl)
 
     m_pEdName->SetText( aName );
 
-    if ( !pDoc->ValidTabName( aName ) )
+    if ( !ScDocument::ValidTabName( aName ) )
     {
         InfoBox( this, ScGlobal::GetRscString( STR_INVALIDTABNAME ) ).Execute();
         m_pEdName->GrabFocus();
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 71d1368c3872..2cafae98e2ea 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -79,7 +79,7 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const OUString& rItem ) :
     {
         //  parse ref
         ScDocument* pDoc = pDocSh->GetDocument();
-        SCTAB nTab = pDocSh->GetCurTab();
+        SCTAB nTab = ScDocShell::GetCurTab();
         aRange.aStart.SetTab( nTab );
 
         // For DDE link, we always must parse references using OOO A1 convention.
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index cb9f3df0f361..5ff5a5471736 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -109,7 +109,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
     if ( pInputHdl )
         pInputHdl->NotifyChange( NULL );
 
-    m_aHelper.enableInput( false );
+    ScFormulaReferenceHelper::enableInput( false );
     m_aHelper.EnableSpreadsheets();
     m_aHelper.Init();
     m_aHelper.SetDispatcherLock( true );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index d713524a91ba..34c80387222a 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -878,7 +878,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle)
         pViewFrm->ShowChildWindow(nAcceptId,false);
         pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle));
         pWnd->SetRefString(pTPFilter->GetRange());
-        pWnd->SetAutoReOpen(false);
+        ScSimpleRefDlgWrapper::SetAutoReOpen(false);
         Window* pWin=pWnd->GetWindow();
         pWin->SetPosSizePixel(GetPosPixel(),GetSizePixel());
         Hide();
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 7e226366a556..e11cd1b247fb 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -821,7 +821,7 @@ bool ScRefHandler::EnterRefMode()
     if ( pInputHdl )
         pInputHdl->NotifyChange( NULL );
 
-    m_aHelper.enableInput( false );
+    ScFormulaReferenceHelper::enableInput( false );
 
     m_aHelper.EnableSpreadsheets();
 
@@ -963,14 +963,14 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool
     {
         if(m_rWindow.IsVisible())
         {
-            m_aHelper.enableInput( false );
+            ScFormulaReferenceHelper::enableInput( false );
             m_aHelper.EnableSpreadsheets();
             m_aHelper.SetDispatcherLock( true );
             aTimer.Start();
         }
         else
         {
-            m_aHelper.enableInput( true );
+            ScFormulaReferenceHelper::enableInput( true );
             m_aHelper.SetDispatcherLock( false );           /*//! here and in DoClose ?*/
         }
     }
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 676012cd03ba..51d292d6ba26 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -288,7 +288,7 @@ void ScInsertTableDlg::DoEnable_Impl()
 
 IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl)
 {
-    if(nTableCount > 1 || rDoc.ValidTabName(m_pEdName->GetText()))
+    if(nTableCount > 1 || ScDocument::ValidTabName(m_pEdName->GetText()))
     {
         EndDialog(RET_OK);
     }
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index 4f5034b48617..89e37f823d2d 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -144,7 +144,7 @@ void ScRedComDialog::SelectCell()
 
         if(rRange.IsValid(pDocShell->GetDocument()))
         {
-            ScViewData* pViewData=pDocShell->GetViewData();
+            ScViewData* pViewData=ScDocShell::GetViewData();
             ScRange aRef=rRange.MakeRange();
             ScTabView* pTabView=pViewData->GetView();
             pTabView->MarkRange(aRef);
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 8d8e4d841ce3..52fde2ef009e 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -47,7 +47,7 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool )
         maRangeMap.insert(aTemp, new ScRangeName(*itr->second));
     }
 
-    ScViewData* pViewData = pShell->GetViewData();
+    ScViewData* pViewData = ScDocShell::GetViewData();
     ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo());
     SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("ctrl");
     Size aControlSize(210, 0);
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 0c5c495cdec2..aaa58ec792be 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -2174,7 +2174,7 @@ bool ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 
 void ScUndoRemoveMerge::SetCurTab()
 {
-    SCTAB nCurTab = pDocShell->GetCurTab();
+    SCTAB nCurTab = ScDocShell::GetCurTab();
     aBlockRange.aStart.SetTab(nCurTab);
     aBlockRange.aEnd.SetTab(nCurTab);
 }
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 03edabff1fba..736d140c5b0d 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -677,7 +677,7 @@ void ScUndoMerge::DoChange( bool bUndo ) const
     ScDocument* pDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    ScRange aCurRange = maOption.getSingleRange(pDocShell->GetCurTab());
+    ScRange aCurRange = maOption.getSingleRange(ScDocShell::GetCurTab());
     ScUndoUtil::MarkSimpleBlock(pDocShell, aCurRange);
 
     for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index 409cb0bc1b54..4b41c4e92119 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -196,7 +196,7 @@ namespace calc
         OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" );
         Reference< XTextRange > xCellText;
         if ( m_xRange.is() )
-            xCellText.set(xCellText.query( m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ) ));
+            xCellText.set(m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ), css::uno::UNO_QUERY);
 
         OUString sText;
         if ( xCellText.is() )
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 3b808f922354..3aee78f04be6 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -561,7 +561,7 @@ namespace calc
             // first the sheets collection
             Reference< XIndexAccess > xSheets;
             if ( m_xDocument.is() )
-                xSheets.set(xSheets.query( m_xDocument->getSheets( ) ));
+                xSheets.set(m_xDocument->getSheets( ), css::uno::UNO_QUERY);
             OSL_ENSURE( xSheets.is(), "OCellValueBinding::initialize: could not retrieve the sheets!" );
 
             if ( xSheets.is() )
@@ -588,7 +588,7 @@ namespace calc
             throw Exception();
             // TODO error message
 
-        m_xCellText.set(m_xCellText.query( m_xCell ));
+        m_xCellText.set(m_xCell, css::uno::UNO_QUERY);
 
         Reference<XModifyBroadcaster> xBroadcaster( m_xCell, UNO_QUERY );
         if ( xBroadcaster.is() )
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 809be5139b66..75d34169cf2c 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1206,7 +1206,7 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang
             ScDocument* pDoc = pDocSh->GetDocument();
             if ( pDoc )
             {
-                SCTAB nCurTab = pDocSh->GetCurTab();
+                SCTAB nCurTab = ScDocShell::GetCurTab();
                 ScRangeName* pRangeName = pDoc->GetRangeName(nCurTab);
                 if (pRangeName)
                 {
@@ -4285,7 +4285,7 @@ static void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
 {
     if ( pDocShell )
     {
-        ScViewData* pViewData = pDocShell->GetViewData();
+        ScViewData* pViewData = ScDocShell::GetViewData();
         if ( pViewData )
         {
             OSL_TRACE("Pushing out SelectAll query");
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 9ca1e1a4a4b6..5e59b6cac486 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1750,7 +1750,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                 if( !bCommonTerms )
                                     nOptions |= i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 
-                                Font aTargetFont = GetViewData()->GetActiveWin()->GetDefaultFont(
+                                Font aTargetFont = OutputDevice::GetDefaultFont(
                                                     DEFAULTFONT_CJK_SPREADSHEET,
                                                     eTargetLang, DEFAULTFONT_FLAGS_ONLYONE );
                                 ScConversionParam aConvParam( SC_CONVERSION_CHINESE_TRANSL,
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 3ab047f6384b..9a5cd3f2dfee 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -451,7 +451,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
                         //  first test, if the prefix is recognised as valid,
                         //  else avoid only doubles
-                        bool bPrefix = pDoc->ValidTabName( aBaseName );
+                        bool bPrefix = ScDocument::ValidTabName( aBaseName );
                         OSL_ENSURE(bPrefix, "ungueltiger Tabellenname");
 
                         while ( pDoc->IsScenario(nTab+i) )
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d3d655f92bc7..790f7499e3fb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -962,7 +962,7 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
     long nHeight = 0;
     pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
     // The button height should not use the merged cell height, should still use single row height
-    nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
+    nSizeY = ScViewData::ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
     Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich );
     if ( bLayoutRTL )
         aPos.X() -= nSizeX;
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 357b4191b7a3..d308eee6a2b7 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -125,7 +125,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent&
     long nSizeX, nSizeY;
     pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
     // The button height should not use the merged cell height, should still use single row height
-    nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
+    nSizeY = ScViewData::ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
     Size aScrSize(nSizeX-1, nSizeY-1);
 
     // Check if the mouse cursor is clicking on the popup arrow box.
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2625a96376dc..69de77b6ebcf 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1192,7 +1192,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out
                     //should first get the start pos of the merge area, then get the nSizeX through the start pos.
                     pDoc->ExtendOverlapped(nStartCol, nStartRow,nCol, nRow, nTab);//get nStartCol,nStartRow
                     pViewData->GetMergeSizePixel( nStartCol, nStartRow, nSizeX, nSizeY );//get nSizeX
-                    nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
+                    nSizeY = ScViewData::ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
                     Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 
                     aCellBtn.setBoundingBox(aScrPos, Size(nSizeX-1, nSizeY-1), bLayoutRTL);
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index b0071fad92a8..faec9a910545 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -166,21 +166,21 @@ void ScNoteMarker::InvalidateWin()
 {
     if (bVisible)
     {
-        pWindow->Invalidate( pWindow->LogicToLogic(aRect, aMapMode, pWindow->GetMapMode()) );
+        pWindow->Invalidate( OutputDevice::LogicToLogic(aRect, aMapMode, pWindow->GetMapMode()) );
 
         if ( pRightWin || pBottomWin )
         {
             Size aWinSize = pWindow->PixelToLogic( pWindow->GetOutputSizePixel(), aMapMode );
             if ( pRightWin )
-                pRightWin->Invalidate( pRightWin->LogicToLogic(aRect,
+                pRightWin->Invalidate( OutputDevice::LogicToLogic(aRect,
                                         lcl_MoveMapMode( aMapMode, Size( aWinSize.Width(), 0 ) ),
                                         pRightWin->GetMapMode()) );
             if ( pBottomWin )
-                pBottomWin->Invalidate( pBottomWin->LogicToLogic(aRect,
+                pBottomWin->Invalidate( OutputDevice::LogicToLogic(aRect,
                                         lcl_MoveMapMode( aMapMode, Size( 0, aWinSize.Height() ) ),
                                         pBottomWin->GetMapMode()) );
             if ( pDiagWin )
-                pDiagWin->Invalidate( pDiagWin->LogicToLogic(aRect,
+                pDiagWin->Invalidate( OutputDevice::LogicToLogic(aRect,
                                         lcl_MoveMapMode( aMapMode, aWinSize ),
                                         pDiagWin->GetMapMode()) );
         }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 1e583b4bc4ac..08cf2c5001a3 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1237,7 +1237,7 @@ void ScTabViewShell::StartSimpleRefDialog(
                            LINK( this, ScTabViewShell, SimpleRefChange ) );
         pWnd->SetRefString( rInitVal );
         pWnd->SetFlags( bCloseOnButtonUp, bSingleCell, bMultiSelection );
-        pWnd->SetAutoReOpen( false );
+        ScSimpleRefDlgWrapper::SetAutoReOpen( false );
         Window* pWin = pWnd->GetWindow();
         pWin->SetText( rTitle );
         pWnd->StartRefInput();