summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-08 13:48:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-08 18:23:53 +0100
commitc774ad610eb828742a3eea050e5a7571ba3b00be (patch)
tree5563215fe7b481f99efc96017d61ecd5c7a59072 /svx
parent24d0704fa468b300558a3f904ae853fcb7fca312 (diff)
loplugin:constantparam in svtools..unotools
Change-Id: I6e72fbe44dcb65ee5162448e9a72e6437d56b044 Reviewed-on: https://gerrit.libreoffice.org/50948 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx8
-rw-r--r--svx/source/dialog/langbox.cxx2
-rw-r--r--svx/source/form/fmview.cxx4
-rw-r--r--svx/source/gallery2/galexpl.cxx10
-rw-r--r--svx/source/inc/cell.hxx2
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx20
-rw-r--r--svx/source/table/cell.cxx6
7 files changed, 15 insertions, 37 deletions
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 977ce71be4b1..0e7d6b489564 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -46,10 +46,6 @@ namespace sdr
// Range for buffering (in pixel to be independent from mapMode)
basegfx::B2IRange maBufferRememberedRangePixel;
- // Flag to decide if PreRendering shall be used for overlay refreshes.
- // Default is false.
- bool mbRefreshWithPreRendering : 1;
-
// link for timer
DECL_LINK(ImpBufferTimerHandler, Timer*, void);
@@ -59,9 +55,7 @@ namespace sdr
void ImpRestoreBackground(const vcl::Region& rRegionPixel) const;
void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice);
- OverlayManagerBuffered(
- OutputDevice& rOutputDevice,
- bool bRefreshWithPreRendering);
+ OverlayManagerBuffered(OutputDevice& rOutputDevice);
virtual ~OverlayManagerBuffered() override;
public:
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index dd80e3848e3d..d50c957bdce5 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -828,7 +828,7 @@ sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry()
{
// Add to both, SvtLanguageTable and SvxLanguageComboBox.
/* TODO: a descriptive user comment would be a nice to have here. */
- SvtLanguageTable::AddLanguageTag( aLanguageTag, OUString());
+ SvtLanguageTable::AddLanguageTag( aLanguageTag );
}
nPos = InsertLanguage( nLang);
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index ed3a1da307b7..bc53caf1445c 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -566,13 +566,13 @@ FmFormObj* FmFormView::getMarkedGrid() const
void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
- sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID,
+ sal_uInt16 _nControlObjectID, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
{
FmXFormView::createControlLabelPair(
*_pOutDev, _nXOffsetMM, _nYOffsetMM,
_rxField, _rxNumberFormats,
- _nControlObjectID, _rFieldPostfix, _nInventor, _nLabelObjectID,
+ _nControlObjectID, "", _nInventor, _nLabelObjectID,
_pLabelPage, _pControlPage, _pModel,
_rpLabel, _rpControl
);
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index e1ecfd33796e..21e085fc128b 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -136,8 +136,7 @@ bool GalleryExplorer::InsertURL( sal_uInt32 nThemeId, const OUString& rURL )
}
bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
- Graphic* pGraphic, BitmapEx* pThumb,
- bool bProgress )
+ Graphic* pGraphic )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
bool bRet = false;
@@ -150,10 +149,7 @@ bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos
if( pTheme )
{
if( pGraphic )
- bRet = bRet || pTheme->GetGraphic( nPos, *pGraphic, bProgress );
-
- if( pThumb )
- bRet = bRet || pTheme->GetThumb( nPos, *pThumb );
+ bRet = bRet || pTheme->GetGraphic( nPos, *pGraphic, /*bProgress*/false );
pGal->ReleaseTheme( pTheme, aListener );
}
@@ -166,7 +162,7 @@ bool GalleryExplorer::GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
Graphic* pGraphic )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
- return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, nullptr/*pThumb*/, false/*bProgress*/ );
+ return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic );
}
sal_uInt32 GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index 47a1f0f8bc4a..5b7f71b04c89 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -193,7 +193,7 @@ protected:
private:
/// @throws css::uno::RuntimeException
- SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject );
+ SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj );
SVX_DLLPRIVATE virtual ~Cell() throw() override;
Cell(Cell const &) = delete;
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index c78f15990e63..9ee032c1ee3b 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -238,7 +238,7 @@ namespace sdr
}
}
- if(mbRefreshWithPreRendering)
+ // refresh with prerendering
{
// #i73602# ensure valid and sized mpOutputBufferDevice
const Size aDestinationSizePixel(mpBufferDevice->GetOutputSizePixel());
@@ -325,15 +325,6 @@ namespace sdr
getOutputDevice().EnableMapMode(bMapModeWasEnabledDest);
}
}
- else
- {
- // Restore all rectangles for remembered region from buffer
- ImpRestoreBackground();
-
- // paint overlay content for remembered region, use
- // method from base class directly
- OverlayManager::ImpDrawMembers(aBufferRememberedRangeLogic, getOutputDevice());
- }
// VCL hack for transparent child windows
// Problem is e.g. a radiobutton form control in life mode. The used window
@@ -374,13 +365,11 @@ namespace sdr
}
OverlayManagerBuffered::OverlayManagerBuffered(
- OutputDevice& rOutputDevice,
- bool bRefreshWithPreRendering)
+ OutputDevice& rOutputDevice)
: OverlayManager(rOutputDevice),
mpBufferDevice(VclPtr<VirtualDevice>::Create()),
mpOutputBufferDevice(VclPtr<VirtualDevice>::Create()),
- maBufferIdle("sdr overlay OverlayManagerBuffered Idle"),
- mbRefreshWithPreRendering(bRefreshWithPreRendering)
+ maBufferIdle("sdr overlay OverlayManagerBuffered Idle")
{
// Init timer
maBufferIdle.SetPriority( TaskPriority::POST_PAINT );
@@ -391,8 +380,7 @@ namespace sdr
rtl::Reference<OverlayManager> OverlayManagerBuffered::create(
OutputDevice& rOutputDevice)
{
- return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice,
- true/*bRefreshWithPreRendering*/));
+ return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice));
}
OverlayManagerBuffered::~OverlayManagerBuffered()
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index b5ba5ddbb8eb..922a58d0a4e9 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -382,7 +382,7 @@ namespace sdr { namespace table {
rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj )
{
- rtl::Reference< Cell > xCell( new Cell( rTableObj, nullptr ) );
+ rtl::Reference< Cell > xCell( new Cell( rTableObj ) );
if( xCell->mxTable.is() )
{
Reference< XEventListener > xListener( xCell.get() );
@@ -392,8 +392,8 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj )
}
-Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject )
-: SdrText( rTableObj, pOutlinerParaObject )
+Cell::Cell( SdrTableObj& rTableObj )
+: SdrText( rTableObj, /*pOutlinerParaObject*/nullptr )
, SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
, mpPropSet( ImplGetSvxCellPropertySet() )
, mpProperties( new sdr::properties::CellProperties( rTableObj, this ) )