summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-22 11:38:31 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-23 08:59:20 +0200
commitcb37c5f0f3de7b545231a53d46a5271058af76ad (patch)
tree8281f1ceb0363276f29526d9307ba2647679e54c
parent0f347c04bf1305c634b761f92ff487e831bc564c (diff)
loplugin:unusedfields in jvmfwk..mysqlc
Change-Id: If9c7a3239fceba9a2db3a5905ccaa7fa9adadb08 Reviewed-on: https://gerrit.libreoffice.org/39099 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx8
-rw-r--r--l10ntools/inc/lngmerge.hxx1
-rw-r--r--l10ntools/source/lngmerge.cxx9
-rw-r--r--libreofficekit/source/gtk/lokdocview.cxx1
-rw-r--r--libreofficekit/source/gtk/tilebuffer.hxx6
-rw-r--r--linguistic/source/convdic.cxx4
-rw-r--r--linguistic/source/convdic.hxx1
-rw-r--r--linguistic/source/convdicxml.cxx6
-rw-r--r--mysqlc/source/mysqlc_connection.cxx2
-rw-r--r--mysqlc/source/mysqlc_connection.hxx2
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx4
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.hxx1
12 files changed, 5 insertions, 40 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 5e3c8f58494a..ceffbfea6930 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -316,8 +316,6 @@ class AsynchReader: public salhelper::Thread
size_t m_nDataSize;
std::unique_ptr<sal_Char[]> m_arData;
- bool m_bError;
- bool m_bDone;
FileHandleGuard m_aGuard;
virtual ~AsynchReader() override {}
@@ -336,8 +334,8 @@ public:
};
AsynchReader::AsynchReader(oslFileHandle & rHandle):
- Thread("jvmfwkAsyncReader"), m_nDataSize(0), m_bError(false),
- m_bDone(false), m_aGuard(rHandle)
+ Thread("jvmfwkAsyncReader"), m_nDataSize(0),
+ m_aGuard(rHandle)
{
}
@@ -363,13 +361,11 @@ void AsynchReader::execute()
case osl_File_E_None:
break;
default:
- m_bError = true;
return;
}
if (nRead == 0)
{
- m_bDone = true;
break;
}
else if (nRead <= BUFFER_SIZE)
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index beab0c937360..6d47bfcaf199 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -43,7 +43,6 @@ typedef std::vector< OString* > LngLineList;
class LngParser
{
private:
- sal_uInt16 nError;
LngLineList *pLines;
OString sSource;
std::vector<OString> aLanguages;
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 513c36e13e56..540110f99822 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -49,8 +49,7 @@ void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
// class LngParser
LngParser::LngParser(const OString &rLngFile)
- : nError( LNG_OK )
- , pLines( nullptr )
+ : pLines( nullptr )
, sSource( rLngFile )
{
pLines = new LngLineList;
@@ -76,8 +75,6 @@ LngParser::LngParser(const OString &rLngFile)
}
pLines->push_back( new OString() );
}
- else
- nError = LNG_COULD_NOT_OPEN;
}
LngParser::~LngParser()
@@ -166,10 +163,6 @@ bool LngParser::Merge(
{
std::ofstream aDestination(
rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc);
- if (!aDestination.is_open()) {
- nError = LNG_COULD_NOT_OPEN;
- }
- nError = LNG_OK;
MergeDataFile aMergeDataFile( rPOFile, sSource, false, true );
if( rLanguage.equalsIgnoreAsciiCase("ALL") )
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index ca15aca4bfc7..c484fea98bc6 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3282,7 +3282,6 @@ lok_doc_view_open_document (LOKDocView* pDocView,
GError* error = nullptr;
LOEvent* pLOEvent = new LOEvent(LOK_LOAD_DOC);
- pLOEvent->m_pPath = pPath;
priv->m_aDocPath = pPath;
if (pRenderingArguments)
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
index 0d98cc26f899..88961cc1f44d 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -180,11 +180,6 @@ struct LOEvent
gboolean m_bNotifyWhenFinished;
///@}
- /// @name open_document parameter
- ///@{
- const gchar* m_pPath;
- ///@}
-
/// set_edit parameter
gboolean m_bEdit;
@@ -240,7 +235,6 @@ struct LOEvent
, m_pCommand(nullptr)
, m_pArguments(nullptr)
, m_bNotifyWhenFinished(false)
- , m_pPath(nullptr)
, m_bEdit(false)
, m_nPartMode(0)
, m_nPart(0)
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 0e952a516843..ca0304fa4480 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -179,12 +179,11 @@ ConvDic::ConvDic(
bNeedEntries = true;
bIsModified = bIsActive = false;
- bIsReadonly = false;
if( !rMainURL.isEmpty() )
{
bool bExists = false;
- bIsReadonly = IsReadOnly( rMainURL, &bExists );
+ IsReadOnly( rMainURL, &bExists );
if( !bExists ) // new empty dictionary
{
@@ -193,7 +192,6 @@ ConvDic::ConvDic(
//! that could be found by the dictionary-list implementation
// (Note: empty dictionaries are not just empty files!)
Save();
- bIsReadonly = IsReadOnly( rMainURL ); // will be sal_False if Save was successful
}
}
else
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 53167b7123a7..6c41586df6da 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -77,7 +77,6 @@ protected:
bool bNeedEntries;
bool bIsModified;
bool bIsActive;
- bool bIsReadonly;
// disallow copy-constructor and assignment-operator for now
ConvDic(const ConvDic &);
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index e5ac95339348..7829d2c891f4 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -125,14 +125,12 @@ class ConvDicXMLEntryTextContext_Impl :
public ConvDicXMLImportContext
{
OUString aLeftText;
- sal_Int16 nPropertyType; // used for Chinese simplified/traditional conversion
public:
ConvDicXMLEntryTextContext_Impl(
ConvDicXMLImport &rImport,
sal_uInt16 nPrefix, const OUString& rLName ) :
- ConvDicXMLImportContext( rImport, nPrefix, rLName ),
- nPropertyType( ConversionPropertyType::NOT_DEFINED )
+ ConvDicXMLImportContext( rImport, nPrefix, rLName )
{
}
@@ -256,8 +254,6 @@ void ConvDicXMLEntryTextContext_Impl::StartElement(
if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "left-text" )
aLeftText = aValue;
- if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "property-type" )
- nPropertyType = (sal_Int16) aValue.toInt32();
}
}
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 8725f67bb08d..42dbe1a65af3 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -67,7 +67,6 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
,m_xMetaData(nullptr)
,m_rDriver(_rDriver)
,cppDriver(_cppDriver)
- ,m_bClosed(false)
{
m_rDriver.acquire();
}
@@ -507,7 +506,6 @@ void OConnection::disposing()
}
m_aStatements.clear();
- m_bClosed = true;
m_xMetaData = WeakReference< XDatabaseMetaData >();
dispose_ChildImpl();
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 0afae7d4ae64..82887251d340 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -108,8 +108,6 @@ namespace connectivity
MysqlCDriver& m_rDriver; // Pointer to the owning driver object
sql::Driver* cppDriver;
- bool m_bClosed;
-
public:
/// @throws SQLException
/// @throws RuntimeException
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index b64c87c99f72..17b845b2b03b 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -78,13 +78,9 @@ void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nTy
ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon)
:m_rConnection(_rCon)
- ,m_bUseCatalog(true)
,meta(_rCon.getConnectionSettings().cppConnection->getMetaData())
,identifier_quote_string_set(false)
{
- osl_atomic_increment(&m_refCount);
- m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
- osl_atomic_decrement(&m_refCount);
}
ODatabaseMetaData::~ODatabaseMetaData()
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index b8011763c5a4..172c5ee364bd 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -42,7 +42,6 @@ namespace connectivity
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
OConnection& m_rConnection;
- bool m_bUseCatalog;
protected:
sql::DatabaseMetaData * meta;
rtl::OUString identifier_quote_string;