include/svtools/ServerDetailsControls.hxx | 1 include/svtools/calendar.hxx | 2 include/svtools/filectrl.hxx | 1 include/svtools/genericunodialog.hxx | 1 include/svtools/ivctrl.hxx | 3 include/svtools/javacontext.hxx | 1 include/svtools/parrtf.hxx | 3 include/svtools/svparser.hxx | 10 - include/svtools/tabbar.hxx | 2 include/svtools/transfer.hxx | 2 include/svtools/valueset.hxx | 1 include/svtools/viewdataentry.hxx | 2 sd/source/ui/dlg/sdtreelb.cxx | 1 sd/source/ui/view/sdview2.cxx | 1 sfx2/source/doc/objembed.cxx | 1 sfx2/source/doc/sfxbasemodel.cxx | 1 svtools/source/brwbox/datwin.cxx | 12 - svtools/source/brwbox/datwin.hxx | 2 svtools/source/config/accessibilityoptions.cxx | 3 svtools/source/config/colorcfg.cxx | 11 - svtools/source/config/extcolorcfg.cxx | 11 - svtools/source/contnr/fileview.cxx | 4 svtools/source/contnr/iconview.cxx | 2 svtools/source/contnr/imivctl1.cxx | 16 - svtools/source/contnr/ivctrl.cxx | 4 svtools/source/contnr/treelistbox.cxx | 15 - svtools/source/contnr/viewdataentry.cxx | 2 svtools/source/control/calendar.cxx | 14 - svtools/source/control/filectrl.cxx | 1 svtools/source/control/tabbar.cxx | 204 ++++++++++------------- svtools/source/control/valueset.cxx | 40 +--- svtools/source/dialogs/ServerDetailsControls.cxx | 5 svtools/source/filter/exportdialog.cxx | 7 svtools/source/filter/exportdialog.hxx | 1 svtools/source/graphic/descriptor.cxx | 7 svtools/source/graphic/descriptor.hxx | 1 svtools/source/hatchwindow/ipwin.cxx | 29 +-- svtools/source/hatchwindow/ipwin.hxx | 1 svtools/source/java/javacontext.cxx | 5 svtools/source/misc/embedtransfer.cxx | 1 svtools/source/svrtf/parrtf.cxx | 2 svtools/source/svrtf/svparser.cxx | 6 svtools/source/uno/genericunodialog.cxx | 8 sw/source/uibase/dochdl/swdtflvr.cxx | 3 44 files changed, 138 insertions(+), 312 deletions(-)
New commits: commit 24ca187b6370ca56c8acd92bc405028dd9deb5f2 Author: Noel Grandin <n...@peralex.com> Date: Thu Jun 23 15:43:34 2016 +0200 loplugin:singlevalfields in svtools Change-Id: I80fe1d4646af2b8d8e6362a25f6cda4b7ac29eab Reviewed-on: https://gerrit.libreoffice.org/26603 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index b6ceaa2..aaef76f 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -37,7 +37,6 @@ class DetailsContainer VclPtr<FixedText> m_pFTPort; VclPtr<Edit> m_pEDRoot; VclPtr<FixedText> m_pFTRoot; - bool m_bIsActive; public: DetailsContainer( VclBuilderContainer* pBuilder ); diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 12e60cf..144f782 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -190,7 +190,6 @@ private: WinBits mnWinStyle; sal_uInt16 mnFirstYear; sal_uInt16 mnLastYear; - sal_uInt16 mnRequestYear; bool mbCalc:1, mbFormat:1, mbDrag:1, @@ -203,7 +202,6 @@ private: mbPrevIn:1, mbNextIn:1, mbDirect:1, - mbInSelChange:1, mbTravelSelect:1, mbScrollDateRange:1, mbSelLeft:1, diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 1c677e8..1ba522d 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -47,7 +47,6 @@ private: VclPtr<PushButton> maButton; OUString maButtonText; - bool mbOpenDlg; FileControlMode_Internal mnInternalFlags; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index e14b1de..3111f33 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -74,7 +74,6 @@ namespace svt protected: VclPtr<Dialog> m_pDialog; /// the dialog to execute bool m_bExecuting : 1; /// we're currently executing the dialog - bool m_bCanceled : 1; /// endDialog was called while we were executing bool m_bTitleAmbiguous : 1; /// m_sTitle has not been set yet bool m_bInitialized : 1; /// has "initialize" been called? bool m_bNeedInitialization : 1; /// do we need to be initialized before any other API call is allowed? diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 594b11b..2215f91 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -208,7 +208,6 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control Link<SvtIconChoiceCtrl*,void> _aClickIconHdl; KeyEvent* _pCurKeyEvent; std::unique_ptr<SvxIconChoiceCtrl_Impl> _pImpl; - bool _bAutoFontColor; protected: @@ -297,8 +296,6 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = nullptr ); #endif - bool AutoFontColor () { return _bAutoFontColor; } - Point GetPixelPos( const Point& rPosLogic ) const; void SetSelectionMode( SelectionMode eMode ); diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index c4732c2..b14e823 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -67,7 +67,6 @@ namespace svt oslInterlockedCount m_aRefCount; css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; css::uno::Reference< css::task::XInteractionHandler> m_xHandler; - bool m_bShowErrorsOnce; }; } diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 1c45ddc..871dac5 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -38,8 +38,7 @@ class SVT_DLLPUBLIC SvRTFParser : public SvParser { std::stack< RtfParserState_Impl > aParserStates; int nOpenBrakets; - rtl_TextEncoding eCodeSet, - eUNICodeSet; + rtl_TextEncoding eCodeSet; sal_uInt8 nUCharOverread; private: diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 75d07b3..9946402 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -63,14 +63,6 @@ protected: sal_uInt32 nNextCh; // current character codepoint in UTF32 for the "lex" - bool bDownloadingFile : 1; // true: An external file is - // currently being loaded, i.e. - // all DataAvailable Links must - // be ignored. - // If none of the following - // flags is set, the stream - // is read as ANSI, but returned - // as CharSet DONTKNOW. bool bUCS2BSrcEnc : 1; // or as big-endian UCS2 bool bSwitchToUCS2 : 1; // switching is allowed @@ -142,8 +134,6 @@ public: void RestoreState(); virtual void Continue( int nToken ); - inline bool IsDownloadingFile() const { return bDownloadingFile; } - // Set/get source encoding. The UCS2BEncoding flag is valid if source // encoding is UCS2. It specifies a big endian encoding. void SetSrcEncoding( rtl_TextEncoding eSrcEnc ); diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index a84cd2e..57f4950 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -328,8 +328,6 @@ private: bool mbEditCanceled : 1; bool mbDropPos : 1; bool mbInSelect : 1; - bool mbSelColor : 1; - bool mbSelTextColor : 1; bool mbMirrored : 1; bool mbScrollAlwaysEnabled : 1; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 37aaf4d..521f053 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -74,12 +74,10 @@ struct TransferableObjectDescriptor sal_uInt32 mnOle2Misc; OUString maTypeName; OUString maDisplayName; - bool mbCanLink; TransferableObjectDescriptor() : mnViewAspect(css::embed::Aspects::MSOLE_CONTENT) , mnOle2Misc(0) - , mbCanLink(false) {} SVT_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 7b6d097..77caa1a 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -236,7 +236,6 @@ private: bool mbScroll : 1; bool mbFullMode : 1; bool mbEdgeBlending : 1; - bool mbIsTransientChildrenDisabled : 1; bool mbHasVisibleItems : 1; friend class ValueSetAcc; diff --git a/include/svtools/viewdataentry.hxx b/include/svtools/viewdataentry.hxx index 15acf85..8226cfb 100644 --- a/include/svtools/viewdataentry.hxx +++ b/include/svtools/viewdataentry.hxx @@ -50,7 +50,6 @@ class SVT_DLLPUBLIC SvViewDataEntry bool mbHighlighted:1; bool mbExpanded:1; bool mbFocused:1; - bool mbCursored:1; bool mbSelectable:1; Rectangle maPaintRectangle; @@ -63,7 +62,6 @@ public: bool IsHighlighted() const { return mbHighlighted;} bool IsExpanded() const { return mbExpanded;} bool HasFocus() const { return mbFocused;} - bool IsCursored() const { return mbCursored;} bool IsSelectable() const { return mbSelectable;} void SetFocus( bool bFocus ); void SetSelected( bool bSelected ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index ba371ad..eb9b363 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1540,7 +1540,6 @@ void SdPageObjsTLB::AddShapeToTransferable ( aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else aObjectDescriptor.maDisplayName.clear(); - aObjectDescriptor.mbCanLink = false; rTransferable.SetStartPos(aDragPos); rTransferable.SetObjectDescriptor( aObjectDescriptor ); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index e51bc60..8e9da15 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -187,7 +187,6 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObje aObjDesc.maSize = GetAllMarkedRect().GetSize(); aObjDesc.maDragStartPos = rDragPos; aObjDesc.maDisplayName = aDisplayName; - aObjDesc.mbCanLink = false; pTransferable->SetStartPos( rDragPos ); pTransferable->SetObjectDescriptor( aObjDesc ); diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 2bf85bd..66a30a0 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -165,7 +165,6 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MAP_100TH_MM ); rDesc.maDragStartPos = Point(); rDesc.maDisplayName.clear(); - rDesc.mbCanLink = false; } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 9f42bf8..bda9a21 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1949,7 +1949,6 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla aDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapUnit, MAP_100TH_MM ); aDesc.maDragStartPos = Point(); aDesc.maDisplayName.clear(); - aDesc.mbCanLink = false; SvMemoryStream aMemStm( 1024, 1024 ); WriteTransferableObjectDescriptor( aMemStm, aDesc ); diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index d15817b..392140b 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -43,18 +43,12 @@ void ButtonFrame::Draw( OutputDevice& rDev ) rDev.SetFillColor( aColFace ); rDev.DrawRect( aRect ); - if( rDev.GetOutDevType() == OUTDEV_WINDOW ) + if( rDev.GetOutDevType() != OUTDEV_WINDOW ) { - vcl::Window *pWin = static_cast<vcl::Window*>( &rDev ); - if( bPressed ) - pWin->DrawSelectionBackground( aRect, 0, true, false ); - } - else - { - rDev.SetLineColor( bPressed ? aColShadow : aColLight ); + rDev.SetLineColor( aColLight ); rDev.DrawLine( aRect.TopLeft(), Point( aRect.Right(), aRect.Top() ) ); rDev.DrawLine( aRect.TopLeft(), Point( aRect.Left(), aRect.Bottom() - 1 ) ); - rDev.SetLineColor( bPressed ? aColLight : aColShadow ); + rDev.SetLineColor( aColShadow ); rDev.DrawLine( aRect.BottomRight(), Point( aRect.Right(), aRect.Top() ) ); rDev.DrawLine( aRect.BottomRight(), Point( aRect.Left(), aRect.Bottom() ) ); } diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index b320138..b870e7d 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -38,7 +38,6 @@ class ButtonFrame Rectangle aRect; Rectangle aInnerRect; OUString aText; - bool bPressed; bool m_bDrawDisabled; public: @@ -49,7 +48,6 @@ public: ,aInnerRect( Point( aRect.Left()+1, aRect.Top()+1 ), Size( aRect.GetWidth()-2, aRect.GetHeight()-2 ) ) ,aText(rText) - ,bPressed(false) ,m_bDrawDisabled(_bDrawDisabled) { } diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 553b6fd..1e72678 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -65,7 +65,6 @@ class SvtAccessibilityOptions_Impl { private: css::uno::Reference< css::container::XNameAccess > m_xCfg; - bool bIsModified; public: SvtAccessibilityOptions_Impl(); @@ -109,8 +108,6 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl() s_sAccessibility, ::comphelper::EConfigurationModes::Standard ), css::uno::UNO_QUERY); - - bIsModified = false; } catch(const css::uno::Exception& ex) { diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index bde49a1..1805465 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -67,7 +67,6 @@ ColorConfig_Impl* ColorConfig::m_pImpl = nullptr; class ColorConfig_Impl : public utl::ConfigItem { ColorConfigValue m_aConfigValues[ColorConfigEntryCount]; - bool m_bEditMode; OUString m_sLoadedScheme; bool m_bAutoDetectSystemHC; @@ -192,15 +191,11 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme) ColorConfig_Impl::ColorConfig_Impl() : ConfigItem("Office.UI/ColorScheme"), - m_bEditMode(false), m_bAutoDetectSystemHC(true) { - if(!m_bEditMode) - { - //try to register on the root node - if possible - uno::Sequence < OUString > aNames(1); - EnableNotification( aNames ); - } + //try to register on the root node - if possible + uno::Sequence < OUString > aNames(1); + EnableNotification( aNames ); if (!utl::ConfigManager::IsAvoidConfig()) Load(OUString()); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 7856b7b..381767f 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -68,7 +68,6 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster TDisplayNames m_aComponentDisplayNames; ::std::vector<TComponents::iterator> m_aConfigValuesPos; - bool m_bEditMode; OUString m_sLoadedScheme; bool m_bIsBroadcastEnabled; static bool m_bLockBroadcast; @@ -197,15 +196,11 @@ bool ExtendedColorConfig_Impl::m_bLockBroadcast = false; bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = false; ExtendedColorConfig_Impl::ExtendedColorConfig_Impl() : ConfigItem(OUString("Office.ExtendedColorScheme")), - m_bEditMode(false), m_bIsBroadcastEnabled(true) { - if(!m_bEditMode) - { - //try to register on the root node - if possible - uno::Sequence < OUString > aNames(1); - EnableNotification( aNames ); - } + //try to register on the root node - if possible + uno::Sequence < OUString > aNames(1); + EnableNotification( aNames ); Load(OUString()); ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 433652b..dbad90e 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -175,7 +175,6 @@ private: bool mbResizeDisabled : 1; bool mbAutoResize : 1; bool mbEnableDelete : 1; - bool mbEnableRename : 1; bool mbShowHeader; void DeleteEntries(); @@ -486,7 +485,6 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, mbResizeDisabled ( false ), mbAutoResize ( false ), mbEnableDelete ( false ), - mbEnableRename ( true ), mbShowHeader ( !(nFlags & FileViewFlags::SHOW_NONE) ) { Size aBoxSize = pParentWin->GetSizePixel(); @@ -630,7 +628,7 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) VclPtr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() { bool bEnableDelete = mbEnableDelete; - bool bEnableRename = mbEnableRename; + bool bEnableRename = true; if ( bEnableDelete || bEnableRename ) { diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx index bfa6783..b2d3bca 100644 --- a/svtools/source/contnr/iconview.cxx +++ b/svtools/source/contnr/iconview.cxx @@ -139,7 +139,7 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY, Wallpaper aWallpaper = rRenderContext.GetBackground(); - if (pViewDataEntry->IsHighlighted() && !pViewDataEntry->IsCursored()) + if (pViewDataEntry->IsHighlighted()) { Color aNewWallColor = rSettings.GetHighlightColor(); if (!bInUse) diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 64b2d3d..ef8a25c 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1552,24 +1552,8 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect, { OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false); - Color aOldFontColor = rRenderContext.GetTextColor(); - if (pView->AutoFontColor()) - { - Color aBkgColor(rRenderContext.GetBackground().GetColor()); - Color aFontColor; - sal_uInt16 nColor = (aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue()) / 3; - if (nColor > 127) - aFontColor.SetColor(COL_BLACK); - else - aFontColor.SetColor(COL_WHITE); - rRenderContext.SetTextColor(aFontColor); - } - rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags); - if (pView->AutoFontColor()) - rRenderContext.SetTextColor(aOldFontColor); - if (pEntry->IsFocused()) { Rectangle aRect (CalcFocusRect(pEntry)); diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 886095e..5b48497 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -74,9 +74,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) Control( pParent, nWinStyle | WB_CLIPCHILDREN ), _pCurKeyEvent ( nullptr ), - _pImpl ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ), - _bAutoFontColor ( false ) - + _pImpl ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ) { SetLineColor(); _pImpl->InitSettings(); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 4a4f48f..0a1e143 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2854,7 +2854,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render bool bSelTab = bool(nFlags & SvLBoxTabFlags::SHOW_SELECTION); sal_uInt16 nItemType = pItem->GetType(); - if (pViewDataEntry->IsHighlighted() && bSelTab && !pViewDataEntry->IsCursored()) + if (pViewDataEntry->IsHighlighted() && bSelTab) { Color aNewWallColor = rSettings.GetHighlightColor(); if (!bInUse || nItemType != SV_ITEM_ID_LBOXCONTEXTBMP) @@ -2961,19 +2961,6 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render nCurItem++; nCurTab++; } - if (pViewDataEntry->IsCursored() && !HasFocus()) - { - // cursor emphasis - rRenderContext.SetFillColor(); - Color aOldLineColor = rRenderContext.GetLineColor(); - rRenderContext.SetLineColor(Color(COL_BLACK)); - aRect = GetFocusRect(&rEntry, nLine); - aRect.Top()++; - aRect.Bottom()--; - rRenderContext.DrawRect(aRect); - rRenderContext.SetLineColor(aOldLineColor); - rRenderContext.SetFillColor(aBackupColor); - } if (bCurFontIsSel) { diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx index 2644ccf..353d891 100644 --- a/svtools/source/contnr/viewdataentry.cxx +++ b/svtools/source/contnr/viewdataentry.cxx @@ -25,7 +25,6 @@ SvViewDataEntry::SvViewDataEntry() : mbHighlighted(false), mbExpanded(false), mbFocused(false), - mbCursored(false), mbSelectable(true), maPaintRectangle() { @@ -37,7 +36,6 @@ SvViewDataEntry::SvViewDataEntry( const SvViewDataEntry& rData ) : mbHighlighted(false), mbExpanded(rData.mbExpanded), mbFocused(false), - mbCursored(rData.mbCursored), mbSelectable(rData.mbSelectable), maPaintRectangle(rData.maPaintRectangle) { diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 4ce2033..3de8830 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -159,7 +159,6 @@ void Calendar::ImplInit( WinBits nWinStyle ) mnWinStyle = nWinStyle; mnFirstYear = 0; mnLastYear = 0; - mnRequestYear = 0; mbCalc = true; mbFormat = true; mbDrag = false; @@ -172,7 +171,6 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbPrevIn = false; mbNextIn = false; mbDirect = false; - mbInSelChange = false; mbTravelSelect = false; mbScrollDateRange = false; mbSelLeft = false; @@ -473,7 +471,6 @@ void Calendar::ImplFormat() mnFirstYear = nNewFirstYear; mnLastYear = nNewLastYear; } - mnRequestYear = 0; mbFormat = false; } @@ -1098,10 +1095,6 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, bool bNewSel = *pOldSel != *mpSelectTable; if ( (maCurDate != aOldDate) || bNewSel ) { - if ( bNewSel ) - { - mbInSelChange = false; - } HideFocus(); if ( bNewSel ) ImplUpdateSelection( pOldSel.get() ); @@ -1493,7 +1486,6 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) SetCurDate( aNewDate ); mbDirect = false; maAnchorDate = aOldAnchorDate; - mbInSelChange = false; ImplUpdateSelection( pOldSel.get() ); } else @@ -1662,8 +1654,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect ) std::unique_ptr<IntDateSet> pOldSel; - if ( !mbInSelChange ) - pOldSel.reset(new IntDateSet( *mpSelectTable )); + pOldSel.reset(new IntDateSet( *mpSelectTable )); ImplCalendarSelectDate( mpSelectTable, rDate, bSelect ); @@ -1675,8 +1666,7 @@ void Calendar::SetNoSelection() { std::unique_ptr<IntDateSet> pOldSel; - if ( !mbInSelChange ) - pOldSel.reset(new IntDateSet( *mpSelectTable )); + pOldSel.reset(new IntDateSet( *mpSelectTable )); ImplCalendarClearSelectDate( mpSelectTable ); diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 5f45246..dd4b05c 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -41,7 +41,6 @@ FileControl::FileControl( vcl::Window* pParent, WinBits nStyle ) : mnInternalFlags( FileControlMode_Internal::ORIGINALBUTTONTEXT ) { maButton->SetClickHdl( LINK( this, FileControl, ButtonHdl ) ); - mbOpenDlg = true; maButton->Show(); maEdit->Show(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 345a8f9..9d36f56 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -220,7 +220,6 @@ struct ImplTabBarItem OString maHelpId; bool mbShort : 1; bool mbSelect : 1; - bool mbEnable : 1; Color maTabBgColor; Color maTabTextColor; @@ -231,7 +230,6 @@ struct ImplTabBarItem , mnWidth(0) , mbShort(false) , mbSelect(false) - , mbEnable(true) , maTabBgColor(Color(COL_AUTO)) , maTabTextColor(Color(COL_AUTO)) { @@ -567,8 +565,6 @@ void TabBar::ImplInit( WinBits nWinStyle ) mbEditCanceled = false; mbDropPos = false; mbInSelect = false; - mbSelColor = false; - mbSelTextColor = false; mbMirrored = false; mbScrollAlwaysEnabled = false; @@ -663,14 +659,8 @@ void TabBar::ImplGetColors(const StyleSettings& rStyleSettings, rFaceTextColor = GetControlForeground(); else rFaceTextColor = rStyleSettings.GetButtonTextColor(); - if (mbSelColor) - rSelectColor = maSelColor; - else - rSelectColor = rStyleSettings.GetActiveTabColor(); - if (mbSelTextColor) - rSelectTextColor = maSelTextColor; - else - rSelectTextColor = rStyleSettings.GetWindowTextColor(); + rSelectColor = rStyleSettings.GetActiveTabColor(); + rSelectTextColor = rStyleSettings.GetWindowTextColor(); // For 3D-tabs the selection- and face-colours are swapped, // as the selected tabs should appear in 3D @@ -997,17 +987,14 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt) sal_uInt16 nPos = GetPagePos( nSelId ); pItem = mpImpl->mpItemList[nPos]; - if (pItem->mbEnable) + if (ImplDeactivatePage()) { - if (ImplDeactivatePage()) - { - SetCurPageId(nSelId); - Update(); - ImplActivatePage(); - ImplSelect(); - } - mbInSelect = true; + SetCurPageId(nSelId); + Update(); + ImplActivatePage(); + ImplSelect(); } + mbInSelect = true; } return; } @@ -1025,87 +1012,83 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt) sal_uInt16 nPos = GetPagePos(nSelId); pItem = mpImpl->mpItemList[nPos]; - if (pItem->mbEnable) - { - bool bSelectTab = false; + bool bSelectTab = false; - if ((rMEvt.GetMode() & MouseEventModifiers::MULTISELECT) && (mnWinStyle & WB_MULTISELECT)) + if ((rMEvt.GetMode() & MouseEventModifiers::MULTISELECT) && (mnWinStyle & WB_MULTISELECT)) + { + if (nSelId != mnCurPageId) { - if (nSelId != mnCurPageId) - { - SelectPage(nSelId, !IsPageSelected(nSelId)); - bSelectTab = true; - } + SelectPage(nSelId, !IsPageSelected(nSelId)); + bSelectTab = true; } - else if (mnWinStyle & (WB_MULTISELECT | WB_RANGESELECT)) + } + else if (mnWinStyle & (WB_MULTISELECT | WB_RANGESELECT)) + { + bSelectTab = true; + sal_uInt16 n; + bool bSelect; + sal_uInt16 nCurPos = GetPagePos(mnCurPageId); + if (nPos <= nCurPos) { - bSelectTab = true; - sal_uInt16 n; - bool bSelect; - sal_uInt16 nCurPos = GetPagePos(mnCurPageId); - if (nPos <= nCurPos) + // Deselect all tabs till the clicked tab + // and select all tabs from the clicked tab + // 'till the actual position + n = 0; + while (n < nCurPos) { - // Deselect all tabs till the clicked tab - // and select all tabs from the clicked tab - // 'till the actual position - n = 0; - while (n < nCurPos) + pItem = mpImpl->mpItemList[n]; + if (n < nPos) + bSelect = false; + else + bSelect = true; + + if (pItem->mbSelect != bSelect) { - pItem = mpImpl->mpItemList[n]; - if (n < nPos) - bSelect = false; - else - bSelect = true; - - if (pItem->mbSelect != bSelect) - { - pItem->mbSelect = bSelect; - if (!pItem->maRect.IsEmpty()) - Invalidate(pItem->maRect); - } - - n++; + pItem->mbSelect = bSelect; + if (!pItem->maRect.IsEmpty()) + Invalidate(pItem->maRect); } + + n++; } + } - if (nPos >= nCurPos) + if (nPos >= nCurPos) + { + // Select all tabs from the actual position till the clicked tab + // and deselect all tabs from the actual position + // till the last tab + sal_uInt16 nCount = mpImpl->getItemSize(); + n = nCurPos; + while (n < nCount) { - // Select all tabs from the actual position till the clicked tab - // and deselect all tabs from the actual position - // till the last tab - sal_uInt16 nCount = mpImpl->getItemSize(); - n = nCurPos; - while (n < nCount) - { - pItem = mpImpl->mpItemList[n]; - - if (n <= nPos) - bSelect = true; - else - bSelect = false; + pItem = mpImpl->mpItemList[n]; - if (pItem->mbSelect != bSelect) - { - pItem->mbSelect = bSelect; - if (!pItem->maRect.IsEmpty()) - Invalidate(pItem->maRect); - } + if (n <= nPos) + bSelect = true; + else + bSelect = false; - n++; + if (pItem->mbSelect != bSelect) + { + pItem->mbSelect = bSelect; + if (!pItem->maRect.IsEmpty()) + Invalidate(pItem->maRect); } - } - } - // scroll the selected tab if required - if (bSelectTab) - { - ImplShowPage(nPos); - Update(); - ImplSelect(); + n++; + } } } - else + + // scroll the selected tab if required + if (bSelectTab) + { ImplShowPage(nPos); + Update(); + ImplSelect(); + } + mbInSelect = true; return; @@ -1137,38 +1120,34 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt) sal_uInt16 nPos = GetPagePos(nSelId); pItem = mpImpl->mpItemList[nPos]; - if (pItem->mbEnable) + if (!pItem->mbSelect) { - if (!pItem->mbSelect) - { - // make not valid - bool bUpdate = false; - if (IsReallyVisible() && IsUpdateMode()) - bUpdate = true; + // make not valid + bool bUpdate = false; + if (IsReallyVisible() && IsUpdateMode()) + bUpdate = true; - // deselect all selected items - for (ImplTabBarItem* i : mpImpl->mpItemList) + // deselect all selected items + for (ImplTabBarItem* i : mpImpl->mpItemList) + { + pItem = i; + if (pItem->mbSelect || (pItem->mnId == mnCurPageId)) { - pItem = i; - if (pItem->mbSelect || (pItem->mnId == mnCurPageId)) - { - pItem->mbSelect = false; - if (bUpdate) - Invalidate(pItem->maRect); - } + pItem->mbSelect = false; + if (bUpdate) + Invalidate(pItem->maRect); } } + } - if (ImplDeactivatePage()) - { - SetCurPageId(nSelId); - Update(); - ImplActivatePage(); - ImplSelect(); - } + if (ImplDeactivatePage()) + { + SetCurPageId(nSelId); + Update(); + ImplActivatePage(); + ImplSelect(); } - else - ImplShowPage(nPos); + mbInSelect = true; } @@ -1243,14 +1222,13 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect) // We disable custom background color in high contrast mode. bool bCustomBgColor = !pItem->IsDefaultTabBgColor() && !rStyleSettings.GetHighContrastMode(); bool bSpecialTab = (pItem->mnBits & TPB_SPECIAL); - bool bEnabled = pItem->mbEnable; OUString aText = pItem->mbShort ? rRenderContext.GetEllipsisString(pItem->maText, mnCurMaxWidth) : pItem->maText; aDrawer.setRect(aRect); aDrawer.setSelected(bSelected); aDrawer.setCustomColored(bCustomBgColor); aDrawer.setSpecialTab(bSpecialTab); - aDrawer.setEnabled(bEnabled); + aDrawer.setEnabled(true); aDrawer.setCustomColor(pItem->maTabBgColor); aDrawer.drawTab(); @@ -1822,7 +1800,7 @@ bool TabBar::IsPageEnabled(sal_uInt16 nPageId) const sal_uInt16 nPos = GetPagePos(nPageId); if (nPos != PAGE_NOT_FOUND) - return mpImpl->mpItemList[nPos]->mbEnable; + return true; else return false; } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index e3bdbeb..aff6c90 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -101,7 +101,6 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) : maColor( COL_TRANSPARENT ) { ImplInit(); - mbIsTransientChildrenDisabled = false; } VCL_BUILDER_DECL_FACTORY(ValueSet) @@ -121,7 +120,6 @@ ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId ) : maColor( COL_TRANSPARENT ) { ImplInit(); - mbIsTransientChildrenDisabled = false; } ValueSet::~ValueSet() @@ -152,7 +150,7 @@ void ValueSet::ImplDeleteItems() Any aOldAny; Any aNewAny; - aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); + aOldAny <<= pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ); ImplFireAccessibleEvent(AccessibleEventId::CHILD, aOldAny, aNewAny); } @@ -368,7 +366,7 @@ void ValueSet::ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* Reference<XAccessible> ValueSet::CreateAccessible() { - return new ValueSetAcc( this, mbIsTransientChildrenDisabled ); + return new ValueSetAcc( this, false/*bIsTransientChildrenDisabled*/ ); } void ValueSet::Format(vcl::RenderContext& rRenderContext) @@ -653,7 +651,7 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext) Any aOldAny; Any aNewAny; - aNewAny <<= pItem->GetAccessible(mbIsTransientChildrenDisabled); + aNewAny <<= pItem->GetAccessible(false/*bIsTransientChildrenDisabled*/); ImplFireAccessibleEvent(AccessibleEventId::CHILD, aOldAny, aNewAny); } @@ -675,7 +673,7 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext) Any aOldAny; Any aNewAny; - aOldAny <<= pItem->GetAccessible(mbIsTransientChildrenDisabled); + aOldAny <<= pItem->GetAccessible(false/*bIsTransientChildrenDisabled*/); ImplFireAccessibleEvent(AccessibleEventId::CHILD, aOldAny, aNewAny); } @@ -1905,22 +1903,14 @@ void ValueSet::SelectItem( sal_uInt16 nItemId ) if( nPos != VALUESET_ITEM_NOTFOUND ) { ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation( - mItemList[nPos]->GetAccessible( mbIsTransientChildrenDisabled ) ); + mItemList[nPos]->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); if( pItemAcc ) { Any aOldAny; Any aNewAny; - if( !mbIsTransientChildrenDisabled ) - { - aOldAny <<= Reference<XInterface>(static_cast<cppu::OWeakObject*>(pItemAcc)); - ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); - } - else - { - aOldAny <<= AccessibleStateType::FOCUSED; - pItemAcc->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny); - } + aOldAny <<= Reference<XInterface>(static_cast<cppu::OWeakObject*>(pItemAcc)); + ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); } } } @@ -1936,22 +1926,14 @@ void ValueSet::SelectItem( sal_uInt16 nItemId ) ValueItemAcc* pItemAcc = nullptr; if (pItem != nullptr) - pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( mbIsTransientChildrenDisabled ) ); + pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); if( pItemAcc ) { Any aOldAny; Any aNewAny; - if( !mbIsTransientChildrenDisabled ) - { - aNewAny <<= Reference<XInterface>(static_cast<cppu::OWeakObject*>(pItemAcc)); - ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny); - } - else - { - aNewAny <<= AccessibleStateType::FOCUSED; - pItemAcc->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny); - } + aNewAny <<= Reference<XInterface>(static_cast<cppu::OWeakObject*>(pItemAcc)); + ImplFireAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny); } // selection event @@ -2098,7 +2080,7 @@ void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) if (ImplHasAccessibleListeners()) { - Reference<XAccessible> xAccessible(pItem->GetAccessible( mbIsTransientChildrenDisabled)); + Reference<XAccessible> xAccessible(pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/)); ValueItemAcc* pValueItemAcc = static_cast<ValueItemAcc*>(xAccessible.get()); pValueItemAcc->FireAccessibleEvent(AccessibleEventId::NAME_CHANGED, aOldName, aNewName); } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 2fc608b..2e46c34 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -32,8 +32,7 @@ using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder ) : - m_bIsActive ( true ) +DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder ) { pBuilder->get( m_pDetailsGrid, "Details" ); pBuilder->get( m_pHostBox, "HostDetails" ); @@ -52,7 +51,7 @@ DetailsContainer::~DetailsContainer( ) void DetailsContainer::show( bool ) { - m_pDetailsGrid->Enable( m_bIsActive ); + m_pDetailsGrid->Enable(); m_pEDHost->SetModifyHdl( LINK( this, DetailsContainer, ValueChangeHdl ) ); m_pEDPort->SetModifyHdl( LINK( this, DetailsContainer, ValueChangeHdl ) ); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index dd9799c..88f3df5 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -538,7 +538,6 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, , maOriginalSize(awt::Size(0, 0)) , mbIsPixelFormat(bIsPixelFormat) , mbExportSelection(bExportSelection) - , mbPreserveAspectRatio(true) { get(mpMfSizeX, "widthmf-nospin"); get(mpMfSizeY, "heightmf-nospin"); @@ -1018,8 +1017,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); maSize.Width = aDest.Width(); - if ( mbPreserveAspectRatio ) - maSize.Height = aDest.Height(); + maSize.Height = aDest.Height(); } updateControls(); } @@ -1051,8 +1049,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); maSize.Height = aDest.Height(); - if ( mbPreserveAspectRatio ) - maSize.Width = aDest.Width(); + maSize.Width = aDest.Width(); } updateControls(); } diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index b25e99c..29dd689 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -124,7 +124,6 @@ private: bool mbIsPixelFormat; bool mbExportSelection; - bool mbPreserveAspectRatio; sal_Int32 mnInitialResolutionUnit; diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 3606681..f4d268c 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -60,8 +60,7 @@ GraphicDescriptor::GraphicDescriptor() : meType( GraphicType::NONE ), mnBitsPerPixel ( 0 ), mbTransparent ( false ), - mbAlpha( false ), - mbAnimated( false ) + mbAlpha( false ) { } @@ -150,7 +149,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) maSize100thMM = aDescriptor.GetSize_100TH_MM(); mnBitsPerPixel = aDescriptor.GetBitsPerPixel(); mbTransparent = ( graphic::GraphicType::VECTOR == cType ); - mbAlpha = mbAnimated = false; + mbAlpha = false; } } } @@ -425,7 +424,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case UnoGraphicProperty::Animated: { - *pValues <<= mpGraphic ? mpGraphic->IsAnimated() : mbAnimated; + *pValues <<= mpGraphic && mpGraphic->IsAnimated(); } break; } diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index 24045bd9..026bd4a 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -110,7 +110,6 @@ private: sal_uInt16 mnBitsPerPixel; bool mbTransparent; bool mbAlpha; - bool mbAnimated; GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete; diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index adb8df1..c4014ba 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -34,7 +34,6 @@ SvResizeHelper::SvResizeHelper() : aBorder( 5, 5 ) , nGrab( -1 ) - , bResizeable( true ) { } @@ -121,15 +120,12 @@ void SvResizeHelper::Draw(vcl::RenderContext& rRenderContext) sal_uInt16 i; for (i = 0; i < 4; i++) rRenderContext.DrawRect(aMoveRects[i]); - if (bResizeable) - { - // draw handles - rRenderContext.SetFillColor(aColBlack); - Rectangle aRects[ 8 ]; - FillHandleRectsPixel(aRects); - for (i = 0; i < 8; i++) - rRenderContext.DrawRect( aRects[ i ] ); - } + // draw handles + rRenderContext.SetFillColor(aColBlack); + Rectangle aRects[ 8 ]; + FillHandleRectsPixel(aRects); + for (i = 0; i < 8; i++) + rRenderContext.DrawRect( aRects[ i ] ); rRenderContext.Pop(); } @@ -175,14 +171,11 @@ short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { - if( bResizeable ) - { - Rectangle aRects[ 8 ]; - FillHandleRectsPixel( aRects ); - for( sal_uInt16 i = 0; i < 8; i++ ) - if( aRects[ i ].IsInside( rPos ) ) - return i; - } + Rectangle aRects[ 8 ]; + FillHandleRectsPixel( aRects ); + for( sal_uInt16 i = 0; i < 8; i++ ) + if( aRects[ i ].IsInside( rPos ) ) + return i; // Move-Rect overlaps Handles Rectangle aMoveRects[ 4 ]; FillMoveRectsPixel( aMoveRects ); diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index ea60cb2..bc61297 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -31,7 +31,6 @@ class SvResizeHelper Rectangle aOuter; short nGrab; // -1 no Grab, 0 - 7, 8 = Move, see FillHandle... Point aSelPos; - bool bResizeable; public: SvResizeHelper(); diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index d4cf648..b033987 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -30,8 +30,7 @@ namespace svt JavaContext::JavaContext( const Reference< XCurrentContext > & ctx) : m_aRefCount(0), - m_xNextContext( ctx ), - m_bShowErrorsOnce(true) + m_xNextContext( ctx ) { } @@ -69,7 +68,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeEx { osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); if (!m_xHandler.is()) - m_xHandler.set( new JavaInteractionHandler(m_bShowErrorsOnce)); + m_xHandler.set( new JavaInteractionHandler(true/*bShowErrorsOnce*/)); } retVal = makeAny(m_xHandler); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index f1a6184..c133fe2 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -250,7 +250,6 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject rDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapMode, MapMode( MAP_100TH_MM ) ); rDesc.maDragStartPos = Point(); rDesc.maDisplayName.clear(); - rDesc.mbCanLink = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 7edaafa..987051b 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -39,7 +39,6 @@ SvRTFParser::SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize ) : SvParser( rIn, nStackSize ) , nOpenBrakets(0) , eCodeSet(RTL_TEXTENCODING_MS_1252) - , eUNICodeSet(RTL_TEXTENCODING_MS_1252) // default ist ANSI-CodeSet , nUCharOverread(1) { // default ist ANSI-CodeSet @@ -566,7 +565,6 @@ SvParserState SvRTFParser::CallParser() eState = SVPAR_WORKING; nOpenBrakets = 0; SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); - eUNICodeSet = RTL_TEXTENCODING_MS_1252; // default is ANSI-CodeSet // the first two tokens should be '{' and \\rtf !! if( '{' == GetNextToken() && RTF_RTF == GetNextToken() ) diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index b01e9c1..cb75480 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -71,7 +71,6 @@ SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize ) , eSrcEnc( RTL_TEXTENCODING_DONTKNOW ) , nNextChPos(0) , nNextCh(0) - , bDownloadingFile(false) , bUCS2BSrcEnc(false) , bSwitchToUCS2(false) , bRTF_InTextRead(false) @@ -621,11 +620,6 @@ IMPL_LINK_NOARG_TYPED( SvParser, NewDataRead, LinkParamNone*, void ) switch( eState ) { case SVPAR_PENDING: - // if file is loaded we are not allowed to continue - // instead should ignore the call. - if( IsDownloadingFile() ) - break; - eState = SVPAR_WORKING; RestoreState(); diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 9735b5c..821feba 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -49,7 +49,6 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo :OPropertyContainer(GetBroadcastHelper()) ,m_pDialog(nullptr) ,m_bExecuting(false) - ,m_bCanceled(false) ,m_bTitleAmbiguous(true) ,m_bInitialized( false ) ,m_bNeedInitialization( false ) @@ -212,7 +211,6 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e *this ); - m_bCanceled = false; m_bExecuting = true; if ( !impl_ensureDialog_lck() ) @@ -227,12 +225,6 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e nReturn = pDialogToExecute->Execute(); { - ::osl::MutexGuard aExecutionGuard(m_aExecutionMutex); - if (m_bCanceled) - nReturn = RET_CANCEL; - } - - { ::osl::MutexGuard aGuard(m_aMutex); // get the settings of the dialog diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 44db22d..85e7a6a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -982,7 +982,6 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) //ObjectDescriptor was already filly from the old DocShell. //Now adjust it. Thus in GetData the first query can still //be answered with delayed rendering. - m_aObjDesc.mbCanLink = false; Size aSz( OLESIZE ); m_aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM ); @@ -1076,7 +1075,6 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr //ObjectDescriptor was already filled from the old DocShell. //Now adjust it. Thus in GetData the first query can still //be answered with delayed rendering. - m_aObjDesc.mbCanLink = false; Size aSz( OLESIZE ); m_aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM ); @@ -3096,7 +3094,6 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) //ObjectDescriptor was already filled from the old DocShell. //Now adjust it. Thus in GetData the first query can still //be answered with delayed rendering. - m_aObjDesc.mbCanLink = false; m_aObjDesc.maDragStartPos = rSttPos; m_aObjDesc.maSize = OutputDevice::LogicToLogic( Size( OLESIZE ), MAP_TWIP, MAP_100TH_MM ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits