Kaydet (Commit) 8709c643 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:singlevalfields in sfx2

Change-Id: I91c092783facc22b6e580631252e7b2dbd80d511
Reviewed-on: https://gerrit.libreoffice.org/63323
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ba439096
...@@ -300,12 +300,9 @@ protected: ...@@ -300,12 +300,9 @@ protected:
long mnVisLines; long mnVisLines;
long mnLines; long mnLines;
int mnFineness;
sal_uInt16 mnCols; sal_uInt16 mnCols;
sal_uInt16 mnFirstLine; sal_uInt16 mnFirstLine;
bool mbScroll : 1; bool mbScroll : 1;
bool mbIsTransientChildrenDisabled : 1;
bool mbHasVisibleItems : 1; bool mbHasVisibleItems : 1;
bool mbShowTooltips : 1; bool mbShowTooltips : 1;
bool mbIsMultiSelectionEnabled: 1; bool mbIsMultiSelectionEnabled: 1;
......
...@@ -54,7 +54,6 @@ SvFileObject::SvFileObject() ...@@ -54,7 +54,6 @@ SvFileObject::SvFileObject()
, bSynchron(false) , bSynchron(false)
, bLoadError(false) , bLoadError(false)
, bWaitForData(false) , bWaitForData(false)
, bInNewData(false)
, bDataReady(false) , bDataReady(false)
, bClearMedium(false) , bClearMedium(false)
, bStateChangeCalled(false) , bStateChangeCalled(false)
...@@ -169,7 +168,7 @@ bool SvFileObject::LoadFile_Impl() ...@@ -169,7 +168,7 @@ bool SvFileObject::LoadFile_Impl()
if( !bSynchron ) if( !bSynchron )
{ {
bLoadAgain = bDataReady = bInNewData = false; bLoadAgain = bDataReady = false;
bWaitForData = true; bWaitForData = true;
tools::SvRef<SfxMedium> xTmpMed = xMed; tools::SvRef<SfxMedium> xTmpMed = xMed;
...@@ -182,7 +181,7 @@ bool SvFileObject::LoadFile_Impl() ...@@ -182,7 +181,7 @@ bool SvFileObject::LoadFile_Impl()
} }
bWaitForData = true; bWaitForData = true;
bDataReady = bInNewData = false; bDataReady = false;
xMed->Download(); xMed->Download();
bLoadAgain = !xMed->IsRemote(); bLoadAgain = !xMed->IsRemote();
bWaitForData = false; bWaitForData = false;
...@@ -326,7 +325,7 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void ) ...@@ -326,7 +325,7 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void )
bLoadError = false; bLoadError = false;
bWaitForData = false; bWaitForData = false;
if( !bInNewData && !bDataReady ) if( !bDataReady )
{ {
// Graphic is finished, also send DataChanged from Status change // Graphic is finished, also send DataChanged from Status change
bDataReady = true; bDataReady = true;
......
...@@ -42,7 +42,6 @@ class SvFileObject : public sfx2::SvLinkSource ...@@ -42,7 +42,6 @@ class SvFileObject : public sfx2::SvLinkSource
bool bSynchron : 1; bool bSynchron : 1;
bool bLoadError : 1; bool bLoadError : 1;
bool bWaitForData : 1; bool bWaitForData : 1;
bool bInNewData : 1;
bool bDataReady : 1; bool bDataReady : 1;
bool bClearMedium : 1; bool bClearMedium : 1;
bool bStateChangeCalled : 1; bool bStateChangeCalled : 1;
......
...@@ -49,12 +49,13 @@ using namespace basegfx::utils; ...@@ -49,12 +49,13 @@ using namespace basegfx::utils;
using namespace drawinglayer::attribute; using namespace drawinglayer::attribute;
using namespace drawinglayer::primitive2d; using namespace drawinglayer::primitive2d;
constexpr int gnFineness = 5;
ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle) ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle)
: Control( pParent, nWinStyle ) : Control( pParent, nWinStyle )
, mpItemAttrs(new ThumbnailItemAttributes) , mpItemAttrs(new ThumbnailItemAttributes)
{ {
ImplInit(); ImplInit();
mbIsTransientChildrenDisabled = false;
} }
ThumbnailView::~ThumbnailView() ThumbnailView::~ThumbnailView()
...@@ -130,7 +131,6 @@ void ThumbnailView::ImplInit() ...@@ -130,7 +131,6 @@ void ThumbnailView::ImplInit()
mnItemPadding = 0; mnItemPadding = 0;
mnVisLines = 0; mnVisLines = 0;
mnLines = 0; mnLines = 0;
mnFineness = 5;
mnFirstLine = 0; mnFirstLine = 0;
mnCols = 0; mnCols = 0;
mbScroll = false; mbScroll = false;
...@@ -174,7 +174,7 @@ void ThumbnailView::ImplDeleteItems() ...@@ -174,7 +174,7 @@ void ThumbnailView::ImplDeleteItems()
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); aOldAny <<= pItem->GetAccessible( false );
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
} }
...@@ -224,7 +224,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*) ...@@ -224,7 +224,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*)
css::uno::Reference< css::accessibility::XAccessible > ThumbnailView::CreateAccessible() css::uno::Reference< css::accessibility::XAccessible > ThumbnailView::CreateAccessible()
{ {
return new ThumbnailViewAcc( this, mbIsTransientChildrenDisabled ); return new ThumbnailViewAcc( this, false );
} }
void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
...@@ -345,7 +345,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) ...@@ -345,7 +345,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
aNewAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); aNewAny <<= pItem->GetAccessible( false );
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
} }
...@@ -373,7 +373,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) ...@@ -373,7 +373,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); aOldAny <<= pItem->GetAccessible( false );
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
} }
...@@ -400,10 +400,10 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) ...@@ -400,10 +400,10 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
Size aSize( nScrBarWidth, aWinSize.Height() ); Size aSize( nScrBarWidth, aWinSize.Height() );
mpScrBar->SetPosSizePixel( aPos, aSize ); mpScrBar->SetPosSizePixel( aPos, aSize );
mpScrBar->SetRangeMax( (nCurCount+mnCols-1)*mnFineness/mnCols); mpScrBar->SetRangeMax( (nCurCount+mnCols-1)*gnFineness/mnCols);
mpScrBar->SetVisibleSize( mnVisLines ); mpScrBar->SetVisibleSize( mnVisLines );
if (!bScrollBarUsed) if (!bScrollBarUsed)
mpScrBar->SetThumbPos( static_cast<long>(mnFirstLine)*mnFineness ); mpScrBar->SetThumbPos( static_cast<long>(mnFirstLine)*gnFineness );
long nPageSize = mnVisLines; long nPageSize = mnVisLines;
if ( nPageSize < 1 ) if ( nPageSize < 1 )
nPageSize = 1; nPageSize = 1;
...@@ -1100,22 +1100,14 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId ) ...@@ -1100,22 +1100,14 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if( ImplHasAccessibleListeners() ) if( ImplHasAccessibleListeners() )
{ {
// focus event (select) // focus event (select)
ThumbnailViewItemAcc* pItemAcc = ThumbnailViewItemAcc::getImplementation( pItem->GetAccessible( mbIsTransientChildrenDisabled ) ); ThumbnailViewItemAcc* pItemAcc = ThumbnailViewItemAcc::getImplementation( pItem->GetAccessible( false ) );
if( pItemAcc ) if( pItemAcc )
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
if( !mbIsTransientChildrenDisabled ) aNewAny <<= css::uno::Reference< css::uno::XInterface >(
{ static_cast< ::cppu::OWeakObject* >( pItemAcc ));
aNewAny <<= css::uno::Reference< css::uno::XInterface >( ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny );
static_cast< ::cppu::OWeakObject* >( pItemAcc ));
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny );
}
else
{
aNewAny <<= css::accessibility::AccessibleStateType::FOCUSED;
pItemAcc->FireAccessibleEvent( css::accessibility::AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
}
} }
// selection event // selection event
...@@ -1194,7 +1186,7 @@ void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewIte ...@@ -1194,7 +1186,7 @@ void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewIte
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); aOldAny <<= pItem->GetAccessible( false );
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
} }
......
...@@ -894,7 +894,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( ...@@ -894,7 +894,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mbHasPassword = false; mbHasPassword = false;
m_bHaveFilterOptions = false; m_bHaveFilterOptions = false;
mbIsPwdEnabled = true; mbIsPwdEnabled = true;
mbIsGpgEnabled = true;
mbHasVersions = false; mbHasVersions = false;
mbHasPreview = false; mbHasPreview = false;
mbShowPreview = false; mbShowPreview = false;
...@@ -1527,7 +1526,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, ...@@ -1527,7 +1526,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList,
catch( const IllegalArgumentException& ){} catch( const IllegalArgumentException& ){}
} }
// check, whether or not we have to display a key selection box // check, whether or not we have to display a key selection box
if ( pCurrentFilter && mbHasPassword && mbIsGpgEnabled && xCtrlAccess.is() ) if ( pCurrentFilter && mbHasPassword && xCtrlAccess.is() )
{ {
try try
{ {
......
...@@ -76,7 +76,6 @@ namespace sfx2 ...@@ -76,7 +76,6 @@ namespace sfx2
bool mbHasPassword : 1; bool mbHasPassword : 1;
bool mbIsPwdEnabled : 1; bool mbIsPwdEnabled : 1;
bool mbIsGpgEnabled : 1;
bool m_bHaveFilterOptions : 1; bool m_bHaveFilterOptions : 1;
bool mbHasVersions : 1; bool mbHasVersions : 1;
bool mbHasAutoExt : 1; bool mbHasAutoExt : 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment