summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx16
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx2
-rw-r--r--sc/source/ui/inc/datastream.hxx1
-rw-r--r--sc/source/ui/inc/docfuncutil.hxx4
-rw-r--r--sc/source/ui/inc/docsh.hxx4
-rw-r--r--sc/source/ui/inc/filtdlg.hxx1
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx8
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx6
-rw-r--r--sc/source/ui/inc/tabview.hxx1
-rw-r--r--sc/source/ui/inc/uiitems.hxx4
-rw-r--r--sc/source/ui/inc/undoblk.hxx13
-rw-r--r--sc/source/ui/inc/undocell.hxx11
-rw-r--r--sc/source/ui/inc/undodat.hxx4
-rw-r--r--sc/source/ui/inc/undotab.hxx19
-rw-r--r--sc/source/ui/inc/viewdata.hxx4
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx4
16 files changed, 48 insertions, 54 deletions
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index f3289aa2e640..d7e5c798c916 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -17,7 +17,7 @@
#include <vcl/timer.hxx>
#include <svx/checklbx.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <unordered_map>
namespace com { namespace sun { namespace star {
@@ -150,13 +150,13 @@ private:
bool mbEnabled:1;
bool mbSeparator:1;
- ::boost::shared_ptr<Action> mpAction;
+ std::shared_ptr<Action> mpAction;
VclPtr<ScMenuFloatingWindow> mpSubMenuWin;
MenuItemData();
};
- ::std::vector<MenuItemData> maMenuItems;
+ std::vector<MenuItemData> maMenuItems;
struct SubMenuItemData
{
@@ -345,13 +345,13 @@ private:
VclPtr<OKButton> maBtnOk;
VclPtr<CancelButton> maBtnCancel;
- ::std::vector<VclPtr<vcl::Window> > maTabStopCtrls;
+ std::vector<VclPtr<vcl::Window> > maTabStopCtrls;
size_t mnCurTabStop;
- ::std::vector<Member> maMembers;
- boost::scoped_ptr<ExtendedData> mpExtendedData;
- boost::scoped_ptr<Action> mpOKAction;
- boost::scoped_ptr<Action> mpPopupEndAction;
+ std::vector<Member> maMembers;
+ std::unique_ptr<ExtendedData> mpExtendedData;
+ std::unique_ptr<Action> mpOKAction;
+ std::unique_ptr<Action> mpPopupEndAction;
Config maConfig;
Size maWndSize; /// whole window size.
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 814e366f9598..3fd588dee14f 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -235,7 +235,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry
VclPtr<PushButton> maBtOptions;
- boost::scoped_ptr<ScDataBarFormatData> mpDataBarData;
+ std::unique_ptr<ScDataBarFormatData> mpDataBarData;
ScFormatEntry* createDatabarEntry() const;
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index e962b61aa78c..48323642f207 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -18,7 +18,6 @@
#include <address.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <vector>
#include <documentstreamaccess.hxx>
diff --git a/sc/source/ui/inc/docfuncutil.hxx b/sc/source/ui/inc/docfuncutil.hxx
index 65bf820526be..e1db8ce58c35 100644
--- a/sc/source/ui/inc/docfuncutil.hxx
+++ b/sc/source/ui/inc/docfuncutil.hxx
@@ -10,7 +10,7 @@
#include <undobase.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class ScDocument;
class ScMarkData;
@@ -32,7 +32,7 @@ public:
static void addDeleteContentsUndo(
svl::IUndoManager* pUndoMgr, ScDocShell* pDocSh, const ScMarkData& rMark,
const ScRange& rRange, ScDocument* pUndoDoc, InsertDeleteFlags nFlags,
- const boost::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
+ const std::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
bool bMulti, bool bDrawUndo );
static ScSimpleUndo::DataSpansType* getNonEmptyCellSpans(
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 5d6b5b87d1bb..0b5fdcdecc95 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -35,8 +35,8 @@
#include "optutil.hxx"
#include "docuno.hxx"
-#include <boost/scoped_ptr.hpp>
#include <config_telepathy.h>
+#include <memory>
#include <unordered_map>
class ScRefreshTimerProtector;
@@ -453,7 +453,7 @@ typedef tools::SvRef<ScDocShell> ScDocShellRef;
class SC_DLLPUBLIC ScDocShellModificator
{
ScDocShell& rDocShell;
- boost::scoped_ptr<ScRefreshTimerProtector> mpProtector;
+ std::unique_ptr<ScRefreshTimerProtector> mpProtector;
bool bAutoCalcShellDisabled;
bool bIdleEnabled;
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 92ed9bba988e..f01e1feeda5a 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -36,7 +36,6 @@
#include <map>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
class ScFilterOptionsMgr;
class ScViewData;
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 83350a8fb948..ce2b8b6cbe68 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -35,7 +35,7 @@
#include <sfx2/itemconnect.hxx>
#include "pivot.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <unordered_map>
typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper;
@@ -90,7 +90,7 @@ private:
NameMapType maBaseFieldNameMap; // cache for base field display -> original name.
NameMapType maBaseItemNameMap; // cache for base item display -> original name.
- boost::scoped_ptr<ScDPListBoxWrapper> mxLbTypeWrp; /// Wrapper for direct usage of API constants.
+ std::unique_ptr<ScDPListBoxWrapper> mxLbTypeWrp; /// Wrapper for direct usage of API constants.
const ScDPLabelDataVector& mrLabelVec; /// Data of all labels.
bool mbEmptyItem; /// true = Empty base item in listbox.
@@ -176,8 +176,8 @@ private:
VclPtr<FixedText> m_pFtHierarchy;
VclPtr<ListBox> m_pLbHierarchy;
- boost::scoped_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
- boost::scoped_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
+ std::unique_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
+ std::unique_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data.
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 19cc33ebec57..93a895c4c68f 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -31,7 +31,7 @@
#include "tabprotection.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace vcl { class Window; }
class ScDocProtection;
@@ -41,8 +41,8 @@ class ScDocument;
class ScRetypePassDlg : public ModalDialog
{
public:
- typedef ::boost::shared_ptr<ScDocProtection> DocProtectionPtr;
- typedef ::boost::shared_ptr<ScTableProtection> TabProtectionPtr;
+ typedef std::shared_ptr<ScDocProtection> DocProtectionPtr;
+ typedef std::shared_ptr<ScTableProtection> TabProtectionPtr;
explicit ScRetypePassDlg(vcl::Window* pParent);
virtual ~ScRetypePassDlg();
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 5e3ea93c2cd5..e207569c49a0 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -30,7 +30,6 @@
#include "drawview.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
namespace editeng {
struct MisspellRanges;
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 779375140ce3..56b70aa13037 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -27,8 +27,8 @@
#include "paramisc.hxx"
#include <svl/poolitem.hxx>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
namespace editeng {
struct MisspellRanges;
@@ -177,7 +177,7 @@ public:
void SetAdvancedQuerySource(const ScRange* pSource);
private:
- boost::scoped_ptr<ScQueryParam> mpQueryData;
+ std::unique_ptr<ScQueryParam> mpQueryData;
ScViewData* pViewData;
ScRange aAdvSource;
bool bIsAdvanced;
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index e19ade3db28c..53111f41f997 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -26,8 +26,7 @@
#include "cellmergeoption.hxx"
#include "paramisc.hxx"
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScDocShell;
class ScDocument;
@@ -267,10 +266,10 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
- void SetDataSpans( const boost::shared_ptr<DataSpansType>& pSpans );
+ void SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans );
private:
- boost::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells.
+ std::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells.
ScRange aRange;
ScMarkData aMarkData;
@@ -346,7 +345,7 @@ public:
private:
ScMarkData aMarkData;
ScRange aRange;
- boost::scoped_ptr<ScEditDataArray> mpDataArray;
+ std::unique_ptr<ScEditDataArray> mpDataArray;
ScDocument* pUndoDoc;
bool bMulti;
ScPatternAttr* pApplyPattern;
@@ -641,8 +640,8 @@ public:
private:
void DoChange(ScDocument* pDoc);
- boost::scoped_ptr<ScDocument> mpUndoDoc;
- boost::scoped_ptr<ScDocument> mpRedoDoc;
+ std::unique_ptr<ScDocument> mpUndoDoc;
+ std::unique_ptr<ScDocument> mpRedoDoc;
ScRange maRange;
};
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index edce6bc1f22b..1f55708cbdfb 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -25,8 +25,7 @@
#include "cellvalue.hxx"
#include <cellvalues.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScDocShell;
class ScPatternAttr;
@@ -72,11 +71,11 @@ private:
ScPatternAttr* pOldPattern;
ScPatternAttr* pNewPattern;
ScPatternAttr* pApplyPattern;
- ::boost::shared_ptr<EditTextObject> pOldEditData;
- ::boost::shared_ptr<EditTextObject> pNewEditData;
+ std::shared_ptr<EditTextObject> pOldEditData;
+ std::shared_ptr<EditTextObject> pNewEditData;
bool bIsAutomatic;
- void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const;
+ void DoChange( const ScPatternAttr* pWhichPattern, const std::shared_ptr<EditTextObject>& pEditData ) const;
};
class ScUndoEnterData: public ScSimpleUndo
@@ -113,7 +112,7 @@ private:
ValuesType maOldValues;
OUString maNewString;
- boost::scoped_ptr<EditTextObject> mpNewEditData;
+ std::unique_ptr<EditTextObject> mpNewEditData;
sal_uLong mnEndChangeAction;
ScAddress maPos;
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index c9c3060afb0f..0bfa865a5707 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -28,7 +28,7 @@
#include "subtotalparam.hxx"
#include "pivot.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScDocShell;
class ScDocument;
@@ -469,7 +469,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- boost::scoped_ptr<ScMarkData> mpMarkData;
+ std::unique_ptr<ScMarkData> mpMarkData;
ScDocument* pUndoDoc;
ScDocument* pRedoDoc;
InsertDeleteFlags nFlags;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index fe43d95b16e3..e5234961177e 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -27,8 +27,7 @@
#include <com/sun/star/uno/Sequence.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <memory>
#include <vector>
@@ -171,10 +170,10 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
- ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
- ::boost::shared_ptr< ::std::vector< OUString> > mpOldNames;
- ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames;
+ std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
+ std::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
+ std::shared_ptr< ::std::vector< OUString> > mpOldNames;
+ std::shared_ptr< ::std::vector< OUString> > mpNewNames;
void DoChange( bool bUndo ) const;
};
@@ -199,9 +198,9 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
- ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
- ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames;
+ std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
+ std::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
+ std::shared_ptr< ::std::vector< OUString> > mpNewNames;
SdrUndoAction* pDrawUndo;
void DoChange() const;
@@ -254,7 +253,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- boost::scoped_ptr<ScMarkData> mpMarkData;
+ std::unique_ptr<ScMarkData> mpMarkData;
SCTAB nSrcTab;
SCTAB nDestTab;
OUString aName;
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 39fb5b2e151d..3cecc6eea274 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -25,7 +25,7 @@
#include "viewopti.hxx"
#include "docsh.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define SC_SIZE_NONE 65535
const SCCOL SC_TABSTART_NONE = SCCOL_MAX;
@@ -157,7 +157,7 @@ private:
double nPPTX, nPPTY; // Scaling factors
::std::vector<ScViewDataTable*> maTabData;
- boost::scoped_ptr<ScMarkData> mpMarkData;
+ std::unique_ptr<ScMarkData> mpMarkData;
ScViewDataTable* pThisTab; // Data of the displayed sheet
ScDocShell* pDocShell;
ScDocument* pDoc;
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 540c5a2ad49c..6c5e4f0aed33 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -19,8 +19,8 @@
#include "orcusxml.hxx"
#include <set>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScRange;
@@ -47,7 +47,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg
std::set<const SvTreeListEntry*> maRangeLinks;
std::vector<SvTreeListEntry*> maHighlightedEntries;
SvTreeListEntry* mpCurRefEntry;
- boost::scoped_ptr<ScOrcusXMLContext> mpXMLContext;
+ std::unique_ptr<ScOrcusXMLContext> mpXMLContext;
ScDocument* mpDoc;
generated by cgit (git 2.34.1) at 2024-07-12 17:15:25 +0000