[Libreoffice-commits] core.git: 15 commits - accessibility/inc accessibility/source basctl/source basic/source chart2/source connectivity/source cui/source dbaccess/source fpicker/source idl/inc idl/source include/basic include/dbaccess include/sfx2 include/svl include/svtools include/svx lotuswordpro/source reportdesign/source scripting/source sc/source sd/source sfx2/source slideshow/source svl/source svtools/source svx/source sw/inc sw/source ucb/source
Noel Grandin
noel at peralex.com
Wed Mar 9 08:08:34 UTC 2016
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 2
accessibility/inc/accessibility/helper/listboxhelper.hxx | 4
accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx | 2
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 -
basctl/source/basicide/baside3.cxx | 22 +-
basctl/source/inc/baside3.hxx | 2
basic/source/basmgr/basicmanagerrepository.cxx | 4
chart2/source/controller/main/ShapeController.cxx | 4
connectivity/source/drivers/dbase/DIndex.cxx | 4
connectivity/source/drivers/dbase/DResultSet.cxx | 2
connectivity/source/drivers/jdbc/ContextClassLoader.cxx | 7
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 48 ++----
connectivity/source/drivers/postgresql/pq_baseresultset.hxx | 2
connectivity/source/inc/dbase/DIndex.hxx | 2
connectivity/source/inc/java/ContextClassLoader.hxx | 4
cui/source/factory/dlgfact.cxx | 47 ++----
cui/source/factory/dlgfact.hxx | 25 +--
dbaccess/source/core/dataaccess/ModelImpl.cxx | 16 --
dbaccess/source/core/dataaccess/ModelImpl.hxx | 5
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 21 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 50 ++----
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 60 +++-----
dbaccess/source/ui/app/AppDetailView.hxx | 4
dbaccess/source/ui/app/AppSwapWindow.cxx | 24 +--
dbaccess/source/ui/app/AppSwapWindow.hxx | 2
dbaccess/source/ui/app/AppTitleWindow.cxx | 24 +--
dbaccess/source/ui/app/AppTitleWindow.hxx | 4
dbaccess/source/ui/control/VertSplitView.cxx | 30 +---
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 16 --
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 2
dbaccess/source/ui/inc/TableDesignView.hxx | 2
dbaccess/source/ui/inc/VertSplitView.hxx | 2
dbaccess/source/ui/inc/WCopyTable.hxx | 2
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/misc/WColumnSelect.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 12 -
dbaccess/source/ui/misc/WNameMatch.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 28 +--
fpicker/source/office/RemoteFilesDialog.cxx | 4
fpicker/source/office/iodlg.cxx | 8 -
idl/inc/parser.hxx | 2
idl/source/prj/command.cxx | 2
idl/source/prj/parser.cxx | 4
include/basic/basicmanagerrepository.hxx | 6
include/dbaccess/dbsubcomponentcontroller.hxx | 4
include/sfx2/docfile.hxx | 4
include/sfx2/objsh.hxx | 5
include/sfx2/sfxdlg.hxx | 7
include/sfx2/viewfrm.hxx | 2
include/svl/filerec.hxx | 11 -
include/svl/undo.hxx | 2
include/svtools/HtmlWriter.hxx | 2
include/svtools/fileview.hxx | 2
include/svtools/svlbitm.hxx | 3
include/svtools/treelistbox.hxx | 2
include/svx/framelink.hxx | 10 -
include/svx/framelinkarray.hxx | 4
include/svx/sdr/contact/viewcontact.hxx | 4
include/svx/svdedtv.hxx | 4
include/svx/svxdlg.hxx | 19 +-
include/svx/view3d.hxx | 2
lotuswordpro/source/filter/lwpdrawobj.cxx | 2
lotuswordpro/source/filter/lwptools.cxx | 2
lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 6
reportdesign/source/ui/inc/ScrollHelper.hxx | 4
reportdesign/source/ui/report/DesignView.cxx | 6
reportdesign/source/ui/report/ReportController.cxx | 14 -
reportdesign/source/ui/report/ScrollHelper.cxx | 4
sc/source/core/data/fillinfo.cxx | 2
sc/source/ui/docshell/docsh.cxx | 5
sc/source/ui/drawfunc/drawsh5.cxx | 4
sc/source/ui/inc/docsh.hxx | 3
scripting/source/protocolhandler/scripthandler.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 4
sd/source/ui/inc/DrawDocShell.hxx | 3
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/view/drviews2.cxx | 6
sd/source/ui/view/drviews7.cxx | 6
sd/source/ui/view/drviewsj.cxx | 6
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/newhelp.cxx | 25 +--
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/dialog/templdlg.cxx | 22 +-
sfx2/source/doc/docfile.cxx | 8 -
sfx2/source/doc/doctemplates.cxx | 18 --
sfx2/source/doc/iframe.cxx | 2
sfx2/source/doc/objcont.cxx | 3
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/objstor.cxx | 12 -
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/templdgi.hxx | 10 -
sfx2/source/view/viewfrm.cxx | 4
slideshow/source/engine/screenupdater.cxx | 4
slideshow/source/engine/slide/shapemanagerimpl.cxx | 4
slideshow/source/engine/slide/shapemanagerimpl.hxx | 8 -
slideshow/source/engine/slide/slideimpl.cxx | 2
slideshow/source/engine/slideshowimpl.cxx | 2
slideshow/source/inc/screenupdater.hxx | 6
svl/source/filerec/filerec.cxx | 4
svl/source/undo/undo.cxx | 25 +--
svtools/source/contnr/fileview.cxx | 4
svtools/source/contnr/imivctl.hxx | 4
svtools/source/contnr/imivctl1.cxx | 18 +-
svtools/source/contnr/svlbitm.cxx | 11 -
svtools/source/contnr/treelistbox.cxx | 26 +--
svtools/source/control/toolbarmenu.cxx | 14 -
svtools/source/control/toolbarmenuacc.cxx | 8 -
svtools/source/control/toolbarmenuimp.hxx | 2
svtools/source/misc/templatefoldercache.cxx | 18 +-
svtools/source/svhtml/HtmlWriter.cxx | 4
svx/source/dialog/_contdlg.cxx | 31 +---
svx/source/dialog/contimp.hxx | 2
svx/source/dialog/framelink.cxx | 12 -
svx/source/dialog/framelinkarray.cxx | 4
svx/source/engine3d/view3d.cxx | 4
svx/source/engine3d/view3d1.cxx | 6
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/fmshell.cxx | 8 -
svx/source/form/fmshimp.cxx | 8 -
svx/source/gallery2/galbrws1.cxx | 2
svx/source/inc/fmshimp.hxx | 2
svx/source/sdr/contact/viewcontact.cxx | 18 --
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 12 -
svx/source/svdraw/svdedtv2.cxx | 2
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdundo.cxx | 4
svx/source/table/tablecontroller.cxx | 2
sw/inc/IDocumentFieldsAccess.hxx | 4
sw/inc/IDocumentLinksAdministration.hxx | 2
sw/inc/anchoredobject.hxx | 4
sw/inc/crsrsh.hxx | 4
sw/inc/doc.hxx | 2
sw/inc/docsh.hxx | 3
sw/inc/editsh.hxx | 13 -
sw/inc/fesh.hxx | 2
sw/inc/node.hxx | 2
sw/inc/pagedesc.hxx | 4
sw/inc/swabstdlg.hxx | 11 -
sw/source/core/access/accpara.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 8 -
sw/source/core/doc/DocumentFieldsManager.cxx | 26 +--
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 4
sw/source/core/doc/docglbl.cxx | 2
sw/source/core/doc/docglos.cxx | 2
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/doctxm.cxx | 12 -
sw/source/core/docnode/ndsect.cxx | 13 -
sw/source/core/docnode/ndtbl.cxx | 4
sw/source/core/docnode/node.cxx | 9 -
sw/source/core/edit/eddel.cxx | 2
sw/source/core/edit/edfld.cxx | 4
sw/source/core/edit/edglss.cxx | 2
sw/source/core/edit/editsh.cxx | 74 ++--------
sw/source/core/edit/ednumber.cxx | 7
sw/source/core/frmedt/fecopy.cxx | 6
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/frmedt/fews.cxx | 4
sw/source/core/inc/DocumentFieldsManager.hxx | 4
sw/source/core/inc/DocumentLinksAdministrationManager.hxx | 2
sw/source/core/inc/flyfrm.hxx | 4
sw/source/core/inc/frame.hxx | 7
sw/source/core/layout/anchoredobject.cxx | 18 --
sw/source/core/layout/findfrm.cxx | 8 -
sw/source/core/layout/fly.cxx | 11 -
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/frmtool.cxx | 10 -
sw/source/core/layout/objectformattertxtfrm.cxx | 6
sw/source/core/layout/pagedesc.cxx | 4
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 2
sw/source/core/undo/docundo.cxx | 2
sw/source/core/undo/unsect.cxx | 2
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unotext.cxx | 11 -
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/basflt/shellio.cxx | 4
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/ui/config/optload.cxx | 4
sw/source/ui/dialog/docstdlg.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 24 +--
sw/source/ui/dialog/swdlgfact.hxx | 11 -
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labelexp.cxx | 4
sw/source/ui/fldui/fldedt.cxx | 4
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 2
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/app/applab.cxx | 2
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 9 -
sw/source/uibase/app/docst.cxx | 4
sw/source/uibase/dochdl/gloshdl.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/fldui/fldmgr.cxx | 4
sw/source/uibase/inc/fldmgr.hxx | 2
sw/source/uibase/inc/navipi.hxx | 2
sw/source/uibase/inc/unotools.hxx | 4
sw/source/uibase/inc/wrtsh.hxx | 2
sw/source/uibase/shells/basesh.cxx | 8 -
sw/source/uibase/shells/drwbassh.cxx | 4
sw/source/uibase/shells/frmsh.cxx | 3
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 8 -
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view1.cxx | 2
sw/source/uibase/uiview/view2.cxx | 4
sw/source/uibase/uiview/viewcoll.cxx | 2
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/unotxvw.cxx | 4
sw/source/uibase/utlui/navipi.cxx | 15 --
sw/source/uibase/utlui/unotools.cxx | 13 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
sw/source/uibase/wrtsh/wrtsh2.cxx | 2
ucb/source/inc/regexp.hxx | 2
ucb/source/inc/regexpmap.hxx | 2
ucb/source/regexp/regexp.cxx | 26 ---
234 files changed, 702 insertions(+), 974 deletions(-)
New commits:
commit 1b1080fe8a2368410982c5b11575de183fb1bfa9
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 17:04:25 2016 +0200
loplugin:constantparam in dbaccess
Change-Id: I44b5a586a1b0da47e032dff097ebf545f5fe76fc
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index aef17d1..c1e75e7 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -937,7 +937,7 @@ Reference< XModel> ODatabaseModelImpl::getModel_noCreate() const
return m_xModel;
}
-Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _bInitialize )
+Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership()
{
Reference< XModel > xModel( m_xModel );
OSL_PRECOND( !xModel.is(), "ODatabaseModelImpl::createNewModel_deliverOwnership: not to be called if there already is a model!" );
@@ -968,20 +968,6 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
// #i105505#
xModel->attachResource( xModel->getURL(), m_aMediaDescriptor.getPropertyValues() );
}
-
- if ( _bInitialize )
- {
- try
- {
- Reference< XLoadable > xLoad( xModel, UNO_QUERY_THROW );
- xLoad->initNew();
- }
- catch( RuntimeException& ) { throw; }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
- }
}
return xModel;
}
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index b2fa15b..8de14c6 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -341,16 +341,13 @@ public:
/** returns a new ->ODatabaseDocument
- @param _bInitializeIfNecessary
- calls XLoadable::initNew on the newly created model, if necessary
-
@precond
No ->ODatabaseDocument exists so far
@seealso
getModel_noCreate
*/
- css::uno::Reference< css::frame::XModel > createNewModel_deliverOwnership( bool _bInitialize );
+ css::uno::Reference< css::frame::XModel > createNewModel_deliverOwnership();
struct ResetModelAccess { friend class ODatabaseDocument; private: ResetModelAccess() { } };
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index f4e92b5..84fef36 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -354,7 +354,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rNa
{
pModelImpl.set( new ODatabaseModelImpl( _rName, m_aContext, *this ) );
- Reference< XModel > xModel( pModelImpl->createNewModel_deliverOwnership( false ), UNO_SET_THROW );
+ Reference< XModel > xModel( pModelImpl->createNewModel_deliverOwnership(), UNO_SET_THROW );
Reference< XLoadable > xLoad( xModel, UNO_QUERY_THROW );
::comphelper::NamedValueCollection aArgs;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5941d43..a3bd0ff 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2223,7 +2223,7 @@ com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context,
rtl::Reference<dbaccess::ODatabaseModelImpl> pImpl(
new dbaccess::ODatabaseModelImpl(context, *pContext));
- css::uno::Reference<XInterface> inst(pImpl->createNewModel_deliverOwnership(false));
+ css::uno::Reference<XInterface> inst(pImpl->createNewModel_deliverOwnership());
inst->acquire();
return inst.get();
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index c3bbc79..5b24d6d 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -119,7 +119,7 @@ protected:
FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener );
virtual ~FlushNotificationAdapter();
- void SAL_CALL impl_dispose( bool _bRevokeListener );
+ void SAL_CALL impl_dispose();
protected:
// XFlushListener
@@ -147,16 +147,13 @@ FlushNotificationAdapter::~FlushNotificationAdapter()
{
}
-void SAL_CALL FlushNotificationAdapter::impl_dispose( bool _bRevokeListener )
+void SAL_CALL FlushNotificationAdapter::impl_dispose()
{
Reference< XFlushListener > xKeepAlive( this );
- if ( _bRevokeListener )
- {
- Reference< XFlushable > xFlushable( m_aBroadcaster );
- if ( xFlushable.is() )
- xFlushable->removeFlushListener( this );
- }
+ Reference< XFlushable > xFlushable( m_aBroadcaster );
+ if ( xFlushable.is() )
+ xFlushable->removeFlushListener( this );
m_aListener.clear();
m_aBroadcaster.clear();
@@ -168,7 +165,7 @@ void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) thr
if ( xListener.is() )
xListener->flushed( rEvent );
else
- impl_dispose( true );
+ impl_dispose();
}
void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
@@ -177,7 +174,7 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t
if ( xListener.is() )
xListener->disposing( Source );
- impl_dispose( true );
+ impl_dispose();
}
OAuthenticationContinuation::OAuthenticationContinuation()
@@ -1225,7 +1222,7 @@ void SAL_CALL ODatabaseSource::flush( ) throw (RuntimeException, std::exception
SharedModel xModel( m_pImpl->getModel_noCreate(), SharedModel::NoTakeOwnership );
if ( !xModel.is() )
- xModel.reset( m_pImpl->createNewModel_deliverOwnership( false ), SharedModel::TakeOwnership );
+ xModel.reset( m_pImpl->createNewModel_deliverOwnership(), SharedModel::TakeOwnership );
Reference< css::frame::XStorable> xStorable( xModel, UNO_QUERY_THROW );
xStorable->store();
@@ -1311,7 +1308,7 @@ Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocume
Reference< XModel > xModel( m_pImpl->getModel_noCreate() );
if ( !xModel.is() )
- xModel = m_pImpl->createNewModel_deliverOwnership( false );
+ xModel = m_pImpl->createNewModel_deliverOwnership();
return Reference< XOfficeDatabaseDocument >( xModel, UNO_QUERY_THROW );
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 3abd1f8..2f2e240 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -128,7 +128,7 @@ namespace
class OTablePreviewWindow : public vcl::Window
{
DECL_LINK_TYPED(OnDisableInput, void*, void);
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
@@ -137,7 +137,7 @@ namespace
};
OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
}
bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
{
@@ -157,27 +157,21 @@ namespace
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
- void OTablePreviewWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+ void OTablePreviewWindow::ImplInitSettings( bool bBackground )
{
//FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
@@ -1251,7 +1245,7 @@ void OAppDetailPageHelper::ImplInitSettings()
OPreviewWindow::OPreviewWindow(vcl::Window* _pParent)
: Window(_pParent)
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
}
bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
@@ -1310,28 +1304,22 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
-void OPreviewWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OPreviewWindow::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 24bf5e8..96c8423 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -62,7 +62,7 @@ namespace dbaui
<TRUE/> when successful
*/
bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 99470b0..e42d805 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai
m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage );
m_aCreation->SetDefaultExpandedEntryBmp( aFolderImage );
- ImplInitSettings(true,true,true);
+ ImplInitSettings(true);
}
OTasksWindow::~OTasksWindow()
@@ -386,32 +386,26 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
-void OTasksWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OTasksWindow::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
-
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- m_aHelpText->SetTextColor( rStyleSettings.GetFieldTextColor() );
- m_aHelpText->SetTextFillColor();
- m_aDescription->SetTextColor( rStyleSettings.GetFieldTextColor() );
- m_aDescription->SetTextFillColor();
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
+
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
+ m_aHelpText->SetTextColor( rStyleSettings.GetFieldTextColor() );
+ m_aHelpText->SetTextFillColor();
+ m_aDescription->SetTextColor( rStyleSettings.GetFieldTextColor() );
+ m_aDescription->SetTextFillColor();
if( bBackground )
{
@@ -421,7 +415,7 @@ void OTasksWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
m_aFL->SetBackground( rStyleSettings.GetFieldColor() );
}
- vcl::Font aFont = m_aDescription->GetControlFont();
+ aFont = m_aDescription->GetControlFont();
aFont.SetWeight(WEIGHT_BOLD);
m_aDescription->SetControlFont(aFont);
}
@@ -539,7 +533,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
,m_rBorderWin(_rParent)
{
SetUniqueId(UID_APP_DETAIL_VIEW);
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
m_pControlHelper = VclPtr<OAppDetailPageHelper>::Create(m_aContainer.get(),m_rBorderWin,_ePreviewMode);
m_pControlHelper->Show();
@@ -581,23 +575,17 @@ void OApplicationDetailView::dispose()
OSplitterView::dispose();
}
-void OApplicationDetailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OApplicationDetailView::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
@@ -617,7 +605,7 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 7ccccb8..7ae2f3a 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -118,7 +118,7 @@ namespace dbaui
VclPtr<OApplicationDetailView> m_pDetailView;
DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void );
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
@@ -153,7 +153,7 @@ namespace dbaui
::std::vector< TaskPaneData > m_aTaskPaneData;
MnemonicGenerator m_aExternalMnemonics;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 5e6db07..2b89d84 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -43,7 +43,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorde
,m_rBorderWin( _rBorderWindow )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
m_aIconControl->SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl));
m_aIconControl->setControlActionListener( &m_rBorderWin.getView()->getAppController() );
@@ -75,23 +75,17 @@ void OApplicationSwapWindow::Resize()
m_aIconControl->ArrangeIcons();
}
-void OApplicationSwapWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OApplicationSwapWindow::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
@@ -106,7 +100,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index aa6108f..c77877b 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -35,7 +35,7 @@ namespace dbaui
ElementType m_eLastType;
OAppBorderWindow& m_rBorderWin;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
DECL_LINK_TYPED( OnContainerSelectHdl, SvtIconChoiceCtrl*, void );
DECL_LINK_TYPED( ChangeToLastSelected, void*, void );
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index c05151a..ede0411 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -37,7 +37,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n
setTitle(_nTitleId);
SetBorderStyle(WindowBorderStyle::MONO);
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
const StyleSettings& rStyle = Application::GetSettings().GetStyleSettings();
vcl::Window* pWindows[] = { m_aSpace1.get(), m_aSpace2.get(), m_aTitle.get() };
@@ -134,12 +134,12 @@ void OTitleWindow::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
-void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OTitleWindow::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
AllSettings aAllSettings = GetSettings();
@@ -149,19 +149,13 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
SetSettings(aAllSettings);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index d22938d..3bd1c60 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -29,8 +29,8 @@ namespace dbaui
VclPtr<FixedText> m_aSpace2;
VclPtr<FixedText> m_aTitle;
VclPtr<vcl::Window> m_pChild;
- bool m_bShift;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ bool m_bShift;
+ void ImplInitSettings( bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index f23f9be..cb086c0 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -34,7 +34,7 @@ OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pP
,m_pRight(nullptr)
,m_bVertical(_bVertical)
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
}
OSplitterView::~OSplitterView()
@@ -64,27 +64,21 @@ IMPL_LINK_NOARG_TYPED( OSplitterView, SplitHdl, Splitter*, void )
Resize();
}
-void OSplitterView::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OSplitterView::ImplInitSettings( bool bBackground )
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if ( bFont )
- {
- vcl::Font aFont = rStyleSettings.GetAppFont();
- if ( IsControlFont() )
- aFont.Merge( GetControlFont() );
- SetPointFont(*this, aFont);
-// Set/*Zoomed*/PointFont( aFont );
- }
+ vcl::Font aFont = rStyleSettings.GetAppFont();
+ if ( IsControlFont() )
+ aFont.Merge( GetControlFont() );
+ SetPointFont(*this, aFont);
+// Set/*Zoomed*/PointFont( aFont );
- if ( bFont || bForeground )
- {
- Color aTextColor = rStyleSettings.GetButtonTextColor();
- if ( IsControlForeground() )
- aTextColor = GetControlForeground();
- SetTextColor( aTextColor );
- }
+ Color aTextColor = rStyleSettings.GetButtonTextColor();
+ if ( IsControlForeground() )
+ aTextColor = GetControlForeground();
+ SetTextColor( aTextColor );
if ( bBackground )
{
@@ -102,7 +96,7 @@ void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 7fd4ff4..b6afedc0 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -411,10 +411,10 @@ namespace dbaui
implUpdateURLDependentStates();
}
- OUString OConnectionHelper::impl_getURL( bool _bPrefix ) const
+ OUString OConnectionHelper::impl_getURL() const
{
// get the pure text
- OUString sURL = _bPrefix ? m_pConnectionURL->GetText() : OUString(m_pConnectionURL->GetTextNoPrefix());
+ OUString sURL = m_pConnectionURL->GetTextNoPrefix();
OSL_ENSURE( m_pCollection, "OConnectionHelper::impl_getURL: have no interpreter for the URLs!" );
@@ -424,15 +424,7 @@ namespace dbaui
{
// get the two parts: prefix and file URL
OUString sTypePrefix, sFileURLDecoded;
- if ( _bPrefix )
- {
- sTypePrefix = m_pCollection->getPrefix( m_eType );
- sFileURLDecoded = m_pCollection->cutPrefix( sURL );
- }
- else
- {
- sFileURLDecoded = sURL;
- }
+ sFileURLDecoded = sURL;
sURL = sTypePrefix;
if ( !sFileURLDecoded.isEmpty() )
@@ -456,7 +448,7 @@ namespace dbaui
OUString OConnectionHelper::getURLNoPrefix( ) const
{
- return impl_getURL( false );
+ return impl_getURL();
}
void OConnectionHelper::setURLNoPrefix( const OUString& _rURL )
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index e025e00..d6d4392 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -93,7 +93,7 @@ namespace dbaui
private:
DECL_LINK_TYPED(OnBrowseConnections, Button*, void);
DECL_LINK_TYPED(OnCreateDatabase, Button*, void);
- OUString impl_getURL( bool _bPrefix ) const;
+ OUString impl_getURL() const;
void impl_setURL( const OUString& _rURL, bool _bPrefix );
void implUpdateURLDependentStates() const;
};
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 8111b63..e39bcc8 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -36,7 +36,7 @@ namespace dbaui
VclPtr<OTableFieldDescWin> m_pFieldDescWin;
VclPtr<OTableEditorCtrl> m_pEditorCtrl;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index dbc1d3b..4a36f86 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -32,7 +32,7 @@ namespace dbaui
VclPtr<vcl::Window> m_pRight;
bool m_bVertical;
- void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
+ void ImplInitSettings( bool bBackground );
DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index fc067b1..16fa277 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -329,7 +329,7 @@ namespace dbaui
virtual bool DeactivatePage() override;
OKButton& GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); }
Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
- void EnableButton(Wizard_Button_Style eStyle, bool bEnable);
+ void EnableNextButton(bool bEnable);
void AddWizardPage(OWizardPage* pPage); // delete page from OCopyTableWizard
void CheckButtons(); // checks which button can be disabled, enabled
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 001956b..c866e3e 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -131,7 +131,7 @@ IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void )
void OCopyTable::SetAppendDataRadio()
{
- m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,true);
+ m_pParent->EnableNextButton(true);
m_pFT_KeyName->Enable(false);
m_pCB_PrimaryColumn->Enable(false);
m_pEdKeyName->Enable(false);
@@ -140,7 +140,7 @@ void OCopyTable::SetAppendDataRadio()
IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void )
{
- m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != m_pRB_View);
+ m_pParent->EnableNextButton(pButton != m_pRB_View);
bool bKey = m_bPKeyAllowed && pButton != m_pRB_View;
m_pFT_KeyName->Enable(bKey && m_pCB_PrimaryColumn->IsChecked());
m_pEdKeyName->Enable(bKey && m_pCB_PrimaryColumn->IsChecked());
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index b85bb74..80a8c05 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -157,7 +157,7 @@ void OWizColumnSelect::ActivatePage( )
m_pOrgColumnNames->RemoveEntry((*aIter)->first);
}
m_pParent->GetOKButton().Enable(m_pNewColumnNames->GetEntryCount() != 0);
- m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,m_pNewColumnNames->GetEntryCount() && m_pParent->getOperation() != CopyTableOperation::AppendData);
+ m_pParent->EnableNextButton(m_pNewColumnNames->GetEntryCount() && m_pParent->getOperation() != CopyTableOperation::AppendData);
m_pColumns_RH->GrabFocus();
}
@@ -416,7 +416,7 @@ void OWizColumnSelect::enableButtons()
m_pParent->m_mNameMapping.clear();
m_pParent->GetOKButton().Enable(bEntries);
- m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,bEntries && m_pParent->getOperation() != CopyTableOperation::AppendData);
+ m_pParent->EnableNextButton(bEntries && m_pParent->getOperation() != CopyTableOperation::AppendData);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 840234b..79f34ca 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -977,17 +977,9 @@ void OCopyTableWizard::CheckButtons()
}
}
-void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable)
+void OCopyTableWizard::EnableNextButton(bool bEnable)
{
- Button* pButton;
- if(eStyle == WIZARD_NEXT)
- pButton = m_pbNext;
- else if(eStyle == WIZARD_PREV)
- pButton = m_pbPrev;
- else
- pButton = m_pbFinish;
- pButton->Enable(bEnable);
-
+ m_pbNext->Enable(bEnable);
}
bool OCopyTableWizard::DeactivatePage()
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 4f49278..4682412 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -132,7 +132,7 @@ void OWizNameMatching::ActivatePage( )
m_pColumn_up_right->Enable( m_pCTRL_RIGHT->GetEntryCount() > 1 );
m_pColumn_down_right->Enable( m_pCTRL_RIGHT->GetEntryCount() > 1 );
- m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,false);
+ m_pParent->EnableNextButton(false);
m_pCTRL_LEFT->GrabFocus();
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 399640c..a0f844c 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -954,7 +954,7 @@ void OQueryController::impl_initialize()
bForceInitialDesign = true;
}
- if ( !ensureConnected( false ) )
+ if ( !ensureConnected() )
{ // we have no connection so what else should we do
m_bGraphicalDesign = false;
if ( editingView() )
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 2b92d44..97f0621 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -45,7 +45,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB
,m_aHorzSplitter( VclPtr<Splitter>::Create(this) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
// Children erzeugen
m_pEditorCtrl = VclPtr<OTableEditorCtrl>::Create( this);
m_pFieldDescWin = VclPtr<OTableFieldDescWin>::Create( this );
@@ -114,27 +114,21 @@ IMPL_LINK_TYPED( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void )
}
}
-void OTableBorderWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
+void OTableBorderWindow::ImplInitSettings( bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
// FIXME RenderContext
- if ( bFont )
- {
- vcl::Font aFont = rStyleSettings.GetAppFont();
- if ( IsControlFont() )
- aFont.Merge( GetControlFont() );
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont = rStyleSettings.GetAppFont();
+ if ( IsControlFont() )
+ aFont.Merge( GetControlFont() );
+ SetPointFont(*this, aFont);
- if ( bFont || bForeground )
- {
- Color aTextColor = rStyleSettings.GetButtonTextColor();
- if ( IsControlForeground() )
- aTextColor = GetControlForeground();
- SetTextColor( aTextColor );
- }
+ Color aTextColor = rStyleSettings.GetButtonTextColor();
+ if ( IsControlForeground() )
+ aTextColor = GetControlForeground();
+ SetTextColor( aTextColor );
if ( bBackground )
{
@@ -152,7 +146,7 @@ void OTableBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true, true, true );
+ ImplInitSettings( true );
Invalidate();
}
}
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index 6bc86be..798a655 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -163,8 +163,8 @@ namespace dbaui
void disconnect();
virtual void reconnect( bool _bUI );
- bool ensureConnected( bool _bUI ) {
- if ( !isConnected() ) reconnect( _bUI );
+ bool ensureConnected() {
+ if ( !isConnected() ) reconnect( false );
return isConnected();
}
commit ed4375c6d834e68a3f7c7dfb39a6ae0755da4785
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:47:42 2016 +0200
loplugin:constantparam in idl
Change-Id: Icb5e64f17d9472320a79363b1e926e2b4ab05273
diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx
index c24fdfb..7f6186c 100644
--- a/idl/inc/parser.hxx
+++ b/idl/inc/parser.hxx
@@ -37,7 +37,7 @@ class SvIdlParser
SvTokenStream & rInStm;
public:
SvIdlParser( SvIdlDataBase& rBase_, SvTokenStream & rInStrm_) : rBase(rBase_), rInStm(rInStrm_) {}
- void ReadSvIdl( bool bImported, const OUString & rPath );
+ void ReadSvIdl( const OUString & rPath );
void ReadModuleHeader(SvMetaModule& rModule);
void ReadModuleBody(SvMetaModule& rModule);
void ReadModuleElement( SvMetaModule& rModule );
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index c12c1e7..66ab61c 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -126,7 +126,7 @@ bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
SvTokenStream aTokStm( aFileName );
try {
SvIdlParser aParser(*pDataBase, aTokStm);
- aParser.ReadSvIdl( false, rCommand.aPath );
+ aParser.ReadSvIdl( rCommand.aPath );
} catch (const SvParseException& ex) {
pDataBase->SetError(ex.aError);
pDataBase->WriteError(aTokStm);
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index dc3340a..c1a3096 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -26,7 +26,7 @@
#include <globals.hxx>
#include <osl/file.hxx>
-void SvIdlParser::ReadSvIdl( bool bImported, const OUString & rPath )
+void SvIdlParser::ReadSvIdl( const OUString & rPath )
{
rBase.SetPath(rPath); // only valid for this iteration
SvToken& rTok = rInStm.GetToken();
@@ -38,7 +38,7 @@ void SvIdlParser::ReadSvIdl( bool bImported, const OUString & rPath )
return;
Read( SvHash_module() );
- tools::SvRef<SvMetaModule> aModule = new SvMetaModule( bImported );
+ tools::SvRef<SvMetaModule> aModule = new SvMetaModule( false/*bImported*/ );
ReadModuleHeader(*aModule);
rBase.GetModuleList().push_back( aModule );
}
commit 1dc23829b9a38d4c6be4a0649dee28a5693ac87a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:46:00 2016 +0200
loplugin:constantparam in connectivity
Change-Id: I5e71b3de15e043066cd4177dd42b231527eb71e4
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 78a162e..a2e8e3e9 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -172,10 +172,10 @@ bool ODbaseIndex::openIndexFile()
return m_pFileStream != nullptr;
}
-OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp)
+OIndexIterator* ODbaseIndex::createIterator()
{
openIndexFile();
- return new OIndexIterator(this, pOp, nullptr);
+ return new OIndexIterator(this, nullptr, nullptr);
}
bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 3e31902..17b6e9c 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -163,7 +163,7 @@ bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xInde
dbase::ODbaseIndex* pIndex = reinterpret_cast< dbase::ODbaseIndex* >( xTunnel->getSomething(dbase::ODbaseIndex::getUnoTunnelImplementationId()) );
if(pIndex)
{
- dbase::OIndexIterator* pIter = pIndex->createIterator(nullptr);
+ dbase::OIndexIterator* pIter = pIndex->createIterator();
if (pIter)
{
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 39cdafc..c45b5ae 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -92,7 +92,7 @@ namespace connectivity { namespace jdbc
}
- void ContextClassLoaderScope::pop( bool clearExceptions )
+ void ContextClassLoaderScope::pop()
{
if ( isActive() )
{
@@ -101,10 +101,7 @@ namespace connectivity { namespace jdbc
m_setContextClassLoaderMethod = nullptr;
m_environment.CallObjectMethod( currentThread.get(), setContextClassLoaderMethod, m_oldContextClassLoader.get() );
- if ( clearExceptions )
- {
- m_environment.ExceptionClear();
- }
+ m_environment.ExceptionClear();
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index f8ce6ce..acb92e1 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -386,7 +386,7 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException,
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
OUString str = getString( columnIndex );
@@ -412,7 +412,7 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
sal_Int8 b = 0;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(b)>::get()) >>= b;
return b;
@@ -424,7 +424,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
sal_Int16 i = 0;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(i)>::get()) >>= i;
return i;
@@ -435,7 +435,7 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException,
MutexGuard guard(m_refMutex->mutex);
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
OUString ret;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(ret)>::get() ) >>= ret;
// printf( "BaseResultSet::getString() %s\n" , OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ).getStr() );
@@ -448,7 +448,7 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
sal_Int32 i = 0;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(i)>::get()) >>= i;
return i;
@@ -460,7 +460,7 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
sal_Int64 i = 0;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(i)>::get()) >>= i;
return i;
@@ -472,7 +472,7 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
float f = 0.;
convertTo( getValue( columnIndex ), cppu::UnoType<decltype(f)>::get()) >>= f;
return f;
@@ -495,7 +495,7 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex )
MutexGuard guard( m_refMutex->mutex );
checkClosed();
checkColumnIndex( columnIndex );
- checkRowIndex( true /* must be on row */ );
+ checkRowIndex();
Sequence< sal_Int8 > ret;
OUString ustr;
@@ -666,31 +666,17 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run
}
-void BaseResultSet::checkRowIndex( bool mustBeOnValidRow )
+void BaseResultSet::checkRowIndex()
{
- OUStringBuffer buf( 128 );
- buf.append( "pq_baseresultset: row index out of range, allowed is " );
- if( mustBeOnValidRow )
+ if( m_row < 0 || m_row >= m_rowCount )
{
- if( m_row < 0 || m_row >= m_rowCount )
- {
- buf.append( "0 to " );
- buf.append( ((sal_Int32)(m_rowCount -1)) );
- buf.append( ", got " );
- buf.append( m_row );
- throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
- }
- }
- else
- {
- if( m_row < -1 || m_row > m_rowCount )
- {
- buf.append( "-1 to " );
- buf.append( m_rowCount );
- buf.append( ", got " );
- buf.append( m_row );
- throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
- }
+ OUStringBuffer buf( 128 );
+ buf.append( "pq_baseresultset: row index out of range, allowed is " );
+ buf.append( "0 to " );
+ buf.append( ((sal_Int32)(m_rowCount -1)) );
+ buf.append( ", got " );
+ buf.append( m_row );
+ throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 340126b..ad3a6e6 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -85,7 +85,7 @@ protected:
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0;
void checkColumnIndex( sal_Int32 index )
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException );
- void checkRowIndex( bool mustBeOnValidRow );
+ void checkRowIndex();
virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0;
com::sun::star::uno::Any convertTo(
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 7c20b1d..8dd3c0a 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -105,7 +105,7 @@ namespace connectivity
const ODbaseTable* getTable() const { return m_pTable; }
const NDXHeader& getHeader() const { return m_aHeader; }
- OIndexIterator* createIterator(OBoolOperator_BASE* pOp);
+ OIndexIterator* createIterator();
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;}
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 7134fb1..3e80e3b 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -55,7 +55,7 @@ namespace connectivity { namespace jdbc
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxErrorContext
);
- ~ContextClassLoaderScope() { pop(true); }
+ ~ContextClassLoaderScope() { pop(); }
bool isActive() const
{
@@ -67,7 +67,7 @@ namespace connectivity { namespace jdbc
ContextClassLoaderScope(ContextClassLoaderScope &) = delete;
void operator =(ContextClassLoaderScope &) = delete;
- void pop( bool clearExceptions );
+ void pop();
JNIEnv& m_environment;
LocalRef< jobject > m_currentThread;
commit 978cfb856b013580921dc2c262565438692d4221
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:40:23 2016 +0200
loplugin:constantparam in accessibility
Change-Id: I65f2f39c6bd5c222d7d8a21748ad02c521b7377d
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index 237a72d..7777e92 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -41,7 +41,7 @@ namespace accessibility
virtual OUString GetEntry( sal_Int32 nPos ) const = 0;
virtual Rectangle GetDropDownPosSizePixel( ) const = 0;
virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
- virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0;
+ virtual Rectangle GetWindowExtentsRelative() = 0;
virtual bool IsEnabled() const = 0;
virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0;
virtual sal_uInt16 GetDisplayLineCount() const = 0;
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index eafbbbb..1dec33d 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -76,9 +76,9 @@ public:
return aRect;
}
- virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) override
+ virtual Rectangle GetWindowExtentsRelative() override
{
- return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
+ return m_aComboListBox.GetWindowExtentsRelative( nullptr );
}
virtual bool IsEnabled() const override
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 105a76e..a5cda26 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -75,7 +75,7 @@ protected:
virtual css::lang::Locale implGetLocale() override;
virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override;
- OUString GetText( bool _bAsName );
+ OUString GetText();
public:
VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 2ce3c91..26cd9d8 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -377,7 +377,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti
{
Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
aPoint = aRect.TopLeft();
- aPoint += m_pListBoxHelper->GetWindowExtentsRelative( nullptr ).TopLeft();
+ aPoint += m_pListBoxHelper->GetWindowExtentsRelative().TopLeft();
}
return AWTPoint( aPoint );
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 8a2ec25..fc4c7ed 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -74,7 +74,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
OSL_ENSURE( m_pToolBox, "invalid toolbox" );
m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
- m_sOldName = GetText( true );
+ m_sOldName = GetText();
m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == TRISTATE_INDET );
ToolBoxItemType eType = m_pToolBox->GetItemType( (sal_uInt16)m_nIndexInParent );
@@ -121,11 +121,11 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
m_pExternalLock = nullptr;
}
-OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
+OUString VCLXAccessibleToolBoxItem::GetText()
{
OUString sRet;
// no text for separators and spaces
- if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) )
+ if ( m_pToolBox && m_nItemId > 0 )
{
sRet = m_pToolBox->GetItemText( m_nItemId );
if (sRet.isEmpty())
@@ -249,7 +249,7 @@ awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( ) throw (RuntimeExcept
OUString VCLXAccessibleToolBoxItem::implGetText()
{
- return GetText (true);
+ return GetText();
}
Locale VCLXAccessibleToolBoxItem::implGetLocale()
@@ -383,7 +383,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (Runtim
OExternalLockGuard aGuard( this );
// entry text == accessible name
- return GetText( true );
+ return GetText();
}
Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception)
commit 5c1c8f53d7f6fa5eeaac7fca75bafad9154e1be5
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:38:38 2016 +0200
loplugin:constantparam in basctl
Change-Id: I07d22585e768335f61d70bf18807479a2675804a
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 36855cb..af14216 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -80,7 +80,7 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
: Reference<frame::XModel>(), xDialogModel))
,pUndoMgr(new SfxUndoManager)
{
- InitSettings( true, true, true );
+ InitSettings( true );
pEditor->GetModel().SetNotifyUndoActionHdl(
LINK(this, DialogWindow, NotifyUndoActionHdl)
@@ -1325,29 +1325,23 @@ void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- InitSettings( true, true, true );
+ InitSettings( true );
Invalidate();
}
else
BaseWindow::DataChanged( rDCEvt );
}
-void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground)
+void DialogWindow::InitSettings(bool bBackground)
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if( bFont )
- {
- vcl::Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- SetPointFont(*this, aFont);
- }
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ SetPointFont(*this, aFont);
- if( bForeground || bFont )
- {
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- }
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 61afcb8..e6696d4 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -77,7 +77,7 @@ protected:
virtual void DoInit() override;
virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- void InitSettings(bool bFont, bool bForeground, bool bBackground);
+ void InitSettings(bool bBackground);
public:
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);
commit cc091b034336d3ded4538c039eb9086d271a3d98
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:36:06 2016 +0200
loplugin:constantparam in basic
Change-Id: I5b49406535c1ec95e47fe237a23184a499b875e5
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index fd2dc80..559ed3a 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -591,9 +591,9 @@ namespace basic
}
- BasicManager* BasicManagerRepository::getApplicationBasicManager( bool _bCreate )
+ BasicManager* BasicManagerRepository::getApplicationBasicManager()
{
- return ImplRepository::Instance().getApplicationBasicManager( _bCreate );
+ return ImplRepository::Instance().getApplicationBasicManager( true/*_bCreate*/ );
}
diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx
index 1d5545f..4104a4e 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -96,16 +96,12 @@ namespace basic
/** returns the application-wide BasicManager
- @param _bCreate
- determines whether the BasicManager should be created (<TRUE/>) if it
- does not yet exist.
-
@attention
If the BasicManager is newly created, then it is still owned by the repository.
In particular, you are not allowed to delete it. Instead, call resetApplicationBasicManager
to release the BasicManager.
*/
- static BasicManager* getApplicationBasicManager( bool _bCreate );
+ static BasicManager* getApplicationBasicManager();
/** resets the application-wide BasicManager to <NULL/>
*/
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 2e8876b..dd743fe 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -101,7 +101,7 @@ BasicManager* SfxApplication::GetBasicManager()
#else
if (utl::ConfigManager::IsAvoidConfig())
return nullptr;
- return BasicManagerRepository::getApplicationBasicManager( true );
+ return BasicManagerRepository::getApplicationBasicManager();
#endif
}
commit 30a7c24bcd18b6de382e5fc53023405a4941cfa9
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:32:59 2016 +0200
loplugin:constantparam in lotuswordpro
Change-Id: I8f8efa6b01fa0bcab074ac54029d95778cb388ab
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index d964ae6..cd1dee6 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1299,7 +1299,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName)
pRetObj = new XFDrawPath();
XFDrawPath* pFWPath = static_cast<XFDrawPath*>(pRetObj);
CreateFWPath(pFWPath);
- pStyle->SetFontWorkStyle(0, enumXFFWSlantY, enumXFFWAdjustAutosize);
+ pStyle->SetFontWorkStyle(enumXFFWSlantY, enumXFFWAdjustAutosize);
SetPosition(pRetObj);
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index b57224c..8329eeb 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -528,7 +528,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
break;
}
}
- pDateStyle->AddAmPm(true);
+ pDateStyle->AddAmPm();
break;
}
case 'k':
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index 07e5e12f..1ae8acd 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -103,7 +103,7 @@ public:
void AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2);
- void AddAmPm(bool bAmPm);
+ void AddAmPm();
void AddText( const OUString& part );
@@ -196,7 +196,7 @@ inline void XFDateStyle::AddSecond( bool bLongFmt, sal_Int16 pos)
m_aParts.AddStyle(part);
}
-inline void XFDateStyle::AddAmPm(bool /*bAmPm*/)
+inline void XFDateStyle::AddAmPm()
{
XFDatePart *part = new XFDatePart();
part->SetPartType(enumXFDateAmPm);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 336dbdb..93ea544 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -118,14 +118,14 @@ void XFDrawStyle::SetLineDashStyle(enumXFLineStyle style, int num1, int num2,
pXFStyleManager->AddStyle(m_pLineStyle);
}
-void XFDrawStyle::SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust)
+void XFDrawStyle::SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust)
{
if (!m_pFontWorkStyle)
{
m_pFontWorkStyle = new XFFontWorkStyle();
}
- m_pFontWorkStyle->SetButtonForm(nForm);
+ m_pFontWorkStyle->SetButtonForm(0);
m_pFontWorkStyle->SetFWStyleType(eStyle);
m_pFontWorkStyle->SetFWAdjustType(eAdjust);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index d9c4b70..76cd511 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -113,7 +113,7 @@ public:
*/
void SetArrowEnd(const OUString& end, double size=0.3, bool center = false);
- void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
+ void SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
virtual enumXFStyle GetStyleFamily() override;
commit cb629a39b1f42032dfc8ccb9132c34cac3713070
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:30:14 2016 +0200
loplugin:constantparam in reportdesign
Change-Id: Ic98927f6d671b266479c3bbbc2a237c815bc2423
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index c37abf7..106dde5 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -187,11 +187,9 @@ namespace rptui
*/
void showRuler(bool _bShow);
- /** unmark all objects on the views without the given one.
- *
- * @param _pSectionView The view where the objects should not be unmarked.
+ /** unmark all objects on the views.
*/
- void unmarkAllObjects(OSectionView* _pSectionView);
+ void unmarkAllObjects();
/** triggers the property browser with the section
@param _xReportComponent the report component
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 809cdd5..c63dc57 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -152,10 +152,10 @@ namespace rptui
/** calculate the max width of the markers
*
- * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not.
+ * The end marker will not be used for calculation.
* \return the max width
*/
- sal_Int32 getMaxMarkerWidth(bool _bWithEnd) const;
+ sal_Int32 getMaxMarkerWidth() const;
/** checks if the keycode is known by the child windows
@param _rCode the keycode
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index b73bca1..f2b1fd4 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -407,7 +407,7 @@ IMPL_LINK_NOARG_TYPED( ODesignView, SplitHdl, SplitWindow*, void )
if ( m_pPropWin && m_pPropWin->IsVisible() )
nMinWidth = m_pPropWin->GetMinOutputSizePixel().Width();
- if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_aScrollWindow->getMaxMarkerWidth(false) )
+ if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_aScrollWindow->getMaxMarkerWidth() )
{
long nOldSplitPos = getController().getSplitPos();
(void)nOldSplitPos;
@@ -420,9 +420,9 @@ void ODesignView::SelectAll(const sal_uInt16 _nObjectType)
m_aScrollWindow->SelectAll(_nObjectType);
}
-void ODesignView::unmarkAllObjects(OSectionView* _pSectionView)
+void ODesignView::unmarkAllObjects()
{
- m_aScrollWindow->unmarkAllObjects(_pSectionView);
+ m_aScrollWindow->unmarkAllObjects(nullptr);
}
void ODesignView::togglePropertyBrowser(bool _bToogleOn)
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6a70c71..5498e53 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1696,7 +1696,7 @@ void OReportController::impl_initialize( )
getDesignView()->showRuler(m_bShowRuler);
getDesignView()->togglePropertyBrowser(m_bShowProperties);
getDesignView()->setCurrentPage(m_sLastActivePage);
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
if ( m_nPageNum != -1 )
{
@@ -3066,7 +3066,7 @@ sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (Ille
bool bRet = true;
if ( getDesignView() )
{
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
getDesignView()->SetMode(RPTUI_SELECT);
uno::Sequence< uno::Reference<report::XReportComponent> > aElements;
@@ -3259,7 +3259,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
{
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
@@ -3287,7 +3287,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs)
{
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
@@ -3317,7 +3317,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
{
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
// Anhand des FormatKeys wird festgestellt, welches Feld benoetigt wird
OSectionWindow* pSectionWindow[2];
@@ -3375,7 +3375,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
}
}
// clear all selections
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::daColumnObject ], uno::UNO_QUERY );
uno::Reference< lang::XComponent > xHoldAlive;
@@ -3992,7 +3992,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) )
{
Sequence< PropertyValue > aCreateArgs;
- getDesignView()->unmarkAllObjects(nullptr);
+ getDesignView()->unmarkAllObjects();
createControl(aCreateArgs,xSection,OUString(),getDesignView()->GetInsertObj());
}
}
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 1692073..d20907f 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -270,9 +270,9 @@ void OScrollWindowHelper::unmarkAllObjects(OSectionView* _pSectionView)
m_aReportWindow->unmarkAllObjects(_pSectionView);
}
-sal_Int32 OScrollWindowHelper::getMaxMarkerWidth(bool _bWithEnd) const
+sal_Int32 OScrollWindowHelper::getMaxMarkerWidth() const
{
- return m_aReportWindow->getMaxMarkerWidth(_bWithEnd);
+ return m_aReportWindow->getMaxMarkerWidth(false/*_bWithEnd*/);
}
void OScrollWindowHelper::showRuler(bool _bShow)
commit 3a95902b940d32c2bd1e66a537b15357d5c57f16
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:25:21 2016 +0200
loplugin:constantparam in slideshow
Change-Id: If6c9b8e551d6e6dc857f634e1e8db092541c1031
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 7128868..781277f 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -212,9 +212,9 @@ namespace internal
}
}
- ::std::shared_ptr<ScreenUpdater::UpdateLock> ScreenUpdater::createLock (const bool bStartLocked)
+ ::std::shared_ptr<ScreenUpdater::UpdateLock> ScreenUpdater::createLock()
{
- return ::std::shared_ptr<ScreenUpdater::UpdateLock>(new ::UpdateLock(*this, bStartLocked));
+ return ::std::shared_ptr<ScreenUpdater::UpdateLock>(new ::UpdateLock(*this, false/*bStartLocked*/));
}
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index f9b62a8..6b65576 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -50,7 +50,7 @@ ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer& rMultiplexer,
{
}
-void ShapeManagerImpl::activate( bool bSlideBackgoundPainted )
+void ShapeManagerImpl::activate()
{
if( !mbEnabled )
{
@@ -72,7 +72,7 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted )
this->cursorChanged( rListener.first, rListener.second );
if( mpLayerManager )
- mpLayerManager->activate( bSlideBackgoundPainted );
+ mpLayerManager->activate( true/*bSlideBackgoundPainted*/ );
}
}
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 01ea774..63dc1c7 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -71,13 +71,11 @@ public:
/** Enables event listening.
- @param bSlideBackgoundPainted
- When true, the initial slide content on the background layer
+ The initial slide content on the background layer
is already rendered (e.g. from a previous slide
- transition). When false, slide renders initial content of
- slide.
+ transition).
*/
- void activate( bool bSlideBackgoundPainted );
+ void activate();
/** Disables event listening.
*/
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 863b6d2..ab9aa83 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -432,7 +432,7 @@ void SlideImpl::show( bool bSlideBackgoundPainted )
// slide. Also enables LayerManager to record updates. Currently,
// never let LayerManager render initial slide content, use
// buffered slide bitmaps instead.
- mpShapeManager->activate( true );
+ mpShapeManager->activate();
// render slide to screen, if requested
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index da94f03..f826b44 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1240,7 +1240,7 @@ sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exce
else
{
return maEffectRewinder.rewind(
- maScreenUpdater.createLock(false),
+ maScreenUpdater.createLock(),
[this]() { return this->redisplayCurrentSlide(); },
[this]() { return this->rewindEffectToPreviousSlide(); } );
}
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index 384e676..e975f3a 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -110,12 +110,8 @@ namespace slideshow
/** Call this method to create a lock instead of calling
lockUpdates() and unlockUpdates() directly.
- @param bStartLocked
- When <TRUE/> then the UpdateLock is created already
- locked. When <FALSE/> then Activate() has to be called in order
- to lock the lock.
*/
- ::std::shared_ptr<UpdateLock> createLock (const bool bStartLocked);
+ ::std::shared_ptr<UpdateLock> createLock();
/** Lock updates to prevent intermediate repaints.
*/
commit 435d6d50c3cdb6711942ee40dc2fae1865361845
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 16:21:26 2016 +0200
loplugin:constantparam in sfx2
Change-Id: I50a2d8221f907f0e844e558f3dbdd0346c010201
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index c59a32f..0335cc3 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -850,8 +850,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pPa
return nullptr;
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
- vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( const Reference< frame::XFrame >& rxFrame,
sal_uInt32 nResId, const OUString& rParameter )
{
VclPtr<Dialog> pDlg;
@@ -859,7 +858,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
{
// only activate last page if we don't want to activate a special page
bool bActivateLastSelection = ( nResId != SID_OPTIONS_DATABASES && rParameter.isEmpty() );
- VclPtrInstance<OfaTreeOptionsDialog> pOptDlg( pParent, rxFrame, bActivateLastSelection );
+ VclPtrInstance<OfaTreeOptionsDialog> pOptDlg( nullptr, rxFrame, bActivateLastSelection );
if ( nResId == SID_OPTIONS_DATABASES )
pOptDlg->ActivatePage(SID_SB_DBREGISTEROPTIONS);
else if ( !rParameter.isEmpty() )
@@ -1000,10 +999,9 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre
}
VclAbstractDialog*
-AbstractDialogFactory_Impl::CreateScriptErrorDialog(
- vcl::Window* pParent, const css::uno::Any& rException)
+AbstractDialogFactory_Impl::CreateScriptErrorDialog(const css::uno::Any& rException)
{
- return new SvxScriptErrorDialog(pParent, rException);
+ return new SvxScriptErrorDialog(nullptr, rException);
}
AbstractScriptSelectorDialog*
@@ -1551,12 +1549,12 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
return nullptr;
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( const OUString& rCommand,
const Reference < css::embed::XEmbeddedObject >& xObj )
{
if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
- VclPtrInstance<SfxInsertFloatingFrameDialog> pDlg( pParent, xObj );
+ VclPtrInstance<SfxInsertFloatingFrameDialog> pDlg( nullptr, xObj );
pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new CuiVclAbstractDialog_Impl( pDlg );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index fd98e4d..6f8bc05 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -487,8 +487,7 @@ public:
const SfxItemSet& rAttr,
const css::uno::Reference< css::frame::XFrame >& _rxFrame,
sal_uInt32 nResId ) override;
- virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame >& rxFrame,
+ virtual VclAbstractDialog* CreateFrameDialog( const css::uno::Reference< css::frame::XFrame >& rxFrame,
sal_uInt32 nResId,
const OUString& rParameter ) override;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
@@ -511,7 +510,7 @@ public:
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const css::uno::Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList = nullptr ) override;
- virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
+ virtual VclAbstractDialog* CreateEditObjectDialog( const OUString& rCommmand,
const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override;
virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) override;
virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=nullptr ) override;
@@ -634,8 +633,7 @@ public:
const css::uno::Reference< css::frame::XFrame >& _rxFrame
) override;
- virtual VclAbstractDialog* CreateScriptErrorDialog(
- vcl::Window* pParent, const css::uno::Any& rException) override;
+ virtual VclAbstractDialog* CreateScriptErrorDialog(const css::uno::Any& rException) override;
virtual VclAbstractDialog* CreateSvxMacroAssignDlg(
vcl::Window* _pParent,
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index aabf312..12b25ef 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -206,14 +206,14 @@ public:
SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl();
SAL_DLLPRIVATE void AddVersion_Impl( css::util::RevisionTag& rVersion );
SAL_DLLPRIVATE bool TransferVersionList_Impl( SfxMedium& rMedium );
- SAL_DLLPRIVATE void SaveVersionList_Impl( bool bUseXML );
+ SAL_DLLPRIVATE void SaveVersionList_Impl();
SAL_DLLPRIVATE void RemoveVersion_Impl( const OUString& rVersion );
SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime );
SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl();
SAL_DLLPRIVATE void Init_Impl();
- SAL_DLLPRIVATE void ForceSynchronStream_Impl( bool bSynchron );
+ SAL_DLLPRIVATE void ForceSynchronStream_Impl();
SAL_DLLPRIVATE void GetLockingStream_Impl();
SAL_DLLPRIVATE void GetMedium_Impl();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index ffca96b..9f2f71a 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -359,7 +359,7 @@ public:
bool SwitchChildrenPersistance(
const css::uno::Reference< css::embed::XStorage >& xStorage,
bool bForceNonModified = false );
- bool SaveCompletedChildren( bool bSuccess );
+ bool SaveCompletedChildren();
/** a very special case to insert at a position in Writer from UNO,
via OwnSubFilterService */
@@ -375,8 +375,7 @@ public:
SignatureState GetScriptingSignatureState();
void SignScriptingContent();
- virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(
- vcl::Window *pParent, const SfxItemSet& );
+ virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet& );
ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName,
SbxArray* pArgs = nullptr, SbxValue* pRet = nullptr );
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 4548dc8..0a77e80 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -116,7 +116,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog
public:
virtual ~SfxAbstractDialogFactory(); // needed for export of vtable
static SfxAbstractDialogFactory* Create();
- virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
+ virtual VclAbstractDialog* CreateFrameDialog( const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const SfxItemSet* pAttrSet,
@@ -130,7 +130,7 @@ public:
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand,
const css::uno::Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList = nullptr )=0;
- virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand,
+ virtual VclAbstractDialog* CreateEditObjectDialog( const OUString& rCommand,
const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0;
virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0;
virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0;
@@ -143,8 +143,7 @@ public:
const css::uno::Reference< css::frame::XFrame >& _rxFrame
) = 0;
- virtual VclAbstractDialog* CreateScriptErrorDialog(
- vcl::Window* pParent, const css::uno::Any& rException ) = 0;
+ virtual VclAbstractDialog* CreateScriptErrorDialog( const css::uno::Any& rException ) = 0;
virtual VclAbstractDialog* CreateOptionsDialog(
vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index b960289..2f0ec16 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -197,7 +197,7 @@ public:
SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
- SAL_DLLPRIVATE void ForceOuterResize_Impl(bool bOn=true);
+ SAL_DLLPRIVATE void ForceOuterResize_Impl();
SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const;
SAL_DLLPRIVATE void UpdateDocument_Impl();
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index f6ddfdf..e5f9aef 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -409,8 +409,7 @@ public:
const css::uno::Reference< css::frame::XFrame >& _rxFrame
) override = 0;
- virtual VclAbstractDialog* CreateScriptErrorDialog(
- vcl::Window* pParent, const css::uno::Any& rException) override = 0;
+ virtual VclAbstractDialog* CreateScriptErrorDialog(const css::uno::Any& rException) override = 0;
virtual VclAbstractDialog* CreateSvxMacroAssignDlg(
vcl::Window* _pParent,
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 08dbab9..0309e1d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2878,10 +2878,9 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat )
(sal_uInt16) ScPrintFunc( this, pPrinter, i ).GetTotalPages() );
}
-VclPtr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog(
- vcl::Window *pParent, const SfxItemSet &rSet )
+VclPtr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog( const SfxItemSet &rSet )
{
- VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( pParent, rSet );
+ VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( nullptr, rSet );
ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() );
// Only for statistics, if this Doc is shown; not from the Doc Manager
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 74bf9155..d0f93d4 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -220,8 +220,7 @@ public:
void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart );
- virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent,
- const SfxItemSet &rSet ) override;
+ virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet &rSet ) override;
void GetDocStat( ScDocStat& rDocStat );
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 1c5d855..85573b5 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -274,7 +274,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
if ( pFact != nullptr )
{
std::unique_ptr<VclAbstractDialog> pDlg(
- pFact->CreateScriptErrorDialog( nullptr, aException ));
+ pFact->CreateScriptErrorDialog( aException ));
if ( pDlg )
pDlg->Execute();
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index e341578..ff5999d 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -1052,9 +1052,9 @@ void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL )
( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs );
}
-VclPtr<SfxDocumentInfoDialog> DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet )
+VclPtr<SfxDocumentInfoDialog> DrawDocShell::CreateDocumentInfoDialog( const SfxItemSet &rSet )
{
- VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( pParent, rSet );
+ VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( nullptr, rSet );
DrawDocShell* pDocSh = dynamic_cast< DrawDocShell *>( SfxObjectShell::Current() );
if( pDocSh == this )
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 8aa9b3b..2b7a2cc 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -101,8 +101,7 @@ public:
virtual Size GetFirstPageSize() override;
virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const override;
virtual void SetModified( bool = true ) override;
- virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent,
- const SfxItemSet &rSet ) override;
+ virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet &rSet ) override;
using SfxObjectShell::GetVisArea;
using SfxShell::GetViewShell;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f29288ed..25fb772 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -973,7 +973,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
if ( pFact )
{
VclAbstractDialog* pDlg =
- pFact->CreateFrameDialog( nullptr, xFrame, rReq.GetSlot(), sPageURL );
+ pFact->CreateFrameDialog( xFrame, rReq.GetSlot(), sPageURL );
short nRet = pDlg->Execute();
delete pDlg;
SfxViewFrame* pView = SfxViewFrame::GetFirst();
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index da3da96..2ab9ab8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1905,7 +1905,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
InitToolBoxImages();
aToolBox->Show();
- InitOnStartupBox( false );
+ InitOnStartupBox();
aOnStartupCB->SetClickHdl( LINK( this, SfxHelpTextWindow_Impl, CheckHdl ) );
aSelectIdle.SetIdleHdl( LINK( this, SfxHelpTextWindow_Impl, SelectHdl ) );
@@ -2001,7 +2001,7 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages()
}
-void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
+void SfxHelpTextWindow_Impl::InitOnStartupBox()
{
sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier();
@@ -2078,18 +2078,15 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
SetOnStartupBoxPosition();
}
- if ( !bOnlyText )
- {
- // set position of the checkbox
- Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
- Size aTBSize = aToolBox->GetSizePixel();
- Size aCBSize = aOnStartupCB->GetSizePixel();
- Point aPnt = aToolBox->GetPosPixel();
- aPnt.X() += aTBSize.Width() + a3Size.Width();
- aPnt.Y() += ( ( aTBSize.Height() - aCBSize.Height() ) / 2 );
- aOnStartupCB->SetPosPixel( aPnt );
- nMinPos = aPnt.X();
- }
+ // set position of the checkbox
+ Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
+ Size aTBSize = aToolBox->GetSizePixel();
+ Size aCBSize = aOnStartupCB->GetSizePixel();
+ Point aPnt = aToolBox->GetPosPixel();
+ aPnt.X() += aTBSize.Width() + a3Size.Width();
+ aPnt.Y() += ( ( aTBSize.Height() - aCBSize.Height() ) / 2 );
+ aOnStartupCB->SetPosPixel( aPnt );
+ nMinPos = aPnt.X();
}
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 464e2b3..9b9d434 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -444,7 +444,7 @@ private:
bool HasSelection() const;
void InitToolBoxImages();
- void InitOnStartupBox( bool bOnlyText );
+ void InitOnStartupBox();
void SetOnStartupBoxPosition();
css::uno::Reference< css::i18n::XBreakIterator >
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 89601b8..b343050 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -295,7 +295,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
{
if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode())
{
- pDialog->DeleteHdl( nullptr );
+ pDialog->DeleteHdl();
bRet = true;
}
else if( KEY_RETURN == rKeyCode.GetCode())
@@ -1857,7 +1857,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&,
}
// Handler for the New-Buttons
-void SfxCommonTemplateDialog_Impl::NewHdl(void *)
+void SfxCommonTemplateDialog_Impl::NewHdl()
{
if ( nActFamily != 0xffff && (pTreeBox || aFmtLb->GetSelectionCount() <= 1))
{
@@ -1892,7 +1892,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
}
// Handler for the edit-Buttons
-void SfxCommonTemplateDialog_Impl::EditHdl(void *)
+void SfxCommonTemplateDialog_Impl::EditHdl()
{
if(IsInitialized() && HasSelectedStyle())
{
@@ -1915,7 +1915,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
}
// Handler for the Delete-Buttons
-void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
+void SfxCommonTemplateDialog_Impl::DeleteHdl()
{
if ( IsInitialized() && HasSelectedStyle() )
{
@@ -1986,7 +1986,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
}
}
-void SfxCommonTemplateDialog_Impl::HideHdl(void *)
+void SfxCommonTemplateDialog_Impl::HideHdl()
{
if ( IsInitialized() && HasSelectedStyle() )
{
@@ -2004,7 +2004,7 @@ void SfxCommonTemplateDialog_Impl::HideHdl(void *)
}
}
-void SfxCommonTemplateDialog_Impl::ShowHdl(void *)
+void SfxCommonTemplateDialog_Impl::ShowHdl()
{
if ( IsInitialized() && HasSelectedStyle() )
@@ -2145,11 +2145,11 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool
IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void )
{
switch(nLastItemId) {
- case ID_NEW: NewHdl(nullptr); break;
- case ID_EDIT: EditHdl(nullptr); break;
- case ID_DELETE: DeleteHdl(nullptr); break;
- case ID_HIDE: HideHdl(nullptr); break;
- case ID_SHOW: ShowHdl(nullptr); break;
+ case ID_NEW: NewHdl(); break;
+ case ID_EDIT: EditHdl(); break;
+ case ID_DELETE: DeleteHdl(); break;
+ case ID_HIDE: HideHdl(); break;
+ case ID_SHOW: ShowHdl(); break;
}
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a10bf5b..df0d7c9 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -637,7 +637,7 @@ const OUString& SfxMedium::GetPhysicalName() const
void SfxMedium::CreateFileStream()
{
- ForceSynchronStream_Impl( true );
+ ForceSynchronStream_Impl();
GetInStream();
if( pImp->m_pInStream )
{
@@ -3131,13 +3131,13 @@ bool SfxMedium::IsExpired() const
}
-void SfxMedium::ForceSynchronStream_Impl( bool bForce )
+void SfxMedium::ForceSynchronStream_Impl()
{
if( pImp->m_pInStream )
{
SvLockBytes* pBytes = pImp->m_pInStream->GetLockBytes();
if( pBytes )
- pBytes->SetSynchronMode( bForce );
+ pBytes->SetSynchronMode( true/*bForce*/ );
}
}
@@ -3303,7 +3303,7 @@ bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
return false;
}
-void SfxMedium::SaveVersionList_Impl( bool /*bUseXML*/ )
+void SfxMedium::SaveVersionList_Impl()
{
if ( GetStorage().is() )
{
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index a6dad47..7f6d50c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -302,7 +302,7 @@ public:
bool renameGroup( const OUString& rOldName,
const OUString& rNewName );
- void update( bool bUpdateNow );
+ void update();
void doUpdate();
void finished() { mpUpdater = nullptr; }
};
@@ -465,7 +465,7 @@ void SfxDocTplService_Impl::init_Impl()
aSolarGuard.clear();
::osl::ClearableMutexGuard anotherGuard( maMutex );
- update( true );
+ update();
anotherGuard.clear();
SolarMutexGuard aSecondSolarGuard;
@@ -474,7 +474,7 @@ void SfxDocTplService_Impl::init_Impl()
}
else if ( needsUpdate() )
// the UI should be shown only on the first update
- update( true );
+ update();
}
else
{
@@ -1146,17 +1146,11 @@ void SfxDocTplService_Impl::setLocale( const lang::Locale &rLocale )
}
-void SfxDocTplService_Impl::update( bool bUpdateNow )
+void SfxDocTplService_Impl::update()
{
::osl::MutexGuard aGuard( maMutex );
- if ( bUpdateNow )
- doUpdate();
- else
- {
- mpUpdater = new Updater_Impl( this );
- mpUpdater->create();
- }
+ doUpdate();
}
@@ -2378,7 +2372,7 @@ void SAL_CALL SfxDocTplService::update()
throw( uno::RuntimeException, std::exception )
{
if ( pImp->init() )
- pImp->update( true );
+ pImp->update();
}
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 4d8b4860..4b2d79d 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -405,7 +405,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const
::sal_Int16 SAL_CALL IFrameObject::execute() throw (css::uno::RuntimeException, std::exception)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( nullptr, ".uno:InsertObjectFloatingFrame", mxObj );
+ VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( ".uno:InsertObjectFloatingFrame", mxObj );
if ( pDlg )
pDlg->Execute();
return 0;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 1024dad..28d972e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -284,11 +284,10 @@ void SfxObjectShell::UpdateTime_Impl(
VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog
(
- vcl::Window* pParent,
const SfxItemSet& rSet
)
{
- return VclPtr<SfxDocumentInfoDialog>::Create(pParent, rSet);
+ return VclPtr<SfxDocumentInfoDialog>::Create(nullptr, rSet);
}
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6a291cb..a8dd86d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1531,7 +1531,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
std::unique_ptr< VclAbstractDialog > pScriptErrDlg;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
- pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( nullptr, aException ) );
+ pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( aException ) );
OSL_ENSURE( pScriptErrDlg.get(), "SfxObjectShell::CallXScript: no script error dialog!" );
if ( pScriptErrDlg.get() )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8880f48..19b1072 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -490,7 +490,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
// creating dialog is done via virtual method; application will
// add its own statistics page
- ScopedVclPtr<SfxDocumentInfoDialog> pDlg(CreateDocumentInfoDialog(nullptr, aSet));
+ ScopedVclPtr<SfxDocumentInfoDialog> pDlg(CreateDocumentInfoDialog(aSet));
if ( RET_OK == pDlg->Execute() )
{
const SfxDocumentInfoItem* pDocInfoItem = SfxItemSet::GetItem<SfxDocumentInfoItem>(pDlg->GetOutputItemSet(), SID_DOCINFO, false);
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 07a3c6d..cfc8710 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1519,13 +1519,13 @@ bool SfxObjectShell::SaveTo_Impl
// add new version information into the versionlist and save the versionlist
// the version list must have been transferred from the "old" medium before
rMedium.AddVersion_Impl( aInfo );
- rMedium.SaveVersionList_Impl( true );
+ rMedium.SaveVersionList_Impl();
bOk = PutURLContentsToVersionStream_Impl( aTmpVersionURL, xMedStorage, aInfo.Identifier );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list