mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:singlevalfields in sc..vcl

Browse Source 
Change-Id: I68752a3daf5ddd8581c07759b8be2c1dabbb9258
This commit is contained in:
Noel Grandin 2016-09-15 11:24:43 +02:00
parent b79b5e0df6
commit 3b48b3cc92
69 changed files with 82 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compilerplugins/clang/singlevalfields.py
View File

@ -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))

1
include/sfx2/objsh.hxx
View File

@ -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();

2
sc/inc/dociter.hxx
View File

@ -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:

5
sc/inc/docuno.hxx
View File

@ -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()

9
sc/inc/dptabsrc.hxx
View File

@ -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;
};

3
sc/inc/stlpool.hxx
View File

@ -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

4
sc/inc/stlsheet.hxx
View File

@ -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; }

4
sc/source/core/data/dociter.cxx
View File

@ -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;
}
}

22
sc/source/core/data/dptabsrc.cxx
View File

@ -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;
}

3
sc/source/core/data/stlpool.cxx
View File

@ -59,8 +59,7 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP,
ScDocument* pDocument )
: SfxStyleSheetPool( rPoolP ),
pActualStyleSheet( nullptr ),
pDoc( pDocument ),
pForceStdName( nullptr )
pDoc( pDocument )
{
}

33
sc/source/core/data/stlsheet.cxx
View File

@ -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

11
sc/source/core/opencl/formulagroupcl.cxx
View File

@ -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

2
sc/source/core/tool/interpr8.cxx
View File

@ -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();

6
sc/source/filter/excel/tokstack.cxx
View File

@ -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

10
sc/source/filter/inc/tokstack.hxx
View File

@ -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();

1
sc/source/filter/inc/tool.h
View File

@ -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

3
sc/source/filter/lotus/tool.cxx
View File

@ -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;

8
sc/source/filter/oox/formulaparser.cxx
View File

@ -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;

1
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
View File

@ -286,7 +286,6 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet(
{
mpViewShell = pViewShell;
mpMarkedRanges = nullptr;
mpSortedMarkedCells = nullptr;
mpAccDoc = pAccDoc;
mpAccCell.clear();
meSplitPos = eSplitPos;

3
sc/source/ui/dbgui/scuiimoptdlg.cxx
View File

@ -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;
};

1
sc/source/ui/inc/AccessibleSpreadsheet.hxx
View File

@ -261,7 +261,6 @@ protected:
private:
ScTabViewShell* mpViewShell;
ScRangeList* mpMarkedRanges;
std::vector<ScMyAddress>* mpSortedMarkedCells;
ScAccessibleDocument* mpAccDoc;
rtl::Reference<ScAccessibleCell> mpAccCell;
Rectangle maVisCells;

1
sc/source/ui/inc/navipi.hxx
View File

@ -136,7 +136,6 @@ protected:
private:
ScNavigatorDlg& rDlg;
SCCOL nCol;
sal_uInt16 nKeyGroup;
void EvalText ();
void ExecuteCol ();

9
sc/source/ui/inc/validate.hxx
View File

@ -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;

4
sc/source/ui/navipi/navipi.cxx
View File

@ -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()

12
sc/source/ui/unoobj/chart2uno.cxx
View File

@ -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)

15
sc/source/ui/unoobj/docuno.cxx
View File

@ -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

6
sc/source/ui/vba/vbasheetobjects.cxx
View File

@ -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& )
{

1
sd/inc/anminfo.hxx
View File

@ -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.

4
sd/source/core/anminfo.cxx
View File

@ -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),

15
sd/source/filter/html/htmlex.cxx
View File

@ -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;
}

6
sd/source/ui/animations/CustomAnimationList.cxx
View File

@ -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 )

2
sd/source/ui/func/fuoaprms.cxx
View File

@ -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() );

3
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx vendored
View File

@ -180,8 +180,7 @@ std::shared_ptr<PageCacheManager> PageCacheManager::Instance()
PageCacheManager::PageCacheManager()
: mpPageCaches(new PageCacheContainer()),
mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()),
mnMaximalRecentlyCacheCount(2)
mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches())
{
}

2
sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx vendored
View File

@ -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();

16
sd/source/ui/slidesorter/view/SlsLayouter.cxx
View File

@ -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),

4
sd/source/ui/unoidl/unoobj.cxx
View File

@ -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;

5
sd/source/ui/view/DocumentRenderer.cxx
View File

@ -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

2
sd/source/ui/view/sdview2.cxx
View File

@ -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);

12
sfx2/source/control/dispatch.cxx
View File

@ -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);
}
}

3
sfx2/source/doc/doctemplates.cxx
View File

@ -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;

17
sfx2/source/doc/objmisc.cxx
View File

@ -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]

1
sfx2/source/doc/objxtor.cxx
View File

@ -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 )

1
sfx2/source/inc/objshimp.hxx
View File

@ -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;

4
shell/source/unix/sysshell/recently_used_file_handler.cxx
View File

@ -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_;
};

1
starmath/source/mathtype.cxx
View File

@ -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)
{

3
starmath/source/mathtype.hxx
View File

@ -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;

7
stoc/source/javavm/javavm.cxx
View File

@ -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);

2
stoc/source/javavm/javavm.hxx
View File

@ -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.

8
svl/source/misc/strmadpt.cxx
View File

@ -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

1
sw/inc/fmtpdsc.hxx
View File

@ -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:

1
sw/inc/paratr.hxx
View File

@ -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.

17
sw/source/core/doc/swstylemanager.cxx
View File

@ -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;
}

7
sw/source/core/layout/anchoreddrawobject.cxx
View File

@ -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;

3
sw/source/core/layout/atrfrm.cxx
View File

@ -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;

10
sw/source/core/layout/flycnt.cxx
View File

@ -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

3
sw/source/core/para/paratr.cxx
View File

@ -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 * )

2
sw/source/core/text/inftxt.cxx
View File

@ -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;

1
sw/source/core/text/inftxt.hxx
View File

@ -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

2
sw/source/filter/ww8/wrtww8.cxx
View File

@ -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 )

4
sw/source/filter/ww8/wrtww8.hxx
View File

@ -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; }

1
sw/source/filter/ww8/ww8par.cxx
View File

@ -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)

5
sw/source/filter/ww8/ww8par.hxx
View File

@ -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;

1
sw/source/filter/ww8/ww8scan.cxx
View File

@ -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;

1
sw/source/filter/ww8/ww8scan.hxx
View File

@ -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

3
sw/source/uibase/inc/content.hxx
View File

@ -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;
};

2
vcl/inc/svdata.hxx
View File

@ -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

1
vcl/inc/unx/salgdi.h
View File

@ -332,7 +332,6 @@ protected:
mutable XRenderPictFormat* m_pXRenderFormat;
XID m_aXRenderPicture;
Region pPaintRegion_;
Region mpClipRegion;
#if ENABLE_CAIRO_CANVAS
vcl::Region maClipRegion;

10
vcl/source/app/svmain.cxx
View File

@ -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;

2
vcl/unx/generic/gdi/salgdi.cxx
View File

@ -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 );