[Libreoffice-commits] .: 10 commits - basic/inc basic/source drawinglayer/inc framework/inc framework/source linguistic/source sd/source sfx2/inc sfx2/source xmloff/inc xmloff/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Thu Aug 16 00:47:53 PDT 2012
basic/inc/basic/sbmod.hxx | 4 -
basic/inc/basic/sbx.hxx | 4 -
basic/inc/basic/sbxcore.hxx | 4 -
basic/inc/basic/sbxmeth.hxx | 4 -
basic/inc/basic/sbxprop.hxx | 4 -
basic/source/inc/sbunoobj.hxx | 1
basic/source/runtime/iosys.cxx | 2
drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 5 -
framework/inc/helper/statusindicatorfactory.hxx | 3
framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 1
framework/inc/uiconfiguration/windowstateconfiguration.hxx | 1
framework/inc/uielement/fontsizemenucontroller.hxx | 1
framework/inc/uielement/statusbar.hxx | 2
framework/inc/uifactory/uielementfactorymanager.hxx | 1
framework/inc/xml/menudocumenthandler.hxx | 3
framework/source/fwe/helper/undomanagerhelper.cxx | 6 -
framework/source/fwe/xml/menudocumenthandler.cxx | 6 -
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 1
framework/source/uielement/fontsizemenucontroller.cxx | 3
framework/source/uielement/statusbar.cxx | 4 -
framework/source/uifactory/uielementfactorymanager.cxx | 3
linguistic/source/convdicxml.cxx | 9 --
sd/source/ui/view/GraphicViewShellBase.cxx | 3
sd/source/ui/view/ImpressViewShellBase.cxx | 3
sd/source/ui/view/OutlineViewShellBase.cxx | 3
sd/source/ui/view/PresentationViewShellBase.cxx | 2
sd/source/ui/view/SlideSorterViewShellBase.cxx | 3
sd/source/ui/view/ViewShellBase.cxx | 2
sfx2/inc/sfx2/basedlgs.hxx | 1
sfx2/inc/sfx2/hintpost.hxx | 1
sfx2/inc/sfx2/mnuitem.hxx | 1
sfx2/inc/sfx2/objsh.hxx | 3
sfx2/inc/sfx2/sfxhtml.hxx | 1
sfx2/inc/sfx2/tbxctrl.hxx | 1
sfx2/inc/sfx2/viewfac.hxx | 4 -
sfx2/inc/sfx2/viewsh.hxx | 2
sfx2/source/appl/appmisc.cxx | 2
sfx2/source/appl/fileobj.hxx | 1
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 8 --
sfx2/source/bastyp/sfxhtml.cxx | 3
sfx2/source/dialog/dockwin.cxx | 13 +--
sfx2/source/dialog/recfloat.cxx | 1
sfx2/source/dialog/templdlg.cxx | 4 -
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/iframe.cxx | 2
sfx2/source/doc/objmisc.cxx | 6 -
sfx2/source/inc/recfloat.hxx | 1
sfx2/source/toolbox/tbxitem.cxx | 1
sfx2/source/view/impviewframe.hxx | 2
sfx2/source/view/orgmgr.cxx | 2
sfx2/source/view/sfxbasecontroller.cxx | 24 ++----
sfx2/source/view/viewfac.cxx | 3
sfx2/source/view/viewprn.cxx | 2
xmloff/inc/XMLNumberStylesImport.hxx | 2
xmloff/inc/txtfldi.hxx | 4 -
xmloff/inc/txtvfldi.hxx | 4 -
xmloff/inc/xmloff/ProgressBarHelper.hxx | 1
xmloff/source/chart/ColorPropertySet.cxx | 2
xmloff/source/chart/SchXMLAxisContext.cxx | 15 +---
xmloff/source/chart/SchXMLChartContext.cxx | 3
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 6 -
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 9 --
xmloff/source/chart/SchXMLSeries2Context.cxx | 10 --
xmloff/source/chart/SchXMLTableContext.cxx | 10 --
xmloff/source/chart/SchXMLTableContext.hxx | 8 --
xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx | 1
xmloff/source/core/ProgressBarHelper.cxx | 2
xmloff/source/draw/XMLNumberStyles.cxx | 1
xmloff/source/draw/sdpropls.cxx | 4 -
xmloff/source/draw/sdpropls.hxx | 5 -
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp_impl.hxx | 3
xmloff/source/draw/shapeexport.cxx | 6 -
xmloff/source/draw/ximpshap.cxx | 3
xmloff/source/draw/ximpshap.hxx | 1
xmloff/source/text/XMLIndexMarkExport.cxx | 4 -
xmloff/source/text/XMLIndexMarkExport.hxx | 5 -
xmloff/source/text/XMLTextFrameContext.hxx | 2
xmloff/source/text/txtfldi.cxx | 2
xmloff/source/text/txtparae.cxx | 2
xmloff/source/text/txtvfldi.cxx | 35 ++++------
85 files changed, 87 insertions(+), 250 deletions(-)
New commits:
commit 4e05ae6a6b90f8e840186a00010c5e6ca1580548
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 16 08:33:33 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I7162523a26488b8528a91ec7abd587f55647acbb
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 0db7a04..0327f27 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -54,8 +54,7 @@ SfxViewShell* GraphicViewShellBase::CreateInstance (
}
void GraphicViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
- pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,"Default");
+ pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Default");
InitFactory();
}
void GraphicViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index eebc01a..e9f570b 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -55,8 +55,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance (
}
void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
- pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,"Default");
+ pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Default");
InitFactory();
}
void ImpressViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 4783b45..8e74361 100644
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -52,8 +52,7 @@ SfxViewShell* OutlineViewShellBase::CreateInstance (
}
void OutlineViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
- pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,"Outline");
+ pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Outline");
InitFactory();
}
void OutlineViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index bd43160..d15bec7 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -61,7 +61,7 @@ SfxViewShell* PresentationViewShellBase::CreateInstance (
void PresentationViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation");
+ &CreateInstance,nPrio,"FullScreenPresentation");
InitFactory();
}
void PresentationViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index a52b4d4..fb3133e 100644
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -56,8 +56,7 @@ SfxViewShell* SlideSorterViewShellBase::CreateInstance (
void SlideSorterViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
- pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,"SlideSorter");
+ pFactory = new SfxViewFactory(&CreateInstance,nPrio,"SlideSorter");
InitFactory();
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index aa7cbbc..3b4114e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -240,7 +240,7 @@ SfxViewShell* ViewShellBase::CreateInstance (
}
void ViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
- pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default" );
+ pFactory = new SfxViewFactory( &CreateInstance,nPrio,"Default" );
InitFactory();
}
void ViewShellBase::InitFactory()
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 13a482a..cc90161 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -187,7 +187,6 @@ public:
private:
GetTabPageRanges fnGetRanges;
- sal_uInt16* pRanges;
OKButton* pOKBtn;
CancelButton* pCancelBtn;
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index a46065c..25adb3e 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -43,7 +43,6 @@ class SfxHintPoster: public SvRefBase
*/
{
- sal_uIntPtr nId;
GenLink aLink;
private:
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index e3f426a..e65220b 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -39,7 +39,6 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
SfxVirtualMenu* pOwnMenu;
SfxVirtualMenu* pSubMenu;
sal_Bool b_ShowStrings;
- sal_Bool b_UnusedDummy;
public:
SfxMenuControl();
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 7426d7a..5e96dc8 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -768,11 +768,10 @@ SV_IMPL_REF(SfxObjectShell)
class AutoReloadTimer_Impl : public Timer
{
String aUrl;
- sal_Bool bReload;
SfxObjectShell* pObjSh;
public:
- AutoReloadTimer_Impl( const String& rURL, sal_uInt32 nTime, sal_Bool bReloadP,
+ AutoReloadTimer_Impl( const String& rURL, sal_uInt32 nTime,
SfxObjectShell* pSh );
virtual void Timeout();
};
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 971d793..e5e8c17 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -39,7 +39,6 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
SfxMedium* pMedium;
SfxMedium *pDLMedium; // Medium for Download Files
- sal_uInt16 nMetaTags; // Number of previously read Meta-Tags
ScriptType eScriptType;
SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* );
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index e8a11c4..b0c3599 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -347,7 +347,6 @@ protected:
DECL_LINK( Activate, Menu * );
private:
String aLastURL;
- sal_Bool bBigImages;
PopupMenu* pMenu;
sal_uIntPtr m_nSymbolsStyle;
sal_Bool m_bShowMenuImages;
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index b5dae35..3348cb6 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -29,13 +29,12 @@ class SfxViewShell;
class Window;
typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*);
-typedef void (*SfxViewInit)();
// CLASS -----------------------------------------------------------------
class SFX2_DLLPUBLIC SfxViewFactory
{
public:
- SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
+ SfxViewFactory( SfxViewCtor fnC,
sal_uInt16 nOrdinal, const sal_Char* asciiViewName );
SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
@@ -53,7 +52,6 @@ public:
private:
SfxViewCtor fnCreate;
- SfxViewInit fnInit;
sal_uInt16 nOrd;
const String m_sViewName;
};
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index ff42068..3c9387c 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -113,7 +113,7 @@ public: \
{ return new Class(pFrame, pOldView); } \
void Class::RegisterFactory( sal_uInt16 nPrio ) \
{ \
- pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\
+ pFactory = new SfxViewFactory(&CreateInstance,nPrio,AsciiViewName);\
InitFactory(); \
} \
void Class::InitFactory()
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index b1b5699..c3e98e0 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -46,7 +46,6 @@ class SvFileObject : public sfx2::SvLinkSource
sal_Bool bWaitForData : 1;
sal_Bool bInNewData : 1;
sal_Bool bDataReady : 1;
- sal_Bool bMedUseCache : 1;
sal_Bool bNativFormat : 1;
sal_Bool bClearMedium : 1;
sal_Bool bStateChangeCalled : 1;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 88c4563..eb6f06c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -298,21 +298,19 @@ void SfxHelpOptions_Impl::Commit()
class SfxHelp_Impl
{
private:
- sal_Bool m_bIsDebug; // environment variable "help_debug=1"
SfxHelpOptions_Impl* m_pOpt; // the options
::std::vector< ::rtl::OUString > m_aModulesList; // list of all installed modules
public:
- SfxHelp_Impl( sal_Bool bDebug );
+ SfxHelp_Impl();
~SfxHelp_Impl();
SfxHelpOptions_Impl* GetOptions();
static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
};
-SfxHelp_Impl::SfxHelp_Impl( sal_Bool bDebug ) :
+SfxHelp_Impl::SfxHelp_Impl() :
- m_bIsDebug ( bDebug ),
m_pOpt ( NULL )
{
@@ -356,7 +354,7 @@ SfxHelp::SfxHelp() :
bIsDebug = !sHelpDebug.isEmpty();
}
- pImp = new SfxHelp_Impl( bIsDebug );
+ pImp = new SfxHelp_Impl();
::rtl::OUString aLocaleStr = HelpLocaleString();
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 9c64259..8bc4946 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -65,8 +65,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
SfxMedium *pMed ) :
HTMLParser( rStream, bIsNewDoc ),
- pMedium( pMed ), pDLMedium( 0 ),
- nMetaTags( 0 )
+ pMedium( pMed ), pDLMedium( 0 )
{
DBG_ASSERT( RTL_TEXTENCODING_UTF8 == GetSrcEncoding( ),
"SfxHTMLParser::SfxHTMLParser: From where comes ZS?" );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index cd6efdf..6d77417 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -61,19 +61,16 @@ extern sal_Bool GetSplitSizeFromString( const String& rStr, Size& rSize );
// - Add new slot definitions to sfx.sdi
static const int NUM_OF_DOCKINGWINDOWS = 10;
-class SfxTitleDockingWindow;
class SfxTitleDockingWindow : public SfxDockingWindow
{
Window* m_pWrappedWindow;
- sal_uInt16 m_nID;
public:
SfxTitleDockingWindow(
SfxBindings* pBindings ,
SfxChildWindow* pChildWin ,
Window* pParent ,
- WinBits nBits,
- sal_uInt16 nID);
+ WinBits nBits);
virtual ~SfxTitleDockingWindow();
Window* GetWrappedWindow() const { return m_pWrappedWindow; }
@@ -134,7 +131,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
const rtl::OUString aDockWindowResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ));
SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd,
- WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE, nId);
+ WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
pWindow = pTitleDockWindow;
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
@@ -266,14 +263,12 @@ SfxChildWinInfo SfxDockingWrapper::GetInfo() const
SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,
SfxChildWindow* pChildWin ,
Window* pParent ,
- WinBits nBits,
- sal_uInt16 nID ) :
+ WinBits nBits ) :
SfxDockingWindow( pBind ,
pChildWin ,
pParent ,
nBits ),
- m_pWrappedWindow(0),
- m_nID(nID)
+ m_pWrappedWindow(0)
{
}
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 10ff4e3..49690da 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -178,7 +178,6 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
pChildWin,
pParent,
SfxResId( SID_RECORDING_FLOATWINDOW ) )
- , pWrapper( pChildWin )
, aTbx( this, SfxResId(SID_RECORDING_FLOATWINDOW) )
{
// Retrieve label from helper function
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index baef6c0..3982e2e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -421,7 +421,6 @@ class StyleTreeListBox_Impl : public DropListBox_Impl
{
private:
SvLBoxEntry* pCurEntry;
- SfxCommonTemplateDialog_Impl* pCommon;
Link aDoubleClickLink;
Link aDropLink;
String aParent;
@@ -589,8 +588,7 @@ void StyleTreeListBox_Impl::ExpandedHdl()
StyleTreeListBox_Impl::StyleTreeListBox_Impl(
SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) :
DropListBox_Impl(pParent->GetWindow(), nWinStyle, pParent),
- pCurEntry(0),
- pCommon(pParent)
+ pCurEntry(0)
/* [Description]
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index eb7ad55..2515e67 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -43,7 +43,6 @@ namespace sfx2
class IFrameWindow_Impl : public Window
{
uno::Reference < frame::XFrame > mxFrame;
- sal_Bool bActive;
sal_Bool bBorder;
public:
@@ -57,7 +56,6 @@ public:
IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, sal_Bool bHasBorder, WinBits nWinBits )
: Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER )
- , bActive(sal_False)
, bBorder(bHasBorder)
{
if ( !bHasBorder )
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8eada23..ada681f 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1166,7 +1166,7 @@ void SfxObjectShell::SetAutoLoad(
{
pImp->pReloadTimer = new AutoReloadTimer_Impl(
rUrl.GetMainURL( INetURLObject::DECODE_TO_IURI ),
- nTime, bReload, this );
+ nTime, this );
pImp->pReloadTimer->Start();
}
}
@@ -1442,8 +1442,8 @@ void SfxObjectShell::CancelTransfers()
//-------------------------------------------------------------------------
AutoReloadTimer_Impl::AutoReloadTimer_Impl(
- const String& rURL, sal_uInt32 nTime, sal_Bool bReloadP, SfxObjectShell* pSh )
- : aUrl( rURL ), bReload( bReloadP ), pObjSh( pSh )
+ const String& rURL, sal_uInt32 nTime, SfxObjectShell* pSh )
+ : aUrl( rURL ), pObjSh( pSh )
{
SetTimeout( nTime );
}
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 47a3036..256c96c 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -39,7 +39,6 @@ public:
class SfxRecordingFloat_Impl : public SfxFloatingWindow
{
- SfxChildWindow* pWrapper;
ToolBox aTbx;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xStopRecTbxCtrl;
public:
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 035de64..934c0c0 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1399,7 +1399,6 @@ void SfxPopupWindow::Delete()
SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
: SfxToolBoxControl( nSlotId, nId, rBox )
- , bBigImages( sal_False )
, pMenu( 0 )
{
rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 207ad17..079b84a 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -71,13 +71,11 @@ struct SfxViewFrame_Impl
class SfxFrameViewWindow_Impl : public Window
{
- sal_Bool bActive;
SfxViewFrame* pFrame;
public:
SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) :
Window( &rParent, nBits | WB_BORDER | WB_CLIPCHILDREN ),
- bActive( sal_False ),
pFrame( p )
{
SetBorderStyle( WINDOW_BORDER_TOPBOTTOM );
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index b66ef67..33cc346 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -323,15 +323,13 @@ void SAL_CALL SfxStatusIndicator::disposing( const com::sun::star::lang::EventOb
class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrameActionListener >
{
public:
- IMPL_SfxBaseController_ListenerHelper( MUTEX& aMutex ,
- SfxBaseController* pController ) ;
+ IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ;
virtual ~IMPL_SfxBaseController_ListenerHelper() ;
virtual void SAL_CALL frameAction( const FRAMEACTIONEVENT& aEvent ) throw (RUNTIMEEXCEPTION) ;
virtual void SAL_CALL disposing( const EVENTOBJECT& aEvent ) throw (RUNTIMEEXCEPTION) ;
private:
- MUTEX& m_aMutex ;
SfxBaseController* m_pController ;
} ; // class IMPL_SfxBaseController_ListenerContainer
@@ -339,8 +337,7 @@ private:
class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
{
public:
- IMPL_SfxBaseController_CloseListenerHelper( MUTEX& aMutex ,
- SfxBaseController* pController ) ;
+ IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ;
virtual ~IMPL_SfxBaseController_CloseListenerHelper() ;
virtual void SAL_CALL queryClosing( const EVENTOBJECT& aEvent, sal_Bool bDeliverOwnership )
throw (RUNTIMEEXCEPTION, com::sun::star::util::CloseVetoException) ;
@@ -349,15 +346,12 @@ public:
private:
- MUTEX& m_aMutex;
SfxBaseController* m_pController;
} ; // class IMPL_SfxBaseController_ListenerContainer
-IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListenerHelper( MUTEX& aMutex ,
- SfxBaseController* pController )
- : m_aMutex ( aMutex )
- , m_pController ( pController )
+IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController )
+ : m_pController ( pController )
{
}
@@ -421,8 +415,8 @@ struct IMPL_SfxBaseController_DataContainer
IMPL_SfxBaseController_DataContainer( MUTEX& aMutex ,
SfxViewShell* pViewShell ,
SfxBaseController* pController )
- : m_xListener ( new IMPL_SfxBaseController_ListenerHelper( aMutex, pController ) )
- , m_xCloseListener ( new IMPL_SfxBaseController_CloseListenerHelper( aMutex, pController ) )
+ : m_xListener ( new IMPL_SfxBaseController_ListenerHelper( pController ) )
+ , m_xCloseListener ( new IMPL_SfxBaseController_CloseListenerHelper( pController ) )
, m_aUserInputInterception ( *pController, aMutex )
, m_aListenerContainer ( aMutex )
, m_aInterceptorContainer ( aMutex )
@@ -439,10 +433,8 @@ struct IMPL_SfxBaseController_DataContainer
// IMPL_SfxBaseController_ListenerHelper constructor
//________________________________________________________________________________________________________
-IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( MUTEX& aMutex ,
- SfxBaseController* pController )
- : m_aMutex ( aMutex )
- , m_pController ( pController )
+IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController )
+ : m_pController ( pController )
{
}
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index a7e15a1..d1b9528 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -52,10 +52,9 @@ String SfxViewFactory::GetAPIViewName() const
// CTOR / DTOR -----------------------------------------------------------
-SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
+SfxViewFactory::SfxViewFactory( SfxViewCtor fnC,
sal_uInt16 nOrdinal, const sal_Char* asciiViewName ):
fnCreate(fnC),
- fnInit(fnI),
nOrd(nOrdinal),
m_sViewName( rtl::OUString::createFromAscii( asciiViewName ) )
{
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index cb8a2e8..5bc80c3 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -420,7 +420,6 @@ private:
SfxViewShell* _pViewSh;
PrinterSetupDialog* _pSetupParent;
SfxItemSet* _pOptions;
- sal_Bool _bModified;
sal_Bool _bHelpDisabled;
DECL_LINK( Execute, void * );
@@ -441,7 +440,6 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe
_pViewSh ( pViewSh ),
_pSetupParent ( pParent ),
_pOptions ( NULL ),
- _bModified ( sal_False ),
_bHelpDisabled ( sal_False )
{
commit a71e7b108c7041ebc7cb99d1d2d53358140d8e30
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 17:25:23 2012 +0200
-Werror,-Wnon-literal-null-conversion (Clang towards 3.2)
Two cases that 683312377a294e9dbe0a96b7b1b489e3d5b4f1f7 "Removed unused
SfxMedium::bDirect" did not catch.
Change-Id: I33b60bd27b97ac086d0927a6877d055561dde1f6
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index e85dd87..2cf3f95 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1547,7 +1547,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
{
mbIsOwner = sal_True;
SfxMedium *pMed=new SfxMedium(
- aTargetURL,(STREAM_STD_READWRITE | STREAM_SHARE_DENYALL), sal_False, 0 );
+ aTargetURL,(STREAM_STD_READWRITE | STREAM_SHARE_DENYALL) );
const SfxFilter* pFilter = NULL;
pMed->UseInteractionHandler(sal_True);
if( pSfxApp->GetFilterMatcher().GuessFilter(
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index db9937f..e224d55 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -270,7 +270,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( sal_uInt16 nIdx )
{
pEntry->bOwner = sal_True;
SfxMedium* pMed = new SfxMedium(
- aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), sal_False, 0 );
+ aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ) );
const SfxFilter* pFilter = NULL;
pMed->UseInteractionHandler(sal_True);
if (
commit f7dfe57060294da05c092f8389a8841140de22c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 17:09:51 2012 +0200
-Werror,-Wunused-value (Clang towards 3.2)
Change-Id: I048b0d4f28a92c23523e8f53993632238ebfa622
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 4093758..69424db 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -615,7 +615,7 @@ namespace sfx2 {
void IndexTabPage_Impl::InitializeIndex()
{
- WaitObject( this );
+ WaitObject aWaitCursor( this );
// By now more than 256 equal entries are not allowed
sal_Unicode append[256];
commit 0d32a7be7fb1926a477497d14b87f9eb87324f89
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 17:00:44 2012 +0200
-Werror,-Wnon-literal-null-conversion (Clang towards 3.2)
Looks to me like the intent was to call SfxViewFrame::GetFirst(NULL, false)
rather than SfxViewFrame::GetFirst(NULL, true) to which
SfxViewFrame::GetFirst(sal_False) would translate. The call was in that form
effectively since it was introduced with
7c8963693d57a26c88b2ead460fb5e9bfef99272 "Obsolete Objects/Classes removed."
Change-Id: Ib7d9ce75d946291bdfd43420bdd8a1de533cdc98
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 21319fe..44a6d04 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -234,7 +234,7 @@ SfxModule* SfxApplication::GetModule_Impl()
{
SfxModule* pModule = SfxModule::GetActiveModule();
if ( !pModule )
- pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( sal_False ) );
+ pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, sal_False ) );
if( pModule )
return pModule;
else
commit c037063b2324e6779f7c845899772239e6d64112
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 16:40:03 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I20d0bd3eeb7661b51193ba01042e15ef62629ed3
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 485d3dc..197e4fa 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -149,16 +149,13 @@ class ConvDicXMLEntryTextContext_Impl :
{
OUString aLeftText;
sal_Int16 nPropertyType; // used for Chinese simplified/traditional conversion
- ConvDicXMLDictionaryContext_Impl &rDicContext;
public:
ConvDicXMLEntryTextContext_Impl(
ConvDicXMLImport &rImport,
- sal_uInt16 nPrefix, const OUString& rLName,
- ConvDicXMLDictionaryContext_Impl &rParentContext ) :
+ sal_uInt16 nPrefix, const OUString& rLName ) :
ConvDicXMLImportContext( rImport, nPrefix, rLName ),
- nPropertyType( ConversionPropertyType::NOT_DEFINED ),
- rDicContext( rParentContext )
+ nPropertyType( ConversionPropertyType::NOT_DEFINED )
{
}
@@ -252,7 +249,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext(
{
SvXMLImportContext *pContext = 0;
if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "entry" )
- pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this );
+ pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName );
else
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
return pContext;
commit 8a118589217464d4325d9b587b8cee12639d3db6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 16:37:19 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I57abfb3b3d659edcd130788d173c2df3b79101f0
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index f16b0b6..74ce915 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -215,9 +215,6 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider
/** prevent recursive calling of Application::Reschedule(). */
static sal_Int32 m_nInReschedule;
- /** time where there last start call was made. */
- sal_Int32 m_nStartTime;
-
//-------------------------------------------
// interface
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 4365266..dbae903 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -182,7 +182,6 @@ namespace framework
UIElementTypesVector m_aUIElements;
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xDocConfigStorage;
bool m_bReadOnly;
- bool m_bInitialized;
bool m_bModified;
bool m_bConfigRead;
bool m_bDisposed;
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 296c106..fbf1b20 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -110,7 +110,6 @@ class WindowStateConfiguration : private ThreadHelpBase
::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap;
private:
- sal_Bool m_bConfigRead;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
ModuleToWindowStateFileMap m_aModuleToFileHashMap;
ModuleToWindowStateConfigHashMap m_aModuleToWindowStateHashMap;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index c8752d4..86e73b5 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -68,7 +68,6 @@ namespace framework
rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
long* m_pHeightArray;
- sal_Bool m_bRebuildMenu;
com::sun::star::awt::FontDescriptor m_aFontDescriptor;
::com::sun::star::frame::status::FontHeight m_aFontHeight;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xCurrentFontDispatch;
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 752079b..7a82084 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -47,8 +47,6 @@ class FrameworkStatusBar : public StatusBar
private:
StatusBarManager* m_pMgr;
- sal_Bool m_bShow : 1,
- m_bLock : 1;
};
}
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 5a7c1f9..99dc12f 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -106,7 +106,6 @@ namespace framework
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess;
::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigListener;
sal_Bool m_bConfigAccessInitialized;
- bool m_bConfigDirty;
};
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 5750985..2d660a7 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -153,7 +153,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuBarHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer,
const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
virtual ~OReadMenuBarHandler();
@@ -186,8 +185,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
sal_Bool m_bMenuMode;
com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
-
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuBarHandler
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 86260a9..746884d 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -222,7 +222,6 @@ namespace framework
::cppu::OInterfaceContainerHelper m_aUndoListeners;
::cppu::OInterfaceContainerHelper m_aModifyListeners;
IUndoManagerImplementation& m_rUndoManagerImplementation;
- UndoManagerHelper& m_rAntiImpl;
::std::stack< bool > m_aContextVisibilities;
#if OSL_DEBUG_LEVEL > 0
::std::stack< bool > m_aContextAPIFlags;
@@ -234,7 +233,7 @@ namespace framework
::osl::Mutex& getMutex() { return m_aMutex; }
public:
- UndoManagerHelper_Impl( UndoManagerHelper& i_antiImpl, IUndoManagerImplementation& i_undoManagerImpl )
+ UndoManagerHelper_Impl( IUndoManagerImplementation& i_undoManagerImpl )
:m_aMutex()
,m_aQueueMutex()
,m_disposed( false )
@@ -244,7 +243,6 @@ namespace framework
,m_aUndoListeners( m_aMutex )
,m_aModifyListeners( m_aMutex )
,m_rUndoManagerImplementation( i_undoManagerImpl )
- ,m_rAntiImpl( i_antiImpl )
{
getUndoManager().AddUndoListener( *this );
}
@@ -938,7 +936,7 @@ namespace framework
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl )
- :m_pImpl( new UndoManagerHelper_Impl( *this, i_undoManagerImpl ) )
+ :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) )
{
}
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 27ac1f4..680835d 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -289,7 +289,7 @@ throw( SAXException, RuntimeException )
{
++m_nElementDepth;
m_bMenuBarMode = sal_True;
- m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_xMenuBarContainer, m_xContainerFactory ));
+ m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_xMenuBarContainer, m_xContainerFactory ));
m_xReader->startDocument();
}
@@ -328,14 +328,12 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName
// -----------------------------------------------------------------------------
OReadMenuBarHandler::OReadMenuBarHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Reference< XIndexContainer >& rMenuBarContainer,
const Reference< XSingleComponentFactory >& rFactory )
: m_nElementDepth( 0 ),
m_bMenuMode( sal_False ),
m_xMenuBarContainer( rMenuBarContainer ),
- m_xContainerFactory( rFactory ),
- mxServiceFactory( xServiceFactory )
+ m_xContainerFactory( rFactory )
{
}
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 1972d4a..a7789bd 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -64,7 +64,6 @@ ToolbarLayoutManager::ToolbarLayoutManager(
m_eDockOperation( DOCKOP_ON_COLROW ),
m_ePreviewDetection( PREVIEWFRAME_UNKNOWN ),
m_bComponentAttached( false ),
- m_bMustLayout( false ),
m_bLayoutDirty( false ),
m_bStoreWindowState( false ),
m_bGlobalSettings( false ),
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 139619f..0f4d2b7 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -321,7 +321,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
std::auto_ptr< GlobalSettings > m_pGlobalSettings;
bool m_bComponentAttached;
- bool m_bMustLayout;
bool m_bLayoutDirty;
bool m_bStoreWindowState;
bool m_bGlobalSettings;
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 3d0f962..0ce2e54 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -590,7 +590,6 @@ UIConfigurationManager::UIConfigurationManager( com::sun::star::uno::Reference<
ThreadHelpBase( &Application::GetSolarMutex() )
, m_xDocConfigStorage( 0 )
, m_bReadOnly( true )
- , m_bInitialized( false )
, m_bModified( false )
, m_bConfigRead( false )
, m_bDisposed( false )
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 6506edd..8dd3d83 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -71,8 +71,7 @@ DEFINE_INIT_SERVICE ( FontSizeMenuController, {} )
FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
svt::PopupMenuControllerBase( xServiceManager ),
- m_pHeightArray( 0 ),
- m_bRebuildMenu( sal_True )
+ m_pHeightArray( 0 )
{
}
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 438099a..5fb182d 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -37,9 +37,7 @@ FrameworkStatusBar::FrameworkStatusBar(
Window* pParent,
WinBits nWinBits ) :
StatusBar( pParent, nWinBits ),
- m_pMgr( NULL ),
- m_bShow( sal_False ),
- m_bLock( sal_False )
+ m_pMgr( NULL )
{
// set optimal size
SetOutputSizePixel( CalcWindowSizePixel() );
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index f6d55db..11ff2a1 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -89,8 +89,7 @@ ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( Referenc
m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )),
m_sRoot(_sRoot),
m_xServiceManager( rServiceManager ),
- m_bConfigAccessInitialized( sal_False ),
- m_bConfigDirty(true)
+ m_bConfigAccessInitialized( sal_False )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UIElementFactoryManager::ConfigurationAccess_FactoryManager" );
m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( SERVICENAME_CFGPROVIDER),UNO_QUERY );
commit 529951aae5c731ed76fb980fc841699a0cc82a40
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 16:26:45 2012 +0200
-Werror,-Wunused-value (Clang towards 3.2)
Change-Id: Idf2ec39ba286d359903edb6be60f2692c6a9837b
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index fa19b8f..078bf30 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -149,7 +149,7 @@ ConstItemContainer::ConstItemContainer() : ::cppu::OWeakObject()
ConstItemContainer::ConstItemContainer( const ItemContainer& rItemContainer )
{
- ShareGuard( rItemContainer.m_aShareMutex );
+ ShareGuard aLock( rItemContainer.m_aShareMutex );
copyItemContainer( rItemContainer.m_aItemVector );
}
commit fd226710fef768543a3ad0fe5081f79dc875dcf3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 16:18:53 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I4b877ab97259f7e031e34daf7ce93e1b59417a08
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 8a7039a..2e39d17 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -34,8 +34,6 @@ class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext
private:
friend class SdXMLNumberFormatMemberImportContext;
- SdXMLImport& mrImport;
-
sal_Bool mbTimeStyle;
sal_Bool mbAutomatic;
sal_uInt8 mnElements[16];
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b2483de..a78f77d 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1077,7 +1077,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext
::rtl::OUString sMacro; // macro for old documents (pre 638i)
- sal_Bool bMacroOK;
sal_Bool bDescriptionOK;
public:
@@ -1122,11 +1121,9 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext
sal_uInt16 nElementToken;
sal_Int16 nSource;
sal_Int16 nType;
- sal_Int16 nSequenceNumber;
sal_Bool bNameOK;
sal_Bool bTypeOK;
- sal_Bool bSeqNumberOK;
public:
@@ -1402,7 +1399,6 @@ class XMLScriptImportContext : public XMLTextFieldImportContext
sal_Bool bContentOK;
sal_Bool bScriptTypeOK;
- sal_Bool bUrlContent;
public:
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 357284f..9fb1501 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -160,7 +160,6 @@ private:
sal_Bool bHintOK; /// sHint was set
sal_Bool bDisplayOK; /// sDisplayFormula/-None were set
- sal_Bool bSetName; /// set sName with ???-property
sal_Bool bSetFormula; /// set Formula property
sal_Bool bSetFormulaDefault; /// use content as default for formula
sal_Bool bSetDescription; /// set sDescription with Hint-property
@@ -182,7 +181,6 @@ public:
sal_uInt16 nPrfx, /// namespace prefix
const ::rtl::OUString& rLocalName, /// element name w/o prefix
// config variables for PrepareField behavior:
- sal_Bool bName, /// set sName with ???-property
sal_Bool bFormula, /// set Formula property
sal_Bool bFormulaDefault, /// use content as default for formula
sal_Bool bDescription, /// set sDescription with Hint-property
@@ -310,7 +308,6 @@ public:
// for finding appropriate field master (see EndElement())
VarType eVarType, /// variable type
// config variables:
- sal_Bool bName, /// see XMLTextFieldImportContext
sal_Bool bFormula, /// see XMLTextFieldImportContext
sal_Bool bFormulaDefault, /// see XMLTextFieldImportContext
sal_Bool bDescription, /// see XMLTextFieldImportContext
@@ -542,7 +539,6 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext
XMLValueImportHelper aValueHelper;
::rtl::OUString sFormula;
- sal_Bool bFormulaOK;
sal_Bool bIsShowFormula;
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index 6bd2fda..e558b0f 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -36,7 +36,6 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
sal_Int32 nRange;
sal_Int32 nReference;
sal_Int32 nValue;
- double fOldPercent;
sal_Bool bStrict;
// #96469#; if the value goes over the Range the progressbar starts again
sal_Bool bRepeat;
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 6a217d6..0b260a0 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -56,13 +56,11 @@ protected:
virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException);
private:
- bool m_bIsFillColor;
OUString m_aColorPropName;
Property m_aColorProp;
};
lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
- m_bIsFillColor( bFillColor ),
// note: length of FillColor and LineColor is 9
m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
m_aColorProp( m_aColorPropName, -1,
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index fa94162..ac778fa 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -87,12 +87,10 @@ static SvXMLEnumMapEntry aXMLAxisTypeMap[] =
class SchXMLCategoriesContext : public SvXMLImportContext
{
private:
- SchXMLImportHelper& m_rImportHelper;
OUString& mrAddress;
public:
- SchXMLCategoriesContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SchXMLCategoriesContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
OUString& rAddress );
@@ -107,7 +105,7 @@ public:
class DateScaleContext : public SvXMLImportContext
{
public:
- DateScaleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport,
+ DateScaleContext( SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< beans::XPropertySet > xAxisProps );
@@ -115,7 +113,6 @@ public:
virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
private:
- SchXMLImportHelper& m_rImportHelper;
Reference< beans::XPropertySet > m_xAxisProps;
};
@@ -673,7 +670,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
break;
case XML_TOK_AXIS_CATEGORIES:
- pContext = new SchXMLCategoriesContext( m_rImportHelper, GetImport(),
+ pContext = new SchXMLCategoriesContext( GetImport(),
p_nPrefix, rLocalName,
m_rCategoriesAddress );
m_aCurrentAxis.bHasCategories = true;
@@ -681,7 +678,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
case XML_TOK_AXIS_DATE_SCALE:
case XML_TOK_AXIS_DATE_SCALE_EXT:
- pContext = new DateScaleContext( m_rImportHelper, GetImport(),
+ pContext = new DateScaleContext( GetImport(),
p_nPrefix, rLocalName, m_xAxisProps );
m_bDateScaleImported = true;
break;
@@ -883,13 +880,11 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
// ========================================
SchXMLCategoriesContext::SchXMLCategoriesContext(
- SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
OUString& rAddress ) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
- m_rImportHelper( rImpHelper ),
mrAddress( rAddress )
{
}
@@ -920,13 +915,11 @@ void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttribut
// ========================================
DateScaleContext::DateScaleContext(
- SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< beans::XPropertySet > xAxisProps ) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
- m_rImportHelper( rImpHelper ),
m_xAxisProps( xAxisProps )
{
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index cdadaf4..7e842d7 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -54,6 +54,7 @@
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
+#include <com/sun/star/chart/ChartSeriesAddress.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
@@ -1013,7 +1014,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
case XML_TOK_CHART_PLOT_AREA:
pContext = new SchXMLPlotAreaContext( mrImportHelper, GetImport(), rLocalName,
m_aXLinkHRefAttributeToIndicateDataProvider,
- maSeriesAddresses, msCategoriesAddress,
+ msCategoriesAddress,
msChartAddress, m_bHasRangeAtPlotArea, mbAllRangeAddressesAvailable,
mbColHasLabels, mbRowHasLabels,
meDataRowSource,
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 535e6d2..2d9ff9a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -147,7 +147,6 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const rtl::OUString& rLocalName,
const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider,
- uno::Sequence< chart::ChartSeriesAddress >& rSeriesAddresses,
::rtl::OUString& rCategoriesAddress,
::rtl::OUString& rChartAddress,
bool& rbHasRangeAtPlotArea,
@@ -161,7 +160,6 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
const awt::Size & rChartSize ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
- mrSeriesAddresses( rSeriesAddresses ),
mrCategoriesAddress( rCategoriesAddress ),
mrSeriesDefaultsAndStyles( rSeriesDefaultsAndStyles ),
mnNumOfLinesProp( 0 ),
@@ -654,15 +652,13 @@ void SchXMLPlotAreaContext::EndElement()
// ========================================
-SchXMLDataPointContext::SchXMLDataPointContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const rtl::OUString& rLocalName,
+SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
- mrImportHelper( rImpHelper ),
mrStyleList( rStyleList ),
m_xSeries( xSeries ),
mrIndex( rIndex ),
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 7308e69..cce003c 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -32,8 +32,6 @@
#include "SchXMLChartContext.hxx"
#include <xmloff/xmlictxt.hxx>
#include <xmloff/shapeimport.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/chart/ChartSeriesAddress.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include "transporttypes.hxx"
@@ -108,8 +106,6 @@ public:
SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const rtl::OUString& rLocalName,
const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider,
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::chart::ChartSeriesAddress >& rSeriesAddresses,
::rtl::OUString& rCategoriesAddress,
::rtl::OUString& rChartAddress,
bool& bHasRangeAtPlotArea,
@@ -135,7 +131,6 @@ private:
::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram;
::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis > maAxes;
- ::com::sun::star::uno::Sequence< ::com::sun::star::chart::ChartSeriesAddress >& mrSeriesAddresses;
rtl::OUString& mrCategoriesAddress;
SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles;
sal_Int32 mnNumOfLinesProp;
@@ -168,7 +163,6 @@ private:
class SchXMLDataPointContext : public SvXMLImportContext
{
private:
- SchXMLImportHelper& mrImportHelper;
::std::list< DataRowPointStyle >& mrStyleList;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > m_xSeries;
@@ -176,8 +170,7 @@ private:
bool mbSymbolSizeForSeriesIsMissingInFile;
public:
- SchXMLDataPointContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const rtl::OUString& rLocalName,
+ SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex,
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 26f10f0..be6181c 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -77,12 +77,10 @@ namespace
class SchXMLDomain2Context : public SvXMLImportContext
{
private:
- SchXMLImportHelper& mrImportHelper;
::std::vector< OUString > & mrAddresses;
public:
- SchXMLDomain2Context( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SchXMLDomain2Context( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
::std::vector< OUString > & rAddresses );
@@ -91,13 +89,11 @@ public:
};
SchXMLDomain2Context::SchXMLDomain2Context(
- SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
::std::vector< ::rtl::OUString > & rAddresses ) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
- mrImportHelper( rImpHelper ),
mrAddresses( rAddresses )
{
}
@@ -649,7 +645,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
{
m_bHasDomainContext = true;
pContext = new SchXMLDomain2Context(
- mrImportHelper, GetImport(),
+ GetImport(),
nPrefix, rLocalName,
maDomainAddresses );
}
@@ -681,7 +677,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
break;
case XML_TOK_SERIES_DATA_POINT:
- pContext = new SchXMLDataPointContext( mrImportHelper, GetImport(), rLocalName,
+ pContext = new SchXMLDataPointContext( GetImport(), rLocalName,
mrStyleList, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile );
break;
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 935ea69..bf7e95a 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -261,11 +261,11 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
mrTable.bHasHeaderColumn = true;
// fall through intended
case XML_TOK_TABLE_COLUMNS:
- pContext = new SchXMLTableColumnsContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+ pContext = new SchXMLTableColumnsContext( GetImport(), rLocalName, mrTable );
break;
case XML_TOK_TABLE_COLUMN:
- pContext = new SchXMLTableColumnContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+ pContext = new SchXMLTableColumnContext( GetImport(), rLocalName, mrTable );
break;
case XML_TOK_TABLE_HEADER_ROWS:
@@ -430,12 +430,10 @@ void SchXMLTableContext::setColumnPermutation( const uno::Sequence< sal_Int32 >
// ----------------------------------------
SchXMLTableColumnsContext::SchXMLTableColumnsContext(
- SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
const rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
- mrImportHelper( rImpHelper ),
mrTable( aTable )
{
}
@@ -454,7 +452,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_TABLE &&
IsXMLToken( rLocalName, XML_TABLE_COLUMN ) )
{
- pContext = new SchXMLTableColumnContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+ pContext = new SchXMLTableColumnContext( GetImport(), rLocalName, mrTable );
}
else
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
@@ -467,12 +465,10 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
// ----------------------------------------
SchXMLTableColumnContext::SchXMLTableColumnContext(
- SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
const rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
- mrImportHelper( rImpHelper ),
mrTable( aTable )
{
}
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 3285849..d983fc0 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -108,12 +108,10 @@ public:
class SchXMLTableColumnsContext : public SvXMLImportContext
{
private:
- SchXMLImportHelper& mrImportHelper;
SchXMLTable& mrTable;
public:
- SchXMLTableColumnsContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SchXMLTableColumnsContext( SvXMLImport& rImport,
const rtl::OUString& rLocalName,
SchXMLTable& aTable );
virtual ~SchXMLTableColumnsContext();
@@ -129,12 +127,10 @@ public:
class SchXMLTableColumnContext : public SvXMLImportContext
{
private:
- SchXMLImportHelper& mrImportHelper;
SchXMLTable& mrTable;
public:
- SchXMLTableColumnContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SchXMLTableColumnContext( SvXMLImport& rImport,
const rtl::OUString& rLocalName,
SchXMLTable& aTable );
virtual ~SchXMLTableColumnContext();
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index 4eb28fa..2f46b6c 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -32,7 +32,6 @@ public:
private:
bool m_bIsNamedSymbol;
- sal_Int32 nSymbolType;
};
#endif // _XMLSYMBOLTYPEPROPERTYHDL_HXX_
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 56e3a67..0ba5857 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -41,7 +41,6 @@
using namespace ::com::sun::star;
const sal_Int32 nDefaultProgressBarRange = 1000000;
-const float fProgressStep = 0.5;
ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator,
const sal_Bool bTempStrict)
@@ -49,7 +48,6 @@ ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::
, nRange(nDefaultProgressBarRange)
, nReference(100)
, nValue(0)
-, fOldPercent(0.0)
, bStrict(bTempStrict)
, bRepeat(sal_True)
#ifdef DBG_UTIL
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 6ef4815..83576ab 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -600,7 +600,6 @@ TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext );
SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
: SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
- mrImport( rImport ),
mbAutomatic( sal_False ),
mnIndex(0),
mnKey( -1 )
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 82f5476..37bd435 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1186,10 +1186,8 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper()
// ----------------------------------------
-XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, XMLTextListAutoStylePool *pListAutoPool, SvXMLExport& rExport )
+XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport )
: SvXMLExportPropertyMapper( rMapper )
-, mpListAutoPool( pListAutoPool )
-, mrExport( rExport )
, maNumRuleExp( rExport )
, mbIsInAutoStyles( sal_True )
, msCDATA( GetXMLToken(XML_CDATA))
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index e851156..5980a49 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -36,7 +36,6 @@
#include <xmloff/xmlement.hxx>
#include <xmloff/prhdlfac.hxx>
#include <xmloff/xmlprmap.hxx>
-#include "xmloff/XMLTextListAutoStylePool.hxx"
#include <xmloff/xmlexppr.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -260,8 +259,6 @@ public:
class XMLShapeExportPropertyMapper : public SvXMLExportPropertyMapper
{
private:
- XMLTextListAutoStylePool *mpListAutoPool;
- SvXMLExport& mrExport;
SvxXMLNumRuleExport maNumRuleExp;
sal_Bool mbIsInAutoStyles;
@@ -275,7 +272,7 @@ protected:
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rPropSet ) const;
public:
- XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, XMLTextListAutoStylePool *pListAutoPool, SvXMLExport& rExport );
+ XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport );
virtual ~XMLShapeExportPropertyMapper();
virtual void handleElementItem(
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9509787..eed9efd 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -456,7 +456,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
// construct PropertySetMapper
UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef);
- mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, (XMLTextListAutoStylePool*)&GetTextParagraphExport()->GetListAutoStylePool(), *this );
+ mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, *this );
// set lock to avoid deletion
mpPropertySetMapper->acquire();
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index f13524a..6a92501 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -201,13 +201,10 @@ class SdXMLImport: public SvXMLImport
SvXMLTokenMap* mpDocElemTokenMap;
SvXMLTokenMap* mpBodyElemTokenMap;
SvXMLTokenMap* mpStylesElemTokenMap;
- SvXMLTokenMap* mpAutoStylesElemTokenMap;
SvXMLTokenMap* mpMasterPageElemTokenMap;
SvXMLTokenMap* mpMasterPageAttrTokenMap;
SvXMLTokenMap* mpPageMasterAttrTokenMap;
SvXMLTokenMap* mpPageMasterStyleAttrTokenMap;
- SvXMLTokenMap* mpDocStyleAttrTokenMap;
- SvXMLTokenMap* mpDocStyleElemTokenMap;
SvXMLTokenMap* mpDrawPageAttrTokenMap;
SvXMLTokenMap* mpDrawPageElemTokenMap;
SvXMLTokenMap* mpPresentationPlaceholderAttrTokenMap;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index bec909b..606164b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1025,9 +1025,7 @@ SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper(
UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport );
UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory );
SvXMLExportPropertyMapper* pResult =
- new XMLShapeExportPropertyMapper( xMapper,
- (XMLTextListAutoStylePool*)&rExport.GetTextParagraphExport()->GetListAutoStylePool(),
- rExport );
+ new XMLShapeExportPropertyMapper( xMapper, rExport );
// chain text attributes
return pResult;
}
@@ -1275,7 +1273,7 @@ const rtl::Reference< XMLTableExport >& XMLShapeExport::GetShapeTableExport()
{
rtl::Reference< XMLPropertyHandlerFactory > xFactory( new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport ) );
UniReference < XMLPropertySetMapper > xMapper( new XMLShapePropertySetMapper( xFactory.get() ) );
- rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, (XMLTextListAutoStylePool*)&mrExport.GetTextParagraphExport()->GetListAutoStylePool(), mrExport ) );
+ rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, mrExport ) );
mxShapeTableExport = new XMLTableExport( mrExport, xPropertySetMapper, xFactory );
}
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8623a17..a7434c0 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1368,8 +1368,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes,
sal_Bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
- mbClosed( sal_True )
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
{
}
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index c86ed79..e9d1e32 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -229,7 +229,6 @@ class SdXMLPathShapeContext : public SdXMLShapeContext
{
rtl::OUString maD;
rtl::OUString maViewBox;
- sal_Bool mbClosed;
public:
TYPEINFO();
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index d7bc932..3c24b4e 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -50,8 +50,7 @@ using ::com::sun::star::uno::Any;
XMLIndexMarkExport::XMLIndexMarkExport(
- SvXMLExport& rExp,
- XMLTextParagraphExport& rParaExp)
+ SvXMLExport& rExp)
: sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
, sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName"))
, sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey"))
@@ -65,7 +64,6 @@ XMLIndexMarkExport::XMLIndexMarkExport(
, sSecondaryKeyReading(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeyReading"))
, sMainEntry(RTL_CONSTASCII_USTRINGPARAM("IsMainEntry"))
, rExport(rExp)
-, rParaExport(rParaExp)
{
}
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index c106b1d..e5b3cc4 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Sequence.h>
class SvXMLExport;
-class XMLTextParagraphExport;
namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
} } }
@@ -59,11 +58,9 @@ class XMLIndexMarkExport
SvXMLExport& rExport;
- XMLTextParagraphExport& rParaExport;
public:
- XMLIndexMarkExport(SvXMLExport& rExp,
- XMLTextParagraphExport& rParaExp);
+ XMLIndexMarkExport(SvXMLExport& rExp);
~XMLIndexMarkExport();
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 2c201c5..d03de03 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextCursor; class XTextContent; }
} } }
-class SvXMLAttributeList;
class XMLTextFrameContextHyperlink_Impl;
class XMLTextFrameContext : public SvXMLImportContext
@@ -46,7 +45,6 @@ class XMLTextFrameContext : public SvXMLImportContext
SvXMLImportContextRef m_xImplContext;
SvXMLImportContextRef m_xReplImplContext;
- SvXMLAttributeList *m_pAttrList;
XMLTextFrameContextHyperlink_Impl *m_pHyperlink;
// Implement Title/Description Elements UI (#i73249#)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 0e8057b..bf55333 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2870,7 +2870,6 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
, nType(ReferenceFieldPart::PAGE_DESC)
, bNameOK(sal_False)
, bTypeOK(sal_False)
-, bSeqNumberOK(sal_False)
{
}
@@ -3869,7 +3868,6 @@ XMLScriptImportContext::XMLScriptImportContext(
, sPropertyContent(sAPI_content)
, bContentOK(sal_False)
, bScriptTypeOK(sal_False)
-, bUrlContent(sal_False)
{
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e5d8876..6eba38b 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1303,7 +1303,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
GetExport() );
pSectionExport = new XMLSectionExport( rExp, *this );
- pIndexMarkExport = new XMLIndexMarkExport( rExp, *this );
+ pIndexMarkExport = new XMLIndexMarkExport( rExp );
if( ! IsBlockMode() &&
Reference<XRedlinesSupplier>( GetExport().GetModel(), UNO_QUERY ).is())
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c9c8219..e605685 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -115,7 +115,7 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
const sal_Char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName,
- sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
+ sal_Bool bFormula, sal_Bool bFormulaDefault,
sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible,
sal_Bool bIsDisplayFormula,
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue,
@@ -137,7 +137,6 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
bHelpOK(sal_False),
bHintOK(sal_False),
bDisplayOK(sal_False),
- bSetName(bName),
bSetFormula(bFormula),
bSetFormulaDefault(bFormulaDefault),
bSetDescription(bDescription),
@@ -310,12 +309,12 @@ XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
const sal_Char* pServiceName, sal_uInt16 nPrfx,
const OUString& rLocalName, VarType eVarType,
- sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
+ sal_Bool bFormula, sal_Bool bFormulaDefault,
sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, sal_Bool bIsDisplayFormula,
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bPresentation) :
XMLVarFieldImportContext(rImport, rHlp, pServiceName,
nPrfx, rLocalName,
- bName, bFormula, bFormulaDefault,
+ bFormula, bFormulaDefault,
bDescription, bHelp, bHint, bVisible, bIsDisplayFormula,
bType, bStyle, bValue, bPresentation),
eFieldType(eVarType)
@@ -399,8 +398,8 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
sal_uInt16 nPrfx, const OUString& rLocalName) :
XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSequence,
- // name, formula
- sal_True, sal_True, sal_True,
+ // formula
+ sal_True, sal_True,
sal_False, sal_False, sal_False, sal_False,
sal_False,
sal_False, sal_False, sal_False, sal_True),
@@ -472,9 +471,9 @@ XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
sal_uInt16 nPrfx, const OUString& rLocalName) :
XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSimple,
- // name, formula, value&type, style,
+ // formula, value&type, style,
// display none
- sal_True, sal_True, sal_True,
+ sal_True, sal_True,
sal_False, sal_False, sal_False,
sal_True, sal_False,
sal_True, sal_True, sal_True,
@@ -508,9 +507,9 @@ XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
const OUString& rLocalName) :
XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
nPrfx, rLocalName, VarTypeSimple,
- // name, description, display none/formula,
+ // description, display none/formula,
// value&type, style, formula
- sal_True, sal_True, sal_True,
+ sal_True, sal_True,
sal_True, sal_True, sal_True,
sal_True, sal_False,
sal_True, sal_True, sal_True,
@@ -550,8 +549,8 @@ XMLUserFieldImportContext::XMLUserFieldImportContext(
sal_uInt16 nPrfx, const OUString& rLocalName) :
XMLSetVarFieldImportContext(rImport, rHlp, sAPI_user, nPrfx,
rLocalName, VarTypeUserField,
- // name, display none/formula, style
- sal_True, sal_False, sal_False,
+ // display none/formula, style
+ sal_False, sal_False,
sal_False, sal_False, sal_False, sal_True,
sal_True,
sal_False, sal_True, sal_False,
@@ -573,8 +572,8 @@ XMLUserFieldInputImportContext::XMLUserFieldInputImportContext(
const OUString& rLocalName) :
XMLVarFieldImportContext(rImport, rHlp, sAPI_input_user,
nPrfx, rLocalName,
- // name, description, style
- sal_True, sal_False, sal_False,
+ // description, style
+ sal_False, sal_False,
sal_True, sal_False, sal_False,
sal_False, sal_False,
sal_False /*???*/, sal_True, sal_False,
@@ -605,8 +604,8 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
sal_uInt16 nPrfx, const OUString& rLocalName) :
XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
nPrfx, rLocalName,
- // name, style, display formula
- sal_True, sal_False, sal_False,
+ // style, display formula
+ sal_False, sal_False,
sal_False, sal_False, sal_False,
sal_False, sal_True,
sal_True, sal_True, sal_False,
@@ -641,7 +640,7 @@ XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
nPrfx, rLocalName,
// formula, type, style, display formula
- sal_False, sal_True, sal_True,
+ sal_True, sal_True,
sal_False, sal_False, sal_False,
sal_False, sal_True,
sal_True, sal_True, sal_False,
@@ -678,7 +677,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
XMLVarFieldImportContext(rImport, rHlp, sAPI_input,
nPrfx, sLocalName,
// description
- sal_False, sal_False, sal_False,
+ sal_False, sal_False,
sal_True, sal_True, sal_True,
sal_False, sal_False,
sal_False, sal_False, sal_False,
commit 38b8c6e969242fa2541e1dc751b49c00f3f17290
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 15:31:38 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I156255a5691beedec0cd00db0c772dac8ecfa564
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index f3b115f..fed20e6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -77,11 +77,6 @@ namespace drawinglayer
short mnStyle;
- /// bitfield
- /// flags to influence inside/outside creation
- unsigned mbCreateInside : 1;
- unsigned mbCreateOutside : 1;
-
/// local helpers
double getWidth(
const geometry::ViewInformation2D& rViewInformation) const;
commit 27f4f9ae8f18b1aab931511bd8532e961318bba9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 15 15:30:18 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Ia6f5bf7c3372515c2796d239aeb610fbe6f29f8d
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index f981211..e654c53 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -148,13 +148,9 @@ SV_DECL_IMPL_REF(SbModule)
#endif
-class SbClassModuleImpl;
-
// Object class for instances of class modules
class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule
{
- SbClassModuleImpl* mpSbClassModuleImpl;
-
SbModule* mpClassModule;
bool mbInitializeEventDone;
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 5a3ecdd..7544f33 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -200,12 +200,8 @@ public:
// SbxDimArray is an array that can dimensioned using BASIC conventions.
struct SbxDim;
-class SbxDimArrayImpl;
-
class BASIC_DLLPUBLIC SbxDimArray : public SbxArray
{
- SbxDimArrayImpl* mpSbxDimArrayImpl; // Impl data
-
SbxDim* pFirst, *pLast; // Links to Dimension table
short nDim; // Number of dimensions
BASIC_DLLPRIVATE void AddDimImpl32( sal_Int32, sal_Int32, sal_Bool bAllowSize0 );
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index c85366f..50995d5 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -54,12 +54,8 @@ class SbxObject;
DBG_NAMEEX_VISIBILITY(SbxBase, BASIC_DLLPUBLIC)
-class SbxBaseImpl;
-
class BASIC_DLLPUBLIC SbxBase : virtual public SvRefBase
{
- SbxBaseImpl* mpSbxBaseImpl; // Impl data
-
virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
virtual sal_Bool StoreData( SvStream& ) const;
protected:
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 5fdc042..9666c93 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -23,12 +23,8 @@
#include <basic/sbxvar.hxx>
#include "basicdllapi.h"
-class SbxMethodImpl;
-
class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
{
- SbxMethodImpl* mpSbxMethodImpl; // Impl data
-
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
TYPEINFO();
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index c8aa3a7..161821f 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
@@ -23,12 +23,8 @@
#include <basic/sbxvar.hxx>
#include "basicdllapi.h"
-class SbxPropertyImpl;
-
class BASIC_DLLPUBLIC SbxProperty : public SbxVariable
{
- SbxPropertyImpl* mpSbxPropertyImpl; // Impl data
-
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1);
TYPEINFO();
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index eac35fb..222943f 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -281,7 +281,6 @@ class SbUnoServiceCtor : public SbxMethod
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > m_xServiceCtorDesc;
- SbUnoServiceCtor* pPrev;
SbUnoServiceCtor* pNext;
public:
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index ccaa437..8ec4614 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -302,7 +302,6 @@ sal_Bool hasUno( void )
class OslStream : public SvStream
{
osl::File maFile;
- short mnStrmMode;
public:
OslStream( const String& rName, short nStrmMode );
@@ -316,7 +315,6 @@ public:
OslStream::OslStream( const String& rName, short nStrmMode )
: maFile( rName )
- , mnStrmMode( nStrmMode )
{
sal_uInt32 nFlags;
More information about the Libreoffice-commits
mailing list