[Libreoffice-commits] core.git: 13 commits - chart2/qa chart2/source connectivity/source cui/source desktop/source forms/source framework/inc framework/source include/sfx2 l10ntools/inc l10ntools/source lotuswordpro/source reportdesign/source rsc/inc rsc/source scaddins/source sc/source sdext/source sd/inc sd/source sfx2/source sw/inc sw/qa sw/source
Noel Grandin
noel at peralex.com
Wed Mar 2 07:19:47 UTC 2016
chart2/qa/extras/charttest.hxx | 8
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 4
chart2/source/controller/inc/ObjectNameProvider.hxx | 2
chart2/source/inc/DataSourceHelper.hxx | 3
chart2/source/inc/DiagramHelper.hxx | 22 --
chart2/source/inc/RelativePositionHelper.hxx | 18 -
chart2/source/inc/StatisticsHelper.hxx | 6
chart2/source/inc/ThreeDHelper.hxx | 2
chart2/source/tools/DataSourceHelper.cxx | 11 -
chart2/source/tools/DiagramHelper.cxx | 42 +---
chart2/source/tools/ImplOPropertySet.cxx | 9
chart2/source/tools/ImplOPropertySet.hxx | 3
chart2/source/tools/RelativePositionHelper.cxx | 95 ++++------
chart2/source/tools/StatisticsHelper.cxx | 5
chart2/source/tools/ThreeDHelper.cxx | 21 --
chart2/source/view/charttypes/VSeriesPlotter.cxx | 5
chart2/source/view/inc/PlottingPositionHelper.hxx | 13 -
chart2/source/view/inc/VLineProperties.hxx | 6
chart2/source/view/inc/VSeriesPlotter.hxx | 3
chart2/source/view/main/VLineProperties.cxx | 16 -
connectivity/source/inc/TSortIndex.hxx | 4
cui/source/customize/cfg.cxx | 9
cui/source/customize/macropg.cxx | 12 -
cui/source/dialogs/SpellDialog.cxx | 4
cui/source/dialogs/iconcdlg.cxx | 3
cui/source/factory/dlgfact.cxx | 11 -
cui/source/factory/dlgfact.hxx | 9
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/cfg.hxx | 6
cui/source/inc/headertablistbox.hxx | 4
cui/source/inc/iconcdlg.hxx | 6
cui/source/inc/numpages.hxx | 2
cui/source/tabpages/borderconn.cxx | 14 -
cui/source/tabpages/borderconn.hxx | 9
cui/source/tabpages/numpages.cxx | 9
desktop/source/app/officeipcthread.cxx | 26 +-
desktop/source/app/officeipcthread.hxx | 8
desktop/source/deployment/dp_persmap.cxx | 5
desktop/source/deployment/inc/dp_persmap.h | 2
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 34 +--
desktop/source/pkgchk/unopkg/unopkg_shared.h | 5
forms/source/component/EventThread.cxx | 4
forms/source/component/EventThread.hxx | 2
forms/source/richtext/richtextcontrol.cxx | 4
forms/source/xforms/computedexpression.cxx | 4
forms/source/xforms/computedexpression.hxx | 2
forms/source/xforms/xpathlib/xpathlib.cxx | 4
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/threadhelp/gate.hxx | 6
framework/source/dispatch/menudispatcher.cxx | 11 -
include/sfx2/app.hxx | 4
include/sfx2/bindings.hxx | 4
include/sfx2/childwin.hxx | 3
include/sfx2/docfac.hxx | 2
include/sfx2/docfile.hxx | 8
include/sfx2/docfilt.hxx | 2
include/sfx2/dockwin.hxx | 2
include/sfx2/doctempl.hxx | 10 -
include/sfx2/fcontnr.hxx | 4
include/sfx2/frame.hxx | 4
include/sfx2/frmdescr.hxx | 2
include/sfx2/linksrc.hxx | 2
include/sfx2/mgetempl.hxx | 3
include/sfx2/objsh.hxx | 4
include/sfx2/passwd.hxx | 4
include/sfx2/request.hxx | 2
include/sfx2/sfxdlg.hxx | 9
include/sfx2/tabdlg.hxx | 10 -
include/sfx2/viewfrm.hxx | 8
include/sfx2/viewsh.hxx | 2
l10ntools/inc/xmlparse.hxx | 2
l10ntools/inc/xrmmerge.hxx | 2
l10ntools/source/xmlparse.cxx | 12 -
lotuswordpro/source/filter/lwpobjstrm.cxx | 24 --
lotuswordpro/source/filter/lwpobjstrm.hxx | 8
lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 6
lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 28 --
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 8
lotuswordpro/source/filter/xfilter/xffont.hxx | 6
lotuswordpro/source/filter/xfilter/xfframestyle.hxx | 4
lotuswordpro/source/filter/xfilter/xflistitem.hxx | 6
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 6
reportdesign/source/ui/inc/DesignView.hxx | 2
reportdesign/source/ui/inc/UITools.hxx | 3
reportdesign/source/ui/misc/UITools.cxx | 4
reportdesign/source/ui/report/DesignView.cxx | 4
rsc/inc/rscclass.hxx | 3
rsc/inc/rscmgr.hxx | 2
rsc/source/res/rscclass.cxx | 4
rsc/source/res/rscmgr.cxx | 3
sc/source/ui/inc/prevwsh.hxx | 2
sc/source/ui/inc/tabvwsh.hxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 4
scaddins/source/analysis/analysishelper.cxx | 5
scaddins/source/analysis/analysishelper.hxx | 3
sd/inc/CustomAnimationEffect.hxx | 2
sd/source/core/CustomAnimationEffect.cxx | 4
sd/source/filter/html/htmlex.cxx | 8
sd/source/filter/html/htmlex.hxx | 2
sd/source/ui/animations/CategoryListBox.cxx | 4
sd/source/ui/animations/CategoryListBox.hxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 6
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/STLPropertySet.cxx | 2
sd/source/ui/animations/STLPropertySet.hxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 5
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/inc/TemplateScanner.hxx | 4
sd/source/ui/inc/ViewShellBase.hxx | 3
sd/source/ui/inc/WindowUpdater.hxx | 6
sd/source/ui/inc/slideshow.hxx | 3
sd/source/ui/inc/tools/AsynchronousCall.hxx | 10 -
sd/source/ui/inc/unomodel.hxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 44 +---
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 6
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 9
sd/source/ui/slideshow/slideshow.cxx | 5
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 4
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 3
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 10 -
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 6
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 5
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 9
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 2
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 10 -
sd/source/ui/tools/AsynchronousCall.cxx | 6
sd/source/ui/unoidl/unolayer.cxx | 5
sd/source/ui/unoidl/unolayer.hxx | 2
sd/source/ui/unoidl/unomodel.cxx | 4
sd/source/ui/view/ViewShellBase.cxx | 5
sd/source/ui/view/WindowUpdater.cxx | 5
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 5
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 3
sdext/source/presenter/PresenterCanvasHelper.cxx | 5
sdext/source/presenter/PresenterCanvasHelper.hxx | 3
sdext/source/presenter/PresenterPaintManager.cxx | 10 -
sdext/source/presenter/PresenterPaintManager.hxx | 6
sdext/source/presenter/PresenterScrollBar.cxx | 10 -
sdext/source/presenter/PresenterScrollBar.hxx | 3
sdext/source/presenter/PresenterSlideSorter.cxx | 9
sfx2/source/appl/appserv.cxx | 3
sfx2/source/appl/childwin.cxx | 5
sfx2/source/appl/linksrc.cxx | 6
sfx2/source/appl/macroloader.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 9
sfx2/source/control/bindings.cxx | 14 -
sfx2/source/control/request.cxx | 35 +--
sfx2/source/dialog/dockwin.cxx | 7
sfx2/source/dialog/mgetempl.cxx | 5
sfx2/source/dialog/splitwin.cxx | 11 -
sfx2/source/dialog/tabdlg.cxx | 10 -
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/docfile.cxx | 6
sfx2/source/doc/docfilt.cxx | 30 ---
sfx2/source/doc/docinsert.cxx | 4
sfx2/source/doc/doctempl.cxx | 6
sfx2/source/doc/frmdescr.cxx | 7
sfx2/source/doc/objmisc.cxx | 6
sfx2/source/doc/objxtor.cxx | 9
sfx2/source/doc/oleprops.cxx | 4
sfx2/source/doc/oleprops.hxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/splitwin.hxx | 2
sfx2/source/view/frame.cxx | 2
sfx2/source/view/viewfrm.cxx | 23 +-
sfx2/source/view/viewsh.cxx | 2
sw/inc/view.hxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 6
sw/source/uibase/app/docsh2.cxx | 6
sw/source/uibase/uiview/view.cxx | 6
175 files changed, 470 insertions(+), 804 deletions(-)
New commits:
commit f69585c35411ca74e17bb6cd1cf535489472a4c2
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 20:38:22 2016 +0200
loplugin:unuseddefaultparams in chart2
Change-Id: I03a3580fdbd1f6cf08af329b07edcfe09ecbb9aa
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 3cf509b..21e89fe 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -261,10 +261,10 @@ Reference< chart2::XDataSeries > getDataSeriesFromDoc( uno::Reference< chart2::X
Reference< chart2::data::XDataSequence > getLabelDataSequenceFromDoc(
Reference< chart2::XChartDocument > xChartDoc,
- sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0 )
+ sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0 )
{
Reference< chart2::XDataSeries > xDataSeries =
- getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType, nCooSys );
+ getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType );
CPPUNIT_ASSERT(xDataSeries.is());
Reference< chart2::data::XDataSource > xDataSource( xDataSeries, uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::data::XLabeledDataSequence > > xDataSequences =
@@ -284,10 +284,10 @@ Reference< chart2::data::XDataSequence > getLabelDataSequenceFromDoc(
Reference< chart2::data::XDataSequence > getDataSequenceFromDocByRole(
Reference< chart2::XChartDocument > xChartDoc, const OUString& rRole,
- sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0 )
+ sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0 )
{
Reference< chart2::XDataSeries > xDataSeries =
- getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType, nCooSys );
+ getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType );
CPPUNIT_ASSERT(xDataSeries.is());
Reference< chart2::data::XDataSource > xDataSource( xDataSeries, uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::data::XLabeledDataSequence > > xDataSequences =
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 1f18f1f..be4efd3 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -456,9 +456,9 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
return aRet;
}
-OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose )
+OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument )
{
- return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ), bVerbose );
+ return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ) );
}
OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose )
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 004eefb..dbe7be8 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -62,7 +62,7 @@ public:
The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier.
*/
static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
- static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false );
+ static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
/** This is used for showing the currently selected object in the status bar
(command "Context")
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index c58fa25..4ad1a28 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -82,8 +82,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >
pressUsedDataIntoRectangularFormat( const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument >& xChartDoc,
- bool bWithCategories = true );
+ ::com::sun::star::chart2::XChartDocument >& xChartDoc );
SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index fa168fb..cbd7808 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -60,11 +60,6 @@ public:
/** tries to find a template in the chart-type manager that matches the
given diagram.
- @param rPreferredTemplateName
- Check this template first. This may speed up searching, if the
- caller assumes a certain template as most likely to be the one that
- matches.
-
@return
A pair containing a template with the correct properties set as
first entry and the service name of the templateas second entry. If
@@ -75,8 +70,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager,
- const OUString & rPreferredTemplateName = OUString());
+ ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager);
/** Sets the "SwapXAndYAxis" property at all coordinate systems found in the
given diagram.
@@ -102,18 +96,16 @@ public:
bool& rbFound, bool& rbAmbiguous
);
- /** @param bOnlyAtFirstChartType
- If </sal_True>, the stacking mode is only set at the series found inside
- the first chart type. This is the standard for all current
- templates (the only template that has more than one chart-type and
- allows stacking is bar/line combi, and for this the stacking only
- applies to the first chart type/the bars)
+ /** The stacking mode is only set at the series found inside
+ the first chart type. This is the standard for all current
+ templates (the only template that has more than one chart-type and
+ allows stacking is bar/line combi, and for this the stacking only
+ applies to the first chart type/the bars)
*/
static void setStackMode(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram,
- StackMode eStackMode,
- bool bOnlyAtFirstChartType = true
+ StackMode eStackMode
);
/** Retrieves the stackmode of the first DataSeries or none. If the series have differing stack
diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx
index 7f9b175..4416abc2 100644
--- a/chart2/source/inc/RelativePositionHelper.hxx
+++ b/chart2/source/inc/RelativePositionHelper.hxx
@@ -73,8 +73,8 @@ public:
position such that the resize is relative to the former rectangle's
center.
- @param bCheck If </sal_True>, the resize is only done, if after
- transformation, the position and size are within the bounds [0,1].
+ The resize is only done, if after
+ transformation, the position and size are within the bounds [0,1].
@return </sal_True>, if changes were applied.
@@ -84,23 +84,21 @@ public:
static bool centerGrow(
::com::sun::star::chart2::RelativePosition & rInOutPosition,
::com::sun::star::chart2::RelativeSize & rInOutSize,
- double fAmountX, double fAmountY,
- bool bCheck = true );
+ double fAmountX, double fAmountY );
/** shifts a relative position about the given amount
- @param bCheck If </sal_True>, the shift is only done, if after
- transformation, the object represented by the position
- rInOutPosition and its size rObjectSize the position and size are
- within the bounds [0,1].
+ The shift is only done, if after
+ transformation, the object represented by the position
+ rInOutPosition and its size rObjectSize the position and size are
+ within the bounds [0,1].
@return </sal_True>, if changes were applied.
*/
static bool moveObject(
::com::sun::star::chart2::RelativePosition & rInOutPosition,
const ::com::sun::star::chart2::RelativeSize & rObjectSize,
- double fAmountX, double fAmountY,
- bool bCheck = true );
+ double fAmountX, double fAmountY );
};
} //namespace chart
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index 334bbea..7d9aeaf 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -34,12 +34,8 @@ namespace StatisticsHelper
/** Calculates 1/n * sum (x_i - x_mean)^2.
@see http://mathworld.wolfram.com/Variance.html
-
- @param bUnbiasedEstimator
- If true, 1/(n-1) * sum (x_i - x_mean)^2 is returned.
*/
- OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const ::com::sun::star::uno::Sequence< double > & rData,
- bool bUnbiasedEstimator = false );
+ OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const ::com::sun::star::uno::Sequence< double > & rData );
// square root of the variance
OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const ::com::sun::star::uno::Sequence< double > & rData );
diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx
index 41427ab..024466c 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -80,7 +80,7 @@ public:
static void switchRightAngledAxes( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xSceneProperties
- , bool bRightAngledAxes, bool bRotateLights=true );
+ , bool bRightAngledAxes );
static void adaptRadAnglesForRightAngledAxes( double& rfXAngleRad, double& rfYAngleRad );
static double getXDegreeAngleLimitForRightAngledAxes() { return 90.0; }
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 84cf5f7..6e37732 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -226,19 +226,16 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
}
uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoRectangularFormat(
- const uno::Reference< chart2::XChartDocument >& xChartDoc, bool bWithCategories )
+ const uno::Reference< chart2::XChartDocument >& xChartDoc )
{
::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector;
//categories are always the first sequence
Reference< chart2::XDiagram > xDiagram( xChartDoc->getFirstDiagram());
- if( bWithCategories )
- {
- Reference< chart2::data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
- if( xCategories.is() )
- aResultVector.push_back( xCategories );
- }
+ Reference< chart2::data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
+ if( xCategories.is() )
+ aResultVector.push_back( xCategories );
::std::vector< Reference< chart2::XDataSeries > > xSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
uno::Reference< chart2::data::XDataSource > xSeriesSource(
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 5f1a074..820209b 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -75,8 +75,7 @@ namespace chart
DiagramHelper::tTemplateWithServiceName
DiagramHelper::getTemplateForDiagram(
const Reference< XDiagram > & xDiagram,
- const Reference< lang::XMultiServiceFactory > & xChartTypeManager,
- const OUString & rPreferredTemplateName )
+ const Reference< lang::XMultiServiceFactory > & xChartTypeManager )
{
DiagramHelper::tTemplateWithServiceName aResult;
@@ -86,39 +85,20 @@ DiagramHelper::tTemplateWithServiceName
Sequence< OUString > aServiceNames( xChartTypeManager->getAvailableServiceNames());
const sal_Int32 nLength = aServiceNames.getLength();
- bool bHasPreferredTemplate = !rPreferredTemplateName.isEmpty();
bool bTemplateFound = false;
- if( bHasPreferredTemplate )
- {
- Reference< XChartTypeTemplate > xTempl(
- xChartTypeManager->createInstance( rPreferredTemplateName ), uno::UNO_QUERY );
-
- if( xTempl.is() &&
- xTempl->matchesTemplate( xDiagram, sal_True ))
- {
- aResult.first = xTempl;
- aResult.second = rPreferredTemplateName;
- bTemplateFound = true;
- }
- }
-
for( sal_Int32 i = 0; ! bTemplateFound && i < nLength; ++i )
{
try
{
- if( ! bHasPreferredTemplate ||
- ! rPreferredTemplateName.equals( aServiceNames[ i ] ))
- {
- Reference< XChartTypeTemplate > xTempl(
- xChartTypeManager->createInstance( aServiceNames[ i ] ), uno::UNO_QUERY_THROW );
+ Reference< XChartTypeTemplate > xTempl(
+ xChartTypeManager->createInstance( aServiceNames[ i ] ), uno::UNO_QUERY_THROW );
- if (xTempl.is() && xTempl->matchesTemplate(xDiagram, true))
- {
- aResult.first = xTempl;
- aResult.second = aServiceNames[ i ];
- bTemplateFound = true;
- }
+ if (xTempl.is() && xTempl->matchesTemplate(xDiagram, true))
+ {
+ aResult.first = xTempl;
+ aResult.second = aServiceNames[ i ];
+ bTemplateFound = true;
}
}
catch( const uno::Exception & ex )
@@ -247,8 +227,7 @@ bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDia
void DiagramHelper::setStackMode(
const Reference< XDiagram > & xDiagram,
- StackMode eStackMode,
- bool bOnlyAtFirstChartType /* = true */
+ StackMode eStackMode
)
{
try
@@ -307,8 +286,7 @@ void DiagramHelper::setStackMode(
continue;
uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
sal_Int32 nMax = aChartTypeList.getLength();
- if( bOnlyAtFirstChartType
- && nMax >= 1 )
+ if( nMax >= 1 )
nMax = 1;
for( sal_Int32 nT = 0; nT < nMax; ++nT )
{
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 7658d81..3fe1e94 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -160,15 +160,8 @@ bool ImplOPropertySet::GetPropertyValueByHandle(
}
void ImplOPropertySet::SetPropertyValueByHandle(
- sal_Int32 nHandle, const Any & rValue, Any * pOldValue )
+ sal_Int32 nHandle, const Any & rValue )
{
- if( pOldValue != nullptr )
- {
- tPropertyMap::const_iterator aFoundIter( m_aProperties.find( nHandle ) );
- if( m_aProperties.end() != aFoundIter )
- (*pOldValue) = (*aFoundIter).second;
- }
-
m_aProperties[ nHandle ] = rValue;
}
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 0da1ca6..2c3c80e 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -62,8 +62,7 @@ public:
sal_Int32 nHandle ) const;
void SetPropertyValueByHandle( sal_Int32 nHandle,
- const ::com::sun::star::uno::Any & rValue,
- ::com::sun::star::uno::Any * pOldValue = nullptr );
+ const ::com::sun::star::uno::Any & rValue );
bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle );
::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >
diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx
index 71df2ac..0d4edec 100644
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -244,8 +244,7 @@ awt::Point RelativePositionHelper::getCenterOfAnchoredObject(
bool RelativePositionHelper::centerGrow(
chart2::RelativePosition & rInOutPosition,
chart2::RelativeSize & rInOutSize,
- double fAmountX, double fAmountY,
- bool bCheck /* = true */ )
+ double fAmountX, double fAmountY )
{
chart2::RelativePosition aPos( rInOutPosition );
chart2::RelativeSize aSize( rInOutSize );
@@ -312,39 +311,35 @@ bool RelativePositionHelper::centerGrow(
rInOutSize.Secondary == aSize.Secondary )
return false;
- // check
- if( bCheck )
- {
- // Note: this somewhat complicated check allows the output being
- // out-of-bounds if the input was also out-of-bounds, and the change is
- // for "advantage". E.g., you have a chart that laps out on the left
- // side. If you shrink it, this should be possible, also if it still
- // laps out on the left side afterwards. But you shouldn't be able to
- // grow it then.
-
- chart2::RelativePosition aUpperLeft(
- RelativePositionHelper::getReanchoredPosition( aPos, aSize, drawing::Alignment_TOP_LEFT ));
- chart2::RelativePosition aLowerRight(
- RelativePositionHelper::getReanchoredPosition( aPos, aSize, drawing::Alignment_BOTTOM_RIGHT ));
-
- // Do not grow, if this leads to corners being off-screen
- if( fAmountX > 0.0 &&
- ( (aUpperLeft.Primary < fPosCheckThreshold) ||
- (aLowerRight.Primary > (1.0 - fPosCheckThreshold)) ))
- return false;
- if( fAmountY > 0.0 &&
- ( (aUpperLeft.Secondary < fPosCheckThreshold) ||
- (aLowerRight.Secondary > (1.0 - fPosCheckThreshold)) ))
- return false;
-
- // Do not shrink, if this leads to a size too small
- if( fAmountX < 0.0 &&
- ( aSize.Primary < fSizeCheckThreshold ))
- return false;
- if( fAmountY < 0.0 &&
- ( aSize.Secondary < fSizeCheckThreshold ))
- return false;
- }
+ // Note: this somewhat complicated check allows the output being
+ // out-of-bounds if the input was also out-of-bounds, and the change is
+ // for "advantage". E.g., you have a chart that laps out on the left
+ // side. If you shrink it, this should be possible, also if it still
+ // laps out on the left side afterwards. But you shouldn't be able to
+ // grow it then.
+
+ chart2::RelativePosition aUpperLeft(
+ RelativePositionHelper::getReanchoredPosition( aPos, aSize, drawing::Alignment_TOP_LEFT ));
+ chart2::RelativePosition aLowerRight(
+ RelativePositionHelper::getReanchoredPosition( aPos, aSize, drawing::Alignment_BOTTOM_RIGHT ));
+
+ // Do not grow, if this leads to corners being off-screen
+ if( fAmountX > 0.0 &&
+ ( (aUpperLeft.Primary < fPosCheckThreshold) ||
+ (aLowerRight.Primary > (1.0 - fPosCheckThreshold)) ))
+ return false;
+ if( fAmountY > 0.0 &&
+ ( (aUpperLeft.Secondary < fPosCheckThreshold) ||
+ (aLowerRight.Secondary > (1.0 - fPosCheckThreshold)) ))
+ return false;
+
+ // Do not shrink, if this leads to a size too small
+ if( fAmountX < 0.0 &&
+ ( aSize.Primary < fSizeCheckThreshold ))
+ return false;
+ if( fAmountY < 0.0 &&
+ ( aSize.Secondary < fSizeCheckThreshold ))
+ return false;
rInOutPosition = aPos;
rInOutSize = aSize;
@@ -354,29 +349,25 @@ bool RelativePositionHelper::centerGrow(
bool RelativePositionHelper::moveObject(
chart2::RelativePosition & rInOutPosition,
const chart2::RelativeSize & rObjectSize,
- double fAmountX, double fAmountY,
- bool bCheck /* = true */ )
+ double fAmountX, double fAmountY )
{
chart2::RelativePosition aPos( rInOutPosition );
aPos.Primary += fAmountX;
aPos.Secondary += fAmountY;
const double fPosCheckThreshold = 0.02;
- if( bCheck )
- {
- chart2::RelativePosition aUpperLeft(
- RelativePositionHelper::getReanchoredPosition( aPos, rObjectSize, drawing::Alignment_TOP_LEFT ));
- chart2::RelativePosition aLowerRight( aUpperLeft );
- aLowerRight.Primary += rObjectSize.Primary;
- aLowerRight.Secondary += rObjectSize.Secondary;
-
- const double fFarEdgeThreshold = 1.0 - fPosCheckThreshold;
- if( ( fAmountX > 0.0 && (aLowerRight.Primary > fFarEdgeThreshold)) ||
- ( fAmountX < 0.0 && (aUpperLeft.Primary < fPosCheckThreshold)) ||
- ( fAmountY > 0.0 && (aLowerRight.Secondary > fFarEdgeThreshold)) ||
- ( fAmountY < 0.0 && (aUpperLeft.Secondary < fPosCheckThreshold)) )
- return false;
- }
+ chart2::RelativePosition aUpperLeft(
+ RelativePositionHelper::getReanchoredPosition( aPos, rObjectSize, drawing::Alignment_TOP_LEFT ));
+ chart2::RelativePosition aLowerRight( aUpperLeft );
+ aLowerRight.Primary += rObjectSize.Primary;
+ aLowerRight.Secondary += rObjectSize.Secondary;
+
+ const double fFarEdgeThreshold = 1.0 - fPosCheckThreshold;
+ if( ( fAmountX > 0.0 && (aLowerRight.Primary > fFarEdgeThreshold)) ||
+ ( fAmountX < 0.0 && (aUpperLeft.Primary < fPosCheckThreshold)) ||
+ ( fAmountY > 0.0 && (aLowerRight.Secondary > fFarEdgeThreshold)) ||
+ ( fAmountY < 0.0 && (aUpperLeft.Secondary < fPosCheckThreshold)) )
+ return false;
rInOutPosition = aPos;
return true;
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 0c0064d..b25d165 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -167,11 +167,10 @@ namespace chart
{
double StatisticsHelper::getVariance(
- const Sequence< double > & rData,
- bool bUnbiasedEstimator /* = false */ )
+ const Sequence< double > & rData )
{
sal_Int32 nValCount;
- return lcl_getVariance( rData, nValCount, bUnbiasedEstimator );
+ return lcl_getVariance( rData, nValCount, false/*bUnbiasedEstimator*/ );
}
double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData )
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 38eaa0e..e08c349 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -948,7 +948,7 @@ void ThreeDHelper::getRotationAngleFromDiagram(
}
}
-void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >& xSceneProperties, bool bRightAngledAxes, bool bRotateLights )
+void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >& xSceneProperties, bool bRightAngledAxes )
{
try
{
@@ -959,18 +959,15 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >
if( bOldRightAngledAxes!=bRightAngledAxes)
{
xSceneProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( bRightAngledAxes ));
- if( bRotateLights )
+ if(bRightAngledAxes)
{
- if(bRightAngledAxes)
- {
- ::basegfx::B3DHomMatrix aInverseRotation( lcl_getInverseRotationMatrix( xSceneProperties ) );
- lcl_rotateLights( aInverseRotation, xSceneProperties );
- }
- else
- {
- ::basegfx::B3DHomMatrix aCompleteRotation( lcl_getCompleteRotationMatrix( xSceneProperties ) );
- lcl_rotateLights( aCompleteRotation, xSceneProperties );
- }
+ ::basegfx::B3DHomMatrix aInverseRotation( lcl_getInverseRotationMatrix( xSceneProperties ) );
+ lcl_rotateLights( aInverseRotation, xSceneProperties );
+ }
+ else
+ {
+ ::basegfx::B3DHomMatrix aCompleteRotation( lcl_getCompleteRotationMatrix( xSceneProperties ) );
+ lcl_rotateLights( aCompleteRotation, xSceneProperties );
}
}
}
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6c789cd..380a84d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1025,8 +1025,7 @@ void VSeriesPlotter::createErrorBar(
void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
- , const uno::Reference< drawing::XShapes >& xTarget
- , double* pfScaledLogicX )
+ , const uno::Reference< drawing::XShapes >& xTarget )
{
if(m_nDimension!=2)
return;
@@ -1041,7 +1040,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic
, rUnscaledLogicPosition, xErrorBarProp
, rVDataSeries, nPointIndex
, false /* bYError */
- , pfScaledLogicX );
+ , nullptr );
}
}
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 9a568f1..c4ddffe 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -60,12 +60,12 @@ public:
inline bool isStrongLowerRequested( sal_Int32 nDimensionIndex ) const;
inline bool isLogicVisible( double fX, double fY, double fZ ) const;
inline void doLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const;
- inline void doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const;
+ inline void doUnshiftedLogicScaling( double* pX, double* pY, double* pZ ) const;
inline void clipLogicValues( double* pX, double* pY, double* pZ ) const;
void clipScaledLogicValues( double* pX, double* pY, double* pZ ) const;
inline bool clipYRange( double& rMin, double& rMax ) const;
- inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip=false ) const;
+ inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >
getTransformationScaledLogicToScene() const;
@@ -323,11 +323,8 @@ void PlottingPositionHelper::doLogicScaling( double* pX, double* pY, double* pZ,
}
}
-void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip ) const
+void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, double* pZ ) const
{
- if(bClip)
- this->clipLogicValues( pX,pY,pZ );
-
if(pX && m_aScales[0].Scaling.is())
*pX = m_aScales[0].Scaling->doScaling(*pX);
if(pY && m_aScales[1].Scaling.is())
@@ -336,9 +333,9 @@ void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, do
*pZ = m_aScales[2].Scaling->doScaling(*pZ);
}
-void PlottingPositionHelper::doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip ) const
+void PlottingPositionHelper::doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const
{
- doLogicScaling( &rPos.PositionX, &rPos.PositionY, &rPos.PositionZ, bClip );
+ doLogicScaling( &rPos.PositionX, &rPos.PositionY, &rPos.PositionZ );
}
void PlottingPositionHelper::clipLogicValues( double* pX, double* pY, double* pZ ) const
diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx
index 23de24c..51a9ea7 100644
--- a/chart2/source/view/inc/VLineProperties.hxx
+++ b/chart2/source/view/inc/VLineProperties.hxx
@@ -25,9 +25,6 @@
namespace chart
{
-/**
-*/
-
struct VLineProperties
{
com::sun::star::uno::Any Color; //type sal_Int32 UNO_NAME_LINECOLOR
@@ -38,8 +35,7 @@ struct VLineProperties
VLineProperties();
void initFromPropertySet( const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet >& xProp
- , bool bUseSeriesPropertyNames=false );
+ ::com::sun::star::beans::XPropertySet >& xProp );
bool isLineVisible() const;
};
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index dec486a..c6873bd 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -382,8 +382,7 @@ protected:
void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
, const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes >& xTarget
- , double* pfScaledLogicX=nullptr );
+ ::com::sun::star::drawing::XShapes >& xTarget );
void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index 8cf06e6..e3486ce 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -35,23 +35,11 @@ VLineProperties::VLineProperties()
this->Width = uno::makeAny( sal_Int32(0) );//type sal_Int32 for property UNO_NAME_LINEWIDTH
}
-void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp, bool bUseSeriesPropertyNames )
+void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
if(xProp.is())
{
- if( bUseSeriesPropertyNames ) try
- {
- this->Color = xProp->getPropertyValue( "BorderColor" );
- this->LineStyle = xProp->getPropertyValue( "BorderStyle" );
- this->Transparence = xProp->getPropertyValue( "BorderTransparency" );
- this->Width = xProp->getPropertyValue( "BorderWidth" );
- this->DashName = xProp->getPropertyValue( "BorderDashName" );
- }
- catch( const uno::Exception& e )
- {
- ASSERT_EXCEPTION( e );
- }
- else try
+ try
{
this->Color = xProp->getPropertyValue( "LineColor" );
this->LineStyle = xProp->getPropertyValue( "LineStyle" );
commit 33265f52dfa6a4612156288a170a8e41cff2cfd8
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:46:58 2016 +0200
loplugin:unuseddefaultparam in cui
Change-Id: I445b96a2ed4364616b2cb6a23efe36afb3f862f7
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 40d036d..c633526 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -112,8 +112,8 @@ namespace connectivity
: ORefVector<sal_Int32>(_nSize)
, m_bFrozen(false){}
- bool isFrozen() const { return m_bFrozen; }
- void setFrozen(bool _bFrozen=true) { m_bFrozen = _bFrozen; }
+ bool isFrozen() const { return m_bFrozen; }
+ void setFrozen() { m_bFrozen = true; }
};
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_TSORTINDEX_HXX
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9dbe49f..c238dc7 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1200,7 +1200,7 @@ bool MenuSaveInData::Apply()
uno::Reference< lang::XSingleComponentFactory > xFactory (
m_xMenuSettings, uno::UNO_QUERY );
- Apply( pRootEntry, xIndexContainer, xFactory );
+ Apply( xIndexContainer, xFactory );
try
{
@@ -1237,14 +1237,9 @@ bool MenuSaveInData::Apply()
}
void MenuSaveInData::Apply(
- SvxConfigEntry* pRootEntry_,
uno::Reference< container::XIndexContainer >& rMenuBar,
- uno::Reference< lang::XSingleComponentFactory >& rFactory,
- SvTreeListEntry *pParentEntry )
+ uno::Reference< lang::XSingleComponentFactory >& rFactory )
{
- (void)pRootEntry_;
- (void)pParentEntry;
-
SvxEntries::const_iterator iter = GetEntries()->begin();
SvxEntries::const_iterator end = GetEntries()->end();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 778b513..c57913a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -195,16 +195,16 @@ void MacroEventListBox::ConnectElements()
maListBox->InitHeaderBar( maHeaderBar.get() );
}
-void MacroEventListBox::Show( bool bVisible, ShowFlags nFlags )
+void MacroEventListBox::Show( bool bVisible )
{
- maListBox->Show( bVisible, nFlags );
- maHeaderBar->Show( bVisible, nFlags );
+ maListBox->Show( bVisible );
+ maHeaderBar->Show( bVisible );
}
-void MacroEventListBox::Enable( bool bEnable, bool bChild )
+void MacroEventListBox::Enable( bool bEnable )
{
- maListBox->Enable( bEnable, bChild );
- maHeaderBar->Enable( bEnable, bChild );
+ maListBox->Enable( bEnable );
+ maHeaderBar->Enable( bEnable );
}
// assign button ("Add Command") is enabled only if it is not read only
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index f1b552f..7b772b1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1979,10 +1979,10 @@ void SentenceEditWindow_Impl::ResetUndo()
}
-void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg )
+void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction )
{
::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
- rUndoMgr.AddUndoAction(pAction, bTryMerg);
+ rUndoMgr.AddUndoAction(pAction);
GetSpellDialog()->m_pUndoPB->Enable();
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6e39a87..a6a9aba 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -279,8 +279,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
const Image& rChoiceIcon,
CreatePage pCreateFunc /* != 0 */,
GetPageRanges pRangesFunc /* darf 0 sein */,
- bool bItemsOnDemand,
- sal_uLong /*nPos*/
+ bool bItemsOnDemand
)
{
IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index ab74377..c527080 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -111,7 +111,7 @@ public:
void ResetUndo();
void Undo();
- void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false );
+ void AddUndoAction( SfxUndoAction *pAction );
sal_uInt16 GetUndoActionCount();
void UndoActionStart( sal_uInt16 nId );
void UndoActionEnd();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0b47d2c..abc9280 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -176,10 +176,8 @@ private:
static MenuSaveInData* GetDefaultData() { return pDefaultData; }
void Apply(
- SvxConfigEntry* pRootEntry,
css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
- css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
- SvTreeListEntry *pParent = nullptr );
+ css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory );
public:
@@ -290,7 +288,7 @@ public:
SvxEntries* GetEntries() const { return mpEntries; }
void SetEntries( SvxEntries* entries ) { mpEntries = entries; }
- void SetMain( bool bValue = true ) { bIsMain = bValue; }
+ void SetMain() { bIsMain = true; }
bool IsMain() { return bIsMain; }
void SetParentData( bool bValue = true ) { bIsParentData = bValue; }
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 71397b7..1ec22e2 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -52,8 +52,8 @@ public:
void ConnectElements();/**< should be called after all manipulations on elements are done
calcs real sizes depending on sizes of this */
- void Show( bool bVisible = true, ShowFlags nFlags = ShowFlags::NONE ); ///< same meaning as Windows::Show()
- void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable()
+ void Show( bool bVisible = true ); ///< same meaning as Windows::Show()
+ void Enable( bool bEnable = true ); ///< same meaning as Windows::Enable()
};
#endif
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 76d8d37..23a3cb6 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -91,8 +91,8 @@ public:
virtual bool FillItemSet( SfxItemSet* ) = 0;
virtual void Reset( const SfxItemSet& ) = 0;
- bool HasExchangeSupport() const { return bHasExchangeSupport; }
- void SetExchangeSupport( bool bNew = true ) { bHasExchangeSupport = bNew; }
+ bool HasExchangeSupport() const { return bHasExchangeSupport; }
+ void SetExchangeSupport() { bHasExchangeSupport = true; }
enum {
KEEP_PAGE = 0x0000, ///< error handling
@@ -181,7 +181,7 @@ public:
SvxIconChoiceCtrlEntry* AddTabPage(
sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon,
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = nullptr /* NULL allowed*/,
- bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND );
+ bool bItemsOnDemand = false );
void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b29e329..c5243bf 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -457,7 +457,7 @@ public:
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
- void SetModified(bool bRepaint = true);
+ void SetModified();
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index aecef5b..ce94e50 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -265,24 +265,22 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet,
sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot,
- FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags )
+ FrameSelector& rFrameSel, FrameBorderType eBorder )
{
- return new sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper >( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags );
+ return new sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper >( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), sfx::ITEMCONN_DEFAULT );
}
sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
MetricField& rMfLeft, MetricField& rMfRight,
- MetricField& rMfTop, MetricField& rMfBottom,
- sfx::ItemConnFlags nFlags )
+ MetricField& rMfTop, MetricField& rMfBottom )
{
- return new MarginConnection( rItemSet, rMfLeft, rMfRight, rMfTop, rMfBottom, nFlags );
+ return new MarginConnection( rItemSet, rMfLeft, rMfRight, rMfTop, rMfBottom, sfx::ITEMCONN_DEFAULT );
}
sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
- ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor,
- sfx::ItemConnFlags nFlags )
+ ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor )
{
- return new ShadowConnection( rItemSet, rVsPos, rMfSize, rLbColor, nFlags );
+ return new ShadowConnection( rItemSet, rVsPos, rMfSize, rLbColor, sfx::ITEMCONN_DEFAULT );
}
diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 466c631..17343d8 100644
--- a/cui/source/tabpages/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
@@ -36,21 +36,18 @@ class FrameSelector;
/** Creates an item connection object that connects an SvxLineItem with an
svx::FrameSelector control. */
sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot,
- FrameSelector& rFrameSel, FrameBorderType eBorder,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ FrameSelector& rFrameSel, FrameBorderType eBorder );
/** Creates an item connection object that connects an SvxMarginItem with the
controls of the SvxBorderTabPage. */
sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
MetricField& rMfLeft, MetricField& rMfRight,
- MetricField& rMfTop, MetricField& rMfBottom,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ MetricField& rMfTop, MetricField& rMfBottom );
/** Creates an item connection object that connects an SvxShadowItem with the
controls of the SvxBorderTabPage. */
sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
- ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor,
- sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
+ ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7361c98..45e51f6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3664,14 +3664,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void)
SetModified();
}
-void SvxNumPositionTabPage::SetModified(bool bRepaint)
+void SvxNumPositionTabPage::SetModified()
{
bModified = true;
- if(bRepaint)
- {
- m_pPreviewWIN->SetLevel(nActNumLvl);
- m_pPreviewWIN->Invalidate();
- }
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
void SvxNumOptionsTabPage::SetModified(bool bRepaint)
commit 09b5fe4c898cacd69042d1c585e27daf5d86cae7
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:39:39 2016 +0200
loplugin:unuseddefaultparam in desktop
Change-Id: I9a7ac03dcbc3849eced0f8431e186b59b31b2418
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index a350579..2a72627 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -400,7 +400,7 @@ void OfficeIPCThread::SetDowning()
static bool s_bInEnableRequests = false;
-void OfficeIPCThread::EnableRequests( bool i_bEnable )
+void OfficeIPCThread::EnableRequests()
{
// switch between just queueing the requests and executing them
::osl::MutexGuard aGuard( GetMutex() );
@@ -408,14 +408,11 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable )
if ( pGlobalOfficeIPCThread.is() )
{
s_bInEnableRequests = true;
- pGlobalOfficeIPCThread->mbRequestsEnabled = i_bEnable;
- if( i_bEnable )
- {
- // hit the compiler over the head
- ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< OUString >() );
- // trigger already queued requests
- OfficeIPCThread::ExecuteCmdLineRequests( aEmptyReq );
- }
+ pGlobalOfficeIPCThread->mbRequestsEnabled = true;
+ // hit the compiler over the head
+ ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< OUString >() );
+ // trigger already queued requests
+ OfficeIPCThread::ExecuteCmdLineRequests( aEmptyReq );
s_bInEnableRequests = false;
}
}
@@ -430,14 +427,14 @@ bool OfficeIPCThread::AreRequestsPending()
return false;
}
-void OfficeIPCThread::RequestsCompleted( int nCount )
+void OfficeIPCThread::RequestsCompleted()
{
// Remove nCount pending requests from our internal counter
::osl::MutexGuard aGuard( GetMutex() );
if ( pGlobalOfficeIPCThread.is() )
{
if ( pGlobalOfficeIPCThread->mnPendingRequests > 0 )
- pGlobalOfficeIPCThread->mnPendingRequests -= nCount;
+ pGlobalOfficeIPCThread->mnPendingRequests --;
}
}
@@ -682,12 +679,9 @@ void OfficeIPCThread::SetReady(
}
}
-void OfficeIPCThread::WaitForReady(
- rtl::Reference< OfficeIPCThread > const & pThread)
-
+void OfficeIPCThread::WaitForReady()
{
- rtl::Reference< OfficeIPCThread > const & t(
- pThread.is() ? pThread : pGlobalOfficeIPCThread);
+ rtl::Reference< OfficeIPCThread > const & t(pGlobalOfficeIPCThread);
if (t.is())
{
t->cReady.wait();
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 4014803..e00593d 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -106,9 +106,9 @@ class OfficeIPCThread : public salhelper::Thread
// controlling pipe communication during shutdown
static void SetDowning();
- static void EnableRequests( bool i_bEnable = true );
+ static void EnableRequests();
static bool AreRequestsPending();
- static void RequestsCompleted( int n = 1 );
+ static void RequestsCompleted();
static bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
// return sal_False if second office
@@ -118,9 +118,7 @@ class OfficeIPCThread : public salhelper::Thread
static void SetReady(
rtl::Reference< OfficeIPCThread > const & pThread =
rtl::Reference< OfficeIPCThread >());
- static void WaitForReady(
- rtl::Reference< OfficeIPCThread > const & pThread =
- rtl::Reference< OfficeIPCThread >());
+ static void WaitForReady();
static bool IsEnabled();
bool AreRequestsEnabled() const { return mbRequestsEnabled && ! mbDowning; }
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index d032153..f77aff0 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -290,7 +290,7 @@ void PersistentMap::put( OString const & key, OString const & value )
flush();
}
-bool PersistentMap::erase( OString const & key, bool flush_immediately )
+bool PersistentMap::erase( OString const & key )
{
if( m_bReadOnly)
return false;
@@ -298,8 +298,7 @@ bool PersistentMap::erase( OString const & key, bool flush_immediately )
if( !nCount)
return false;
m_bIsDirty = true;
- if( flush_immediately)
- flush();
+ flush();
return true;
}
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index d40aed4..8923395 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -51,7 +51,7 @@ public:
bool get( OString * value, OString const & key ) const;
const t_string2string_map& getEntries() const { return m_entries; }
void put( OString const & key, OString const & value );
- bool erase( OString const & key, bool flush_immediately = true );
+ bool erase( OString const & key );
protected:
void open();
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 3b73159..2be62e1 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -67,7 +67,7 @@ OUString toString( OptionInfo const * info )
OptionInfo const * getOptionInfo(
OptionInfo const * list,
- OUString const & opt, sal_Unicode copt )
+ OUString const & opt )
{
for ( ; list->m_name != nullptr; ++list )
{
@@ -75,16 +75,7 @@ OptionInfo const * getOptionInfo(
if (!opt.isEmpty())
{
if (opt.equalsAsciiL(
- option_info.m_name, option_info.m_name_length ) &&
- (copt == '\0' || copt == option_info.m_short_option))
- {
- return &option_info;
- }
- }
- else
- {
- OSL_ASSERT( copt != '\0' );
- if (copt == option_info.m_short_option)
+ option_info.m_name, option_info.m_name_length ))
{
return &option_info;
}
@@ -198,7 +189,7 @@ OUString const & getProcessWorkingDir()
OUString makeAbsoluteFileUrl(
- OUString const & sys_path, OUString const & base_url, bool throw_exc )
+ OUString const & sys_path, OUString const & base_url )
{
// system path to file url
OUString file_url;
@@ -209,7 +200,7 @@ OUString makeAbsoluteFileUrl(
{
file_url = sys_path;
}
- else if (throw_exc)
+ else
{
throw RuntimeException("cannot get file url from system path: " +
sys_path );
@@ -220,16 +211,13 @@ OUString makeAbsoluteFileUrl(
if (osl_getAbsoluteFileURL(
base_url.pData, file_url.pData, &abs.pData ) != osl_File_E_None)
{
- if (throw_exc) {
- OUStringBuffer buf;
- buf.append( "making absolute file url failed: \"" );
- buf.append( base_url );
- buf.append( "\" (base-url) and \"" );
- buf.append( file_url );
- buf.append( "\" (file-url)!" );
- throw RuntimeException( buf.makeStringAndClear() );
- }
- return OUString();
+ OUStringBuffer buf;
+ buf.append( "making absolute file url failed: \"" );
+ buf.append( base_url );
+ buf.append( "\" (base-url) and \"" );
+ buf.append( file_url );
+ buf.append( "\" (file-url)!" );
+ throw RuntimeException( buf.makeStringAndClear() );
}
return abs[ abs.getLength() -1 ] == '/'
? abs.copy( 0, abs.getLength() -1 ) : abs;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index e263b61..a11a29b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -59,7 +59,7 @@ OUString toString( OptionInfo const * info );
OptionInfo const * getOptionInfo(
OptionInfo const * list,
- OUString const & opt, sal_Unicode copt = '\0' );
+ OUString const & opt );
bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex );
@@ -94,8 +94,7 @@ OUString const & getProcessWorkingDir();
OUString makeAbsoluteFileUrl(
- OUString const & sys_path, OUString const & base_url,
- bool throw_exc = true );
+ OUString const & sys_path, OUString const & base_url );
commit b0e18a68c86733b6d88a0c990d4fa4d938680727
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:32:24 2016 +0200
loplugin:unuseddefaultparam in forms
Change-Id: I5a2b50163acfda3878fe5625a605e3437a7cc700
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 7de4e87..8e4cdfa 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -110,10 +110,10 @@ void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno
}
}
-void OComponentEventThread::addEvent( const EventObject* _pEvt, bool bFlag )
+void OComponentEventThread::addEvent( const EventObject* _pEvt )
{
Reference<XControl> xTmp;
- addEvent( _pEvt, xTmp, bFlag );
+ addEvent( _pEvt, xTmp );
}
void OComponentEventThread::addEvent( const EventObject* _pEvt,
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 9b8cc8b..7934fb3 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -89,7 +89,7 @@ public:
explicit OComponentEventThread(::cppu::OComponentHelper* pCompImpl);
virtual ~OComponentEventThread();
- void addEvent( const css::lang::EventObject* _pEvt, bool bFlag = false );
+ void addEvent( const css::lang::EventObject* _pEvt );
void addEvent( const css::lang::EventObject* _pEvt, const css::uno::Reference< css::awt::XControl>& rControl,
bool bFlag = false );
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index b3830c5..e3bfef6 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -116,9 +116,9 @@ namespace frm
}
- static WinBits getWinBits( const Reference< XControlModel >& _rxModel, WinBits nBaseBits = 0 )
+ static WinBits getWinBits( const Reference< XControlModel >& _rxModel )
{
- WinBits nBits = nBaseBits;
+ WinBits nBits = 0;
try
{
Reference< XPropertySet > xProps( _rxModel, UNO_QUERY );
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index 31b9aaf..03aae7b 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -153,9 +153,9 @@ void ComputedExpression::clear()
}
-OUString ComputedExpression::getString( const OUString& rDefault ) const
+OUString ComputedExpression::getString() const
{
- return mxResult.is() ? mxResult->getString() : rDefault;
+ return mxResult.is() ? mxResult->getString() : OUString();
}
bool ComputedExpression::getBool( bool bDefault ) const
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 1aa4ffc..169cd66 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -113,7 +113,7 @@ public:
// must call evaluate to ensure current results.)
css::uno::Reference<css::xml::xpath::XXPathObject> getXPath() const { return mxResult;}
bool getBool( bool bDefault = false ) const;
- OUString getString( const OUString& rDefault = OUString() ) const;
+ OUString getString() const;
};
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index fe68cd9..43ac716 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -232,7 +232,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs)
// Date and Time Functions
-static OString makeDateTimeString (const DateTime& aDateTime, bool bUTC = true)
+static OString makeDateTimeString (const DateTime& aDateTime)
{
OStringBuffer aDateTimeString;
aDateTimeString.append((sal_Int32)aDateTime.GetYear());
@@ -251,7 +251,7 @@ static OString makeDateTimeString (const DateTime& aDateTime, bool bUTC = true)
aDateTimeString.append(":");
if (aDateTime.GetSec()<10) aDateTimeString.append("0");
aDateTimeString.append((sal_Int32)aDateTime.GetSec());
- if (bUTC) aDateTimeString.append("Z");
+ aDateTimeString.append("Z");
return aDateTimeString.makeStringAndClear();
}
commit 7607b608d626267011d6cd00080cb608b0badf97
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:30:09 2016 +0200
loplugin:unuseddefaultparam in framework
Change-Id: I4c5baa6f524e3382794c4844b7444904cc38584a
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index e3b5b78..3a8bcfb 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -160,7 +160,7 @@ class MenuDispatcher : public ::cppu::WeakImplHelper<
/*-****************************************************************************************************
*//*-*****************************************************************************************************/
- bool impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource = false );
+ bool impl_setMenuBar( MenuBar* pMenuBar );
/*-****************************************************************************************************
*//*-*****************************************************************************************************/
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 9ba5db8..f4eaec8 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -107,10 +107,8 @@ class Gate : private boost::noncopyable
@seealso method wait()
@seealso method open()
- @param "pTimeOut", optional parameter to wait a certain time
-
*//*-*****************************************************************************************************/
- void wait(const TimeValue* pTimeOut = nullptr)
+ void wait()
{
// We must safe access to our internal member!
::osl::ClearableMutexGuard aLock( m_aAccessLock );
@@ -122,7 +120,7 @@ class Gate : private boost::noncopyable
// and if we hold the access lock nobody else can use this object without a deadlock!
aLock.clear();
// Wait for opening gate...
- m_aPassage.wait( pTimeOut );
+ m_aPassage.wait();
}
}
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 90c9e63..739b30c 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -209,7 +209,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
}
}
-bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource )
+bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar )
{
uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY );
if ( xFrame.is() )
@@ -261,14 +261,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource
}
// set new menu on our system window and create new menu manager
- if ( bMenuFromResource )
- {
- m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, false );
- }
- else
- {
- m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, true );
- }
+ m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, true );
pSysWindow->SetMenuBar( pMenuBar );
}
commit 88eda6e3f932c97e998343829acbc444d03f5167
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:28:14 2016 +0200
loplugin:unuseddefaultparam in l10ntools
Change-Id: I688ed796c054002ed05a1a2faa04c6f7a3123ef0
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 94a6188..29397bf 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -156,7 +156,7 @@ public:
void Print( XMLNode *pCur = nullptr, sal_uInt16 nLevel = 0 );
void SearchL10NElements( XMLChildNode *pCur, int pos = 0 );
- void Extract( XMLFile *pCur = nullptr );
+ void Extract();
XMLHashMap* GetStrings(){ return m_pXMLStrings.get(); }
void Write( OString const &rFilename );
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 8b42184..45b3e2f 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -63,7 +63,7 @@ public:
void Execute( int nToken, char * pToken );
- void SetError( bool bErr = true ) { bError = bErr; }
+ void SetError() { bError = true; }
bool GetError() { return bError; }
};
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 6946f07..714ef1d 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -324,18 +324,10 @@ XMLFile::XMLFile( const OString &rFileName ) // the file name, empty if created
m_aNodes_localize.insert( TagMap::value_type(OString("link") , sal_True) );
}
-void XMLFile::Extract( XMLFile *pCur )
+void XMLFile::Extract()
{
m_pXMLStrings.reset( new XMLHashMap() );
- if ( !pCur )
- SearchL10NElements( this );
- else
- {
- if( pCur->GetNodeType() == XML_NODE_TYPE_FILE )
- {
- SearchL10NElements(pCur);
- }
- }
+ SearchL10NElements( this );
}
void XMLFile::InsertL10NElement( XMLElement* pElement )
commit 5055b4ad7be50e905ebc0c032fa9f5cdc6316fc1
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:27:02 2016 +0200
loplugin:unuseddefaultparam in lotuswordpro
Change-Id: I60a7a6d1b576411bea63f1616f2103ec6f126915
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 6c9c09a..7dc67e7 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -202,12 +202,10 @@ void LwpObjectStream::Seek( sal_uInt16 pos)
/**
* @descr Quick read sal_Bool
*/
-bool LwpObjectStream::QuickReadBool(bool *pFailure)
+bool LwpObjectStream::QuickReadBool()
{
SVBT16 aValue = {0};
- sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
- if (pFailure)
- *pFailure = (nRead != sizeof(aValue));
+ QuickRead(aValue, sizeof(aValue));
return static_cast<bool>(SVBT16ToShort(aValue));
}
/**
@@ -235,23 +233,19 @@ sal_uInt16 LwpObjectStream::QuickReaduInt16(bool *pFailure)
/**
* @descr Quick read sal_Int32
*/
-sal_Int32 LwpObjectStream::QuickReadInt32(bool *pFailure)
+sal_Int32 LwpObjectStream::QuickReadInt32()
{
SVBT32 aValue = {0};
- sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
- if (pFailure)
- *pFailure = (nRead != sizeof(aValue));
+ QuickRead(aValue, sizeof(aValue));
return static_cast<sal_Int32>(SVBT32ToUInt32(aValue));
}
/**
* @descr Quick read sal_Int16
*/
-sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure)
+sal_Int16 LwpObjectStream::QuickReadInt16()
{
SVBT16 aValue = {0};
- sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
- if (pFailure)
- *pFailure = (nRead != sizeof(aValue));
+ QuickRead(aValue, sizeof(aValue));
return static_cast<sal_Int16>(SVBT16ToShort(aValue));
}
@@ -269,7 +263,7 @@ sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure)
/**
* @descr Quick read double
*/
-double LwpObjectStream::QuickReadDouble(bool *pFailure)
+double LwpObjectStream::QuickReadDouble()
{
union
{
@@ -277,9 +271,7 @@ double LwpObjectStream::QuickReadDouble(bool *pFailure)
sal_uInt8 c[8];
} s;
memset(s.c, 0, sizeof(s.c));
- sal_uInt16 nRead = QuickRead(s.c, sizeof(s.c));
- if (pFailure)
- *pFailure = (nRead != sizeof(s.c));
+ QuickRead(s.c, sizeof(s.c));
#if defined(OSL_BIGENDIAN)
for (size_t i = 0; i < 4; ++i)
std::swap(s.c[i], s.c[7-i]);
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index d842485..826bd8e 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -92,13 +92,13 @@ public:
void SkipExtra();
sal_uInt16 CheckExtra();
- bool QuickReadBool(bool *pFailure=nullptr);
+ bool QuickReadBool();
sal_uInt32 QuickReaduInt32(bool *pFailure=nullptr);
sal_uInt16 QuickReaduInt16(bool *pFailure=nullptr);
sal_uInt8 QuickReaduInt8(bool *pFailure=nullptr);
- sal_Int32 QuickReadInt32(bool *pFailure=nullptr);
- sal_Int16 QuickReadInt16(bool *pFailure=nullptr);
- double QuickReadDouble(bool *pFailure=nullptr);
+ sal_Int32 QuickReadInt32();
+ sal_Int16 QuickReadInt16();
+ double QuickReadDouble();
OUString QuickReadStringPtr();
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index 143b006..07e5e12f 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -95,7 +95,7 @@ public:
void AddWeekDay( bool bLongFmt = true );
- void AddEra(bool bLongFmt = false);
+ void AddEra();
void AddHour( bool bLongFmt = true );
@@ -155,11 +155,11 @@ inline void XFDateStyle::AddWeekDay( bool bLongFmt )
m_aParts.AddStyle(part);
}
-inline void XFDateStyle::AddEra(bool bLongFmt)
+inline void XFDateStyle::AddEra()
{
XFDatePart *part = new XFDatePart();
part->SetPartType(enumXFDateEra);
- part->SetLongFmt(bLongFmt);
+ part->SetLongFmt(false);
m_aParts.AddStyle(part);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index 0fa2623..4d19489 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -86,11 +86,11 @@ public:
/**
* @descr Set drawing object rotate.
*/
- void SetRotate(double degree, const XFPoint& rRotatePoint=XFPoint(0,0))
+ void SetRotate(double degree)
{
m_nFlag |= XFDRAWOBJECT_FLAG_ROTATE;
m_fRotate = degree*2*PI/360;
- m_aRotatePoint = rRotatePoint;
+ m_aRotatePoint = XFPoint(0,0);
}
void ContentToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index f125779..52c8ac0 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -81,38 +81,29 @@ XFDrawPath::XFDrawPath()
{
}
-void XFDrawPath::MoveTo(XFPoint pt, bool absPosition)
+void XFDrawPath::MoveTo(XFPoint pt)
{
XFSvgPathEntry entry;
- if( absPosition )
- entry.SetCommand("M");
- else
- entry.SetCommand("m");
+ entry.SetCommand("M");
entry.AddPoint(pt);
m_aPaths.push_back(entry);
}
-void XFDrawPath::LineTo(XFPoint pt, bool absPosition)
+void XFDrawPath::LineTo(XFPoint pt)
{
XFSvgPathEntry entry;
- if( absPosition )
- entry.SetCommand("L");
- else
- entry.SetCommand("l");
+ entry.SetCommand("L");
entry.AddPoint(pt);
m_aPaths.push_back(entry);
}
-void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition)
+void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2)
{
XFSvgPathEntry entry;
- if( absPosition )
- entry.SetCommand("C");
- else
- entry.SetCommand("c");
+ entry.SetCommand("C");
entry.AddPoint(ctrl1);
entry.AddPoint(ctrl2);
entry.AddPoint(dest);
@@ -120,14 +111,11 @@ void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool abs
m_aPaths.push_back(entry);
}
-void XFDrawPath::ClosePath(bool absPosition)
+void XFDrawPath::ClosePath()
{
XFSvgPathEntry entry;
- if( absPosition )
- entry.SetCommand("Z");
- else
- entry.SetCommand("z");
+ entry.SetCommand("Z");
m_aPaths.push_back(entry);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index 584677a..4866724 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -107,22 +107,22 @@ public:
/**
* @descr Move command.
*/
- void MoveTo(XFPoint pt, bool absPosition = true);
+ void MoveTo(XFPoint pt);
/**
* @descr Line command.
*/
- void LineTo(XFPoint pt, bool absPosition = true);
+ void LineTo(XFPoint pt);
/**
* @descr Curve command.
*/
- void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition = true);
+ void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2);
/**
* @descr Close path command.
*/
- void ClosePath(bool absPosition = true);
+ void ClosePath();
virtual void ToXml(IXFStream *pStrm) override;
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index d7ada06..95ecbfa 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -189,7 +189,7 @@ public:
/**
* @descr Set crossout.
*/
- void SetCrossout(enumXFCrossout cross,bool wordByWord=false);
+ void SetCrossout(enumXFCrossout cross);
/**
* @descr Set font transform type,pls refer to enumXFTransform.
@@ -354,10 +354,10 @@ inline void XFFont::SetUnderline(enumXFUnderline underline, bool wordByWord)
m_nFlag |= XFFONT_FLAG_UNDERLINE;
}
-inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord)
+inline void XFFont::SetCrossout(enumXFCrossout cross)
{
m_eCrossout = cross;
- m_bWordByWord = wordByWord;
+ m_bWordByWord = false;
m_nFlag |= XFFONT_FLAG_CROSSOUT;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 838d861..e756258 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -84,7 +84,7 @@ public:
virtual ~XFFrameStyle();
public:
- void SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs = 0);
+ void SetWrapType(enumXFWrap wrap);
/**
* @descr: space between frame and paragraph text.
@@ -172,7 +172,7 @@ protected:
enumXFFrameYRel m_eYRel;
};
-inline void XFFrameStyle::SetWrapType(enumXFWrap wrap, sal_Int32 /*nParagraphs*/)
+inline void XFFrameStyle::SetWrapType(enumXFWrap wrap)
{
m_eWrap = wrap;
}
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index d0e1a075..65ce1e8 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -70,7 +70,7 @@ public:
XFListItem();
public:
- void SetIsHeader(bool isHeader=true);
+ void SetIsHeader();
virtual void ToXml(IXFStream *pStrm) override;
@@ -83,9 +83,9 @@ inline XFListItem::XFListItem()
m_bIsHeader = false;
}
-inline void XFListItem::SetIsHeader(bool isHeader)
+inline void XFListItem::SetIsHeader()
{
- m_bIsHeader = isHeader;
+ m_bIsHeader = true;
}
inline void XFListItem::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index 57e710d..7848d44 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -73,7 +73,7 @@ public:
public:
void SetDecimalDigits(sal_Int32 decimal);
- void SetGroup(bool group = true);
+ void SetGroup();
void SetColor(const XFColor& color);
XFColor GetColor(){return m_aColor;}
@@ -134,9 +134,9 @@ inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUStri
m_strNegativeSuffix = suffix;
}
-inline void XFNumberStyle::SetGroup(bool group)
+inline void XFNumberStyle::SetGroup()
{
- m_bGroup = group;
+ m_bGroup = true;
}
inline void XFNumberStyle::SetColor(const XFColor& color)
commit 1fe8e60c014df28c6d5a9bf06e868d4764e661d5
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:20:46 2016 +0200
loplugin:unuseddefaultparam in reportdesign
Change-Id: I7663ed82da85794ed8409f03e21940cd26786c5a
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 2f30567..c37abf7 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -137,7 +137,7 @@ namespace rptui
/** align all marked objects in all sections
*/
- void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false);
+ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection);
/** All objects will be marked.
*/
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index cc0f8ca..4587542 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -147,10 +147,9 @@ namespace rptui
* \param _pObj
* \param _rPage
* \param _rView
- * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones
* \return the object which is overlapped, otherwise <NULL/>. If the given object is not of type OUnoObject <NULL/> will be returned.
*/
- SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects = false);
+ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView);
/** retrieves the names of the parameters of the command which the given RowSet is bound to
*/
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index efe32db..0feab73 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -906,13 +906,13 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _
}
-SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMarkedObjects)
+SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView)
{
SdrObject* pOverlappedObj = nullptr;
if (dynamic_cast<OUnoObject*>(_pObj) != nullptr || dynamic_cast<OOle2Obj*>(_pObj) != nullptr) // this doesn't need to be done for shapes
{
Rectangle aRect = _pObj->GetCurrentBoundRect();
- pOverlappedObj = isOver(aRect,_rPage,_rView,_bUnMarkedObjects,_pObj);
+ pOverlappedObj = isOver(aRect,_rPage,_rView,false/*_bUnMarkedObjects*/,_pObj);
}
return pOverlappedObj;
}
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index eb2cdb0..b73bca1 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -581,9 +581,9 @@ void ODesignView::setCurrentPage(const OUString& _sLastActivePage)
m_pPropWin->setCurrentPage(_sLastActivePage);
}
-void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
+void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection)
{
- m_aScrollWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects);
+ m_aScrollWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection);
}
bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
commit 1e34462c538cda04f9afcbdb0f7b9ead26fc94be
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:16:10 2016 +0200
loplugin:unuseddefaultparam in rsc
Change-Id: Ib4cbc48295e7c16683765d1c1420fcf73235517d
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index d6a5b48..be4854a 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -99,8 +99,7 @@ class RscSysDepend : public RscClass
public:
RscSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper );
ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra,
- bool bFirst = false );
+ RscTypCont * pTC, sal_uInt32, bool bExtra );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
};
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 2a99492..cf27386 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -35,7 +35,7 @@ class RscMgr : public RscClass
void Create(){ aRefId.Create(); bDflt = true; }
void Destroy(){ aRefId.Destroy(); }
};
- ERRTYPE IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 );
+ ERRTYPE IsToDeep( const RSCINST & rInst );
public:
RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 4164762..7529de4 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -768,7 +768,7 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
}
ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra, bool bFirst )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError;
RSCINST aFileName;
@@ -789,7 +789,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
{
nId = pTC->PutSysName( rInst.pClass->GetTypId(),
aTmpMem.GetUTF8( 0 ),
- 0, 0, bFirst );
+ 0, 0, false/*bFirst*/ );
}
rMem.Put( nId );
aError = aFileName.pClass->WriteRcHeader( aFileName, rMem, pTC,
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 9c90716..682ea0c 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -279,13 +279,14 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId )
return ERR_OK;
}
-ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
+ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst )
{
RscMgrInst * pClassData;
RscId aOldId, aId;
ERRTYPE aError;
RSCINST aTmpI = rInst;
ObjNode * pObjNode;
+ sal_uInt32 nDeep = 0;
pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
commit b887f73ff0f152a7cf943dcab1eee09c3fb0d877
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:14:22 2016 +0200
loplugin:unuseddefaultparam in scaddins
Change-Id: I47f7ead34832c19d5194c1e4ccf190384262f436
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index a45beac..3ce6a18 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1629,11 +1629,10 @@ void ScaDoubleList::Append(
void ScaDoubleList::Append(
ScaAnyConverter& rAnyConv,
const uno::Reference< beans::XPropertySet >& xOpt,
- const uno::Sequence< uno::Any >& rAnySeq,
- bool bIgnoreEmpty ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+ const uno::Sequence< uno::Any >& rAnySeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
{
rAnyConv.init( xOpt );
- Append( rAnyConv, rAnySeq, bIgnoreEmpty );
+ Append( rAnyConv, rAnySeq, true/*bIgnoreEmpty*/ );
}
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index ade2310..6e7fca11 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -330,8 +330,7 @@ public:
void Append(
ScaAnyConverter& rAnyConv,
const css::uno::Reference< css::beans::XPropertySet >& xOpt,
- const css::uno::Sequence< css::uno::Any >& rAnySeq,
- bool bIgnoreEmpty = true ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+ const css::uno::Sequence< css::uno::Any >& rAnySeq ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
virtual bool CheckInsert( double fValue ) const
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
commit e65506968f98340522df9af1a2bfa7ab736bdc45
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 1 15:13:33 2016 +0200
loplugin:unuseddefaultparam in sd
Change-Id: Ic1bb6903a7e4d4aae44b0a2a21a46590d5b4027f
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f6dbd18..a8dcbe5 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -151,7 +151,7 @@ public:
SAL_DLLPRIVATE void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
SAL_DLLPRIVATE bool getStopAudio() const;
void setStopAudio();
- void createAudio( const css::uno::Any& rSource, double fVolume = 1.0 );
+ void createAudio( const css::uno::Any& rSource );
SAL_DLLPRIVATE void removeAudio();
SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index a3efd9f..674f311 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1477,7 +1477,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
return bChanged;
}
-void CustomAnimationEffect::createAudio( const css::uno::Any& rSource, double fVolume /* = 1.0 */ )
+void CustomAnimationEffect::createAudio( const css::uno::Any& rSource )
{
DBG_ASSERT( !mxAudio.is(), "sd::CustomAnimationEffect::createAudio(), node already has an audio!" );
@@ -1486,7 +1486,7 @@ void CustomAnimationEffect::createAudio( const css::uno::Any& rSource, double fV
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XAudio > xAudio( Audio::create( xContext ) );
xAudio->setSource( rSource );
- xAudio->setVolume( fVolume );
+ xAudio->setVolume( 1.0 );
setAudio( xAudio );
}
catch( Exception& )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 9bbe92c..06b2375 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2729,8 +2729,7 @@ OUString HtmlExport::CreateLink( const OUString& aLink,
// creates a image tag
OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText,
- sal_Int16 nWidth,
- sal_Int16 nHeight )
+ sal_Int16 nWidth )
{
OUStringBuffer aStr( "<img src=\"");
aStr.append(aImage);
@@ -2753,11 +2752,6 @@ OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltTe
aStr.append(" width=" + OUString::number(nWidth));
}
- if(nHeight > -1)
- {
- aStr.append(" height=" + OUString::number(nHeight));
- }
-
aStr.append('>');
return aStr.makeStringAndClear();
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 0c51afb..ae681a2 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -172,7 +172,7 @@ class HtmlExport
static OUString CreateLink( const OUString& aLink, const OUString& aText,
const OUString& aTarget = OUString());
- static OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 );
+ static OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1 );
OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
OUString CreateBodyTag() const;
diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx
index 93364d4..1fba845 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -15,9 +15,9 @@ CategoryListBox::~CategoryListBox()
{
}
-sal_Int32 CategoryListBox::InsertCategory( const OUString& rStr, sal_Int32 nPos /* = LISTBOX_APPEND */ )
+sal_Int32 CategoryListBox::InsertCategory( const OUString& rStr )
{
- sal_Int32 n = ListBox::InsertEntry( rStr, nPos );
+ sal_Int32 n = ListBox::InsertEntry( rStr );
if( n != LISTBOX_ENTRY_NOTFOUND )
ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | ListBoxEntryFlags::DisableSelection );
diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx
index fa29b4a..aace8a4 100644
--- a/sd/source/ui/animations/CategoryListBox.hxx
+++ b/sd/source/ui/animations/CategoryListBox.hxx
@@ -14,7 +14,7 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND );
+ sal_Int32 InsertCategory( const OUString& rStr );
DECL_LINK_TYPED(implDoubleClickHdl, ListBox&, void);
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 16c05d4..a8cc25e 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -487,21 +487,21 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt )
/** selects or deselects the given effect.
Selections of other effects are not changed */
-void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect /* = true */ )
+void CustomAnimationList::select( CustomAnimationEffectPtr pEffect )
{
CustomAnimationListEntry* pEntry = static_cast< CustomAnimationListEntry* >(First());
while( pEntry )
{
if( pEntry->getEffect() == pEffect )
{
- Select( pEntry, bSelect );
+ Select( pEntry );
MakeVisible( pEntry );
break;
}
pEntry = static_cast< CustomAnimationListEntry* >(Next( pEntry ));
}
- if( !pEntry && bSelect )
+ if( !pEntry )
{
append( pEffect );
select( pEffect );
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 58f6153..3769345 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -58,7 +58,7 @@ public:
/** selects or deselects the given effect.
Selections of other effects are not changed */
- void select( CustomAnimationEffectPtr pEffect, bool bSelect = true );
+ void select( CustomAnimationEffectPtr pEffect );
/** populates the list with all effects from the given MainSequence */
void update( MainSequencePtr pMainSequence );
diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx
index 9044c02..ea339af 100644
--- a/sd/source/ui/animations/STLPropertySet.cxx
+++ b/sd/source/ui/animations/STLPropertySet.cxx
@@ -42,7 +42,7 @@ void STLPropertySet::setPropertyDefaultValue( sal_Int32 nHandle, const Any& rVal
maPropertyMap[ nHandle ] = aEntry;
}
-void STLPropertySet::setPropertyValue( sal_Int32 nHandle, const Any& rValue, sal_Int32 /* nState = STLPropertyState_DIRECT */ )
+void STLPropertySet::setPropertyValue( sal_Int32 nHandle, const Any& rValue )
{
PropertyMapIter aIter;
if( findProperty( nHandle, aIter ) )
diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx
index 1060653..54665cc 100644
--- a/sd/source/ui/animations/STLPropertySet.hxx
+++ b/sd/source/ui/animations/STLPropertySet.hxx
@@ -55,7 +55,7 @@ public:
~STLPropertySet();
void setPropertyDefaultValue( sal_Int32 nHandle, const css::uno::Any& rValue );
- void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT );
+ void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue );
css::uno::Any getPropertyValue( sal_Int32 nHandle ) const;
sal_Int32 getPropertyState( sal_Int32 nHandle ) const;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index fe92614..a33e043 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -523,7 +523,7 @@ TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation )
return nullptr;
}
-void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation, bool bGrabFocus )
+void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation )
{
if( (xAnnotation != mxAnnotation) && xAnnotation.is() )
{
@@ -559,9 +559,6 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
sMeta += sDateTime;
}
mpMeta->SetText(sMeta);
-
- if( bGrabFocus )
- GrabFocus();
}
}
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 20f6e16..0ce3197 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -107,7 +107,7 @@ class AnnotationWindow : public FloatingWindow
SvxLanguageItem GetLanguage();
- void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bGrabFocus = false );
+ void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
void ExecuteSlot( sal_uInt16 nSID );
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 6497848..eed8d94 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -142,8 +142,8 @@ public:
/** Set whether to sort the template entries inside the regions.
*/
- void EnableEntrySorting (bool isEntrySortingEnabled = true)
- {mbEntrySortingEnabled = isEntrySortingEnabled;}
+ void EnableEntrySorting ()
+ {mbEntrySortingEnabled = true;}
private:
/** The current state determines which step will be executed next by
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index e444353..30c92d6 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -92,12 +92,8 @@ public:
@param pWindow
The device to update. When the given pointer is NULL then
nothing is done.
- @param pDocument
- When given a pointer to a document then tell it to reformat all
- text objects. This refomatting is necessary for the new values
- to take effect.
*/
- void Update (OutputDevice* pDevice, SdDrawDocument* pDocument=nullptr) const;
+ void Update (OutputDevice* pDevice) const;
/** Callback that waits for notifications of a
<type>SvtCTLOptions</type> object.
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 741af84..93f3ede 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -95,8 +95,7 @@ public:
static bool StartPreview( ViewShellBase& rBase,
const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
- const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode,
- vcl::Window* pParent = nullptr );
+ const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode );
static void Stop( ViewShellBase& rBase );
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index d20a76f..2733f22 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -54,20 +54,16 @@ public:
~AsynchronousCall();
/** Post a function object that is to be executed asynchronously. When
- this method is called while the current function object has not bee
- executed then the later is destroyed and only the given function
+ this method is called while the current function object has not been
+ executed then the latter is destroyed and only the given function
object will be executed.
@param rFunction
The function object that may be called asynchronously in the
near future.
- @param nTimeoutInMilliseconds
- The timeout in milliseconds until the function object is
- executed.
*/
typedef ::std::function<void ()> AsynchronousFunction;
void Post (
- const AsynchronousFunction& rFunction,
- sal_uInt32 nTimeoutInMilliseconds=10);
+ const AsynchronousFunction& rFunction);
private:
Timer maTimer;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index fe09a74..7b2c9d3 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -145,7 +145,7 @@ public:
SdDrawDocument* GetDoc() const { return mpDoc; }
bool IsImpressDocument() const { return mbImpressDoc; }
- void SetModified( bool bModified = true ) throw();
+ void SetModified() throw();
css::uno::Reference< css::i18n::XForbiddenCharacters > getForbiddenCharsTable();
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index a75743a..728bf78 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -104,8 +104,7 @@ public:
void FireContainerChange (
MasterPageContainerChangeEvent::EventType eType,
- Token aToken,
- bool bNotifyAsynchronously = false);
+ Token aToken);
virtual bool UpdateDescriptor (
const SharedMasterPageDescriptor& rpDescriptor,
@@ -170,7 +169,6 @@ private:
bool mbContainerCleaningPending;
typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
- DECL_LINK_TYPED(AsynchronousNotifyCallback, void*, void);
Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
@@ -617,18 +615,6 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize
return maLargePreviewSizePixel;
}
-IMPL_LINK_TYPED(MasterPageContainer::Implementation,AsynchronousNotifyCallback, void*, p, void)
-{
- EventData* pData = static_cast<EventData*>(p);
- const ::osl::MutexGuard aGuard (maMutex);
-
- if (pData != nullptr)
- {
- FireContainerChange(pData->first, pData->second);
- delete pData;
- }
-}
-
MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
const SharedMasterPageDescriptor& rpDescriptor)
{
@@ -945,25 +931,15 @@ void MasterPageContainer::Implementation::CleanContainer()
void MasterPageContainer::Implementation::FireContainerChange (
MasterPageContainerChangeEvent::EventType eType,
- Token aToken,
- bool bNotifyAsynchronously)
-{
- if (bNotifyAsynchronously)
- {
- Application::PostUserEvent(
- LINK(this,Implementation,AsynchronousNotifyCallback),
- new EventData(eType,aToken));
- }
- else
- {
- ::std::vector<Link<MasterPageContainerChangeEvent&,void>> aCopy(maChangeListeners.begin(),maChangeListeners.end());
- ::std::vector<Link<MasterPageContainerChangeEvent&,void>>::iterator iListener;
- MasterPageContainerChangeEvent aEvent;
- aEvent.meEventType = eType;
- aEvent.maChildToken = aToken;
- for (iListener=aCopy.begin(); iListener!=aCopy.end(); ++iListener)
- iListener->Call(aEvent);
- }
+ Token aToken)
+{
+ ::std::vector<Link<MasterPageContainerChangeEvent&,void>> aCopy(maChangeListeners.begin(),maChangeListeners.end());
+ ::std::vector<Link<MasterPageContainerChangeEvent&,void>>::iterator iListener;
+ MasterPageContainerChangeEvent aEvent;
+ aEvent.meEventType = eType;
+ aEvent.maChildToken = aToken;
+ for (iListener=aCopy.begin(); iListener!=aCopy.end(); ++iListener)
+ iListener->Call(aEvent);
}
bool MasterPageContainer::Implementation::UpdateDescriptor (
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 7d52c78..0a0283b 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -317,8 +317,7 @@ IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
}
void RecentlyUsedMasterPages::AddMasterPage (
- MasterPageContainer::Token aToken,
- bool bMakePersistent)
+ MasterPageContainer::Token aToken)
{
// For the page to be inserted the token has to be valid and the page
// has to have a valid URL. This excludes master pages that do not come
@@ -349,8 +348,7 @@ void RecentlyUsedMasterPages::AddMasterPage (
mvMasterPages.pop_back ();
}
- if (bMakePersistent)
- SavePersistentValues ();
+ SavePersistentValues ();
SendEvent();
}
}
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 7c01cc7..f8ad97a 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -110,15 +110,8 @@ private:
list of most recently used master pages. When the page is already a
member of that list the associated descriptor is moved to the end of
the list to make it the most recently used entry.
- @param bMakePersistent
- When <TRUE/> is given then the new list of recently used master
- pages is written back into the configuration to make it
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list