loplugin:expandablemethodds in sc

Change-Id: Idda64b23ea91ec457b60279d851b7f01d8c02881
Reviewed-on: https://gerrit.libreoffice.org/30033
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

33 files changed, 25 insertions, 84 deletions

diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index fba3061cd555..7d4c737fde66 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -155,7 +155,6 @@ protected:
 
 private:
     bool isSelected() const;
-    bool isFocused() const;
 
     void updateStates();
 
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index b9f4ebabbe34..c150278631d1 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -96,7 +96,6 @@ protected:
 
 private:
     bool isSelected() const;
-    bool isFocused() const;
     void updateStateSet();
 
 private:
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 1beda6cdac30..9201638b701d 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -375,7 +375,6 @@ private:
 
         virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) override;
         void addFileId(sal_uInt16 nFileId);
-        void removeFileId(sal_uInt16 nFileId);
         const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
 
     private:
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 20423ef364fa..468d0c3891ba 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -171,8 +171,6 @@ public:
     formula::FormulaToken* CreateToken() const;   // create typified token
 
     static sal_Int32 GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array
-    static size_t GetStrLenBytes( sal_Int32 nLen )
-        { return nLen * sizeof(sal_Unicode); }
 };
 
 class SC_DLLPUBLIC ScCompiler : public formula::FormulaCompiler
@@ -262,7 +260,6 @@ private:
         const char* pOriginal;              // programmatical name
         const char* pUpper;                 // upper case programmatical name
     } g_aAddInMap[];
-    static const AddInMap* GetAddInMap();
     static size_t GetAddInMapCount();
 
     ScDocument* pDoc;
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 2dcee628e527..915d9d90d40e 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -555,7 +555,6 @@ public:
     void setFunction(css::sheet::GeneralFunction Function);
     css::uno::Sequence< css::sheet::GeneralFunction > getSubtotals() const;
     void setSubtotals(const css::uno::Sequence< css::sheet::GeneralFunction >& rFunctions);
-    static OUString getCurrentPage();
     void setCurrentPage(const OUString& sPage);
     void setUseCurrentPage(bool bUse);
     const css::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo();
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 9d12fccb00c7..ea5cca40fefa 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -73,8 +73,6 @@ public:
 
     static void GetDefaultFormulaSeparators(OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow);
 
-    static const LocaleDataWrapper& GetLocaleDataWrapper();
-
     ScFormulaOptions&  operator=  ( const ScFormulaOptions& rCpy );
     bool               operator== ( const ScFormulaOptions& rOpt ) const;
     bool               operator!= ( const ScFormulaOptions& rOpt ) const;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2c7ff4d3fcdd..920b75b3a761 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -113,7 +113,7 @@ void ScCompiler::fillFromAddInMap( const NonConstOpCodeMapPtr& xMap,FormulaGramm
             nSymbolOffset = offsetof( AddInMap, pEnglish);
             break;
     }
-    const AddInMap* pMap = GetAddInMap();
+    const AddInMap* pMap = g_aAddInMap;
     const AddInMap* const pStop = pMap + GetAddInMapCount();
     for ( ; pMap < pStop; ++pMap)
     {
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 2d853cfcc90d..beca64e37075 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -79,7 +79,7 @@ void ScFormulaOptions::GetDefaultFormulaSeparators(
         // the old separator set.
         return;
 
-    const LocaleDataWrapper& rLocaleData = GetLocaleDataWrapper();
+    const LocaleDataWrapper& rLocaleData = *ScGlobal::pLocaleData;
     const OUString& rDecSep  = rLocaleData.getNumDecimalSep();
     const OUString& rListSep = rLocaleData.getListSep();
 
@@ -117,11 +117,6 @@ void ScFormulaOptions::GetDefaultFormulaSeparators(
     rSepArrayRow = ";";
 }
 
-const LocaleDataWrapper& ScFormulaOptions::GetLocaleDataWrapper()
-{
-    return *ScGlobal::pLocaleData;
-}
-
 ScFormulaOptions& ScFormulaOptions::operator=( const ScFormulaOptions& rCpy )
 {
     bUseEnglishFuncName = rCpy.bUseEnglishFuncName;
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index c97d167be0e4..2b6e0998f425 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -135,11 +135,6 @@ const ScCompiler::AddInMap ScCompiler::g_aAddInMap[] =
     { "FVSCHEDULE", "FVSCHEDULE", "com.sun.star.sheet.addin.Analysis.getFvschedule", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETFVSCHEDULE" },
 };
 
-const ScCompiler::AddInMap* ScCompiler::GetAddInMap()
-{
-    return g_aAddInMap;
-}
-
 size_t ScCompiler::GetAddInMapCount()
 {
     return SAL_N_ELEMENTS(g_aAddInMap);
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index c5bac8d1c55f..47a3d2a0a831 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -357,7 +357,7 @@ void ScRawToken::SetExternal( const sal_Unicode* pStr )
     if( nLen >= MAXSTRLEN )
         nLen = MAXSTRLEN-1;
     // Platz fuer Byte-Parameter lassen!
-    memcpy( cStr+1, pStr, GetStrLenBytes( nLen ) );
+    memcpy( cStr+1, pStr, nLen * sizeof(sal_Unicode) );
     cStr[ nLen+1 ] = 0;
 }
 
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index 9d3ca7b980c1..29735feb55b0 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -40,7 +40,6 @@ public:
     ScBiffReader( SfxMedium& rMedium );
     ~ScBiffReader();
     bool recordsLeft() { return mpStream && !mpStream->IsEof(); }
-    bool IsEndOfFile() { return mbEndOfFile; }
     bool nextRecord();
 };
 #endif
diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx
index 0e871a0e303a..ce0276726468 100644
--- a/sc/source/filter/qpro/biff.cxx
+++ b/sc/source/filter/qpro/biff.cxx
@@ -55,7 +55,7 @@ bool ScBiffReader::nextRecord()
     if( !recordsLeft() )
         return false;
 
-    if( IsEndOfFile() )
+    if( mbEndOfFile )
         return false;
 
     sal_uInt32 nPos = mpStream->Tell();
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index b68e5db3bf2b..8095089f1730 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3050,8 +3050,7 @@ sal_Int32 ScXMLImport::GetRangeType(const OUString& sRangeType)
 
 void ScXMLImport::SetLabelRanges()
 {
-    ScMyLabelRanges* pLabelRanges = GetLabelRanges();
-    if (pLabelRanges)
+    if (pMyLabelRanges)
     {
         uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY);
         if (xPropertySet.is())
@@ -3067,8 +3066,8 @@ void ScXMLImport::SetLabelRanges()
                 table::CellRangeAddress aLabelRange;
                 table::CellRangeAddress aDataRange;
 
-                ScMyLabelRanges::iterator aItr = pLabelRanges->begin();
-                while (aItr != pLabelRanges->end())
+                ScMyLabelRanges::iterator aItr = pMyLabelRanges->begin();
+                while (aItr != pMyLabelRanges->end())
                 {
                     sal_Int32 nOffset1(0);
                     sal_Int32 nOffset2(0);
@@ -3084,7 +3083,7 @@ void ScXMLImport::SetLabelRanges()
                     }
 
                     delete *aItr;
-                    aItr = pLabelRanges->erase(aItr);
+                    aItr = pMyLabelRanges->erase(aItr);
                 }
             }
         }
@@ -3141,8 +3140,7 @@ public:
 
 void ScXMLImport::SetNamedRanges()
 {
-    ScMyNamedExpressions* pNamedExpressions = GetNamedExpressions();
-    if (!pNamedExpressions)
+    if (!m_pMyNamedExpressions)
         return;
 
     if (!pDoc)
@@ -3150,7 +3148,7 @@ void ScXMLImport::SetNamedRanges()
 
     // Insert the namedRanges
     ScRangeName* pRangeNames = pDoc->GetRangeName();
-    ::std::for_each(pNamedExpressions->begin(), pNamedExpressions->end(), RangeNameInserter(pDoc, *pRangeNames));
+    ::std::for_each(m_pMyNamedExpressions->begin(), m_pMyNamedExpressions->end(), RangeNameInserter(pDoc, *pRangeNames));
 }
 
 void ScXMLImport::SetSheetNamedRanges()
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 0e10678f5d70..b2eec2a3c3e8 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1098,15 +1098,12 @@ public:
         m_pMyNamedExpressions->push_back(std::unique_ptr<ScMyNamedExpression>(pMyNamedExpression));
     }
 
-    ScMyNamedExpressions* GetNamedExpressions() { return m_pMyNamedExpressions; }
-
     void AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp);
 
     void    AddLabelRange(const ScMyLabelRange* pMyLabelRange) {
         if (!pMyLabelRanges)
             pMyLabelRanges = new ScMyLabelRanges();
         pMyLabelRanges->push_back(pMyLabelRange); }
-    ScMyLabelRanges* GetLabelRanges() { return pMyLabelRanges; }
 
     void AddValidation(const ScMyImportValidation& rValidation) {
         if (!pValidations)
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 4078549c20d2..178b40a85ec8 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -340,11 +340,6 @@ bool ScAccessibleFilterMenu::isSelected() const
     return mpWindow->isMenuItemSelected(mnMenuPos);
 }
 
-bool ScAccessibleFilterMenu::isFocused() const
-{
-    return isSelected();
-}
-
 void ScAccessibleFilterMenu::updateStates()
 {
     if (!mxStateSet.is())
@@ -361,7 +356,7 @@ void ScAccessibleFilterMenu::updateStates()
     p->insert(SENSITIVE);
     p->insert(OPAQUE);
 
-    if (isFocused())
+    if (isSelected())
         p->insert(FOCUSED);
 
     if (isSelected())
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 16b03e1705a1..634bb7fc39bc 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -128,11 +128,6 @@ bool ScAccessibleFilterMenuItem::isSelected() const
     return mpWindow->isMenuItemSelected(mnMenuPos);
 }
 
-bool ScAccessibleFilterMenuItem::isFocused() const
-{
-    return isSelected();
-}
-
 void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled)
 {
     mbEnabled = bEnabled;
@@ -181,7 +176,7 @@ void ScAccessibleFilterMenuItem::updateStateSet()
     p->insert(SENSITIVE);
     p->insert(OPAQUE);
 
-    if (isFocused())
+    if (isSelected())
         p->insert(FOCUSED);
 
     if (isSelected())
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1f20584d7274..e0d961bc98ec 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1140,12 +1140,11 @@ static void lcl_ModifyRTLVisArea( EditView* pEditView )
 void ScTextWnd::InitEditEngine()
 {
     ScFieldEditEngine* pNew;
-    ScTabViewShell* pViewSh = GetViewShell();
     ScDocShell* pDocSh = nullptr;
-    if ( pViewSh )
+    if ( mpViewShell )
     {
-        pDocSh = pViewSh->GetViewData().GetDocShell();
-        ScDocument* pDoc = pViewSh->GetViewData().GetDocument();
+        pDocSh = mpViewShell->GetViewData().GetDocShell();
+        ScDocument* pDoc = mpViewShell->GetViewData().GetDocument();
         pNew = new ScFieldEditEngine(pDoc, pDoc->GetEnginePool(), pDoc->GetEditPool());
     }
     else
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 1d53ce0dfddb..da218c6bdea6 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -108,7 +108,6 @@ class SC_DLLPUBLIC ScRefHandler :
     bool                 m_bInRefMode;
 
 public:
-    operator vcl::Window *(){ return m_rWindow.get(); }
     friend class        formula::RefButton;
     friend class        formula::RefEdit;
 
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index a9047ededf71..7fd17358516f 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -127,8 +127,6 @@ public:
     /** Locks/unlocks the background layer that contains background objects.
         Unlocked layer is required to be able to edit the objects. */
     inline void     LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }
-    /** Unlocks the background layer that contains background objects. */
-    inline void     UnlockBackgroundLayer() { LockBackgroundLayer( false ); }
 
     /** Locks/unlocks the internal layer that contains caption objects of cell notes.
         Unlocked layer is required to be able to edit the contained objects. */
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 6e557460f8c4..8e550f5f940b 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -124,8 +124,6 @@ protected:
 
     void InitEditEngine();
 
-    ScTabViewShell* GetViewShell() { return mpViewShell;}
-
     typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector;
 
     OUString    aString;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index b6cf36b718b0..359be4889d81 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -124,9 +124,6 @@ public:
     using SfxTabPage::DeactivatePage;
     virtual void        ActivatePage( const SfxItemSet& ) override;
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
-
-    void                SetDocument(ScDocument* pPtr){pDoc = pPtr;}
-
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_TPVIEW_HXX
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 39d94a0d9b61..30f402625405 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -311,7 +311,6 @@ public:
     void            ShowNote( bool bShow );
     void            EditNote();
 
-    void            ForgetFormatArea()      { bFormatValid = false; }
     bool            SelectionEditable( bool* pOnlyNotBecauseOfMatrix = nullptr );
 
     SC_DLLPUBLIC void
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 532cf9cc2fc3..512af1b54b35 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -840,7 +840,7 @@ bool ScRefHandler::LeaveRefMode()
 
     lcl_HideAllReferences();
 
-    if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<vcl::Window*>(*this) ) )
+    if( Dialog *pDlg = dynamic_cast<Dialog*>( m_rWindow.get() ) )
         pDlg->SetModalInputMode(false);
     SetDispatcherLock( false );         //! here and in DoClose ?
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 4db904780c82..9e254fb83c93 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -459,7 +459,7 @@ VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window*          pParent,
     ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() );
 
     if(pDocSh!=nullptr)
-        pNew->SetDocument(&pDocSh->GetDocument());
+        pNew->pDoc = &pDocSh->GetDocument();
     return pNew;
 }
 
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index c77fa56a6311..2c34f0ba7080 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2958,7 +2958,7 @@ void ScChart2DataSequence::ExternalRefListener::notify(sal_uInt16 nFileId, ScExt
         }
         break;
         case ScExternalRefManager::LINK_BROKEN:
-            removeFileId(nFileId);
+            maFileIds.erase(nFileId);
         break;
     }
 }
@@ -2968,11 +2968,6 @@ void ScChart2DataSequence::ExternalRefListener::addFileId(sal_uInt16 nFileId)
     maFileIds.insert(nFileId);
 }
 
-void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId)
-{
-    maFileIds.erase(nFileId);
-}
-
 uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
     throw (uno::RuntimeException, std::exception)
 {
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 102c020fbddb..a6f7f5846842 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1964,7 +1964,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
     else if ( aPropertyName == SC_UNONAME_ORIENT )
         aRet <<= getOrientation();
     else if ( aPropertyName == SC_UNONAME_SELPAGE )
-        aRet <<= getCurrentPage();
+        aRet <<= OUString();
     else if ( aPropertyName == SC_UNONAME_USESELPAGE )
         aRet <<= false;
     else if ( aPropertyName == SC_UNONAME_HASAUTOSHOW )
@@ -2200,11 +2200,6 @@ void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubt
     }
 }
 
-OUString ScDataPilotFieldObj::getCurrentPage()
-{
-    return OUString();
-}
-
 void ScDataPilotFieldObj::setCurrentPage( const OUString& rPage )
 {
     SolarMutexGuard aGuard;
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 2035ba7d1454..a2880f9b372e 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -730,7 +730,7 @@ ScVbaFormat< Ifc... >::getNumberFormat(  ) throw (script::BasicErrorException, u
         {
             initializeNumberFormats();
 
-            sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() );
+            sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, m_aDefaultLocale );
             OUString sFormat;
             xNumberFormats->getByKey(nNewFormat)->getPropertyValue( FORMATSTRING ) >>= sFormat;
             aFormat = uno::makeAny( sFormat );
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 573f0664c892..983d60320b83 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -39,7 +39,6 @@ class ScVbaFormat : public InheritedHelperInterfaceWeakImpl< Ifc... >
 typedef InheritedHelperInterfaceWeakImpl< Ifc... > ScVbaFormat_BASE;
     css::lang::Locale m_aDefaultLocale;
 protected:
-    const css::lang::Locale& getDefaultLocale() { return m_aDefaultLocale; }
     css::uno::Reference< css::beans::XPropertySet > mxPropertySet;
     css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier;
     css::uno::Reference< css::util::XNumberFormats > xNumberFormats;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index a49e5a2ee344..60f48d1d5685 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1707,9 +1707,9 @@ ScVbaRange::getCount() throw (uno::RuntimeException, std::exception)
     rowCount = xColumnRowRange->getRows()->getCount();
     colCount = xColumnRowRange->getColumns()->getCount();
 
-    if( IsRows() )
+    if( mbIsRows )
         return rowCount;
-    if( IsColumns() )
+    if( mbIsColumns )
         return colCount;
     return rowCount * colCount;
 }
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 6ebc7bbd7db8..6b7925f23df8 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -196,8 +196,6 @@ public:
     virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) override;
     // Methods
-    bool IsRows() const { return mbIsRows; }
-    bool IsColumns() const { return mbIsColumns; }
     virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 9bf969152c6b..03e5746995d9 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -777,7 +777,7 @@ bool ScDrawView::SelectObject( const OUString& rName )
                 !pDoc->IsTabProtected( nTab ) &&
                 !pViewData->GetSfxDocShell()->IsReadOnly() )
         {
-            UnlockBackgroundLayer();
+            LockBackgroundLayer(false);
         }
 
         SdrPageView* pPV = GetSdrPageView();
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 0d38a6eeb618..ce51ee47bf0f 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -157,7 +157,6 @@ public:
     // This assumes that a formula cell has already been calculated.
     sal_uLong GetResultValueFormat() const { return nValueFormat;}
 
-    sal_uLong   GetValueFormat() const                  { return nValueFormat; }
     bool    GetLineBreak() const                    { return bLineBreak; }
     bool    IsRepeat() const                        { return bRepeat; }
     bool    IsShrink() const                        { return bShrink; }
@@ -498,7 +497,7 @@ bool ScDrawStringsVars::SetText( ScRefCellValue& rCell )
             maLastCell = rCell;          // store cell
 
             Color* pColor;
-            sal_uLong nFormat = GetValueFormat();
+            sal_uLong nFormat = nValueFormat;
             ScCellFormat::GetString( rCell,
                                      nFormat, aString, &pColor,
                                      *pOutput->mpDoc->GetFormatTable(),
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 8c5ff00774fc..4c475a7296a7 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1811,7 +1811,7 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags nFlags )
     if ( nFlags & InsertDeleteFlags::ATTRIB )
     {
         if ( nFlags & InsertDeleteFlags::CONTENTS )
-            ForgetFormatArea();
+            bFormatValid = false;
         else
             StartFormatArea();              // delete attribute is also attribute-change
     }