[Libreoffice-commits] core.git: 20 commits - chart2/source cppu/source cui/source dbaccess/source drawinglayer/source include/svx include/toolkit include/vcl sc/source sd/inc sd/source sfx2/source starmath/source svtools/source svx/source sw/source toolkit/inc toolkit/source vcl/inc vcl/source vcl/unx
Noel Grandin
noel at peralex.com
Thu Sep 1 09:06:05 UTC 2016
chart2/source/view/charttypes/GL3DBarChart.cxx | 6 -
chart2/source/view/inc/GL3DBarChart.hxx | 4
cppu/source/threadpool/jobqueue.cxx | 2
cppu/source/threadpool/jobqueue.hxx | 5
cppu/source/threadpool/threadpool.cxx | 18 +--
cppu/source/threadpool/threadpool.hxx | 7 -
cui/source/factory/dlgfact.hxx | 8 -
dbaccess/source/core/api/CacheSet.cxx | 14 +-
dbaccess/source/core/api/CacheSet.hxx | 5
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
include/svx/SvxPresetListBox.hxx | 2
include/svx/svdedtv.hxx | 6 -
include/svx/svdedxv.hxx | 2
include/svx/svdglev.hxx | 8 -
include/svx/svdlayer.hxx | 2
include/svx/svdmodel.hxx | 8 -
include/svx/svdmrkv.hxx | 18 +--
include/svx/svdoashp.hxx | 2
include/svx/svdobj.hxx | 4
include/svx/svdomeas.hxx | 2
include/svx/svdotable.hxx | 4
include/svx/svdotext.hxx | 4
include/svx/svdpagv.hxx | 10 -
include/svx/svdpntv.hxx | 18 +--
include/svx/svdpoev.hxx | 2
include/svx/svdview.hxx | 4
include/svx/svdxcgv.hxx | 4
include/svx/svxdlg.hxx | 8 -
include/svx/txencbox.hxx | 4
include/svx/unopage.hxx | 2
include/svx/unoshape.hxx | 10 -
include/svx/xoutbmp.hxx | 4
include/svx/xtable.hxx | 2
include/toolkit/awt/vclxcontainer.hxx | 6 -
include/toolkit/awt/vclxtabpagecontainer.hxx | 4
include/toolkit/awt/vclxtopwindow.hxx | 4
include/toolkit/awt/vclxwindow.hxx | 8 -
include/toolkit/awt/vclxwindows.hxx | 96 ++++++++---------
include/toolkit/controls/controlmodelcontainerbase.hxx | 1
include/toolkit/controls/unocontrolmodel.hxx | 6 -
include/vcl/virdev.hxx | 24 +---
sc/source/core/data/documen8.cxx | 2
sc/source/filter/xml/XMLColumnRowGroupExport.cxx | 8 -
sc/source/filter/xml/XMLColumnRowGroupExport.hxx | 5
sc/source/ui/unoobj/chart2uno.cxx | 11 -
sd/inc/drawdoc.hxx | 2
sd/source/core/CustomAnimationEffect.cxx | 9 -
sd/source/ui/animations/CustomAnimationPane.cxx | 6 -
sd/source/ui/app/sdmod.cxx | 2
sfx2/source/appl/appdispatchprovider.cxx | 7 -
sfx2/source/view/sfxbasecontroller.cxx | 6 -
starmath/source/smmod.cxx | 2
svtools/source/inc/unoiface.hxx | 32 ++---
svtools/source/uno/unoiface.cxx | 17 +--
svx/source/unodraw/shapeimpl.hxx | 6 -
sw/source/core/doc/DocumentDeviceManager.cxx | 6 -
sw/source/core/doc/tblcpy.cxx | 3
sw/source/core/inc/scriptinfo.hxx | 4
toolkit/inc/helper/unopropertyarrayhelper.hxx | 4
toolkit/source/awt/vclxcontainer.cxx | 2
toolkit/source/awt/vclxtabpagecontainer.cxx | 2
toolkit/source/awt/vclxtopwindow.cxx | 2
toolkit/source/awt/vclxwindow.cxx | 10 -
toolkit/source/awt/vclxwindows.cxx | 48 ++++----
toolkit/source/controls/unocontrolmodel.cxx | 4
toolkit/source/helper/unopropertyarrayhelper.cxx | 4
vcl/inc/unx/fontmanager.hxx | 17 +--
vcl/inc/unx/printergfx.hxx | 3
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/virdev.cxx | 31 +++--
vcl/unx/generic/fontmanager/fontcache.cxx | 6 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 29 ++---
vcl/unx/generic/print/printerjob.cxx | 9 -
vcl/unx/generic/print/text_gfx.cxx | 14 +-
74 files changed, 325 insertions(+), 340 deletions(-)
New commits:
commit b8ee524330d924456931ad602eb4701b55a2aa85
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 31 16:37:55 2016 +0200
loplugin:countusersofdefaultparams
Change-Id: Ifc9cdbda77048791203e89350c2efa9a6c34c4a5
Reviewed-on: https://gerrit.libreoffice.org/28555
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a1441f6..b8737d4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -509,7 +509,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
- bool bEnableSelector = false,
+ bool bEnableSelector,
bool bEnableDrawingLayerFillStyles = false) override;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent,
@@ -520,7 +520,7 @@ public:
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
- bool bSizeTabPage = false
+ bool bSizeTabPage
) override;
virtual AbstractSpellDialog * CreateSvxSpellDialog(
vcl::Window* pParent,
@@ -588,7 +588,7 @@ public:
bool bShadow ) override;
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel,
- const SdrObject* pObj = nullptr,
+ const SdrObject* pObj,
bool bHasObj = true ) override;
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet,
@@ -617,7 +617,7 @@ public:
const sal_uInt16 _nInitiallySelectedEvent
) override;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr ) override;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj ) override;
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override;
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 84f2c4c..aa05380 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -39,7 +39,7 @@ private:
DECL_LINK_TYPED( OnMenuItemSelected, Menu*, bool );
template< typename ListType, typename EntryType >
- void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex = 1);
+ void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex);
public:
SvxPresetListBox(vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER);
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 7c1197f..aefeb0c 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -192,7 +192,7 @@ public:
void AddUndoActions( std::vector< SdrUndoAction* >& );
// Layermanagement with Undo.
- void InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
+ void InsertNewLayer(const OUString& rName, sal_uInt16 nPos);
// Delete a layer including all objects contained
void DeleteLayer(const OUString& rName);
@@ -218,8 +218,8 @@ public:
void MirrorMarkedObjVertical();
long GetMarkedObjShear() const;
void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false);
- void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
- void DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false);
+ void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion=false, bool bCopy=false);
+ void DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false);
// copy marked objects and mark them instead of the old ones
void CopyMarkedObj();
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 0dede9e..0e48c22 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -234,7 +234,7 @@ public:
virtual SvtScriptType GetScriptType() const;
/* new interface src537 */
- bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index e9489e0..6559ddb 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -35,8 +35,8 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
void ImpCopyMarkedGluePoints();
typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
- void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
- void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
+ void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
+ void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -73,8 +73,8 @@ public:
void DeleteMarkedGluePoints();
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
- void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
- void RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy=false);
+ void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy);
+ void RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy);
};
#endif // INCLUDED_SVX_SVDGLEV_HXX
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index ecb8343..fef2ca5 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -132,7 +132,7 @@ public:
SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
// New layer, name is retrieved from the resource
- void NewStandardLayer(sal_uInt16 nPos=0xFFFF);
+ void NewStandardLayer(sal_uInt16 nPos);
// Iterate over all layers
sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.size()); }
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e44ba06..63c75f4 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -299,7 +299,7 @@ public:
void SetTextDefaults() const;
static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
- SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=nullptr) const;
+ SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj) const;
TextChain * GetTextChain() const;
// ReferenceDevice for the EditEngine
@@ -440,7 +440,7 @@ public:
// bTreadSourceAsConst.......: sal_True=the SourceModel will not be changed,
// so pages will be copied.
virtual void Merge(SdrModel& rSourceModel,
- sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+ sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum=0xFFFF,
sal_uInt16 nDestPos=0xFFFF,
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false);
@@ -448,7 +448,7 @@ public:
// Behaves like Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy);
void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
sal_uInt16 nDestPos,
- bool bUndo = true, bool bMoveNoCopy = false);
+ bool bUndo, bool bMoveNoCopy = false);
// BegUndo() / EndUndo() enables you to group arbitrarily many UndoActions
// arbitrarily deeply. As comment for the UndoAction the first BegUndo(String) of all
@@ -459,7 +459,7 @@ public:
// Actions on the SdrView however do generate those.
void BegUndo(); // open Undo group
void BegUndo(const OUString& rComment); // open Undo group
- void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SdrRepeatFunc::NONE); // open Undo group
+ void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc); // open Undo group
void EndUndo(); // close Undo group
void AddUndo(SdrUndoAction* pUndo);
sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; }
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index a4217bf..dc4f739 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -206,11 +206,11 @@ public:
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return meEditMode; }
- void SetEditMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::Edit:SdrViewEditMode::Create); }
+ void SetEditMode(bool bOn) { SetEditMode(bOn?SdrViewEditMode::Edit:SdrViewEditMode::Create); }
bool IsEditMode() const { return meEditMode==SdrViewEditMode::Edit; }
- void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::Create:SdrViewEditMode::Edit); }
+ void SetCreateMode(bool bOn) { SetEditMode(bOn?SdrViewEditMode::Create:SdrViewEditMode::Edit); }
bool IsCreateMode() const { return meEditMode==SdrViewEditMode::Create; }
- void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::GluePointEdit:meEditMode0); }
+ void SetGluePointEditMode(bool bOn) { SetEditMode(bOn?SdrViewEditMode::GluePointEdit:meEditMode0); }
bool IsGluePointEditMode() const { return meEditMode==SdrViewEditMode::GluePointEdit; }
void SetDesignMode(bool bOn = true);
@@ -274,7 +274,7 @@ public:
bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false);
// Pick: Supported options for nOptions are SdrSearchOptions::PASS2BOUND und SdrSearchOptions::PASS3NEAREST
- bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const;
+ bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const;
// Selects the most upper of the marked objects (O1) and scans from there
// towards bottom direction, selecting the first non-marked object (O2).
@@ -288,11 +288,11 @@ public:
// object (O2). In case of success the marking of O1 is deleted, a marking
// is created at O2 and sal_True is returned. With the parameter
// bPrev=sal_True the scan direction is turned to the other direction.
- bool MarkNextObj(const Point& rPnt, short nTol=-2, bool bPrev=false);
+ bool MarkNextObj(const Point& rPnt, short nTol, bool bPrev=false);
// Mark all objects within a rectangular area
// Just objects are marked which are inclosed completely
- void MarkObj(const Rectangle& rRect, bool bUnmark=false);
+ void MarkObj(const Rectangle& rRect, bool bUnmark);
void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false);
void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages
void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages
@@ -322,7 +322,7 @@ public:
bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);
// Mark all points within this rectangular alle Punkte (View coordinates)
- void MarkPoints(const Rectangle& rRect, bool bUnmark=false) { MarkPoints(&rRect,bUnmark); }
+ void MarkPoints(const Rectangle& rRect, bool bUnmark) { MarkPoints(&rRect,bUnmark); }
bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); }
bool MarkAllPoints() { return MarkPoints(nullptr,false); }
@@ -333,7 +333,7 @@ public:
// In case of success the marking of
// P1 is deleted, a mark is set at P2 and sal_True is returned.
// With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- bool MarkNextPoint(const Point& rPnt, bool bPrev=false);
+ bool MarkNextPoint(const Point& rPnt, bool bPrev);
// Search for the number of the suitable handle. In case of empty search result,
// SAL_MAX_SIZE is returned.
@@ -388,7 +388,7 @@ public:
// In case of success the marking of
// P1 is deleted, a mark is set at P2 and sal_True is returned.
// With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- bool MarkNextGluePoint(const Point& rPnt, bool bPrev=false);
+ bool MarkNextGluePoint(const Point& rPnt, bool bPrev);
// Draw a selection frame for glue point marking.
// This routine will just be started in case that HasMarkablePoints() returns sal_True.
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 2d5ba46..8166a9c 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -233,7 +233,7 @@ public:
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override;
virtual void EndTextEdit( SdrOutliner& rOutl ) override;
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const override;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override;
virtual SdrObjCustomShape* Clone() const override;
SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj);
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 9d913bc..7b3741c 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -826,7 +826,7 @@ public:
// when there is no filled new polygon created from line-to-polygon conversion,
// specially used for XLINE_DASH and 3D conversion
SdrObject* ConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false) const;
- static SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false);
+ static SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash);
// if true, reference onto an object
bool IsVirtualObj() const { return bVirtObj;}
@@ -872,7 +872,7 @@ public:
void DeleteUserData(sal_uInt16 nNum);
// switch ItemPool for this object
- void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr);
+ void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel);
// access to the UNO representation of the shape
virtual css::uno::Reference< css::uno::XInterface > getUnoShape();
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 8335808..c095545 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -135,7 +135,7 @@ public:
virtual bool BegTextEdit(SdrOutliner& rOutl) override;
virtual const Size& GetTextSize() const override;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override;
virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const override;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 1fe79ee..dc0b5a6 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -174,8 +174,8 @@ public:
/** At the same time, we set the text in the outliner (if applicable the EditOutliners')
* as well as the PaperSize
*/
- void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override;
+ void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const;
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override;
void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const;
virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 5c62210..cb8abe4 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -335,7 +335,7 @@ public:
void SetTextLink(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet);
void ReleaseTextLink();
bool IsLinkedText() const { return pPlusData!=nullptr && GetLinkUserData()!=nullptr; }
- bool ReloadLinkedText(bool bForceLoad = false);
+ bool ReloadLinkedText(bool bForceLoad);
bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet);
virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
@@ -395,7 +395,7 @@ public:
// Simultaneously sets the text into the Outliner (possibly
// the one of the EditOutliner) and sets the PaperSize.
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const;
virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
const GeoStat& GetGeoStat() const { return aGeo; }
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index f5b9821..e410b43 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -162,12 +162,12 @@ public:
void PrePaint();
/// @param rReg refers to the OutDev and not to the Page
- void CompleteRedraw( SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr );
+ void CompleteRedraw( SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector );
/// Write access to mpPreparedPageWindow
void setPreparedPageWindow(SdrPageWindow* pKnownTarget);
- void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget = nullptr, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
+ void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
const Rectangle& rRect = Rectangle());
void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) );
@@ -191,17 +191,17 @@ public:
Rectangle& MarkBound() { return aMarkBound; }
Rectangle& MarkSnap() { return aMarkSnap; }
- void SetLayerVisible(const OUString& rName, bool bShow = true) {
+ void SetLayerVisible(const OUString& rName, bool bShow) {
SetLayer(rName, aLayerVisi, bShow);
if(!bShow) AdjHdl();
InvalidateAllWin();
}
bool IsLayerVisible(const OUString& rName) const { return IsLayer(rName, aLayerVisi); }
- void SetLayerLocked(const OUString& rName, bool bLock = true) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
+ void SetLayerLocked(const OUString& rName, bool bLock) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
bool IsLayerLocked(const OUString& rName) const { return IsLayer(rName,aLayerLock); }
- void SetLayerPrintable(const OUString& rName, bool bPrn = true) { SetLayer(rName, aLayerPrn, bPrn); }
+ void SetLayerPrintable(const OUString& rName, bool bPrn) { SetLayer(rName, aLayerPrn, bPrn); }
bool IsLayerPrintable(const OUString& rName) const { return IsLayer(rName, aLayerPrn); }
/// PV represents a RefPage or a SubList of a RefObj, or the Model is ReadOnly
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index b687bd6..e7245bb 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -107,7 +107,7 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector;
BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx(
const GDIMetaFile& rMtf,
const basegfx::B2DRange& rTargetRange,
- const sal_uInt32 nMaximumQuadraticPixels = 500000);
+ const sal_uInt32 nMaximumQuadraticPixels);
class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener
@@ -305,13 +305,13 @@ public:
virtual void AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow);
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
- void SetLayerVisible(const OUString& rName, bool bShow=true);
+ void SetLayerVisible(const OUString& rName, bool bShow);
bool IsLayerVisible(const OUString& rName) const;
void SetLayerLocked(const OUString& rName, bool bLock=true);
bool IsLayerLocked(const OUString& rName) const;
- void SetLayerPrintable(const OUString& rName, bool bPrn=true);
+ void SetLayerPrintable(const OUString& rName, bool bPrn);
bool IsLayerPrintable(const OUString& rName) const;
// PrePaint call forwarded from app windows
@@ -379,13 +379,13 @@ public:
const Color& GetGridColor() const { return maGridColor;}
void SetPageVisible(bool bOn = true) { mbPageVisible=bOn; InvalidateAllWin(); }
- void SetPageShadowVisible(bool bOn = true) { mbPageShadowVisible=bOn; InvalidateAllWin(); }
+ void SetPageShadowVisible(bool bOn) { mbPageShadowVisible=bOn; InvalidateAllWin(); }
void SetPageBorderVisible(bool bOn = true) { mbPageBorderVisible=bOn; InvalidateAllWin(); }
void SetBordVisible(bool bOn = true) { mbBordVisible=bOn; InvalidateAllWin(); }
- void SetGridVisible(bool bOn = true) { mbGridVisible=bOn; InvalidateAllWin(); }
- void SetGridFront(bool bOn = true) { mbGridFront =bOn; InvalidateAllWin(); }
+ void SetGridVisible(bool bOn) { mbGridVisible=bOn; InvalidateAllWin(); }
+ void SetGridFront(bool bOn) { mbGridFront =bOn; InvalidateAllWin(); }
void SetHlplVisible(bool bOn = true) { mbHlplVisible=bOn; InvalidateAllWin(); }
- void SetHlplFront(bool bOn = true) { mbHlplFront =bOn; InvalidateAllWin(); }
+ void SetHlplFront(bool bOn) { mbHlplFront =bOn; InvalidateAllWin(); }
void SetGlueVisible(bool bOn = true) { if (mbGlueVisible!=bOn) { mbGlueVisible=bOn; if (!mbGlueVisible2 && !mbGlueVisible3 && !mbGlueVisible4) GlueInvalidate(); } }
void SetGridColor( Color aColor );
@@ -455,7 +455,7 @@ public:
virtual bool MouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; }
virtual bool Command(const CommandEvent& /*rCEvt*/, vcl::Window* /*pWin*/) { return false; }
- bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
@@ -484,7 +484,7 @@ public:
/// The Browser is destroyed for bShow=false
#ifdef DBG_UTIL
- void ShowItemBrowser(bool bShow=true);
+ void ShowItemBrowser(bool bShow);
bool IsItemBrowserVisible() const { return mpItemBrowser!=nullptr && GetItemBrowser()->IsVisible(); }
vcl::Window* GetItemBrowser() const;
#endif
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 450cc12..524c371 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -42,7 +42,7 @@ private:
SVX_DLLPRIVATE void ImpCheckPolyPossibilities();
typedef void (*PPolyTrFunc)(Point&, Point*, Point*, const void*, const void*, const void*, const void*, const void*);
- SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
+ SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 4ae82e7..d4b39af 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -203,7 +203,7 @@ public:
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll=false) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
- bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr=false) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
/* new interface src537 */
bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
@@ -237,7 +237,7 @@ public:
// bAddMark=TRUE: add to existing selection (->Shift)
// bUnmark=TRUE: remove objects from selection which are inside of
// the enveloped frame.
- bool BegMark(const Point& rPnt, bool bAddMark=false, bool bUnmark=false);
+ bool BegMark(const Point& rPnt, bool bAddMark, bool bUnmark=false);
// The following actions are possible:
// - ObjectCreating
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 5377870..f506a91 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -109,8 +109,8 @@ public:
virtual bool Paste(
const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
- bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE);
- bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE);
+ bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions=SdrInsertFlags::NONE);
+ bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions=SdrInsertFlags::NONE);
};
#endif // INCLUDED_SVX_SVDXCGV_HXX
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 7cd86f7..af4ea64 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -324,7 +324,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg(
vcl::Window* pParent,
const SfxItemSet& rCoreSet,
- bool bEnableSelector = false,
+ bool bEnableSelector,
bool bEnableDrawingLayerFillStyles = false) = 0;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent,
@@ -335,7 +335,7 @@ public:
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
- bool bSizeTabPage = false
+ bool bSizeTabPage
)=0;
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
const SfxItemSet& rOptionsSet,
@@ -384,7 +384,7 @@ public:
bool bShadow) = 0 ;
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
- const SdrObject* pObj = nullptr,
+ const SdrObject* pObj,
bool bHasObj = true )=0;
virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
@@ -419,7 +419,7 @@ public:
const sal_uInt16 _nInitiallySelectedEvent
) = 0;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr )=0;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj )=0;
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0;
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 1f8f483..5b1c014 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -53,7 +53,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
- bool bExcludeImportSubsets = false,
+ bool bExcludeImportSubsets,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -74,7 +74,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromDbTextEncodingMap(
- bool bExcludeImportSubsets = false,
+ bool bExcludeImportSubsets,
sal_uInt32 nExcludeInfoFlags = 0
);
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 808bba5..3ce80c5 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -96,7 +96,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception);
- static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = nullptr, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);
+ static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating object.
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 496c338..15690c0 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -173,7 +173,7 @@ public:
// Internals
void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet);
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr );
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage );
/** takes the ownership of the SdrObject.
When the shape is disposed, and it has the ownership of its associated SdrObject, then
@@ -337,7 +337,7 @@ public:
SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw ();
virtual ~SvxShapeText() throw ();
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -397,7 +397,7 @@ public:
SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw ();
virtual ~SvxShapeGroup() throw ();
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -670,7 +670,7 @@ public:
virtual ~Svx3DSceneObject() throw();
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -808,7 +808,7 @@ public:
virtual ~SvxCustomShape() throw ();
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index c694625..032716f 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -59,7 +59,7 @@ public:
static Graphic MirrorGraphic( const Graphic& rGraphic, const BmpMirrorFlags nMirrorFlags );
static Animation MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr );
static sal_uInt16 WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
- const OUString& rFilterName, const XOutFlags nFlags = XOutFlags::NONE,
+ const OUString& rFilterName, const XOutFlags nFlags,
const Size* pMtfSize_100TH_MM = nullptr );
static bool GraphicToBase64(const Graphic& rGraphic, OUString& rOUString);
@@ -70,7 +70,7 @@ public:
static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
static tools::Polygon GetCountour( const Bitmap& rBmp, const XOutFlags nContourFlags,
- const sal_uInt8 cEdgeDetectThreshold = 50,
+ const sal_uInt8 cEdgeDetectThreshold,
const Rectangle* pWorkRect = nullptr );
};
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 1847453..39fc5f7 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -211,7 +211,7 @@ public:
const OUString& GetPath() const { return maPath; }
void SetPath(const OUString& rString) { maPath = rString; }
- void SetDirty(bool bDirty = true) { mbListDirty = bDirty; }
+ void SetDirty(bool bDirty) { mbListDirty = bDirty; }
bool IsEmbedInDocument() const { return mbEmbedInDocument; }
void SetEmbedInDocument(bool b) { mbEmbedInDocument = b; }
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 8a67ab8..e2fae51 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -449,7 +449,7 @@ public:
SAL_DLLPRIVATE void CheckMasterPages();
SAL_DLLPRIVATE void Merge(SdrModel& rSourceModel,
- sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+ sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum=0xFFFF,
sal_uInt16 nDestPos=0xFFFF,
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false) override;
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 9b3367d..a42286d 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -42,7 +42,7 @@ public:
virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
};
class SvxAppletShape : public SvxOle2Shape
{
@@ -60,7 +60,7 @@ public:
virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
};
class SvxFrameShape : public SvxOle2Shape
{
@@ -83,7 +83,7 @@ public:
virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) throw (css::uno::RuntimeException, std::exception) override;
};
commit 26c149617c54e29902a77d2f95ca7c64af13b52f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:39:20 2016 +0200
std::list<sal_Int32> to deque
Change-Id: I28942e35cf240b83ad49def6252f2709baf525a9
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index ca68522..c4f7aa3 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -42,6 +42,7 @@
#include <sal/macros.h>
#include <algorithm>
+#include <deque>
#include <vector>
using namespace psp;
@@ -829,7 +830,7 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
// order the patch files
// according to PPD spec the JobPatchFile options must be int
// and should be emitted in order
- std::list< sal_Int32 > patch_order;
+ std::deque< sal_Int32 > patch_order;
int nValueCount = pKey->countValues();
for( int i = 0; i < nValueCount; i++ )
{
@@ -846,10 +847,10 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
}
}
- patch_order.sort();
- patch_order.unique();
+ std::sort(patch_order.begin(), patch_order.end());
+ std::unique(patch_order.begin(), patch_order.end());
- while( patch_order.begin() != patch_order.end() )
+ while( !patch_order.empty() )
{
// note: this discards patch files not adhering to the "int" scheme
// as there won't be a value for them
commit 30ab4661371e6ae1e4b60c9e1f72f1205a326221
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:33:46 2016 +0200
std::list<sal_Unicode> to vector
Change-Id: If437d2588c75c76fdf03413c074f4f49f93a12f4
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 6304c19..1aca67c 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -427,7 +427,7 @@ public:
// helper for type 1 fonts
std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
- std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const;
+ std::vector< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const;
std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
getUnicodeFromAdobeCode( sal_uInt8 aChar ) const
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index a532787..a88f179 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -482,8 +482,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
if( pChar->name )
{
pUnicodes[i] = 0;
- std::list< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
- for( std::list< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
+ std::vector< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
+ for( std::vector< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
{
if( *it != 0 )
{
@@ -541,8 +541,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
if( bFillEncodingvector && pChar->name )
{
- std::list< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
- for( std::list< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
+ std::vector< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
+ for( std::vector< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
{
if( *it != 0 )
{
@@ -573,8 +573,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
}
else if( pChar->name )
{
- std::list< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
- for( std::list< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
+ std::vector< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
+ for( std::vector< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
{
if( *it != 0 )
m_pMetrics->m_aMetrics[ *it ] = aMetric;
@@ -585,8 +585,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
{
if( pChar->name )
{
- std::list< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
- for( std::list< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
+ std::vector< sal_Unicode > aCodes = rManager.getUnicodeFromAdobeName( pChar->name );
+ for( std::vector< sal_Unicode >::const_iterator it = aCodes.begin(); it != aCodes.end(); ++it )
{
if( *it != 0 )
m_pMetrics->m_aMetrics[ *it ] = aMetric;
@@ -2195,13 +2195,13 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha
return aRet;
}
-std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const
+std::vector< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const
{
std::pair< std::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator,
std::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range
= m_aAdobenameToUnicode.equal_range( rName );
- std::list< sal_Unicode > aRet;
+ std::vector< sal_Unicode > aRet;
for( ; range.first != range.second; ++range.first )
aRet.push_back( range.first->second );
commit 1f7f8ab442917acad935cea1d30c2d3acf506320
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:23:26 2016 +0200
std::list<sal_Int32> to vector
Change-Id: I991fba4593665035df26a0e13f0219029f2eb917
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index efa6b61..c254ef6 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -27,6 +27,7 @@
#include "vclpluginapi.h"
#include <list>
+#include <vector>
namespace psp {
@@ -181,7 +182,7 @@ private:
glyph in one of the subfonts, the mapping from unicode to the
glyph has to be remembered */
- std::list< sal_Int32 > maPS1Font;
+ std::vector< sal_Int32 > maPS1Font;
std::list< GlyphSet > maPS3Font;
sal_Int32 mnFontID;
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index c21cb75..723fd46 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -85,13 +85,12 @@ static int getVerticalDeltaAngle( sal_Unicode nChar )
void
PrinterGfx::PSUploadPS1Font (sal_Int32 nFontID)
{
- std::list< sal_Int32 >::iterator aFont;
// already in the document header ?
- for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont )
- if( nFontID == *aFont )
+ for ( int i : maPS1Font )
+ if( nFontID == i )
return;
- // no occurrenc yet, mark for download
+ // no occurrence yet, mark for download
// add the fontid to the list
maPS1Font.push_back (nFontID);
}
@@ -664,18 +663,17 @@ void
PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts )
{
// write all type 1 fonts
- std::list< sal_Int32 >::iterator aFont;
// already in the document header ?
- for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont)
+ for (int aFont : maPS1Font)
{
- const OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) );
+ const OString& rSysPath (mrFontMgr.getFontFileSysPath(aFont) );
OUString aUNCPath;
osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath);
osl::File aFontFile (aUNCPath);
// provide the pfb or pfa font as a (pfa-)font resource
OString aPostScriptName =
- OUStringToOString ( mrFontMgr.getPSName(*aFont),
+ OUStringToOString ( mrFontMgr.getPSName(aFont),
RTL_TEXTENCODING_ASCII_US );
WritePS (pFile, "%%BeginResource: font ");
commit f1ea2177ce53ac873f3306d3ade7d23371df8cbf
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:20:08 2016 +0200
std::list<int> to vector
Change-Id: I018eec4fa6647e76c5f4d6a08350acda2950b33e
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 6606327..6304c19 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -247,7 +247,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
std::unordered_map< fontID, PrintFont* > m_aFonts;
std::unordered_map< int, FontFamily > m_aFamilyTypes;
std::list< OString > m_aFontDirectories;
- std::list< int > m_aPrivateFontDirectories;
+ std::vector< int > m_aPrivateFontDirectories;
utl::MultiAtomProvider* m_pAtoms;
// for speeding up findFontFileID
std::unordered_map< OString, std::set< fontID >, OStringHash >
commit 74a944721c093e6a781d2bfa90b1ddeb11462b73
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:18:49 2016 +0200
std::list<int> to vector
Change-Id: I05d4531ac6d3daa8c996db374bc2a2425215dde8
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 7f7069d..6606327 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -20,11 +20,6 @@
#ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
#define INCLUDED_VCL_INC_FONTMANAGER_HXX
-#include <list>
-#include <map>
-#include <set>
-#include <unordered_map>
-
#include <vcl/dllapi.h>
#include <vcl/helper.hxx>
#include <vcl/timer.hxx>
@@ -33,7 +28,11 @@
#include "salglyphid.hxx"
#include "unx/fc_fontoptions.hxx"
+#include <list>
+#include <map>
+#include <set>
#include <vector>
+#include <unordered_map>
#include "config_dbus.h"
@@ -181,9 +180,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
// font attributes
int m_nFamilyName; // atom
- std::list< int > m_aAliases;
+ std::vector< int > m_aAliases;
int m_nPSName; // atom
- OUString m_aStyleName;
+ OUString m_aStyleName;
FontItalic m_eItalic;
FontWidth m_eWidth;
FontWeight m_eWeight;
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index 27851c1..e308db8 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -153,9 +153,9 @@ void FontCache::flush()
nSubEntry = 0;
aLine.append(OUStringToOString(pAtoms->getString( ATOM_FAMILYNAME, (*it)->m_nFamilyName), RTL_TEXTENCODING_UTF8));
- for( ::std::list< int >::const_iterator name_it = (*it)->m_aAliases.begin(); name_it != (*it)->m_aAliases.end(); ++name_it )
+ for( int name : (*it)->m_aAliases )
{
- const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, *name_it ) );
+ const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, name ) );
if( !rAdd.isEmpty() )
{
aLine.append(';');
@@ -567,7 +567,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
pRight->m_bUserOverride != pLeft->m_bUserOverride
)
return false;
- std::list< int >::const_iterator lit, rit;
+ std::vector< int >::const_iterator lit, rit;
for( lit = pLeft->m_aAliases.begin(), rit = pRight->m_aAliases.begin();
lit != pLeft->m_aAliases.end() && rit != pRight->m_aAliases.end() && (*lit) == (*rit);
++lit, ++rit )
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index e7e59aa..a532787 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1234,9 +1234,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it );
if( nAlias != pFont->m_nFamilyName )
{
- std::list< int >::const_iterator al_it;
- for( al_it = pFont->m_aAliases.begin(); al_it != pFont->m_aAliases.end() && *al_it != nAlias; ++al_it )
- ;
+ std::vector< int >::const_iterator al_it =
+ std::find( pFont->m_aAliases.begin(), pFont->m_aAliases.end(), nAlias );
if( al_it == pFont->m_aAliases.end() )
pFont->m_aAliases.push_back( nAlias );
}
@@ -1539,8 +1538,8 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r
rInfo.m_bSubsettable = (pFont->m_eType == fonttype::TrueType); // TODO: rename to SfntType
rInfo.m_aAliases.clear();
- for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
- rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
+ for( int i : pFont->m_aAliases )
+ rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, i ) );
}
void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const
commit 3c376151f5445f3a5ca147f962a12235128cfc01
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 10:12:07 2016 +0200
std::list<sal_Int32> to vector
Change-Id: I7784e9bebf3185eb3e0f699fc80005d3d92ac1b5
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 865bac9..e0ee73c 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
-#include <list>
+#include <vector>
#include <deque>
#include "swscanner.hxx"
#include <rtl/ustrbuf.hxx>
@@ -29,7 +29,7 @@
class SwTextNode;
class Point;
class MultiSelection;
-typedef std::list< sal_Int32 > PositionList;
+typedef std::vector< sal_Int32 > PositionList;
enum class SwFontScript;
#define SPACING_PRECISION_FACTOR 100
commit 9e9e7bd3c9dc9a3149436916e747c7f7ee040621
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:35:43 2016 +0200
std::list<sal_uLong> to deque
Change-Id: I99d4f5fb322301542519241ec65a38304ecc16a1
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 7a13fd3..c199d6d 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -45,6 +45,7 @@
#include <redline.hxx>
#include <fmtfsize.hxx>
#include <list>
+#include <deque>
#include <memory>
#include <o3tl/make_unique.hxx>
@@ -68,7 +69,7 @@ namespace
typedef std::vector< BoxSpanInfo > BoxStructure;
typedef std::vector< BoxStructure > LineStructure;
- typedef std::list< sal_uLong > ColumnStructure;
+ typedef std::deque< sal_uLong > ColumnStructure;
struct SubBox
{
commit 6af36bae47e34c51b0f063e938554db3a922eed6
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:33:10 2016 +0200
std::list<sal_Int16> to vector
Change-Id: I4129ea523bd3e4882ff776328b46c72abf9f918f
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 11c316c..e2db919 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1145,7 +1145,7 @@ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- std::list< sal_Int16 > aGroupList;
+ std::vector< sal_Int16 > aGroupList;
SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() );
SfxSlotPool* pPool = &SfxSlotPool::GetSlotPool( pViewFrame );
@@ -1169,9 +1169,7 @@ throw (RuntimeException, std::exception)
}
}
- uno::Sequence< sal_Int16 > aSeq =
- comphelper::containerToSequence< sal_Int16 >( aGroupList );
- return aSeq;
+ return comphelper::containerToSequence< sal_Int16 >( aGroupList );
}
uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
commit a378ece3831f3639022a6fb5543c279f517c7535
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:32:23 2016 +0200
std::list<sal_Int16> to vector
Change-Id: If1fbab63446ed7d1627f542a7aac4a9eb2fa6c88
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 11cc76d..cc947c5 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -181,7 +181,7 @@ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- std::list< sal_Int16 > aGroupList;
+ std::vector< sal_Int16 > aGroupList;
SfxSlotPool* pAppSlotPool = &SfxGetpApp()->GetAppSlotPool_Impl();
const SfxSlotMode nMode( SfxSlotMode::TOOLBOXCONFIG|SfxSlotMode::ACCELCONFIG|SfxSlotMode::MENUCONFIG );
@@ -203,10 +203,7 @@ throw (uno::RuntimeException, std::exception)
}
}
- uno::Sequence< sal_Int16 > aSeq =
- comphelper::containerToSequence< sal_Int16, std::list< sal_Int16 > >( aGroupList );
-
- return aSeq;
+ return comphelper::containerToSequence< sal_Int16 >( aGroupList );
}
Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
commit bb932b34f19bf8297549b9741b7cdcfe691ca374
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:30:40 2016 +0200
std::list<sal_Int16> to vector
Change-Id: I3b8b902108d632ea992018ca023984bf1366e804
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e328453..1b958ad 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1678,7 +1678,7 @@ void CustomAnimationPane::onChangeCurrentPage()
}
}
-bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::list< sal_Int16 >& rParaList )
+bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::vector< sal_Int16 >& rParaList )
{
Reference< XTextRange > xSelectedText;
rSelection >>= xSelectedText;
@@ -1812,13 +1812,13 @@ void CustomAnimationPane::onAdd()
else if ( maViewSelection.getValueType() == cppu::UnoType<XTextCursor>::get())
{
Reference< XShape > xShape;
- std::list< sal_Int16 > aParaList;
+ std::vector< sal_Int16 > aParaList;
if( getTextSelection( maViewSelection, xShape, aParaList ) )
{
ParagraphTarget aParaTarget;
aParaTarget.Shape = xShape;
- std::list< sal_Int16 >::iterator aIter( aParaList.begin() );
+ std::vector< sal_Int16 >::iterator aIter( aParaList.begin() );
for( ; aIter != aParaList.end(); ++aIter )
{
aParaTarget.Paragraph = (*aIter);
commit 18e638ef6fa55d045f874d38574f30d8152094e4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:28:58 2016 +0200
std::list<sal_Int16> to deque
Change-Id: I5e841fd7a9de74bba359c7e39d23d9a9b3fbc1f2
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 0f8545c..da8d1bd 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -64,6 +64,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <algorithm>
+#include <deque>
#include <cppuhelper/implbase.hxx>
@@ -2462,7 +2463,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( const CustomAnimatio
Reference< XEnumerationAccess > xText( xTarget, UNO_QUERY_THROW );
Reference< XEnumeration > xEnumeration( xText->createEnumeration(), UNO_QUERY_THROW );
- std::list< sal_Int16 > aParaList;
+ std::deque< sal_Int16 > aParaList;
sal_Int16 nPara;
// fill the list with all valid paragraphs
@@ -2481,11 +2482,9 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( const CustomAnimatio
ParagraphTarget aTarget;
aTarget.Shape = xTarget;
- std::list< sal_Int16 >::iterator aIter( aParaList.begin() );
- std::list< sal_Int16 >::iterator aEnd( aParaList.end() );
- while( aIter != aEnd )
+ for( const auto i : aParaList )
{
- aTarget.Paragraph = (*aIter++);
+ aTarget.Paragraph = i;
CustomAnimationEffectPtr pNewEffect;
if( bUsed )
commit 649bae7fb2c6ecd7dcbbfd7f0d0ba37f598ac2f5
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 09:26:18 2016 +0200
std::list<sal_Int32> to vector
Change-Id: I9691983a026ce4c0d2979de85b0abaed48b90910
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index aafd0cd..c443058 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2547,9 +2547,8 @@ void ScChart2DataSequence::BuildDataCache()
StopListeningToAllExternalRefs();
- ::std::list<sal_Int32> aHiddenValues;
+ ::std::vector<sal_Int32> aHiddenValues;
sal_Int32 nDataCount = 0;
- sal_Int32 nHiddenValueCount = 0;
for (vector<ScTokenRef>::const_iterator itr = m_aTokens.begin(), itrEnd = m_aTokens.end();
itr != itrEnd; ++itr)
@@ -2578,7 +2577,6 @@ void ScChart2DataSequence::BuildDataCache()
if (bColHidden || bRowHidden)
{
// hidden cell
- ++nHiddenValueCount;
aHiddenValues.push_back(nDataCount-1);
if( !m_bIncludeHiddenCells )
@@ -2629,11 +2627,8 @@ void ScChart2DataSequence::BuildDataCache()
}
// convert the hidden cell list to sequence.
- m_aHiddenValues.realloc(nHiddenValueCount);
- sal_Int32* pArr = m_aHiddenValues.getArray();
- ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end();
- for (;itr != itrEnd; ++itr, ++pArr)
- *pArr = *itr;
+ m_aHiddenValues.realloc(aHiddenValues.size());
+ memcpy(m_aHiddenValues.getArray(), aHiddenValues.data(), sizeof(sal_Int32) * aHiddenValues.size());
// Clear the data series cache when the array is re-built.
m_aMixedDataCache.realloc(0);
commit d1f2d52e21aff9bf0e70ed3da261102eaa609f54
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 08:43:26 2016 +0200
std::list<sal_Int32> to vector
Change-Id: I468689916e508e65cbe37d7b1123f47b63d9b08b
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index 7d5677f..c5bc808 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -140,9 +140,8 @@ void ScMyOpenCloseColumnRowGroup::CloseGroup()
void ScMyOpenCloseColumnRowGroup::CloseGroups(const sal_Int32 nField)
{
ScMyFieldGroupVec::iterator aItr(aTableEnd.begin());
- ScMyFieldGroupVec::iterator aEndItr(aTableEnd.end());
bool bReady(false);
- while(!bReady && aItr != aEndItr)
+ while(!bReady && aItr != aTableEnd.end())
{
if (*aItr == nField)
{
@@ -158,8 +157,7 @@ sal_Int32 ScMyOpenCloseColumnRowGroup::GetLast()
{
sal_Int32 maximum(-1);
ScMyFieldGroupVec::iterator i(aTableEnd.begin());
- ScMyFieldGroupVec::iterator endi(aTableEnd.end());
- while (i != endi)
+ while (i != aTableEnd.end())
{
if (*i > maximum)
maximum = *i;
@@ -171,7 +169,7 @@ sal_Int32 ScMyOpenCloseColumnRowGroup::GetLast()
void ScMyOpenCloseColumnRowGroup::Sort()
{
aTableStart.sort();
- aTableEnd.sort();
+ std::sort(aTableEnd.begin(), aTableEnd.end());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
index 0ec24a7..007e8a6 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLUMNROWGROUPEXPORT_HXX
#include <list>
+#include <vector>
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -34,8 +35,8 @@ struct ScMyColumnRowGroup
bool operator< (const ScMyColumnRowGroup& rGroup) const;
};
-typedef std::list <ScMyColumnRowGroup> ScMyColumnRowGroupVec;
-typedef std::list <sal_Int32> ScMyFieldGroupVec;
+typedef std::list<ScMyColumnRowGroup> ScMyColumnRowGroupVec;
+typedef std::vector<sal_Int32> ScMyFieldGroupVec;
class ScXMLExport;
class ScMyOpenCloseColumnRowGroup
commit 3069878c60da990a603754ced4a64be4e7855538
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 1 08:40:17 2016 +0200
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 2ba61b1..732d7d2 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -48,7 +48,7 @@ public:
// css::lang::XTypeProvider
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
- css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
// css::awt::XVclContainer
void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
@@ -63,8 +63,8 @@ public:
// css::awt::XVclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index 92d10d1..d8e90ab 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -60,8 +60,8 @@ public:
virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 5a65a94..f80734e 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -101,8 +101,8 @@ public:
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 67d6f7e..775d38e 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -44,7 +44,7 @@
#include <tools/link.hxx>
#include <stdarg.h>
-#include <list>
+#include <vector>
#include <functional>
@@ -96,11 +96,11 @@ protected:
::toolkit::IAccessibleFactory& getAccessibleFactory();
// helper ...
- static void PushPropertyIds( std::list< sal_uInt16 > &aIds, int nFirstId, ...);
+ static void PushPropertyIds( std::vector< sal_uInt16 > &aIds, int nFirstId, ...);
// for use in controls/
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds,
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds,
bool bWithDefaults = false );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds );
::comphelper::OInterfaceContainerHelper2& GetContainerListeners();
::comphelper::OInterfaceContainerHelper2& GetTopWindowListeners();
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index f065f47..8483008 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -136,8 +136,8 @@ protected:
virtual void ImplSetNewImage();
public:
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -186,8 +186,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -208,8 +208,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
protected:
virtual void ImplSetNewImage() override;
@@ -269,8 +269,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -326,8 +326,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -361,8 +361,8 @@ public:
// css::awt::XLayoutConstrains
css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -395,8 +395,8 @@ public:
// css::awt::XVclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -434,8 +434,8 @@ public:
// css::awt::XDevice,
css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
// css::awt::XVclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
@@ -470,8 +470,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
TabPage* getTabPage() const throw ( css::uno::RuntimeException);
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
class VCLXMultiPage : public css::awt::XSimpleTabController, public VCLXContainer
@@ -520,8 +520,8 @@ public:
// C++
TabControl* getTabControl() const throw ( css::uno::RuntimeException);
sal_uInt16 insertTab( TabPage*, OUString& sTitle );
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -575,8 +575,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -612,8 +612,8 @@ public:
css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override;
css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -673,8 +673,8 @@ public:
css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException);
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -741,8 +741,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -818,8 +818,8 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -882,8 +882,8 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -920,8 +920,8 @@ public:
void SAL_CALL last( ) throw(css::uno::RuntimeException, std::exception) override;
void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -948,8 +948,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -996,8 +996,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -1041,8 +1041,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -1086,8 +1086,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -1138,8 +1138,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -1184,8 +1184,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -1220,8 +1220,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index cf2e214..17e524c 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -41,6 +41,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <tools/gen.hxx>
+#include <list>
// class ControlModelContainerBase
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index ec3286a..e83c949 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -40,7 +40,7 @@
#include <cppuhelper/implbase7.hxx>
#include <comphelper/uno3.hxx>
-#include <list>
+#include <vector>
#include <map>
typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable;
@@ -71,7 +71,7 @@ protected:
protected:
void ImplRegisterProperty( sal_uInt16 nPropType );
- void ImplRegisterProperties( const std::list< sal_uInt16 > &rIds );
+ void ImplRegisterProperties( const std::vector< sal_uInt16 > &rIds );
void ImplRegisterProperty( sal_uInt16 nPropId, const css::uno::Any& rDefault );
css::uno::Sequence<sal_Int32> ImplGetPropertyIds() const;
virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
@@ -176,7 +176,7 @@ public:
#define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \
do { \
- std::list< sal_uInt16 > aIds; \
+ std::vector< sal_uInt16 > aIds; \
a::ImplGetPropertyIds( aIds ); \
ImplRegisterProperties( aIds ); \
} while (false)
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 7b9bc25..ec04cd2 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -105,8 +105,8 @@ public:
// css::awt::XWindow
void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -159,8 +159,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -209,8 +209,8 @@ protected:
virtual void SetWindow( const VclPtr< vcl::Window > &_pWindow) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -275,8 +275,8 @@ protected:
// VCLXGraphicControl overridables
virtual void ImplSetNewImage() override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -315,8 +315,8 @@ public:
void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -359,8 +359,8 @@ public:
void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -401,8 +401,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -417,8 +417,8 @@ public:
// css::awt::VclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
#endif // INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 0e14c9a..f76fab0 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -522,7 +522,7 @@ void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(css::uno::RuntimeException,
GetWindow()->GrabFocus();
}
-void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXMultiLineEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -532,7 +532,6 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
BASEPROPERTY_HIDEINACTIVESELECTION,
0);
VCLXWindow::ImplGetPropertyIds( rIds, true );
-
}
// class VCLXFileControl
@@ -796,7 +795,7 @@ void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
nCols = pControl->GetEdit().GetMaxVisChars();
}
-void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXFileControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -1364,7 +1363,7 @@ void SVTXFormattedField::NotifyTextListeners()
}
}
-void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXFormattedField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -1630,7 +1629,7 @@ void SVTXRoadmap::ImplSetNewImage()
pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() );
}
-void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXRoadmap::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_COMPLETE,
@@ -1804,7 +1803,7 @@ sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, st
return pField && pField->IsStrictFormat();
}
-void SVTXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
SVTXFormattedField::ImplGetPropertyIds( rIds );
}
@@ -2032,7 +2031,7 @@ css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) thr
return SVTXFormattedField::getProperty(PropertyName);
}
-void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_CURRENCYSYMBOL,
@@ -2277,7 +2276,7 @@ css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw
return aProp;
}
-void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXProgressBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_PROGRESSVALUE,
@@ -2325,7 +2324,7 @@ void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const cs
}
}
-void SVTXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_TEXTLINECOLOR,
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 3b5ae6a..4d29030 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -23,7 +23,7 @@
#include <toolkit/dllapi.h>
#include <cppuhelper/propshlp.hxx>
-#include <list>
+#include <vector>
#include <set>
@@ -39,7 +39,7 @@ protected:
public:
UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs );
- UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs );
+ UnoPropertyArrayHelper( const std::vector< sal_uInt16 > &rIDs );
// ::cppu::IPropertyArrayHelper
sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) override;
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index c9d230e..a0c7d30 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -34,7 +34,7 @@
// class VCLXContainer
-void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
VCLXWindow::ImplGetPropertyIds( rIds );
}
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 8af76d1..c053aae 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::view;
// class VCLXTabPageContainer
-void VCLXTabPageContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXTabPageContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
VCLXWindow::ImplGetPropertyIds( rIds );
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list