[Libreoffice-commits] core.git: 3 commits - accessibility/inc basic/qa canvas/source chart2/source compilerplugins/clang cui/source dbaccess/source extensions/source filter/source framework/inc idl/inc idl/source include/vcl include/xmloff l10ntools/inc l10ntools/source mysqlc/source reportdesign/source rsc/inc sal/osl sc/qa sc/source sdext/source sd/source sfx2/source vcl/source xmloff/source
Noel Grandin
noel at peralex.com
Wed Nov 25 03:58:08 PST 2015
accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 4
basic/qa/cppunit/basictest.hxx | 7
canvas/source/tools/surfacerect.hxx | 4
chart2/source/controller/inc/ChartController.hxx | 1
chart2/source/inc/UncachedDataSequence.hxx | 2
compilerplugins/clang/unusedfields.py | 3
cui/source/options/optgenrl.cxx | 9
dbaccess/source/core/api/RowSetBase.hxx | 3
dbaccess/source/ui/inc/JoinController.hxx | 1
extensions/source/scanner/scanner.hxx | 1
filter/source/graphicfilter/icgm/outact.hxx | 7
filter/source/svg/svgwriter.hxx | 2
framework/inc/uielement/macrosmenucontroller.hxx | 1
idl/inc/object.hxx | 4
idl/source/objects/slot.cxx | 4
include/vcl/animate.hxx | 4
include/vcl/bitmap.hxx | 3
include/vcl/builder.hxx | 6
include/vcl/dockwin.hxx | 2
include/vcl/graph.h | 4
include/vcl/menubtn.hxx | 1
include/vcl/opengl/OpenGLContext.hxx | 4
include/vcl/pdfwriter.hxx | 4
include/vcl/sysdata.hxx | 8
include/vcl/texteng.hxx | 1
include/vcl/threadex.hxx | 3
include/xmloff/formlayerexport.hxx | 2
include/xmloff/txtparae.hxx | 8
l10ntools/inc/export.hxx | 3
l10ntools/source/merge.cxx | 5
mysqlc/source/mysqlc_connection.cxx | 1
mysqlc/source/mysqlc_connection.hxx | 1
mysqlc/source/mysqlc_preparedstatement.hxx | 1
mysqlc/source/mysqlc_types.cxx | 172 ++--------
mysqlc/source/mysqlc_types.hxx | 3
reportdesign/source/filter/xml/xmlExport.hxx | 1
rsc/inc/rscdb.hxx | 1
sal/osl/unx/file_volume.cxx | 2
sal/osl/unx/sockimpl.hxx | 1
sc/qa/unit/ucalc_formula.cxx | 5
sc/source/core/opencl/formulagroupcl.cxx | 11
sc/source/core/opencl/op_logical.cxx | 2
sc/source/core/opencl/opbase.cxx | 4
sc/source/core/opencl/opbase.hxx | 3
sc/source/ui/vba/vbachart.hxx | 1
sd/source/ui/animations/CustomAnimationPane.cxx | 7
sd/source/ui/animations/CustomAnimationPane.hxx | 4
sd/source/ui/inc/RemoteServer.hxx | 3
sd/source/ui/inc/ViewShellBase.hxx | 1
sd/source/ui/remotecontrol/Server.cxx | 8
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 1
sd/source/ui/view/ViewShellBase.cxx | 1
sdext/source/minimizer/fileopendialog.hxx | 4
sfx2/source/inc/objshimp.hxx | 1
sfx2/source/inc/templdgi.hxx | 1
sfx2/source/view/ipclient.cxx | 1
sfx2/source/view/viewimp.hxx | 6
vcl/source/gdi/animate.cxx | 1
vcl/source/gdi/bitmap4.cxx | 6
vcl/source/window/builder.cxx | 2
vcl/source/window/dockmgr.cxx | 2
xmloff/source/forms/formlayerexport.cxx | 3
xmloff/source/text/txtparae.cxx | 9
64 files changed, 76 insertions(+), 307 deletions(-)
New commits:
commit 1f86864e97bea96fdc608f8c8b93024ad4684d51
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 25 13:51:15 2015 +0200
loplugin:unusedfields various
Change-Id: I59d9f7f73677358b4ae57efda965d43718bdf0d5
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index 103d338..bbd19d4 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -150,10 +150,6 @@ protected:
sal_Int32 m_nCurSelectedPos;
- /// The currently selected item.
- css::uno::WeakReference< css::accessibility::XAccessible>
- m_xSelectedItem;
-
virtual ~VCLXAccessibleList();
/** This function is called from the implementation helper during a
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 39240e0d..2a87559 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -40,13 +40,6 @@ class MacroSnippet
mpMod = mpBasic->MakeModule( "TestModule", sSource );
}
public:
- struct ErrorDetail
- {
- OUString sErrorText;
- int nLine;
- int nCol;
- ErrorDetail() : nLine(0), nCol(0) {}
- };
explicit MacroSnippet(const OUString& sSource)
: mbError(false)
diff --git a/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx
index 3f79f88..e0cd0fc 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.hxx
@@ -29,12 +29,10 @@ namespace canvas
{
::basegfx::B2IPoint maPos;
::basegfx::B2ISize maSize;
- ::basegfx::B2IPoint maBackup;
explicit SurfaceRect( const ::basegfx::B2ISize &rSize ) :
maPos(),
- maSize(rSize),
- maBackup()
+ maSize(rSize)
{
}
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index 2e41d86..ae1472c 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -456,7 +456,6 @@ private:
private:
mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
- mutable ::osl::Mutex m_aControllerMutex;
bool m_bSuspended;
bool m_bCanClose;
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 4f5ec3b..f7c649d 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -186,8 +186,6 @@ protected:
void fireModifyEvent();
- mutable ::osl::Mutex m_aMutex;
-
// <properties>
sal_Int32 m_nNumberFormatKey;
OUString m_sRole;
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index 4748888..9f3f16a 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -68,7 +68,8 @@ for d in definitionSet:
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
- or srcLoc.startswith("include/svl/svdde.hxx")):
+ or srcLoc.startswith("include/svl/svdde.hxx")
+ or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")):
continue
tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc))
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7de37b3..8703b98 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -160,17 +160,14 @@ const vFieldInfo[] =
struct SvxGeneralTabPage::Row
{
- // which row is it?
- RowType eRow;
// row label
VclPtr<FixedText> pLabel;
// first and last field in the row (last is exclusive)
unsigned nFirstField, nLastField;
public:
- Row (FixedText *pLabel_, RowType eRow_)
- : eRow(eRow_)
- , pLabel(pLabel_)
+ Row (FixedText *pLabel_)
+ : pLabel(pLabel_)
, nFirstField(0)
, nLastField(0)
{
@@ -260,7 +257,7 @@ void SvxGeneralTabPage::InitControls ()
continue;
// creating row
vRows.push_back(std::make_shared<Row>(
- get<FixedText>(vRowInfo[iRow].pTextId), eRow));
+ get<FixedText>(vRowInfo[iRow].pTextId)));
Row& rRow = *vRows.back();
// fields in the row
static unsigned const nFieldCount = SAL_N_ELEMENTS(vFieldInfo);
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index dd33546..3f99a54 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -76,8 +76,7 @@ namespace dbaccess
protected:
typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
- ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes
- // we need a extra mutex for columns to prevend deadlock when setting new values
+ ::osl::Mutex // we need a extra mutex for columns to prevend deadlock when setting new values
// for a row
m_aColumnsMutex;
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 91a80f7..2756ec2 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -48,7 +48,6 @@ namespace dbaui
TTableConnectionData m_vTableConnectionData;
TTableWindowData m_vTableData;
- Fraction m_aZoom;
::dbtools::SQLExceptionInfo m_aExceptionInfo;
VclPtr<OAddTableDlg> m_pAddTableDialog;
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 10b17bb..5c18f03 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -43,7 +43,6 @@ class ScannerManager:
{
protected:
- osl::Mutex maProtector;
void* mpData;
static void AcquireData();
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index 1021edc..0f80cb0 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -34,13 +34,6 @@
#include <chart.hxx>
#include <tools/poly.hxx>
-struct NodeFrameSet
-{
- Point nTopLeft;
- Point nBottomRight;
- css::awt::Size nSize;
-};
-
class CGM;
class CGMBitmapDescriptor;
class CGMOutAct
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 7afb41b..a0413be 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -90,8 +90,6 @@ class SVGAttributeWriter
private:
vcl::Font maCurFont;
- Color maCurLineColor;
- Color maCurFillColor;
SVGExport& mrExport;
SVGFontExport& mrFontExport;
SvXMLElementExport* mpElemFont;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index c794419..5f8cc74 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -48,7 +48,6 @@ namespace framework
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
css::util::URL aTargetURL;
- css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider;
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 2850288..650ee4e 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -27,10 +27,8 @@
struct SvSlotElement
{
SvMetaSlotRef xSlot;
- OString aPrefix;
- SvSlotElement( SvMetaSlot * pS, const OString& rPrefix )
+ SvSlotElement( SvMetaSlot * pS )
: xSlot( pS )
- , aPrefix( rPrefix )
{
}
};
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 774bcda..9876016 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -544,11 +544,11 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
{
SvSlotElementList::iterator it = rList.begin();
std::advance( it, nPos );
- rList.insert( it, new SvSlotElement( this, rPrefix ) );
+ rList.insert( it, new SvSlotElement( this ) );
}
else
{
- rList.push_back( new SvSlotElement( this, rPrefix ) );
+ rList.push_back( new SvSlotElement( this ) );
}
// iron out EnumSlots
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index c99e0b8..e4bbb87 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -290,12 +290,11 @@ public:
OString sTyp;
OString sGID;
OString sLID;
- OString sFilename;
MergeEntrys* pMergeEntrys;
private:
MergeDataHashMap::iterator m_aNextData;
public:
- MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename );
+ MergeData( const OString &rTyp, const OString &rGID, const OString &rLID );
~MergeData();
MergeEntrys* GetMergeEntries() { return pMergeEntrys;}
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index dd6639b..c3a0b09 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -192,11 +192,10 @@ MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey)
MergeData::MergeData(
const OString &rTyp, const OString &rGID,
- const OString &rLID , const OString &rFilename )
+ const OString &rLID )
: sTyp( rTyp ),
sGID( rGID ),
sLID( rLID ) ,
- sFilename( rFilename ),
pMergeEntrys( new MergeEntrys() )
{
}
@@ -411,7 +410,7 @@ void MergeDataFile::InsertEntry(
if( !pData )
{
- pData = new MergeData( rTYP, rGID, rLID, rInFilename );
+ pData = new MergeData( rTYP, rGID, rLID );
aMap.insert( sKey, pData );
}
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 5c3fd7c..d962ffa 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -68,7 +68,6 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
,cppDriver(_cppDriver)
,m_bClosed(false)
,m_bUseCatalog(false)
- ,m_bUseOldDateFormat(false)
{
OSL_TRACE("OConnection::OConnection");
m_rDriver.acquire();
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index e21b2f6..ebb5c70 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -112,7 +112,6 @@ namespace connectivity
bool m_bClosed;
bool m_bUseCatalog; // should we use the catalog on filebased databases
- bool m_bUseOldDateFormat;
public:
rtl::OUString getMysqlVariable(const char *varname)
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index 693d21f..d5c657d 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -52,7 +52,6 @@ namespace connectivity
{
protected:
unsigned int m_paramCount; // number of placeholders
- sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
Reference< XResultSetMetaData > m_xMetaData;
void checkParameterIndex(sal_Int32 parameter);
diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx
index 6c2849a..8d39b90 100644
--- a/mysqlc/source/mysqlc_types.cxx
+++ b/mysqlc/source/mysqlc_types.cxx
@@ -43,10 +43,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BIT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ------------ MySQL-Type: BOOL. SDBC-Type: Bit -------------
@@ -65,10 +62,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BOOL", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// --------- MySQL-Type: TINYINT SDBC-Type: TINYINT ----------
@@ -87,10 +81,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"TINYINT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: BIGINT SDBC-Type: BIGINT ----------
@@ -109,10 +100,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"BIGINT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: LONG VARBINARY SDBC-Type: LONGVARBINARY ----------
@@ -131,10 +119,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONG VARBINARY", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMBLOB SDBC-Type: LONGVARBINARY ----------
@@ -153,10 +138,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"MEDIUMBLOB", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: LONGBLOB SDBC-Type: LONGVARBINARY ----------
@@ -175,10 +157,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONGBLOB", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: BLOB SDBC-Type: LONGVARBINARY ----------
@@ -197,10 +176,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BLOB", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TINYBLOB SDBC-Type: LONGVARBINARY ----------
@@ -219,10 +195,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TINYBLOB", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: VARBINARY SDBC-Type: VARBINARY ----------
@@ -241,10 +214,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARBINARY", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: BINARY SDBC-Type: BINARY ----------
@@ -263,10 +233,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARBINARY", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: LONG VARCHAR SDBC-Type: LONG VARCHAR ----------
@@ -285,10 +252,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONG VARCHAR", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMTEXT SDBC-Type: LONG VARCHAR ----------
@@ -307,10 +271,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"MEDIUMTEXT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: LONGTEXT SDBC-Type: LONG VARCHAR ----------
@@ -329,10 +290,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONGTEXT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TEXT SDBC-Type: LONG VARCHAR ----------
@@ -351,10 +309,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TEXT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TINYTEXT SDBC-Type: LONG VARCHAR ----------
@@ -373,10 +328,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TINYTEXT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: CHAR SDBC-Type: CHAR ----------
@@ -395,10 +347,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"NUMERIC", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: DECIMAL SDBC-Type: DECIMAL ----------
@@ -417,10 +366,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DECIMAL", // local type name
-308, // minimum scale
- 308, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 308 // maximum scale
},
// ----------- MySQL-Type: NUMERIC SDBC-Type: NUMERIC ----------
@@ -439,10 +385,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"NUMERIC", // local type name
-308, // minimum scale
- 308, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 308 // maximum scale
},
// ----------- MySQL-Type: INTEGER SDBC-Type: INTEGER ----------
@@ -461,10 +404,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"INTEGER", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: INT SDBC-Type: INTEGER ----------
@@ -483,10 +423,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"INT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMINT SDBC-Type: INTEGER ----------
@@ -505,10 +442,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"MEDIUMINT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: SMALLINT SDBC-Type: INTEGER ----------
@@ -527,10 +461,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"SMALLINT", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: FLOAT SDBC-Type: REAL ----------
@@ -549,10 +480,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"FLOAT", // local type name
-38, // minimum scale
- 38, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 38 // maximum scale
},
// ----------- MySQL-Type: DOUBLE SDBC-Type: DOUBLE ----------
@@ -571,10 +499,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DOUBLE", // local type name
-308, // minimum scale
- 308, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 308 // maximum scale
},
// ----------- MySQL-Type: DOUBLE PRECISION SDBC-Type: DOUBLE ----------
@@ -593,10 +518,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DOUBLE PRECISION", // local type name
-308, // minimum scale
- 308, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 308 // maximum scale
},
// ----------- MySQL-Type: REAL SDBC-Type: DOUBLE ----------
@@ -615,10 +537,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"REAL", // local type name
-308, // minimum scale
- 308, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 308 // maximum scale
},
// ----------- MySQL-Type: VARCHAR SDBC-Type: VARCHAR ----------
@@ -637,10 +556,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARCHAR", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: ENUM SDBC-Type: VARCHAR ----------
@@ -659,10 +575,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"ENUM", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: SET SDBC-Type: VARCHAR ----------
@@ -681,10 +594,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"SET", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: DATE SDBC-Type: DATE ----------
@@ -703,10 +613,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"DATE", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TIME SDBC-Type: TIME ----------
@@ -725,10 +632,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TIME", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: DATETIME SDBC-Type: TIMESTAMP ----------
@@ -747,10 +651,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"DATETIME", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
@@ -769,15 +670,12 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TIMESTAMP", // local type name
0, // minimum scale
- 0, // maximum scale
- 0, // sql data type (unsued)
- 0, // sql datetime sub (unsued)
- 10 // num prec radix
+ 0 // maximum scale
},
// ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
{
- nullptr, 0, 0, nullptr, nullptr, nullptr, 0, false, 0, false, false, false, nullptr, 0, 0, 0, 0, 0
+ nullptr, 0, 0, nullptr, nullptr, nullptr, 0, false, 0, false, false, false, nullptr, 0, 0
}
};
diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx
index 1f7540c..ccdfc57 100644
--- a/mysqlc/source/mysqlc_types.hxx
+++ b/mysqlc/source/mysqlc_types.hxx
@@ -36,9 +36,6 @@ struct TypeInfoDef {
const char *localTypeName;
sal_Int32 minScale;
sal_Int32 maxScale;
- sal_Int32 sqlDataType;
- sal_Int32 sqlDateTimeSub;
- sal_Int32 numPrecRadix;
};
extern TypeInfoDef mysqlc_types[];
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 8e1da57..d7d22f4 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -112,7 +112,6 @@ private:
OUString m_sTableStyle;
OUString m_sCellStyle;
OUString m_sColumnStyle;
- Any m_aPreviewMode;
rtl::Reference < SvXMLExportPropertyMapper> m_xExportHelper;
rtl::Reference < SvXMLExportPropertyMapper> m_xSectionPropMapper;
rtl::Reference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 4046f1d..1a164cb 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -66,7 +66,6 @@ struct RscSysEntry
class RscTypCont
{
rtl_TextEncoding nSourceCharSet;
- sal_uInt32 nMachineId; // global machine type
RSCBYTEORDER_TYPE nByteOrder; // Intel oder
OString aLanguage; // output language
std::vector< sal_uInt32 > aLangFallbacks; // language fallback list (entry 0 is language itself)
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 7a869de..2d1bee2 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -87,8 +87,6 @@
typedef struct _oslVolumeDeviceHandleImpl
{
sal_Char pszMountPoint[PATH_MAX];
- sal_Char pszFilePath[PATH_MAX];
- sal_Char pszDevice[PATH_MAX];
sal_Char ident[4];
sal_uInt32 RefCount;
} oslVolumeDeviceHandleImpl;
diff --git a/sal/osl/unx/sockimpl.hxx b/sal/osl/unx/sockimpl.hxx
index 772a583..900155c 100644
--- a/sal/osl/unx/sockimpl.hxx
+++ b/sal/osl/unx/sockimpl.hxx
@@ -40,7 +40,6 @@ struct oslSocketImpl {
struct oslSocketAddrImpl
{
- sal_Int32 m_nRefCount;
struct sockaddr m_sockaddr;
};
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ffcf834..e27973a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4222,11 +4222,6 @@ void Test::testFuncVLOOKUP()
m_pDoc->DeleteTab(0);
}
-struct NumStrCheck {
- double fVal;
- const char* pRes;
-};
-
struct StrStrCheck {
const char* pVal;
const char* pRes;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 49360df..0e257dd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2660,7 +2660,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
{
// Can't handle
SAL_INFO("sc.opencl", "Strings but can't do that.");
- throw UnhandledToken(pChild, ("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
+ throw UnhandledToken(("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
}
else
{
@@ -2751,8 +2751,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
else
{
SAL_INFO("sc.opencl", "Fallback case, rejecting for OpenCL");
- throw UnhandledToken(pChild,
- "Got unhandled case here", __FILE__, __LINE__);
+ throw UnhandledToken("Got unhandled case here", __FILE__, __LINE__);
}
}
else if (pChild->GetType() == formula::svDouble)
@@ -2773,7 +2772,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
else
{
SAL_INFO("sc.opencl", "Fallback case, rejecting for OpenCL");
- throw UnhandledToken(pChild, ("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
+ throw UnhandledToken(("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
}
break;
case ocDiv:
@@ -3663,11 +3662,11 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
new OpGestep, nResultSize));
}
else
- throw UnhandledToken(pChild, "unhandled opcode");
+ throw UnhandledToken("unhandled opcode");
break;
default:
- throw UnhandledToken(pChild, "unhandled opcode");
+ throw UnhandledToken("unhandled opcode");
}
}
}
diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx
index a057cf0..61a4bba 100644
--- a/sc/source/core/opencl/op_logical.cxx
+++ b/sc/source/core/opencl/op_logical.cxx
@@ -318,7 +318,7 @@ void OpIf::GenSlidingWindowFunction(std::stringstream &ss,
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
if(tmpCur0->GetType() == formula::svDoubleVectorRef)
{
- throw UnhandledToken(tmpCur0, "unknown operand for ocPush");
+ throw UnhandledToken("unknown operand for ocPush");
}
else
{
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index 1b4e92c..6d0b37a2 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -16,8 +16,8 @@ using namespace formula;
namespace sc { namespace opencl {
UnhandledToken::UnhandledToken(
- formula::FormulaToken* t, const char* m, const std::string& fn, int ln ) :
- mToken(t), mMessage(m), mFile(fn), mLineNumber(ln) {}
+ const char* m, const std::string& fn, int ln ) :
+ mMessage(m), mFile(fn), mLineNumber(ln) {}
OpenCLError::OpenCLError( const std::string& function, cl_int error, const std::string& file, int line ) :
mFunction(function), mError(error), mFile(file), mLineNumber(line)
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index f467bb7..6401e19 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -32,9 +32,8 @@ class FormulaTreeNode;
class UnhandledToken
{
public:
- UnhandledToken( formula::FormulaToken* t, const char* m, const std::string& fn = "", int ln = 0 );
+ UnhandledToken( const char* m, const std::string& fn = "", int ln = 0 );
- formula::FormulaToken* mToken;
std::string mMessage;
std::string mFile;
int mLineNumber;
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 9bfa43f..21c1e90 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -50,7 +50,6 @@ friend class ScVbaAxis;
css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier;
static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount );
- css::uno::Sequence< css::uno::Sequence< double > > dblValues;
void setDefaultChartType()throw ( css::script::BasicErrorException ) ;
void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException );
bool isStacked() throw ( css::uno::RuntimeException );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index ba817a6..c50955f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -146,13 +146,11 @@ void fillRepeatComboBox( ListBox* pBox )
}
CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const Size& rMinSize )
+ const css::uno::Reference<css::frame::XFrame>& rxFrame )
: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ),
mrBase( rBase ),
mpCustomAnimationPresets(nullptr),
mnPropertyType( nPropertyTypeNone ),
- maMinSize( rMinSize ),
mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ),
maLateInitTimer()
{
@@ -2278,8 +2276,7 @@ vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& r
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
{
- const Size aMinSize( pParent->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) );
- pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame, aMinSize );
+ pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame );
}
return pWindow;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index f1a51d8..86a6ec6 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr
{
friend class MotionPathTag;
public:
- CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize );
+ CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~CustomAnimationPane();
virtual void dispose() override;
@@ -151,8 +151,6 @@ private:
sal_Int32 mnPropertyType;
- Size maMinSize;
-
EffectSequence maListSelection;
css::uno::Any maViewSelection;
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index d8d9a18..e6bc07a 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -43,16 +43,13 @@ namespace sd
struct ClientInfo
{
OUString mName;
- OUString mAddress;
bool mbIsAlreadyAuthorised;
enum PROTOCOL { NETWORK = 1, BLUETOOTH };
ClientInfo( const OUString& rName,
- const OUString& rAddress,
const bool bIsAlreadyAuthorised ) :
mName( rName ),
- mAddress( rAddress ),
mbIsAlreadyAuthorised( bIsAlreadyAuthorised ) {}
virtual ~ClientInfo() {};
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 74c7e2e..5e4aec3 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -222,7 +222,6 @@ public:
OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) const;
protected:
- osl::Mutex maMutex;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 82c67c7..f0ebbff 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -53,11 +53,10 @@ namespace sd {
OUString mPin;
ClientInfoInternal( const OUString& rName,
- const OUString& rAddress,
const bool bIsAlreadyAuthorised,
BufferedStreamSocket *pSocket,
const OUString& rPin ):
- ClientInfo( rName, rAddress, bIsAlreadyAuthorised ),
+ ClientInfo( rName, bIsAlreadyAuthorised ),
mpStreamSocket( pSocket ),
mPin( rPin ) {}
};
@@ -126,13 +125,12 @@ void RemoteServer::execute()
SocketAddr aClientAddr;
pSocket->getPeerAddr( aClientAddr );
- OUString aAddress = aClientAddr.getHostname();
MutexGuard aGuard( sDataMutex );
std::shared_ptr< ClientInfoInternal > pClient(
new ClientInfoInternal(
OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
- aAddress, false, pSocket, OStringToOUString( aPin,
+ false, pSocket, OStringToOUString( aPin,
RTL_TEXTENCODING_UTF8 ) ) );
mAvailableClients.push_back( pClient );
@@ -266,7 +264,7 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
- aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
+ aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], true ) ) );
}
return aClients;
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index e70f18a..b445211 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -337,9 +337,7 @@ private:
std::shared_ptr< AnimationSlideController > mpSlideController;
long mnRestoreSlide;
- Point maSlideOrigin;
Point maPopupMousePos;
- Size maSlideSize;
Size maPresSize;
AnimationMode meAnimationMode;
OUString maCharBuffer;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 3a49541..6d82fa1 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -36,7 +36,6 @@ class NoBitmapCompression::DummyReplacement
{
public:
Bitmap maPreview;
- Size maOriginalSize;
explicit DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { }
virtual ~DummyReplacement() {}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 41ad725..a66ad73 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -236,7 +236,6 @@ ViewShellBase::ViewShellBase (
: SfxViewShell (_pFrame,
SfxViewShellFlags::CAN_PRINT
| SfxViewShellFlags::HAS_PRINTOPTIONS),
- maMutex(),
mpImpl(),
mpDocShell (nullptr),
mpDocument (nullptr)
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index ac2ea7f..1b25d6e 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -36,10 +36,8 @@ class FileOpenDialog
OUString maType;
OUString maUIName;
sal_Int32 maFlags;
- css::uno::Sequence< OUString > maExtensions;
- FilterEntry() :
- maFlags( 0 ) {}
+ FilterEntry() : maFlags( 0 ) {}
};
css::uno::Reference < css::ui::dialogs::XFilePicker3 > mxFilePicker;
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index a631003..b7dbb0c 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -54,7 +54,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
xBasicLibraries;
css::uno::Reference< css::script::XLibraryContainer >
xDialogLibraries;
- css::uno::Sequence < OUString > xEventNames;
::sfx2::DocumentMacroMode
aMacroMode;
SfxProgress* pProgress;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8b640c2..98fe582 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -192,7 +192,6 @@ protected:
VclPtr<SfxActionListBox> aFmtLb;
VclPtr<ListBox> aFilterLb;
- Size aSize;
sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
sal_uInt16 nActFilter; // FilterIdx
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index b35b13c..09c8546 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -103,7 +103,6 @@ public:
Fraction m_aScaleHeight;
SfxInPlaceClient* m_pClient;
sal_Int64 m_nAspect; // ViewAspect that is assigned from the container
- Rectangle m_aLastObjAreaPixel; // area of object in coordinate system of the container (without scaling)
bool m_bStoreObject;
bool m_bUIActive; // set and cleared when notification for UI (de)activation is sent
bool m_bResizeNoScale;
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index de11afe..74e70b1 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -46,19 +46,17 @@ struct SfxViewShell_Impl
bool m_bControllerSet;
SfxShellArr_Impl aArr;
SvBorder aBorder;
- Size aOptimalSize;
Size aMargin;
- sal_uInt16 m_nPrinterLocks;
+ sal_uInt16 m_nPrinterLocks;
bool m_bCanPrint;
bool m_bHasPrintOptions;
bool m_bPlugInsActive;
bool m_bIsShowView;
bool m_bGotOwnership;
bool m_bGotFrameOwnership;
- sal_uInt16 m_nFamily;
+ sal_uInt16 m_nFamily;
::rtl::Reference<SfxBaseController> m_pController;
std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec;
- css::uno::Sequence < css::beans::PropertyValue > aPrintOpts;
::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
std::shared_ptr< vcl::PrinterController > m_xPrinterController;
commit 3e6ba91e2d6d362f4af91566e740f5dbc310e026
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 25 10:53:40 2015 +0200
loplugin:unusedfields in include/xmloff
Change-Id: I979743671e9a2e868d815f917427588b7b0320ba
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index d3c7e14..2fe31dd 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -53,8 +53,6 @@ namespace xmloff
:public ::salhelper::SimpleReferenceObject
{
protected:
- /// our export context
- SvXMLExport& m_rContext;
// impl class
std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl;
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index f8f411c..3e42ee9 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -125,7 +125,6 @@ public:
protected:
- const OUString sActualSize;
// Implement Title/Description Elements UI (#i73249#)
const OUString sTitle;
const OUString sDescription;
@@ -139,17 +138,12 @@ protected:
const OUString sCharStyleName;
const OUString sCharStyleNames;
const OUString sContourPolyPolygon;
- const OUString sDocumentIndex;
const OUString sDocumentIndexMark;
const OUString sEndNotice;
const OUString sFootnote;
const OUString sFootnoteCounting;
const OUString sFrame;
- const OUString sFrameHeightAbsolute;
- const OUString sFrameHeightPercent;
const OUString sFrameStyleName;
- const OUString sFrameWidthAbsolute;
- const OUString sFrameWidthPercent;
const OUString sGraphicFilter;
const OUString sGraphicRotation;
const OUString sGraphicURL;
@@ -170,7 +164,6 @@ protected:
const OUString sNumberingType;
const OUString sPageDescName;
const OUString sPageStyleName;
- const OUString sParaChapterNumberingLevel;
const OUString sParaConditionalStyleName;
const OUString sParagraphService;
const OUString sParaStyleName;
@@ -182,7 +175,6 @@ protected:
const OUString sRelativeHeight;
const OUString sRelativeWidth;
const OUString sRuby;
- const OUString sRubyAdjust;
const OUString sRubyCharStyleName;
const OUString sRubyText;
const OUString sServerMap;
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 69c5d42..3cf618b 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -43,8 +43,7 @@ namespace xmloff
//= OFormLayerXMLExport
OFormLayerXMLExport::OFormLayerXMLExport(SvXMLExport& _rContext)
- :m_rContext(_rContext)
- ,m_pImpl(new OFormLayerXMLExport_Impl(_rContext))
+ :m_pImpl(new OFormLayerXMLExport_Impl(_rContext))
{
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 97317ab..ce9e90b 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1176,7 +1176,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
bOpenRuby( false ),
mpTextListsHelper( nullptr ),
maTextListsHelperStack(),
- sActualSize("ActualSize"),
// Implement Title/Description Elements UI (#i73249#)
sTitle("Title"),
sDescription("Description"),
@@ -1190,17 +1189,11 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sCharStyleName("CharStyleName"),
sCharStyleNames("CharStyleNames"),
sContourPolyPolygon("ContourPolyPolygon"),
- sDocumentIndex("DocumentIndex"),
- sDocumentIndexMark("DocumentIndexMark"),
sEndNotice("EndNotice"),
sFootnote("Footnote"),
sFootnoteCounting("FootnoteCounting"),
sFrame("Frame"),
- sFrameHeightAbsolute("FrameHeightAbsolute"),
- sFrameHeightPercent("FrameHeightPercent"),
sFrameStyleName("FrameStyleName"),
- sFrameWidthAbsolute("FrameWidthAbsolute"),
- sFrameWidthPercent("FrameWidthPercent"),
sGraphicFilter("GraphicFilter"),
sGraphicRotation("GraphicRotation"),
sGraphicURL("GraphicURL"),
@@ -1221,7 +1214,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sNumberingType("NumberingType"),
sPageDescName("PageDescName"),
sPageStyleName("PageStyleName"),
- sParaChapterNumberingLevel("ParaChapterNumberingLevel"),
sParaConditionalStyleName("ParaConditionalStyleName"),
sParagraphService("com.sun.star.text.Paragraph"),
sParaStyleName("ParaStyleName"),
@@ -1233,7 +1225,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sRelativeHeight("RelativeHeight"),
sRelativeWidth("RelativeWidth"),
sRuby("Ruby"),
- sRubyAdjust("RubyAdjust"),
sRubyCharStyleName("RubyCharStyleName"),
sRubyText("RubyText"),
sServerMap("ServerMap"),
commit 1522d4b36aa4a8c6f61788b897c24ddfb065185b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 25 08:42:22 2015 +0200
loplugin:unusedfields in include/vcl
and fixed bug in sepia filter, where it was using the
wrong member of the union to get the percentage
Change-Id: I56b76496a3ac711adec12dd8c08b28d69644d66f
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index b690bea..52e81fb 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -95,15 +95,11 @@ struct AInfo
{
Bitmap aLastSaveBitmap;
Bitmap aBackBitmap;
- Rectangle aClipRect;
- Size aLastSaveSize;
- Point aLastSavePoint;
Point aStartOrg;
Size aStartSize;
VclPtr<OutputDevice> pOutDev;
void* pViewData;
long nExtraData;
- bool bWithSize;
bool bPause;
AInfo();
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 6e5f5d8..23587e5 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -165,7 +165,8 @@ public:
BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ),
- mnSepiaPercent( nSepiaPercent ) {}
+ mnSepiaPercent( nSepiaPercent )
+ { assert(nSepiaPercent>=0 && nSepiaPercent<=100); }
BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd )
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 485bbe8..074200a 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -260,13 +260,9 @@ private:
struct SizeGroup
{
- OString m_sID;
std::vector<OString> m_aWidgets;
stringmap m_aProperties;
- SizeGroup(const OString &rId)
- : m_sID(rId)
- {
- }
+ SizeGroup() {}
};
typedef std::map< VclPtr<vcl::Window>, stringmap> AtkMap;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index cf44a66..aab8013 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -107,10 +107,8 @@ private:
mbFloatPrevented:1,
mbDockable:1,
mbDocking:1,
- mbDragFull:1,
mbLastFloatMode:1,
mbStartFloat:1,
- mbTrackDock:1,
mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
index f412747..ec196d0 100644
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -39,11 +39,9 @@ protected:
OUString maUpperName;
ReaderData* mpReaderData;
- bool mbIsReading;
GraphicReader() :
- mpReaderData( NULL ),
- mbIsReading( sal_False ) {}
+ mpReaderData( NULL ) {}
public:
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index ce97a9e..d7dead7 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -35,7 +35,6 @@ class VCL_DLLPUBLIC MenuButton : public PushButton
private:
friend class VclBuilder;
- Rectangle maFocusRect;
Timer* mpMenuTimer;
PopupMenu* mpOwnMenu;
PopupMenu* mpMenu;
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index fb09bd5..36efe03 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -78,7 +78,6 @@ struct GLWindow
Display* dpy;
int screen;
Window win;
- Pixmap pix;
#if defined( GLX_EXT_texture_from_pixmap )
GLXFBConfig fbc;
#endif
@@ -88,7 +87,6 @@ struct GLWindow
bool HasGLXExtension( const char* name ) const;
const char* GLXExtensions;
#endif
- unsigned int bpp;
unsigned int Width;
unsigned int Height;
const GLubyte* GLExtensions;
@@ -108,7 +106,6 @@ struct GLWindow
dpy(nullptr),
screen(0),
win(0),
- pix(0),
#if defined( GLX_EXT_texture_from_pixmap )
fbc(nullptr),
#endif
@@ -116,7 +113,6 @@ struct GLWindow
ctx(nullptr),
GLXExtensions(nullptr),
#endif
- bpp(0),
Width(0),
Height(0),
GLExtensions(nullptr),
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index c10f1cc..d3d0fdb 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -451,10 +451,6 @@ public:
// Use Sig prefix for members to avoid conflict with
// the Location member of the AnyWidget which specifies the coordinates
// of the signature
-
- OUString SigLocation;
- OUString SigReason;
- OUString SigContactInfo;
bool SigHidden;
SignatureWidget()
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 5ae9947..81ad3db 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -122,14 +122,8 @@ struct SystemMenuData
{
#if defined( WNT )
HMENU hMenu; // the menu handle of the menu bar
-#elif defined( MACOSX )
- // Nothing
-#elif defined( ANDROID )
- // Nothing
-#elif defined( IOS )
+#else
// Nothing
-#elif defined( UNX )
- long aMenu; // ???
#endif
};
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 3def95a..c268b7e 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -109,7 +109,6 @@ private:
css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC;
Rectangle maInvalidRect;
- Range maInvalidRange;
LocaleDataWrapper* mpLocaleDataWrapper;
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 8e3fa53..2bb011b 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -139,8 +139,7 @@ private:
struct data_holder {
T m_value;
T * const m_ptr;
- sal_Int32 m_refCount;
- data_holder( T * p ) : m_value(*p), m_ptr(p), m_refCount(1) {}
+ data_holder( T * p ) : m_value(*p), m_ptr(p) {}
~data_holder() { *m_ptr = m_value; }
};
data_holder * const m_holder;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 911e0ca..d6d9ea1 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -802,7 +802,6 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
AInfo::AInfo() : pOutDev( nullptr ),
pViewData( nullptr ),
nExtraData( 0L ),
- bWithSize( false ),
bPause( false ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 3d56db3..2b5723c 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -678,16 +678,14 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam )
if( pReadAcc )
{
long nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ?
- pFilterParam->mcSolarGreyThreshold : 10;
+ pFilterParam->mnSepiaPercent : 10;
const long nSepia = 10000 - 100 * SAL_BOUND( nSepiaPercent, 0, 100 );
BitmapPalette aSepiaPal( 256 );
- DBG_ASSERT( nSepiaPercent <= 100, "Bitmap::ImplSepia(): sepia value out of range; defaulting to 100%" );
-
for( sal_uInt16 i = 0; i < 256; i++ )
{
BitmapColor& rCol = aSepiaPal[ i ];
- const sal_uInt8 cSepiaValue = (sal_uInt8) ( ( nSepia * i ) / 10000 );
+ const sal_uInt8 cSepiaValue = (sal_uInt8) ( nSepia * i / 10000 );
rCol.SetRed( (sal_uInt8) i );
rCol.SetGreen( cSepiaValue );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 11efd79..2ee7ab9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2572,7 +2572,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID)
{
- m_pParserState->m_aSizeGroups.push_back(SizeGroup(rID));
+ m_pParserState->m_aSizeGroups.push_back(SizeGroup());
SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back();
int nLevel = 1;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 20950c6..305878e 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -811,10 +811,8 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow )
, mbFloatPrevented(false)
, mbDockable(true)
, mbDocking(false)
- , mbDragFull(false)
, mbLastFloatMode(false)
, mbStartFloat(false)
- , mbTrackDock(false)
, mbPinned(false)
, mbRollUp(false)
, mbDockBtn(false)
More information about the Libreoffice-commits
mailing list