summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/ui/config/optcomp.cxx9
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx14
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx5
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx1
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx1
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx1
-rw-r--r--sw/source/uibase/inc/formedt.hxx5
-rw-r--r--sw/source/uibase/inc/navipi.hxx1
-rw-r--r--sw/source/uibase/inc/num.hxx7
-rw-r--r--sw/source/uibase/inc/textsh.hxx1
-rw-r--r--sw/source/uibase/shells/textsh.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx1
14 files changed, 14 insertions, 40 deletions
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index d0452ab76430..c3963c3e93a0 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -56,14 +56,13 @@ struct CompatibilityItem
bool m_bConsiderWrappingStyle;
bool m_bExpandWordSpace;
bool m_bIsDefault;
- bool m_bIsUser;
CompatibilityItem( const OUString& _rName, const OUString& _rModule,
bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages,
bool _bUseOurTabStops, bool _bNoExtLeading, bool _bUseLineSpacing,
bool _bAddTableSpacing, bool _bUseObjPos, bool _bUseOurTextWrapping,
bool _bConsiderWrappingStyle, bool _bExpandWordSpace,
- bool _bIsDefault, bool _bIsUser ) :
+ bool _bIsDefault ) :
m_sName ( _rName ),
m_sModule ( _rModule ),
@@ -78,8 +77,7 @@ struct CompatibilityItem
m_bUseOurTextWrapping ( _bUseOurTextWrapping ),
m_bConsiderWrappingStyle( _bConsiderWrappingStyle ),
m_bExpandWordSpace ( _bExpandWordSpace ),
- m_bIsDefault ( _bIsDefault ),
- m_bIsUser ( _bIsUser ) {}
+ m_bIsDefault ( _bIsDefault ) {}
};
#include <vector>
@@ -275,8 +273,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
bAddSpacingAtPages, bUseOurTabStops, bNoExtLeading,
bUseLineSpacing, bAddTableSpacing, bUseObjPos,
bUseOurTextWrapping, bConsiderWrappingStyle, bExpandWordSpace,
- bIsDefaultEntry,
- bIsUserEntry );
+ bIsDefaultEntry );
m_pImpl->m_aList.push_back( aItem );
if ( aItem.m_bIsDefault )
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index af571d1e1f6d..24eb19692340 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -265,7 +265,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
sal_Int32 nCount = aColNames.getLength();
for (sal_Int32 n = 0; n < nCount; ++n)
{
- SwInsDBColumn* pNew = new SwInsDBColumn( pColNames[n], (sal_uInt16)n );
+ SwInsDBColumn* pNew = new SwInsDBColumn( pColNames[n] );
Any aCol = xCols->getByName(pColNames[n]);
Reference <XPropertySet> xCol;
aCol >>= xCol;
@@ -491,7 +491,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void )
: *m_pLbTableCol )
: *m_pLbTextDbColumn;
- SwInsDBColumn aSrch( rBox.GetSelectEntry(), 0 );
+ SwInsDBColumn aSrch( rBox.GetSelectEntry() );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
bool bFromDB = m_pRbDbFormatFromDb == pButton;
@@ -547,7 +547,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void
nTopPos = m_pLbTableCol->GetTopEntry();
// look for the right InsertPos!!
- SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( nDelPos ), 0 );
+ SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( nDelPos ) );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if( it == aDBColumns.begin() || (it+1) == aDBColumns.end() )
nInsPos = it - aDBColumns.begin();
@@ -795,7 +795,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void )
: m_pLbTextDbColumn.get() )
: &rBox;
- SwInsDBColumn aSrch( pGetBox->GetSelectEntry(), 0 );
+ SwInsDBColumn aSrch( pGetBox->GetSelectEntry() );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if( &rBox == m_pLbDbFormatFromUsr )
@@ -890,7 +890,7 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rText,
if( -1 != ( nEndPos = sText.indexOf( cDBFieldEnd, nSttPos+1 )))
{
// Text in <> brackets found: what is it:
- SwInsDBColumn aSrch( sText.copy( nSttPos, nEndPos - nSttPos ), 0);
+ SwInsDBColumn aSrch( sText.copy( nSttPos, nEndPos - nSttPos ));
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if( it != aDBColumns.end() )
{
@@ -1006,7 +1006,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
std::vector<SwInsDBColumn*> aColFields;
for( sal_Int32 n = 0; n < nCols; ++n )
{
- SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( n ), 0 );
+ SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( n ) );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if (it != aDBColumns.end())
aColFields.push_back(*it);
@@ -1698,7 +1698,7 @@ void SwInsertDBColAutoPilot::Load()
continue;
sal_Int16 nIndex = 0;
pSubProps[1] >>= nIndex;
- SwInsDBColumn* pInsDBColumn = new SwInsDBColumn(sColumn, nIndex);
+ SwInsDBColumn* pInsDBColumn = new SwInsDBColumn(sColumn);
if(pSubProps[2].hasValue())
pInsDBColumn->bHasFormat = *static_cast<sal_Bool const *>(pSubProps[2].getValue());
if(pSubProps[3].hasValue())
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index c7aff3e5dd66..0b6207fb58d2 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -90,8 +90,6 @@ class SwVisitingCardPage : public SfxTabPage
VclPtr<ListBox> m_pAutoTextGroupLB;
VclPtr<vcl::Window> m_pExampleWIN;
- OUString sTempURL;
-
SwLabItem aLabItem;
SwOneExampleFrame* pExampleFrame;
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 2cebd3e771c1..d460358418da 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -148,13 +148,12 @@ struct MSOStyleNameTable
{
const sal_Char* pMSOStyleName;
const sal_Char* pOOoStyleName;
- const sal_Char* pOOoStyleType;
};
static const MSOStyleNameTable aMSOStyleNameTable[] =
{
- { "Normal", "Default", "ParagraphStyles" },
- { nullptr, nullptr, nullptr }
+ { "Normal", "Default" },
+ { nullptr, nullptr }
};
class StyleCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess,
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 26106097cfdf..a4eca985305c 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -63,7 +63,6 @@ using namespace ::com::sun::star::beans;
struct SwConnectionData
{
- OUString sSourceName;
Reference<XConnection> xConnection;
};
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index cd0c9a0a9d18..673cac073f11 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -217,7 +217,6 @@ inline sal_uInt16 GetPackCount() { return sizeof(aSwFields) / sizeof(SwFieldPac
// FieldManager controls inserting and updating of fields
SwFieldMgr::SwFieldMgr(SwWrtShell* pSh ) :
- pModule(nullptr),
pMacroItem(nullptr),
pWrtShell(pSh),
bEvalExp(true)
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 59c1b5fd1561..1313e4e9425a 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -63,16 +63,14 @@ struct SwInsDBColumn
sal_Int32 nDBNumFormat;
sal_uInt32 nUsrNumFormat;
LanguageType eUsrNumFormatLng;
- sal_uInt16 nCol;
bool bHasFormat : 1;
bool bIsDBFormat : 1;
- SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn )
+ SwInsDBColumn( const OUString& rStr )
: sColumn( rStr ),
nDBNumFormat( 0 ),
nUsrNumFormat( 0 ),
eUsrNumFormatLng( LANGUAGE_SYSTEM ),
- nCol( nColumn ),
bHasFormat(false),
bIsDBFormat(true)
{}
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index a8bdfc427c8e..832dfd360adf 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -100,7 +100,6 @@ class SW_DLLPUBLIC SwFieldMgr
{
private:
SwField* pCurField;
- SbModule* pModule;
const SvxMacroItem* pMacroItem;
SwWrtShell* pWrtShell; // can be ZERO too!
OUString aCurPar1;
diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx
index 9439c4ab969c..320d2276edf2 100644
--- a/sw/source/uibase/inc/formedt.hxx
+++ b/sw/source/uibase/inc/formedt.hxx
@@ -57,11 +57,6 @@ class SwIdxFormDlg : public SvxStandardDialog
VclPtr<PushButton> m_aAssignBT;
VclPtr<FixedLine> m_aFormatFL;
- SwWrtShell &m_rSh;
- SwForm *m_pForm;
- sal_uInt16 m_nAktLevel;
- bool m_bLastLinkIsEnd;
-
public:
SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
virtual ~SwIdxFormDlg();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 5d74116ab635..761f495f7e70 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -90,7 +90,6 @@ class SwNavigationPI : public vcl::Window,
short m_nZoomOutInit;
short m_nZoomOut;
- bool m_bSmallMode : 1;
bool m_bIsZoomedIn : 1;
bool m_bPageCtrlsVisible : 1;
bool m_bGlobalMode : 1;
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index de8d9e5618c0..fb5880bd7c36 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -36,13 +36,6 @@ class SwWrtShell;
class SvxBrushItem;
class SwOutlineTabDialog;
-struct SwBmpItemInfo
-{
- SvxBrushItem* pBrushItem;
- sal_uInt16 nItemId;
-};
-
-
class SwNumPositionTabPage : public SfxTabPage
{
VclPtr<ListBox> m_pLevelLB;
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 9abef5b0d499..e28067d44830 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -30,7 +30,6 @@ class SvxHyperlinkItem;
class SW_DLLPUBLIC SwTextShell: public SwBaseShell
{
- SwFieldMgr* pPostItFieldMgr;
RotateTransliteration m_aRotateCase;
void InsertSymbol( SfxRequest& );
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index c0d542ec8aa2..2ea08ce09815 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -925,7 +925,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq )
}
SwTextShell::SwTextShell(SwView &_rView) :
- SwBaseShell(_rView), pPostItFieldMgr( nullptr )
+ SwBaseShell(_rView)
{
SetName("Text");
SetHelpId(SW_TEXTSHELL);
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 8a26ff77283b..149d047a3cb7 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -665,7 +665,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
m_nAutoMarkIdx(1),
m_nRegionMode(RegionMode::NONE),
- m_bSmallMode(false),
m_bIsZoomedIn(false),
m_bPageCtrlsVisible(false),
m_bGlobalMode(false)