[Libreoffice-commits] core.git: basctl/source cui/source dbaccess/source extensions/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 12 11:48:54 UTC 2018
basctl/source/accessibility/accessibledialogwindow.cxx | 12 --
basctl/source/inc/accessibledialogwindow.hxx | 1
cui/source/inc/border.hxx | 1
cui/source/inc/paragrph.hxx | 1
cui/source/inc/tabstpge.hxx | 1
cui/source/options/treeopt.cxx | 14 --
cui/source/tabpages/border.cxx | 80 +++++------------
cui/source/tabpages/paragrph.cxx | 7 -
cui/source/tabpages/tabstpge.cxx | 3
dbaccess/source/ui/dlg/directsql.cxx | 7 -
dbaccess/source/ui/inc/JoinTableView.hxx | 2
dbaccess/source/ui/inc/directsql.hxx | 1
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4
extensions/source/bibliography/framectr.cxx | 4
extensions/source/bibliography/framectr.hxx | 1
15 files changed, 36 insertions(+), 103 deletions(-)
New commits:
commit bf8c1e277159b82362ed8f3a83d1abd0460a25c8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 12 08:50:53 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 12 12:48:32 2018 +0100
loplugin:singlevalfields in accessibility..extensions
Change-Id: Id3a3241af83f769fc60f67e01c9129d6f4b5c2af
Reviewed-on: https://gerrit.libreoffice.org/63274
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 3c5987a2cb28..07a7d0704e98 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -77,7 +77,6 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow)
: m_pDialogWindow(pDialogWindow)
- , m_pDlgEditor(nullptr)
, m_pDlgEdModel(nullptr)
{
if ( m_pDialogWindow )
@@ -110,9 +109,6 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
if ( m_pDialogWindow )
m_pDialogWindow->RemoveEventListener( LINK( this, AccessibleDialogWindow, WindowEventListener ) );
- if ( m_pDlgEditor )
- EndListening( *m_pDlgEditor );
-
if ( m_pDlgEdModel )
EndListening( *m_pDlgEdModel );
}
@@ -375,10 +371,6 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
m_pDialogWindow->RemoveEventListener( LINK( this, AccessibleDialogWindow, WindowEventListener ) );
m_pDialogWindow = nullptr;
- if ( m_pDlgEditor )
- EndListening( *m_pDlgEditor );
- m_pDlgEditor = nullptr;
-
if ( m_pDlgEdModel )
EndListening( *m_pDlgEdModel );
m_pDlgEdModel = nullptr;
@@ -524,10 +516,6 @@ void AccessibleDialogWindow::disposing()
m_pDialogWindow->RemoveEventListener( LINK( this, AccessibleDialogWindow, WindowEventListener ) );
m_pDialogWindow = nullptr;
- if ( m_pDlgEditor )
- EndListening( *m_pDlgEditor );
- m_pDlgEditor = nullptr;
-
if ( m_pDlgEdModel )
EndListening( *m_pDlgEdModel );
m_pDlgEdModel = nullptr;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 99e34ee06475..5b362fa6df96 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -73,7 +73,6 @@ private:
AccessibleChildren m_aAccessibleChildren;
VclPtr<basctl::DialogWindow> m_pDialogWindow;
- DlgEditor* m_pDlgEditor;
DlgEdModel* m_pDlgEdModel;
void UpdateFocused();
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index f2994a3fadb2..009048d738fb 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -115,7 +115,6 @@ private:
bool mbTLBREnabled; ///< true = Top-left to bottom-right border enabled.
bool mbBLTREnabled; ///< true = Bottom-left to top-right border enabled.
bool mbUseMarginItem;
- bool mbAllowPaddingWithoutBorders;
bool mbLeftModified;
bool mbRightModified;
bool mbTopModified;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 8acc4f4ea4bd..bbcb7b3d3f68 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -53,7 +53,6 @@ class SvxStdParagraphTabPage: public SfxTabPage
private:
SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- long nAbst;
long nWidth;
long nMinFixDist;
bool bRelativeMode;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index a6a7b6cb3ac5..d244064b5c67 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -88,7 +88,6 @@ private:
SvxTabStop aCurrentTab;
SvxTabStopItem aNewTabs;
long nDefDist;
- FieldUnit eDefUnit;
TabWin_Impl m_aLeftWin;
TabWin_Impl m_aRightWin;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index a33079c99989..62179f315de4 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -471,12 +471,11 @@ struct OptionsGroupInfo
sal_uInt16 m_nDialogId; // Id of the former dialog
bool m_bLoadError; // load fails?
OUString m_sPageURL;
- VclPtr<ExtensionsTabPage> m_pExtPage;
OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) :
m_pShell( pSh ),
m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( false ),
- m_sPageURL( OUString() ), m_pExtPage( nullptr ) {}
+ m_sPageURL( OUString() ) {}
};
#define INI_LIST() \
@@ -597,8 +596,6 @@ void OfaTreeOptionsDialog::dispose()
if(!pTreeLB->GetParent(pEntry))
{
OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
- if ( pGroupInfo )
- pGroupInfo->m_pExtPage.disposeAndClear();
delete pGroupInfo;
}
pEntry = pTreeLB->Next(pEntry);
@@ -993,15 +990,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pOptPageInfo->m_pExtPage->Hide();
pOptPageInfo->m_pExtPage->DeactivatePage();
}
- else if ( pCurrentPageEntry && !pTreeLB->GetParent( pCurrentPageEntry ) )
- {
- OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pCurrentPageEntry->GetUserData());
- if ( pGroupInfo && pGroupInfo->m_pExtPage )
- {
- pGroupInfo->m_pExtPage->Hide();
- pGroupInfo->m_pExtPage->DeactivatePage();
- }
- }
OptionsPageInfo *pPageInfo = static_cast<OptionsPageInfo *>(pEntry->GetUserData());
OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo *>(pParent->GetUserData());
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ed2c7b4e6991..749505c1fd0f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -231,7 +231,6 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor
, mbTLBREnabled(false)
, mbBLTREnabled(false)
, mbUseMarginItem(false)
- , mbAllowPaddingWithoutBorders(true)
, mbLeftModified(false)
, mbRightModified(false)
, mbTopModified(false)
@@ -930,44 +929,33 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
if( !m_xLeftMF->get_text().isEmpty() || !m_xRightMF->get_text().isEmpty() ||
!m_xTopMF->get_text().isEmpty() || !m_xBottomMF->get_text().isEmpty() )
{
- if ( mbAllowPaddingWithoutBorders
- || ((mbHorEnabled || mbVerEnabled || (nSWMode & SwBorderModes::TABLE)) &&
- (mbLeftModified || mbRightModified || mbTopModified || mbBottomModified) )
- || m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Top ) != svx::FrameBorderState::Hide
- || m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Bottom ) != svx::FrameBorderState::Hide
- || m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Left ) != svx::FrameBorderState::Hide
- || m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Right ) != svx::FrameBorderState::Hide )
+ const SvxBoxInfoItem* pOldBoxInfoItem = GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_INNER );
+ if (
+ !pOldBoxItem ||
+ m_xLeftMF->get_value_changed_from_saved() ||
+ m_xRightMF->get_value_changed_from_saved() ||
+ m_xTopMF->get_value_changed_from_saved() ||
+ m_xBottomMF->get_value_changed_from_saved() ||
+ nMinValue == m_xLeftMF->get_value(FieldUnit::NONE) ||
+ nMinValue == m_xRightMF->get_value(FieldUnit::NONE) ||
+ nMinValue == m_xTopMF->get_value(FieldUnit::NONE) ||
+ nMinValue == m_xBottomMF->get_value(FieldUnit::NONE) ||
+ (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::DISTANCE))
+ )
{
- const SvxBoxInfoItem* pOldBoxInfoItem = GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_INNER );
- if (
- !pOldBoxItem ||
- m_xLeftMF->get_value_changed_from_saved() ||
- m_xRightMF->get_value_changed_from_saved() ||
- m_xTopMF->get_value_changed_from_saved() ||
- m_xBottomMF->get_value_changed_from_saved() ||
- nMinValue == m_xLeftMF->get_value(FieldUnit::NONE) ||
- nMinValue == m_xRightMF->get_value(FieldUnit::NONE) ||
- nMinValue == m_xTopMF->get_value(FieldUnit::NONE) ||
- nMinValue == m_xBottomMF->get_value(FieldUnit::NONE) ||
- (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::DISTANCE))
- )
- {
- aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xLeftMF, eCoreUnit )), SvxBoxItemLine::LEFT );
- aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xRightMF, eCoreUnit )), SvxBoxItemLine::RIGHT );
- aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xTopMF, eCoreUnit )), SvxBoxItemLine::TOP );
- aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xBottomMF, eCoreUnit )), SvxBoxItemLine::BOTTOM);
- }
- else
- {
- aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::LEFT ), SvxBoxItemLine::LEFT);
- aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::RIGHT), SvxBoxItemLine::RIGHT);
- aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::TOP ), SvxBoxItemLine::TOP);
- aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::BOTTOM), SvxBoxItemLine::BOTTOM);
- }
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE );
+ aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xLeftMF, eCoreUnit )), SvxBoxItemLine::LEFT );
+ aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xRightMF, eCoreUnit )), SvxBoxItemLine::RIGHT );
+ aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xTopMF, eCoreUnit )), SvxBoxItemLine::TOP );
+ aBoxItem.SetDistance( static_cast<sal_uInt16>(GetCoreValue(*m_xBottomMF, eCoreUnit )), SvxBoxItemLine::BOTTOM);
}
else
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, false );
+ {
+ aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::LEFT ), SvxBoxItemLine::LEFT);
+ aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::RIGHT), SvxBoxItemLine::RIGHT);
+ aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::TOP ), SvxBoxItemLine::TOP);
+ aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::BOTTOM), SvxBoxItemLine::BOTTOM);
+ }
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE );
}
}
}
@@ -1366,30 +1354,10 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void)
m_xRightMF->set_min(0, FieldUnit::NONE);
m_xTopMF->set_min(0, FieldUnit::NONE);
m_xBottomMF->set_min(0, FieldUnit::NONE);
- if(!bSpaceModified && !mbAllowPaddingWithoutBorders)
- {
- m_xLeftMF->set_value(0, FieldUnit::NONE);
- m_xRightMF->set_value(0, FieldUnit::NONE);
- m_xTopMF->set_value(0, FieldUnit::NONE);
- m_xBottomMF->set_value(0, FieldUnit::NONE);
- }
}
// for tables everything is allowed
SvxBoxInfoItemValidFlags nValid = SvxBoxInfoItemValidFlags::TOP|SvxBoxInfoItemValidFlags::BOTTOM|SvxBoxInfoItemValidFlags::LEFT|SvxBoxInfoItemValidFlags::RIGHT;
- // for other objects (paragraph, page, frame, character) the edit is disabled, if there's no border set
- if(!(nSWMode & SwBorderModes::TABLE) && !mbAllowPaddingWithoutBorders)
- {
- if(bLineSet)
- {
- nValid = (m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Top) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::TOP : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Bottom) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::BOTTOM : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Left) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::LEFT : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_aFrameSel.GetFrameBorderState( svx::FrameBorderType::Right ) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::RIGHT : SvxBoxInfoItemValidFlags::NONE;
- }
- else
- nValid = SvxBoxInfoItemValidFlags::NONE;
- }
m_xLeftFT->set_sensitive( bool(nValid & SvxBoxInfoItemValidFlags::LEFT) );
m_xRightFT->set_sensitive( bool(nValid & SvxBoxInfoItemValidFlags::RIGHT) );
m_xTopFT->set_sensitive( bool(nValid & SvxBoxInfoItemValidFlags::TOP) );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a038007c49fb..c6f989d9f211 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -670,7 +670,6 @@ DeactivateRC SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
: SfxTabPage(pParent, "cui/ui/paraindentspacing.ui", "ParaIndentSpacing", &rAttr)
- , nAbst(MAX_DURCH)
, nWidth(11905 /*567 * 50*/)
, nMinFixDist(0)
, bRelativeMode(false)
@@ -883,9 +882,9 @@ void SvxStdParagraphTabPage::Init_Impl()
DBG_ASSERT( pPool, "Where is the pool?" );
FieldUnit eUnit = MapToFieldUnit( pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ) );
- m_xTopDist->set_max( m_xTopDist->normalize( nAbst ), eUnit );
- m_xBottomDist->set_max( m_xBottomDist->normalize( nAbst ), eUnit );
- m_xLineDistAtMetricBox->set_max( m_xLineDistAtMetricBox->normalize( nAbst ), eUnit );
+ m_xTopDist->set_max( m_xTopDist->normalize( MAX_DURCH ), eUnit );
+ m_xBottomDist->set_max( m_xBottomDist->normalize( MAX_DURCH ), eUnit );
+ m_xLineDistAtMetricBox->set_max( m_xLineDistAtMetricBox->normalize( MAX_DURCH ), eUnit );
}
void SvxStdParagraphTabPage::UpdateExample_Impl()
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 51f864fd6cd7..8220e0b19d04 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -32,6 +32,8 @@
#include <sfx2/request.hxx>
#include <svl/intitem.hxx>
+constexpr FieldUnit eDefUnit = FieldUnit::MM_100TH;
+
const sal_uInt16 SvxTabulatorTabPage::pRanges[] =
{
SID_ATTR_TABSTOP,
@@ -69,7 +71,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet
, aCurrentTab(0)
, aNewTabs(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP))
, nDefDist(0)
- , eDefUnit(FieldUnit::MM_100TH)
, m_xTabSpin(m_xBuilder->weld_metric_spin_button("SP_TABPOS", FieldUnit::CM))
, m_xTabBox(m_xBuilder->weld_entry_tree_view("tabgrid", "ED_TABPOS", "LB_TABPOS"))
, m_xCenterTab(m_xBuilder->weld_radio_button("radiobuttonBTN_TABTYPE_CENTER"))
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 16216f60315f..87f4d956ae63 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -38,10 +38,11 @@ namespace dbaui
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
+ constexpr sal_Int32 g_nHistoryLimit = 20;
+
// DirectSQLDialog
DirectSQLDialog::DirectSQLDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConn )
:ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui")
- ,m_nHistoryLimit(20)
,m_nStatusCount(1)
,m_xConnection(_rxConn)
{
@@ -128,11 +129,11 @@ namespace dbaui
{
CHECK_INVARIANTS("DirectSQLDialog::implEnsureHistoryLimit");
- if (getHistorySize() <= m_nHistoryLimit)
+ if (getHistorySize() <= g_nHistoryLimit)
// nothing to do
return;
- sal_Int32 nRemoveEntries = getHistorySize() - m_nHistoryLimit;
+ sal_Int32 nRemoveEntries = getHistorySize() - g_nHistoryLimit;
while (nRemoveEntries--)
{
m_aStatementHistory.pop_front();
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index a7b228d18fa4..ecd2dcd69d18 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -101,8 +101,6 @@ namespace dbaui
VclPtr<OTableConnection> m_pSelectedConn;
- bool m_bTrackingInitiallyMoved;
-
DECL_LINK(OnDragScrollTimer, Timer*, void);
protected:
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 5b2e08edc982..03e31bb7e2ec 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -58,7 +58,6 @@ namespace dbaui
StringQueue m_aStatementHistory; // previous statements
StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box
- sal_Int32 m_nHistoryLimit;
sal_Int32 m_nStatusCount;
css::uno::Reference< css::sdbc::XConnection >
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 51fd3d9ea4f5..5b8a74508786 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -164,7 +164,6 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
,m_pDragWin( nullptr )
,m_pSizingWin( nullptr )
,m_pSelectedConn( nullptr )
- ,m_bTrackingInitiallyMoved(false)
,m_pLastFocusTabWin(nullptr)
,m_pView( pView )
,m_pAccessible(nullptr)
@@ -616,7 +615,6 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP
Point aMousePos = ScreenToOutputPixel( rMousePos );
m_aDragOffset = aMousePos - pTabWin->GetPosPixel();
m_pDragWin->SetZOrder(nullptr, ZOrderFlags::First);
- m_bTrackingInitiallyMoved = false;
StartTracking();
}
@@ -999,7 +997,7 @@ void OJoinTableView::ScrollWhileDragging()
Size aDragWinSize = m_pDragWin->GetSizePixel();
Point aLowerRight(aDragWinPos.X() + aDragWinSize.Width(), aDragWinPos.Y() + aDragWinSize.Height());
- if (!m_bTrackingInitiallyMoved && (aDragWinPos == m_pDragWin->GetPosPixel()))
+ if (aDragWinPos == m_pDragWin->GetPosPixel())
return;
// avoid illustration errors (when scrolling with active TrackingRect)
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 66fa470ca631..9be3dc455439 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -153,7 +153,6 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi
,m_xDatMan( pDataManager )
{
bDisposing=false;
- bHierarchical=true;
mxImpl = new BibFrameCtrl_Impl;
mxImpl->pController = this;
}
@@ -617,8 +616,7 @@ void BibFrameController_Impl::addStatusListener(
else if ( aURL.Path == "Bib/hierarchical" )
{
aEvent.IsEnabled = true;
- const char* pHier = bHierarchical? "" : "*" ;
- aEvent.State <<= OUString::createFromAscii(pHier);
+ aEvent.State <<= OUString();
}
else if(aURL.Path == "Bib/MenuFilter")
{
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 524eb8ed0317..8b6209c1d98b 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -65,7 +65,6 @@ friend class BibFrameCtrl_Impl;
css::uno::Reference< css::awt::XWindow > xWindow;
css::uno::Reference< css::frame::XFrame > xFrame;
bool bDisposing;
- bool bHierarchical;
rtl::Reference<BibDataManager> m_xDatMan;
DECL_LINK( DisposeHdl, void*, void );
More information about the Libreoffice-commits
mailing list