summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/access/accmap.cxx6
-rw-r--r--sw/source/core/doc/tblrwcl.cxx8
-rw-r--r--sw/source/core/inc/MarkManager.hxx3
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx2
-rw-r--r--sw/source/core/inc/flyfrms.hxx2
-rw-r--r--sw/source/core/inc/swblocks.hxx1
-rw-r--r--sw/source/core/inc/viewimp.hxx3
-rw-r--r--sw/source/core/layout/flylay.cxx1
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx4
-rw-r--r--sw/source/core/swg/swblocks.cxx4
-rw-r--r--sw/source/core/text/itratr.cxx7
-rw-r--r--sw/source/core/text/porlay.cxx7
-rw-r--r--sw/source/core/text/porlay.hxx12
-rw-r--r--sw/source/core/unocore/unofield.cxx6
-rw-r--r--sw/source/core/view/viewimp.cxx1
15 files changed, 11 insertions, 56 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 2af9cd10a54c..b8504b61f353 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -231,14 +231,8 @@ private:
public:
-#if OSL_DEBUG_LEVEL > 0
- bool mbLocked;
-#endif
explicit SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
: maMap()
-#if OSL_DEBUG_LEVEL > 0
- , mbLocked( false )
-#endif
{
maInfo.SetSdrView( pMap->GetShell()->GetDrawView() );
maInfo.SetWindow( pMap->GetShell()->GetWin() );
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index c46d561be5d0..e1c0cccf6238 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1373,14 +1373,12 @@ struct _InsULPara
bool bUL : 1; // Upper-Left(true) or Lower-Right(false) ?
SwTableBox* pLeftBox;
- SwTableBox* pRightBox;
- SwTableBox* pMergeBox;
_InsULPara( SwTableNode* pTNd, bool bUpperLower, bool bUpper,
- SwTableBox* pLeft, SwTableBox* pMerge, SwTableBox* pRight,
+ SwTableBox* pLeft,
SwTableLine* pLine=nullptr, SwTableBox* pBox=nullptr )
: pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
- pLeftBox( pLeft ), pRightBox( pRight ), pMergeBox( pMerge )
+ pLeftBox( pLeft )
{ bUL_LR = bUpperLower; bUL = bUpper; }
void SetLeft( SwTableBox* pBox=nullptr )
@@ -1617,7 +1615,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
// This contains all Lines that are above the selected Area,
// thus they form a Upper/Lower Line
- _InsULPara aPara( pTableNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine );
+ _InsULPara aPara( pTableNd, true, true, pLeftBox, pInsLine );
// Move the overlapping upper/lower Lines of the selected Area
for (auto & it : pFndBox->GetLines().front()->GetBoxes())
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 5df4e82768e8..6abeb4831196 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -116,9 +116,6 @@ namespace sw {
// container for annotation marks
container_t m_vAnnotationMarks;
- // container for all marks except annotation marks
- container_t m_vCommonMarks;
-
SwDoc * const m_pDoc;
};
} // namespace mark
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 8f96c6d7f1d7..884af8c2fff5 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -35,7 +35,6 @@ class SwXMLTextBlocks : public SwImpBlocks
{
protected:
bool bAutocorrBlock;
- bool bBlock;
SfxObjectShellRef xDocShellRef;
sal_uInt16 nFlags;
OUString aPackageName;
@@ -49,7 +48,6 @@ protected:
public:
css::uno::Reference < css::embed::XStorage > xBlkRoot;
css::uno::Reference < css::embed::XStorage > xRoot;
- short nCurBlk;
SwXMLTextBlocks( const OUString& rFile );
SwXMLTextBlocks( const css::uno::Reference < css::embed::XStorage >&, const OUString& rFile );
void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false );
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 0deb6b7b96fa..115f25e8fd71 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -30,8 +30,6 @@ class SwFlyAtCntFrm;
// bound in Content.
class SwFlyFreeFrm : public SwFlyFrm
{
- SwPageFrm *pPage; // page where the Fly is registered
-
// #i34753# - flag for at-page anchored Writer fly frames
// to prevent a positioning - call of method <MakeObjPos()> -, if Writer
// fly frame is already clipped during its format by the object formatter.
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index f309519554e5..90bbb59bbccb 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -38,7 +38,6 @@ public:
OUString aPackageName; /// Package name
bool bIsOnlyTextFlagInit : 1; /// Is the Flag valid?
bool bIsOnlyText : 1; /// Unformatted text
- bool bInPutMuchBlocks : 1; /// Put serveral block entries
SwBlockName( const OUString& rShort, const OUString& rLong );
SwBlockName( const OUString& rShort, const OUString& rLong, const OUString& rPackageName );
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 52c5cf593795..e6efdf4278be 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -76,9 +76,6 @@ class SwViewShellImp
SwAccessibleMap *m_pAccessibleMap; // Accessible wrappers
- mutable const SdrObject * m_pSdrObjectCached;
- mutable OUString m_sSdrObjectCachedComment;
-
bool m_bFirstPageInvalid : 1; // Pointer to the first Page invalid?
bool m_bResetHdlHiddenPaint : 1; // Ditto
bool m_bSmoothUpdate : 1; // For SmoothScroll
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index d365fe291711..951f5c8b29e3 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star;
SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
SwFlyFrm( pFormat, pSib, pAnch ),
- pPage( nullptr ),
// #i34753#
mbNoMakePos( false ),
// #i37068#
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 2f911a5a654d..efb72ea696f8 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -58,9 +58,7 @@ void SwXMLTextBlocks::ResetBlockMode ( )
SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
: SwImpBlocks(rFile)
, bAutocorrBlock(false)
- , bBlock(false)
, nFlags(0)
- , nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
if( !pDocSh->DoInitNew() )
@@ -104,9 +102,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg, const OUString& rName )
: SwImpBlocks( rName )
, bAutocorrBlock(false)
- , bBlock(false)
, nFlags(0)
- , nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL );
if( !pDocSh->DoInitNew() )
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 775254ab9b2d..279b2f4d70f9 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -57,7 +57,7 @@ sal_uInt16 SwImpBlocks::Hash( const OUString& r )
SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
: aShort( rShort ), aLong( rLong ), aPackageName (rShort),
- bIsOnlyTextFlagInit( false ), bIsOnlyText( false ), bInPutMuchBlocks(false)
+ bIsOnlyTextFlagInit( false ), bIsOnlyText( false )
{
nHashS = SwImpBlocks::Hash( rShort );
nHashL = SwImpBlocks::Hash( rLong );
@@ -65,7 +65,7 @@ SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong, const OUString& rPackageName)
: aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
- bIsOnlyTextFlagInit( false ), bIsOnlyText( false ), bInPutMuchBlocks(false)
+ bIsOnlyTextFlagInit( false ), bIsOnlyText( false )
{
nHashS = SwImpBlocks::Hash( rShort );
nHashL = SwImpBlocks::Hash( rLong );
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 2a86ba989a92..56adbd5a3e8f 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -341,14 +341,13 @@ public:
VclPtr<OutputDevice> pOut;
SwViewShell const * pSh;
sal_uLong &rMin;
- sal_uLong &rMax;
sal_uLong &rAbsMin;
long nRowWidth;
long nWordWidth;
long nWordAdd;
sal_Int32 nNoLineBreak;
- SwMinMaxArgs( OutputDevice* pOutI, SwViewShell const * pShI, sal_uLong& rMinI, sal_uLong &rMaxI, sal_uLong &rAbsI )
- : pOut( pOutI ), pSh( pShI ), rMin( rMinI ), rMax( rMaxI ), rAbsMin( rAbsI )
+ SwMinMaxArgs( OutputDevice* pOutI, SwViewShell const * pShI, sal_uLong& rMinI, sal_uLong &rAbsI )
+ : pOut( pOutI ), pSh( pShI ), rMin( rMinI ), rAbsMin( rAbsI )
{ nRowWidth = nWordWidth = nWordAdd = 0; nNoLineBreak = COMPLETE_STRING; }
void Minimum( long nNew ) const { if( (long)rMin < nNew ) rMin = nNew; }
void NewWord() { nWordAdd = nWordWidth = 0; }
@@ -617,7 +616,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM
sal_Int32 nLen = m_Text.getLength();
long nAktWidth = 0;
long nAdd = 0;
- SwMinMaxArgs aArg( pOut, pSh, rMin, rMax, rAbsMin );
+ SwMinMaxArgs aArg( pOut, pSh, rMin, rAbsMin );
while( nIdx < nLen )
{
sal_Int32 nNextChg = aIter.GetNextAttr();
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index b1ca592f93f7..7d483f5d5c72 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1955,13 +1955,6 @@ SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTextNode& rTNd,
}
SwParaPortion::SwParaPortion()
- : m_bFlag00(false)
- , m_bFlag11(false)
- , m_bFlag12(false)
- , m_bFlag13(false)
- , m_bFlag14(false)
- , m_bFlag15(false)
- , m_bFlag16(false)
{
FormatReset();
m_bFlys = m_bFootnoteNum = m_bMargin = false;
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 868087dffca0..3e6079b2d097 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -247,16 +247,8 @@ class SwParaPortion : public SwLineLayout
bool m_bFollowField : 1; // We have a bit of field left for the Follow
bool m_bFixLineHeight : 1; // Fixed line height
- bool m_bFootnoteNum : 1; // contains a footnotenumberportion
- bool m_bMargin : 1; // contains a hanging punctuation in the margin
-
- bool m_bFlag00 : 1;
- bool m_bFlag11 : 1;
- bool m_bFlag12 : 1;
- bool m_bFlag13 : 1;
- bool m_bFlag14 : 1;
- bool m_bFlag15 : 1;
- bool m_bFlag16 : 1;
+ bool m_bFootnoteNum : 1; // contains a footnotenumberportion
+ bool m_bMargin : 1; // contains a hanging punctuation in the margin
public:
SwParaPortion();
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index a4d63b892ab8..289bce53e33f 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -427,12 +427,10 @@ public:
OUString m_sParam1; // Content / Database / NumberingSeparator
OUString m_sParam2; // - /DataTablename
OUString m_sParam3; // - /DataFieldName
- OUString m_sParam4;
OUString m_sParam5; // - /DataBaseURL
- OUString m_sParam6; // - /DataBaseResource
double m_fParam1; // Value / -
sal_Int8 m_nParam1; // ChapterNumberingLevel
- bool m_bParam1; // IsExpression
+ bool m_bParam1; // IsExpression
sal_Int32 m_nParam2;
Impl(SwModify *const pModify,
@@ -1086,8 +1084,6 @@ struct SwFieldProperties_Impl
OUString sPar2;
OUString sPar3;
OUString sPar4;
- OUString sPar5;
- OUString sPar6;
Date aDate;
double fDouble;
uno::Sequence<beans::PropertyValue> aPropSeq;
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 36a9d9d8fb43..4d3206ea0427 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -95,7 +95,6 @@ SwViewShellImp::SwViewShellImp( SwViewShell *pParent ) :
m_pLayAction( nullptr ),
m_pIdleAct( nullptr ),
m_pAccessibleMap( nullptr ),
- m_pSdrObjectCached(nullptr),
m_bFirstPageInvalid( true ),
m_bResetHdlHiddenPaint( false ),
m_bSmoothUpdate( false ),