[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source basic/source chart2/source comphelper/source include/basic include/comphelper
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jun 23 07:01:45 UTC 2017
accessibility/inc/extended/accessibletabbarpage.hxx | 1
accessibility/inc/standard/vclxaccessibleedit.hxx | 1
accessibility/source/extended/accessibletabbarpage.cxx | 1
accessibility/source/standard/vclxaccessibleedit.cxx | 1
avmedia/source/gstreamer/gstwindow.cxx | 6 -
avmedia/source/gstreamer/gstwindow.hxx | 1
basctl/source/dlged/dlgedfunc.cxx | 6 -
basctl/source/inc/dlgedfunc.hxx | 3
basic/source/basmgr/basmgr.cxx | 4
basic/source/classes/sb.cxx | 1
basic/source/comp/parser.cxx | 3
basic/source/inc/iosys.hxx | 3
basic/source/inc/parser.hxx | 1
basic/source/runtime/iosys.cxx | 9 --
chart2/source/controller/dialogs/DataBrowser.cxx | 17 ---
chart2/source/controller/dialogs/DataBrowser.hxx | 6 -
chart2/source/controller/dialogs/res_ErrorBar.cxx | 4
chart2/source/controller/dialogs/tp_ChartType.cxx | 4
chart2/source/controller/inc/CommandDispatchContainer.hxx | 4
chart2/source/controller/inc/ItemConverter.hxx | 1
chart2/source/controller/inc/SeriesOptionsItemConverter.hxx | 1
chart2/source/controller/inc/res_ErrorBar.hxx | 2
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 9 --
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 2
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/CommandDispatchContainer.cxx | 4
chart2/source/inc/MediaDescriptorHelper.hxx | 15 ---
chart2/source/tools/MediaDescriptorHelper.cxx | 43 ++--------
comphelper/source/misc/stillreadwriteinteraction.cxx | 5 -
include/basic/sbstar.hxx | 1
include/comphelper/stillreadwriteinteraction.hxx | 1
31 files changed, 25 insertions(+), 137 deletions(-)
New commits:
commit 7b5fac67fd2441778cb9a6d2f529adc270998144
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 22 14:50:10 2017 +0200
loplugin:unusedfields in accessibility..comphelper
Change-Id: Ifb68d65fc3e48dd80e3ff2b7a4124468fdda1695
Reviewed-on: https://gerrit.libreoffice.org/39137
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index 3fa3d7a93a54..d9ee581dd372 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -50,7 +50,6 @@ namespace accessibility
private:
sal_uInt16 m_nPageId;
- bool m_bEnabled;
bool m_bShowing;
bool m_bSelected;
OUString m_sPageText;
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 61ee87ee1102..f0aaf6492de8 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -40,7 +40,6 @@ class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
friend class VCLXAccessibleBox;
private:
- sal_Int32 m_nSelectionStart;
sal_Int32 m_nCaretPosition;
protected:
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 9cfad8b674bd..d090b807a8b3 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -50,7 +50,6 @@ namespace accessibility
,m_nPageId( nPageId )
,m_xParent( rxParent )
{
- m_bEnabled = IsEnabled();
m_bShowing = IsShowing();
m_bSelected = IsSelected();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index e0ee6fe3f0a6..4bfa8e544636 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -61,7 +61,6 @@ using namespace ::comphelper;
VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
:VCLXAccessibleTextComponent( pVCLWindow )
{
- m_nSelectionStart = getSelectionStart();
m_nCaretPosition = getCaretPosition();
}
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 30ba0c8764ae..df128744e0f0 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -35,8 +35,7 @@ namespace avmedia { namespace gstreamer {
Window::Window() :
- meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
- mnPointerType( awt::SystemPointer::ARROW )
+ meZoomLevel( media::ZoomLevel_NOT_AVAILABLE )
{
}
@@ -74,9 +73,8 @@ media::ZoomLevel SAL_CALL Window::getZoomLevel( )
return meZoomLevel;
}
-void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+void SAL_CALL Window::setPointerType( sal_Int32 /*nPointerType*/ )
{
- mnPointerType = nPointerType;
}
// XWindow
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 3b8f431d767a..870df4c40786 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -76,7 +76,6 @@ public:
private:
css::media::ZoomLevel meZoomLevel;
- int mnPointerType;
};
} // namespace gstreamer
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 6260f8d885f2..3da94728b3bc 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -428,8 +428,7 @@ void DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
}
DlgEdFuncSelect::DlgEdFuncSelect (DlgEditor& rParent_) :
- DlgEdFunc(rParent_),
- bMarkAction(false)
+ DlgEdFunc(rParent_)
{
}
@@ -485,7 +484,6 @@ void DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
// select object
rView.BegMarkObj(aMDPos);
- bMarkAction = true;
}
}
}
@@ -523,8 +521,6 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
}
}
- bMarkAction = false;
-
rWindow.SetPointer( rView.GetPreferredPointer( aPnt, &rWindow, nHitLog ) );
rWindow.ReleaseMouse();
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index f4c64518bc03..063f2f269222 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -69,9 +69,6 @@ public:
class DlgEdFuncSelect : public DlgEdFunc
{
-protected:
- bool bMarkAction;
-
public:
explicit DlgEdFuncSelect (DlgEditor& rParent);
virtual ~DlgEdFuncSelect () override;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 47d09e629a44..2b71f0439003 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -342,7 +342,6 @@ private:
bool bDoLoad;
bool bReference;
- bool bPasswordVerified;
// Lib represents library in new UNO library container
uno::Reference< script::XLibraryContainer > mxScriptCont;
@@ -381,7 +380,6 @@ public:
const OUString& GetPassword() const { return aPassword; }
void SetPassword( const OUString& rNewPassword )
{ aPassword = rNewPassword; }
- void SetPasswordVerified() { bPasswordVerified = true; }
static BasicLibInfo* Create( SotStorageStream& rSStream );
@@ -395,7 +393,6 @@ public:
BasicLibInfo::BasicLibInfo()
{
bReference = false;
- bPasswordVerified = false;
bDoLoad = false;
mxScriptCont = nullptr;
aStorageName = szImbedded;
@@ -601,7 +598,6 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
{
pOldBasicPassword->setLibraryPassword(
pLib->GetName(), rpBasLibInfo->GetPassword() );
- rpBasLibInfo->SetPasswordVerified();
}
}
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 4a37061eafd4..e72136234e21 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -915,7 +915,6 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic )
: SbxObject("StarBASIC"), bDocBasic( bIsDocBasic )
{
SetParent( p );
- pLibInfo = nullptr;
bNoRtl = bBreak = false;
bVBAEnabled = false;
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 45e1b49c9537..0347e0eccd62 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -122,7 +122,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
pStack = nullptr;
pWithVar = nullptr;
nBase = 0;
- bText =
bGblDefs =
bNewGblDefs =
bSingleLineIf =
@@ -788,11 +787,9 @@ void SbiParser::Option()
SbiToken eTok = Next();
if( eTok == BINARY )
{
- bText = false;
}
else if( eTok == SYMBOL && GetSym().equalsIgnoreAsciiCase("text") )
{
- bText = true;
}
else
{
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index d13da0ee0014..4bed2e20160c 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -54,14 +54,13 @@ class SbiStream
sal_uInt64 nLine;
short nLen; // buffer length
SbiStreamFlags nMode;
- short nChan;
ErrCode nError;
void MapError();
public:
SbiStream();
~SbiStream();
- ErrCode Open( short, const OString&, StreamMode, SbiStreamFlags, short );
+ ErrCode Open( const OString&, StreamMode, SbiStreamFlags, short );
ErrCode Close();
ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
ErrCode Read( char& );
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index e81ce3b50c29..a2138283bb22 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -70,7 +70,6 @@ public:
SbiCodeGen aGen; // Code-Generator
SbiSymPool* pPool;
short nBase; // OPTION BASE-value
- bool bText; // OPTION COMPARE TEXT
bool bExplicit; // true: OPTION EXPLICIT
bool bClassModule; // true: OPTION ClassModule
StringVector aIfaceVector; // Holds all interfaces implemented by a class module
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index fca1a1c17cc7..dce5777e14af 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -126,7 +126,6 @@ SbiStream::SbiStream()
, nLine(0)
, nLen(0)
, nMode(SbiStreamFlags::NONE)
- , nChan(0)
, nError(0)
{
}
@@ -449,11 +448,10 @@ void UCBStream::SetSize( sal_uInt64 nSize )
ErrCode SbiStream::Open
-( short nCh, const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL )
+( const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL )
{
nMode = nFlags;
nLen = nL;
- nChan = nCh;
nLine = 0;
nExpandOnWriteTo = 0;
if( ( nStrmMode & ( StreamMode::READ|StreamMode::WRITE ) ) == StreamMode::READ )
@@ -522,7 +520,6 @@ ErrCode SbiStream::Close()
MapError();
pStrm.reset();
}
- nChan = 0;
return nError;
}
@@ -674,8 +671,8 @@ void SbiIoSystem::Open(short nCh, const OString& rName, StreamMode nMode, SbiStr
}
else
{
- pChan[ nCh ] = new SbiStream;
- nError = pChan[ nCh ]->Open( nCh, rName, nMode, nFlags, nLen );
+ pChan[ nCh ] = new SbiStream;
+ nError = pChan[ nCh ]->Open( rName, nMode, nFlags, nLen );
if( nError )
{
delete pChan[ nCh ];
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2e83401aa76d..3c659927f8e0 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -439,7 +439,6 @@ DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate
::svt::EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::HANDLE_COLUMN_TEXT, nStyle, BrowserStdFlags ),
m_nSeekRow( 0 ),
m_bIsReadOnly( false ),
- m_bIsDirty( false ),
m_bLiveUpdate( bLiveUpdate ),
m_bDataValid( true ),
m_aNumberEditField( VclPtr<FormattedField>::Create( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ),
@@ -452,7 +451,6 @@ DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate
m_aNumberEditField->SetDefaultValue( fNan );
m_aNumberEditField->TreatAsNumber( true );
RenewTable();
- SetClean();
}
DataBrowser::~DataBrowser()
@@ -628,7 +626,6 @@ void DataBrowser::RenewTable()
}
ImplAdjustHeaderControls();
- SetDirty();
SetUpdateMode( bLastUpdateMode );
ActivateCell();
Invalidate();
@@ -737,17 +734,6 @@ void DataBrowser::SetReadOnly( bool bNewState )
}
}
-void DataBrowser::SetClean()
-{
- m_bIsDirty = false;
-}
-
-void DataBrowser::SetDirty()
-{
- if( !m_bLiveUpdate )
- m_bIsDirty = true;
-}
-
void DataBrowser::CursorMoved()
{
EditBrowseBox::CursorMoved();
@@ -804,7 +790,6 @@ bool DataBrowser::IsDataValid()
void DataBrowser::CellModified()
{
m_bDataValid = IsDataValid();
- SetDirty();
m_aCursorMovedHdlLink.Call( this );
}
@@ -840,7 +825,6 @@ void DataBrowser::SetDataFromModel(
GoToRow( 0 );
GoToColumnId( 1 );
}
- SetClean();
}
void DataBrowser::InsertColumn()
@@ -1213,7 +1197,6 @@ bool DataBrowser::SaveModified()
::svt::CellController* pCtrl = GetController( GetCurRow(), GetCurColumnId());
if( pCtrl )
pCtrl->ClearModified();
- SetDirty();
}
return bChangeValid;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index a3edc8cde4b2..ddc583049166 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -63,8 +63,6 @@ protected:
virtual void EndScroll() override;
virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ) override;
- void SetDirty();
-
public:
DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate );
virtual ~DataBrowser() override;
@@ -93,9 +91,6 @@ public:
void SetReadOnly( bool bNewState );
bool IsReadOnly() const { return m_bIsReadOnly;}
- /// reset the dirty status, if changes have been saved
- void SetClean();
-
void SetDataFromModel( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc,
const css::uno::Reference< css::uno::XComponentContext > & xContext );
@@ -155,7 +150,6 @@ private:
/// the row that is currently painted
long m_nSeekRow;
bool m_bIsReadOnly;
- bool m_bIsDirty;
bool m_bLiveUpdate;
bool m_bDataValid;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 998d57862f3c..4e73d7c0ff9f 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -86,8 +86,6 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
m_eIndicate( SvxChartIndicate::Both ),
m_bErrorKindUnique( true ),
m_bIndicatorUnique( true ),
- m_bPlusUnique( true ),
- m_bMinusUnique( true ),
m_bRangePosUnique( true ),
m_bRangeNegUnique( true ),
m_bNoneAvailable( bNoneAvailable ),
@@ -535,14 +533,12 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// parameters
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, true, &pPoolItem );
- m_bPlusUnique = ( aState != SfxItemState::DONTCARE );
if( aState == SfxItemState::SET )
{
m_fPlusValue = static_cast<const SvxDoubleItem*>(pPoolItem)->GetValue();
}
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, true, &pPoolItem );
- m_bMinusUnique = ( aState != SfxItemState::DONTCARE );
if( aState == SfxItemState::SET )
{
m_fMinusValue = static_cast<const SvxDoubleItem*>(pPoolItem)->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index eca76e57e280..d2f979596417 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -180,13 +180,10 @@ private:
VclPtr<RadioButton> m_pRB_Stack_Y;
VclPtr<RadioButton> m_pRB_Stack_Y_Percent;
VclPtr<RadioButton> m_pRB_Stack_Z;
-
- bool m_bShowDeepStacking;
};
StackingResourceGroup::StackingResourceGroup(VclBuilderContainer* pWindow)
: ChangingResource()
- , m_bShowDeepStacking(true)
{
pWindow->get(m_pCB_Stacked, "stack");
pWindow->get(m_pRB_Stack_Y, "ontop");
@@ -201,7 +198,6 @@ StackingResourceGroup::StackingResourceGroup(VclBuilderContainer* pWindow)
void StackingResourceGroup::showControls( bool bShow, bool bShowDeepStacking )
{
- m_bShowDeepStacking = bShowDeepStacking;
m_pCB_Stacked->Show(bShow);
m_pRB_Stack_Y->Show(bShow);
m_pRB_Stack_Y_Percent->Show(bShow);
diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx
index dfae2e41018a..9cfed008dfb5 100644
--- a/chart2/source/controller/inc/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx
@@ -70,8 +70,7 @@ public:
// handled by other dispatchers. (Chart is currently the controller
// itself)
explicit CommandDispatchContainer(
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
- ChartController* pController );
+ const css::uno::Reference< css::uno::XComponentContext > & xContext );
void setModel(
const css::uno::Reference< css::frame::XModel > & xModel );
@@ -126,7 +125,6 @@ private:
css::uno::Reference< css::frame::XDispatch > m_xChartDispatcher;
std::set< OUString > m_aChartCommands;
- ChartController* m_pChartController;
DrawCommandDispatch* m_pDrawCommandDispatch;
ShapeController* m_pShapeController;
};
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 7e791de8eac4..9c2609897230 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -186,7 +186,6 @@ private:
css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo;
SfxItemPool& m_rItemPool;
- bool m_bIsValid;
};
}}
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index dd313a08de55..c04b626a026f 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -61,7 +61,6 @@ private:
bool m_bSupportingAxisSideBySide;
bool m_bGroupBarsPerAxis;
- bool m_bAllSeriesAttachedToSameAxis;
sal_Int32 m_nAllSeriesAxisIndex;
bool m_bSupportingStartingAngle;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 2b1b5f12894d..c7987d2fbdbb 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -103,8 +103,6 @@ private:
bool m_bErrorKindUnique;
bool m_bIndicatorUnique;
- bool m_bPlusUnique;
- bool m_bMinusUnique;
bool m_bRangePosUnique;
bool m_bRangeNegUnique;
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index db43d225b73a..fe339e917399 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -36,8 +36,7 @@ ItemConverter::ItemConverter(
SfxItemPool& rItemPool ) :
m_xPropertySet( rPropertySet ),
m_xPropertySetInfo( nullptr ),
- m_rItemPool( rItemPool ),
- m_bIsValid( true )
+ m_rItemPool( rItemPool )
{
resetPropertySet( m_xPropertySet );
}
@@ -70,12 +69,8 @@ SfxItemSet ItemConverter::CreateEmptyItemSet() const
return SfxItemSet( GetItemPool(), GetWhichPairs() );
}
-void ItemConverter::_disposing( const lang::EventObject& rSource )
+void ItemConverter::_disposing( const lang::EventObject& )
{
- if( rSource.Source == m_xPropertySet )
- {
- m_bIsValid = false;
- }
}
void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index c09349484b9b..89204580b11e 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -65,7 +65,6 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
, m_bConnectBars(false)
, m_bSupportingAxisSideBySide(false)
, m_bGroupBarsPerAxis(true)
- , m_bAllSeriesAttachedToSameAxis(true)
, m_nAllSeriesAxisIndex(-1)
, m_bSupportingStartingAngle(false)
, m_nStartingAngle(90)
@@ -128,7 +127,6 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
if( m_bSupportingAxisSideBySide && xDiagramProperties.is() )
{
xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis;
- m_bAllSeriesAttachedToSameAxis = DataSeriesHelper::areAllSeriesAttachedToSameAxis( xChartType, m_nAllSeriesAxisIndex );
}
m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType );
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index c1a91ee6a389..5e278b9bf362 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -117,7 +117,7 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
m_bConnectingToView(false),
m_bDisposed(false),
m_xUndoManager( nullptr ),
- m_aDispatchContainer( m_xCC, this ),
+ m_aDispatchContainer( m_xCC ),
m_eDrawMode( CHARTDRAW_SELECT ),
mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
[this]() { return this->GetContextName(); },
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index a03083a31342..5ad221ea876d 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -37,9 +37,8 @@ namespace chart
{
CommandDispatchContainer::CommandDispatchContainer(
- const Reference< uno::XComponentContext > & xContext, ChartController* pController )
+ const Reference< uno::XComponentContext > & xContext )
:m_xContext( xContext )
- ,m_pChartController( pController )
,m_pDrawCommandDispatch( nullptr )
,m_pShapeController( nullptr )
{
@@ -155,7 +154,6 @@ void CommandDispatchContainer::DisposeAndClear()
m_aToBeDisposedDispatches.clear();
m_xChartDispatcher.clear();
m_aChartCommands.clear();
- m_pChartController = nullptr;
m_pDrawCommandDispatch = nullptr;
m_pShapeController = nullptr;
}
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 488a31851b25..fd20e1f441a7 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -70,21 +70,16 @@ public:
//@todo define this for debug only, except URL
bool AsTemplate; //document is a template.
- bool ISSET_AsTemplate;
css::uno::Any
ComponentData;
- bool ISSET_ComponentData;
css::uno::Any
FilterData;
- bool ISSET_FilterData;
OUString FilterName; //internal filter name.
bool ISSET_FilterName;
bool Hidden; //load document, invisible.
- bool ISSET_Hidden;
OUString HierarchicalDocumentName;
- bool ISSET_HierarchicalDocumentName;
css::uno::Reference< css::io::XOutputStream >
OutputStream; //a stream to receive the document data for saving
@@ -94,30 +89,21 @@ public:
bool ISSET_InputStream;
bool OpenNewView; //opens a new view for an already loaded document.
- bool ISSET_OpenNewView;
bool Overwrite; //opens a new view for an already loaded document.
- bool ISSET_Overwrite;
bool Preview; //show preview.
- bool ISSET_Preview;
bool ReadOnly; //open document readonly.
- bool ISSET_ReadOnly;
//not documented ... @todo remove?
bool Silent; //prevents dialogs to query for more information.
- bool ISSET_Silent;
bool Unpacked;
- bool ISSET_Unpacked;
OUString URL;// FileName, URL of the document.
bool ISSET_URL;
sal_Int16 Version; //storage version.
- bool ISSET_Version;
css::uno::Any
ViewData;
- bool ISSET_ViewData;
sal_Int16 ViewId; //id of the initial view.
- bool ISSET_ViewId;
// new framework objects
css::uno::Reference< css::embed::XStorage >
@@ -128,7 +114,6 @@ public:
bool ISSET_Stream;
bool SetEmbedded;
- bool ISSET_SetEmbedded;
protected:
SAL_DLLPRIVATE void impl_init();
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index fda1f0d442f6..a96dddf731b7 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -61,7 +61,7 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
if (rProp.Name == "AsTemplate")
{
- ISSET_AsTemplate = rProp.Value >>= AsTemplate;
+ rProp.Value >>= AsTemplate;
addModelProp(rProp);
}
else if (rProp.Name == "Author")
@@ -79,7 +79,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
else if (rProp.Name == "ComponentData")
{
ComponentData = rProp.Value;
- ISSET_ComponentData = ComponentData.hasValue();
addModelProp(rProp);
}
else if (rProp.Name == "FileName")
@@ -89,7 +88,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
else if (rProp.Name == "FilterData")
{
FilterData = rProp.Value;
- ISSET_FilterData = FilterData.hasValue();
addModelProp(rProp);
}
else if (rProp.Name == "FilterName")
@@ -111,12 +109,12 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "Hidden")
{
- ISSET_Hidden = rProp.Value >>= Hidden;
+ rProp.Value >>= Hidden;
addModelProp(rProp);
}
else if (rProp.Name == "HierarchicalDocumentName")
{
- ISSET_HierarchicalDocumentName = rProp.Value >>= HierarchicalDocumentName;
+ rProp.Value >>= HierarchicalDocumentName;
addModelProp(rProp);
}
else if (rProp.Name == "OutputStream")
@@ -147,12 +145,12 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "OpenNewView")
{
- ISSET_OpenNewView = rProp.Value >>= OpenNewView;
+ rProp.Value >>= OpenNewView;
addRegularProp(rProp);
}
else if (rProp.Name == "Overwrite")
{
- ISSET_Overwrite = rProp.Value >>= Overwrite;
+ rProp.Value >>= Overwrite;
addModelProp(rProp);
}
else if (rProp.Name == "Password")
@@ -173,12 +171,12 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "Preview")
{
- ISSET_Preview = rProp.Value >>= Preview;
+ rProp.Value >>= Preview;
addModelProp(rProp);
}
else if (rProp.Name == "ReadOnly")
{
- ISSET_ReadOnly = rProp.Value >>= ReadOnly;
+ rProp.Value >>= ReadOnly;
addRegularProp(rProp);
}
else if (rProp.Name == "Referer")
@@ -187,12 +185,12 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "SetEmbedded")
{
- ISSET_SetEmbedded = rProp.Value >>= SetEmbedded;
+ rProp.Value >>= SetEmbedded;
addRegularProp(rProp);
}
else if (rProp.Name == "Silent")
{
- ISSET_Silent = rProp.Value >>= Silent;
+ rProp.Value >>= Silent;
addRegularProp(rProp);
}
else if (rProp.Name == "StatusIndicator")
@@ -219,7 +217,7 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "Unpacked")
{
- ISSET_Unpacked = rProp.Value >>= Unpacked;
+ rProp.Value >>= Unpacked;
addModelProp(rProp);
}
else if (rProp.Name == "URL")
@@ -229,18 +227,17 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "Version")
{
- ISSET_Version = rProp.Value >>= Version;
+ rProp.Value >>= Version;
addModelProp(rProp);
}
else if (rProp.Name == "ViewData")
{
ViewData = rProp.Value;
- ISSET_ViewData = ViewData.hasValue();
addModelProp(rProp);
}
else if (rProp.Name == "ViewId")
{
- ISSET_ViewId = rProp.Value >>= ViewId;
+ rProp.Value >>= ViewId;
addModelProp(rProp);
}
else if (rProp.Name == "WinExtent")
@@ -263,41 +260,25 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
void MediaDescriptorHelper::impl_init()
{
AsTemplate = false;
- ISSET_AsTemplate = false;
- ISSET_ComponentData = false;
-
- ISSET_FilterData = false;
ISSET_FilterName = false;
Hidden = false;
- ISSET_Hidden = false;
- ISSET_HierarchicalDocumentName = false;
ISSET_OutputStream = false;
ISSET_InputStream = false;
OpenNewView = false;
- ISSET_OpenNewView = false;
Overwrite = false;
- ISSET_Overwrite = false;
Preview = false;
- ISSET_Preview = false;
ReadOnly = false;
- ISSET_ReadOnly = false;
Silent = false;
- ISSET_Silent = false;
Unpacked = false;
- ISSET_Unpacked = false;
ISSET_URL = false;
Version = 0;
- ISSET_Version = false;
- ISSET_ViewData = false;
ViewId = 0;
- ISSET_ViewId = false;
SetEmbedded = false;
- ISSET_SetEmbedded = false;
ISSET_Storage = false;
ISSET_Stream = false;
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index a211229baad0..bf0ecc3fa3e2 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -37,7 +37,6 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
const css::uno::Reference< css::task::XInteractionHandler >& xAuxiliaryHandler)
: m_bUsed (false)
, m_bHandledByMySelf (false)
- , m_bHandledByInternalHandler(false)
, m_xAuxiliaryHandler(xAuxiliaryHandler)
{
std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
@@ -76,7 +75,6 @@ void StillReadWriteInteraction::resetErrorStates()
{
m_bUsed = false;
m_bHandledByMySelf = false;
- m_bHandledByInternalHandler = false;
}
@@ -140,10 +138,9 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction:
return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
}
- // Otherwhise use internal handler.
+ // Otherwise use internal handler.
if (m_xInterceptedHandler.is())
{
- m_bHandledByInternalHandler = true;
m_xInterceptedHandler->handle(xRequest);
}
return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED;
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 2edd8ad906ab..35a51e17a5c9 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -59,7 +59,6 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
bool bBreak; // if true: Break, otherwise Step
bool bDocBasic;
bool bVBAEnabled;
- BasicLibInfo* pLibInfo; // Info block for basic manager
bool bQuit;
SbxObjectRef pVBAGlobals;
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index dcad7609760a..375a23590bcb 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -38,7 +38,6 @@ private:
bool m_bUsed;
bool m_bHandledByMySelf;
- bool m_bHandledByInternalHandler;
public:
StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler,
More information about the Libreoffice-commits
mailing list