[Libreoffice-commits] .: 17 commits - l10ntools/scripts sc/inc sc/source sd/inc sd/source setup_native/prj setup_native/source solenv/bin solenv/gbuild starmath/inc starmath/source sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 11 08:11:59 PDT 2012
l10ntools/scripts/update_tree.pl | 2
sc/inc/AccessibleFilterMenu.hxx | 4
sc/inc/AccessibleFilterTopWindow.hxx | 6
sc/inc/compiler.hxx | 21 +-
sc/inc/consoli.hxx | 1
sc/inc/dpsdbtab.hxx | 3
sc/inc/dpshttab.hxx | 1
sc/inc/drwlayer.hxx | 1
sc/inc/olinetab.hxx | 1
sc/inc/scabstdlg.hxx | 2
sc/source/core/data/dpobject.cxx | 2
sc/source/core/data/dpoutput.cxx | 12 -
sc/source/core/data/dpsdbtab.cxx | 3
sc/source/core/data/dpshttab.cxx | 1
sc/source/core/tool/consoli.cxx | 1
sc/source/filter/excel/xecontent.cxx | 1
sc/source/filter/excel/xestream.cxx | 1
sc/source/filter/excel/xilink.cxx | 8
sc/source/filter/html/htmlpars.cxx | 1
sc/source/filter/inc/XclExpChangeTrack.hxx | 1
sc/source/filter/inc/condformatbuffer.hxx | 2
sc/source/filter/inc/defnamesbuffer.hxx | 1
sc/source/filter/inc/drawingmanager.hxx | 4
sc/source/filter/inc/excdoc.hxx | 2
sc/source/filter/inc/externallinkbuffer.hxx | 1
sc/source/filter/inc/htmlpars.hxx | 1
sc/source/filter/inc/numberformatsbuffer.hxx | 1
sc/source/filter/inc/scflt.hxx | 1
sc/source/filter/inc/xecontent.hxx | 1
sc/source/filter/inc/xestream.hxx | 1
sc/source/filter/inc/xetable.hxx | 1
sc/source/filter/oox/condformatbuffer.cxx | 2
sc/source/filter/oox/defnamesbuffer.cxx | 3
sc/source/filter/oox/drawingmanager.cxx | 4
sc/source/filter/oox/externallinkbuffer.cxx | 1
sc/source/filter/oox/numberformatsbuffer.cxx | 3
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 1
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 1
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 1
sc/source/filter/xml/XMLTextPContext.cxx | 3
sc/source/filter/xml/XMLTextPContext.hxx | 1
sc/source/filter/xml/xmlannoi.cxx | 1
sc/source/filter/xml/xmlannoi.hxx | 1
sc/source/filter/xml/xmlcondformat.cxx | 1
sc/source/filter/xml/xmlcondformat.hxx | 1
sc/source/filter/xml/xmldpimp.hxx | 1
sc/source/filter/xml/xmldrani.hxx | 1
sc/source/filter/xml/xmlexternaltabi.cxx | 1
sc/source/filter/xml/xmlexternaltabi.hxx | 1
sc/source/filter/xml/xmlfilti.hxx | 4
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 4
sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx | 6
sc/source/ui/Accessibility/AccessibleText.cxx | 11 -
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 4
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/cctrl/checklistmenu.cxx | 7
sc/source/ui/condformat/condformatdlg.cxx | 3
sc/source/ui/condformat/condformatmgr.cxx | 3
sc/source/ui/dbgui/filtdlg.cxx | 1
sc/source/ui/dbgui/foptmgr.cxx | 4
sc/source/ui/dbgui/sfiltdlg.cxx | 1
sc/source/ui/dbgui/tpsort.cxx | 1
sc/source/ui/dbgui/validate.cxx | 8
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh.cxx | 12 -
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/docshell/pntlock.cxx | 3
sc/source/ui/inc/AccessibleText.hxx | 1
sc/source/ui/inc/acredlin.hxx | 9
sc/source/ui/inc/checklistmenu.hxx | 1
sc/source/ui/inc/colrowba.hxx | 2
sc/source/ui/inc/condformatdlg.hxx | 3
sc/source/ui/inc/condformatmgr.hxx | 4
sc/source/ui/inc/dwfunctr.hxx | 2
sc/source/ui/inc/foptmgr.hxx | 5
sc/source/ui/inc/hdrcont.hxx | 9
sc/source/ui/inc/inputwin.hxx | 3
sc/source/ui/inc/overlayobject.hxx | 5
sc/source/ui/inc/pntlock.hxx | 3
sc/source/ui/inc/privsplt.hxx | 2
sc/source/ui/inc/pvlaydlg.hxx | 2
sc/source/ui/inc/simpref.hxx | 2
sc/source/ui/inc/textdlgs.hxx | 3
sc/source/ui/inc/tpsort.hxx | 1
sc/source/ui/inc/undoblk.hxx | 1
sc/source/ui/inc/undocell.hxx | 6
sc/source/ui/inc/undodat.hxx | 3
sc/source/ui/inc/undotab.hxx | 7
sc/source/ui/inc/validate.hxx | 4
sc/source/ui/inc/viewdata.hxx | 2
sc/source/ui/inc/viewutil.hxx | 4
sc/source/ui/miscdlgs/simpref.cxx | 2
sc/source/ui/miscdlgs/textdlgs.cxx | 4
sc/source/ui/undo/undocell.cxx | 10 -
sc/source/ui/undo/undodat.cxx | 3
sc/source/ui/undo/undotab.cxx | 8
sc/source/ui/vba/vbaaxis.hxx | 1
sc/source/ui/vba/vbaname.hxx | 4
sc/source/ui/view/cellsh1.cxx | 9
sc/source/ui/view/colrowba.cxx | 10 -
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/hdrcont.cxx | 5
sc/source/ui/view/overlayobject.cxx | 4
sc/source/ui/view/preview.cxx | 2
sc/source/ui/view/viewfun2.cxx | 6
sc/source/ui/view/viewfunc.cxx | 5
sd/inc/sdabstdlg.hxx | 3
sd/source/filter/html/HtmlOptionsDialog.cxx | 10 -
sd/source/filter/html/htmlex.hxx | 1
sd/source/ui/animations/CustomAnimationDialog.cxx | 11 -
sd/source/ui/animations/CustomAnimationList.cxx | 9
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 1
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 5
sd/source/ui/dlg/dlgchar.cxx | 1
sd/source/ui/dlg/dlgpage.cxx | 1
sd/source/ui/dlg/paragr.cxx | 1
sd/source/ui/dlg/sddlgfact.cxx | 4
sd/source/ui/dlg/sddlgfact.hxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 3
sd/source/ui/func/fuprlout.cxx | 2
sd/source/ui/inc/OutlineView.hxx | 1
sd/source/ui/inc/PreviewRenderer.hxx | 1
sd/source/ui/inc/SdUnoDrawView.hxx | 4
sd/source/ui/inc/SdUnoOutlineView.hxx | 9
sd/source/ui/inc/SdUnoSlideView.hxx | 10 -
sd/source/ui/inc/dlg_char.hxx | 1
sd/source/ui/inc/dlgpage.hxx | 2
sd/source/ui/inc/headerfooterdlg.hxx | 1
sd/source/ui/inc/morphdlg.hxx | 2
sd/source/ui/inc/paragr.hxx | 2
sd/source/ui/inc/prltempl.hxx | 2
sd/source/ui/inc/sdpreslt.hxx | 3
sd/source/ui/inc/undopage.hxx | 3
sd/source/ui/remotecontrol/BluetoothServer.cxx | 9
sd/source/ui/slideshow/PaneHider.cxx | 5
sd/source/ui/slideshow/PaneHider.hxx | 3
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 1
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 1
sd/source/ui/table/TableDesignPane.cxx | 1
sd/source/ui/table/TableDesignPane.hxx | 1
sd/source/ui/tools/PreviewRenderer.cxx | 1
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2
sd/source/ui/unoidl/SdUnoOutlineView.cxx | 8
sd/source/ui/unoidl/SdUnoSlideView.cxx | 8
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 6
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/drviewsa.cxx | 1
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/outlview.cxx | 1
sd/source/ui/view/viewoverlaymanager.cxx | 8
sd/source/ui/view/viewshe2.cxx | 2
setup_native/prj/build.lst | 3
setup_native/source/packinfo/makefile.mk | 24 ++
setup_native/source/packinfo/spellchecker_selection.pl | 68 ++++++
setup_native/source/packinfo/spellchecker_selection.txt | 2
setup_native/source/win32/customactions/sellang/sellang.cxx | 120 +++++++++---
solenv/bin/modules/installer/files.pm | 1
solenv/gbuild/ExtensionTarget.mk | 5
starmath/inc/view.hxx | 1
starmath/source/dialog.cxx | 2
sw/inc/pvprtdat.hxx | 3
sw/inc/splargs.hxx | 3
sw/inc/unoframe.hxx | 4
sw/inc/unostyle.hxx | 2
sw/source/core/bastyp/swcache.cxx | 1
sw/source/core/doc/doc.cxx | 4
sw/source/core/doc/doccomp.cxx | 3
sw/source/core/doc/docedt.cxx | 8
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docfmt.cxx | 12 -
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/swserv.cxx | 8
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/node2lay.cxx | 2
sw/source/core/inc/SwXMLBlockListContext.hxx | 3
sw/source/core/inc/docfld.hxx | 5
sw/source/core/inc/mvsave.hxx | 5
sw/source/core/inc/swblocks.hxx | 3
sw/source/core/inc/swcache.hxx | 3
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/layout/paintfrm.cxx | 3
sw/source/core/swg/SwXMLBlockListContext.cxx | 3
sw/source/core/swg/swblocks.cxx | 8
sw/source/core/text/inftxt.hxx | 1
sw/source/core/text/redlnitr.cxx | 2
sw/source/core/text/redlnitr.hxx | 1
sw/source/core/unocore/unocoll.cxx | 5
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unostyle.cxx | 6
sw/source/filter/html/htmlctxt.cxx | 3
sw/source/filter/ww8/wrtww8.cxx | 3
sw/source/filter/xml/xmltbli.cxx | 12 -
sw/source/ui/config/usrpref.cxx | 3
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 14 -
sw/source/ui/dialog/uiregionsw.cxx | 1
sw/source/ui/docvw/SidebarTxtControl.cxx | 1
sw/source/ui/docvw/SidebarTxtControl.hxx | 2
sw/source/ui/envelp/labfmt.hxx | 1
sw/source/ui/fldui/fldvar.cxx | 1
sw/source/ui/fldui/fldvar.hxx | 1
sw/source/ui/inc/content.hxx | 2
sw/source/ui/inc/frmdlg.hxx | 1
sw/source/ui/inc/frmpage.hxx | 1
sw/source/ui/inc/glshell.hxx | 1
sw/source/ui/inc/inputwin.hxx | 1
sw/source/ui/inc/insfnote.hxx | 1
sw/source/ui/inc/num.hxx | 1
sw/source/ui/inc/optload.hxx | 1
sw/source/ui/inc/regionsw.hxx | 1
sw/source/ui/inc/swuiccoll.hxx | 3
sw/source/ui/inc/usrpref.hxx | 1
sw/source/ui/inc/workctrl.hxx | 3
sw/source/ui/misc/glshell.cxx | 1
sw/source/ui/misc/num.cxx | 3
sw/source/ui/ribbar/workctrl.cxx | 4
sw/source/ui/shells/textsh2.cxx | 2
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/vba/vbacells.cxx | 2
sw/source/ui/vba/vbacells.hxx | 2
sw/source/ui/vba/vbatablehelper.cxx | 2
sw/source/ui/vba/vbatablehelper.hxx | 2
225 files changed, 372 insertions(+), 565 deletions(-)
New commits:
commit a0ca9451c7e628056b14bef46ebeadc20f463ba2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 14:23:33 2012 +0200
Make update_tree.pl work with internal xmllint
Change-Id: I5985e484ffd031e0526c2de7765df113b51bb7e8
diff --git a/l10ntools/scripts/update_tree.pl b/l10ntools/scripts/update_tree.pl
index 568d99e..02faf6a 100644
--- a/l10ntools/scripts/update_tree.pl
+++ b/l10ntools/scripts/update_tree.pl
@@ -44,7 +44,7 @@ terminate() if ( ! defined $inpath );
my $destpath = $inpath;
my $with_lang = $ARGV[1];
-my $xmllint = $ENV{XMLLINT};
+my $xmllint = $ENV{XMLLINT} || "$ENV{OUTDIR_FOR_BUILD}/bin/xmllint";
$tree_target_prefix = $ARGV[4];
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index d89cfa8..d68f79e 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -40,7 +40,10 @@ gb_ExtensionTarget_PROPMERGECOMMAND := \
$(PERL) $(gb_ExtensionTarget_PROPMERGETARGET)
gb_ExtensionTarget_UPDATETREETARGET := $(SRCDIR)/l10ntools/scripts/update_tree.pl
-gb_ExtensionTarget_UPDATETREECOMMAND := $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET)
+gb_ExtensionTarget_UPDATETREECOMMAND := \
+ $(gb_Helper_set_ld_path) $(PERL) $(gb_ExtensionTarget_UPDATETREETARGET)
+ # update_tree.pl calls xmllint, which needs $(gb_Helper_set_ld_path) if it
+ # is the internal one
gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
gb_ExtensionTarget_HELPEXCOMMAND := \
commit 04f94ba53f2b18fdf548ca86bce5030ca6b06eb0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 14:22:09 2012 +0200
Stray "use Carp"
Change-Id: Iba0cc40699bd7d5f2d4c5964d8005f41814bfe8e
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index 610ba4f..67fa8a6 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -32,7 +32,6 @@ use warnings;
use installer::exiter;
use installer::logger;
-use Carp;
############################################
# File Operations
commit 84db94e97bf088cf442db5f97fefbe41fd45c1bb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 11:25:20 2012 +0200
-Werror,-Wunused-private-field (various sw)
Change-Id: Ib2becb2af810da0fa3d24bd0aa21887d41e2f34c
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index 19a4785..513b1b3 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -29,12 +29,11 @@ class SwPagePreViewPrtData
nHorzSpace, nVertSpace;
sal_uInt8 nRow, nCol;
sal_Bool bLandscape : 1;
- sal_Bool bStretch : 1;
public:
SwPagePreViewPrtData()
: nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0),
nHorzSpace(0), nVertSpace(0), nRow(1), nCol(1),
- bLandscape(0),bStretch(0)
+ bLandscape(0)
{}
sal_uLong GetLeftSpace() const { return nLeftSpace; }
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 9746642..8d8be46 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -129,7 +129,6 @@ class SwInterHyphInfo
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
const Point aCrsrPos;
- sal_Bool bAuto : 1;
sal_Bool bNoLang : 1;
sal_Bool bCheck : 1;
public:
@@ -144,7 +143,7 @@ public:
const sal_uInt16 nStartPos = 0,
const sal_uInt16 nLength = USHRT_MAX )
: aCrsrPos( rCrsrPos ),
- bAuto(sal_False), bNoLang(sal_False), bCheck(sal_False),
+ bNoLang(sal_False), bCheck(sal_False),
nStart(nStartPos), nLen(nLength),
nWordStart(0), nWordLen(0),
nHyphPos(0), nMinTrail(0)
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 3642a8c..948dd03 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -49,8 +49,6 @@
#include <unoevtlstnr.hxx>
#include <unotext.hxx>
-
-class SfxItemPropertSet;
class SdrObject;
class SwDoc;
class SwFmt;
@@ -171,8 +169,6 @@ class SwXTextFrame : public SwXTextFrameBaseClass,
public SwXText,
public SwXFrame
{
- const SfxItemPropertSet* _pPropSet;
-
protected:
virtual const SwStartNode *GetStartNode() const;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index d18eb21..76bbd50 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -288,8 +288,6 @@ public:
class SwXPageStyle : public SwXStyle
{
- SwDocShell* pDocShell;
-
protected:
void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 63320c0..d900267 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -84,7 +84,6 @@ SwCache::SwCache( const sal_uInt16 nInitSize
pRealFirst( 0 ),
pFirst( 0 ),
pLast( 0 ),
- nMax( nInitSize ),
nCurMax( nInitSize )
#ifdef DBG_UTIL
, m_aName( rNm )
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8b439b3..3dc4caf 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -761,7 +761,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
{
// BUG 26675: Send DataChanged before deleting, so that we notice which objects are in scope.
// After that they can be before/after the position.
- SwDataChanged aTmp( this, rPos, 0 );
+ SwDataChanged aTmp( this, rPos );
}
SwUndoSplitNode* pUndo = 0;
@@ -944,7 +944,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
if(!pNode)
return false;
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
if (!bDoesUndo || !GetIDocumentUndoRedo().DoesGroupUndo())
{
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0ed56d7..02db609 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -227,7 +227,6 @@ private:
const SwTxtNode *pTxtNd1, *pTxtNd2;
int *pPos1, *pPos2;
int nCnt1, nCnt2; // number of words
- const unsigned nMul;
void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
@@ -2206,7 +2205,7 @@ bool CharArrayComparator::Compare( int nIdx1, int nIdx2 ) const
WordArrayComparator::WordArrayComparator( const SwTxtNode *pNode1,
const SwTxtNode *pNode2 )
- : pTxtNd1( pNode1 ), pTxtNd2( pNode2 ), nMul( 251 )
+ : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
{
pPos1 = new int[ pTxtNd1->GetTxt().Len() + 1 ];
pPos2 = new int[ pTxtNd2->GetTxt().Len() + 1 ];
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3f2e699..14ef5ae 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -725,7 +725,7 @@ void SwDoc::DeleteSection( SwNode *pNode )
void SwDoc::SetModified(SwPaM &rPaM)
{
- SwDataChanged aTmp( rPaM, 0 );
+ SwDataChanged aTmp( rPaM );
SetModified();
}
@@ -753,7 +753,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
sal_uInt16 nOldAttrCnt = pNode->GetpSwpHints()
? pNode->GetpSwpHints()->Count() : 0;
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
SwIndex& rIdx = rPt.nContent;
xub_StrLen nStart = 0;
@@ -1662,7 +1662,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
// Send DataChanged before deletion, so that we still know
// which objects are in the range.
// Afterwards they could be before/after the Position.
- SwDataChanged aTmp( rPam, 0 );
+ SwDataChanged aTmp( rPam );
}
@@ -2295,7 +2295,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
nEnd = bOneNode ? pEnd->nContent.GetIndex()
: pTxtNd->GetTxt().Len();
- SwDataChanged aTmp( aDelPam, 0 );
+ SwDataChanged aTmp( aDelPam );
if( IsRedlineOn() )
{
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index b70ddcc..d68fd40 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2565,7 +2565,7 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
}
SwDocUpdtFld::SwDocUpdtFld()
- : pFldSortLst(0), nFldUpdtPos(LONG_MAX), nFldLstGetMode(0)
+ : pFldSortLst(0), nFldLstGetMode(0)
{
bInUpdateFlds = bFldsDirty = sal_False;
memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 6b749df..ea14782 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -313,7 +313,7 @@ sal_Bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
void SwDoc::RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark )
{
SwHistory* pHst = 0;
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
if (GetIDocumentUndoRedo().DoesUndo())
{
SwUndoResetAttr* pUndo = new SwUndoResetAttr( rRg, RES_CHRFMT );
@@ -385,11 +385,11 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
}
// #i96644#
- // SwDataChanged aTmp( *pPam, 0 );
+ // SwDataChanged aTmp( *pPam );
std::auto_ptr< SwDataChanged > pDataChanged;
if ( bSendDataChangedEvents )
{
- pDataChanged.reset( new SwDataChanged( *pPam, 0 ) );
+ pDataChanged.reset( new SwDataChanged( *pPam ) );
}
SwHistory* pHst = 0;
if (GetIDocumentUndoRedo().DoesUndo())
@@ -1019,7 +1019,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
bool SwDoc::InsertPoolItem( const SwPaM &rRg, const SfxPoolItem &rHt,
const SetAttrMode nFlags )
{
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
SwUndoAttr* pUndoAttr = 0;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -1044,7 +1044,7 @@ bool SwDoc::InsertPoolItem( const SwPaM &rRg, const SfxPoolItem &rHt,
bool SwDoc::InsertItemSet ( const SwPaM &rRg, const SfxItemSet &rSet,
const SetAttrMode nFlags )
{
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
SwUndoAttr* pUndoAttr = 0;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -1689,7 +1689,7 @@ sal_Bool SwDoc::SetTxtFmtColl( const SwPaM &rRg,
bool bReset,
bool bResetListAttrs )
{
- SwDataChanged aTmp( rRg, 0 );
+ SwDataChanged aTmp( rRg );
const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
SwHistory* pHst = 0;
sal_Bool bRet = sal_True;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index a0ff168..6ac2c6a 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1874,7 +1874,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
// which objects are still in the Area.
// After the move they could come before/after the
// Position.
- SwDataChanged aTmp( rPam, 0 );
+ SwDataChanged aTmp( rPam );
}
SwNodeIndex aIdx( nOffset > 0 ? pEnd->nNode : pStt->nNode, nOffs );
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index ceba15f..80c7ea6 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -303,16 +303,16 @@ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
-SwDataChanged::SwDataChanged( const SwPaM& rPam, sal_uInt16 nTyp )
- : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() ), nType( nTyp )
+SwDataChanged::SwDataChanged( const SwPaM& rPam )
+ : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() )
{
nNode = rPam.GetPoint()->nNode.GetIndex();
nCntnt = rPam.GetPoint()->nContent.GetIndex();
}
-SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos, sal_uInt16 nTyp )
- : pPam( 0 ), pPos( &rPos ), pDoc( pDc ), nType( nTyp )
+SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos )
+ : pPam( 0 ), pPos( &rPos ), pDoc( pDc )
{
nNode = rPos.nNode.GetIndex();
nCntnt = rPos.nContent.GetIndex();
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 9e03115..3fd001a 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -46,9 +46,6 @@ public:
class SwXMLBlockContext : public SvXMLImportContext
{
-private:
- SwXMLBlockListImport & rLocalRef;
-
public:
SwXMLBlockContext( SwXMLBlockListImport& rImport,
sal_uInt16 nPrefix,
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 212b648..ee8ede6 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -35,7 +35,6 @@
class SwTxtFld;
class SwIndex;
class SwNodeIndex;
-class SwCntntNode;
class SwCntntFrm;
class SwSectionNode;
class SwSection;
@@ -154,10 +153,6 @@ class SwDocUpdtFld
_SetGetExpFlds* pFldSortLst; // current field list for calculation
SwCalcFldType* aFldTypeTable[ TBLSZ ];
- // another optimization - currently not used!
- long nFldUpdtPos; // start update from this position
- SwCntntNode* pCNode; // TxtNode at update position
-
sal_uLong nNodes; // if the node count is different
sal_uInt8 nFldLstGetMode;
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index c360938..9c56566 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -130,11 +130,10 @@ class SwDataChanged
SwDoc* pDoc;
sal_uLong nNode;
xub_StrLen nCntnt;
- sal_uInt16 nType; // Insert/Move/Delete/... (UndoIds)
public:
- SwDataChanged( const SwPaM& rPam, sal_uInt16 nType );
- SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, sal_uInt16 nType );
+ SwDataChanged( const SwPaM& rPam );
+ SwDataChanged( SwDoc* pDoc, const SwPosition& rPos );
~SwDataChanged();
sal_uLong GetNode() const { return nNode; }
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index d182c5c..2a73bb7 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -44,7 +44,6 @@ class SwBlockName
{
friend class SwImpBlocks;
sal_uInt16 nHashS, nHashL; // Hash-Codes zum Checken
- long nPos; // Dateiposition (SW2-Format)
public:
String aShort; // Short name
String aLong; // Long name
@@ -53,7 +52,7 @@ public:
sal_Bool bIsOnlyTxt : 1; // unformatted text
sal_Bool bInPutMuchBlocks : 1; // put serveral block entries
- SwBlockName( const String& rShort, const String& rLong, long n );
+ SwBlockName( const String& rShort, const String& rLong );
SwBlockName( const String& rShort, const String& rLong, const String& rPackageName );
// fuer das Einsortieren in das Array
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 2c54072..c0acab9 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -75,9 +75,6 @@ class SwCache
SwCacheObj *pFirst; //der virtuelle erste.
SwCacheObj *pLast;
- const sal_uInt16 nMax; //Mehr sollen nicht aufgenommen werden,
- //der Cache kann aber dynamisch um jeweils
- //nMax vergroessert werden.
sal_uInt16 nCurMax; //Mehr werden nicht aufgenommen.
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b3efb88..3bef609 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -345,8 +345,7 @@ void SwCalcPixStatics( OutputDevice *pOut )
//To be able to save the statics so the paint is more or lees reentrant.
class SwSavePaintStatics
{
- sal_Bool bSFlyMetafile,
- bSPageOnly;
+ sal_Bool bSFlyMetafile;
ViewShell *pSGlobalShell;
OutputDevice *pSFlyMetafileOut;
SwFlyFrm *pSRetoucheFly,
diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx
index f86f301..36ad18e 100644
--- a/sw/source/core/swg/SwXMLBlockListContext.cxx
+++ b/sw/source/core/swg/SwXMLBlockListContext.cxx
@@ -90,8 +90,7 @@ SwXMLBlockContext::SwXMLBlockContext(
const OUString& rLocalName,
const uno::Reference<
xml::sax::XAttributeList > & xAttrList ) :
- SvXMLImportContext ( rImport, nPrefix, rLocalName ),
- rLocalRef(rImport)
+ SvXMLImportContext ( rImport, nPrefix, rLocalName )
{
static const CharClass & rCC = GetAppCharClass();
String aShort, aLong, aPackageName;
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index cb938d2..46954c0 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -65,15 +65,15 @@ sal_uInt16 SwImpBlocks::Hash( const String& r )
}
-SwBlockName::SwBlockName( const String& rShort, const String& rLong, long n )
- : nPos( n ), aShort( rShort ), aLong( rLong ), aPackageName (rShort),
+SwBlockName::SwBlockName( const String& rShort, const String& rLong )
+ : aShort( rShort ), aLong( rLong ), aPackageName (rShort),
bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False )
{
nHashS = SwImpBlocks::Hash( rShort );
nHashL = SwImpBlocks::Hash( rLong );
}
SwBlockName::SwBlockName( const String& rShort, const String& rLong, const String& rPackageName)
- : nPos( 0 ), aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
+ : aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False )
{
nHashS = SwImpBlocks::Hash( rShort );
@@ -205,7 +205,7 @@ void SwImpBlocks::AddName( const String& rShort, const String& rLong,
delete aNames[nIdx];
aNames.erase( aNames.begin() + nIdx );
}
- SwBlockName* pNew = new SwBlockName( rShort, rLong, 0L );
+ SwBlockName* pNew = new SwBlockName( rShort, rLong );
pNew->bIsOnlyTxtFlagInit = sal_True;
pNew->bIsOnlyTxt = bOnlyTxt;
aNames.insert( pNew );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 6cb4d56..a975d04 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -778,7 +778,6 @@ class SwDefFontSave
SwTxtSizeInfo *pInf;
SwFont *pFnt;
SwFont *pNewFnt;
- sal_Bool bAlter;
public:
SwDefFontSave( const SwTxtSizeInfo &rInf );
~SwDefFontSave();
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 05f0cc9..70af191 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -184,7 +184,7 @@ SwRedlineItr::SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt,
SwAttrHandler& rAH, MSHORT nRed, sal_Bool bShw,
const std::vector<sal_uInt16> *pArr,
xub_StrLen nExtStart )
- : rDoc( *rTxtNd.GetDoc() ), rNd( rTxtNd ), rAttrHandler( rAH ), pSet( 0 ),
+ : rDoc( *rTxtNd.GetDoc() ), rAttrHandler( rAH ), pSet( 0 ),
nNdIdx( rTxtNd.GetIndex() ), nFirst( nRed ),
nAct( MSHRT_MAX ), bOn( sal_False ), bShow( bShw )
{
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 42f1c24..8323f05 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -68,7 +68,6 @@ class SwRedlineItr
{
std::deque<SwTxtAttr *> m_Hints;
const SwDoc& rDoc;
- const SwTxtNode& rNd;
SwAttrHandler& rAttrHandler;
SfxItemSet *pSet;
SwExtend *pExt;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 57ac3b5..148d261 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -184,10 +184,9 @@ public:
typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap;
class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
{
- SwDocShell* mpDocShell;
StringHashMap mTemplateToProject;
public:
- SwVbaProjectNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
+ SwVbaProjectNameProvider()
{
}
virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
@@ -603,7 +602,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache();
if ( !xProjProv.is() && pDoc->GetDocShell() && ooo::vba::isAlienWordDoc( *pDoc->GetDocShell() ) )
{
- xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() );
+ xProjProv = new SwVbaProjectNameProvider;
pDoc->SetVBATemplateToProjectCache( xProjProv );
}
//xRet = (cppu::OWeakObject*)xProjProv;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 447159c..a851413 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2933,15 +2933,13 @@ void SwXStyle::Invalidate()
SwXPageStyle::SwXPageStyle(SfxStyleSheetBasePool& rPool,
SwDocShell* pDocSh, SfxStyleFamily eFam,
const String& rStyleName):
- SwXStyle(rPool, eFam, pDocSh->GetDoc(), rStyleName),
- pDocShell(pDocSh)
+ SwXStyle(rPool, eFam, pDocSh->GetDoc(), rStyleName)
{
}
SwXPageStyle::SwXPageStyle(SwDocShell* pDocSh) :
- SwXStyle(pDocSh->GetDoc(), SFX_STYLE_FAMILY_PAGE),
- pDocShell(pDocSh)
+ SwXStyle(pDocSh->GetDoc(), SFX_STYLE_FAMILY_PAGE)
{
}
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 65ca502..ef18fc8 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -67,8 +67,6 @@ class _HTMLAttrContext_SaveDoc
sal_Bool bStripTrailingPara : 1; // letzen Absatz entfernen?
sal_Bool bKeepNumRules : 1; // Numerierung beibehalten?
- sal_Bool bPopStack : 1; // Stack-Elemente oberhalb des
- // zu schliessenden entfernen?
sal_Bool bFixHeaderDist : 1;
sal_Bool bFixFooterDist : 1;
@@ -78,7 +76,6 @@ public:
pPos( 0 ), pAttrTab( 0 ),
nContextStMin( USHRT_MAX ), nContextStAttrMin( USHRT_MAX ),
bStripTrailingPara( sal_False ), bKeepNumRules( sal_False ),
- bPopStack( sal_False ),
bFixHeaderDist( sal_False ), bFixFooterDist( sal_False )
{}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 634fe20..5bf9d26 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -133,7 +133,6 @@ class WW8_WrFkp
sal_uInt8 nItemSize;
sal_uInt8 nIMax; // Anzahl der Eintrags-Paare
sal_uInt8 nOldVarLen;
- sal_uInt8 nMark;
bool bCombined; // true : Einfuegen verboten
sal_uInt8 SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms );
@@ -892,7 +891,7 @@ void WW8_WrPlcPn::WritePlc()
WW8_WrFkp::WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc, bool bWrtWW8)
: ePlc(ePl), nStartGrp(511), nOldStartGrp(511),
nItemSize( ( CHP == ePl ) ? 1 : ( bWrtWW8 ? 13 : 7 )),
- nIMax(0), nOldVarLen(0), nMark(0), bCombined(false)
+ nIMax(0), nOldVarLen(0), bCombined(false)
{
pFkp = (sal_uInt8*)new sal_Int32[128]; // 512 Byte
pOfs = (sal_uInt8*)new sal_Int32[128]; // 512 Byte
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 8d24c24..b3e0d01 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -815,7 +815,6 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl()
class SwXMLTableColsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef xMyTable;
- sal_Bool bHeader;
SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
@@ -825,8 +824,7 @@ public:
SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- SwXMLTableContext *pTable,
- sal_Bool bHead );
+ SwXMLTableContext *pTable );
virtual ~SwXMLTableColsContext_Impl();
@@ -840,10 +838,9 @@ public:
SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XAttributeList > &,
- SwXMLTableContext *pTable, sal_Bool bHead ) :
+ SwXMLTableContext *pTable ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
- xMyTable( pTable ),
- bHeader( bHead )
+ xMyTable( pTable )
{
}
@@ -1482,12 +1479,11 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
case XML_TOK_TABLE_HEADER_COLS:
- bHeader = sal_True;
case XML_TOK_TABLE_COLS:
if( IsValid() )
pContext = new SwXMLTableColsContext_Impl( GetSwImport(), nPrefix,
rLocalName, xAttrList,
- this, bHeader );
+ this );
break;
case XML_TOK_TABLE_COL:
if( IsValid() && IsInsertColPossible() )
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 12672aa..a15588e 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -394,8 +394,7 @@ Sequence<OUString> SwGridConfig::GetPropertyNames()
SwGridConfig::SwGridConfig(sal_Bool bIsWeb, SwMasterUsrPref& rPar) :
ConfigItem(bIsWeb ? C2U("Office.WriterWeb/Grid") : C2U("Office.Writer/Grid"),
CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
- rParent(rPar),
- bWeb(bIsWeb)
+ rParent(rPar)
{
}
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 4642b44..87bf68e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -374,7 +374,6 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aImageIL ( SW_RES(IL_BITMAPS)),
rSh( rWrtSh ),
- pAktEntry( 0 ),
m_pDocInserter ( NULL ),
m_pOldDefDlgParent ( NULL ),
bDontCheckPasswd ( sal_True)
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index b237996..edcb451 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -72,7 +72,6 @@ SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin,
, mrSidebarWin( rSidebarWin )
, mrDocView( rDocView )
, mrPostItMgr( rPostItMgr )
- , mbMouseOver( false )
{
AddEventListener( LINK( &mrSidebarWin, SwSidebarWin, WindowEventListener ) );
}
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index e3d3742..2c703d9 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -47,8 +47,6 @@ class SidebarTxtControl : public Control
SwView& mrDocView;
SwPostItMgr& mrPostItMgr;
- bool mbMouseOver;
-
protected:
virtual void Paint( const Rectangle& rRect);
virtual void KeyInput( const KeyEvent& rKeyEvt );
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index d440523..d31bf82 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -61,7 +61,6 @@ class SwLabPreview : public Window
long lLeftWidth;
long lUpperWidth;
long lColsWidth;
- long PRowsWidth;
long lPWidthWidth;
long lPHeightWidth;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 2d4cc6f..c7e20d6 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1255,7 +1255,6 @@ sal_uInt16 SwFldVarPage::GetGroup()
SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) :
ListBox (pDialog, rResId),
- pDlg (pDialog),
bCallAddSelection(sal_False)
{
}
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index f925dca..27611c1 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -44,7 +44,6 @@ class SwFldVarPage;
class SelectionListBox : public ListBox
{
- SwFldVarPage* pDlg;
sal_Bool bCallAddSelection;
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 0a994c0..9bdd0b9 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -186,8 +186,6 @@ class SwContentType : public SwTypeNumber
sal_uInt16 nMemberCount; // content count
sal_uInt16 nContentType; // content type's Id
sal_uInt8 nOutlineLevel;
- sal_Bool bMemberFilled : 1; // has content already been inserted?
- sal_Bool bIsInternalDrag:1; // can content be relocated?
sal_Bool bDataValid : 1; //
sal_Bool bEdit: 1; // can this type be edited?
sal_Bool bDelete: 1; // can this type be deleted?
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx
index 0cadce1..31ca68c 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/ui/inc/frmdlg.hxx
@@ -41,7 +41,6 @@ class SwFrmDlg : public SfxTabDialog
sal_Bool m_bFormat;
sal_Bool m_bNew;
sal_Bool m_bHTMLMode;
- bool m_bEnableVertPos;
const SfxItemSet& m_rSet;
sal_uInt16 m_nDlgType;
SwWrtShell* m_pWrtShell;
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 4a73d99..94453ce 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -106,7 +106,6 @@ class SwFrmPage: public SfxTabPage
sal_Bool bFormat;
sal_Bool bNew;
sal_Bool bNoModifyHdl;
- sal_Bool bVerticalChanged; //check done whether frame is in vertical environment
sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged
// --> OD 2009-08-31 #mongolianlayou#
sal_Bool bIsVerticalL2R;
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx
index c37939c..abe5fac 100644
--- a/sw/source/ui/inc/glshell.hxx
+++ b/sw/source/ui/inc/glshell.hxx
@@ -25,7 +25,6 @@ class SwGlosDocShell : public SwDocShell
String aLongName;
String aShortName;
String aGroupName;
- sal_Bool bShow;
using SotObject::GetInterface;
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx
index 7814825..8404b44 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/ui/inc/inputwin.hxx
@@ -111,7 +111,6 @@ public:
class SwInputChild : public SfxChildWindow
{
- sal_Bool bObjVis;
SfxDispatcher* pDispatch;
public:
SwInputChild( Window* ,
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx
index 367f253..5380994 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/ui/inc/insfnote.hxx
@@ -44,7 +44,6 @@ class SwInsFootNoteDlg: public SvxStandardDialog
// everything for the character(s)
String aFontName;
CharSet eCharSet;
- char cExtChar;
sal_Bool bExtCharAvailable;
sal_Bool bEdit;
FixedLine aNumberFL;
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index d613366..4bbdc11 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -149,7 +149,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
SwWrtShell& rWrtSh;
String sRemoveText;
- int nRetOptionsDialog;
protected:
virtual short Ok();
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 6889c22..908aa53 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -159,7 +159,6 @@ private:
String sNone;
SwFldMgr *pMgr;
- sal_uInt16 eType;
sal_Bool bHTMLMode;
DECL_LINK(SelectHdl, void *);
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 63618c3..0217dbf 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -109,7 +109,6 @@ class SwEditRegionDlg : public SfxModalDialog
SwWrtShell& rSh;
SectReprArr aSectReprArr;
- SvLBoxEntry* pAktEntry;
const SwSection* pCurrSect;
sfx2::DocumentInserter* m_pDocInserter;
Window* m_pOldDefDlgParent;
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx
index 7d94b5d..58d920d 100644
--- a/sw/source/ui/inc/swuiccoll.hxx
+++ b/sw/source/ui/inc/swuiccoll.hxx
@@ -20,7 +20,6 @@
#define _SWUI_CCOLL_HXX
#include <tools/resary.hxx>
-#include "ccoll.hxx"
class SwWrtShell;
class SwFmt;
@@ -48,8 +47,6 @@ class SwCondCollPage : public SfxTabPage
const CommandStruct*pCmds;
SwFmt* pFmt;
- CollName* pNms;
-
sal_Bool bNewTemplate;
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx
index fbf1971..3517468 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/ui/inc/usrpref.hxx
@@ -74,7 +74,6 @@ class SwLayoutViewConfig : public utl::ConfigItem
class SwGridConfig : public utl::ConfigItem
{
SwMasterUsrPref& rParent;
- sal_Bool bWeb;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 2e8588c..34fddb5 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -139,9 +139,6 @@ class SwScrollNaviPopup : public SfxPopupWindow
String sQuickHelp[2 * NID_COUNT];
- sal_uInt16 nFwdId;
- sal_uInt16 nBackId;
-
void ApplyImageList();
using Window::GetQuickHelpText;
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index 29644ee..5926066 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -138,7 +138,6 @@ sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName,
SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow)
: SwDocShell( (bNewShow)
? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL )
- , bShow ( bNewShow )
{
SetHelpId(SW_GLOSDOCSHELL);
}
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 791407c..c3c61dc 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -915,8 +915,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent,
const SfxItemSet* pSwItemSet, SwWrtShell & rSh) :
SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, sal_False, &aEmptyStr),
rWrtSh(rSh),
- sRemoveText(SW_RES(ST_RESET)),
- nRetOptionsDialog(USHRT_MAX)
+ sRemoveText(SW_RES(ST_RESET))
{
FreeResource();
GetUserButton()->SetText(sRemoveText);
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 168c435..f95429f 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -404,9 +404,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const Reference< XFrame >&
aToolBox(this, 0),
aSeparator(this, SW_RES(FL_SEP)),
aInfoField(this, SW_RES(FI_INFO)),
- aIList(SW_RES(IL_VALUES)),
- nFwdId(FN_START_OF_NEXT_PAGE),
- nBackId(FN_START_OF_PREV_PAGE)
+ aIList(SW_RES(IL_VALUES))
{
sal_uInt16 i;
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 9330f46..c3d0d44 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -209,7 +209,6 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe
nMemberCount(0),
nContentType(nType),
nOutlineLevel(nLevel),
- bMemberFilled(sal_False),
bDataValid(sal_False),
bEdit(sal_False),
bDelete(sal_True)
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index f0ae51b..1d7f282 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -112,7 +112,7 @@ public:
}
};
-SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom )
+SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom )
{
}
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index c35d225..6c15c09 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -39,9 +39,7 @@ class SwVbaCells : public SwVbaCells_BASE
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
- sal_Int32 mnLeft;
sal_Int32 mnTop;
- sal_Int32 mnRight;
sal_Int32 mnBottom;
public:
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 3a89218..59b1aec 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -35,7 +35,7 @@ using namespace ::ooo::vba;
#define UNO_TABLE_COLUMN_SUM 10000
-SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable ), pDoc( NULL )
+SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable )
{
pTable = GetSwTable( mxTextTable );
}
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 72fc09b..464c021 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -32,14 +32,12 @@
#include "wordvbahelper.hxx"
#include <swtable.hxx>
#include <tabcol.hxx>
-#include <doc.hxx>
class SwVbaTableHelper
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
SwTable* pTable;
- SwDoc* pDoc;
private:
SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException);
commit 6928f43c86d05b9229e24d6d199b3f139031d596
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 11:22:17 2012 +0200
-Werror,-Wunused-private-field (various sd)
Change-Id: Ib0756e3730783f2c842a835782452279ad8f189b
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 66dcc97..b332440 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -45,7 +45,6 @@
namespace sd {
class View;
class DrawDocShell;
- class ViewShell;
class DrawView;
}
@@ -203,7 +202,7 @@ public:
const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) = 0;
virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0;
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
- virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
+ virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 55957ec..bc39ae8 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -62,7 +62,6 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
XServiceInfo
>
{
- const Reference< XMultiServiceFactory > &mrxMgr;
Sequence< PropertyValue > maMediaDescriptor;
Sequence< PropertyValue > maFilterDataSequence;
::rtl::OUString aDialogTitle;
@@ -70,7 +69,7 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
public:
- SdHtmlOptionsDialog( const Reference< XMultiServiceFactory >& _rxORB );
+ SdHtmlOptionsDialog();
~SdHtmlOptionsDialog();
// XInterface
@@ -110,9 +109,9 @@ public:
Reference< XInterface >
SAL_CALL SdHtmlOptionsDialog_CreateInstance(
- const Reference< XMultiServiceFactory > & _rxFactory )
+ SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
{
- return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog( _rxFactory ) );
+ return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog );
}
::rtl::OUString SdHtmlOptionsDialog_getImplementationName()
@@ -138,8 +137,7 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName
// -----------------------------------------------------------------------------
-SdHtmlOptionsDialog::SdHtmlOptionsDialog( const Reference< XMultiServiceFactory > & xMgr ) :
- mrxMgr ( xMgr ),
+SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
meDocType ( DOCUMENT_TYPE_DRAW )
{
}
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 6c008a6..0b4a4aa 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -113,7 +113,6 @@ class HtmlExport
bool mbHeader;
bool mbNotes;
bool mbFrames;
- bool mbKiosk;
String maIndex;
String maEMail;
String maAuthor;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 049fa9f..5db3c26 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1149,17 +1149,6 @@ private:
CheckBox* mpCBSmoothEnd;
CheckBox* mpCBAutoRestart;
- FixedLine* mpFLPlay;
- RadioButton* mpRBFromStart;
- RadioButton* mpRBFromLast;
- RadioButton* mpRBFromTime;
- MetricField* mpMFStartTime;
- FixedLine* mpFLStop;
- RadioButton* mpRBStopOnClick;
- RadioButton* mpRBStopOnNextSlide;
- RadioButton* mpRBStopAfterSlides;
- MetricField* mpMFStopAfterSlides;
-
FixedLine* mpFLEnhancements;
FixedText* mpFTSound;
ListBox* mpLBSound;
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 761fe30..55393d8 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -358,7 +358,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
class CustomAnimationTriggerEntryItem : public SvLBoxString
{
public:
- CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent );
+ CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription );
virtual ~CustomAnimationTriggerEntryItem();
virtual sal_uInt16 IsA();
void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
@@ -367,14 +367,13 @@ public:
void Clone( SvLBoxItem* pSource );
private:
- CustomAnimationList* mpParent;
OUString maDescription;
};
// --------------------------------------------------------------------
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent )
-: SvLBoxString( pEntry, nFlags, aDescription ), mpParent( pParent ), maDescription( aDescription )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
+: SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription )
{
}
@@ -672,7 +671,7 @@ void CustomAnimationList::update()
OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) );
aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
- pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription, this ) );
+ pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription ) );
Insert( pLBoxEntry );
SvViewData* pViewData = GetViewData( pLBoxEntry );
if( pViewData )
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 0c59799..c809ecb 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -81,7 +81,6 @@ ClientBox::ClientBox( Dialog* pParent, RemoteServer *pServer,
m_bHasScrollBar( false ),
m_bHasActive( false ),
m_bNeedsRecalc( true ),
- m_bHasNew( false ),
m_bInCheckMode( false ),
m_bAdjustActive( false ),
m_bInDelete( false ),
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index fd2b49e..c9d272e 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -35,7 +35,6 @@
#include "svtools/extensionlistbox.hxx"
#include "svtools/fixedhyper.hxx"
#include "cppuhelper/implbase1.hxx"
-#include "unotools/collatorwrapper.hxx"
#include "com/sun/star/lang/Locale.hpp"
#include "com/sun/star/lang/XEventListener.hpp"
@@ -103,7 +102,6 @@ class ClientBox:
bool m_bHasScrollBar;
bool m_bHasActive;
bool m_bNeedsRecalc;
- bool m_bHasNew;
bool m_bInCheckMode;
bool m_bAdjustActive;
bool m_bInDelete;
@@ -136,8 +134,6 @@ class ClientBox:
std::vector< TClientBoxEntry > m_vEntries;
std::vector< TClientBoxEntry > m_vRemovedEntries;
- CollatorWrapper *m_pCollator;
-
void CalcActiveHeight( const long nPos );
long GetTotalHeight() const;
void SetupScrollBar();
@@ -194,4 +190,4 @@ public:
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 2d45e05..f33bfd1 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -42,7 +42,6 @@
SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell ) :
SfxTabDialog ( pParent, SdResId( TAB_CHAR ), pAttr ),
- rOutAttrs ( *pAttr ),
rDocShell ( *pDocShell )
{
FreeResource();
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index af8d7a1..bf51813 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -51,7 +51,6 @@
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) :
SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ),
- mrOutAttrs ( *pAttr ),
mpDocShell ( pDocSh )
{
SvxColorListItem aColorListItem(*( (const SvxColorListItem*)
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index c087644..3ef9dbf 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -167,7 +167,6 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl)
SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr )
: SfxTabDialog( pParent, SdResId( TAB_PARAGRAPH ), pAttr )
-, rOutAttrs( *pAttr )
{
FreeResource();
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index e1a4666..a00f663 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -505,9 +505,9 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplate
}
// add for SdPresLayoutDlg begin
-AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs)
+AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs)
{
- return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pViewShell, pWindow, rInAttrs ) );
+ return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) );
}
// add for SdPresLayoutDlg end
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 7fd1781..65c5fad 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -277,7 +277,7 @@ public:
const std::vector<String> &rPageNames, SdCustomShowList* pCSList );
virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ); // ad for RemoteDialog
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool );
- virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
+ virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView );
virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView );
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 419e97c..f785e50 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -45,7 +45,6 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "DrawDocShell.hxx"
-#include "ViewShell.hxx"
#define DOCUMENT_TOKEN (sal_Unicode('#'))
@@ -57,12 +56,10 @@
SdPresLayoutDlg::SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell,
- ::sd::ViewShell* pViewShell,
::Window* pWindow,
const SfxItemSet& rInAttrs ):
ModalDialog (pWindow, SdResId(DLG_PRESLT)),
mpDocSh ( pDocShell ),
- mpViewSh ( pViewShell ),
maFtLayout (this, SdResId(FT_LAYOUT)),
maVS (this, SdResId(VS_LAYOUT)),
maBtnOK (this, SdResId(BTN_OK)),
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 725c3da..5641f1a 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -159,7 +159,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, mpViewShell, NULL, aSet ) : 0;
+ AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0;
sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 4bf14d2..c9bda34 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -221,7 +221,6 @@ private:
std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard;
Font maPageNumberFont;
- sal_Int32 mnPageNumberWidthPixel;
Font maBulletFont;
SvxLRSpaceItem maLRSpaceItem;
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index cfdf9a9..7d83719 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -131,7 +131,6 @@ private:
::std::auto_ptr<VirtualDevice> mpPreviewDevice;
::std::auto_ptr<DrawView> mpView;
DrawDocShell* mpDocShellOfView;
- int mnWidthOfView;
const Color maFrameColor;
const bool mbHasFrame;
static const int snSubstitutionTextSize;
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index ccfd3ca..00cf722 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -21,7 +21,6 @@
#define SD_UNO_DRAW_VIEW_HXX
#include "DrawSubController.hxx"
-#include "DrawController.hxx"
#include "DrawViewShell.hxx"
#include <cppuhelper/basemutex.hxx>
@@ -35,7 +34,6 @@ class XLayer;
namespace sd {
-class DrawController;
class DrawViewShell;
/** This class implements the DrawViewShell specific part of the controller.
@@ -46,7 +44,6 @@ class SdUnoDrawView
{
public:
SdUnoDrawView (
- DrawController& rController,
DrawViewShell& rViewShell,
View& rView) throw();
virtual ~SdUnoDrawView (void) throw();
@@ -132,7 +129,6 @@ protected:
::com::sun::star::uno::Any getDrawViewMode() const;
private:
- DrawController& mrController;
DrawViewShell& mrDrawViewShell;
sd::View& mrView;
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index 1c812be..7960a12 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -29,10 +29,7 @@ namespace css = ::com::sun::star;
namespace sd {
-class DrawController;
class OutlineViewShell;
-class View;
-
/** This class implements the OutlineViewShell specific part of the controller.
*/
@@ -42,9 +39,7 @@ class SdUnoOutlineView
{
public:
SdUnoOutlineView (
- DrawController& rController,
- OutlineViewShell& rViewShell,
- View& rView) throw();
+ OutlineViewShell& rViewShell) throw();
virtual ~SdUnoOutlineView (void) throw();
virtual void SAL_CALL disposing (void);
@@ -107,9 +102,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
- DrawController& mrController;
OutlineViewShell& mrOutlineViewShell;
- sd::View& mrView;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 8264522..9cecb79 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -41,10 +41,6 @@ class SlideSorter;
namespace sd {
-class DrawController;
-class View;
-
-
/** This class implements the SlideSorter specific part of the
controller.
*/
@@ -54,9 +50,7 @@ class SdUnoSlideView
{
public:
SdUnoSlideView (
- DrawController& rController,
- slidesorter::SlideSorter& rSlideSorter,
- View& rView) throw();
+ slidesorter::SlideSorter& rSlideSorter) throw();
virtual ~SdUnoSlideView (void) throw();
// XSelectionSupplier
@@ -111,9 +105,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
- DrawController& mrController;
slidesorter::SlideSorter& mrSlideSorter;
- sd::View& mrView;
/*
virtual void FillPropertyTable (
::std::vector< ::com::sun::star::beans::Property>& rProperties);
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index fe5ed82..67175f7 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -37,7 +37,6 @@ class SfxObjectShell;
class SdCharDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
const SfxObjectShell& rDocShell;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 713e620..6089f71 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -45,8 +45,6 @@ typedef sal_uInt16 ChangeType;
class SdPageDlg : public SfxTabDialog
{
private:
- const SfxItemSet& mrOutAttrs;
-
const SfxObjectShell* mpDocShell;
XColorListRef mpColorList;
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 53dea9e..20055cd 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -57,7 +57,6 @@ private:
HeaderFooterSettings maSlideSettings;
HeaderFooterSettings maNotesHandoutSettings;
- bool mbNotOnTitle;
SdDrawDocument* mpDoc;
SdPage* mpCurrentPage;
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 6e76275..a14ad3f 100644
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -63,8 +63,6 @@ private:
OKButton aBtnOK;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
- SdrObject* pSdrObj1;
- SdrObject* pSdrObj2;
void LoadSettings();
};
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 89d77c7..5b0bc49 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -42,8 +42,6 @@
class SdParagraphDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
-
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index 7c49f3a..f27dd9c 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -66,8 +66,6 @@ private:
ChangeType nBitmapListState;
ChangeType nGradientListState;
ChangeType nHatchingListState;
- ChangeType nLineEndListState;
- ChangeType nDashListState;
PresentationObjects ePO;
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index db74471..014c7c5 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -40,7 +40,6 @@ class SfxItemSet;
namespace sd {
class DrawDocShell;
-class ViewShell;
}
@@ -51,7 +50,6 @@ class SdPresLayoutDlg
public:
SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell,
- ::sd::ViewShell* pViewShell,
::Window* pWindow,
const SfxItemSet& rInAttrs);
@@ -64,7 +62,6 @@ public:
private:
::sd::DrawDocShell* mpDocSh;
- ::sd::ViewShell* mpViewSh;
FixedText maFtLayout;
ValueSet maVS;
OKButton maBtnOK;
diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx
index 10a902f..964d4bb 100644
--- a/sd/source/ui/inc/undopage.hxx
+++ b/sd/source/ui/inc/undopage.hxx
@@ -39,7 +39,6 @@ class SdPageFormatUndoAction : public SdUndoAction
sal_Int32 mnOldRight;
sal_Int32 mnOldUpper;
sal_Int32 mnOldLower;
- sal_Bool mbOldScale;
Orientation meOldOrientation;
sal_uInt16 mnOldPaperBin;
sal_Bool mbOldFullSize;
@@ -63,7 +62,6 @@ public:
sal_Int32 nOldRgt,
sal_Int32 nOldUpr,
sal_Int32 nOldLwr,
- sal_Bool bOldScl,
Orientation eOldOrient,
sal_uInt16 nOPaperBin,
sal_Bool bOFullSize,
@@ -85,7 +83,6 @@ public:
mnOldRight (nOldRgt),
mnOldUpper (nOldUpr),
mnOldLower (nOldLwr),
- mbOldScale (bOldScl),
meOldOrientation(eOldOrient),
mnOldPaperBin (nOPaperBin),
mbOldFullSize (bOFullSize),
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx
index b12c28c..c87f753 100644
--- a/sd/source/ui/slideshow/PaneHider.cxx
+++ b/sd/source/ui/slideshow/PaneHider.cxx
@@ -42,10 +42,7 @@ using ::com::sun::star::lang::DisposedException;
namespace sd {
PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
- : mrViewShell(rViewShell),
- mbWindowVisibilitySaved(false),
- mbOriginalLeftPaneWindowVisibility(false),
- mbOriginalRightPaneWindowVisibility(false)
+ : mrViewShell(rViewShell)
{
// Hide the left and right pane windows when a slideshow exists and is
// not full screen.
diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx
index 1ca85b4..1b0422b 100644
--- a/sd/source/ui/slideshow/PaneHider.hxx
+++ b/sd/source/ui/slideshow/PaneHider.hxx
@@ -50,9 +50,6 @@ private:
/** Remember whether the visibility states of the windows of the panes
has been modified and have to be restored.
*/
- bool mbWindowVisibilitySaved;
- bool mbOriginalLeftPaneWindowVisibility;
- bool mbOriginalRightPaneWindowVisibility;
::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController>
mxConfigurationController;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 04d5921..c0102dc 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -122,7 +122,6 @@ public:
private:
SharedSdWindow mpWindow;
Size maPageObjectSize;
- double mnModelToWindowScale;
Rectangle maFocusIndicatorBoundingBox;
Rectangle maPageObjectBoundingBox;
Rectangle maPageNumberAreaBoundingBox;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 7b874c0..8fdd916 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -260,9 +260,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController
// Create uno controller for the main view shell.
xSubController = Reference<drawing::XDrawSubController>(
new SdUnoSlideView (
- GetViewShellBase().GetDrawController(),
- *mpSlideSorter,
- *GetView()));
+ *mpSlideSorter));
}
return xSubController;
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 5b1b671..b044dfe 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -52,7 +52,6 @@ PageObjectLayouter::PageObjectLayouter (
const sal_Int32 nPageCount)
: mpWindow(rpWindow),
maPageObjectSize(rPageObjectWindowSize.Width(), rPageObjectWindowSize.Height()),
- mnModelToWindowScale(1),
maPageObjectBoundingBox(),
maPageNumberAreaBoundingBox(),
maPreviewBoundingBox(),
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 59a41bd..a7817bc 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -895,7 +895,6 @@ void TableDesignPane::FillDesignPreviewControl()
TableDesignDialog::TableDesignDialog(::Window* pParent, ViewShellBase& rBase )
: ModalDialog( pParent, SdResId( DLG_TABLEDESIGNPANE ))
-, mrBase( rBase )
{
mxFlSep1.reset( new FixedLine( this, SdResId( FL_SEP1 ) ) );
mxFlSep2.reset( new FixedLine( this, SdResId( FL_SEP2 ) ) );
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 5df94d9..12d1e02 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -111,7 +111,6 @@ public:
virtual short Execute();
private:
- ViewShellBase& mrBase;
boost::scoped_ptr< TableDesignPane > mpDesignPane;
boost::scoped_ptr< FixedLine > mxFlSep1;
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index bc1015b..fe2c8ad 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -79,7 +79,6 @@ PreviewRenderer::PreviewRenderer (
: mpPreviewDevice (new VirtualDevice()),
mpView(NULL),
mpDocShellOfView(NULL),
- mnWidthOfView(0),
maFrameColor (svtools::ColorConfig().GetColorValue(svtools::DOCBOUNDARIES).nColor),
mbHasFrame(bHasFrame)
{
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index b34f104..95fb315 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -63,11 +63,9 @@ using namespace ::com::sun::star::drawing;
namespace sd {
SdUnoDrawView::SdUnoDrawView(
- DrawController& rController,
DrawViewShell& rViewShell,
View& rView) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
mrDrawViewShell(rViewShell),
mrView(rView)
{
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 01bc479..879e185 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -51,13 +51,9 @@ using namespace ::com::sun::star::uno;
namespace sd {
SdUnoOutlineView::SdUnoOutlineView(
- DrawController& rController,
- OutlineViewShell& rViewShell,
- View& rView) throw()
+ OutlineViewShell& rViewShell) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
- mrOutlineViewShell(rViewShell),
- mrView(rView)
+ mrOutlineViewShell(rViewShell)
{
}
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 041398a..b47a3f7 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -51,13 +51,9 @@ namespace sd {
SdUnoSlideView::SdUnoSlideView (
- DrawController& rController,
- slidesorter::SlideSorter& rSlideSorter,
- View& rView) throw()
+ slidesorter::SlideSorter& rSlideSorter) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
- mrSlideSorter(rSlideSorter),
- mrView(rView)
+ mrSlideSorter(rSlideSorter)
{
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 22464d2..f3844e7 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -434,7 +434,6 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo
// Create uno sub controller for the main view shell.
xSubController = css::uno::Reference<css::drawing::XDrawSubController>(
new SdUnoDrawView (
- GetViewShellBase().GetDrawController(),
*this,
*GetView()));
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index acee1e6..fbf2b18 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -192,9 +192,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo
// Create uno sub controller for the main view shell.
xSubController = Reference<drawing::XDrawSubController>(
new SdUnoOutlineView (
- GetViewShellBase().GetDrawController(),
- *this,
- *GetView()));
+ *this));
}
return xSubController;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index d7834b3..43a06aa 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -115,7 +115,6 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh
, mbFirstPaint(sal_True)
, mpProgress(NULL)
, maDocColor( COL_WHITE )
-, mnPageNumberWidthPixel( 0 )
, maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE )
{
sal_Bool bInitOutliner = sal_False;
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 236655b..392e473 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -122,7 +122,7 @@ class ChangePlaceholderTag : public SmartTag
{
friend class ImageButtonHdl;
public:
- ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj );
+ ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj );
virtual ~ChangePlaceholderTag();
/** returns true if the SmartTag handled the event. */
@@ -140,7 +140,6 @@ protected:
virtual void deselect();
private:
- ViewOverlayManager& mrManager;
SdrObjectWeakRef mxPlaceholderObj;
};
@@ -315,9 +314,8 @@ Pointer ImageButtonHdl::GetPointer() const
// ====================================================================
-ChangePlaceholderTag::ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj )
+ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj )
: SmartTag( rView )
-, mrManager( rManager )
, mxPlaceholderObj( &rPlaceholderObj )
{
}
@@ -565,7 +563,7 @@ bool ViewOverlayManager::CreateTags()
{
if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) )
{
- rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) );
+ rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *mrBase.GetMainViewShell()->GetView(), *(*iter) ) );
maTagVector.push_back(xTag);
bChanges = true;
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index afd7ac0..c1ce1e5 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -552,7 +552,6 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
pPage->GetSize(),
pPage->GetLftBorder(), pPage->GetRgtBorder(),
pPage->GetUppBorder(), pPage->GetLwrBorder(),
- pPage->IsScaleObjects(),
pPage->GetOrientation(),
pPage->GetPaperBin(),
pPage->IsBackgroundFullSize(),
@@ -603,7 +602,6 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
pPage->GetSize(),
pPage->GetLftBorder(), pPage->GetRgtBorder(),
pPage->GetUppBorder(), pPage->GetLwrBorder(),
- pPage->IsScaleObjects(),
pPage->GetOrientation(),
pPage->GetPaperBin(),
pPage->IsBackgroundFullSize(),
commit 69c9acd0d275fba2b387bd64584227f5ffcfce0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 11:21:02 2012 +0200
-Werror,-Wunused-private-field workaround (BluetoothServer)
Change-Id: I7c5428c74f6d7ff759ed9853cb44bcd7c2d3d514
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 691951b..5bf242c 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -40,6 +40,7 @@ BluetoothServer::~BluetoothServer()
void BluetoothServer::execute()
{
#if defined(LINUX) && defined(ENABLE_DBUS)
+
g_type_init();
GError *aError = NULL;
@@ -145,13 +146,9 @@ void BluetoothServer::execute()
}
}
-#endif // LINUX && ENABLE_DBUS
-
-#ifdef WIN32
-
-#endif
+#else
-#ifdef MACOSX
+ (void) mpCommunicators; // avoid warnings about unused member
#endif
}
commit f34f7b65035f0afe1ceac6f5b5d8ddfac824bde9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 11 11:18:45 2012 +0200
-Werror,-Wunused-private-field (various sc)
Change-Id: Ia30a2bb6b1f36304a3c420db1d28d177d429a19b
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index 2b90cee..a73842e 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
}
}}}
-class ScDocument;
class ScMenuFloatingWindow;
typedef ::cppu::ImplHelper1<
@@ -50,7 +49,7 @@ public:
explicit ScAccessibleFilterMenu(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos, ScDocument* pDoc);
+ ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos);
virtual ~ScAccessibleFilterMenu();
// XAccessibleComponent
@@ -175,7 +174,6 @@ private:
size_t mnMenuPos;
ScMenuFloatingWindow* mpWindow;
- ScDocument* mpDoc;
bool mbEnabled:1;
};
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index ec4afb6..bb7c0ef 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -33,7 +33,6 @@
#include "cppuhelper/implbase1.hxx"
class ScCheckListMenuWindow;
-class ScDocument;
class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu
{
@@ -41,7 +40,7 @@ public:
ScAccessibleFilterTopWindow(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- ScCheckListMenuWindow* pWin, const ::rtl::OUString& rName, ScDocument* pDoc);
+ ScCheckListMenuWindow* pWin, const ::rtl::OUString& rName);
virtual ~ScAccessibleFilterTopWindow();
// XAccessibleContext
@@ -90,9 +89,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
mxAccCancelBtn;
-
- ScCheckListMenuWindow* mpWindow;
- ScDocument* mpDoc;
};
#endif
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index f56a4a5..5cb341d 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -82,7 +82,6 @@ private:
sal_Bool bReference;
sal_Bool bColByName;
sal_Bool bRowByName;
- sal_Bool bSubTitles;
SCSIZE nColCount;
SCSIZE nRowCount;
sal_Bool** ppUsed;
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 3a852ef..943bf8d 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -68,10 +68,9 @@ struct ScImportSourceDesc
class ScDatabaseDPData : public ScDPTableData
{
private:
- const ScImportSourceDesc& mrImport;
ScDPCacheTable aCacheTable;
public:
- ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport, const ScDPCache* pCache);
+ ScDatabaseDPData(ScDocument* pDoc, const ScDPCache* pCache);
virtual ~ScDatabaseDPData();
virtual long GetColumnCount();
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index dc1ce1a..0374123 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -104,7 +104,6 @@ private:
bool bIgnoreEmptyRows;
bool bRepeatIfEmpty;
- const ScSheetSourceDesc& mrDesc;
ScDPCacheTable aCacheTable;
public:
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index dc98185..9f7bc56 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -78,7 +78,6 @@ private:
ScAddress aOldEnd;
ScAddress aNewStt;
ScAddress aNewEnd;
- sal_Bool bHasNew;
public:
ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE,
const ScAddress& rNS, const ScAddress& rNE );
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index 108785c..86e0cb3 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -182,7 +182,6 @@ private:
SCCOLROW nEnd;
size_t nSubLevel;
size_t nSubEntry;
- size_t nCount;
size_t nDepth;
public:
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 2dca713..7081ddb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -367,7 +367,7 @@ public:
const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0; //add for ScCondFormatDlg
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
- const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0;
+ const ScAddress& rPos, int nId ) = 0;
virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ) = 0; //add for ScDataBarSettingsDlg
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 78b1e03..a9462b6 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -595,7 +595,7 @@ ScDPTableData* ScDPObject::GetTableData()
if (pCache)
{
pCache->AddReference(this);
- pData.reset(new ScDatabaseDPData(pDoc, *pImpDesc, pCache));
+ pData.reset(new ScDatabaseDPData(pDoc, pCache));
}
}
else
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index a3c3a99..7bf5936 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -127,8 +127,6 @@ class ScDPOutputImpl
SCCOL mnTabStartCol;
SCROW mnTabStartRow;
- SCCOL mnMemberStartCol;
- SCROW mnMemberStartRow;
SCCOL mnDataStartCol;
SCROW mnDataStartRow;
@@ -139,8 +137,6 @@ public:
ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
SCCOL nTabStartCol,
SCROW nTabStartRow,
- SCCOL nMemberStartCol,
- SCROW nMemberStartRow,
SCCOL nDataStartCol,
SCROW nDataStartRow,
SCCOL nTabEndCol,
@@ -200,8 +196,6 @@ void ScDPOutputImpl::OutputDataArea()
ScDPOutputImpl::ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
SCCOL nTabStartCol,
SCROW nTabStartRow,
- SCCOL nMemberStartCol,
- SCROW nMemberStartRow,
SCCOL nDataStartCol,
SCROW nDataStartRow,
SCCOL nTabEndCol,
@@ -210,8 +204,6 @@ ScDPOutputImpl::ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
mnTab( nTab ),
mnTabStartCol( nTabStartCol ),
mnTabStartRow( nTabStartRow ),
- mnMemberStartCol( nMemberStartCol),
- mnMemberStartRow( nMemberStartRow),
mnDataStartCol ( nDataStartCol ),
mnDataStartRow ( nDataStartRow ),
mnTabEndCol( nTabEndCol ),
@@ -805,7 +797,7 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
if ( nFlags & sheet::MemberResultFlags::SUBTOTAL )
{
ScDPOutputImpl outputimp( pDoc, nTab,
- nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow,
+ nTabStartCol, nTabStartRow,
nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow );
//! limit frames to horizontal or vertical?
if (bColHeader)
@@ -1030,7 +1022,7 @@ void ScDPOutput::Output()
// output column headers:
ScDPOutputImpl outputimp( pDoc, nTab,
- nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow,
+ nTabStartCol, nTabStartRow,
nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow );
for (nField=0; nField<nColFieldCount; nField++)
{
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index edec6e3..4cd86ca 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -72,9 +72,8 @@ const ScDPCache* ScImportSourceDesc::CreateCache(const ScDPDimensionSaveData* pD
}
ScDatabaseDPData::ScDatabaseDPData(
- ScDocument* pDoc, const ScImportSourceDesc& rImport, const ScDPCache* pCache) :
+ ScDocument* pDoc, const ScDPCache* pCache) :
ScDPTableData(pDoc),
- mrImport(rImport),
aCacheTable(pCache)
{
}
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 13f1980..e2f6801 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -56,7 +56,6 @@ ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, con
aQuery ( rDesc.GetQueryParam() ),
bIgnoreEmptyRows( false ),
bRepeatIfEmpty(false),
- mrDesc(rDesc),
aCacheTable(pCache)
{
SCSIZE nEntryCount( aQuery.GetEntryCount());
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index babcbcb..f475d5d 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -101,7 +101,6 @@ ScConsData::ScConsData() :
bReference(false),
bColByName(false),
bRowByName(false),
- bSubTitles(false),
nColCount(0),
nRowCount(0),
ppUsed(NULL),
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 905073e..6bef29b 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1043,7 +1043,6 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm )
XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ):
XclExpRecord(),
XclExpRoot( rRoot ),
- mrFormat( rFormat ),
mnPriority( nPriority )
{
const ScRange* pRange = rFormat.GetRange().front();
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 67df56f..fe96d75 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -483,7 +483,6 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes )
// ============================================================================
XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) :
- mrRoot(rRoot),
mnOldPos(STREAM_SEEK_TO_END),
mbValid(false)
{
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index d6d83de..e38aea3 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -92,7 +92,6 @@ private:
XclImpCrnList maCrnList; /// List of CRN records (cached cell values).
String maTabName; /// Name of the external sheet.
- SCTAB mnScTab; /// New sheet index in Calc document.
};
// External document (SUPBOOK) ================================================
@@ -222,7 +221,6 @@ private:
XclImpXtiVector maXtiList; /// List of all XTI structures.
XclImpSupbookList maSupbookList; /// List of external documents.
- bool mbCreated; /// true = Calc sheets already created.
};
// ============================================================================
@@ -564,8 +562,7 @@ const XclAddress& XclImpCrn::GetAddress() const
// Sheet in an external document ==============================================
XclImpSupbookTab::XclImpSupbookTab( const String& rTabName ) :
- maTabName( rTabName ),
- mnScTab( SCTAB_INVALID )
+ maTabName( rTabName )
{
}
@@ -749,8 +746,7 @@ void XclImpSupbook::LoadCachedValues()
// Import link manager ========================================================
XclImpLinkManagerImpl::XclImpLinkManagerImpl( const XclImpRoot& rRoot ) :
- XclImpRoot( rRoot ),
- mbCreated( false )
+ XclImpRoot( rRoot )
{
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 4034d03..41eef66 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -238,7 +238,6 @@ ScHTMLLayoutParser::ScHTMLLayoutParser(
nTableWidth(0),
nColOffset(0),
nColOffsetStart(0),
- nMetaCnt(0),
nOffsetTolerance( SC_HTML_OFFSET_TOLERANCE_SMALL ),
bTabInTabCell( false ),
bFirstRow( true ),
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 4997f0e..e12f218 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -613,7 +613,6 @@ private:
ScDocument* pTempDoc; // empty document
- sal_uInt32 nNewAction; // action number, 1-based
XclExpChTrHeader* pHeader; // header record for last GUID
sal_uInt8 aGUID[ 16 ]; // GUID for action info records
sal_Bool bValidGUID;
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 188a0af..91521c6 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -110,7 +110,6 @@ public:
void AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, const ScAddress& rAddr );
private:
- const CondFormat& mrCondFormat;
std::vector< ColorScaleRuleModelEntry > maColorScaleRuleEntries;
sal_uInt32 mnCfvo;
@@ -130,7 +129,6 @@ public:
ScDataBarFormatData* getDataBarFormatData() { return mpFormat; }
private:
- const CondFormat& mrCondFormat;
ScDataBarFormatData* mpFormat;
boost::scoped_ptr<ColorScaleRuleModelEntry> mpUpperLimit;
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index d3269a4..b9012fb 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -212,7 +212,6 @@ private:
DefNameNameMap maModelNameMap; /// Maps all defined names by sheet index and model name.
DefNameBuiltinMap maBuiltinMap; /// Maps all defined names by sheet index and built-in identifier.
DefNameTokenIdMap maTokenIdMap; /// Maps all defined names by API token index.
- sal_Int16 mnCalcSheet; /// Current sheet index for BIFF2-BIFF4 names (always sheet-local).
};
// ============================================================================
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 4b39755..7a784c9 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -158,16 +158,12 @@ private:
::rtl::OUString maObjName; /// Name of the object.
::rtl::OUString maMacroName; /// Name of an attached macro.
::rtl::OUString maHyperlink; /// On-click hyperlink URL.
- sal_uInt32 mnDffShapeId; /// Shape identifier from DFF stream (BIFF8 only).
- sal_uInt32 mnDffFlags; /// Shape flags from DFF stream.
sal_uInt16 mnObjId; /// The object identifier (unique per drawing).
sal_uInt16 mnObjType; /// The object type from OBJ record.
- bool mbHasAnchor; /// True = anchor has been initialized.
bool mbHidden; /// True = object is hidden.
bool mbVisible; /// True = object is visible (form controls).
bool mbPrintable; /// True = object is printable.
bool mbAreaObj; /// True = width and height must be greater than 0.
- bool mbAutoMargin; /// True = set automatic text margin.
bool mbSimpleMacro; /// True = create simple macro link and hyperlink.
bool mbProcessShape; /// True = object is valid, do processing and insertion.
bool mbInsertShape; /// True = insert the UNO shape into the draw page.
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 4c74f1f..7477052 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -62,8 +62,6 @@ private:
SCTAB mnScTab; // table number SC document
sal_uInt16 nExcTab; // table number Excel document
- sal_uInt16 nAktRow; // fuer'n Iterator
- sal_uInt16 nAktCol;
NameBuffer* pTabNames;
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 72c3297..59014b3 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -128,7 +128,6 @@ private:
ExternalNameModel maExtNameModel; /// Additional name data.
ResultMatrix maResults; /// DDE/OLE link results.
ResultMatrix::iterator maCurrIt; /// Current position in result matrix.
- sal_uInt32 mnStorageId; /// OLE storage identifier (BIFF).
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink >
mxDdeLink; /// Interface of a DDE link.
bool mbDdeLinkCreated; /// True = already tried to create the DDE link.
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index fbae497..db93a76 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -190,7 +190,6 @@ private:
sal_uInt16 nTableWidth; // je Table
sal_uInt16 nColOffset; // aktuell, Pixel
sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel
- sal_uInt16 nMetaCnt; // fuer ParseMetaOptions
sal_uInt16 nOffsetTolerance; // for use with SeekOffset and related
bool bTabInTabCell:1;
bool bFirstRow:1; // je Table, ob in erster Zeile
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index ac9a63b..e5b7eee 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -129,7 +129,6 @@ private:
NumberFormatMap maNumFmts; /// List of number formats.
::rtl::OUString maLocaleStr; /// Current office locale.
- sal_Int32 mnNextBiffIndex; /// Format id counter for BIFF2-BIFF4.
};
// ============================================================================
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 8439a25..0073ae6 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -721,7 +721,6 @@ class Sc10Import
Sc10PatternCollection* pPatternCollection;
Sc10DataBaseCollection* pDataBaseCollection;
sal_uLong nError;
- SCTAB TabCount;
SCTAB nShowTab;
ScViewOptions aSc30ViewOpt;
ScfStreamProgressBar* pPrgrsBar;
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 668641b..23ca6e4 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -257,7 +257,6 @@ private:
XclExpCfvoList maCfvoList;
XclExpColScaleColList maColList;
- const ScColorScaleFormat& mrFormat;
sal_Int32 mnPriority;
};
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 7abb5b3..3c22bda 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -236,7 +236,6 @@ private:
sal_uInt8 mpnSalt[16];
sal_uInt8 mpnSaltDigest[16];
- const XclExpRoot& mrRoot;
sal_Size mnOldPos; /// Last known stream position
bool mbValid;
};
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 681f47b..598dcde 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -239,7 +239,6 @@ private:
virtual void WriteBody( XclExpStream& rStrm );
private:
- SCTAB mnScTab; /// Sheet index of this record.
sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell.
sal_uInt16 mnColInpXclCol; /// Column index of column input cell.
sal_uInt32 mnColInpXclRow; /// Row index of column input cell.
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 105dc06..7df5321 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -148,7 +148,6 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString&
ColorScaleRule::ColorScaleRule( const CondFormat& rFormat ):
WorksheetHelper( rFormat ),
- mrCondFormat( rFormat ),
mnCfvo(0),
mnCol(0)
{
@@ -267,7 +266,6 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc,
//
DataBarRule::DataBarRule( const CondFormat& rFormat ):
WorksheetHelper( rFormat ),
- mrCondFormat( rFormat ),
mpFormat(new ScDataBarFormatData)
{
mpFormat->meAxisPosition = databar::NONE;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 4eafab7..b31b5fb 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -485,8 +485,7 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const
// ============================================================================
DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) :
- WorkbookHelper( rHelper ),
- mnCalcSheet( -1 )
+ WorkbookHelper( rHelper )
{
}
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 37eecb3..9739880 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -229,16 +229,12 @@ void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, co
BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) :
WorksheetHelper( rHelper ),
maAnchor( rHelper ),
- mnDffShapeId( 0 ),
- mnDffFlags( 0 ),
mnObjId( BIFF_OBJ_INVALID_ID ),
mnObjType( BIFF_OBJTYPE_UNKNOWN ),
- mbHasAnchor( false ),
mbHidden( false ),
mbVisible( true ),
mbPrintable( true ),
mbAreaObj( false ),
- mbAutoMargin( true ),
mbSimpleMacro( true ),
mbProcessShape( true ),
mbInsertShape( true ),
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index d6b7587..cb0e608 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -105,7 +105,6 @@ ExternalNameModel::ExternalNameModel() :
ExternalName::ExternalName( const ExternalLink& rParentLink ) :
DefinedNameBase( rParentLink ),
mrParentLink( rParentLink ),
- mnStorageId( 0 ),
mbDdeLinkCreated( false )
{
}
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 83755ec..2c3c421 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1961,8 +1961,7 @@ void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const
// ============================================================================
NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) :
- WorkbookHelper( rHelper ),
- mnNextBiffIndex( 0 )
+ WorkbookHelper( rHelper )
{
// get the current locale
// try user-defined locale setting
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index f18e824..66359f2 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1416,7 +1416,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
aActionStack(),
pTabIdBuffer( NULL ),
pTempDoc( NULL ),
- nNewAction( 1 ),
pHeader( NULL ),
bValidGUID( false )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list