diff options
69 files changed, 82 insertions, 308 deletions
diff --git a/compilerplugins/clang/singlevalfields.py b/compilerplugins/clang/singlevalfields.py index 47c4c0d806c1..403ccbcd03d7 100755 --- a/compilerplugins/clang/singlevalfields.py +++ b/compilerplugins/clang/singlevalfields.py @@ -38,15 +38,18 @@ for fieldInfo, assignValues in fieldAssignDict.iteritems(): continue if "?" in assignValues: continue - # if it contains anything other than this set, ignore it - if len(assignValues - set(["0", "1", "-1", "nullptr"])) > 0: - continue + #if len(assignValues - set(["0", "1", "-1", "nullptr"])) > 0: + # continue # ignore things which are locally declared but are actually redeclarations of things from 3rd party code - parentClass = fieldInfo[0] - if parentClass == "_mwmhints": + containingClass = fieldInfo[0] + if containingClass == "_mwmhints": continue # ignore things which are representations of on-disk structures - if parentClass in ["SEPr", "WW8Dop", ]: + if containingClass in ["SEPr", "WW8Dop", "BmpInfoHeader", "BmpFileHeader", "Exif::ExifIFD", + "sw::WW8FFData", "FFDataHeader", "INetURLHistory_Impl::head_entry"]: + continue + # Windows-only + if containingClass in ["SfxAppData_Impl", "sfx2::ImplDdeItem"]: continue v0 = fieldInfo[0] + " " + fieldInfo[1] v1 = (",".join(assignValues)) diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 35d6a50c60b8..45a0c9675512 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -681,7 +681,6 @@ public: SAL_DLLPRIVATE bool ImportFromGeneratedStream_Impl( const css::uno::Reference< css::io::XStream >& xStream, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr ); - SAL_DLLPRIVATE void PositionView_Impl(); SAL_DLLPRIVATE void UpdateFromTemplate_Impl(); SAL_DLLPRIVATE bool CanReload_Impl(); SAL_DLLPRIVATE void SetNamedVisibility_Impl(); diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 162096429405..088ca7f37fc3 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -268,7 +268,6 @@ class ScQueryCellIterator // walk through all non-empty cells in an ar std::unique_ptr<ScQueryParam> mpParam; ScDocument* pDoc; - const ScAttrArray* pAttrArray; SCTAB nTab; SCCOL nCol; SCROW nRow; @@ -459,7 +458,6 @@ private: SCROW nCurRow; SCTAB nCurTab; SCROW nAttrEndRow; - bool bNumValid; bool bCalcAsShown; public: diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 25dc77e7a785..8e32685b8f2f 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -775,14 +775,9 @@ class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper< css::lang::XServiceInfo>, public SfxListener { -private: - ScDocShell* pDocShell; - public: virtual ~ScSpreadsheetSettingsObj() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - /// XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c532583740e1..998f77491cec 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -308,7 +308,6 @@ class ScDPDimension : public cppu::WeakImplHelper< ScDPSource* pSource; long nDim; // dimension index (== column ID) rtl::Reference<ScDPHierarchies> mxHierarchies; - long nUsedHier; sal_uInt16 nFunction; // enum GeneralFunction OUString aName; // if empty, take from source std::unique_ptr<OUString> mpLayoutName; @@ -401,7 +400,7 @@ public: bool getIsDataLayoutDimension() const; sal_uInt16 getFunction() const { return nFunction;} void setFunction(sal_uInt16 nNew); // for data dimension - long getUsedHierarchy() const { return nUsedHier;} + static long getUsedHierarchy() { return 0;} bool HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); @@ -416,7 +415,9 @@ class ScDPHierarchies : public cppu::WeakImplHelper< private: ScDPSource* pSource; long nDim; - long nHierCount; + // date columns have 3 hierarchies (flat/quarter/week), other columns only one + // #i52547# don't offer the incomplete date hierarchy implementation + static const long nHierCount = 1; ScDPHierarchy** ppHiers; public: @@ -446,7 +447,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - long getCount() const; + static long getCount(); ScDPHierarchy* getByIndex(long nIndex) const; }; diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index a5675c7353a3..842ae88737c5 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -51,8 +51,6 @@ public: ScStyleSheet* FindCaseIns( const OUString& rName, SfxStyleFamily eFam ); - const OUString* GetForceStdName() const { return pForceStdName; } - virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam, sal_uInt16 nMask = SFXSTYLEBIT_ALL) override; @@ -69,7 +67,6 @@ protected: private: SfxStyleSheetBase* pActualStyleSheet; ScDocument* pDoc; - const OUString* pForceStdName; }; #endif // INCLUDED_SC_INC_STLPOOL_HXX diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index bebbc0f87a1b..b8309aa64df1 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -55,10 +55,6 @@ public: virtual bool HasFollowSupport () const override; virtual bool HasParentSupport () const override; - virtual const OUString& GetName() const override; - virtual const OUString& GetParent() const override; - virtual const OUString& GetFollow() const override; - virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) override; void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 22f803400ac3..b9bc4db58ac6 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1081,7 +1081,6 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; } } - pAttrArray = nullptr; } void ScQueryCellIterator::InitPos() @@ -2170,7 +2169,6 @@ ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument, const ScRange& rRange ) : pDoc( pDocument ), nEndTab( rRange.aEnd.Tab() ), - bNumValid( false ), bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ) { SCCOL nStartCol = rRange.aStart.Col(); @@ -2226,7 +2224,6 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) { case CELLTYPE_VALUE: { - bNumValid = false; rValue = pCell->mfValue; rErr = 0; if ( bCalcAsShown ) @@ -2245,7 +2242,6 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) if (rErr || pCell->mpFormula->IsValue()) { rValue = pCell->mpFormula->GetValue(); - bNumValid = false; bFound = true; } } diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 498c11c3434c..859b0caa929f 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -626,8 +626,8 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool for (; it != itEnd; ++it) { ScDPDimension* pDim = GetDimensionsObject()->getByIndex(*it); - long nHierarchy = pDim->getUsedHierarchy(); - if ( nHierarchy >= pDim->GetHierarchiesObject()->getCount() ) + long nHierarchy = ScDPDimension::getUsedHierarchy(); + if ( nHierarchy >= ScDPHierarchies::getCount() ) nHierarchy = 0; ScDPLevels* pLevels = pDim->GetHierarchiesObject()->getByIndex(nHierarchy)->GetLevelsObject(); long nCount = pLevels->getCount(); @@ -904,8 +904,8 @@ void ScDPSource::CreateRes_Impl() for (it = maPageDims.begin(), itEnd = maPageDims.end(); it != itEnd; ++it) { ScDPDimension* pDim = GetDimensionsObject()->getByIndex(*it); - long nHierarchy = pDim->getUsedHierarchy(); - if ( nHierarchy >= pDim->GetHierarchiesObject()->getCount() ) + long nHierarchy = ScDPDimension::getUsedHierarchy(); + if ( nHierarchy >= ScDPHierarchies::getCount() ) nHierarchy = 0; ScDPLevels* pLevels = pDim->GetHierarchiesObject()->getByIndex(nHierarchy)->GetLevelsObject(); @@ -1017,8 +1017,8 @@ void ScDPSource::FillLevelList( sal_uInt16 nOrientation, std::vector<ScDPLevel*> OSL_ENSURE( pDim->getOrientation() == nOrientation, "orientations are wrong" ); ScDPHierarchies* pHiers = pDim->GetHierarchiesObject(); - long nHierarchy = pDim->getUsedHierarchy(); - if ( nHierarchy >= pHiers->getCount() ) + long nHierarchy = ScDPDimension::getUsedHierarchy(); + if ( nHierarchy >= ScDPHierarchies::getCount() ) nHierarchy = 0; ScDPHierarchy* pHier = pHiers->getByIndex(nHierarchy); ScDPLevels* pLevels = pHier->GetLevelsObject(); @@ -1324,7 +1324,6 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : pSource( pSrc ), nDim( nD ), - nUsedHier( 0 ), nFunction( SUBTOTAL_FUNC_SUM ), // sum is default mpLayoutName(nullptr), mpSubtotalName(nullptr), @@ -1436,7 +1435,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData() long nLevel = 0; long nHierarchy = getUsedHierarchy(); - if ( nHierarchy >= GetHierarchiesObject()->getCount() ) + if ( nHierarchy >= ScDPHierarchies::getCount() ) nHierarchy = 0; ScDPLevels* pLevels = GetHierarchiesObject()->getByIndex(nHierarchy)->GetLevelsObject(); long nLevCount = pLevels->getCount(); @@ -1673,11 +1672,6 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : ppHiers( nullptr ) { //TODO: hold pSource - - // date columns have 3 hierarchies (flat/quarter/week), other columns only one - - // #i52547# don't offer the incomplete date hierarchy implementation - nHierCount = 1; } ScDPHierarchies::~ScDPHierarchies() @@ -1743,7 +1737,7 @@ sal_Bool SAL_CALL ScDPHierarchies::hasElements() throw(uno::RuntimeException, st // end of XNameAccess implementation -long ScDPHierarchies::getCount() const +long ScDPHierarchies::getCount() { return nHierCount; } diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 9b2a5ce56488..d1f06ce05bc7 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -59,8 +59,7 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, ScDocument* pDocument ) : SfxStyleSheetPool( rPoolP ), pActualStyleSheet( nullptr ), - pDoc( pDocument ), - pForceStdName( nullptr ) + pDoc( pDocument ) { } diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 4ec5248a3bbb..323545cc2897 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -274,39 +274,6 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) GetItemSet().SetParent( nullptr ); } -// Dirty tricks, to always save the default template as "standard" -// even though when shown to the user it is renamed: - -const OUString& ScStyleSheet::GetName() const -{ - const OUString& rBase = SfxStyleSheet::GetName(); - const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); - if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) - return *pForceStdName; - else - return rBase; -} - -const OUString& ScStyleSheet::GetParent() const -{ - const OUString& rBase = SfxStyleSheet::GetParent(); - const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); - if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) - return *pForceStdName; - else - return rBase; -} - -const OUString& ScStyleSheet::GetFollow() const -{ - const OUString& rBase = SfxStyleSheet::GetFollow(); - const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); - if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) - return *pForceStdName; - else - return rBase; -} - // Avoid creating a Style "Standard" if this is not the Standard-Name; // otherwise two styles would have the same name when storing. // (on loading the style is created directly per Make with the name; making this query diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 7f25321e23c9..e5f0a1ecc63f 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -948,7 +948,7 @@ public: DynamicKernelSlidingArgument( const ScCalcConfig& config, const std::string& s, FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen, int index = 0 ) : - Base(config, s, ft, index), mpCodeGen(CodeGen), mpClmem2(nullptr) + Base(config, s, ft, index), mpCodeGen(CodeGen) { FormulaToken* t = ft->GetFormulaToken(); if (t->GetType() != formula::svDoubleVectorRef) @@ -1101,13 +1101,6 @@ public: } ~DynamicKernelSlidingArgument() { - if (mpClmem2) - { - cl_int err; - err = clReleaseMemObject(mpClmem2); - SAL_WARN_IF(err != CL_SUCCESS, "sc.opencl", "clReleaseMemObject failed: " << ::opencl::errorString(err)); - mpClmem2 = nullptr; - } } size_t GetArrayLength() const { return mpDVR->GetArrayLength(); } @@ -1123,8 +1116,6 @@ protected: const formula::DoubleVectorRefToken* mpDVR; // from parent nodes std::shared_ptr<SlidingFunctionBase> mpCodeGen; - // controls whether to invoke the reduction kernel during marshaling or not - cl_mem mpClmem2; }; /// A mixed string/numberic vector diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index d219c6e4692f..d85372117cc5 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -95,7 +95,7 @@ private: // constants used in determining best fit for alpha, beta, gamma const double cfMinABCResolution = 0.001; // minimum change of alpha, beta, gamma - const SCSIZE cnScenarios = 1000; // No. of scenarios to calculate for PI calculations + static const SCSIZE cnScenarios = 1000; // No. of scenarios to calculate for PI calculations bool initData(); bool prefillBaseData(); diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index f6c1cb61bbc4..ae8c59b9009f 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -31,11 +31,8 @@ const sal_uInt16 TokenPool::nScTokenOff = 8192; TokenStack::TokenStack( ) { - const sal_uInt16 nNewSize = 1024; - pStack = new TokenId[ nNewSize ]; - + pStack = new TokenId[ nSize ]; Reset(); - nSize = nNewSize; } TokenStack::~TokenStack() @@ -74,7 +71,6 @@ TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : pP_Dbl = new double[ nP_Dbl ]; // pool for error codes - nP_Err = 8; pP_Err = new sal_uInt16[ nP_Err ]; // pool for References diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 98b40a150041..e6eb8e3bd4fe 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -80,12 +80,12 @@ private: sal_uInt16 nP_Str; // ...with size sal_uInt16 nP_StrAkt; // ...and Write-Mark - double* pP_Dbl; // Pool for Doubles + double* pP_Dbl; // Pool for Doubles sal_uInt16 nP_Dbl; sal_uInt16 nP_DblAkt; sal_uInt16* pP_Err; // Pool for error codes - sal_uInt16 nP_Err; + static const sal_uInt16 nP_Err = 8; sal_uInt16 nP_ErrAkt; ScSingleRefData** ppP_RefTr; // Pool for References @@ -221,9 +221,9 @@ class TokenStack { private: - TokenId* pStack; // Stack as Array - sal_uInt16 nPos; // Write-mark - sal_uInt16 nSize; // first Index outside of stack + TokenId* pStack; // Stack as Array + sal_uInt16 nPos; // Write-mark + static const sal_uInt16 nSize = 1024; // first Index outside of stack public: TokenStack(); ~TokenStack(); diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index bf5f3e93bdc8..b6fb1c480fc9 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -88,7 +88,6 @@ private: FormIdent aIdents[ nSize_ ]; //gepufferte Formate bool bValid[ nSize_ ]; FormIdent aCompareIdent; // zum Vergleichen - sal_uInt8 nDefaultFormat; // Defaultformat der Datei SvNumberFormatter* pFormTable; // Value-Format-Table-Anker StampTyp nIndex; LanguageType eLanguage; // Systemsprache diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index cf12bc2e160e..729a7a1370c5 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -149,8 +149,7 @@ double Snum32ToDouble( sal_uInt32 nValue ) FormCache::FormCache( ScDocument* pDoc1 ) : nIndex(0) -{ // Default format is 'Default' - nDefaultFormat = 0xff; +{ pFormTable = pDoc1->GetFormatTable(); for(bool & rb : bValid) rb = false; diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 0503ade2a68e..9c0cffb7c21b 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -547,7 +547,6 @@ protected: bool mbRelativeAsOffset; /// True = relative row/column index is (signed) offset, false = explicit index. bool mb2dRefsAs3dRefs; /// True = convert all 2D references to 3D references in sheet specified by base address. bool mbSpecialTokens; /// True = special handling for tExp and tTbl tokens, false = exit with error. - bool mbAllowNulChars; /// True = keep NUL characters in string tokens. private: typedef ::std::vector< size_t > SizeTypeVector; @@ -569,8 +568,7 @@ FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) : mnMaxXlsRow( rParent.getAddressConverter().getMaxXlsAddress().Row() ), mbRelativeAsOffset( false ), mb2dRefsAs3dRefs( false ), - mbSpecialTokens( false ), - mbAllowNulChars( false ) + mbSpecialTokens( false ) { // reserve enough space to make resize(), push_back() etc. cheap maTokenStorage.reserve( 0x2000 ); @@ -618,7 +616,7 @@ OUString FormulaParserImpl::resolveOleTarget( sal_Int32 nRefId, bool bUseRefShee void FormulaParserImpl::initializeImport( const CellAddress& rBaseAddr, FormulaType eType ) { maBaseAddr = ScAddress( rBaseAddr.Column, rBaseAddr.Row, rBaseAddr.Sheet ); - mbRelativeAsOffset = mb2dRefsAs3dRefs = mbSpecialTokens = mbAllowNulChars = false; + mbRelativeAsOffset = mb2dRefsAs3dRefs = mbSpecialTokens = false; switch( eType ) { case FORMULATYPE_CELL: @@ -634,8 +632,6 @@ void FormulaParserImpl::initializeImport( const CellAddress& rBaseAddr, FormulaT break; case FORMULATYPE_VALIDATION: mbRelativeAsOffset = true; - // enable NUL characters in BIFF import, string list is single tStr token with NUL separators - mbAllowNulChars = false; break; case FORMULATYPE_DEFINEDNAME: mbRelativeAsOffset = true; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index bab7391269b6..69d23e0c9f72 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -286,7 +286,6 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet( { mpViewShell = pViewShell; mpMarkedRanges = nullptr; - mpSortedMarkedCells = nullptr; mpAccDoc = pAccDoc; mpAccCell.clear(); meSplitPos = eSplitPos; diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 4b3b95e416ce..485219475081 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -34,7 +34,6 @@ class ScDelimiterTable public: explicit ScDelimiterTable( const OUString& rDelTab ) : theDelTab ( rDelTab ), - cSep ( '\t' ), nCount ( comphelper::string::getTokenCount(rDelTab, '\t') ), nIter ( 0 ) {} @@ -47,7 +46,7 @@ public: private: const OUString theDelTab; - const sal_Unicode cSep; + static const sal_Unicode cSep = '\t'; const sal_Int32 nCount; sal_Int32 nIter; }; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 681081f0f8c3..96aa87afd74c 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -261,7 +261,6 @@ protected: private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; - std::vector<ScMyAddress>* mpSortedMarkedCells; ScAccessibleDocument* mpAccDoc; rtl::Reference<ScAccessibleCell> mpAccCell; Rectangle maVisCells; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index fb6dd898b8f6..f424c6d02792 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -136,7 +136,6 @@ protected: private: ScNavigatorDlg& rDlg; SCCOL nCol; - sal_uInt16 nKeyGroup; void EvalText (); void ExecuteCol (); diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index fa6441c323aa..802bc30d4485 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -40,8 +40,6 @@ protected: void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , ScDocument* ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, formula::RefButton* pButton ); - void (ScRefHandlerCaller::*m_pRefInputStartPostHdl)( formula::RefEdit* pEdit, formula::RefButton* pButton ); - void (ScRefHandlerCaller::*m_pRefInputDonePreHdl)(); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); public: @@ -66,7 +64,7 @@ public: void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; } void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; } - ScRefHandlerHelper():m_pHandler(nullptr), m_pSetReferenceHdl( nullptr ), m_pSetActiveHdl(nullptr), m_pRefInputStartPreHdl( nullptr ), m_pRefInputStartPostHdl( nullptr ), m_pRefInputDonePreHdl( nullptr ), m_pRefInputDonePostHdl( nullptr ){} + ScRefHandlerHelper():m_pHandler(nullptr), m_pSetReferenceHdl( nullptr ), m_pSetActiveHdl(nullptr), m_pRefInputStartPreHdl( nullptr ), m_pRefInputDonePostHdl( nullptr ){} }; class ScValidationDlg; @@ -222,8 +220,6 @@ public: (m_pHandler->*m_pRefInputStartPreHdl)( pEdit, pButton ); m_bRefInputting = true; ScValidationDlgBase::RefInputStart( pEdit, pButton ); - if ( m_pHandler && m_pRefInputStartPostHdl ) - (m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton ); } virtual void RefInputDone( bool bForced = false ) override @@ -231,9 +227,6 @@ public: if( !CanInputDone( bForced ) ) return; - if ( m_pHandler && m_pRefInputDonePreHdl ) - (m_pHandler->*m_pRefInputDonePreHdl)(); - ScValidationDlgBase::RefInputDone( bForced ); m_bRefInputting = false; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 9cbf06693cba..10573c15681f 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -78,8 +78,7 @@ void ScNavigatorDlg::ReleaseFocus() ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : SpinField ( pParent, rResId ), rDlg ( *pParent ), - nCol ( 0 ), - nKeyGroup ( KEYGROUP_ALPHA ) + nCol ( 0 ) { SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ } @@ -169,7 +168,6 @@ void ColumnEdit::EvalText() nCol = 0; SetText( aStrCol ); - nKeyGroup = KEYGROUP_ALPHA; } void ColumnEdit::ExecuteCol() diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 79282f576b0e..9aa88e592822 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -894,8 +894,6 @@ public: explicit Tokens2RangeStringXML(ScDocument* pDoc) : mpRangeStr(new OUStringBuffer), mpDoc(pDoc), - mcRangeSep(' '), - mcAddrSep(':'), mbFirst(true) { } @@ -903,8 +901,6 @@ public: Tokens2RangeStringXML(const Tokens2RangeStringXML& r) : mpRangeStr(r.mpRangeStr), mpDoc(r.mpDoc), - mcRangeSep(r.mcRangeSep), - mcAddrSep(r.mcAddrSep), mbFirst(r.mbFirst) { } @@ -984,10 +980,10 @@ private: private: shared_ptr<OUStringBuffer> mpRangeStr; - ScDocument* mpDoc; - sal_Unicode mcRangeSep; - sal_Unicode mcAddrSep; - bool mbFirst; + ScDocument* mpDoc; + static const sal_Unicode mcRangeSep = ' '; + static const sal_Unicode mcAddrSep = ':'; + bool mbFirst; }; void lcl_convertTokensToString(OUString& rStr, const vector<ScTokenRef>& rTokens, ScDocument* pDoc) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 730e9e071010..ee03313d0c16 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -4055,21 +4055,6 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { - SolarMutexGuard g; - - if (pDocShell) - pDocShell->GetDocument().RemoveUnoObject(*this); -} - -void ScSpreadsheetSettingsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) -{ - // Referenz-Update interessiert hier nicht - - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING ) - { - pDocShell = nullptr; // ungueltig geworden - } } // XPropertySet diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 0c6d36d35d5d..2a47e09188b0 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -354,7 +354,6 @@ protected: protected: uno::Reference< container::XIndexContainer > mxFormIC; OUString maModelServiceName; - sal_Int16 mnComponentType; }; ScVbaControlContainer::ScVbaControlContainer( @@ -365,8 +364,7 @@ ScVbaControlContainer::ScVbaControlContainer( const uno::Type& rVbaType, const OUString& rModelServiceName ) throw (uno::RuntimeException) : ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ), - maModelServiceName( rModelServiceName ), - mnComponentType( form::FormComponentType::COMMANDBUTTON ) + maModelServiceName( rModelServiceName ) { } @@ -399,7 +397,7 @@ bool ScVbaControlContainer::implPickShape( const uno::Reference< drawing::XShape uno::Reference< beans::XPropertySet > xModelProps( xControlShape->getControl(), uno::UNO_QUERY_THROW ); sal_Int16 nClassId = -1; return lclGetProperty( nClassId, xModelProps, "ClassId" ) && - (nClassId == mnComponentType) && implCheckProperties( xModelProps ); + (nClassId == form::FormComponentType::COMMANDBUTTON) && implCheckProperties( xModelProps ); } catch( uno::Exception& ) { diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 1bce875044fc..11d04fd29e95 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -49,7 +49,6 @@ public: OUString maSoundFile; ///< Path to the sound file in MS DOS notation bool mbSoundOn; ///< Sound on / off bool mbPlayFull; ///< play sound completely. - SdrPathObj* mpPathObj; ///< The path object css::presentation::ClickAction meClickAction; ///< Action at mouse click css::presentation::AnimationEffect meSecondEffect; ///< for object fading. css::presentation::AnimationSpeed meSecondSpeed; ///< for object fading. diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index f0b5f10bd7f4..1783bec9eae8 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -45,7 +45,6 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) mbDimHide (false), mbSoundOn (false), mbPlayFull (false), - mpPathObj (nullptr), meClickAction (presentation::ClickAction_NONE), meSecondEffect (presentation::AnimationEffect_NONE), meSecondSpeed (presentation::AnimationSpeed_SLOW), @@ -60,7 +59,7 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject) : SdrObjUserData (rAnmInfo), - mePresObjKind (PRESOBJ_NONE), + mePresObjKind (PRESOBJ_NONE), meEffect (rAnmInfo.meEffect), meTextEffect (rAnmInfo.meTextEffect), meSpeed (rAnmInfo.meSpeed), @@ -73,7 +72,6 @@ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rOb maSoundFile (rAnmInfo.maSoundFile), mbSoundOn (rAnmInfo.mbSoundOn), mbPlayFull (rAnmInfo.mbPlayFull), - mpPathObj (nullptr), meClickAction (rAnmInfo.meClickAction), meSecondEffect (rAnmInfo.meSecondEffect), meSecondSpeed (rAnmInfo.meSecondSpeed), diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 917c3e5c7896..e495a5f1a220 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -130,7 +130,6 @@ class EasyFile { private: SvStream* pOStm; - SfxMedium* pMedium; bool bOpen; public: @@ -3139,7 +3138,6 @@ OUString HtmlExport::GetButtonName( int nButton ) EasyFile::EasyFile() { - pMedium = nullptr; pOStm = nullptr; bOpen = false; } @@ -3179,7 +3177,6 @@ sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr ) if( nErr != 0 ) { bOpen = false; - delete pMedium; delete pOStm; pOStm = nullptr; } @@ -3222,18 +3219,6 @@ sal_uLong EasyFile::close() bOpen = false; - if( pMedium ) - { - // transmitted - pMedium->Close(); - pMedium->Commit(); - - nErr = pMedium->GetError(); - - delete pMedium; - pMedium = nullptr; - } - return nErr; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index b15f0b9bbc16..2cbac3ec54cd 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -216,8 +216,8 @@ private: OUString msEffectName; CustomAnimationEffectPtr mpEffect; const CustomAnimationPresets* mpCustomAnimationPresets; - const long nIconWidth = 19; - const long nItemMinHeight = 38; + static const long nIconWidth = 19; + static const long nItemMinHeight = 38; }; CustomAnimationListEntryItem::CustomAnimationListEntryItem( const OUString& aDescription, const CustomAnimationEffectPtr& pEffect, CustomAnimationList* pParent ) @@ -384,7 +384,7 @@ public: private: OUString msDescription; - const long nIconWidth = 19; + static const long nIconWidth = 19; }; CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( const OUString& aDescription ) diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 7c21c3944d49..e5ef8a46f744 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -729,7 +729,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSoundOn(pInfo->mbSoundOn, bSoundOn); pAction->SetSound(pInfo->maSoundFile, aSound); pAction->SetPlayFull(pInfo->mbPlayFull, bPlayFull); - pAction->SetPathObj(pInfo->mpPathObj, pPath); + pAction->SetPathObj(nullptr, pPath); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); pAction->SetVerb(pInfo->mnVerb, (sal_uInt16)pInfo->GetBookmark().toInt32() ); diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index d0c0c2096ff5..9b7f551e57f0 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -180,8 +180,7 @@ std::shared_ptr<PageCacheManager> PageCacheManager::Instance() PageCacheManager::PageCacheManager() : mpPageCaches(new PageCacheContainer()), - mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()), - mnMaximalRecentlyCacheCount(2) + mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()) { } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 91e289c37f15..4d3efe48565b 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -122,7 +122,7 @@ private: they have become inactive, i.e. after they are not used anymore by a slide sorter. */ - const sal_uInt32 mnMaximalRecentlyCacheCount; + static const sal_uInt32 mnMaximalRecentlyCacheCount = 2; PageCacheManager(); ~PageCacheManager(); diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index cc8380e690f4..05ca714e6fa9 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -30,10 +30,10 @@ class Layouter::Implementation { public: VclPtr<sd::Window> mpWindow; - sal_Int32 mnRequestedLeftBorder; - sal_Int32 mnRequestedRightBorder; - sal_Int32 mnRequestedTopBorder; - sal_Int32 mnRequestedBottomBorder; + static const sal_Int32 mnRequestedLeftBorder = 5; + static const sal_Int32 mnRequestedRightBorder = 5; + static const sal_Int32 mnRequestedTopBorder = 5; + static const sal_Int32 mnRequestedBottomBorder = 5; sal_Int32 mnLeftBorder; sal_Int32 mnRightBorder; sal_Int32 mnTopBorder; @@ -430,10 +430,6 @@ Layouter::Implementation::Implementation ( sd::Window *pWindow, const std::shared_ptr<view::Theme>& rpTheme) : mpWindow(pWindow), - mnRequestedLeftBorder(5), - mnRequestedRightBorder(5), - mnRequestedTopBorder(5), - mnRequestedBottomBorder(5), mnLeftBorder(5), mnRightBorder(5), mnTopBorder(5), @@ -458,10 +454,6 @@ Layouter::Implementation::Implementation ( Layouter::Implementation::Implementation (const Implementation& rImplementation) : mpWindow(rImplementation.mpWindow), - mnRequestedLeftBorder(rImplementation.mnRequestedLeftBorder), - mnRequestedRightBorder(rImplementation.mnRequestedRightBorder), - mnRequestedTopBorder(rImplementation.mnRequestedTopBorder), - mnRequestedBottomBorder(rImplementation.mnRequestedBottomBorder), mnLeftBorder(rImplementation.mnLeftBorder), mnRightBorder(rImplementation.mnRightBorder), mnTopBorder(rImplementation.mnTopBorder), diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 4d49bb3eeaad..d49a4a4560b4 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -797,10 +797,6 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName case WID_STYLE: aRet = GetStyleSheet(); break; - case WID_ANIMPATH: - if( pInfo && pInfo->mpPathObj ) - aRet <<= pInfo->mpPathObj->getUnoShape(); - break; case WID_IMAGEMAP: { uno::Reference< uno::XInterface > xImageMap; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 6c81a615a3e1..86aa5e15cf19 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -789,8 +789,7 @@ namespace { const sal_uInt16 nPaperTray) : PrinterPage(ePageKind, MapMode(), bPrintMarkedOnly, rsPageString, rPageStringOffset, nDrawMode, eOrientation, nPaperTray), - mnPageIndex(nPageIndex), - mnGap(500) + mnPageIndex(nPageIndex) { } @@ -850,7 +849,7 @@ namespace { private: const sal_uInt16 mnPageIndex; - const sal_Int32 mnGap; + static const sal_Int32 mnGap = 500; }; /** Print two slides to one printer page so that the resulting pages diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index a3a615d728f3..8c178c2dec9a 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -765,7 +765,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, pAction->SetSoundOn(pInfo->mbSoundOn, pInfo->mbSoundOn); pAction->SetSound(pInfo->maSoundFile, pInfo->maSoundFile); pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull); - pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); + pAction->SetPathObj(nullptr, nullptr); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 7357d79780c2..0df9c0e893d2 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -115,8 +115,6 @@ struct SfxDispatcher_Impl for (SfxRequestPtrArray::iterator aI = aReqArr.begin(), aEnd = aReqArr.end(); aI != aEnd; ++aI) delete *aI; } - const SfxSlotServer* pCachedServ1; // last called message - const SfxSlotServer* pCachedServ2; // penultimate called Message SfxShellStack_Impl aStack; // active functionality Idle aIdle; // for Flush std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop @@ -425,8 +423,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) xImp.reset(new SfxDispatcher_Impl); xImp->bFlushed = true; - xImp->pCachedServ1 = nullptr; - xImp->pCachedServ2 = nullptr; xImp->bFlushing = false; xImp->bUpdated = false; xImp->bLocked = false; @@ -1579,12 +1575,6 @@ void SfxDispatcher::FlushImpl() // Invalidate bindings, if possible if ( !pSfxApp->IsDowning() ) { - if ( bModify ) - { - xImp->pCachedServ1 = nullptr; - xImp->pCachedServ2 = nullptr; - } - InvalidateBindings_Impl( bModify ); } @@ -2187,8 +2177,6 @@ void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell ) if ( !SfxGetpApp()->IsDowning() ) { xImp->bUpdated = false; - xImp->pCachedServ1 = nullptr; - xImp->pCachedServ2 = nullptr; InvalidateBindings_Impl(true); } } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index d9b0bc1ef4ec..b10302044c4b 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -128,8 +128,8 @@ namespace { class WaitWindow_Impl : public WorkWindow { Rectangle maRect; - DrawTextFlags mnTextStyle; OUString maText; + static const DrawTextFlags mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine; public: WaitWindow_Impl(); @@ -2351,7 +2351,6 @@ void SAL_CALL SfxDocTplService::update() WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(nullptr, WB_BORDER | WB_3DLOOK) { Rectangle aRect = Rectangle(0, 0, 300, 30000); - mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine; maText = SfxResId(RID_CNT_STR_WAITING).toString(); maRect = GetTextRect(aRect, maText, mnTextStyle); aRect = maRect; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 201664b1c705..5dfaf72859fd 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1149,8 +1149,6 @@ void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags ) pImpl->nFlagsInProgress |= SfxLoadedFlags::MAINDOCUMENT; static_cast<SfxHeaderAttributes_Impl*>(GetHeaderAttributes())->SetAttributes(); pImpl->bImportDone = true; - if( !IsAbortingImport() ) - PositionView_Impl(); if ( ( GetModifyPasswordHash() || GetModifyPasswordInfo().getLength() ) && !IsModifyPasswordEntered() ) SetReadOnly(); @@ -1324,21 +1322,6 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() } -void SfxObjectShell::PositionView_Impl() -{ - MarkData_Impl *pMark = Get_Impl()->pMarkData; - if( pMark ) - { - SfxViewShell* pSh = pMark->pFrame->GetViewShell(); - if( !pMark->aUserData.isEmpty() ) - pSh->ReadUserData( pMark->aUserData, true ); - else if( !pMark->aMark.isEmpty() ) - pSh->JumpToMark( pMark->aMark ); - DELETEZ( Get_Impl()->pMarkData ); - } -} - - bool SfxObjectShell::IsLoading() const /* [Description] diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 5ce07891d709..7f92db707fc3 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -243,7 +243,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) ,lErr(ERRCODE_NONE) ,nEventId ( 0) ,pReloadTimer ( nullptr) - ,pMarkData( nullptr ) ,nLoadedFlags ( SfxLoadedFlags::ALL ) ,nFlagsInProgress( SfxLoadedFlags::NONE ) ,bModalMode( false ) diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 22cb4c660e39..ca9c81a8b1e3 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -109,7 +109,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_uInt16 nEventId; // If Open/Create as to be sent // before Activate AutoReloadTimer_Impl *pReloadTimer; - MarkData_Impl* pMarkData; SfxLoadedFlags nLoadedFlags; SfxLoadedFlags nFlagsInProgress; bool bModalMode; diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 9d19de32b555..d2393bf65dfc 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -307,18 +307,16 @@ namespace /* private */ { public: recent_item_writer( recently_used_file& file ) : file_(file), - max_items_to_write_(MAX_RECENTLY_USED_ITEMS), items_written_(0) {} void operator() (const recently_used_item* item) { - if (items_written_++ < max_items_to_write_) + if (items_written_++ < MAX_RECENTLY_USED_ITEMS) item->write_xml(file_); } private: recently_used_file& file_; - int max_items_to_write_; int items_written_; }; diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 5fec1eb790f4..05af492aedec 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1820,6 +1820,7 @@ void MathType::HandleAlign(sal_uInt8 nHorAlign, sal_uInt8 /*nVAlign*/, int &rSet * indicator by mathtype file format*/ bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize) { + const sal_Int16 nDefaultSize = 12; bool bRet=false; if (nLstSize < 0) { diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 1bf66020cc0a..8e25570383ec 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -66,7 +66,6 @@ public: , nVAlign(0) , nPendingAttributes(0) , nInsertion(0) - , nDefaultSize(12) , nLSize(0) , nDSize(0) , nCurSize(0) @@ -93,7 +92,6 @@ public: , nVAlign(0) , nPendingAttributes(0) , nInsertion(0) - , nDefaultSize(12) , nLSize(0) , nDSize(0) , nCurSize(0) @@ -172,7 +170,6 @@ private: sal_uLong nInsertion; std::vector<sal_Int16> aSizeTable; - sal_Int16 nDefaultSize; sal_Int16 nLSize; sal_Int16 nDSize; sal_Int16 nCurSize; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index abf287f9c595..87196d5e9d63 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -557,7 +557,6 @@ JavaVirtualMachine::JavaVirtualMachine( m_xContext(rContext), m_bDisposed(false), m_pJavaVm(nullptr), - m_bDontCreateJvm(false), m_aAttachGuards(destroyAttachGuards) // TODO check for validity {} @@ -665,12 +664,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) jfw::JavaInfoGuard info; while (!m_xVirtualMachine.is()) // retry until successful { - // This is the second attempt to create Java. m_bDontCreateJvm is - // set which means instantiating the JVM might crash. - if (m_bDontCreateJvm) - //throw css::uno::RuntimeException(); - return css::uno::Any(); - stoc_javavm::JVM aJvm; initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext); diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 8e354a8c1a35..f4ebabd48f7f 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -142,8 +142,6 @@ private: rtl::Reference< jvmaccess::VirtualMachine > m_xVirtualMachine; rtl::Reference< jvmaccess::UnoVirtualMachine > m_xUnoVirtualMachine; JavaVM * m_pJavaVm; - // stored as an instance member for backwards compatibility in getJavaVM - bool m_bDontCreateJvm; // If the first creation of Java failed and this flag is set then the // next call to getJavaVM throws a RuntimException. This is useful when // the second attempt to create Java might cause a crash. diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 9b784ca2a958..f29b7663ca36 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -62,8 +62,6 @@ private: sal_uInt32 m_nReadBufferSize; sal_uInt32 m_nReadBufferFilled; sal_uInt32 m_nPageSize; - sal_uInt32 m_nMinPages; - sal_uInt32 m_nMaxPages; sal_uInt32 m_nPages; bool m_bEOF; @@ -100,8 +98,6 @@ SvDataPipe_Impl::SvDataPipe_Impl() 1000, sal_uInt32(std::numeric_limits< sal_uInt32 >::max() - sizeof (Page) + 1))) - , m_nMinPages(100) - , m_nMaxPages(std::numeric_limits< sal_uInt32 >::max()) , m_nPages( 0 ) , m_bEOF( false ) {} @@ -463,7 +459,7 @@ void SvDataPipe_Impl::remove(Page * pPage) m_pFirstPage = m_pFirstPage->m_pNext; - if (m_nPages <= m_nMinPages) + if (m_nPages <= 100) // min pages return; pPage->m_pPrev->m_pNext = pPage->m_pNext; @@ -595,7 +591,7 @@ void SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) if (m_pWritePage->m_pNext == m_pFirstPage) { - if (m_nPages == m_nMaxPages) + if (m_nPages == std::numeric_limits< sal_uInt32 >::max()) break; Page * pNew diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index e86fdef2a1b0..8386c5ab1785 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -39,7 +39,6 @@ class SwEndNoteInfo; class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient { ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. - sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; /**< Points to the object in which the attribute was set (ContentNode/Format). */ protected: diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 00be3cb5a0fb..2dff35adba8e 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -54,7 +54,6 @@ class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient SwModify* pDefinedIn; /**< Modify-Object, that contains DropCaps. Can only be TextFormatCollection/TextNode. */ sal_uInt16 nDistance; ///< Distance to beginning of text. - sal_uInt16 nReadFormat; ///< For Sw3-Reader: CharFormat-Id (load Pool!). sal_uInt8 nLines; ///< Line count. sal_uInt8 nChars; ///< Character count. bool bWholeWord; ///< First word with initials. diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 4a98fbc9c4be..483ca3885d3d 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -112,11 +112,18 @@ std::shared_ptr<SfxItemSet> SwStyleManager::cacheAutomaticStyle( const SfxItemSe { StylePool& rAutoPool = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? aAutoCharPool : aAutoParaPool; std::shared_ptr<SfxItemSet> pStyle = rAutoPool.insertItemSet( rSet ); - SwStyleCache* &rpCache = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? - mpCharCache : mpParaCache; - if( !rpCache ) - rpCache = new SwStyleCache(); - rpCache->addStyleName( pStyle ); + if (eFamily == IStyleAccess::AUTO_STYLE_CHAR) + { + if (!mpCharCache) + mpCharCache = new SwStyleCache(); + mpCharCache->addStyleName( pStyle ); + } + else + { + if (!mpParaCache) + mpParaCache = new SwStyleCache(); + mpParaCache->addStyleName( pStyle ); + } return pStyle; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 9b2a7e123dc2..ba0dd96a55f4 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -126,8 +126,6 @@ Point SwPosNotify::LastObjPos() const class SwObjPosOscillationControl { private: - sal_uInt8 mnPosStackSize; - const SwAnchoredDrawObject* mpAnchoredDrawObj; std::vector<Point*> maObjPositions; @@ -141,8 +139,7 @@ class SwObjPosOscillationControl SwObjPosOscillationControl::SwObjPosOscillationControl( const SwAnchoredDrawObject& _rAnchoredDrawObj ) - : mnPosStackSize( 20 ), - mpAnchoredDrawObj( &_rAnchoredDrawObj ) + : mpAnchoredDrawObj( &_rAnchoredDrawObj ) { } @@ -161,7 +158,7 @@ bool SwObjPosOscillationControl::OscillationDetected() { bool bOscillationDetected = false; - if ( maObjPositions.size() == mnPosStackSize ) + if ( maObjPositions.size() == 20 ) { // position stack is full -> oscillation bOscillationDetected = true; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 1830666ca719..a37fe0af15a7 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -579,7 +579,6 @@ SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy ) : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast<SwPageDesc*>(rCpy.GetPageDesc()) ), oNumOffset( rCpy.oNumOffset ), - nDescNameIdx( rCpy.nDescNameIdx ), pDefinedIn( nullptr ) { } @@ -587,7 +586,6 @@ SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy ) SwFormatPageDesc::SwFormatPageDesc( const SwPageDesc *pDesc ) : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast<SwPageDesc*>(pDesc) ), - nDescNameIdx( 0xFFFF ), // IDX_NO_VALUE pDefinedIn( nullptr ) { } @@ -597,7 +595,6 @@ SwFormatPageDesc &SwFormatPageDesc::operator=(const SwFormatPageDesc &rCpy) if (rCpy.GetPageDesc()) RegisterToPageDesc(*const_cast<SwPageDesc*>(rCpy.GetPageDesc())); oNumOffset = rCpy.oNumOffset; - nDescNameIdx = rCpy.nDescNameIdx; pDefinedIn = nullptr; return *this; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 9fbc5d27641c..5cb716e04ec9 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -200,8 +200,6 @@ class SwOszControl static const SwFlyFrame *pStack5; const SwFlyFrame *pFly; - // #i3317# - sal_uInt8 mnPosStackSize; std::vector<Point*> maObjPositions; public: @@ -218,9 +216,7 @@ const SwFlyFrame *SwOszControl::pStack4 = nullptr; const SwFlyFrame *SwOszControl::pStack5 = nullptr; SwOszControl::SwOszControl( const SwFlyFrame *pFrame ) - : pFly( pFrame ), - // #i3317# - mnPosStackSize( 20 ) + : pFly( pFrame ) { if ( !SwOszControl::pStack1 ) SwOszControl::pStack1 = pFly; @@ -275,9 +271,9 @@ bool SwOszControl::ChkOsz() { bool bOscillationDetected = false; - if ( maObjPositions.size() == mnPosStackSize ) + if ( maObjPositions.size() == 20 ) { - // position stack is full -> oscillation + // #i3317# position stack is full -> oscillation bOscillationDetected = true; } else diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index f24c529d518b..6c79db7b3f31 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -54,7 +54,6 @@ SwFormatDrop::SwFormatDrop() SwClient( nullptr ), pDefinedIn( nullptr ), nDistance( 0 ), - nReadFormat( USHRT_MAX ), nLines( 0 ), nChars( 0 ), bWholeWord( false ) @@ -66,7 +65,6 @@ SwFormatDrop::SwFormatDrop( const SwFormatDrop &rCpy ) SwClient( rCpy.GetRegisteredInNonConst() ), pDefinedIn( nullptr ), nDistance( rCpy.GetDistance() ), - nReadFormat( rCpy.nReadFormat ), nLines( rCpy.GetLines() ), nChars( rCpy.GetChars() ), bWholeWord( rCpy.GetWholeWord() ) @@ -84,7 +82,6 @@ void SwFormatDrop::SetCharFormat( SwCharFormat *pNew ) GetRegisteredInNonConst()->Remove( this ); if(pNew) pNew->Add( this ); - nReadFormat = USHRT_MAX; } void SwFormatDrop::Modify( const SfxPoolItem*, const SfxPoolItem * ) diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 1c7e487b2e4b..ad0e3f9edb19 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1438,7 +1438,6 @@ void SwTextFormatInfo::Init() m_pRoot = nullptr; m_pLast = nullptr; m_pFly = nullptr; - m_pLastField = nullptr; m_pLastTab = nullptr; m_pUnderflow = nullptr; m_cTabDecimal = 0; @@ -1473,7 +1472,6 @@ SwTextFormatInfo::SwTextFormatInfo( const SwTextFormatInfo& rInf, m_pRoot = &rLay; m_pLast = &rLay; m_pFly = nullptr; - m_pLastField = nullptr; m_pUnderflow = nullptr; m_pRest = nullptr; m_pLastTab = nullptr; diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 729f65ff2944..51747ac2bb5f 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -485,7 +485,6 @@ class SwTextFormatInfo : public SwTextPaintInfo SwLineLayout *m_pRoot; // The Root of the current line (pCurr) SwLinePortion *m_pLast; // The last Portion SwFlyPortion *m_pFly; // The following FlyPortion - SwFieldPortion *m_pLastField; // Wrapped Field SwLinePortion *m_pUnderflow; // Underflow: Last Portion SwLinePortion *m_pRest; // The Rest is the start of the next Line diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 56fd6e85d64a..08f12df116cf 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3747,7 +3747,7 @@ void WW8SHDLong::Write( WW8Export& rExport ) { rExport.InsUInt32( m_cvFore ); rExport.InsUInt32( m_cvBack ); - rExport.InsUInt16( m_ipat ); + rExport.InsUInt16( 0 ); // ipat } void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 426c5d25145a..35c08e1477f6 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1576,11 +1576,9 @@ class WW8SHDLong { sal_uInt32 m_cvFore; sal_uInt32 m_cvBack; - sal_uInt16 m_ipat; public: - WW8SHDLong() : m_cvFore(0), m_cvBack(0), m_ipat(0) {} - virtual ~WW8SHDLong() {} + WW8SHDLong() : m_cvFore(0), m_cvBack(0) {} void Write(WW8Export & rExport); void setCvFore(sal_uInt32 cvFore) { m_cvFore = cvFore; } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ad9f65143dfb..834714b27919 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4199,7 +4199,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_pSFlyPara(nullptr) , m_pTableDesc(nullptr) , m_pNumOlst(nullptr) - , m_pNode_FLY_AT_PARA(nullptr) , m_pDrawModel(nullptr) , m_pDrawPg(nullptr) , m_pDrawEditEngine(nullptr) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index a8b344d0fd4d..ca835d9f5c83 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -650,7 +650,7 @@ public: WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rRdr) : mrRdr(rRdr), mfUnknown(0), mfDropdownIndex(0), mfToolTip(0), mfNoMark(0), mfUseSize(0), mfNumbersOnly(0), mfDateOnly(0), - mfUnused(0), mnSize(0), mhpsCheckBox(20), mnChecked(0), mnMaxLen(0), msName( rN ) + mfUnused(0), mhpsCheckBox(20), mnChecked(0), mnMaxLen(0), msName( rN ) { } sal_uInt8 mfUnknown:2; @@ -661,7 +661,6 @@ public: sal_uInt8 mfNumbersOnly:1; sal_uInt8 mfDateOnly:1; sal_uInt8 mfUnused:3; - sal_uInt16 mnSize; sal_uInt16 mhpsCheckBox; sal_uInt16 mnChecked; @@ -1234,8 +1233,6 @@ private: ANLDRuleMap m_aANLDRules; WW8_OLST* m_pNumOlst; // position in text - SwNode* m_pNode_FLY_AT_PARA; // set: WW8SwFlyPara() read: CreateSwTable() - SdrModel* m_pDrawModel; SdrPage* m_pDrawPg; EditEngine* m_pDrawEditEngine; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index d8416b5d30f4..d3fcc1b37283 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4602,7 +4602,6 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, { pWwFib = pBase->pWw8Fib; - nLastWhereIdxCp = 0; memset( aD, 0, sizeof( aD ) ); nLineEnd = WW8_CP_MAX; nManType = nType; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index cafc1f549801..7b4e69b0ecc2 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -916,7 +916,6 @@ private: long nCpO; // Origin Cp -- the basis for nNewCp WW8_CP nLineEnd; // points *after* the <CR> - long nLastWhereIdxCp; // last result of WhereIdx() sal_uInt16 nPLCF; // this many PLCFs are managed ManTypes nManType; bool mbDoingDrawTextBox; //Normally we adjust the end of attributes diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index cc8309feb225..815dcd8dab8d 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -90,7 +90,6 @@ public: class SwPostItContent : public SwContent { const SwFormatField* pField; - SwRangeRedline* pRedline; public: SwPostItContent( const SwContentType* pCnt, const OUString& rName, @@ -98,11 +97,9 @@ public: long nYPos ) : SwContent(pCnt, rName, nYPos) , pField(pFormatField) - , pRedline(nullptr) {} const SwFormatField* GetPostIt() const { return pField; } - SwRangeRedline* GetRedline() { return pRedline; } virtual bool IsProtect() const override; }; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b538d48e64a4..3836d150c6bc 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -210,8 +210,6 @@ struct ImplSVCtrlData ImageList* mpPinImgList; // ImageList for PIN ImageList* mpSplitHPinImgList; // ImageList for Horizontale SplitWindows ImageList* mpSplitVPinImgList; // ImageList for Vertikale SplitWindows (PIN's) - ImageList* mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows) - ImageList* mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows) Image* mpDisclosurePlus; Image* mpDisclosureMinus; ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 803c75addb6b..28d0628ba24e 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -332,7 +332,6 @@ protected: mutable XRenderPictFormat* m_pXRenderFormat; XID m_aXRenderPicture; - Region pPaintRegion_; Region mpClipRegion; #if ENABLE_CAIRO_CANVAS vcl::Region maClipRegion; diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4984ff439b98..0a4ef69b4850 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -449,16 +449,6 @@ void DeInitVCL() delete pSVData->maCtrlData.mpSplitVPinImgList; pSVData->maCtrlData.mpSplitVPinImgList = nullptr; } - if ( pSVData->maCtrlData.mpSplitHArwImgList ) - { - delete pSVData->maCtrlData.mpSplitHArwImgList; - pSVData->maCtrlData.mpSplitHArwImgList = nullptr; - } - if ( pSVData->maCtrlData.mpSplitVArwImgList ) - { - delete pSVData->maCtrlData.mpSplitVArwImgList; - pSVData->maCtrlData.mpSplitVArwImgList = nullptr; - } if ( pSVData->maCtrlData.mpDisclosurePlus ) { delete pSVData->maCtrlData.mpDisclosurePlus; diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index cfd8925681ca..43022a7453db 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -77,7 +77,6 @@ X11SalGraphics::X11SalGraphics(): m_nXScreen( 0 ), m_pXRenderFormat(nullptr), m_aXRenderPicture(0), - pPaintRegion_(nullptr), mpClipRegion(nullptr), #if ENABLE_CAIRO_CANVAS maClipRegion(), @@ -117,7 +116,6 @@ void X11SalGraphics::freeResources() { Display *pDisplay = GetXDisplay(); - SAL_WARN_IF( pPaintRegion_, "vcl", "pPaintRegion_" ); if( mpClipRegion ) { XDestroyRegion( mpClipRegion ); |