[Libreoffice-commits] core.git: 2 commits - cui/source include/sfx2 include/svx include/unotools sal/rtl sc/source sd/source sfx2/source svx/source unotools/source vcl/inc vcl/source writerperfect/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon May 28 06:45:28 UTC 2018
cui/source/tabpages/textattr.cxx | 2
include/sfx2/docfile.hxx | 1
include/svx/dlgctrl.hxx | 8
include/unotools/historyoptions.hxx | 10 -
sal/rtl/alloc_arena.hxx | 3
sal/rtl/alloc_cache.cxx | 18 --
sc/source/ui/inc/sortkeydlg.hxx | 2
sd/source/ui/table/TableDesignPane.cxx | 6
sd/source/ui/table/TableDesignPane.hxx | 3
sfx2/source/doc/docfile.cxx | 6
svx/source/dialog/dlgctrl.cxx | 227 +++++++++++----------------
unotools/source/config/historyoptions.cxx | 7
vcl/inc/messagedialog.hxx | 1
vcl/inc/salwtype.hxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 11 -
vcl/source/gdi/pdfwriter_impl.hxx | 1
vcl/source/window/layout.cxx | 13 -
writerperfect/source/writer/exp/txtstyli.cxx | 5
writerperfect/source/writer/exp/txtstyli.hxx | 1
19 files changed, 101 insertions(+), 225 deletions(-)
New commits:
commit 96d7c67d98527b1ccc1cfba3ca817238e582d63b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri May 25 16:34:11 2018 +0200
loplugin:unusedfields
Change-Id: I625b73152c0c277c6e0ce3e24e4704094fc4e8ff
Reviewed-on: https://gerrit.libreoffice.org/54822
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 3013bd6038d7..9cb423211176 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -81,7 +81,7 @@ SvxTextAttrPage::SvxTextAttrPage(TabPageParent pPage, const SfxItemSet& rInAttrs
, m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION", m_aCtlPosition))
, m_xTsbFullWidth(m_xBuilder->weld_check_button("TSB_FULL_WIDTH"))
{
- m_aCtlPosition.SetControlSettings(RectPoint::MM, 240, 100);
+ m_aCtlPosition.SetControlSettings(RectPoint::MM, 240);
FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
SetFieldUnit( *m_xMtrFldLeft, eFUnit );
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index c14761bd8017..c7a1e1087765 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -100,7 +100,6 @@ protected:
BitmapEx* pBitmap;
CTL_STATE m_nState;
- bool mbCompleteDisable : 1;
bool mbUpdateForeground : 1;
bool mbUpdateBackground : 1;
@@ -143,8 +142,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const;
-
- bool IsCompletelyDisabled() const { return mbCompleteDisable; }
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC RectCtl : public weld::CustomWidgetController
@@ -163,7 +160,6 @@ private:
protected:
rtl::Reference<RectCtlAccessibleContext> pAccContext;
sal_uInt16 nBorderWidth;
- sal_uInt16 nRadius;
Point aPtLT, aPtMT, aPtRT;
Point aPtLM, aPtMM, aPtRM;
Point aPtLB, aPtMB, aPtRB;
@@ -180,8 +176,8 @@ protected:
Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const;
public:
- RectCtl(SvxTabPage* pPage, RectPoint eRpt = RectPoint::MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80);
- void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircl);
+ RectCtl(SvxTabPage* pPage, RectPoint eRpt = RectPoint::MM, sal_uInt16 nBorder = 200);
+ void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder);
virtual ~RectCtl() override;
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 8bc419e33090..7da1c532e30e 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -100,8 +100,6 @@ struct rtl_arena_st
rtl_arena_segment_type * m_hash_table_0[RTL_ARENA_HASH_SIZE];
sal_Size m_hash_size; /* m_hash_mask + 1 */
sal_Size m_hash_shift; /* log2(m_hash_size) */
-
- rtl_cache_type ** m_qcache_ptr;
};
/** gp_default_arena
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 1a61bf6f100e..23a8dd2499e4 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -86,8 +86,6 @@ static const OUStringLiteral gPropNames[CB_COUNT] =
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase )
: mrBase(rBase)
- , mbStyleSelected(false)
- , mbOptionsChanged(false)
{
pParent->get(m_pValueSet, "previews");
m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER);
@@ -146,7 +144,6 @@ static SfxDispatcher* getDispatcher( ViewShellBase const & rBase )
IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void)
{
- mbStyleSelected = true;
ApplyStyle();
}
@@ -202,10 +199,7 @@ void TableDesignWidget::ApplyStyle()
IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void)
{
- mbOptionsChanged = true;
-
ApplyOptions();
-
FillDesignPreviewControl();
}
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 1111149ce0ae..a8a641291656 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -98,9 +98,6 @@ private:
css::uno::Reference< css::beans::XPropertySet > mxSelectedTable;
css::uno::Reference< css::drawing::XDrawView > mxView;
css::uno::Reference< css::container::XIndexAccess > mxTableFamily;
-
- bool mbStyleSelected;
- bool mbOptionsChanged;
};
class TableDesignPane : public PanelLayout
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 389e6ec06857..3f72131aa1bd 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -75,7 +75,6 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RectPoint eRpt,
, eDefRP(eRpt)
, pBitmap(nullptr)
, m_nState(CTL_STATE::NONE)
- , mbCompleteDisable(false)
, mbUpdateForeground(true)
, mbUpdateBackground(true)
{
@@ -217,110 +216,102 @@ void SvxRectCtl::InitSettings(vcl::RenderContext& rRenderContext)
// is notified that the item was changed
void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
- // CompletelyDisabled() added to have a disabled state for SvxRectCtl
- if(!IsCompletelyDisabled())
- {
- Point aPtLast = aPtNew;
+ Point aPtLast = aPtNew;
- aPtNew = GetApproxLogPtFromPixPt( rMEvt.GetPosPixel() );
+ aPtNew = GetApproxLogPtFromPixPt( rMEvt.GetPosPixel() );
- Invalidate( tools::Rectangle( aPtLast - Point( nRadius, nRadius ),
- aPtLast + Point( nRadius, nRadius ) ) );
- Invalidate( tools::Rectangle( aPtNew - Point( nRadius, nRadius ),
- aPtNew + Point( nRadius, nRadius ) ) );
- eRP = GetRPFromPoint( aPtNew );
+ Invalidate( tools::Rectangle( aPtLast - Point( nRadius, nRadius ),
+ aPtLast + Point( nRadius, nRadius ) ) );
+ Invalidate( tools::Rectangle( aPtNew - Point( nRadius, nRadius ),
+ aPtNew + Point( nRadius, nRadius ) ) );
+ eRP = GetRPFromPoint( aPtNew );
- SetActualRP( eRP );
+ SetActualRP( eRP );
- vcl::Window *pTabPage = getNonLayoutParent(this);
- if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
- static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, eRP );
- }
+ vcl::Window *pTabPage = getNonLayoutParent(this);
+ if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
+ static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, eRP );
}
void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
{
- // CompletelyDisabled() added to have a disabled state for SvxRectCtl
- if(!IsCompletelyDisabled())
- {
- RectPoint eNewRP = eRP;
+ RectPoint eNewRP = eRP;
- switch( rKeyEvt.GetKeyCode().GetCode() )
+ switch( rKeyEvt.GetKeyCode().GetCode() )
+ {
+ case KEY_DOWN:
{
- case KEY_DOWN:
- {
- if( !(m_nState & CTL_STATE::NOVERT) )
- switch( eNewRP )
- {
- case RectPoint::LT: eNewRP = RectPoint::LM; break;
- case RectPoint::MT: eNewRP = RectPoint::MM; break;
- case RectPoint::RT: eNewRP = RectPoint::RM; break;
- case RectPoint::LM: eNewRP = RectPoint::LB; break;
- case RectPoint::MM: eNewRP = RectPoint::MB; break;
- case RectPoint::RM: eNewRP = RectPoint::RB; break;
- default: ; //prevent warning
- }
- }
- break;
- case KEY_UP:
- {
- if( !(m_nState & CTL_STATE::NOVERT) )
- switch( eNewRP )
- {
- case RectPoint::LM: eNewRP = RectPoint::LT; break;
- case RectPoint::MM: eNewRP = RectPoint::MT; break;
- case RectPoint::RM: eNewRP = RectPoint::RT; break;
- case RectPoint::LB: eNewRP = RectPoint::LM; break;
- case RectPoint::MB: eNewRP = RectPoint::MM; break;
- case RectPoint::RB: eNewRP = RectPoint::RM; break;
- default: ; //prevent warning
- }
- }
- break;
- case KEY_LEFT:
- {
- if( !(m_nState & CTL_STATE::NOHORZ) )
- switch( eNewRP )
- {
- case RectPoint::MT: eNewRP = RectPoint::LT; break;
- case RectPoint::RT: eNewRP = RectPoint::MT; break;
- case RectPoint::MM: eNewRP = RectPoint::LM; break;
- case RectPoint::RM: eNewRP = RectPoint::MM; break;
- case RectPoint::MB: eNewRP = RectPoint::LB; break;
- case RectPoint::RB: eNewRP = RectPoint::MB; break;
- default: ; //prevent warning
- }
- }
- break;
- case KEY_RIGHT:
- {
- if( !(m_nState & CTL_STATE::NOHORZ) )
- switch( eNewRP )
- {
- case RectPoint::LT: eNewRP = RectPoint::MT; break;
- case RectPoint::MT: eNewRP = RectPoint::RT; break;
- case RectPoint::LM: eNewRP = RectPoint::MM; break;
- case RectPoint::MM: eNewRP = RectPoint::RM; break;
- case RectPoint::LB: eNewRP = RectPoint::MB; break;
- case RectPoint::MB: eNewRP = RectPoint::RB; break;
- default: ; //prevent warning
- }
- }
- break;
- default:
- Control::KeyInput( rKeyEvt );
- return;
+ if( !(m_nState & CTL_STATE::NOVERT) )
+ switch( eNewRP )
+ {
+ case RectPoint::LT: eNewRP = RectPoint::LM; break;
+ case RectPoint::MT: eNewRP = RectPoint::MM; break;
+ case RectPoint::RT: eNewRP = RectPoint::RM; break;
+ case RectPoint::LM: eNewRP = RectPoint::LB; break;
+ case RectPoint::MM: eNewRP = RectPoint::MB; break;
+ case RectPoint::RM: eNewRP = RectPoint::RB; break;
+ default: ; //prevent warning
+ }
}
- if( eNewRP != eRP )
+ break;
+ case KEY_UP:
{
- SetActualRP( eNewRP );
+ if( !(m_nState & CTL_STATE::NOVERT) )
+ switch( eNewRP )
+ {
+ case RectPoint::LM: eNewRP = RectPoint::LT; break;
+ case RectPoint::MM: eNewRP = RectPoint::MT; break;
+ case RectPoint::RM: eNewRP = RectPoint::RT; break;
+ case RectPoint::LB: eNewRP = RectPoint::LM; break;
+ case RectPoint::MB: eNewRP = RectPoint::MM; break;
+ case RectPoint::RB: eNewRP = RectPoint::RM; break;
+ default: ; //prevent warning
+ }
+ }
+ break;
+ case KEY_LEFT:
+ {
+ if( !(m_nState & CTL_STATE::NOHORZ) )
+ switch( eNewRP )
+ {
+ case RectPoint::MT: eNewRP = RectPoint::LT; break;
+ case RectPoint::RT: eNewRP = RectPoint::MT; break;
+ case RectPoint::MM: eNewRP = RectPoint::LM; break;
+ case RectPoint::RM: eNewRP = RectPoint::MM; break;
+ case RectPoint::MB: eNewRP = RectPoint::LB; break;
+ case RectPoint::RB: eNewRP = RectPoint::MB; break;
+ default: ; //prevent warning
+ }
+ }
+ break;
+ case KEY_RIGHT:
+ {
+ if( !(m_nState & CTL_STATE::NOHORZ) )
+ switch( eNewRP )
+ {
+ case RectPoint::LT: eNewRP = RectPoint::MT; break;
+ case RectPoint::MT: eNewRP = RectPoint::RT; break;
+ case RectPoint::LM: eNewRP = RectPoint::MM; break;
+ case RectPoint::MM: eNewRP = RectPoint::RM; break;
+ case RectPoint::LB: eNewRP = RectPoint::MB; break;
+ case RectPoint::MB: eNewRP = RectPoint::RB; break;
+ default: ; //prevent warning
+ }
+ }
+ break;
+ default:
+ Control::KeyInput( rKeyEvt );
+ return;
+ }
+ if( eNewRP != eRP )
+ {
+ SetActualRP( eNewRP );
- vcl::Window *pTabPage = getNonLayoutParent(this);
- if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
- static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP);
+ vcl::Window *pTabPage = getNonLayoutParent(this);
+ if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
+ static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP);
- SetFocusRect();
- }
+ SetFocusRect();
}
}
@@ -387,46 +378,26 @@ void SvxRectCtl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl
BitmapEx& rBitmap = GetRectBitmap();
- // CompletelyDisabled() added to have a disabled state for SvxRectCtl
- if (IsCompletelyDisabled())
- {
- rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap());
- }
- else
- {
- rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- // Center for rectangle and line
- rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ // Center for rectangle and line
+ rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
- }
+ rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
+ rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap());
// draw active button, avoid center pos for angle
- // CompletelyDisabled() added to have a disabled state for SvxRectCtl
- if (!IsCompletelyDisabled())
+ if (IsEnabled())
{
- if (IsEnabled())
- {
- Point aCenterPt(aPtNew);
- aCenterPt -= aToCenter;
+ Point aCenterPt(aPtNew);
+ aCenterPt -= aToCenter;
- rRenderContext.DrawBitmap(aCenterPt, aDstBtnSize, aBtnPnt2, aBtnSize, rBitmap.GetBitmap());
- }
+ rRenderContext.DrawBitmap(aCenterPt, aDstBtnSize, aBtnPnt2, aBtnSize, rBitmap.GetBitmap());
}
}
@@ -652,10 +623,9 @@ BitmapEx& RectCtl::GetRectBitmap()
return *pBitmap;
}
-RectCtl::RectCtl(SvxTabPage* pPage, RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle)
+RectCtl::RectCtl(SvxTabPage* pPage, RectPoint eRpt, sal_uInt16 nBorder)
: m_pPage(pPage)
, nBorderWidth(Application::GetDefaultDevice()->LogicToPixel(Size(nBorder, 0), MapMode(MapUnit::Map100thMM)).Width())
- , nRadius(Application::GetDefaultDevice()->LogicToPixel(Size(nCircle, 0), MapMode(MapUnit::Map100thMM)).Width())
, eDefRP(eRpt)
, pBitmap(nullptr)
, m_nState(CTL_STATE::NONE)
@@ -670,10 +640,9 @@ void RectCtl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
CustomWidgetController::SetDrawingArea(pDrawingArea);
}
-void RectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle)
+void RectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder)
{
nBorderWidth = Application::GetDefaultDevice()->LogicToPixel(Size(nBorder, 0), MapMode(MapUnit::Map100thMM)).Width();
- nRadius = Application::GetDefaultDevice()->LogicToPixel(Size(nCircle, 0), MapMode(MapUnit::Map100thMM)).Width();
eDefRP = eRpt;
Resize_Impl();
}
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index a7384090a20f..34ca43664a25 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -186,7 +186,6 @@ struct SalExtTextInputPosEvent
struct SalInputContextChangeEvent
{
- LanguageType meLanguage; // new language
};
struct SalSurroundingTextRequestEvent
commit a7acea766c7812614b95257e934648cdf737ca3f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri May 25 15:56:15 2018 +0200
loplugin:unusedmethods
Change-Id: I64df1f467986b3d70c058adff289a6dd8f00fb20
Reviewed-on: https://gerrit.libreoffice.org/54821
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index d3db0dfaba79..6e9f38241f2a 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -208,7 +208,6 @@ public:
void SetInCheckIn( bool bInCheckIn );
bool IsInCheckIn( );
bool IsSkipImages( );
- OUString GetConvertImagesFilter();
SAL_DLLPRIVATE bool HasStorage_Impl() const;
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index ca9ae2828142..df9030a7e8fa 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -60,16 +60,6 @@ public:
SvtHistoryOptions();
virtual ~SvtHistoryOptions() override;
- /** Get max size of specified history.
-
- Call this methods to get information about max. size of specified list.
- If a new one is add to it the oldest one is deleted automatically.
-
- @param eHistory select right history.
- @return Current max size of specified list.
- */
- sal_uInt32 GetSize(EHistoryType eHistory) const;
-
/** Clear complete specified list.
@param eHistory select right history.
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 120d0ec5ac45..8bc419e33090 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -114,7 +114,6 @@ extern rtl_arena_type * gp_default_arena;
typedef void (*ArenaForeachFn)(void *addr, sal_Size size);
void rtl_arena_foreach(rtl_arena_type *arena, ArenaForeachFn fn);
-void rtl_cache_foreach(rtl_cache_type *arena, ArenaForeachFn foreachFn);
#endif // INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index f7dd02ab7c8a..38449ccfb795 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -1141,24 +1141,6 @@ void SAL_CALL rtl_cache_free(
}
}
-// FIXME: foreachFn called for free'd blocks and will break free-chains.
-void rtl_cache_foreach(rtl_cache_type *cache, ArenaForeachFn foreachFn)
-{
- for (rtl_cache_slab_type *cur = &(cache->m_used_head);
- cur && cur->m_slab_next != &(cache->m_used_head);
- cur = cur->m_slab_next)
- {
- for (char *item = reinterpret_cast<char *>(cur->m_data);
- item < reinterpret_cast<char *>(cur->m_bp);
- item += cache->m_type_size)
- {
- foreachFn(item, cache->m_type_size);
- }
- }
-
- RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock));
-}
-
#if defined(SAL_UNX)
void SAL_CALL rtl_secureZeroMemory(void *Ptr, sal_Size Bytes) SAL_THROW_EXTERN_C()
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index 3950605d0532..bf71d46289e7 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -50,8 +50,6 @@ public:
~ScSortKeyWindow();
void AddSortKey( sal_uInt16 nItem );
- void DoScroll( sal_Int32 nNewPos );
- sal_Int32 GetItemHeight() const { return m_nItemHeight; }
};
#endif // INCLUDED_SC_SOURCE_UI_INC_SORTKEYDLG_HXX
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 72a6c131fc41..57536a51ddc1 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -533,12 +533,6 @@ bool SfxMedium::IsSkipImages()
return pSkipImagesItem && pSkipImagesItem->GetValue() == "SkipImages";
}
-OUString SfxMedium::GetConvertImagesFilter()
-{
- const SfxStringItem* pConvertItem = GetItemSet()->GetItem<SfxStringItem>(SID_CONVERT_IMAGES);
- return ( pConvertItem ? pConvertItem->GetValue() : OUString() );
-}
-
SvStream* SfxMedium::GetInStream()
{
if ( pImpl->m_pInStream )
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 7b627b57c9fa..e08aa57c09cb 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -538,13 +538,6 @@ SvtHistoryOptions::~SvtHistoryOptions()
m_pImpl.reset();
}
-sal_uInt32 SvtHistoryOptions::GetSize( EHistoryType eHistory ) const
-{
- MutexGuard aGuard(theHistoryOptionsMutex::get());
-
- return m_pImpl->GetCapacity(eHistory);
-}
-
void SvtHistoryOptions::Clear( EHistoryType eHistory )
{
MutexGuard aGuard(theHistoryOptionsMutex::get());
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index cf1df6ed68aa..5b4fda5a231c 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -38,7 +38,6 @@ private:
public:
MessageDialog(vcl::Window* pParent, const OUString& rMessage, VclMessageType eMessageType,
VclButtonsType eButtonsType);
- MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription);
virtual bool set_property(const OString& rKey, const OUString& rValue) override;
OUString const& get_primary_text() const;
OUString const& get_secondary_text() const;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 21ca8d478e5b..f5b7efe16570 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11405,17 +11405,6 @@ void PDFWriterImpl::setAlternateText( const OUString& rText )
}
}
-void PDFWriterImpl::setAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr )
-{
- if( nPageNr < 0 )
- nPageNr = m_nCurrentPage;
-
- if( nPageNr < 0 || nPageNr >= static_cast<sal_Int32>(m_aPages.size()) )
- return;
-
- m_aPages[ nPageNr ].m_nDuration = nSeconds;
-}
-
void PDFWriterImpl::setPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr )
{
if( nPageNr < 0 )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 23da7f6052cc..b4c1b3a454e6 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1268,7 +1268,6 @@ public:
void setAlternateText( const OUString& rText );
// transitional effects
- void setAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr );
void setPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr );
// controls
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9d9e05325ddf..e29619092ba5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2320,19 +2320,6 @@ MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle)
SetType(WindowType::MESSBOX);
}
-MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
- : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WindowType::MESSBOX)
- , m_eButtonsType(VclButtonsType::NONE)
- , m_eMessageType(VclMessageType::Info)
- , m_pOwnedContentArea(nullptr)
- , m_pOwnedActionArea(nullptr)
- , m_pGrid(nullptr)
- , m_pImage(nullptr)
- , m_pPrimaryMessage(nullptr)
- , m_pSecondaryMessage(nullptr)
-{
-}
-
MessageDialog::MessageDialog(vcl::Window* pParent,
const OUString &rMessage,
VclMessageType eMessageType,
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx
index b8b7813e08ad..b8b84c03410c 100644
--- a/writerperfect/source/writer/exp/txtstyli.cxx
+++ b/writerperfect/source/writer/exp/txtstyli.cxx
@@ -388,11 +388,6 @@ librevenge::RVNGPropertyList& XMLStyleContext::GetPageLayoutPropertyList()
return m_aPageLayoutPropertyList;
}
-librevenge::RVNGPropertyList& XMLStyleContext::GetMasterPagePropertyList()
-{
- return m_aMasterPagePropertyList;
-}
-
} // namespace exp
} // namespace writerperfect
diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx
index f72f9e60d769..c4ddc488899e 100644
--- a/writerperfect/source/writer/exp/txtstyli.hxx
+++ b/writerperfect/source/writer/exp/txtstyli.hxx
@@ -42,7 +42,6 @@ public:
librevenge::RVNGPropertyList& GetTablePropertyList();
librevenge::RVNGPropertyList& GetGraphicPropertyList();
librevenge::RVNGPropertyList& GetPageLayoutPropertyList();
- librevenge::RVNGPropertyList& GetMasterPagePropertyList();
private:
OUString m_aName;
More information about the Libreoffice-commits
mailing list