summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx8
-rw-r--r--dbaccess/source/ui/inc/dlgsize.hxx2
-rw-r--r--editeng/source/rtf/svxrtf.cxx3
-rw-r--r--include/editeng/svxrtf.hxx2
-rw-r--r--include/svtools/editbrowsebox.hxx4
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx6
-rw-r--r--sc/source/filter/xml/xmltransformationi.cxx1
-rw-r--r--sc/source/filter/xml/xmltransformationi.hxx1
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx6
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx11
-rw-r--r--ucb/source/ucp/file/bc.cxx3
-rw-r--r--ucb/source/ucp/file/filinsreq.cxx9
-rw-r--r--ucb/source/ucp/file/filinsreq.hxx1
-rw-r--r--ucb/source/ucp/file/filtask.cxx15
-rw-r--r--ucb/source/ucp/file/filtask.hxx11
-rw-r--r--vcl/source/bitmap/BitmapScaleSuperFilter.cxx6
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx18
-rw-r--r--vcl/unx/generic/dtrans/bmp.hxx6
-rw-r--r--writerfilter/source/ooxml/Handler.cxx3
-rw-r--r--writerfilter/source/ooxml/Handler.hxx2
20 files changed, 35 insertions, 83 deletions
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 9ed623fc8003..aca0710c5fc7 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -30,20 +30,20 @@ DlgSize::DlgSize(weld::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nA
: GenericDialogController(pParent, bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"),
bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"))
, m_nPrevValue(nVal)
- , m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH)
, m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM))
, m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic"))
{
+ sal_Int32 nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH);
if ( _nAlternativeStandard > 0 )
- m_nStandard = _nAlternativeStandard;
+ nStandard = _nAlternativeStandard;
m_xCB_STANDARD->connect_toggled(LINK(this,DlgSize,CbClickHdl));
bool bDefault = -1 == nVal;
m_xCB_STANDARD->set_active(bDefault);
if (bDefault)
{
- SetValue(m_nStandard);
- m_nPrevValue = m_nStandard;
+ SetValue(nStandard);
+ m_nPrevValue = nStandard;
}
CbClickHdl(*m_xCB_STANDARD);
}
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 6e72490945fb..d71f0ff1c649 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -27,7 +27,7 @@ namespace dbaui
class DlgSize final : public weld::GenericDialogController
{
private:
- sal_Int32 m_nPrevValue, m_nStandard;
+ sal_Int32 m_nPrevValue;
void SetValue( sal_Int32 nVal );
DECL_LINK(CbClickHdl, weld::ToggleButton&, void);
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index eed91b25158f..78d726b86d51 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -315,7 +315,7 @@ void SvxRTFParser::ReadStyleTable()
break;
case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); break;
- case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break;
+ case RTF_SNEXT: break;
case RTF_OUTLINELEVEL:
case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break;
case RTF_S: nStyleNo = static_cast<short>(nTokenValue);
@@ -925,7 +925,6 @@ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRa
{
nOutlineNo = sal_uInt8(-1); // not set
nBasedOn = 0;
- nNext = 0;
}
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 73634f515e97..c9dd555d6ebe 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -95,7 +95,7 @@ struct SvxRTFStyleType
{
SfxItemSet aAttrSet; // the attributes of Style (+ derivate!)
OUString sName;
- sal_uInt16 nBasedOn, nNext;
+ sal_uInt16 nBasedOn;
sal_uInt8 nOutlineNo;
SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange );
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index d61cda9dba39..9080c6a4f617 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -478,8 +478,8 @@ namespace svt
// and the asynchronous event the focus has changed, we won't grab it for ourself.
long nPaintRow; // row being painted
- long nEditRow, nOldEditRow;
- sal_uInt16 nEditCol, nOldEditCol;
+ long nEditRow;
+ sal_uInt16 nEditCol;
bool bHasFocus : 1;
mutable bool bPaintStatus : 1; // paint a status (image) in the handle column
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 7cd7eabe70dc..d64f0160bc88 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -171,12 +171,6 @@ class XMLShapeImportHelper;
class ScXMLChangeTrackingImportHelper;
class SolarMutexGuard;
-struct tScMyCellRange
-{
- sal_Int32 StartColumn, EndColumn;
- sal_Int32 StartRow, EndRow;
-};
-
struct ScMyNamedExpression
{
OUString sName;
diff --git a/sc/source/filter/xml/xmltransformationi.cxx b/sc/source/filter/xml/xmltransformationi.cxx
index 0d280bc7ab5c..576716f87140 100644
--- a/sc/source/filter/xml/xmltransformationi.cxx
+++ b/sc/source/filter/xml/xmltransformationi.cxx
@@ -423,6 +423,7 @@ ScXMLColumnNumberContext::ScXMLColumnNumberContext(
, maType(sc::NUMBER_TRANSFORM_TYPE::ROUND)
, maPrecision(0)
{
+ OUString aType;
if (rAttrList.is())
{
for (auto& aIter : *rAttrList)
diff --git a/sc/source/filter/xml/xmltransformationi.hxx b/sc/source/filter/xml/xmltransformationi.hxx
index b927708cadad..a8ae4bb1dcdc 100644
--- a/sc/source/filter/xml/xmltransformationi.hxx
+++ b/sc/source/filter/xml/xmltransformationi.hxx
@@ -119,7 +119,6 @@ public:
class ScXMLColumnNumberContext : public ScXMLImportContext
{
- OUString aType;
sc::NUMBER_TRANSFORM_TYPE maType;
int maPrecision;
std::set<SCCOL> maColumns;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 1d3990b01322..88fdd373f8b2 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -107,12 +107,6 @@ using ::com::sun::star::frame::XTitle;
using ::com::sun::star::ui::XSidebarProvider;
-struct GroupIDToCommandGroup
-{
- SfxGroupId const nGroupID;
- sal_Int16 const nCommandGroup;
-};
-
typedef std::unordered_map< SfxGroupId, sal_Int16 > GroupHashMap;
sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID )
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 4054a437d245..7c7510416097 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -126,9 +126,7 @@ namespace svt
,m_pFocusWhileRequest(nullptr)
,nPaintRow(-1)
,nEditRow(-1)
- ,nOldEditRow(-1)
,nEditCol(0)
- ,nOldEditCol(0)
,bHasFocus(false)
,bPaintStatus(true)
,bActiveBeforeTracking( false )
@@ -167,8 +165,8 @@ namespace svt
void EditBrowseBox::RemoveRows()
{
BrowseBox::Clear();
- nOldEditRow = nEditRow = nPaintRow = -1;
- nEditCol = nOldEditCol = 0;
+ nEditRow = nPaintRow = -1;
+ nEditCol = 0;
}
@@ -1019,9 +1017,6 @@ return;
if (bUpdate)
Update();
- nOldEditCol = nEditCol;
- nOldEditRow = nEditRow;
-
// release the controller (asynchronously)
if (nEndEvent)
Application::RemoveUserEvent(nEndEvent);
@@ -1046,8 +1041,6 @@ return;
nEndEvent = nullptr;
aOldController = CellControllerRef();
- nOldEditRow = -1;
- nOldEditCol = 0;
}
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 952badaab9da..eb2d7d9b8489 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -264,9 +264,8 @@ BaseContent::createCommandIdentifier()
void SAL_CALL
-BaseContent::abort( sal_Int32 CommandId )
+BaseContent::abort( sal_Int32 /*CommandId*/ )
{
- m_pMyShell->abort( CommandId );
}
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 9275b47aeab3..359b420ee181 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -45,17 +45,16 @@ XInteractionRequestImpl::XInteractionRequestImpl(
TaskManager *pShell,sal_Int32 CommandId)
: p1( new XInteractionSupplyNameImpl ),
p2( new XInteractionAbortImpl ),
- m_nErrorCode(0),
- m_nMinorError(0),
m_xOrigin(xOrigin)
{
+ sal_Int32 nErrorCode(0), nMinorError(0);
if( pShell )
- pShell->retrieveError(CommandId,m_nErrorCode,m_nMinorError);
+ pShell->retrieveError(CommandId,nErrorCode,nMinorError);
std::vector<uno::Reference<task::XInteractionContinuation>> continuations{
Reference<XInteractionContinuation>(p1),
Reference<XInteractionContinuation>(p2) };
Any aAny;
- if(m_nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR)
+ if(nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR)
{
NameClashException excep;
excep.Name = aClashingName;
@@ -64,7 +63,7 @@ XInteractionRequestImpl::XInteractionRequestImpl(
excep.Message = "folder exists and overwrite forbidden";
aAny <<= excep;
}
- else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR)
+ else if(nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR)
{
InteractiveAugmentedIOException excep;
excep.Code = IOErrorCode_INVALID_CHARACTER;
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 302c7fcc59d0..035b51a05ea8 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -131,7 +131,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
XInteractionSupplyNameImpl* const p1;
XInteractionAbortImpl* const p2;
- sal_Int32 m_nErrorCode,m_nMinorError;
css::uno::Reference<css::task::XInteractionRequest> m_xRequest;
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 7bdd707b9b10..f3f32ccfe18b 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -415,21 +415,6 @@ TaskManager::endTask( sal_Int32 CommandId,
}
-void
-TaskManager::abort( sal_Int32 CommandId )
-{
- if( CommandId )
- {
- osl::MutexGuard aGuard( m_aMutex );
- TaskMap::iterator it = m_aTaskMap.find( CommandId );
- if( it == m_aTaskMap.end() )
- return;
- else
- it->second.abort();
- }
-}
-
-
void TaskManager::clearError( sal_Int32 CommandId )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 8de0bae31198..2c20b350b5f2 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -88,7 +88,7 @@ namespace fileaccess
{
private:
- bool m_bAbort,m_bHandled;
+ bool m_bHandled;
sal_Int32 m_nErrorCode,m_nMinorCode;
css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment;
@@ -98,19 +98,13 @@ namespace fileaccess
explicit TaskHandling(
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv )
- : m_bAbort( false ),
- m_bHandled( false ),
+ : m_bHandled( false ),
m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorCode( TASKHANDLER_NO_ERROR ),
m_xCommandEnvironment( xCommandEnv )
{
}
- void abort()
- {
- m_bAbort = true;
- }
-
void setHandled()
{
m_bHandled = true;
@@ -253,7 +247,6 @@ namespace fileaccess
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv );
sal_Int32 getCommandId();
- void abort( sal_Int32 CommandId );
/**
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index eb081281b56d..ba6be51513b0 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -51,8 +51,7 @@ void generateMap(long nW, long nDstW, bool bHMirr, long* pMapIX, long* pMapFX)
struct ScaleContext {
BitmapReadAccess * const mpSrc;
BitmapWriteAccess *mpDest;
- long mnSrcW, mnDestW;
- long mnSrcH, mnDestH;
+ long mnDestW;
bool mbHMirr, mbVMirr;
std::unique_ptr<long[]> mpMapIX;
std::unique_ptr<long[]> mpMapIY;
@@ -64,8 +63,7 @@ struct ScaleContext {
long nSrcH, long nDestH,
bool bHMirr, bool bVMirr)
: mpSrc( pSrc ), mpDest( pDest )
- , mnSrcW( nSrcW ), mnDestW( nDestW )
- , mnSrcH( nSrcH ), mnDestH( nDestH )
+ , mnDestW( nDestW )
, mbHMirr( bHMirr ), mbVMirr( bVMirr )
, mpMapIX( new long[ nDestW ] )
, mpMapIY( new long[ nDestH ] )
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 57399b238c89..448feee1ffc7 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -360,11 +360,8 @@ PixmapHolder::PixmapHolder( Display* pDisplay )
, m_aPixmap(None)
, m_aBitmap(None)
, m_nRedShift(0)
- , m_nRedShift2(0)
, m_nGreenShift(0)
- , m_nGreenShift2(0)
, m_nBlueShift(0)
- , m_nBlueShift2(0)
, m_nBlueShift2Mask(0)
, m_nRedShift2Mask(0)
, m_nGreenShift2Mask(0)
@@ -400,14 +397,17 @@ PixmapHolder::PixmapHolder( Display* pDisplay )
#endif
if( m_aInfo.c_class == TrueColor )
{
+ int nRedShift2(0);
+ int nGreenShift2(0);
+ int nBlueShift2(0);
int nRedSig, nGreenSig, nBlueSig;
- getShift( m_aInfo.red_mask, m_nRedShift, nRedSig, m_nRedShift2 );
- getShift( m_aInfo.green_mask, m_nGreenShift, nGreenSig, m_nGreenShift2 );
- getShift( m_aInfo.blue_mask, m_nBlueShift, nBlueSig, m_nBlueShift2 );
+ getShift( m_aInfo.red_mask, m_nRedShift, nRedSig, nRedShift2 );
+ getShift( m_aInfo.green_mask, m_nGreenShift, nGreenSig, nGreenShift2 );
+ getShift( m_aInfo.blue_mask, m_nBlueShift, nBlueSig, nBlueShift2 );
- m_nBlueShift2Mask = m_nBlueShift2 ? ~static_cast<unsigned long>((1<<m_nBlueShift2)-1) : ~0L;
- m_nGreenShift2Mask = m_nGreenShift2 ? ~static_cast<unsigned long>((1<<m_nGreenShift2)-1) : ~0L;
- m_nRedShift2Mask = m_nRedShift2 ? ~static_cast<unsigned long>((1<<m_nRedShift2)-1) : ~0L;
+ m_nBlueShift2Mask = nBlueShift2 ? ~static_cast<unsigned long>((1<<nBlueShift2)-1) : ~0L;
+ m_nGreenShift2Mask = nGreenShift2 ? ~static_cast<unsigned long>((1<<nGreenShift2)-1) : ~0L;
+ m_nRedShift2Mask = nRedShift2 ? ~static_cast<unsigned long>((1<<nRedShift2)-1) : ~0L;
}
}
diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index 9547bc2170b6..853fc0b53716 100644
--- a/vcl/unx/generic/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
@@ -44,9 +44,9 @@ class PixmapHolder
Pixmap m_aBitmap;
XVisualInfo m_aInfo;
- int m_nRedShift, m_nRedShift2;
- int m_nGreenShift, m_nGreenShift2;
- int m_nBlueShift, m_nBlueShift2;
+ int m_nRedShift;
+ int m_nGreenShift;
+ int m_nBlueShift;
unsigned long m_nBlueShift2Mask, m_nRedShift2Mask, m_nGreenShift2Mask;
// these expect data pointers to bitmapinfo header
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 290a4b749758..f7003b44e6f0 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -238,7 +238,7 @@ void OOXMLHeaderHandler::sprm(Sprm & /*sprm*/)
class OOXMLBreakHandler
*/
OOXMLBreakHandler::OOXMLBreakHandler(Stream &rStream)
-: mnType(0), mnClear(0),
+: mnType(0),
mrStream(rStream)
{
}
@@ -270,7 +270,6 @@ void OOXMLBreakHandler::attribute(Id name, Value & val)
mnType = val.getInt();
break;
case NS_ooxml::LN_CT_Br_clear:
- mnClear = val.getInt();
break;
default:
break;
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index 5de41e351981..47ae7d562a53 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -108,7 +108,7 @@ public:
class OOXMLBreakHandler : public Properties
{
- sal_Int32 mnType, mnClear;
+ sal_Int32 mnType;
Stream & mrStream;
public:
explicit OOXMLBreakHandler(Stream & rStream);
generated by cgit (git 2.34.1) at 2024-12-28 09:45:34 +0000