avmedia/source/gstreamer/gstwindow.hxx | 4 chart2/source/controller/sidebar/ChartAreaPanel.cxx | 2 chart2/source/controller/sidebar/ChartLinePanel.cxx | 2 chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx | 2 chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx | 2 configmgr/source/node.hxx | 2 cui/source/inc/cuitabarea.hxx | 2 cui/source/inc/cuitabline.hxx | 100 +- cui/source/tabpages/tpline.cxx | 476 +++++----- dbaccess/source/core/api/OptimisticSet.cxx | 78 - dbaccess/source/core/dataaccess/databasecontext.cxx | 23 dbaccess/source/core/dataaccess/databasedocument.cxx | 26 dbaccess/source/ui/app/AppController.cxx | 24 dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 dbaccess/source/ui/browser/genericcontroller.cxx | 28 dbaccess/source/ui/control/RelationControl.cxx | 9 dbaccess/source/ui/dlg/adminpages.cxx | 15 dbaccess/source/ui/dlg/adminpages.hxx | 24 dbaccess/source/ui/inc/ConnectionLine.hxx | 24 dbaccess/source/ui/inc/ConnectionLineData.hxx | 1 dbaccess/source/ui/inc/RefFunctor.hxx | 45 dbaccess/source/ui/querydesign/JoinController.cxx | 2 dbaccess/source/ui/querydesign/TableConnection.cxx | 11 dbaccess/source/ui/tabledesign/TableController.cxx | 5 dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2 dbaccess/source/ui/uno/TableFilterDlg.hxx | 2 dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2 dbaccess/source/ui/uno/admindlg.hxx | 2 dbaccess/source/ui/uno/composerdialogs.hxx | 6 dbaccess/source/ui/uno/copytablewizard.cxx | 4 dbaccess/source/ui/uno/dbinteraction.hxx | 4 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 2 dbaccess/source/ui/uno/unoDirectSql.hxx | 2 desktop/source/app/desktopcontext.hxx | 2 desktop/source/app/officeipcthread.hxx | 2 drawinglayer/source/attribute/materialattribute3d.cxx | 2 drawinglayer/source/dumper/EnhancedShapeDumper.hxx | 6 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 2 editeng/qa/unit/core-test.cxx | 2 editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 editeng/source/editeng/editdoc.cxx | 10 editeng/source/editeng/editobj.cxx | 2 editeng/source/editeng/editundo.cxx | 2 editeng/source/editeng/fieldupdater.cxx | 2 editeng/source/editeng/impedit2.cxx | 6 editeng/source/items/frmitems.cxx | 2 editeng/source/lookuptree/Trie.cxx | 2 editeng/source/xml/editsource.hxx | 4 editeng/source/xml/xmltxtexp.cxx | 30 framework/inc/classes/menumanager.hxx | 2 framework/inc/uielement/menubarmanager.hxx | 2 framework/inc/uielement/togglebuttontoolbarcontroller.hxx | 2 framework/inc/uielement/toolbarmanager.hxx | 2 framework/source/classes/menumanager.cxx | 4 framework/source/uielement/menubarmanager.cxx | 4 framework/source/uielement/togglebuttontoolbarcontroller.cxx | 4 framework/source/uielement/toolbarmanager.cxx | 8 helpcontent2 | 2 include/oox/export/drawingml.hxx | 4 include/oox/export/vmlexport.hxx | 4 include/sfx2/mnumgr.hxx | 2 include/sfx2/sidebar/SidebarController.hxx | 2 include/sfx2/templatedlg.hxx | 8 include/svx/SmartTagCtl.hxx | 2 include/svx/ruler.hxx | 4 include/vcl/menu.hxx | 4 lotuswordpro/source/filter/lwpoverride.hxx | 2 lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 2 oox/source/export/drawingml.cxx | 33 oox/source/export/vmlexport.cxx | 9 sc/inc/dbdata.hxx | 3 sc/source/core/tool/compiler.cxx | 72 - sc/source/core/tool/dbdata.cxx | 91 + sc/source/ui/formdlg/dwfunctr.cxx | 2 sc/source/ui/formdlg/privsplt.cxx | 128 -- sc/source/ui/inc/privsplt.hxx | 7 sd/source/ui/dlg/navigatr.cxx | 8 sd/source/ui/inc/navigatr.hxx | 4 sd/source/ui/sidebar/LayoutMenu.cxx | 6 sd/source/ui/sidebar/LayoutMenu.hxx | 2 sd/source/ui/sidebar/MasterPagesSelector.cxx | 6 sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 sd/source/ui/slideshow/slideshowimpl.cxx | 4 sd/source/ui/slideshow/slideshowimpl.hxx | 2 sd/source/ui/slidesorter/view/SlsLayouter.cxx | 8 sfx2/source/dialog/taskpane.cxx | 8 sfx2/source/dialog/templdlg.cxx | 8 sfx2/source/doc/templatedlg.cxx | 16 sfx2/source/inc/templdgi.hxx | 4 sfx2/source/inc/virtmenu.hxx | 2 sfx2/source/menu/mnumgr.cxx | 8 sfx2/source/menu/virtmenu.cxx | 8 sfx2/source/sidebar/SidebarController.cxx | 6 sfx2/uiconfig/ui/newstyle.ui | 1 slideshow/inc/pch/precompiled_slideshow.hxx | 5 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 8 slideshow/source/engine/eventmultiplexer.cxx | 4 slideshow/source/engine/shapes/gdimtftools.cxx | 5 slideshow/source/engine/slideshowimpl.cxx | 5 slideshow/source/engine/slideview.cxx | 4 slideshow/test/demoshow.cxx | 7 slideshow/test/slidetest.cxx | 1 slideshow/test/testshape.cxx | 4 slideshow/test/testview.cxx | 4 slideshow/test/views.cxx | 1 starmath/inc/dialog.hxx | 4 starmath/inc/edit.hxx | 2 starmath/inc/view.hxx | 2 starmath/source/dialog.cxx | 10 starmath/source/edit.cxx | 4 starmath/source/view.cxx | 4 stoc/source/corereflection/base.hxx | 5 stoc/source/defaultregistry/defaultregistry.cxx | 7 stoc/source/implementationregistration/implreg.cxx | 4 stoc/source/inspect/introspection.cxx | 4 stoc/source/invocation/invocation.cxx | 4 stoc/source/invocation_adapterfactory/iafactory.cxx | 4 stoc/source/javaloader/javaloader.cxx | 4 stoc/source/javavm/interact.cxx | 6 stoc/source/javavm/interact.hxx | 4 stoc/source/javavm/javavm.cxx | 4 stoc/source/javavm/javavm.hxx | 4 stoc/source/loader/dllcomponentloader.cxx | 4 stoc/source/namingservice/namingservice.cxx | 4 stoc/source/proxy_factory/proxyfac.cxx | 4 stoc/source/security/access_controller.cxx | 14 stoc/source/security/file_policy.cxx | 4 stoc/source/servicemanager/servicemanager.cxx | 17 stoc/source/simpleregistry/simpleregistry.cxx | 7 stoc/source/typeconv/convert.cxx | 4 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 4 stoc/source/uriproc/UriReferenceFactory.cxx | 7 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 7 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 7 stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 4 stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 6 stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 4 stoc/test/tdmanager/testtdmanager.cxx | 4 stoc/test/testcorefl.cxx | 4 stoc/test/testiadapter.cxx | 6 stoc/test/testintrosp.cxx | 7 stoc/test/testloader.cxx | 4 stoc/test/testproxyfac.cxx | 9 stoc/test/testsmgr_cpnt.cxx | 4 store/source/store.cxx | 2 svl/inc/pch/precompiled_svl.hxx | 2 svl/qa/unit/test_URIHelper.cxx | 7 svl/source/config/itemholder2.hxx | 4 svl/source/fsstor/oinputstreamcontainer.hxx | 4 svl/source/inc/fsfactory.hxx | 4 svl/source/inc/passwordcontainer.hxx | 4 svl/source/numbers/numfmuno.hxx | 11 svl/source/uno/pathservice.cxx | 4 svtools/inc/pch/precompiled_svt.hxx | 5 svtools/source/config/itemholder2.hxx | 4 svtools/source/control/ruler.cxx | 2 svtools/source/control/toolbarmenuimp.hxx | 7 svtools/source/control/valueimp.hxx | 8 svtools/source/filter/SvFilterOptionsDialog.cxx | 4 svtools/source/graphic/graphicunofactory.cxx | 4 svtools/source/hatchwindow/documentcloser.cxx | 4 svtools/source/hatchwindow/hatchwindowfactory.cxx | 4 svtools/source/inc/provider.hxx | 4 svtools/source/inc/unoiface.hxx | 5 svtools/source/misc/embedhlp.cxx | 4 svtools/source/misc/imageresourceaccess.cxx | 4 svtools/source/misc/transfer.cxx | 4 svtools/source/uno/svtxgridcontrol.hxx | 4 svtools/source/uno/treecontrolpeer.cxx | 3 svtools/source/uno/treecontrolpeer.hxx | 4 svtools/source/uno/unocontroltablemodel.hxx | 1 svtools/source/uno/unoevent.cxx | 1 svtools/source/uno/unogridcolumnfacade.cxx | 3 svtools/source/uno/unogridcolumnfacade.hxx | 1 svtools/source/uno/unoimap.cxx | 4 svtools/source/uno/wizard/unowizard.cxx | 4 svx/inc/AccessibleTableShape.hxx | 8 svx/inc/pch/precompiled_svx.hxx | 4 svx/inc/pch/precompiled_svxcore.hxx | 5 svx/inc/tbunosearchcontrollers.hxx | 1 svx/source/accessibility/ChildrenManagerImpl.cxx | 2 svx/source/accessibility/ChildrenManagerImpl.hxx | 4 svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 4 svx/source/customshapes/EnhancedCustomShapeHandle.hxx | 4 svx/source/dialog/imapwnd.cxx | 82 - svx/source/dialog/imapwnd.hxx | 2 svx/source/dialog/rubydialog.cxx | 4 svx/source/dialog/svxruler.cxx | 8 svx/source/fmcomp/gridctrl.cxx | 3 svx/source/form/filtnav.cxx | 4 svx/source/form/fmscriptingenv.cxx | 4 svx/source/form/fmtextcontrolshell.cxx | 6 svx/source/form/fmundo.cxx | 4 svx/source/form/legacyformcontroller.cxx | 4 svx/source/gallery2/galbrws1.cxx | 4 svx/source/gallery2/galbrws1.hxx | 2 svx/source/gallery2/galbrws2.cxx | 19 svx/source/inc/AccessibleFrameSelector.hxx | 4 svx/source/inc/datalistener.hxx | 4 svx/source/inc/docrecovery.hxx | 7 svx/source/inc/fmexpl.hxx | 3 svx/source/inc/fmshimp.hxx | 5 svx/source/inc/fmtextcontrolfeature.hxx | 4 svx/source/inc/fmundo.hxx | 4 svx/source/inc/fmvwimp.hxx | 7 svx/source/inc/formcontrolling.hxx | 4 svx/source/inc/formdispatchinterceptor.hxx | 4 svx/source/inc/formfeaturedispatcher.hxx | 4 svx/source/inc/svxpixelctlaccessiblecontext.hxx | 2 svx/source/inc/svxrectctaccessiblecontext.hxx | 2 svx/source/inc/unogalthemeprovider.hxx | 4 svx/source/mnuctrls/SmartTagCtl.cxx | 10 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 4 svx/source/sidebar/insert/InsertPropertyPanel.cxx | 1 svx/source/svdraw/svdoole2.cxx | 4 svx/source/svdraw/svdouno.cxx | 4 svx/source/table/accessiblecell.hxx | 4 svx/source/table/accessibletableshape.cxx | 4 svx/source/table/cellcursor.hxx | 4 svx/source/table/svdotable.cxx | 4 svx/source/table/tablecolumn.hxx | 4 svx/source/table/tablecontroller.cxx | 3 svx/source/table/tabledesign.cxx | 8 svx/source/table/tablemodel.hxx | 4 svx/source/table/tablerow.hxx | 4 svx/source/tbxctrls/tbcontrl.cxx | 6 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 4 svx/source/unodraw/UnoGraphicExporter.cxx | 4 svx/source/unodraw/UnoNameItemTable.hxx | 4 svx/source/unodraw/UnoNamespaceMap.cxx | 4 svx/source/unodraw/XPropertyTable.cxx | 4 svx/source/unodraw/gluepts.cxx | 4 svx/source/unodraw/recoveryui.cxx | 4 svx/source/unodraw/unoctabl.cxx | 4 svx/source/unodraw/unomod.cxx | 4 svx/source/unodraw/unomtabl.cxx | 4 svx/source/unogallery/unogaltheme.hxx | 4 svx/source/xml/xmleohlp.cxx | 3 svx/source/xml/xmlgrhlp.cxx | 9 sw/qa/extras/ooxmlexport/data/tdf83227.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 12 sw/source/filter/ww8/docxattributeoutput.cxx | 16 sw/source/filter/ww8/docxattributeoutput.hxx | 4 sw/source/filter/ww8/ww8scan.cxx | 2 sw/source/ui/index/cnttab.cxx | 6 sw/source/ui/misc/glossary.cxx | 8 sw/source/ui/misc/outline.cxx | 6 sw/source/uibase/docvw/SidebarTxtControl.cxx | 4 sw/source/uibase/docvw/SidebarTxtControl.hxx | 2 sw/source/uibase/inc/conttree.hxx | 2 sw/source/uibase/inc/glossary.hxx | 2 sw/source/uibase/inc/inputwin.hxx | 2 sw/source/uibase/inc/navipi.hxx | 2 sw/source/uibase/inc/outline.hxx | 2 sw/source/uibase/inc/swuicnttab.hxx | 2 sw/source/uibase/inc/unotools.hxx | 2 sw/source/uibase/inc/workctrl.hxx | 2 sw/source/uibase/ribbar/inputwin.cxx | 4 sw/source/uibase/ribbar/workctrl.cxx | 6 sw/source/uibase/utlui/glbltree.cxx | 4 sw/source/uibase/utlui/navipi.cxx | 4 sw/source/uibase/utlui/unotools.cxx | 6 vcl/source/window/toolbox.cxx | 71 - vcl/win/source/gdi/winlayout.cxx | 59 - 264 files changed, 1180 insertions(+), 1324 deletions(-)
New commits: commit cd631a16e49dadd3279f528134962a4376795304 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 14:19:43 2015 +0200 TableRef: prefer internal table column name over header cell content Now that table column names are refreshed we can prefer them over header cell content during formula compilation and string creation of a tokenized formula. Change-Id: I0755404883af78c52c8d27a777acd7300bc2af75 diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 67cf1d7..c882467 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3517,6 +3517,37 @@ bool ScCompiler::IsTableRefColumn( const OUString& rName ) const aRange.aEnd.SetTab( aRange.aStart.Tab()); aRange.aEnd.SetRow( aRange.aStart.Row()); + // Prefer the stored internal table column name, which is also needed for + // named expressions during document load time when cell content isn't + // available yet. Also, avoiding a possible calculation step in case the + // header cell is a formula cell is "a good thing". + sal_Int32 nOffset = pDBData->GetColumnNameOffset( aName); + if (nOffset >= 0) + { + if (pDBData->HasHeader()) + { + ScSingleRefData aRef; + ScAddress aAdr( aRange.aStart); + aAdr.IncCol( nOffset); + aRef.InitAddress( aAdr); + maRawToken.SetSingleReference( aRef ); + } + else + { + /* TODO: this probably needs a new token type to hold offset and + * name, to be handled in HandleTableRef(). We can't use a + * reference token here because any reference would be wrong as + * there are no header cells to be referenced. However, it would + * only work as long as the ScDBData column names are not + * invalidated during document structure changes, otherwise + * recompiling the same formula could not resolve the name again. + * As long as this doesn't work generate an error. */ + return false; + } + return true; + } + + SAL_WARN("sc.core", "ScCompiler::IsTableRefColumn - falling back to cell lookup"); if (pDBData->HasHeader()) { // Quite similar to IsColRowName() but limited to one row of headers. @@ -3553,36 +3584,6 @@ bool ScCompiler::IsTableRefColumn( const OUString& rName ) const } } - // And now a fallback for named expressions during document load time when - // cell content isn't available yet. This could be the preferred method IF - // the ScDBData column names were maintained and refreshed on ALL sheet - // operations, including cell content changes. - sal_Int32 nOffset = pDBData->GetColumnNameOffset( aName); - if (nOffset >= 0) - { - if (pDBData->HasHeader()) - { - ScSingleRefData aRef; - ScAddress aAdr( aRange.aStart); - aAdr.IncCol( nOffset); - aRef.InitAddress( aAdr); - maRawToken.SetSingleReference( aRef ); - } - else - { - /* TODO: this probably needs a new token type to hold offset and - * name, to be handled in HandleTableRef(). We can't use a - * reference token here because any reference would be wrong as - * there are no header cells to be referenced. However, it would - * only work as long as the ScDBData column names are not - * invalidated during document structure changes, otherwise - * recompiling the same formula could not resolve the name again. - * As long as this doesn't work generate an error. */ - return false; - } - return true; - } - return false; } @@ -4700,14 +4701,15 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu } else if (pArr && (p = pArr->PeekPrevNoSpaces()) && p->GetOpCode() == ocTableRefOpen) { + OUString aStr; ScAddress aAbs = rRef.toAbs(aPos); - OUString aStr = pDoc->GetString(aAbs); + const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab(), ScDBDataPortion::HEADER); + if (pData) + aStr = pData->GetTableColumnName( aAbs.Col()); if (aStr.isEmpty()) { - // Hope that there's still the original column name available. - const ScDBData* pData = pDoc->GetDBAtCursor( aAbs.Col(), aAbs.Row(), aAbs.Tab(), ScDBDataPortion::HEADER); - if (pData) - aStr = pData->GetTableColumnName( aAbs.Col()); + SAL_WARN("sc.core", "ScCompiler::CreateStringFromSingleRef - TableRef falling back to cell"); + aStr = pDoc->GetString(aAbs); } escapeTableRefColumnSpecifier( aStr); rBuffer.append(aStr); commit fff1c3e3e50fcb2e5781c73ba1316a225dd34fa4 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 13:14:21 2015 +0200 TableRef: move swap to empty names to InvalidateTableColumnNames() Change-Id: I495377786bd0add1521d37490c8c57d4d30f541e diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 5812365..85ace9f 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -221,7 +221,7 @@ private: void AdjustTableColumnNames( UpdateRefMode eUpdateRefMode, SCCOL nDx, SCCOL nCol1, SCCOL nOldCol1, SCCOL nOldCol2, SCCOL nNewCol1, SCCOL nNewCol2 ); - void InvalidateTableColumnNames(); + void InvalidateTableColumnNames( bool bSwapToEmptyNames ); }; class SC_DLLPUBLIC ScDBCollection diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 4b58c87..c5b14a0 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -185,11 +185,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) bAutoFilter = rData.bAutoFilter; if (bHeaderRangeDiffers) - { - if (!maTableColumnNames.empty()) - ::std::vector<OUString>().swap( maTableColumnNames); - InvalidateTableColumnNames(); - } + InvalidateTableColumnNames( true); else { maTableColumnNames = rData.maTableColumnNames; @@ -320,15 +316,7 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW { bool bHeaderRangeChange = (nTab != nTable || nCol1 != nStartCol || nCol2 != nEndCol || nRow1 != nStartRow); if (bHeaderRangeChange) - { EndTableColumnNamesListener(); - if (!maTableColumnNames.empty()) - { - SAL_WARN("sc.core", "ScDBData::SetArea - invalidating column names/offsets"); - ::std::vector<OUString>().swap( maTableColumnNames); - InvalidateTableColumnNames(); - } - } nTable = nTab; nStartCol = nCol1; @@ -337,7 +325,13 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nEndRow = nRow2; if (bHeaderRangeChange) + { + SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", "ScDBData::SetArea - invalidating column names/offsets"); + // Invalidate *after* new area has been set above to add the proper + // header range to dirty list. + InvalidateTableColumnNames( true); StartTableColumnNamesListener(); + } } void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) @@ -632,12 +626,8 @@ void ScDBData::ExtendDataArea(ScDocument* pDoc) pDoc->GetDataArea(nTable, nStartCol, nStartRow, nEndCol, nEndRow, false, true); if (nStartCol != nOldCol1 || nEndCol != nOldCol2) { - if (!maTableColumnNames.empty()) - { - SAL_WARN("sc.core", "ScDBData::ExtendDataArea - invalidating column names/offsets"); - ::std::vector<OUString>().swap( maTableColumnNames); - InvalidateTableColumnNames(); - } + SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", "ScDBData::ExtendDataArea - invalidating column names/offsets"); + InvalidateTableColumnNames( true); } } @@ -709,12 +699,14 @@ void ScDBData::AdjustTableColumnNames( UpdateRefMode eUpdateRefMode, SCCOL nDx, if (maTableColumnNames.empty()) mbTableColumnNamesDirty = true; if (mbTableColumnNamesDirty) - InvalidateTableColumnNames(); + InvalidateTableColumnNames( false); // preserve new column names array } -void ScDBData::InvalidateTableColumnNames() +void ScDBData::InvalidateTableColumnNames( bool bSwapToEmptyNames ) { mbTableColumnNamesDirty = true; + if (bSwapToEmptyNames && !maTableColumnNames.empty()) + ::std::vector<OUString>().swap( maTableColumnNames); if (mpContainer) { // Add header range to dirty list. commit e6f44f1fc3d0e43db74d24956ce8c74a675effd4 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 12:47:37 2015 +0200 assert Notify() without container Change-Id: Ie2a84f58f63737b241222523f6d6c380e727bb89 diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 3741725..4b58c87 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -898,7 +898,9 @@ void ScDBData::Notify( const SfxHint& rHint ) if (nHint & SC_HINT_DATACHANGED) { mbTableColumnNamesDirty = true; - if (mpContainer) + if (!mpContainer) + assert(!"ScDBData::Notify - how did we end up here without container?"); + else { // Only one cell of a range is broadcasted per area listener if // multiple cells are affected. Expand the range to what this is commit 18f91ac4ad376826408256e1d9117a5c5dcf377e Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 12:45:54 2015 +0200 TableRef: call InvalidateTableColumnNames() whenever they are invalidated Change-Id: I10396818da901a6a4da331ad2152b901968fd8bd diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 95439ef..3741725 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -188,16 +188,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) { if (!maTableColumnNames.empty()) ::std::vector<OUString>().swap( maTableColumnNames); - if (bHasHeader) - { - mbTableColumnNamesDirty = true; - if (mpContainer) - mpContainer->GetDirtyTableColumnNames().Join( GetHeaderArea()); - } - else - { - mbTableColumnNamesDirty = false; - } + InvalidateTableColumnNames(); } else { @@ -335,7 +326,7 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW { SAL_WARN("sc.core", "ScDBData::SetArea - invalidating column names/offsets"); ::std::vector<OUString>().swap( maTableColumnNames); - mbTableColumnNamesDirty = true; + InvalidateTableColumnNames(); } } @@ -645,7 +636,7 @@ void ScDBData::ExtendDataArea(ScDocument* pDoc) { SAL_WARN("sc.core", "ScDBData::ExtendDataArea - invalidating column names/offsets"); ::std::vector<OUString>().swap( maTableColumnNames); - mbTableColumnNamesDirty = true; + InvalidateTableColumnNames(); } } } @@ -717,6 +708,8 @@ void ScDBData::AdjustTableColumnNames( UpdateRefMode eUpdateRefMode, SCCOL nDx, aNewNames.swap( maTableColumnNames); if (maTableColumnNames.empty()) mbTableColumnNamesDirty = true; + if (mbTableColumnNamesDirty) + InvalidateTableColumnNames(); } void ScDBData::InvalidateTableColumnNames() commit 8e230d5d874cfe4f9def61b67b4b24ab2389bc01 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 12:31:09 2015 +0200 TableRef: introduce InvalidateTableColumnNames() Change-Id: I3dcefc3ba55c33f9cfef6ff4bf9aa2242a866c14 diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 9785873..5812365 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -221,6 +221,7 @@ private: void AdjustTableColumnNames( UpdateRefMode eUpdateRefMode, SCCOL nDx, SCCOL nCol1, SCCOL nOldCol1, SCCOL nOldCol2, SCCOL nNewCol1, SCCOL nNewCol2 ); + void InvalidateTableColumnNames(); }; class SC_DLLPUBLIC ScDBCollection diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 50626bd..95439ef 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -719,6 +719,23 @@ void ScDBData::AdjustTableColumnNames( UpdateRefMode eUpdateRefMode, SCCOL nDx, mbTableColumnNamesDirty = true; } +void ScDBData::InvalidateTableColumnNames() +{ + mbTableColumnNamesDirty = true; + if (mpContainer) + { + // Add header range to dirty list. + if (HasHeader()) + mpContainer->GetDirtyTableColumnNames().Join( GetHeaderArea()); + else + { + // We need *some* range in the dirty list even without header area, + // otherwise the container would not attempt to call a refresh. + mpContainer->GetDirtyTableColumnNames().Join( ScRange( nStartCol, nStartRow, nTable)); + } + } +} + namespace { class TableColumnNameSearch : public unary_function<ScDBData, bool> { commit be1585dd847cf377da14b29be81934464ea6c403 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 12:20:32 2015 +0200 TableRef: add a comment why we need a full check anyway Change-Id: I352a1378cc1a9e3d689c6902a01b901a74466d2d diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index ed92bcf..50626bd 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -848,7 +848,8 @@ void ScDBData::RefreshTableColumnNames( ScDocument* pDoc, const ScRange& rRange // Always fully refresh, only one cell of a range was broadcasted per area // listener if multiple cells were affected. We don't know if there were - // more. + // more. Also, we need the full check anyway in case a duplicated name was + // entered. RefreshTableColumnNames( pDoc); } commit ca59efcff507d3f41aba7302e652cc5c0a28f2b9 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 12:17:15 2015 +0200 TableRef: add entire header range to dirty list on address notification Change-Id: I0a0fb83a1e72d73a517eabaa3c8dc1b2228848d1 diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index ea59ae8..ed92bcf 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -888,7 +888,21 @@ void ScDBData::Notify( const SfxHint& rHint ) { mbTableColumnNamesDirty = true; if (mpContainer) - mpContainer->GetDirtyTableColumnNames().Join( pScHint->GetAddress()); + { + // Only one cell of a range is broadcasted per area listener if + // multiple cells are affected. Expand the range to what this is + // listening to. Broadcasted address outside should not happen, + // but.. let it trigger a refresh if. + ScRange aHeaderRange( GetHeaderArea()); + if (aHeaderRange.IsValid()) + { + mpContainer->GetDirtyTableColumnNames().Join( aHeaderRange); + if (!aHeaderRange.In( pScHint->GetAddress())) + mpContainer->GetDirtyTableColumnNames().Join( pScHint->GetAddress()); + } + else + mpContainer->GetDirtyTableColumnNames().Join( pScHint->GetAddress()); + } } // Do not refresh column names here, which might trigger unwanted commit e74bc6b9a61dbc80caa6d2a8bfb79b3ac61c9899 Author: László Németh <laszlo.nem...@collabora.com> Date: Mon Sep 7 14:05:32 2015 +0200 tdf#92357 clear tab type switcher button of ruler before drawing the new icon Change-Id: Ibbdbed448f965848429ace28dcfae47efc982164 diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index de25ff6..d8a8faa 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2528,7 +2528,7 @@ void Ruler::SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle ) meExtraType = eNewExtraType; mnExtraStyle = nStyle; if (IsReallyVisible() && IsUpdateMode()) - Invalidate(InvalidateFlags::NoErase); + Invalidate(); } } commit 3adbb8d4d8d8b43a9f02e148a7b7a67234797f97 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Sep 7 13:12:37 2015 +0200 Fix harmless, historic mis-merge ...between 6037a79c3791e41578c384481acec48904951ae0 "cws tl82: #i74049# math symbols should be able to handle 20 bit Unicode characters (surrogates)" and a93c9517dc52b1d9c22a0e69f9d92c119983f7fe "Removes a fair amount of BOOL variables in starmath." Change-Id: Id146defb7231458b945629d4e4dcb7fc8de69f0e diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index e572bbb..417594c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2376,7 +2376,6 @@ bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) if (bApplyFont) { SetFont(pFonts->GetSelectEntry(), pStyles->GetText()); - bRet = true; pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() ); } bRet = true; @@ -2406,7 +2405,6 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) if (bApplyFont) { SetFont(pFonts->GetSelectEntry(), pStyles->GetText()); - bRet = true; pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() ); } bRet = true; commit 22bdebb622de39488221c9d7a1566f3810fb2f17 Author: Eike Rathke <er...@redhat.com> Date: Mon Sep 7 11:49:47 2015 +0200 let's follow our pseudo-hungarian notation Commit 6fb54d7bd3eb8efb2223c6a7250852fb6ad22b89 changed from pointer to reference but didn't adapt the variable name. Change-Id: If91c632d8fc41957ed3b542ed7bf19c376b56a82 diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 00b4db9..ea59ae8 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -654,9 +654,9 @@ void ScDBData::StartTableColumnNamesListener() { if (mpContainer && bHasHeader) { - ScDocument& pDoc = mpContainer->GetDocument(); - if (!pDoc.IsClipOrUndo()) - pDoc.StartListeningArea( GetHeaderArea(), false, this); + ScDocument& rDoc = mpContainer->GetDocument(); + if (!rDoc.IsClipOrUndo()) + rDoc.StartListeningArea( GetHeaderArea(), false, this); } } commit 4e0a5cf0f929ae5fef7eda8057202ac29a8f3a77 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Sun Sep 6 19:59:36 2015 +0900 svx: tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants. Change-Id: Id881385b2653da2ee89498afbd6453d40acaea83 Reviewed-on: https://gerrit.libreoffice.org/18358 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 934fd33..1c704ec 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -27,12 +27,12 @@ #include <rtl/ref.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svx/AccessibleShape.hxx> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> @@ -45,7 +45,7 @@ namespace accessibility class AccessibleTableShapeImpl; class AccessibleCell; - typedef ::cppu::ImplInheritanceHelper2< AccessibleShape, + typedef ::cppu::ImplInheritanceHelper< AccessibleShape, ::com::sun::star::accessibility::XAccessibleTable, ::com::sun::star::view::XSelectionChangeListener > AccessibleTableShape_Base; @@ -151,7 +151,7 @@ private: sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const; }; -typedef ::cppu::WeakImplHelper5< +typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleComponent, ::com::sun::star::accessibility::XAccessibleContext, diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index fb6c528..886c285 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -260,13 +260,13 @@ #include <config_features.h> #include <config_folders.h> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase6.hxx> #include <cppuhelper/component_context.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase7.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index febf7c0..99fa0de 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -452,13 +452,12 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 8aa95e1..64c4718 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <cppuhelper/implbase1.hxx> #include <cppuhelper/weak.hxx> #include <svtools/toolboxcontroller.hxx> #include <vcl/button.hxx> diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 4cea26f..151cb5a 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -58,7 +58,7 @@ ChildrenManagerImpl::ChildrenManagerImpl ( const uno::Reference<drawing::XShapes>& rxShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext) - : ::cppu::WeakComponentImplHelper2< + : ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XEventListener, ::com::sun::star::view::XSelectionChangeListener>(maMutex), mxShapeList (rxShapeList), diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index d793596..ccacc2d 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -24,7 +24,7 @@ #include <svx/IAccessibleParent.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> #include <editeng/AccessibleContextBase.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> #include <vector> #include <com/sun/star/drawing/XShape.hpp> @@ -73,7 +73,7 @@ typedef ::std::vector<ChildDescriptor> ChildDescriptorListType; */ class ChildrenManagerImpl : public MutexOwner, - public cppu::WeakComponentImplHelper2< + public cppu::WeakComponentImplHelper< ::com::sun::star::document::XEventListener, ::com::sun::star::view::XSelectionChangeListener>, public IAccessibleViewForwarderListener, diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index c78641f..8d766c7 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -51,7 +51,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> #include <com/sun/star/document/XActionLockable.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> using namespace css; @@ -62,7 +62,7 @@ class SdrObjCustomShape; namespace { -class EnhancedCustomShapeEngine : public cppu::WeakImplHelper3 +class EnhancedCustomShapeEngine : public cppu::WeakImplHelper < css::lang::XInitialization, css::lang::XServiceInfo, diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index 3a23906..37ad46d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX #include <com/sun/star/uno/RuntimeException.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -29,7 +29,7 @@ #include <com/sun/star/awt/Point.hpp> #include <cppuhelper/weakref.hxx> -class EnhancedCustomShapeHandle : public cppu::WeakImplHelper2 +class EnhancedCustomShapeHandle : public cppu::WeakImplHelper < com::sun::star::drawing::XCustomShapeHandle, com::sun::star::lang::XInitialization diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 6c416d8..f640161 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <svtools/colorcfg.hxx> #include <vcl/layout.hxx> #include <vcl/settings.hxx> @@ -83,7 +83,7 @@ SfxChildWinInfo SvxRubyChildWindow::GetInfo() const return SfxChildWindow::GetInfo(); } -class SvxRubyData_Impl : public cppu::WeakImplHelper1<css::view::XSelectionChangeListener> +class SvxRubyData_Impl : public cppu::WeakImplHelper<css::view::XSelectionChangeListener> { Reference<XModel> xModel; Reference<XRubySelection> xSelection; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 70ea9e9..c00f259 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -55,6 +55,7 @@ #include "sdbdatacolumn.hxx" #include <comphelper/property.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/scoped_ptr.hpp> @@ -87,7 +88,7 @@ using namespace com::sun::star::accessibility; | BrowserMode::VLINES \ | BrowserMode::HEADERBAR_NEW \ -class RowSetEventListener : public ::cppu::WeakImplHelper1<XRowsChangeListener> +class RowSetEventListener : public ::cppu::WeakImplHelper<XRowsChangeListener> { VclPtr<DbGridControl> m_pControl; public: diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index b9fcbb2..ea1d6a0 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -39,7 +39,7 @@ #include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlnode.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <fmservs.hxx> #include <fmshimp.hxx> #include <sfx2/dispatch.hxx> @@ -281,7 +281,7 @@ public: // class FmFilterAdapter, Listener an den FilterControls -class FmFilterAdapter : public ::cppu::WeakImplHelper1< XFilterControllerListener > +class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener > { FmFilterModel* m_pModel; Reference< XIndexAccess > m_xControllers; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 3c7690c..fbc8b84 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/awt/XControl.hpp> #include <tools/diagnose_ex.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -75,7 +75,7 @@ namespace svxform //= FormScriptListener - typedef ::cppu::WeakImplHelper1 < XScriptListener + typedef ::cppu::WeakImplHelper < XScriptListener > FormScriptListener_Base; /** implements the XScriptListener interface, is used by FormScriptingEnvironment diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e90f74b..affd7bf 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -160,7 +160,7 @@ namespace svx 0 }; - typedef ::cppu::WeakImplHelper1 < XFocusListener + typedef ::cppu::WeakImplHelper < XFocusListener > FmFocusListenerAdapter_Base; class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base { @@ -246,7 +246,7 @@ namespace svx m_xWindow.clear(); } - typedef ::cppu::WeakImplHelper1 < XMouseListener + typedef ::cppu::WeakImplHelper < XMouseListener > FmMouseListenerAdapter_Base; class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base { diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 35d4538..ae9d251 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -73,9 +73,9 @@ using namespace ::dbtools; #include <com/sun/star/script/XScriptListener.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -class ScriptEventListenerWrapper : public cppu::WeakImplHelper1< XScriptListener > +class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener > { public: explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 2edb900..385da67 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> @@ -58,7 +58,7 @@ namespace svxform //= LegacyFormController - typedef ::cppu::WeakImplHelper2 < form::XFormController + typedef ::cppu::WeakImplHelper < form::XFormController , XServiceInfo > LegacyFormController_Base; /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 2f4fcf5..857e0b1 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -58,6 +58,7 @@ #include <com/sun/star/style/GraphicLocation.hpp> #include <map> #include <boost/scoped_ptr.hpp> +#include <cppuhelper/implbase.hxx> #undef GALLERY_USE_CLIPBOARD @@ -105,7 +106,7 @@ struct CommandInfo } }; -class GalleryThemePopup : public ::cppu::WeakImplHelper1< css::frame::XStatusListener > +class GalleryThemePopup : public ::cppu::WeakImplHelper< css::frame::XStatusListener > { private: const GalleryTheme* mpTheme; diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 09bc230..3c20eec 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -30,7 +30,7 @@ #include <tools/link.hxx> #include <tools/resary.hxx> #include <tools/rc.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <svx/framebordertype.hxx> @@ -48,7 +48,7 @@ namespace a11y { class AccFrameSelector : - public ::cppu::WeakImplHelper5< + public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index e6ceeb2..9804a18 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX #define INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/xml/dom/events/XEventListener.hpp> @@ -32,7 +32,7 @@ namespace svxform class DataNavigatorWindow; - typedef cppu::WeakImplHelper3< + typedef cppu::WeakImplHelper< com::sun::star::container::XContainerListener, com::sun::star::frame::XFrameActionListener, com::sun::star::xml::dom::events::XEventListener > DataListener_t; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 1cd3ba4..71f5b68 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -31,8 +31,7 @@ #include <svtools/svmedit2.hxx> #include <svtools/treelistbox.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/task/StatusIndicatorFactory.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -184,7 +183,7 @@ class IRecoveryUpdateListener }; -class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener > +class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener > { // types, const @@ -309,7 +308,7 @@ class PluginProgressWindow : public vcl::Window virtual void dispose() SAL_OVERRIDE; }; -class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator , +class PluginProgress : public ::cppu::WeakImplHelper< css::task::XStatusIndicator , css::lang::XComponent > { // member diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 12db53d..ec65af0 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -51,6 +51,7 @@ #include "fmexch.hxx" #include <vector> #include <set> +#include <cppuhelper/implbase.hxx> class SdrObjListIter; class FmFormShell; @@ -296,7 +297,7 @@ namespace svxform class NavigatorTreeModel; class OFormComponentObserver - :public ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener + :public ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener > { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 082633e..d2045a5 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -52,8 +52,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/component.hxx> #include <comphelper/container.hxx> -#include <cppuhelper/compbase4.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <unotools/configitem.hxx> #include "formcontrolling.hxx" #include "fmdocumentclassification.hxx" @@ -122,7 +121,7 @@ struct FmLoadAction class SfxViewFrame; -typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::beans::XPropertyChangeListener +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::view::XSelectionChangeListener , ::com::sun::star::form::XFormControllerListener diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index 33e1641..fa2a18e 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/util/URL.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "fmslotinvalidator.hxx" namespace svx { - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XStatusListener + typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener > FmTextControlFeature_Base; class FmTextControlFeature : public FmTextControlFeature_Base diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 7c6e1af..c5a9115 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/ContainerEvent.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> @@ -121,7 +121,7 @@ public: class SVX_DLLPRIVATE FmXUndoEnvironment - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::util::XModifyListener > diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index a713c6e..984a763 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -41,8 +41,7 @@ #include <comphelper/stl_types.hxx> #include <tools/link.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <rtl/ref.hxx> #include <vcl/vclptr.hxx> @@ -82,7 +81,7 @@ namespace svx { // FormViewPageWindowAdapter -typedef ::cppu::WeakImplHelper2 < ::com::sun::star::container::XIndexAccess +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XIndexAccess , ::com::sun::star::form::runtime::XFormControllerContext > FormViewPageWindowAdapter_Base; @@ -139,7 +138,7 @@ typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::awt: > MapControlContainerToSetOfForms; class SdrModel; -class FmXFormView : public ::cppu::WeakImplHelper3< +class FmXFormView : public ::cppu::WeakImplHelper< ::com::sun::star::form::XFormControllerListener, ::com::sun::star::awt::XFocusListener, ::com::sun::star::container::XContainerListener> diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index dc90e72..f3b1f7d 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/form/runtime/XFormOperations.hpp> #include <com/sun/star/sdb/XSQLErrorListener.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> @@ -125,7 +125,7 @@ namespace svx //= FormControllerHelper - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::form::runtime::XFeatureInvalidation + typedef ::cppu::WeakImplHelper < ::com::sun::star::form::runtime::XFeatureInvalidation , ::com::sun::star::sdb::XSQLErrorListener > FormControllerHelper_Base; /** is a helper class which manages form controller functionality (such as moveNext etc.). diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index c6b3c08..65be521 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> @@ -47,7 +47,7 @@ namespace svxform //= - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::frame::XDispatchProviderInterceptor + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor , ::com::sun::star::lang::XEventListener > DispatchInterceptionMultiplexer_BASE; diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 8c860e4..a040bb7 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -24,14 +24,14 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/form/runtime/XFormOperations.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> namespace svx { - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XDispatch > OSingleFeatureDispatcher_Base; class OSingleFeatureDispatcher : public OSingleFeatureDispatcher_Base diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index c67ad53..6160782 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -37,10 +37,8 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/compbase6.hxx> -#include <cppuhelper/compbase7.hxx> #include <cppuhelper/compbase5.hxx> #include <comphelper/broadcasthelper.hxx> -#include <cppuhelper/implbase6.hxx> #include <comphelper/servicehelper.hxx> #include <svx/rectenum.hxx> diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 6f9407d..f22fe12e 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -42,8 +42,6 @@ #include <cppuhelper/compbase6.hxx> #include <cppuhelper/compbase7.hxx> #include <comphelper/broadcasthelper.hxx> -#include <cppuhelper/implbase6.hxx> -#include <cppuhelper/implbase7.hxx> #include <comphelper/servicehelper.hxx> #include <svx/rectenum.hxx> #include <vcl/vclptr.hxx> diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index 3ef6205..254572f 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX #define INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/gallery/XGalleryThemeProvider.hpp> @@ -29,7 +29,7 @@ class Gallery; namespace { -class GalleryThemeProvider : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XInitialization, +class GalleryThemeProvider : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XInitialization, ::com::sun::star::gallery::XGalleryThemeProvider, ::com::sun::star::lang::XServiceInfo > { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 8479eeb..9f00a32 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -49,7 +49,7 @@ #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/scopeguard.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -494,7 +494,7 @@ namespace sdr { namespace contact { //= ViewObjectContactOfUnoControl_Impl - typedef ::cppu::WeakImplHelper4 < XWindowListener + typedef ::cppu::WeakImplHelper < XWindowListener , XPropertyChangeListener , XContainerListener , XModeChangeListener diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index 590759b..df89146 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -32,7 +32,6 @@ #include <framework/sfxhelperfunctions.hxx> #include <framework/imageproducer.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/frame/XStatusListener.hpp> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 83f24b3..f9d2811 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -60,7 +60,7 @@ #include <sot/formats.hxx> #include <sfx2/linkmgr.hxx> #include <svtools/transfer.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/solar.hrc> #include <svl/urihelper.hxx> @@ -102,7 +102,7 @@ static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Ob return xFrame; } -class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper5 +class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper < embed::XStateChangeListener , document::XEventListener , embed::XInplaceClient diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index e7ce02a..b3d227b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -62,10 +62,10 @@ using namespace sdr::contact; #include <com/sun/star/lang/XEventListener.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > +class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener > { protected: SdrUnoObj* pObj; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index dca0e54..b7497fc 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -34,7 +34,7 @@ #include <svx/AccessibleShapeTreeInfo.hxx> #include <AccessibleTableShape.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "cell.hxx" @@ -46,7 +46,7 @@ namespace accessibility class AccessibleShapeTreeInfo; -typedef ::cppu::ImplInheritanceHelper1< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase; +typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase; class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public AccessibleComponentBase, public IAccessibleViewForwarderListener { diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 8524cf6..f683878 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -32,7 +32,7 @@ #include <algorithm> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <svx/svdotable.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> @@ -61,7 +61,7 @@ struct hash typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; -class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener > +class AccessibleTableShapeImpl : public cppu::WeakImplHelper< XModifyListener > { public: explicit AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo ); diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index dc0b5e4..8760a17 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/table/XMergeableCellRange.hpp> #include <com/sun/star/table/XCellCursor.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include "cellrange.hxx" @@ -31,7 +31,7 @@ namespace sdr { namespace table { struct CellPos; -typedef ::cppu::ImplInheritanceHelper2< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase; +typedef ::cppu::ImplInheritanceHelper< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase; class CellCursor : public CellCursorBase { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index edf53c8..2cbdc10 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -56,7 +56,7 @@ #include "svx/xflhtit.hxx" #include "svx/xflftrit.hxx" #include "svx/xfltrit.hxx" - +#include <cppuhelper/implbase.hxx> using ::com::sun::star::uno::Any; @@ -195,7 +195,7 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const -class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener > +class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener > { public: CellRef mxActiveCell; diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 580f191..8b7599c 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include "propertyset.hxx" #include "tablemodel.hxx" @@ -31,7 +31,7 @@ namespace sdr { namespace table { -typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase; +typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase; class TableColumn : public TableColumnBase { diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 1c4cfcd..149d0db 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -70,6 +70,7 @@ #include <memory> #include <o3tl/enumarray.hxx> #include <o3tl/enumrange.hxx> +#include <cppuhelper/implbase.hxx> using ::editeng::SvxBorderLine; using namespace sdr::table; @@ -83,7 +84,7 @@ using namespace ::com::sun::star::style; namespace sdr { namespace table { -class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener > +class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener > { public: explicit SvxTableControllerModifyListener( SvxTableController* pController ) diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 6480c72..8e18495 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -32,8 +32,8 @@ #include <vcl/svapp.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase6.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> @@ -66,7 +66,7 @@ namespace sdr { namespace table { typedef std::map< OUString, sal_Int32 > CellStyleNameMap; -typedef ::cppu::WeakComponentImplHelper6< XStyle, XNameReplace, XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase; +typedef ::cppu::WeakComponentImplHelper< XStyle, XNameReplace, XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase; class TableDesignStyle : private ::cppu::BaseMutex, public TableDesignStyleBase { @@ -125,7 +125,7 @@ public: typedef std::vector< Reference< XStyle > > TableDesignStyleVector; -class TableDesignFamily : public ::cppu::WeakImplHelper7< XNameContainer, XNamed, XIndexAccess, XSingleServiceFactory, XServiceInfo, XComponent, XPropertySet > +class TableDesignFamily : public ::cppu::WeakImplHelper< XNameContainer, XNamed, XIndexAccess, XSingleServiceFactory, XServiceInfo, XComponent, XPropertySet > { public: // XServiceInfo diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 80fc4ce..a398564 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/table/XTable.hpp> #include <basegfx/range/b2irectangle.hxx> #include <basegfx/tuple/b2ituple.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/listenernotification.hxx> #include "celltypes.hxx" @@ -50,7 +50,7 @@ protected: ~ICellRange() {} }; -typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase; +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase; class TableModel : public ::comphelper::OBaseMutex, public TableModelBase, diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 4619886..f0b742b 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include "propertyset.hxx" #include "tablemodel.hxx" @@ -31,7 +31,7 @@ namespace sdr { namespace table { -typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase; +typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase; class TableRow : public TableRowBase { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 5f0cbdc..2dc0e30 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> @@ -59,7 +59,7 @@ The dialog gets this information from the registry on execute and writes it back class ChineseTranslationDialog; -class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper5 < +class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper < ::com::sun::star::ui::dialogs::XExecutableDialog , ::com::sun::star::lang::XInitialization , ::com::sun::star::beans::XPropertySet diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 52ccf49..f77c801 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -38,7 +38,7 @@ #include <framework/interaction.hxx> #include <com/sun/star/drawing/GraphicFilterRequest.hpp> #include <com/sun/star/util/URL.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <vcl/metaact.hxx> @@ -138,7 +138,7 @@ namespace { @implements com.sun.star.drawing.GraphicExportFilter */ - class GraphicExporter : public WeakImplHelper2< XGraphicExportFilter, XServiceInfo > + class GraphicExporter : public WeakImplHelper< XGraphicExportFilter, XServiceInfo > { public: GraphicExporter(); diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index ff97a04..11ec991 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> #include <svl/lstner.hxx> @@ -36,7 +36,7 @@ class SfxItemPool; class SfxItemSet; typedef std::vector< SfxItemSet* > ItemPoolVector; -class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::container::XNameContainer, com::sun::star::lang::XServiceInfo >, +class SvxUnoNameItemTable : public cppu::WeakImplHelper< com::sun::star::container::XNameContainer, com::sun::star::lang::XServiceInfo >, public SfxListener { private: diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index f8f0d41..2da6f86 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> @@ -46,7 +46,7 @@ namespace svx /** implements a component to export namespaces of all SvXMLAttrContainerItem inside one or two pools with a variable count of which ids. */ - class NamespaceMap : public WeakImplHelper2< XNameAccess, XServiceInfo > + class NamespaceMap : public WeakImplHelper< XNameAccess, XServiceInfo > { private: sal_uInt16* mpWhichIds; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index cda985d..2cf5597 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -28,7 +28,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/xdef.hxx> @@ -40,7 +40,7 @@ using namespace com::sun::star; using namespace ::cppu; -class SvxUnoXPropertyTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo > +class SvxUnoXPropertyTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo > { private: XPropertyList* mpList; diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index f2c156b..c10eab8 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/drawing/GluePoint2.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> @@ -35,7 +35,7 @@ using namespace ::cppu; const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4; -class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer > +class SvxUnoGluePointAccess : public WeakImplHelper< container::XIndexContainer, container::XIdentifierContainer > { private: SdrObjectWeakRef mpObject; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index b7a702c..7993b93 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <rtl/ref.hxx> @@ -44,7 +44,7 @@ using namespace ::osl; namespace { -class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , +class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo , css::frame::XSynchronousDispatch > // => XDispatch! { diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 5a4136d..5acf6ba 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <svx/xtable.hxx> @@ -30,7 +30,7 @@ using namespace ::com::sun::star; namespace { -class SvxUnoColorTable : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo > +class SvxUnoColorTable : public cppu::WeakImplHelper< container::XNameContainer, lang::XServiceInfo > { private: XColorListRef pList; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 38ecbac..6b6ac20 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -28,7 +28,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svx/unofill.hxx> #include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> @@ -66,7 +66,7 @@ using namespace ::com::sun::star; //- -class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo > +class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo > { private: SvxUnoDrawingModel& mrModel; diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index d12392b..456c361 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/drawing/PointSequence.hpp> #include <svl/style.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> @@ -49,7 +49,7 @@ using namespace ::cppu; typedef std::vector< SfxItemSet* > ItemPoolVector; -class SvxUnoMarkerTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >, +class SvxUnoMarkerTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo >, public SfxListener { private: diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index f09222c..de6bb82 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -22,7 +22,7 @@ #include <list> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/gallery/XGalleryTheme.hpp> @@ -38,7 +38,7 @@ namespace unogallery { // - GalleryTheme - -class GalleryTheme : public ::cppu::WeakImplHelper2< +class GalleryTheme : public ::cppu::WeakImplHelper< ::com::sun::star::gallery::XGalleryTheme, ::com::sun::star::lang::XServiceInfo >, public SfxListener diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 3d69924..b3a726d 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -43,6 +43,7 @@ #include <comphelper/embeddedobjectcontainer.hxx> #include <comphelper/classids.hxx> +#include <cppuhelper/implbase.hxx> #include <map> #include "svx/xmleohlp.hxx" #include <boost/scoped_ptr.hpp> @@ -64,7 +65,7 @@ using namespace ::com::sun::star::lang; -class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream> +class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream> { ::osl::Mutex maMutex; Reference < XOutputStream > xOut; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 74573fb..9268b9d 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -28,7 +28,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> @@ -73,7 +74,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) } class SvXMLGraphicInputStream: - public cppu::WeakImplHelper1<XInputStream>, private boost::noncopyable + public cppu::WeakImplHelper<XInputStream>, private boost::noncopyable { private: @@ -199,7 +200,7 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException } class SvXMLGraphicOutputStream: - public cppu::WeakImplHelper1<XOutputStream>, private boost::noncopyable + public cppu::WeakImplHelper<XOutputStream>, private boost::noncopyable { private: @@ -895,7 +896,7 @@ namespace { namespace impl { -typedef ::cppu::WeakComponentImplHelper4< +typedef ::cppu::WeakComponentImplHelper< lang::XInitialization, document::XGraphicObjectResolver, document::XBinaryStreamResolver, commit 7884205f64a962b586a553fd094abc46a3c1562e Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 09:59:39 2015 +0100 WaE: -Werror, -Wunused-private-field Change-Id: I63cfbe32b165b33e986641f9c6270994ddaa6480 diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index bb7ca44..ee8d6e3 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -36,7 +36,6 @@ ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId) - , nDeltaX(0) , nDeltaY(0) { Point aPos=GetPosPixel(); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index fb2edaa..a10c162 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -35,7 +35,6 @@ private: short nNewY; Range aXMovingRange; Range aYMovingRange; - short nDeltaX; short nDeltaY; using Control::ImplInitSettings; commit 267f401e2ad6e0094de39032671a3191772276ed Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 09:33:18 2015 +0100 cppcheck: noExplicitConstructor Change-Id: I2a1add8cf526cdb305ad99ccb138454a88f2fdbd diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index b965e59..aabf48e 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -39,8 +39,8 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, { public: - Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); - virtual ~Window(); + explicit Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); + virtual ~Window(); // XPlayerWindow virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 294bcc5..39f8185 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -207,7 +207,7 @@ GraphicObject getXBitmapFromName(css::uno::Reference<css::frame::XModel> xModel, class PreventUpdate { public: - PreventUpdate(bool& bUpdate): + explicit PreventUpdate(bool& bUpdate): mbUpdate(bUpdate) { mbUpdate = false; diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 55753bd..ccde794 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -93,7 +93,7 @@ css::uno::Any getLineDash( class PreventUpdate { public: - PreventUpdate(bool& bUpdate): + explicit PreventUpdate(bool& bUpdate): mbUpdate(bUpdate) { mbUpdate = false; diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx index 5db469e..d1534f0 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx @@ -30,7 +30,7 @@ class ChartSidebarModifyListener : public cppu::WeakImplHelper1<css::util::XModi { public: - ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); + explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); virtual ~ChartSidebarModifyListener(); virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 3c31644..c4c78ce 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -35,7 +35,7 @@ class ChartSidebarSelectionListener : public cppu::WeakImplHelper1<css::view::XS public: // listen to all chart selection changes - ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); + explicit ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); // only liste to the changes of eType ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType); virtual ~ChartSidebarSelectionListener(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 31e71c5..6876f32 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -66,7 +66,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OPreviewWindow(vcl::Window* _pParent); + explicit OPreviewWindow(vcl::Window* _pParent); // Window overrides virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 193c35d..e57be72 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -82,7 +82,7 @@ class AddTableDialogContext : public IAddTableDialogContext OJoinController& m_rController; public: - AddTableDialogContext( OJoinController& _rController ) + explicit AddTableDialogContext( OJoinController& _rController ) :m_rController( _rController ) { } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index aa6b89e..97e3696 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -33,7 +33,7 @@ class ODBTypeWizDialogSetup bool m_bStartTableWizard; protected: - ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 5901a8c..95a9594 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -31,7 +31,7 @@ class OTableFilterDialog { protected: - OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 6ecaa14..f6003a7 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -31,7 +31,7 @@ class OUserSettingsDialog { protected: - OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index e511940..68b8b8f 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -31,7 +31,7 @@ class ODataSourcePropertyDialog { protected: - ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index df98196..ec437fd 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -51,7 +51,7 @@ namespace dbaui // </properties> protected: - ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ComposerDialog(); public: @@ -77,7 +77,7 @@ namespace dbaui class RowsetFilterDialog : public ComposerDialog { public: - RowsetFilterDialog( + explicit RowsetFilterDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); @@ -102,7 +102,7 @@ namespace dbaui class RowsetOrderDialog : public ComposerDialog { public: - RowsetOrderDialog( + explicit RowsetOrderDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 05e5a2d..6428fbe 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -189,7 +189,7 @@ namespace dbaui bool isInitialized() const { return m_xSourceConnection.is() && m_pSourceObject.get() && m_xDestConnection.is(); } protected: - CopyTableWizard( const Reference< XComponentContext >& _rxORB ); + explicit CopyTableWizard( const Reference< XComponentContext >& _rxORB ); virtual ~CopyTableWizard(); // OGenericUnoDialog overridables @@ -355,7 +355,7 @@ private: class CopyTableAccessGuard { public: - CopyTableAccessGuard( CopyTableWizard& _rWizard ) + explicit CopyTableAccessGuard( CopyTableWizard& _rWizard ) :m_rWizard( _rWizard ) { m_rWizard.getMutex().acquire(); diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 4c5e9c3..68485db 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -125,7 +125,7 @@ namespace dbaui class SQLExceptionInteractionHandler : public BasicInteractionHandler { public: - SQLExceptionInteractionHandler( + explicit SQLExceptionInteractionHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, false ) @@ -153,7 +153,7 @@ namespace dbaui class LegacyInteractionHandler : public BasicInteractionHandler { public: - LegacyInteractionHandler( + explicit LegacyInteractionHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, true ) diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index f9c1c36..cd1e722 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -70,7 +70,7 @@ namespace dbaui PropertyValues m_aPropertyValues; protected: - OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext ); + explicit OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext ); virtual ~OTextConnectionSettingsDialog(); public: diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 1c5ff4e..f3b92fc 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -44,7 +44,7 @@ namespace dbaui OUString m_sInitialSelection; css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: - ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ODirectSQLDialog(); public: diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 0c31758..cc7e68d 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -28,7 +28,7 @@ namespace desktop class DesktopContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext > { public: - DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); + explicit DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index c329e7a..add9376 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -45,7 +45,7 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign // that was given by command line or by IPC pipe communication. struct ProcessDocumentsRequest { - ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): + explicit ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): aCwdUrl(cwdUrl), pcProcessed( NULL ), bTextCat( false ) {} boost::optional< OUString > aCwdUrl; diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 3d5fe22..0d914fa 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer { } - ImpMaterialAttribute3D(const basegfx::BColor& rColor) + explicit ImpMaterialAttribute3D(const basegfx::BColor& rColor) : maColor(rColor), maSpecular(1.0, 1.0, 1.0), maEmission(), diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx index e47750e..7d17c9a 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx @@ -34,11 +34,9 @@ class EnhancedShapeDumper { public: - EnhancedShapeDumper(xmlTextWriterPtr writer) - : - xmlWriter(writer) + explicit EnhancedShapeDumper(xmlTextWriterPtr writer) + : xmlWriter(writer) { - } // auxiliary functions diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 843ba43..f8484ef 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -53,7 +53,7 @@ namespace sal_uInt32 generateStepTime(sal_uInt32 nIndex) const; public: - animatedBitmapExPreparator(const Graphic& rGraphic); + explicit animatedBitmapExPreparator(const Graphic& rGraphic); sal_uInt32 count() const { return maSteps.size(); } sal_uInt32 loopCount() const { return (sal_uInt32)maAnimation.GetLoopCount(); } diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 8d5fcf70..bc128b5 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -347,7 +347,7 @@ namespace { class UrlEditEngine : public EditEngine { public: - UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {} + explicit UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {} virtual OUString CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_Int32, Color*&, Color*& ) SAL_OVERRIDE { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 87886f4..0dc65b2 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -896,7 +896,7 @@ namespace accessibility struct IndexCompare { const PropertyValue* pValues; - IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {} + explicit IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {} bool operator() ( const sal_Int32& a, const sal_Int32& b ) const { return pValues[a].Name < pValues[b].Name; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 3f1e342..4336014 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -470,7 +470,7 @@ class FindTextPortionByAddress : std::unary_function<TextPortion, bool> { const TextPortion* mp; public: - FindTextPortionByAddress(const TextPortion* p) : mp(p) {} + explicit FindTextPortionByAddress(const TextPortion* p) : mp(p) {} bool operator() (const TextPortion& v) const { return &v == mp; @@ -1991,7 +1991,7 @@ class RemoveEachItemFromPool : std::unary_function<ContentNode, void> { EditDoc& mrDoc; public: - RemoveEachItemFromPool(EditDoc& rDoc) : mrDoc(rDoc) {} + explicit RemoveEachItemFromPool(EditDoc& rDoc) : mrDoc(rDoc) {} void operator() (const ContentNode& rNode) { mrDoc.RemoveItemsFromPool(rNode); @@ -2896,7 +2896,7 @@ class FindByAddress : std::unary_function<EditCharAttrib, bool> { const EditCharAttrib* mpAttr; public: - FindByAddress(const EditCharAttrib* p) : mpAttr(p) {} + explicit FindByAddress(const EditCharAttrib* p) : mpAttr(p) {} bool operator() (const EditCharAttrib& r) const { return &r == mpAttr; @@ -2985,7 +2985,7 @@ class FindByStartPos : std::unary_function<EditCharAttrib, bool> { sal_Int32 mnPos; public: - FindByStartPos(sal_Int32 nPos) : mnPos(nPos) {} + explicit FindByStartPos(sal_Int32 nPos) : mnPos(nPos) {} bool operator() (const EditCharAttrib& r) const { return r.GetStart() >= mnPos; @@ -3015,7 +3015,7 @@ class RemoveEmptyAttrItem : std::unary_function<EditCharAttrib, void> { SfxItemPool& mrItemPool; public: - RemoveEmptyAttrItem(SfxItemPool& rPool) : mrItemPool(rPool) {} + explicit RemoveEmptyAttrItem(SfxItemPool& rPool) : mrItemPool(rPool) {} void operator() (const EditCharAttrib& r) { if (r.IsEmpty()) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index c9cce3d..d964545 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -877,7 +877,7 @@ class FindByParagraph : std::unary_function<editeng::Section, bool> { sal_Int32 mnPara; public: - FindByParagraph(sal_Int32 nPara) : mnPara(nPara) {} + explicit FindByParagraph(sal_Int32 nPara) : mnPara(nPara) {} bool operator() (const editeng::Section& rAttr) const { return rAttr.mnParagraph == mnPara; diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 523f8c6..597f60c 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -505,7 +505,7 @@ struct RemoveAttribsFromPool : std::unary_function<ContentAttribsInfo, void> { SfxItemPool& mrPool; public: - RemoveAttribsFromPool(SfxItemPool& rPool) : mrPool(rPool) {} + explicit RemoveAttribsFromPool(SfxItemPool& rPool) : mrPool(rPool) {} void operator() (ContentAttribsInfo& rInfo) { rInfo.RemoveAllCharAttribsFromPool(mrPool); diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx index 1f90fc5..80a35e9 100644 --- a/editeng/source/editeng/fieldupdater.cxx +++ b/editeng/source/editeng/fieldupdater.cxx @@ -22,7 +22,7 @@ class FieldUpdaterImpl { EditTextObjectImpl& mrObj; public: - FieldUpdaterImpl(EditTextObject& rObj) : mrObj(*rObj.mpImpl) {} + explicit FieldUpdaterImpl(EditTextObject& rObj) : mrObj(*rObj.mpImpl) {} FieldUpdaterImpl(const FieldUpdaterImpl& r) : mrObj(r.mrObj) {} void updateTableFields(int nTab) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 8269dae..a78b6c5 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1731,8 +1731,10 @@ namespace { struct FindByPos { - FindByPos(sal_Int32 nPos): - mnPos(nPos) {} + explicit FindByPos(sal_Int32 nPos) + : mnPos(nPos) + { + } bool operator()(const ScriptTypePosInfos::value_type& rValue) { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 20fee5d..3ee4bb0 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3317,7 +3317,7 @@ public: //copied to the GraphicObject when necessary SvStream* pStream; - SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} + explicit SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} }; diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx index 43e84b8..e148318 100644 --- a/editeng/source/lookuptree/Trie.cxx +++ b/editeng/source/lookuptree/Trie.cxx @@ -26,7 +26,7 @@ struct TrieNode TrieNode* mLatinArray[LATIN_ARRAY_SIZE]; - TrieNode(sal_Unicode aCharacter = '\0'); + explicit TrieNode(sal_Unicode aCharacter = '\0'); virtual ~TrieNode(); void markWord(); diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index bc5f12f..259851f 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -28,7 +28,7 @@ class SvxEditEngineSourceImpl; class SvxEditEngineSource : public SvxEditSource { public: - SvxEditEngineSource( EditEngine* pEditEngine ); + explicit SvxEditEngineSource( EditEngine* pEditEngine ); virtual ~SvxEditEngineSource(); virtual SvxEditSource* Clone() const SAL_OVERRIDE; @@ -36,7 +36,7 @@ public: virtual void UpdateData() SAL_OVERRIDE; private: - SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); + explicit SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); SvxEditEngineSourceImpl* mpImpl; }; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 5d575a1..4efcc46 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -57,12 +57,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; using namespace cppu; - - class SvxEditEngineSourceImpl; - - class SvxEditEngineSourceImpl { private: @@ -74,7 +70,7 @@ private: ~SvxEditEngineSourceImpl(); public: - SvxEditEngineSourceImpl( EditEngine* pEditEngine ); + explicit SvxEditEngineSourceImpl( EditEngine* pEditEngine ); void SAL_CALL acquire(); void SAL_CALL release(); @@ -82,11 +78,6 @@ public: SvxTextForwarder* GetTextForwarder(); }; - - - - - SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) : maRefCount(0), mpEditEngine( pEditEngine ), @@ -94,30 +85,22 @@ SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) { } - - SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl() { delete mpTextForwarder; } - - void SAL_CALL SvxEditEngineSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } - - void SAL_CALL SvxEditEngineSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) delete this; } - - SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() { if (!mpTextForwarder) @@ -126,40 +109,29 @@ SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() return mpTextForwarder; } - // SvxTextEditSource - - SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine ) { mpImpl = new SvxEditEngineSourceImpl( pEditEngine ); mpImpl->acquire(); } - - SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ) { mpImpl = pImpl; mpImpl->acquire(); } - - SvxEditEngineSource::~SvxEditEngineSource() { mpImpl->release(); } - - SvxEditSource* SvxEditEngineSource::Clone() const { return new SvxEditEngineSource( mpImpl ); } - - SvxTextForwarder* SvxEditEngineSource::GetTextForwarder() { return mpImpl->GetTextForwarder(); commit b0f3024304bf4e7d9efcb539a49394945f052a51 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 09:12:55 2015 +0100 cppcheck: noExplicitCopyMoveConstructor Change-Id: I8718ddd144bec48541e6412a8c9feb74d9391ecc diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx index 0a90463..a42b769 100644 --- a/configmgr/source/node.hxx +++ b/configmgr/source/node.hxx @@ -55,7 +55,7 @@ public: protected: explicit Node(int layer); - Node(const Node & other); + explicit Node(const Node & other); virtual ~Node(); diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx index 0b6e9c6..ec59247 100644 --- a/lotuswordpro/source/filter/lwpoverride.hxx +++ b/lotuswordpro/source/filter/lwpoverride.hxx @@ -91,7 +91,7 @@ public: void Override(sal_uInt16 nBits, STATE eState); protected: - LwpOverride(LwpOverride const& rOther); + explicit LwpOverride(LwpOverride const& rOther); private: LwpOverride& operator=(LwpOverride const& rOther) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 0f960e2..b63b307 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -202,7 +202,7 @@ protected: Implementation ( sd::Window *pWindow, const ::boost::shared_ptr<view::Theme>& rpTheme); - Implementation (const Implementation& rImplementation); + explicit Implementation (const Implementation& rImplementation); virtual void CalculateRowAndColumnCount (const Size& rWindowSize) = 0; virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) = 0; @@ -225,7 +225,7 @@ protected: class VerticalImplementation : public Layouter::Implementation { public: - VerticalImplementation (const Implementation& rImplementation); + explicit VerticalImplementation (const Implementation& rImplementation); virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; @@ -247,7 +247,7 @@ protected: class HorizontalImplementation : public Layouter::Implementation { public: - HorizontalImplementation (const Implementation& rImplementation); + explicit HorizontalImplementation(const Implementation& rImplementation); virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; @@ -273,7 +273,7 @@ public: GridImplementation ( sd::Window *pWindow, const ::boost::shared_ptr<view::Theme>& rpTheme); - GridImplementation (const Implementation& rImplementation); + explicit GridImplementation(const Implementation& rImplementation); virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; commit 7ac8939cc8e7599cca3de27c8f8dc9fd9f2e2185 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 09:12:00 2015 +0100 cppcheck: operatorEqVarError Change-Id: Ie27c7c5d1b0c87a0e440cf57db436c7c46d46788 diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index 701d057..78c80db 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -143,6 +143,8 @@ XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other) m_nFlag = other.m_nFlag; m_eAlignType = other.m_eAlignType; m_eLastLineAlign = other.m_eLastLineAlign; + m_bJustSingleWord = other.m_bJustSingleWord; + m_bKeepWithNext = other.m_bKeepWithNext; m_fTextIndent = other.m_fTextIndent; m_bNumberLines = other.m_bNumberLines; m_nLineNumberRestart = other.m_nLineNumberRestart; commit fd6eef7c48833538f4a1e7ee61a48bf021f4e01d Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 08:59:04 2015 +0100 cppcheck: redundantCondition Change-Id: If4ef5f054412b75a18d4afd28509ca02d5d2573f diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index eca4dc3..ed1a83b 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6089,7 +6089,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, sal_uInt16 nLidLocale) OSL_ENSURE(chs <= 0x100, "overflowed winword charset set"); if (chs == 0x0100) return RTL_TEXTENCODING_APPLE_ROMAN; - if (chs == 0 && nLidLocale != 0 && nLidLocale >= 999) + if (chs == 0 && nLidLocale >= 999) { /* nLidLocale: commit 68f585b1372ecf119271b18f46fb468538fde621 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 7 08:58:21 2015 +0100 cppcheck: redundantPointerOp Change-Id: I46f0e7c4cd45c7ac596dceae7ad28664b0cc2183 diff --git a/store/source/store.cxx b/store/source/store.cxx index a7c9875..d01d4e9 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -126,7 +126,7 @@ storeError SAL_CALL store_createMemoryFile ( xManager->acquire(); - *phFile = static_cast<storeFileHandle>(&(*xManager)); + *phFile = xManager.get(); return store_E_None; } commit 6354d5a95ed0fcd90da29b8c48769a57a7202f0b Author: Caolán McNamara <caol...@redhat.com> Date: Sat Sep 5 14:43:44 2015 +0100 only one use of ScPrivatSplit, and that's for vertical split Change-Id: I942907d6af150818cb1e9a0f1d3f4cd036d0503e diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 8a0b5ec..d10ae1f 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -90,7 +90,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow( pBindingsP, pCW, pParent, rResId ), - aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT) ), + aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ) ) ), aCatBox ( VclPtr<ListBox>::Create( this, ResId( CB_CAT, *rResId.GetResMgr() ) ) ), aFuncList ( VclPtr<ListBox>::Create( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ) ), aDDFuncList ( VclPtr<ListBox>::Create( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ) ), diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 311c078..bb7ca44 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -34,8 +34,7 @@ #* #************************************************************************/ -ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId, - SC_SPLIT_DIRECTION eSplit) +ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId) , nDeltaX(0) , nDeltaY(0) ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits