[Libreoffice-commits] .: 30 commits - accessibility/inc autodoc/inc autodoc/source avmedia/source basctl/source chart2/source connectivity/source cui/source dbaccess/source desktop/source embeddedobj/source extensions/source filter/inc filter/source lotuswordpro/source oox/inc oox/source regexp/inc reportdesign/source scp2/InstallModule_ooo.mk scp2/source sc/source sdext/source sd/source slideshow/source uui/source vbahelper/inc vbahelper/source vcl/aqua vcl/inc writerfilter/source writerperfect/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 31 00:04:46 PDT 2012
accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx | 3
autodoc/inc/ary_i/d_token.hxx | 20 -----
autodoc/source/ary/idl/i_reposypart.cxx | 9 +-
autodoc/source/ary/idl/i_reposypart.hxx | 5 -
autodoc/source/ary/inc/idl_internalgate.hxx | 11 --
autodoc/source/ary/kernel/reposy.cxx | 2
autodoc/source/display/idl/hfi_hierarchy.cxx | 2
autodoc/source/display/idl/hfi_interface.cxx | 2
autodoc/source/display/idl/hfi_method.cxx | 6 -
autodoc/source/display/idl/hfi_module.cxx | 2
autodoc/source/display/idl/hfi_navibar.hxx | 13 ---
autodoc/source/display/idl/hfi_property.cxx | 14 +--
autodoc/source/display/idl/hfi_service.cxx | 4 -
autodoc/source/display/idl/hfi_singleton.cxx | 4 -
autodoc/source/display/idl/hfi_siservice.cxx | 2
autodoc/source/display/idl/hfi_tag.cxx | 8 +-
autodoc/source/display/idl/hfi_typedef.cxx | 2
autodoc/source/display/idl/hfi_typetext.cxx | 9 --
autodoc/source/display/idl/hfi_typetext.hxx | 2
autodoc/source/display/idl/hfi_xrefpage.cxx | 4 -
autodoc/source/display/idl/hi_factory.cxx | 4 -
autodoc/source/parser_i/idl/cx_idlco.cxx | 26 +++---
autodoc/source/parser_i/idl/distrib.cxx | 1
autodoc/source/parser_i/idl/unoidl.cxx | 3
autodoc/source/parser_i/idoc/cx_dsapi.cxx | 30 +++----
autodoc/source/parser_i/inc/s2_luidl/distrib.hxx | 1
autodoc/source/parser_i/inc/tokens/stmstfi2.hxx | 5 -
autodoc/source/parser_i/tokens/stmstfi2.cxx | 7 -
avmedia/source/quicktime/player.hxx | 7 -
avmedia/source/quicktime/player.mm | 13 +--
basctl/source/inc/managelang.hxx | 1
chart2/source/controller/inc/DataPointItemConverter.hxx | 4 -
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 1
chart2/source/controller/inc/res_ErrorBar.hxx | 1
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 2
chart2/source/controller/main/ChartController_Properties.cxx | 6 -
chart2/source/model/template/AreaChartTypeTemplate.hxx | 1
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 4 -
chart2/source/view/axes/Tickmarks_Equidistant.hxx | 2
connectivity/source/drivers/hsqldb/hsqlui.src | 23 ++---
connectivity/source/drivers/mysql/YDriver.cxx | 8 +-
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 2
connectivity/source/inc/mysql/YDriver.hxx | 8 --
cui/source/dialogs/SpellDialog.cxx | 3
cui/source/dialogs/colorpicker.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 1
cui/source/dialogs/hltpbase.cxx | 5 -
cui/source/dialogs/iconcdlg.cxx | 3
cui/source/inc/SpellDialog.hxx | 1
cui/source/inc/cfg.hxx | 2
cui/source/inc/cuihyperdlg.hxx | 8 --
cui/source/inc/cuitabarea.hxx | 2
cui/source/inc/cuitabline.hxx | 1
cui/source/inc/hlmarkwn.hxx | 1
cui/source/inc/hltpbase.hxx | 5 -
cui/source/inc/iconcdlg.hxx | 1
cui/source/inc/macropg.hxx | 2
cui/source/inc/textanim.hxx | 1
cui/source/inc/transfrm.hxx | 2
cui/source/options/optgdlg.hxx | 1
cui/source/tabpages/tabline.cxx | 1
cui/source/tabpages/textanim.cxx | 1
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/api/table.cxx | 2
dbaccess/source/core/api/tablecontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2
dbaccess/source/core/dataaccess/intercept.cxx | 3
dbaccess/source/core/dataaccess/intercept.hxx | 3
dbaccess/source/core/inc/ContainerMediator.hxx | 11 --
dbaccess/source/core/misc/ContainerMediator.cxx | 3
dbaccess/source/filter/xml/xmlStyleImport.cxx | 2
dbaccess/source/filter/xml/xmlStyleImport.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 1
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/control/RelationControl.cxx | 8 --
dbaccess/source/ui/control/TableGrantCtrl.cxx | 1
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1
dbaccess/source/ui/dlg/ConnectionPage.hxx | 1
dbaccess/source/ui/dlg/admincontrols.cxx | 1
dbaccess/source/ui/dlg/advancedsettings.cxx | 1
dbaccess/source/ui/dlg/generalpage.cxx | 1
dbaccess/source/ui/dlg/generalpage.hxx | 1
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/source/ui/dlg/tablespage.hxx | 1
dbaccess/source/ui/inc/CollectionView.hxx | 1
dbaccess/source/ui/inc/FieldDescControl.hxx | 1
dbaccess/source/ui/inc/QueryDesignView.hxx | 1
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 1
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 1
dbaccess/source/ui/inc/TableWindowListBox.hxx | 1
dbaccess/source/ui/inc/WNameMatch.hxx | 2
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 1
dbaccess/source/ui/inc/brwctrlr.hxx | 1
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 1
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 1
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 1
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 1
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 1
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 8 --
embeddedobj/source/inc/oleembobj.hxx | 6 -
extensions/source/bibliography/bibcont.cxx | 6 -
extensions/source/bibliography/bibcont.hxx | 6 -
extensions/source/bibliography/bibload.cxx | 2
extensions/source/propctrlr/formcontroller.hxx | 1
extensions/source/scanner/sanedlg.hxx | 1
filter/inc/filter/msfilter/mstoolbar.hxx | 1
filter/inc/filter/msfilter/svxmsbas.hxx | 8 --
filter/source/graphicfilter/epict/epict.cxx | 4 -
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
filter/source/pdf/impdialog.hxx | 2
filter/source/pdf/pdfexport.cxx | 2
filter/source/pdf/pdfexport.hxx | 1
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 1
filter/source/xsltdialog/xmlfiltertestdialog.hxx | 2
lotuswordpro/source/filter/bento.hxx | 1
lotuswordpro/source/filter/lwpfont.hxx | 1
lotuswordpro/source/filter/lwpfoundry.hxx | 1
lotuswordpro/source/filter/lwpframelayout.hxx | 2
lotuswordpro/source/filter/lwplaypiece.hxx | 2
lotuswordpro/source/filter/lwpmarker.cxx | 1
lotuswordpro/source/filter/lwpmarker.hxx | 2
lotuswordpro/source/filter/lwpsdwfileloader.cxx | 6 -
lotuswordpro/source/filter/lwpsdwfileloader.hxx | 4 -
lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx | 4 -
lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx | 5 -
lotuswordpro/source/filter/xfilter/xfsection.hxx | 2
oox/inc/oox/dump/dumperbase.hxx | 11 --
oox/source/dump/dumperbase.cxx | 13 +--
oox/source/dump/pptxdumper.cxx | 4 -
oox/source/export/ColorPropertySet.cxx | 2
oox/source/ppt/buildlistcontext.cxx | 11 --
oox/source/ppt/buildlistcontext.hxx | 6 -
oox/source/ppt/slidetimingcontext.cxx | 4 -
regexp/inc/regexp/reclass.hxx | 4 -
reportdesign/source/filter/xml/xmlfilter.cxx | 2
sc/source/filter/excel/expop2.cxx | 4 -
scp2/InstallModule_ooo.mk | 4 -
scp2/source/ooo/file_library_ooo.scp | 39 +++++-----
sd/source/filter/eppt/eppt.cxx | 2
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 1
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 1
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 2
slideshow/source/engine/animationnodes/animationcommandnode.hxx | 1
slideshow/source/engine/slide/userpaintoverlay.cxx | 5 -
uui/source/sslwarndlg.cxx | 3
uui/source/sslwarndlg.hxx | 1
uui/source/unknownauthdlg.cxx | 3
uui/source/unknownauthdlg.hxx | 1
vbahelper/inc/vbahelper/vbashaperange.hxx | 1
vbahelper/source/msforms/vbacombobox.cxx | 2
vbahelper/source/msforms/vbacombobox.hxx | 3
vbahelper/source/msforms/vbacontrol.cxx | 2
vbahelper/source/vbahelper/vbacommandbar.cxx | 2
vbahelper/source/vbahelper/vbacommandbar.hxx | 3
vbahelper/source/vbahelper/vbacommandbars.cxx | 12 +--
vbahelper/source/vbahelper/vbashaperange.cxx | 2
vcl/aqua/source/a11y/aqua11ywrapperrow.mm | 2
vcl/aqua/source/dtrans/DragSource.cxx | 8 +-
vcl/aqua/source/dtrans/DragSourceContext.cxx | 5 -
vcl/aqua/source/dtrans/DragSourceContext.hxx | 7 -
vcl/inc/aqua/salgdicommon.hxx | 30 ++++---
writerfilter/source/ooxml/Handler.cxx | 5 -
writerfilter/source/ooxml/Handler.hxx | 3
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2
writerperfect/source/filter/ListStyle.hxx | 1
xmlsecurity/source/framework/decryptorimpl.hxx | 12 ---
xmlsecurity/source/framework/encryptorimpl.hxx | 12 ---
xmlsecurity/source/framework/signaturecreatorimpl.hxx | 11 --
xmlsecurity/source/framework/signatureverifierimpl.hxx | 11 --
174 files changed, 211 insertions(+), 537 deletions(-)
New commits:
commit 5129f99e7e4bf20e57c7741172168978355a7333
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:28:12 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: If8ed0534ba282145e66b023777820c9c09b2b496
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 2762350..6dca8cd 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -204,9 +204,8 @@ void OOXMLHeaderHandler::sprm(Sprm & /*sprm*/)
/*
class OOXMLBreakHandler
*/
-OOXMLBreakHandler::OOXMLBreakHandler(Stream &rStream,
- OOXMLFastContextHandler * pContext)
-: mpFastContext(pContext), mnType(0), mnClear(0),
+OOXMLBreakHandler::OOXMLBreakHandler(Stream &rStream)
+: mnType(0), mnClear(0),
mrStream(rStream)
{
}
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index c185d0f..23e3e9c 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -97,11 +97,10 @@ public:
class OOXMLBreakHandler : public Properties
{
- OOXMLFastContextHandler * mpFastContext;
sal_Int32 mnType, mnClear;
Stream & mrStream;
public:
- OOXMLBreakHandler(Stream & rStream, OOXMLFastContextHandler * pContext);
+ OOXMLBreakHandler(Stream & rStream);
virtual ~OOXMLBreakHandler();
virtual void attribute(Id name, Value & val);
virtual void sprm(Sprm & sprm);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index a4803a9..531b394 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1435,7 +1435,7 @@ void OOXMLFastContextHandlerProperties::handleBreak()
debug_logger->element("handleBreak");
#endif
- OOXMLBreakHandler aBreakHandler(*mpStream, this);
+ OOXMLBreakHandler aBreakHandler(*mpStream);
getPropertySet()->resolve(aBreakHandler);
}
commit 24530c684a0a5a8aca44b4869eeb141099442fdc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:27:31 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Ie83cd8392363800bcb1de641b537efdab2910ddd
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 7512d6b..8f7faf2 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -306,7 +306,6 @@ private: // Data
pCBenProperty cpProperty;
CUtOwningList cValueSegments;
pCBenValue cpReferencedList;
- unsigned long cReferencedObjectsSize;
};
class CBenProperty : public CBenIDListElmt
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 7cf5da1..5bdeb16 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -253,7 +253,6 @@ public:
private:
LwpFontNameManager m_FNMgr;
LwpFontAttrManager m_AttrMgr;
- sal_uInt32 m_nDlfTxtStyleFontID;
public:
void Read(LwpObjectStream *pStrm);
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index c16f7ab..60dea4f 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -142,7 +142,6 @@ private:
LwpObjectID m_EnumHead;
LwpObjectID m_EnumTail;
LwpObjectID m_OleObjCount;
- sal_uInt32 m_oldOleObjCount;
LwpObjectID m_GrapHead;
LwpObjectID m_GrapTail;
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index 294193f..607d5de 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -234,8 +234,6 @@ private:
sal_Int32 m_nXOffset;
sal_Int32 m_nYOffset;
LwpObjectID m_objRubyMarker;
- sal_Int32 m_nBodyX;
- sal_Int32 m_nBodyWidth;
};
#endif
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 74a2247..4abae52 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -75,8 +75,6 @@ public:
void Read(LwpObjectStream *pStrm);
private:
sal_Int16 m_nRotation; //angle
- sal_uInt16 m_nSin;
- sal_uInt16 m_nCos;
};
class LwpLayoutGeometry : public LwpVirtualPiece
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 74176b7..f3da43a 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -349,7 +349,6 @@ OUString LwpBookMark::GetName()
LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
: LwpStoryMarker(objHdr,pStrm)
- , m_nExtra(0)
, m_nFlag(0)
, m_nFieldType(0)
, m_bHasStyle(sal_False)
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 276d28f..25b540d 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -189,7 +189,6 @@ private:
BKMK_OLDNOTESFX = 0x0002
};
LwpObjectID m_objMarker;
- sal_Bool m_bHint;
sal_uInt16 m_nFlag;
};
@@ -246,7 +245,6 @@ public:
private:
LwpObjectID m_objFormulaStory;
LwpObjectID m_objResultContent;
- sal_uInt8* m_nExtra;
sal_uInt16 m_nFlag;
sal_uInt16 m_nFieldType;
LwpAtomHolder m_Formula;
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index a198762..dd828f0 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -63,10 +63,8 @@
#include "xfilter/xfframe.hxx"
-LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj,
- IXFStream* pOutputStream)
+LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj)
: m_pStream(pStream)
- , m_pOutputStream(pOutputStream)
, m_pGraphicObj(pGraphicObj)
{
pStream->Seek(0);
@@ -97,7 +95,7 @@ void LwpSdwFileLoader::CreateDrawObjects(vector <XFFrame*>* pDrawObjVector)
}
if (nVersion>=0x0102)
{
- LwpSdwGroupLoaderV0102 sdwGroupLoader(m_pStream, m_pGraphicObj, m_pOutputStream);
+ LwpSdwGroupLoaderV0102 sdwGroupLoader(m_pStream, m_pGraphicObj);
sdwGroupLoader.BeginDrawObjects(pDrawObjVector);
}
}
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
index e6da63b..a90ccc0 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
@@ -71,11 +71,9 @@ class LwpSdwFileLoader
{
private:
SvStream* m_pStream;
- IXFStream* m_pOutputStream;
LwpGraphicObject* m_pGraphicObj;
public:
- LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj,
- IXFStream* pOutputStream=NULL);
+ LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj);
~LwpSdwFileLoader(void);
public:
// void LoadObjectList(void);
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 7e912aa..571b5a3 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -78,10 +78,8 @@
#include "xfilter/xfstylemanager.hxx"
#include "xfilter/xfdrawgroup.hxx"
-LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj,
- IXFStream* pOutputStream)
+LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj)
: m_pStream(pStream)
- , m_pOutputStream(pOutputStream)
, m_pGraphicObj(pGraphicObj)
{
}
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
index 7de220b..d343f5e 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
@@ -61,7 +61,6 @@
#include <tools/stream.hxx>
#include "lwpheader.hxx"
#include "assert.h"
-#include "xfilter/ixfstream.hxx"
#include "lwpsdwdrawheader.hxx"
class XFFrame;
@@ -71,15 +70,13 @@ class LwpSdwGroupLoaderV0102
{
private:
SvStream* m_pStream;
- IXFStream* m_pOutputStream;
LwpGraphicObject* m_pGraphicObj;
std::vector <XFFrame*>* m_pDrawObjVector;
DrawingOffsetAndScale m_aTransformData;
public:
- LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj,
- IXFStream* pOutputStream);
+ LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj);
~LwpSdwGroupLoaderV0102(void);
public:
// void LoadDrawGroupObject(void);
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index a6e1a04..90bc6d4 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -88,8 +88,6 @@ private:
sal_Bool m_bProtected;
sal_Bool m_bHiden;
XFColor m_aBackColor;
- double m_fMarginLeft;
- double m_fMarginRight;
rtl::OUString m_strSourceLink;
};
commit 938fd390a96bd8cb61f67d7318ad4fe64ade1b2d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:26:49 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I8daed910fc552a973464ec6756f59910ddd5d0da
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index fc810c7..c61ea5f 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -123,12 +123,10 @@ sal_Bool BibWindowContainer::HandleShortCutKey( const KeyEvent& rKeyEvent )
}
-BibBookContainer::BibBookContainer(Window* pParent,BibDataManager* pDtMn, WinBits nStyle):
+BibBookContainer::BibBookContainer(Window* pParent, WinBits nStyle):
BibSplitWindow(pParent,nStyle),
- pDatMan(pDtMn),
pTopWin(NULL),
- pBottomWin(NULL),
- bFirstTime(sal_True)
+ pBottomWin(NULL)
{
pBibMod = OpenBibModul();
aTimer.SetTimeoutHdl(LINK( this, BibBookContainer, SplitHdl));
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 710f871..cb5bbee 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -30,8 +30,6 @@
#define TOP_WINDOW 1
#define BOTTOM_WINDOW 2
-class BibDataManager;
-
class BibWindowContainer : public BibWindow //Window
{
private:
@@ -70,10 +68,8 @@ class BibBookContainer: public BibSplitWindow
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef;
- BibDataManager* pDatMan;
BibWindowContainer* pTopWin;
BibWindowContainer* pBottomWin;
- sal_Bool bFirstTime;
HdlBibModul pBibMod;
Timer aTimer;
@@ -87,7 +83,7 @@ class BibBookContainer: public BibSplitWindow
public:
- BibBookContainer(Window* pParent,BibDataManager*, WinBits nStyle = WB_3DLOOK );
+ BibBookContainer(Window* pParent, WinBits nStyle = WB_3DLOOK );
~BibBookContainer();
inline BibWindow* GetTopWin() {return pTopWin;}
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 66ab4b4..5753a86 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -315,7 +315,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
Window* pParent = VCLUnoHelper::GetWindow( aWindow );
- BibBookContainer *pMyWindow = new BibBookContainer( pParent, m_pDatMan );
+ BibBookContainer *pMyWindow = new BibBookContainer( pParent );
pMyWindow->Show();
::bib::BibView* pView = new ::bib::BibView( pMyWindow, m_pDatMan, WB_VSCROLL | WB_HSCROLL | WB_3DLOOK );
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index f6e6c7d..3cb2f5c 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -61,7 +61,6 @@ namespace pcr
ServiceDescriptor m_aServiceDescriptor;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_xCurrentInspectee;
- bool m_bUseFormComponentHandlers;
public:
FormController(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 5e1fcc9..e1aae9e 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -53,7 +53,6 @@ private:
sal_Bool mbDragEnable;
sal_Bool mbIsDragging;
bool mbScanEnabled;
- int mnDragMode;
sal_Bool mbDragDrawn;
DragDirection meDragDirection;
commit 0afa53428e4e56a303c07d53920b731e2f18cdf0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:26:17 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I70840eba399c4b4f2b0f5330399dae6f1928c0bc
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 0450159..87c25cb 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -722,7 +722,6 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, TheExtensionManager *pManager ) :
m_bProgressChanged( false ),
m_bStartProgress( false ),
m_bStopProgress( false ),
- m_bUpdateWarning( false ),
m_bEnableWarning( false ),
m_bDisableWarning( false ),
m_bDeleteWarning( false ),
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index a06b75e..0aecee3 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -130,7 +130,6 @@ class ExtMgrDialog : public ModelessDialog,
bool m_bProgressChanged;
bool m_bStartProgress;
bool m_bStopProgress;
- bool m_bUpdateWarning;
bool m_bEnableWarning;
bool m_bDisableWarning;
bool m_bDeleteWarning;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 03bf3cb..29511d2 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -173,7 +173,6 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
m_bHasScrollBar( false ),
m_bHasActive( false ),
m_bNeedsRecalc( true ),
- m_bHasNew( false ),
m_bInCheckMode( false ),
m_bAdjustActive( false ),
m_bInDelete( false ),
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 9dbbb7d..0a6eca2 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -125,7 +125,6 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
bool m_bHasScrollBar;
bool m_bHasActive;
bool m_bNeedsRecalc;
- bool m_bHasNew;
bool m_bInCheckMode;
bool m_bAdjustActive;
bool m_bInDelete;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8023678..c525fde 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -135,14 +135,12 @@ class UpdateCommandEnv
{
friend class UpdateInstallDialog::Thread;
- UpdateInstallDialog & m_updateDialog;
::rtl::Reference<UpdateInstallDialog::Thread> m_installThread;
cssu::Reference< cssu::XComponentContext > m_xContext;
public:
virtual ~UpdateCommandEnv();
UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
- UpdateInstallDialog & updateDialog,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread);
// XCommandEnvironment
@@ -173,7 +171,7 @@ UpdateInstallDialog::Thread::Thread(
m_dialog(dialog),
m_xComponentContext(xCtx),
m_aVecUpdateData(aVecUpdateData),
- m_updateCmdEnv(new UpdateCommandEnv(xCtx, m_dialog, this)),
+ m_updateCmdEnv(new UpdateCommandEnv(xCtx, this)),
m_stop(false)
{}
@@ -638,10 +636,8 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
// -------------------------------------------------------------------------------------------------------
UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
- UpdateInstallDialog & updateDialog,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread)
- : m_updateDialog( updateDialog ),
- m_installThread(thread),
+ : m_installThread(thread),
m_xContext(xCtx)
{
}
commit 4a69252e2c757dbc94cca213cf1fc1baca84b081
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:25:58 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I55ad905bef36b54fadc245bfb22f687e47d20c3a
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 1b24b96..c7a9a12 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -608,7 +608,7 @@ void ODBTableDecorator::refreshColumns()
m_xMetaData.is() && m_xMetaData->supportsAlterTableWithDropColumn());
pCol->setParent(*this);
- OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection, OContainerMediator::eColumns );
+ OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection );
m_xColumnMediator = pMediator;
pCol->setMediator( pMediator );
m_pColumns = pCol;
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 85c7e34..8ace09d 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -133,7 +133,7 @@ void OQuery::rebuildColumns()
{
xColumnDefinitions = xColSup->getColumns();
if ( xColumnDefinitions.is() )
- m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions, m_xConnection, OContainerMediator::eColumns );
+ m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions, m_xConnection );
}
// fill the columns with columns from the statement
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 080c7d2..818a388 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -382,7 +382,7 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithDropColumn()));
static_cast<OColumnsHelper*>(pCol)->setParent(this);
pCol->setParent(*this);
- m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions, getConnection(), OContainerMediator::eColumns );
+ m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions, getConnection() );
pCol->setMediator( m_pColumnMediator.get() );
return pCol;
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index ccda2be..2a33459 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -240,7 +240,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
if ( !m_pTableMediator.is() )
m_pTableMediator = new OContainerMediator(
- this, m_xTableDefinitions.get(), m_xConnection, OContainerMediator::eTables );
+ this, m_xTableDefinitions.get(), m_xConnection );
if ( m_pTableMediator.is() )
m_pTableMediator->notifyElementCreated(_rName,xDest);
}
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index ce48601..1f39d32 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1543,7 +1543,7 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC
m_pInterceptor = NULL;
}
- m_pInterceptor = new OInterceptor( this ,_bReadOnly);
+ m_pInterceptor = new OInterceptor( this );
m_pInterceptor->acquire();
Reference<XDispatchProviderInterceptor> xInterceptor = m_pInterceptor;
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 93e93b0..9a29502 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -76,12 +76,11 @@ void SAL_CALL OInterceptor::dispose()
DBG_NAME(OInterceptor)
-OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllowEditDoc )
+OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder )
:m_pContentHolder( _pContentHolder )
,m_aInterceptedURL(7)
,m_pDisposeEventListeners(0)
,m_pStatCL(0)
- ,m_bAllowEditDoc(_bAllowEditDoc)
{
DBG_CTOR(OInterceptor,NULL);
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index ff198e4..6229d55 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -44,7 +44,7 @@ protected:
virtual ~OInterceptor();
public:
- OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllowEditDoc );
+ OInterceptor( ODocumentDefinition* _pContentHolder );
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
@@ -150,7 +150,6 @@ private:
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
PropertyChangeListenerContainer* m_pStatCL;
- sal_Bool m_bAllowEditDoc;
};
} // namespace dbaccess
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 4bc1779..4d0eeeb 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -39,13 +39,6 @@ namespace dbaccess
class OContainerMediator : public ::comphelper::OBaseMutex
,public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener >
{
- public:
- enum ContainerType
- {
- eColumns,
- eTables
- };
-
private:
typedef ::rtl::Reference< OPropertyForward > TPropertyForward;
typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList;
@@ -53,7 +46,6 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak
::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection;
- ContainerType m_eType;
protected:
virtual ~OContainerMediator();
@@ -62,8 +54,7 @@ namespace dbaccess
OContainerMediator(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xSettings,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- ContainerType _eType
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
);
virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index f85a41c..bd153d5 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -44,11 +44,10 @@ namespace dbaccess
DBG_NAME(OContainerMediator)
OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContainer, const Reference< XNameAccess >& _xSettings,
- const Reference< XConnection >& _rxConnection, ContainerType _eType )
+ const Reference< XConnection >& _rxConnection )
: m_xSettings( _xSettings )
, m_xContainer( _xContainer )
, m_aConnection( _rxConnection )
- , m_eType( _eType )
{
DBG_CTOR(OContainerMediator,NULL);
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 6b67e32..e1b0177 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -67,8 +67,6 @@ OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
,sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")))
,pStyles(&rStyles)
,m_nNumberFormat(-1)
- ,bConditionalFormatCreated(sal_False)
- ,bParentSet(sal_False)
{
DBG_CTOR(OTableStyleContext,NULL);
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index f682131..46a7f83 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -44,8 +44,6 @@ namespace dbaxml
SvXMLStylesContext* pStyles;
com::sun::star::uno::Any aConditionalFormat;
sal_Int32 m_nNumberFormat;
- sal_Bool bConditionalFormatCreated : 1;
- sal_Bool bParentSet : 1;
ODBFilter& GetOwnImport();
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index a2931e7..a3c21e9 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -619,7 +619,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
,m_nPendingLoadFinished(0)
,m_nFormActionNestingLevel(0)
,m_bLoadCanceled( sal_False )
- ,m_bClosingKillOpen( sal_False )
,m_bCannotSelectUnfiltered( true )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen at sun.com", "SbaXDataBrowserController::SbaXDataBrowserController" );
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index b142314..2f9aa0d 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -140,7 +140,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTab
,m_pVertScroll( NULL )
,m_pHorzScroll( NULL )
,m_pPreviousType()
- ,nCurChildId(1)
,m_nPos(-1)
,aYes(ModuleRes(STR_VALUE_YES))
,aNo(ModuleRes(STR_VALUE_NO))
@@ -189,7 +188,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHel
,m_pVertScroll( NULL )
,m_pHorzScroll( NULL )
,m_pPreviousType()
- ,nCurChildId(1)
,m_nPos(-1)
,aYes(ModuleRes(STR_VALUE_YES))
,aNo(ModuleRes(STR_VALUE_NO))
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 4c0c71c..47c0155 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -56,7 +56,6 @@ namespace dbaui
::std::auto_ptr< ::svt::ListBoxControl> m_pListCell;
TTableConnectionData::value_type m_pConnData;
- const OJoinTableView::OTableWindowMap* m_pTableMap;
OTableListBoxControl* m_pBoxControl;
long m_nDataPos;
Reference< XPropertySet> m_xSourceDef;
@@ -72,7 +71,7 @@ namespace dbaui
*/
sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const;
public:
- ORelationControl( OTableListBoxControl* pParent,const OJoinTableView::OTableWindowMap* _pTableMap );
+ ORelationControl( OTableListBoxControl* pParent );
virtual ~ORelationControl();
/** searches for a connection between these two tables
@@ -121,9 +120,8 @@ namespace dbaui
//========================================================================
DBG_NAME(ORelationControl)
//------------------------------------------------------------------------
- ORelationControl::ORelationControl( OTableListBoxControl* pParent ,const OJoinTableView::OTableWindowMap* _pTableMap)
+ ORelationControl::ORelationControl( OTableListBoxControl* pParent )
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
- ,m_pTableMap(_pTableMap)
,m_pBoxControl(pParent)
,m_xSourceDef( NULL )
,m_xDestDef( NULL )
@@ -459,7 +457,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
, m_pTableMap(_pTableMap)
, m_pParentDialog(_pParentDialog)
{
- m_pRC_Tables = new ORelationControl( this,m_pTableMap );
+ m_pRC_Tables = new ORelationControl( this );
m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS);
m_pRC_Tables->Init( );
m_pRC_Tables->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND);
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 6e548bb..fb1eacb 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -54,7 +54,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
,m_pCheckCell( NULL )
,m_pEdit( NULL )
,m_nDataPos( 0 )
- ,m_bEnable(sal_True)
,m_nDeactivateEvent(0)
{
DBG_CTOR(OTableGrantControl,NULL);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 3f14457..50e26bf 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -93,7 +93,6 @@ namespace dbaui
DBG_NAME(OConnectionTabPage)
OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
- ,m_bUserGrabFocus(sal_True)
,m_aFL1(this, ModuleRes(FL_SEPARATOR1))
,m_aFL2(this, ModuleRes(FL_SEPARATOR2))
,m_aUserNameLabel(this, ModuleRes(FT_USERNAME))
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 367741b..b5d4ead 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -38,7 +38,6 @@ namespace dbaui
*/
class OConnectionTabPage : public OConnectionHelper
{
- sal_Bool m_bUserGrabFocus : 1;
protected:
// connection
FixedLine m_aFL1;
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 3f859db..097cde2 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -69,7 +69,6 @@ namespace dbaui
private:
const String m_sDisabledText;
String m_sUserText;
- sal_Bool m_bLastKnownEnabledState;
};
//--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 6ae17f4..f15fd25 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -453,7 +453,6 @@ namespace dbaui
AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems,
const Reference< XMultiServiceFactory >& _rxORB, const Any& _aDataSourceName )
:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems)
- ,m_pItemSet(_pItems)
{
m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 34939b9..f637155 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -82,7 +82,6 @@ namespace dbaui
,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN)
,m_eLastMessage (smNone)
,m_bDisplayingInvalid (sal_False)
- ,m_bUserGrabFocus (sal_True)
,m_bInitTypeList (true)
{
// fill the listbox with the UI descriptions for the possible types
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 3874f7b..5370884 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -100,7 +100,6 @@ namespace dbaui
Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen
sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted
- sal_Bool m_bUserGrabFocus : 1;
bool m_bInitTypeList : 1;
bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName );
void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName);
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index f57e0ec..19eba7d 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -79,7 +79,6 @@ DBG_NAME(OTableSubscriptionPage)
,m_aTables (this, ModuleRes(FL_SEPARATOR1))
,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True)
,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION))
- ,m_bCheckedAll ( sal_False )
,m_bCatalogAtStart ( sal_True )
,m_pTablesDlg(_pTablesDlg)
{
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 45297b9..02c9aa4 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -47,7 +47,6 @@ namespace dbaui
FixedText m_aExplanation;
::rtl::OUString m_sCatalogSeparator;
- sal_Bool m_bCheckedAll : 1;
sal_Bool m_bCatalogAtStart : 1;
::osl::Mutex m_aNotifierMutex;
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 18a36b9..28f9bc1 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -50,7 +50,6 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
Size m_aDlgSize;
Size m_a6Size;
- sal_Int32 m_nFixDeltaHeight;
sal_Bool m_bCreateForm;
DECL_LINK(Up_Click,void*);
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index a43f0cc..715160b 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -101,7 +101,6 @@ namespace dbaui
ScrollBar* m_pHorzScroll;
TOTypeInfoSP m_pPreviousType;
- sal_uInt16 nCurChildId;
short m_nPos;
XubString aYes;
XubString aNo;
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index cab96e7..07a55ce 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -72,7 +72,6 @@ namespace dbaui
OSelectionBrowseBox* m_pSelectionBox; // presents the lower window
ChildFocusState m_eChildFocus;
- sal_Bool m_bInKeyEvent;
sal_Bool m_bInSplitHandler;
public:
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 6b02354..2d1865d 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -35,7 +35,6 @@ namespace dbaui
private:
String m_sHelpText;
MultiLineEdit* m_pTextWin;
- sal_uInt16 m_nDummy;
protected:
virtual void Resize();
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 4c4bb84..e95bc49 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -53,7 +53,6 @@ class OTableGrantControl : public ::svt::EditBrowseBox
::svt::CheckBoxControl* m_pCheckCell;
Edit* m_pEdit;
long m_nDataPos;
- sal_Bool m_bEnable;
sal_uLong m_nDeactivateEvent;
public:
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 2537ac9..1bec975 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -62,7 +62,6 @@ namespace dbaui
OJoinDropData m_aDropInfo;
sal_Bool m_bReallyScrolled : 1;
- sal_Bool m_bDragSource : 1;
protected:
virtual void LoseFocus();
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index c8b7a93..ba5cb51 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -67,8 +67,6 @@ namespace dbaui
String m_sSourceText;
String m_sDestText;
- sal_Bool m_bAttrsChanged;
-
DECL_LINK( ButtonClickHdl, Button * );
DECL_LINK( RightButtonClickHdl, Button * );
DECL_LINK( AllNoneClickHdl, Button * );
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 529eaad..ea0c311 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -44,7 +44,6 @@ namespace dbaui
{
OModuleClient m_aModuleClient;
::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
- SfxItemSet* m_pItemSet;
protected:
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 284a97a..27df5e6 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -115,7 +115,6 @@ namespace dbaui
sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction
sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow
- sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ?
bool m_bCannotSelectUnfiltered : 1; // recieved an DATA_CANNOT_SELECT_UNFILTERED error
protected:
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 0e9d406..ebddbfc 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2507,7 +2507,6 @@ OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
:OQueryView( _pParent, _rController, _rFactory )
,m_aSplitter( this )
,m_eChildFocus(NONE)
- ,m_bInKeyEvent(sal_False)
,m_bInSplitHandler( sal_False )
{
DBG_CTOR(OQueryDesignView,NULL);
commit 56d7b9db443f5ace23677629869ffbd599e43d69
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:23:36 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I3bb7559101c27eacefbf43f751f96135f8792845
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 2cf2722..c1c381f 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -119,7 +119,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
(void)anImage;
(void)aPoint;
DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
+ new DragSourceContext,
mDragSource,
DNDConstants::ACTION_COPY,
DNDConstants::ACTION_COPY);
@@ -139,7 +139,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
bDropSuccess = DragSource::g_DropSuccess;
DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
+ new DragSourceContext,
static_cast< XDragSource* >(mDragSource),
SystemToOfficeDragActions(operation),
bDropSuccess );
@@ -154,7 +154,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
(void)draggedImage;
(void)screenPoint;
DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
+ new DragSourceContext,
mDragSource,
DNDConstants::ACTION_COPY,
DNDConstants::ACTION_COPY);
@@ -263,7 +263,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
trigger.Event >>= mMouseEvent;
m_MouseButton= mMouseEvent.Buttons;
mXDragSrcListener = listener;
- mXCurrentContext = static_cast<XDragSourceContext*>(new DragSourceContext(this));
+ mXCurrentContext = static_cast<XDragSourceContext*>(new DragSourceContext);
auto_ptr<AquaClipboard> clipb(new AquaClipboard(NULL, false));
g_XTransferable = transferable;
clipb->setContents(g_XTransferable, uno::Reference<XClipboardOwner>());
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx
index 82d161f..b5689c1 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.cxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.cxx
@@ -28,9 +28,8 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants;
using namespace com::sun::star::uno;
using namespace cppu;
-DragSourceContext::DragSourceContext( DragSource* pSource) :
- WeakComponentImplHelper1<XDragSourceContext>(m_aMutex),
- m_pDragSource( pSource)
+DragSourceContext::DragSourceContext() :
+ WeakComponentImplHelper1<XDragSourceContext>(m_aMutex)
{
}
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 99f0a62..100edef 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -27,8 +27,6 @@
#include <boost/utility.hpp>
-#include "DragSource.hxx"
-
// This class fires events to XDragSourceListener implementations.
// Of that interface only dragDropEnd and dropActionChanged are called.
// The functions dragEnter, dragExit and dragOver are not supported
@@ -40,7 +38,7 @@ class DragSourceContext: public cppu::BaseMutex,
private ::boost::noncopyable
{
public:
- DragSourceContext(DragSource* pSource);
+ DragSourceContext();
~DragSourceContext();
virtual sal_Int32 SAL_CALL getCurrentCursor( )
@@ -54,9 +52,6 @@ public:
virtual void SAL_CALL transferablesFlavorsChanged( )
throw( com::sun::star::uno::RuntimeException);
-
-private:
- DragSource* m_pDragSource;
};
diff --git a/vcl/inc/aqua/salgdicommon.hxx b/vcl/inc/aqua/salgdicommon.hxx
index 21307ee..6d674fd 100644
--- a/vcl/inc/aqua/salgdicommon.hxx
+++ b/vcl/inc/aqua/salgdicommon.hxx
@@ -9,26 +9,28 @@ class RGBAColor
public:
RGBAColor( SalColor );
RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha ); //NOTUSEDYET
- const float* AsArray() const { return &m_fRed; }
- bool IsVisible() const { return m_fAlpha > 0; }
- void SetAlpha( float fAlpha ) { m_fAlpha = fAlpha; }
+ const float* AsArray() const { return m_fRGBA; }
+ bool IsVisible() const { return m_fRGBA[3] > 0; }
+ void SetAlpha( float fAlpha ) { m_fRGBA[3] = fAlpha; }
private:
- float m_fRed, m_fGreen, m_fBlue, m_fAlpha;
+ float m_fRGBA[4]; // red, green, blue, alpha
};
inline RGBAColor::RGBAColor( SalColor nSalColor )
-: m_fRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-, m_fGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-, m_fBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-, m_fAlpha( 1.0 ) // opaque
-{}
+{
+ m_fRGBA[0] = SALCOLOR_RED(nSalColor) * (1.0/255);
+ m_fRGBA[1] = SALCOLOR_GREEN(nSalColor) * (1.0/255);
+ m_fRGBA[2] = SALCOLOR_BLUE(nSalColor) * (1.0/255);
+ m_fRGBA[3] = 1.0; // opaque
+}
inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha )
-: m_fRed( fRed )
-, m_fGreen( fGreen )
-, m_fBlue( fBlue )
-, m_fAlpha( fAlpha )
-{}
+{
+ m_fRGBA[0] = fRed;
+ m_fRGBA[1] = fGreen;
+ m_fRGBA[2] = fBlue;
+ m_fRGBA[3] = fAlpha;
+}
class XorEmulation
{
commit 146a4ec3bdedede32fcc3a9b2039351dfe44b5db
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:23:02 2012 +0200
-Werror,-Wnon-literal-null-conversion (Clang towards 3.2)
Change-Id: I530d742dce07f7f8521419a8fd3d736a3ca4ea53
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
index 446d658..d62b3ed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
@@ -28,7 +28,7 @@
@implementation AquaA11yWrapperRow : AquaA11yWrapper
-(id)disclosingAttribute {
- return NO; // TODO
+ return NULL; // TODO
}
-(NSArray *)accessibilityAttributeNames {
commit 65f2d5c9f7aab607e83a4876bca70c330850d345
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:21:46 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Idea1fd2769c2431906d4898c0ec935f20bddc391
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index ec64dd7..8949fc5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -30,7 +30,6 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/util/DateTime.hpp>
-#include <comphelper/mediadescriptor.hxx>
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/helper.hxx"
#include "oox/helper/storagebase.hxx"
@@ -829,8 +828,7 @@ public:
const ::rtl::OUString& rFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName,
- ::comphelper::MediaDescriptor& rMediaDesc );
+ const ::rtl::OUString& rSysFileName );
virtual ~SharedConfigData();
@@ -871,7 +869,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
StorageRef mxRootStrg;
::rtl::OUString maSysFileName;
- ::comphelper::MediaDescriptor& mrMediaDesc;
ConfigFileSet maConfigFiles;
ConfigDataMap maConfigData;
NameListMap maNameLists;
@@ -915,8 +912,7 @@ public:
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName,
- ::comphelper::MediaDescriptor& rMediaDesc );
+ const ::rtl::OUString& rSysFileName );
virtual ~Config();
@@ -956,8 +952,7 @@ protected:
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName,
- ::comphelper::MediaDescriptor& rMediaDesc );
+ const ::rtl::OUString& rSysFileName );
virtual bool implIsValid() const;
virtual const ::rtl::OUString* implGetOption( const ::rtl::OUString& rKey ) const;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 0e48615..31b1a2f 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1303,11 +1303,10 @@ NameListRef NameListWrapper::getNameList( const Config& rCfg ) const
SharedConfigData::SharedConfigData( const OUString& rFileName,
const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg,
- const OUString& rSysFileName, MediaDescriptor& rMediaDesc ) :
+ const OUString& rSysFileName ) :
mxContext( rxContext ),
mxRootStrg( rxRootStrg ),
maSysFileName( rSysFileName ),
- mrMediaDesc( rMediaDesc ),
mbLoaded( false ),
mbPwCancelled( false )
{
@@ -1454,9 +1453,9 @@ Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
construct( pcEnvVar, rFilter );
}
-Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
{
- construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName, rMediaDesc );
+ construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName );
}
Config::~Config()
@@ -1471,14 +1470,14 @@ void Config::construct( const Config& rParent )
void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
{
if( !rFilter.getFileUrl().isEmpty() )
- construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl(), rFilter.getMediaDescriptor() );
+ construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl() );
}
-void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
{
if( pcEnvVar && rxRootStrg.get() && !rSysFileName.isEmpty() )
if( const sal_Char* pcFileName = ::getenv( pcEnvVar ) )
- mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) );
+ mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName ) );
}
const OUString& Config::getStringOption( const String& rKey, const OUString& rDefault ) const
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index b87ba61..2a51ba4 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::io;
//using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-using ::comphelper::MediaDescriptor;
using ::oox::core::FilterBase;
using ::rtl::OUString;
@@ -122,8 +121,7 @@ Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference
if( rxContext.is() && rxInStrm.is() )
{
StorageRef xStrg( new ZipStorage( rxContext, rxInStrm ) );
- MediaDescriptor aMediaDesc;
- ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
+ ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName ) );
DumperBase::construct( xCfg );
}
}
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index d42b07b..8475cf0 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -47,13 +47,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/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx
index aec83fe..fe85162 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -21,19 +21,10 @@
#include <rtl/ustring.hxx>
#include "oox/helper/attributelist.hxx"
-
-using namespace ::oox::core;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
-
namespace oox { namespace ppt {
- BuildListContext::BuildListContext( FragmentHandler2& rParent,
- const Reference< XFastAttributeList >& /*xAttribs*/,
- TimeNodePtrList & aTimeNodeList)
+ BuildListContext::BuildListContext( FragmentHandler2& rParent )
: FragmentHandler2( rParent )
- , maTimeNodeList( aTimeNodeList )
, mbInBldGraphic( false )
, mbBuildAsOne( false )
{
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 1cf97b0..8ad7156 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -22,7 +22,6 @@
#ifndef OOX_PPT_BUILDLISTCONTEXT
#define OOX_PPT_BUILDLISTCONTEXT
-#include "oox/ppt/timenode.hxx"
#include "oox/core/fragmenthandler2.hxx"
namespace oox { namespace ppt {
@@ -33,9 +32,7 @@ namespace oox { namespace ppt {
: public ::oox::core::FragmentHandler2
{
public:
- BuildListContext( ::oox::core::FragmentHandler2& rParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
- TimeNodePtrList & aTimeNodeList);
+ BuildListContext( ::oox::core::FragmentHandler2& rParent );
~BuildListContext( );
@@ -43,7 +40,6 @@ namespace oox { namespace ppt {
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
private:
- TimeNodePtrList & maTimeNodeList;
bool mbInBldGraphic;
bool mbBuildAsOne;
};
diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx
index ae709c4..2bcdc75 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -51,12 +51,12 @@ SlideTimingContext::~SlideTimingContext() throw()
}
-::oox::core::ContextHandlerRef SlideTimingContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
+::oox::core::ContextHandlerRef SlideTimingContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& )
{
switch( aElementToken )
{
case PPT_TOKEN( bldLst ):
- return new BuildListContext( *this, rAttribs.getFastAttributeList(), maTimeNodeList );
+ return new BuildListContext( *this );
case PPT_TOKEN( extLst ):
return this;
case PPT_TOKEN( tnLst ):
commit 0a7000e032a43e56e75c8e8066117683866fdc36
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:17:00 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Id2034a3ec40e1cfcd21f60e19f4faa99bb1f6164
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index 4137605..a1ae507 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -177,7 +177,6 @@ class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase
friend class TBCBSpecific; // #FIXME hacky access, need to fix
sal_Int32 cbDIB;
Bitmap mBitMap;
- int size;
public:
TBCBitMap();
~TBCBitMap();
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 84bab35..352d3ea 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -60,10 +60,8 @@ typedef std::map< String, ObjIdToName > ControlAttributeInfo;
class MSFILTER_DLLPUBLIC SvxImportMSVBasic
{
public:
- SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot,
- sal_Bool bImportCode = sal_True, sal_Bool bCopyStorage = sal_True )
- : xRoot(&rRoot), rDocSh(rDocS),
- bImport(bImportCode), bCopy(bCopyStorage)
+ SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot )
+ : xRoot(&rRoot), rDocSh(rDocS)
{}
// only for the export - copy or delete the saved VBA-macro-storage
// form the ObjectShell
@@ -79,8 +77,6 @@ public:
private:
SotStorageRef xRoot;
SfxObjectShell &rDocSh;
- sal_Bool bImport;
- sal_Bool bCopy;
};
#endif
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 3efdacc..bf337c3 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -93,13 +93,13 @@ private:
PictWriterAttrStackMember * pAttrStack;
// current attributes in the target-metafile and whether they are valid
- sal_Bool bDstBkPatVisible; sal_Bool bDstBkPatValid;
+ sal_Bool bDstBkPatValid;
sal_uInt8 nDstTxFace; sal_Bool bDstTxFaceValid;
RasterOp eDstTxMode; sal_Bool bDstTxModeValid;
sal_uInt16 nDstPnSize; sal_Bool bDstPnSizeValid;
RasterOp eDstPnMode; sal_Bool bDstPnModeValid;
PictPattern aDstPnPat; sal_Bool bDstPnPatValid;
- sal_Bool bDstFillPatVisible; sal_Bool bDstFillPatValid;
+ sal_Bool bDstFillPatValid;
sal_uInt16 nDstTxSize; sal_Bool bDstTxSizeValid;
Color aDstFgCol; sal_Bool bDstFgColValid;
Color aDstBkCol; sal_Bool bDstBkColValid;
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index cbd7d5a..ae48fd6 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -713,7 +713,7 @@ void TBCCDData::Print( FILE* fp)
indent_printf(fp," wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
}
-TBCBitMap::TBCBitMap() : cbDIB( 0 ), size( 0 )
+TBCBitMap::TBCBitMap() : cbDIB( 0 )
{
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2331468..ff3d690 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2006,7 +2006,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
}
if ( i && bCopied )
{
- SvxImportMSVBasic aMSVBas( *pShell, *xDest, sal_True, sal_False );
+ SvxImportMSVBasic aMSVBas( *pShell, *xDest );
uno::Reference < embed::XStorage > xDoc( pShell->GetStorage() );
if ( xDoc.is() )
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 0a42cc9..2d8f7ec 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -419,8 +419,6 @@ class ImpPDFTabLinksPage : public SfxTabPage
RadioButton maRbOpnLnksBrowser;
sal_Bool mbOpnLnksBrowserUserState;
- long nWidth;
-
DECL_LINK( ClickRbOpnLnksDefaultHdl, void* );
DECL_LINK( ClickRbOpnLnksBrowserHdl, void* );
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e85afde..58e026f 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -148,8 +148,6 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
mbCanCopyOrExtract ( sal_True ),
mbCanExtractForAccessibility( sal_True ),
- mnCachePatternId ( -1 ),
-
//--->i56629
mbExportRelativeFsysLinks ( sal_False ),
mnDefaultLinkAction ( 0 ),
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 4c884ee..b52de4c 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -102,7 +102,6 @@ private:
sal_Bool mbCanExtractForAccessibility;
SvtGraphicFill maCacheFill;
- sal_Int32 mnCachePatternId;
//--->i56629
sal_Bool mbExportRelativeFsysLinks;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index a42a218..c0e6b47 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -146,7 +146,6 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF ) :
ModalDialog( pParent, ResId( DLG_XML_FILTER_TEST_DIALOG, rResMgr ) ),
mxMSF( rxMSF ),
- mrResMgr( rResMgr ),
maFLExport( this, ResId( FL_EXPORT, rResMgr ) ),
maFTExportXSLT( this, ResId( FT_EXPORT_XSLT, rResMgr ) ),
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index a374ea1..ef60d6d 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -69,8 +69,6 @@ private:
com::sun::star::uno::Reference< com::sun::star::document::XEventListener > mxGlobalEventListener;
com::sun::star::uno::WeakReference< com::sun::star::lang::XComponent > mxLastFocusModel;
- ResMgr& mrResMgr;
-
rtl::OUString maImportRecentFile;
rtl::OUString maExportRecentFile;
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 2cea936..f380878 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -77,18 +77,16 @@ FltError ExportBiff5::Write()
SotStorageRef xRootStrg = GetRootStorage();
OSL_ENSURE( xRootStrg.Is(), "ExportBiff5::Write - no root storage" );
- bool bWriteBasicCode = false;
bool bWriteBasicStrg = false;
if( GetBiff() == EXC_BIFF8 )
{
const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
- bWriteBasicCode = rFilterOpt.IsLoadExcelBasicCode();
bWriteBasicStrg = rFilterOpt.IsLoadExcelBasicStorage();
}
if( pDocShell && xRootStrg.Is() && bWriteBasicStrg )
{
- SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg, bWriteBasicCode, bWriteBasicStrg );
+ SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg );
sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT );
if( nErr != ERRCODE_NONE )
pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 65d3ff3..de9a179 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1499,7 +1499,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( const std::v
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
- SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False );
+ SvxImportMSVBasic aMSVBas( rDocShell, *xDest );
aMSVBas.SaveOrDelMSVBAStorage( sal_True, rtl::OUString( "_MS_VBA_Overhead" ) );
SvStorageRef xOverhead = xDest->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") );
commit b0772418bc2992d213e08ca181e147ed707999e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:16:04 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I2342c6fa614ffbd805c3606de20e080e677fce28
diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx
index 9220e17..f31c9e2 100644
--- a/vbahelper/inc/vbahelper/vbashaperange.hxx
+++ b/vbahelper/inc/vbahelper/vbashaperange.hxx
@@ -33,7 +33,6 @@ class VBAHELPER_DLLPUBLIC ScVbaShapeRange : public ScVbaShapeRange_BASE
private:
css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
css::uno::Reference< css::drawing::XShapes > m_xShapes;
- sal_Int32 m_nShapeGroupCount;
protected:
css::uno::Reference< css::frame::XModel > m_xModel;
virtual rtl::OUString getServiceImplName();
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index 015cad9..240260d 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -41,7 +41,7 @@ const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
-ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
+ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
{
mpListHelper.reset( new ListControlHelper( m_xProps ) );
try
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 3755872..689f895 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -37,10 +37,9 @@ class ScVbaComboBox : public ComboBoxImpl_BASE
std::auto_ptr< ListControlHelper > mpListHelper;
rtl::OUString sSourceName;
rtl::OUString msDftPropName;
- bool mbDialogType;
public:
- ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
+ ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
// Attributes
virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 6b1b5bb..1bd6258 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -621,7 +621,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
xVBAControl.set( new ScVbaButton( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
}
else if ( xServiceInfo->supportsService( rtl::OUString( "com.sun.star.awt.UnoControlComboBoxModel" ) ) )
- xVBAControl.set( new ScVbaComboBox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release(), true ) );
+ xVBAControl.set( new ScVbaComboBox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
else if ( xServiceInfo->supportsService( rtl::OUString( "com.sun.star.awt.UnoControlListBoxModel" ) ) )
xVBAControl.set( new ScVbaListBox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
else if ( xServiceInfo->supportsService( rtl::OUString( "com.sun.star.awt.UnoControlFixedTextModel" ) ) )
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 7a641eb..bd9482c 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -29,7 +29,7 @@
using namespace com::sun::star;
using namespace ooo::vba;
-ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu ), m_bTemporary( bTemporary )
+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu )
{
}
diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx
index 96ad928..d539bf0 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
@@ -39,10 +39,9 @@ private:
css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
rtl::OUString m_sResourceUrl;
sal_Bool m_bIsMenu;
- sal_Bool m_bTemporary;
public:
- ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary = sal_True ) throw( css::uno::RuntimeException );
+ ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu ) throw( css::uno::RuntimeException );
sal_Bool IsMenu() const { return m_bIsMenu; }
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index 051b5aa..72c60a0 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -62,7 +62,7 @@ public:
if( sResourceUrl.indexOf( "private:resource/toolbar/" ) != -1 )
{
uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl );
- uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) );
+ uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False ) );
}
else
return nextElement();
@@ -144,7 +144,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
if( !sResourceUrl.isEmpty() )
{
xBarSettings = m_pCBarHelper->getSettings( sResourceUrl );
- aRet <<= uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, bMenu, sal_False ) );
+ aRet <<= uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, bMenu ) );
}
if( !aRet.hasValue() )
@@ -155,7 +155,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
// XCommandBars
uno::Reference< XCommandBar > SAL_CALL
-ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& /*Temporary*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
// FIXME: only support to add Toolbar
// Position - MsoBar MenuBar - sal_Bool
@@ -176,13 +176,9 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio
sName = rtl::OUString( "Custom1" );
}
- sal_Bool bTemporary = sal_False;
- if( Temporary.hasValue() )
- Temporary >>= bTemporary;
-
sResourceUrl = VbaCommandBarHelper::generateCustomURL();
uno::Reference< container::XIndexAccess > xBarSettings( m_pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW );
- uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) );
+ uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, sal_False ) );
xCBar->setName( sName );
return xCBar;
}
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index 264b85b..fb2ca53 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -47,7 +47,7 @@ public:
};
-ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< frame::XModel >& xModel ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0), m_xModel( xModel )
+ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< frame::XModel >& xModel ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_xModel( xModel )
{
}
commit 07f44bfd39774910fd417f48bbc9bb76f2b34921
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:13:30 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I885db00df96c73c35f9c1a6add8caf6b93f7c01a
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 909f794..3ebb6e6 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -233,8 +233,6 @@ private:
bool mbRestoreSync;
bool mbUseLeavingPixmap;
bool mbUseEnteringPixmap;
- bool mbFreeLeavingPixmap;
- bool mbFreeEnteringPixmap;
// unx::Pixmap maLeavingPixmap;
// unx::Pixmap maEnteringPixmap;
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index c4cf3d6..92eb86a 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -52,7 +52,6 @@ private:
ExternalMediaShapeSharedPtr mpShape;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XCommand > mxCommandNode;
- bool mbIsPaused;
};
} // namespace internal
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index aae100f..dd85891 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -31,7 +31,6 @@
#include <cppcanvas/basegfxfactory.hxx>
#include "activity.hxx"
-#include "activitiesqueue.hxx"
#include "slideshowcontext.hxx"
#include "userpaintoverlay.hxx"
#include "mouseeventhandler.hxx"
@@ -57,13 +56,11 @@ namespace slideshow
public:
PaintOverlayHandler( const RGBColor& rStrokeColor,
double nStrokeWidth,
- ActivitiesQueue& rActivitiesQueue,
ScreenUpdater& rScreenUpdater,
const UnoViewContainer& rViews,
Slide& rSlide,
const PolyPolygonVector& rPolygons,
bool bActive ) :
- mrActivitiesQueue( rActivitiesQueue ),
mrScreenUpdater( rScreenUpdater ),
maViews(),
maPolygons( rPolygons ),
@@ -458,7 +455,6 @@ namespace slideshow
}
private:
- ActivitiesQueue& mrActivitiesQueue;
ScreenUpdater& mrScreenUpdater;
UnoViewVector maViews;
PolyPolygonVector maPolygons;
@@ -498,7 +494,6 @@ namespace slideshow
bool bActive ) :
mpHandler( new PaintOverlayHandler( rStrokeColor,
nStrokeWidth,
- rContext.mrActivitiesQueue,
rContext.mrScreenUpdater,
rContext.mrViewContainer,
//adding a link to Slide
commit 7d0e24786278e02d592ee09b7f88fef8e3b06999
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:12:50 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Icb3d354ff73df2eea04f1248bb160c252f7a4f5b
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index c14e489..4508ad3 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -83,7 +83,6 @@ namespace pdfi
m_eTextDirection( LrTb ),
m_nPages(0),
m_nNextZOrder( 1 ),
- m_fWordSpace(0.0),
m_bIsWhiteSpaceInLine( false ),
m_xStatusIndicator( xStat ),
m_bHaveTextOnDocLevel(false),
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 314988d..eabdd11 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -238,7 +238,6 @@ namespace pdfi
sal_Int32 m_nPages;
sal_Int32 m_nNextZOrder;
- double m_fWordSpace;
bool m_bIsWhiteSpaceInLine;
com::sun::star::uno::Reference<
com::sun::star::task::XStatusIndicator >
commit b7ea1c0d7464a6789cf37fc4600f7c752dfe7ff3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:12:39 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I1badf39ddd5c7fc05657d21f17d7775503617b19
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index a772b8b..04f8d63 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -46,8 +46,6 @@
#include <com/sun/star/util/XCloseListener.hpp>
#include <cppuhelper/implbase5.hxx>
-#include <osl/thread.h>
-
namespace cppu {
class OMultiTypeInterfaceContainerHelper;
}
@@ -58,8 +56,6 @@ class VerbExecutionController
::osl::Mutex m_aVerbExecutionMutex;
sal_Bool m_bVerbExecutionInProgress;
- oslThreadIdentifier m_nVerbExecutionThreadIdentifier;
- sal_Bool m_bChangedOnVerbExecution;
sal_Bool m_bWasEverActive;
sal_Int32 m_nNotificationLock;
@@ -68,8 +64,6 @@ public:
VerbExecutionController()
: m_bVerbExecutionInProgress( sal_False )
- , m_nVerbExecutionThreadIdentifier( 0 )
- , m_bChangedOnVerbExecution( sal_False )
, m_bWasEverActive( sal_False )
, m_nNotificationLock( 0 )
{}
commit 68628d84ad853c68635c5d39379c89145c448229
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:11:24 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: If844f74e5077d841606f306e48c2e687440fdcdd
diff --git a/writerperfect/source/filter/ListStyle.hxx b/writerperfect/source/filter/ListStyle.hxx
index 69e2d54..44d090d 100644
--- a/writerperfect/source/filter/ListStyle.hxx
+++ b/writerperfect/source/filter/ListStyle.hxx
@@ -61,7 +61,6 @@ protected:
private:
ListLevelStyle *mppListLevels[WP6_NUM_LIST_LEVELS];
- int miNumListLevels;
const int miListID;
};
commit 9a4fe0bdd8a5d5d65707503137b519517d9fd6dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:10:52 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I012b13ee3e73a7fa3c9fd6a4519d414315a6543d
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index d1763e7..04c9bd0 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -51,18 +51,6 @@ class DecryptorImpl : public cppu::ImplInheritanceHelper3
******************************************************************************/
{
private:
- /*
- * the Id of the encryption, which is used for the result listener to
- * identify the encryption.
- */
- sal_Int32 m_nEncryptionId;
-
- /*
- * the decryption result,
- * remembers whether the decryption succeeds.
- */
- bool m_bDecryptionSucceed;
-
com::sun::star::uno::Reference<
com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index b1e1a5e..0aaedd4 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -54,22 +54,10 @@ class EncryptorImpl : public cppu::ImplInheritanceHelper4
{
private:
/*
- * the Id of the encryption, which is used for the result listener to
- * identify the encryption.
- */
- sal_Int32 m_nEncryptionId;
-
- /*
* the Id of the element to be encrypted.
*/
sal_Int32 m_nReferenceId;
- /*
- * the decryption result,
- * remembers whether the encryption succeeds.
- */
- bool m_bEncryptionSucceed;
-
com::sun::star::uno::Reference<
com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index 3620dd9..76c841d 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -54,21 +54,10 @@ class SignatureCreatorImpl : public cppu::ImplInheritanceHelper4
{
private:
/*
- * the Id of the signature, which is used for the result listener to
- * identify the signature.
- */
- sal_Int32 m_nSignatureId;
-
- /*
* the Id of template blocker.
*/
sal_Int32 m_nIdOfBlocker;
- /*
- * the signature creation result
- */
- bool m_bCreationSucceed;
-
com::sun::star::uno::Reference<
com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index 059255d..a021d61 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -51,17 +51,6 @@ class SignatureVerifierImpl : public cppu::ImplInheritanceHelper3
******************************************************************************/
{
private:
- /*
- * the Id of the signature, which is used for the result listener to
- * identify the signature.
- */
- sal_Int32 m_nSignatureId;
-
- /*
- * the verify result
- */
- bool m_bVerifySucceed;
-
com::sun::star::uno::Reference<
com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
commit 0fc587fc1ef62b560d3e50e54fe2f1beb45a71d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:10:14 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I70dca6915daf6647271ee89c752a50365cff7010
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index d7214f6..172b11d 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -65,8 +65,7 @@ SSLWarnDialog::SSLWarnDialog
m_aLine ( this, ResId( FL_LINE, *pResMgr ) ),
m_aWarnImage ( this, ResId( IMG_WARN, *pResMgr ) ),
m_xServiceFactory ( xServiceFactory ),
- m_rXCert ( rXCert ),
- pResourceMgr ( pResMgr )
+ m_rXCert ( rXCert )
{
FreeResource();
m_aWarnImage.SetImage( WarningBox::GetStandardImage() );
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index e4b40f8..ab2b8c0 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -51,7 +51,6 @@ private:
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& m_xServiceFactory;
const cssu::Reference< dcss::security::XCertificate >& m_rXCert;
Window* m_pParent;
- ResMgr* pResourceMgr;
DECL_LINK(OKHdl_Impl, void *);
DECL_LINK(ViewCertHdl_Impl, void *);
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 37e1299..17f1464 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -75,8 +75,7 @@ UnknownAuthDialog::UnknownAuthDialog
m_aLabel1 ( this, ResId( FT_LABEL_1, *pResMgr ) ),
m_aWarnImage ( this, ResId( IMG_WARN, *pResMgr ) ),
m_xServiceFactory ( xServiceFactory ),
- m_rXCert ( rXCert ),
- pResourceMgr ( pResMgr )
+ m_rXCert ( rXCert )
{
FreeResource();
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 8147d2c..6ab3eba 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -53,7 +53,6 @@ private:
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& m_xServiceFactory;
const cssu::Reference< dcss::security::XCertificate >& m_rXCert;
Window* m_pParent;
- ResMgr* pResourceMgr;
DECL_LINK(OKHdl_Impl, void *);
DECL_LINK(ViewCertHdl_Impl, void *);
commit 808e0a19d71b706c3cd6608fa81a437f85d11b06
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:10:04 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I7e0429263423837fcddb0b7d29cb0f5bacd5ce01
diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx
index f61112d..d59664f 100644
--- a/regexp/inc/regexp/reclass.hxx
+++ b/regexp/inc/regexp/reclass.hxx
@@ -314,10 +314,6 @@ class REGEXP_DLLPUBLIC Regexpr
pattern when it is compiled and to a string when it is matched. */
int translate;
- sal_uInt32 failure_id;
- sal_uInt32 nfailure_points_pushed;
- sal_uInt32 nfailure_points_popped;
- sal_uInt32 num_regs_pushed; ///< Counts the total number of registers pushed.
sal_uInt32 re_max_failures;
sal_Unicode reg_unset_dummy; ///< Registers are set to a sentinel when they haven't yet matched.
commit accc748d1b95bd9decbb805d0304e43f2fe3c8e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:08:07 2012 +0200
-Werror,-Wnon-literal-null-conversion (Clang towards 3.2)
Change-Id: Id92099158b8c12b19148397562c6ce16812848fa
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 4b1b5ff..f25f781 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -436,7 +436,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY);
SfxMediumRef pMedium = new SfxMedium(
- sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 );
+ sFileName, ( STREAM_READ | STREAM_NOCREATE ) );
uno::Reference< embed::XStorage > xStorage;
try
{
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index b3b920e..00e76c3 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -506,7 +506,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY);
SfxMediumRef pMedium = new SfxMedium(
- sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 );
+ sFileName, ( STREAM_READ | STREAM_NOCREATE ) );
if( pMedium )
{
commit 93a36f862b2aff3790a90a51e4a7df513fde53b1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 30 23:06:00 2012 +0200
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I6d5948fc6b2b42e306db9de70ab44b235dc116f9
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9dcd2ac..e712569 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -256,8 +256,7 @@ SpellDialog::SpellDialog(
aDialogUndoLink( LINK (this, SpellDialog, DialogUndoHdl)),
bModified( false ),
bFocusLocked( true ),
- rParent ( *pChildWindow ),
- nOldLang ( LANGUAGE_NONE )
+ rParent ( *pChildWindow )
{
FreeResource();
xSpell = LinguMgr::GetSpellChecker();
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 497a210..576907d 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -378,7 +378,6 @@ private:
std::vector< sal_uInt16 > maPercent_Horiz;
std::vector< sal_uInt8 > maRGB_Vert;
std::vector< sal_uInt16 > maPercent_Vert;
- bool mbInit;
};
// -----------------------------------------------------------------------
@@ -389,7 +388,6 @@ ColorFieldControl::ColorFieldControl( Window* pParent, const ResId& rResId )
, mdX( -1.0 )
, mdY( -1.0 )
, mpBitmap( 0 )
-, mbInit( false )
{
SetControlBackground();
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index e26d043..86d32f3 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -131,7 +131,6 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ),
mbUserMoved ( sal_False ),
- mbFirst ( sal_True ),
mpParent ( pParent ),
mnError ( LERR_NOERROR )
{
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 4a1a2ec..e665a96 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -96,10 +96,9 @@ SvxFramesComboBox::~SvxFramesComboBox ()
|*
|************************************************************************/
-SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, sal_Bool bAddresses )
+SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart )
: SvtURLBox ( pParent, eSmart ),
- DropTargetHelper ( this ),
- mbAccessAddress (bAddresses)
+ DropTargetHelper ( this )
{
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 4b407b5..e864004 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -79,8 +79,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
: TabPage ( pParent, rResId ),
pSet ( &rAttrSet ),
bHasExchangeSupport ( sal_False ),
- pDialog ( NULL ),
- bStandard ( sal_False )
+ pDialog ( NULL )
{
SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE );
}
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 9846597..da5cd64 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -196,7 +196,6 @@ private:
SpellDialog_Impl* pImpl;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
- LanguageType nOldLang;
DECL_LINK(ChangeHdl, void *);
DECL_LINK(ChangeAllHdl, void *);
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 88aa0d6..291eb51 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -238,8 +238,6 @@ private:
bool bStrEdited;
bool bIsUserDefined;
bool bIsMain;
- bool bIsDeletable;
- bool bIsMovable;
bool bIsParentData;
/// toolbar specific properties
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 67ff9b9..9e976df 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -65,18 +65,10 @@ private:
SfxBindings* mpBindings;
SfxItemSet* mpItemSet;
- sal_Bool mbDummy1 : 1;
- sal_Bool mbDummy2 : 1;
- sal_Bool mbDummy3 : 1;
- sal_Bool mbDummy4 : 1;
- sal_Bool mbDummy5 : 1;
sal_Bool mbGrabFocus : 1;
sal_Bool mbReadOnly : 1;
sal_Bool mbIsHTMLDoc : 1;
- void* mpDummy1;
- void* mpDummy2;
-
DECL_LINK (ClickApplyHdl_Impl, void * );
DECL_LINK (ClickCloseHdl_Impl, void * );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 65121b9..7a954f1 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -335,7 +335,6 @@ private:
ChangeType* pnColorListState;
sal_uInt16 nPageType;
sal_uInt16 nDlgType;
- sal_uInt16* pPos;
sal_Bool* pbAreaTP;
sal_Bool bDisable;
@@ -488,7 +487,6 @@ private:
ImageButton aBtnSave;
const SfxItemSet& rOutAttrs;
- RECT_POINT eRP;
XColorListRef pColorList;
XHatchListRef pHatchingList;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 393e9a6..5245b39 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -55,7 +55,6 @@ private:
sal_uInt16 nDlgType;
sal_uInt16 nPosDashLb;
sal_uInt16 nPosLineEndLb;
- sal_uInt16 mnPos;
sal_Bool mbAreaTP;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 54fafdf..1916a80 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -72,7 +72,6 @@ private:
SvxHlmarkTreeLBox maLbTree;
sal_Bool mbUserMoved;
- sal_Bool mbFirst;
SvxHyperlinkTabPageBase* mpParent;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 2f01b7b..874da64 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -66,9 +66,6 @@ public:
/// ComboBox-Control for URL's with History and Autocompletion
class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
{
-private:
- sal_Bool mbAccessAddress;
-
protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list