summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/ccoll.hxx5
-rw-r--r--sw/inc/doc.hxx9
-rw-r--r--sw/inc/ndgrf.hxx1
-rw-r--r--sw/inc/ndhints.hxx1
-rw-r--r--sw/inc/shellio.hxx1
-rw-r--r--sw/inc/shellres.hxx5
-rw-r--r--sw/inc/splargs.hxx3
-rw-r--r--sw/inc/view.hxx1
-rw-r--r--sw/source/core/doc/docnew.cxx2
-rw-r--r--sw/source/core/txtnode/thints.cxx1
-rw-r--r--sw/source/uibase/utlui/initui.cxx3
11 files changed, 1 insertions, 31 deletions
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 9c9c64d39a2f..313609c44c8a 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,11 +30,6 @@
#include "swdllapi.h"
#include "cmdid.h"
-struct CollName {
- sal_uLong nCnd;
- sal_uLong nSubCond;
- };
-
#define COND_COMMAND_COUNT 28
struct CommandStruct
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 52eae86fc758..66376b884be1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -309,8 +309,6 @@ class SW_DLLPUBLIC SwDoc :
SwDBManager *mpDBManager; /**< Pointer to the DBManager for
evaluation of DB-fields. */
- SwDoc *mpGlossaryDoc; //< Pointer to glossary-document.
-
SwNumRule *mpOutlineRule;
SwFootnoteInfo *mpFootnoteInfo;
SwEndNoteInfo *mpEndNoteInfo;
@@ -352,16 +350,12 @@ private:
// other
- sal_uInt16 mnUndoCnt; //< Count of Undo Actions.
- sal_uInt16 mnUndoSttEnd; //< != 0 -> within parentheses.
-
sal_uInt32 mnRsid; //< current session ID of the document
sal_uInt32 mnRsidRoot; //< session ID when the document was created
sal_Int32 mReferenceCount;
- bool mbGlossDoc : 1; //< TRUE: glossary document.
- bool mbDtor : 1; /**< TRUE: is in SwDoc DTOR.
+ bool mbDtor : 1; /**< TRUE: is in SwDoc DTOR.
and unfortunately temorarily also in
SwSwgReader::InLayout() when flawed
frames need deletion. */
@@ -376,7 +370,6 @@ private:
View
notification of OLE-Objects PrtOLENotify() is required. */
bool mbAllOLENotify : 1; //< True: Notification of all objects is required.
- bool mbIsRedlineMove : 1; //< True: Redlines are moved into to / out of the section.
bool mbInsOnlyTextGlssry : 1; //< True: insert 'only text' glossary into doc
bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage
bool mbClipBoard : 1; //< TRUE: this document represents the clipboard
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d50e682c4b14..885311d9f6d1 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -40,7 +40,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
GraphicObject *mpReplacementGraphic;
tools::SvRef<sfx2::SvBaseLink> refLink; ///< If graphics only as link then pointer is set.
Size nGrfSize;
- OUString aLowResGrf; ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
bool bInSwapIn :1;
bool bGraphicArrived :1;
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index c885be091460..8fbe43bb2e09 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -89,7 +89,6 @@ private:
SwRegHistory* m_pHistory; ///< for Undo
- bool m_bFontChange : 1; ///< font change
/// true: the Node is in Split and Frames are moved
bool m_bInSplitNode : 1;
/// m_bHasHiddenParaField is invalid, call CalcHiddenParaField()
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 9b8c94ea8304..bf6f001ef3d2 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -460,7 +460,6 @@ typedef tools::SvRef<Writer> WriterRef;
class SW_DLLPUBLIC StgWriter : public Writer
{
protected:
- OUString aFltName;
tools::SvRef<SotStorage> pStg;
css::uno::Reference < css::embed::XStorage > xStg;
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index ca89be7dd7c6..15661f64931c 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -41,13 +41,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
OUString aCalc_Default;
OUString aCalc_Error;
- // For GetRefField - up/down.
- OUString aGetRefField_Up;
- OUString aGetRefField_Down;
// For GetRefField - referenced item not found.
OUString aGetRefField_RefItemNotFound;
- // For dynamic menu - string "all".
- OUString aStrAllPageHeadFoot;
// For some list boxes - string "none"
OUString aStrNone;
// For fixed fields.
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 33fe9424fed5..40343400ac73 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -120,8 +120,6 @@ public:
sal_Int32 nEnd;
sal_Int32 nWordStart;
sal_Int32 nWordLen;
- sal_Int32 nHyphPos;
- sal_uInt16 nMinTrail;
SwInterHyphInfo( const Point &rCrsrPos, sal_Int32 nStartPos = 0,
sal_Int32 nLength = SAL_MAX_INT32 )
@@ -131,7 +129,6 @@ public:
, nStart(nStartPos)
, nEnd(nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos + nLength)
, nWordStart(0), nWordLen(0)
- , nHyphPos(0), nMinTrail(0)
{
}
sal_Int32 GetEnd() const
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 229f3934842e..42b7f9d177d7 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -236,7 +236,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
m_bTopCrsr : 1,
m_bAlwaysShowSel : 1,
m_bTabColFromDoc : 1,
- m_bNumIndentFromDoc : 1, // #i23726#
m_bTabRowFromDoc : 1,
m_bSetTabColFromDoc : 1 ,
m_bSetTabRowFromDoc : 1,
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 36d513aab0a4..076ca699fc99 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -240,7 +240,6 @@ SwDoc::SwDoc()
mpGrfFormatCollTable( new SwGrfFormatColls() ),
mpTOXTypes( new SwTOXTypes() ),
mpDefTOXBases( new SwDefTOXBase_Impl() ),
- mpGlossaryDoc( nullptr ),
mpOutlineRule( nullptr ),
mpFootnoteInfo( new SwFootnoteInfo ),
mpEndNoteInfo( new SwEndNoteInfo ),
@@ -259,7 +258,6 @@ SwDoc::SwDoc()
mpTableStyles(new SwTableAutoFormatTable),
m_pXmlIdRegistry(),
mReferenceCount(0),
- mbGlossDoc(false),
mbDtor(false),
mbCopyIsMove(false),
mbInReading(false),
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index a51afa3c5031..f2cd6003507b 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -87,7 +87,6 @@ using namespace ::com::sun::star::i18n;
SwpHints::SwpHints()
: m_pHistory(nullptr)
- , m_bFontChange(true)
, m_bInSplitNode(false)
, m_bCalcHiddenParaField(false)
, m_bHasHiddenParaField(false)
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 30d009b469f2..cf64f93fefa4 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -189,11 +189,8 @@ ShellResource::ShellResource()
aCalc_Default( SW_RES( STR_CALC_DEFAULT ) ),
aCalc_Error( SW_RES( STR_CALC_ERROR ) ),
- aGetRefField_Up( SW_RES( STR_GETREFFLD_UP ) ),
- aGetRefField_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
// #i81002#
aGetRefField_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
- aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
aStrNone( SW_RES( STR_TEMPLATE_NONE )),
aFixedStr( SW_RES( STR_FIELD_FIXED )),
sDurationFormat( SW_RES( STR_DURATION_FORMAT )),