summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--registry/source/reflread.cxx4
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx1
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--rsc/inc/rscpar.hxx2
-rw-r--r--rsc/inc/rsctools.hxx1
-rw-r--r--rsc/source/parser/rscpar.cxx4
-rw-r--r--rsc/source/tools/rsctools.cxx1
-rw-r--r--sal/osl/unx/process.cxx2
-rw-r--r--sal/rtl/alloc_cache.cxx8
-rw-r--r--sal/rtl/alloc_cache.hxx1
-rw-r--r--sax/inc/xml2utf.hxx2
-rw-r--r--sax/source/expatwrap/xml2utf.cxx3
12 files changed, 2 insertions, 29 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index de22f988984e..343943516490 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -861,7 +861,6 @@ class MethodList : public BlopObject
public:
sal_uInt16 m_numOfEntries;
- sal_uInt16 m_numOfMethodEntries;
sal_uInt16 m_numOfParamEntries;
size_t m_PARAM_ENTRY_SIZE;
std::unique_ptr<sal_uInt32[]> m_pIndex;
@@ -874,12 +873,11 @@ public:
{
if ( m_numOfEntries > 0 )
{
- m_numOfMethodEntries = readUINT16(0);
+ readUINT16(0) /* numOfMethodEntries */;
m_numOfParamEntries = readUINT16(sizeof(sal_uInt16));
m_PARAM_ENTRY_SIZE = m_numOfParamEntries * sizeof(sal_uInt16);
} else
{
- m_numOfMethodEntries = 0;
m_numOfParamEntries = 0;
m_PARAM_ENTRY_SIZE = 0;
}
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index ca5bd47005b5..499372f6a5df 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -122,7 +122,6 @@ namespace rptui
bool m_bGridVisible;
bool m_bGridUse;
bool m_bShowProperties;
- bool m_bGroupFloaterWasVisible;
bool m_bHelplinesMove;
bool m_bChartEnabled;
bool m_bChartEnabledAsked;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 355b6de39105..f813e8f55c08 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -288,7 +288,6 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
,m_bGridVisible(true)
,m_bGridUse(true)
,m_bShowProperties(true)
- ,m_bGroupFloaterWasVisible(false)
,m_bHelplinesMove(true)
,m_bChartEnabled(false)
,m_bChartEnabledAsked(false)
@@ -1414,7 +1413,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
break;
case SID_SORTINGANDGROUPING:
openSortingAndGroupingDialog();
- m_bGroupFloaterWasVisible = m_pGroupsFloater && m_pGroupsFloater->IsVisible();
break;
case SID_BACKGROUND_COLOR:
{
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index e0c3e861e525..aea9a8740c35 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -31,8 +31,6 @@ class RscTypCont;
class RscFileInst
{
ERRTYPE aFirstError;
- sal_uInt32 nErrorLine;
- sal_uInt32 nErrorPos;
sal_uInt32 nLineNo; // line in input file
RscFileTab::Index lFileIndex; // index input file
RscFileTab::Index lSrcIndex; // index base file
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 2af05864b401..c54b4a1dd4e7 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -79,7 +79,6 @@ class RscWriteRc
{
sal_uInt32 nLen;
bool bSwap;
- RSCBYTEORDER_TYPE nByteOrder;
char * pMem;
char * GetPointer( sal_uInt32 nSize );
public:
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 352e3422df95..de4780aee143 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -34,8 +34,6 @@ void RscFileInst::Init()
RscFileInst::RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc,
RscFileTab::Index lFIndex, FILE * fFile )
- : nErrorLine(0)
- , nErrorPos(0)
{
pTypCont = pTC;
Init();
@@ -156,8 +154,6 @@ void RscFileInst::SetError( ERRTYPE aError )
if( aError.IsOk() )
{
aFirstError = aError;
- nErrorLine = GetLineNo();
- nErrorPos = GetScanPos() -1;
}
};
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index ca011e468177..1482f28142b4 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -191,7 +191,6 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
#endif
bSwap = nOrder != nMachineOrder;
}
- nByteOrder = nOrder;
nLen = 0;
pMem = nullptr;
}
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 405322955d3d..87fedeb20e08 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -79,7 +79,6 @@ struct oslProcessImpl {
struct ProcessData
{
const sal_Char* m_pszArgs[MAX_ARGS + 1];
- oslProcessOption m_options;
const sal_Char* m_pszDir;
sal_Char* m_pszEnv[MAX_ENVS + 1];
uid_t m_uid;
@@ -604,7 +603,6 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
Data.m_pszArgs[i+2] = nullptr;
}
- Data.m_options = Options;
Data.m_pszDir = (pszDirectory != nullptr) ? strdup(pszDirectory) : nullptr;
if (pszEnvironments != nullptr)
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index f68d13909686..f310559c81e8 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -786,7 +786,6 @@ rtl_cache_activate (
size_t objalign,
int (SAL_CALL * constructor)(void * obj, void * userarg),
void (SAL_CALL * destructor) (void * obj, void * userarg),
- void (SAL_CALL * reclaim) (void * userarg),
void * userarg,
rtl_arena_type * source,
int flags
@@ -829,7 +828,6 @@ rtl_cache_activate (
cache->m_constructor = constructor;
cache->m_destructor = destructor;
- cache->m_reclaim = reclaim;
cache->m_userarg = userarg;
/* slab layer */
@@ -1056,7 +1054,7 @@ SAL_CALL rtl_cache_create (
sal_Size objalign,
int (SAL_CALL * constructor)(void * obj, void * userarg),
void (SAL_CALL * destructor) (void * obj, void * userarg),
- void (SAL_CALL * reclaim) (void * userarg),
+ void (SAL_CALL * /*reclaim*/) (void * userarg),
void * userarg,
rtl_arena_type * source,
int flags
@@ -1086,7 +1084,6 @@ try_alloc:
objalign,
constructor,
destructor,
- reclaim,
userarg,
source,
flags
@@ -1552,7 +1549,6 @@ rtl_cache_init()
0, /* objalign */
rtl_cache_magazine_constructor,
rtl_cache_magazine_destructor,
- nullptr, /* reclaim */
nullptr, /* userarg: NYI */
gp_default_arena, /* source */
RTL_CACHE_FLAG_NOMAGAZINE /* during bootstrap; activated below */
@@ -1576,7 +1572,6 @@ rtl_cache_init()
0, /* objalign */
rtl_cache_slab_constructor,
rtl_cache_slab_destructor,
- nullptr, /* reclaim */
nullptr, /* userarg: none */
gp_default_arena, /* source */
0 /* flags: none */
@@ -1597,7 +1592,6 @@ rtl_cache_init()
0, /* objalign */
nullptr, /* constructor */
nullptr, /* destructor */
- nullptr, /* reclaim */
nullptr, /* userarg */
gp_default_arena, /* source */
0 /* flags: none */
diff --git a/sal/rtl/alloc_cache.hxx b/sal/rtl/alloc_cache.hxx
index 1afcd4288922..cd35285740e0 100644
--- a/sal/rtl/alloc_cache.hxx
+++ b/sal/rtl/alloc_cache.hxx
@@ -116,7 +116,6 @@ struct rtl_cache_st
int (SAL_CALL * m_constructor)(void * obj, void * userarg); /* const */
void (SAL_CALL * m_destructor) (void * obj, void * userarg); /* const */
- void (SAL_CALL * m_reclaim) (void * userarg); /* const */
void * m_userarg;
/* slab layer */
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index a07a9588a7e9..18b238844220 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -41,7 +41,6 @@ private:
rtl_TextToUnicodeContext m_contextText2Unicode;
bool m_bCanContinue;
bool m_bInitialized;
- rtl_TextEncoding m_rtlEncoding;
css::uno::Sequence<sal_Int8> m_seqSource;
};
@@ -61,7 +60,6 @@ public:
private:
rtl_UnicodeToTextConverter m_convUnicode2Text;
rtl_UnicodeToTextContext m_contextUnicode2Text;
- rtl_TextEncoding m_rtlEncoding;
css::uno::Sequence<sal_Unicode> m_seqSource;
};
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 6ccecc684983..f11062c3bc32 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -346,7 +346,6 @@ void XMLFile2UTFConverter::initializeDecoding()
Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
: m_convText2Unicode(nullptr)
, m_contextText2Unicode(nullptr)
- , m_rtlEncoding(RTL_TEXTENCODING_DONTKNOW)
{
rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );
if( RTL_TEXTENCODING_DONTKNOW == encoding )
@@ -376,7 +375,6 @@ void Text2UnicodeConverter::init( rtl_TextEncoding encoding )
m_convText2Unicode = rtl_createTextToUnicodeConverter(encoding);
m_contextText2Unicode = rtl_createTextToUnicodeContext( m_convText2Unicode );
- m_rtlEncoding = encoding;
}
@@ -448,7 +446,6 @@ Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding )
{
m_convUnicode2Text = rtl_createUnicodeToTextConverter( encoding );
m_contextUnicode2Text = rtl_createUnicodeToTextContext( m_convUnicode2Text );
- m_rtlEncoding = encoding;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 02:34:46 +0000