summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx72
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx6
-rw-r--r--sd/source/ui/view/Outliner.cxx74
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx30
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx42
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx38
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx10
-rw-r--r--sd/source/ui/view/drtxtob1.cxx8
-rw-r--r--sd/source/ui/view/drviews2.cxx26
-rw-r--r--sd/source/ui/view/drviews3.cxx6
-rw-r--r--sd/source/ui/view/drviews4.cxx6
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviews9.cxx4
-rw-r--r--sd/source/ui/view/drviewsa.cxx4
-rw-r--r--sd/source/ui/view/drviewsf.cxx6
-rw-r--r--sd/source/ui/view/outlnvs2.cxx12
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
-rw-r--r--sd/source/ui/view/sdview.cxx8
-rw-r--r--sd/source/ui/view/sdview2.cxx4
-rw-r--r--sd/source/ui/view/sdview3.cxx6
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx4
22 files changed, 188 insertions, 188 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 81dc5b7daa86..86df4579f849 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -68,7 +68,7 @@ namespace {
public:
PrintOptions (
const vcl::PrinterOptionsHelper& rHelper,
- const ::std::vector<sal_Int32>& rSlidesPerPage)
+ const std::vector<sal_Int32>& rSlidesPerPage)
: mrProperties(rHelper),
maSlidesPerPage(rSlidesPerPage)
{
@@ -221,7 +221,7 @@ namespace {
private:
const vcl::PrinterOptionsHelper& mrProperties;
- const ::std::vector<sal_Int32> maSlidesPerPage;
+ const std::vector<sal_Int32> maSlidesPerPage;
/** When the value of the property with name pName is a boolean then
return its value. When the property is unknown then
@@ -353,14 +353,14 @@ namespace {
}
}
- ::std::vector<sal_Int32> GetSlidesPerPage() const
+ std::vector<sal_Int32> GetSlidesPerPage() const
{
return maSlidesPerPage;
}
private:
- ::std::vector<beans::PropertyValue> maProperties;
- ::std::vector<sal_Int32> maSlidesPerPage;
+ std::vector<beans::PropertyValue> maProperties;
+ std::vector<sal_Int32> maSlidesPerPage;
bool mbImpress;
sal_Int32 mnCurPage;
@@ -799,9 +799,9 @@ namespace {
// Print at least two rows and columns. More if the document
// page fits completely onto the printer page.
- const sal_Int32 nColumnCount (::std::max(sal_Int32(2),
+ const sal_Int32 nColumnCount (std::max(sal_Int32(2),
sal_Int32(aPrintSize.Width() / nPageWidth)));
- const sal_Int32 nRowCount (::std::max(sal_Int32(2),
+ const sal_Int32 nRowCount (std::max(sal_Int32(2),
sal_Int32(aPrintSize.Height() / nPageHeight)));
for (sal_Int32 nRow=0; nRow<nRowCount; ++nRow)
for (sal_Int32 nColumn=0; nColumn<nColumnCount; ++nColumn)
@@ -913,7 +913,7 @@ namespace {
public:
HandoutPrinterPage (
const sal_uInt16 nHandoutPageIndex,
- const ::std::vector<sal_uInt16>& rPageIndices,
+ const std::vector<sal_uInt16>& rPageIndices,
const MapMode& rMapMode,
const OUString& rsPageString,
const Point& rPageStringOffset,
@@ -1045,7 +1045,7 @@ namespace {
private:
const sal_uInt16 mnHandoutPageIndex;
- const ::std::vector<sal_uInt16> maPageIndices;
+ const std::vector<sal_uInt16> maPageIndices;
};
/** The outline information (title, subtitle, outline objects) of the
@@ -1119,7 +1119,7 @@ namespace {
}
private:
- ::boost::scoped_ptr<OutlinerParaObject> mpParaObject;
+ std::unique_ptr<OutlinerParaObject> mpParaObject;
};
}
@@ -1247,23 +1247,23 @@ public:
Printer& rPrinter (*mpPrinter);
- ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
if ( ! pViewShell)
return;
SdDrawDocument* pDocument = pViewShell->GetDoc();
OSL_ASSERT(pDocument!=NULL);
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ std::shared_ptr<DrawViewShell> pDrawViewShell(
+ std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
- if ( ! mpPrintView)
+ if (!mpPrintView)
mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, NULL));
if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size())
return;
- const ::boost::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]);
+ const std::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]);
OSL_ASSERT(pPage);
if ( ! pPage)
return;
@@ -1322,11 +1322,11 @@ private:
bool mbIsDisposed;
VclPtr<Printer> mpPrinter;
Size maPrinterPageSizePixel;
- ::boost::scoped_ptr<PrintOptions> mpOptions;
- ::std::vector< ::boost::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
- ::boost::scoped_ptr<DrawView> mpPrintView;
+ std::unique_ptr<PrintOptions> mpOptions;
+ std::vector< std::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
+ std::unique_ptr<DrawView> mpPrintView;
bool mbHasOrientationWarningBeenShown;
- ::std::vector<sal_Int32> maSlidesPerPage;
+ std::vector<sal_Int32> maSlidesPerPage;
awt::Size maPrintSize;
void Dispose()
@@ -1620,7 +1620,7 @@ private:
long nPageH = aOutRect.GetHeight();
- ::std::vector< sal_Int32 > aPages;
+ std::vector< sal_Int32 > aPages;
sal_Int32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
StringRangeEnumerator::getRangesFromString(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
@@ -1724,7 +1724,7 @@ private:
}
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new OutlinerPrinterPage(
pOutliner->CreateParaObject(),
aMap,
@@ -1798,7 +1798,7 @@ private:
aMap.SetOrigin(Point());
}
- ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
pViewShell->WriteFrameViewData();
// Count page shapes.
@@ -1820,7 +1820,7 @@ private:
StringRangeEnumerator aRangeEnum(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
0, nPageCount-1);
- ::std::vector<sal_uInt16> aPageIndices;
+ std::vector<sal_uInt16> aPageIndices;
sal_uInt16 nPrinterPageIndex = 0;
StringRangeEnumerator::Iterator it = aRangeEnum.begin(), itEnd = aRangeEnum.end();
bool bLastLoop = (it == itEnd);
@@ -1840,7 +1840,7 @@ private:
if (!aPageIndices.empty() && (aPageIndices.size() == nShapeCount || bLastLoop))
{
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new HandoutPrinterPage(
nPrinterPageIndex++,
aPageIndices,
@@ -1889,7 +1889,7 @@ private:
const PageKind ePageKind,
PrintInfo& rInfo)
{
- ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
pViewShell->WriteFrameViewData();
sal_Int32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
@@ -2022,7 +2022,7 @@ private:
StringRangeEnumerator aRangeEnum(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
0, nPageCount-1);
- ::std::vector< sal_uInt16 > aPageVector;
+ std::vector< sal_uInt16 > aPageVector;
for (StringRangeEnumerator::Iterator
it = aRangeEnum.begin(),
itEnd = aRangeEnum.end();
@@ -2035,23 +2035,23 @@ private:
}
// create pairs of pages to print on each page
- typedef ::std::vector< ::std::pair< sal_uInt16, sal_uInt16 > > PairVector;
+ typedef std::vector< std::pair< sal_uInt16, sal_uInt16 > > PairVector;
PairVector aPairVector;
if ( ! aPageVector.empty())
{
sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1;
if( aPageVector.size() & 1 )
- aPairVector.push_back( ::std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) );
else
- aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
while( nFirstIndex < nLastIndex )
{
if( nFirstIndex & 1 )
- aPairVector.push_back( ::std::make_pair( aPageVector[ nFirstIndex++ ], aPageVector[ nLastIndex-- ] ) );
+ aPairVector.push_back( std::make_pair( aPageVector[ nFirstIndex++ ], aPageVector[ nLastIndex-- ] ) );
else
- aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
}
}
@@ -2065,14 +2065,14 @@ private:
if ((!bIsIndexOdd && mpOptions->IsPrintFrontPage())
|| (bIsIndexOdd && mpOptions->IsPrintBackPage()))
{
- const ::std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
+ const std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
Point aSecondOffset (aOffset);
if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
aSecondOffset.X() += aAdjustedPrintSize.Width() / 2;
else
aSecondOffset.Y() += aAdjustedPrintSize.Height() / 2;
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new BookletPrinterPage(
aPair.first,
aPair.second,
@@ -2105,7 +2105,7 @@ private:
nPaperBin = rInfo.mpPrinter->GetPaperBin();
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new TiledPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
@@ -2153,7 +2153,7 @@ private:
// if CutPage is set then do not move it, otherwise move the
// scaled page to printable area
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new RegularPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
@@ -2189,7 +2189,7 @@ private:
{
aMap.SetOrigin(aPageOrigin);
maPrinterPages.push_back(
- ::boost::shared_ptr<PrinterPage>(
+ std::shared_ptr<PrinterPage>(
new RegularPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 64d7884823ff..7c191ae057c7 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -39,7 +39,7 @@
#include "drawview.hxx"
#include "sdresid.hxx"
#include "drawdoc.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace sd;
@@ -86,7 +86,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
bool bDisable = true;
if( 1 == pMarkList->GetMarkCount() )
@@ -123,7 +123,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq )
if( pItem )
{
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index c1964def738c..29521588152b 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -104,7 +104,7 @@ public:
*/
void ProvideOutlinerView (
Outliner& rOutliner,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
vcl::Window* pWindow);
/** This method is called when the OutlinerView is no longer used.
@@ -256,7 +256,7 @@ void Outliner::PrepareSpelling()
SetViewShell (pBase->GetMainViewShell());
SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) );
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
{
mbStringFound = false;
@@ -291,8 +291,8 @@ void Outliner::StartSpelling()
void Outliner::EndSpelling()
{
// Keep old view shell alive until we release the outliner view.
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- ::boost::shared_ptr<ViewShell> pOldViewShell (pViewShell);
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pOldViewShell (pViewShell);
ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current());
if (pBase != NULL)
@@ -353,7 +353,7 @@ void Outliner::EndSpelling()
bool Outliner::SpellNextDocument()
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell->ISA(OutlineViewShell))
{
// When doing a spell check in the outline view then there is
@@ -445,7 +445,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
bool bAbort = false;
if (pBase != NULL)
{
- ::boost::shared_ptr<ViewShell> pShell (pBase->GetMainViewShell());
+ std::shared_ptr<ViewShell> pShell (pBase->GetMainViewShell());
SetViewShell(pShell);
if (pShell.get() == NULL)
bAbort = true;
@@ -465,7 +465,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
}
}
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -523,7 +523,7 @@ void Outliner::Initialize (bool bDirectionIsForward)
maObjectIterator = ::sd::outliner::OutlinerContainer(this).current();
maCurrentPosition = *maObjectIterator;
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -584,7 +584,7 @@ bool Outliner::SearchAndReplaceAll()
// matches.
RememberStartPosition ();
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -637,7 +637,7 @@ bool Outliner::SearchAndReplaceOnce()
if( NULL == pOutlinerView || !GetEditEngine().HasView( &pOutlinerView->GetEditView() ) )
return true;
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != 0)
{
mpView = pViewShell->GetView();
@@ -731,9 +731,9 @@ void Outliner::DetectChange()
{
::sd::outliner::IteratorPosition aPosition (maCurrentPosition);
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
- ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<DrawViewShell> pDrawViewShell (
+ std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
// Detect whether the view has been switched from the outside.
if (pDrawViewShell.get() != NULL
@@ -825,7 +825,7 @@ bool Outliner::DetectSelectionChange()
void Outliner::RememberStartPosition()
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -837,8 +837,8 @@ void Outliner::RememberStartPosition()
if (pViewShell->ISA(DrawViewShell))
{
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
- ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ std::shared_ptr<DrawViewShell> pDrawViewShell (
+ std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
if (pDrawViewShell.get() != NULL)
{
meStartViewMode = pDrawViewShell->GetPageKind();
@@ -884,7 +884,7 @@ void Outliner::RestoreStartPosition()
if (mnStartPageIndex == (sal_uInt16)-1 )
bRestore = false;
// Dont't restore when the view shell is not valid.
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell == 0)
bRestore = false;
@@ -892,8 +892,8 @@ void Outliner::RestoreStartPosition()
{
if (pViewShell->ISA(DrawViewShell))
{
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
- ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ std::shared_ptr<DrawViewShell> pDrawViewShell (
+ std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
SetViewMode (meStartViewMode);
if (pDrawViewShell.get() != NULL)
SetPage (meStartEditMode, mnStartPageIndex);
@@ -959,7 +959,7 @@ void Outliner::ProvideNextTextObject()
{
PutTextIntoOutliner ();
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != 0)
switch (meMode)
{
@@ -986,7 +986,7 @@ void Outliner::ProvideNextTextObject()
void Outliner::EndOfSearch()
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -1185,9 +1185,9 @@ void Outliner::PrepareSearchAndReplace()
void Outliner::SetViewMode (PageKind ePageKind)
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<DrawViewShell> pDrawViewShell(
+ std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
if (pDrawViewShell.get()!=NULL && ePageKind != pDrawViewShell->GetPageKind())
{
// Restore old edit mode.
@@ -1214,7 +1214,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
bool bMatchMayExist = mbMatchMayExist;
ViewShellBase& rBase = pViewShell->GetViewShellBase();
- SetViewShell(::boost::shared_ptr<ViewShell>());
+ SetViewShell(std::shared_ptr<ViewShell>());
framework::FrameworkHelper::Instance(rBase)->RequestView(
sViewURL,
framework::FrameworkHelper::msCenterPaneURL);
@@ -1240,7 +1240,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
// Save edit mode so that it can be restored when switching the view
// shell again.
- pDrawViewShell = ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell);
+ pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>(pViewShell);
OSL_ASSERT(pDrawViewShell.get()!=NULL);
if (pDrawViewShell.get() != NULL)
mpImpl->meOriginalEditMode = pDrawViewShell->GetEditMode();
@@ -1251,9 +1251,9 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex)
{
if ( ! mbRestrictSearchToSelection)
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<DrawViewShell> pDrawViewShell(
+ std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
OSL_ASSERT(pDrawViewShell.get()!=NULL);
if (pDrawViewShell.get() != NULL)
{
@@ -1274,7 +1274,7 @@ void Outliner::EnterEditMode (bool bGrabFocus)
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
pViewShell->GetDispatcher()->
Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON |
SfxCallMode::RECORD, &aItem, 0L);
@@ -1370,9 +1370,9 @@ SdrObject* Outliner::SetObject (
return rPosition.mxObject.get();
}
-void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell)
+void Outliner::SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell)
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != rpViewShell)
{
// Set the new view shell.
@@ -1424,7 +1424,7 @@ void Outliner::HandleChangedSelection()
void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
bool bMultiDoc = pViewShell->ISA(DrawViewShell);
meMode = TEXT_CONVERSION;
@@ -1481,7 +1481,7 @@ void Outliner::BeginConversion()
if (pBase != NULL)
SetViewShell (pBase->GetMainViewShell());
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
{
mbStringFound = false;
@@ -1509,7 +1509,7 @@ void Outliner::EndConversion()
bool Outliner::ConvertNextDocument()
{
- ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell && pViewShell->ISA(OutlineViewShell) )
return false;
@@ -1611,7 +1611,7 @@ Outliner::Implementation::~Implementation()
*/
void Outliner::Implementation::ProvideOutlinerView (
Outliner& rOutliner,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
vcl::Window* pWindow)
{
if (rpViewShell.get() != NULL)
@@ -1646,7 +1646,7 @@ void Outliner::Implementation::ProvideOutlinerView (
rOutliner.SetText(OUString(), rOutliner.GetParagraph(0));
meOriginalEditMode =
- ::boost::static_pointer_cast<DrawViewShell>(rpViewShell)->GetEditMode();
+ std::static_pointer_cast<DrawViewShell>(rpViewShell)->GetEditMode();
}
break;
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 2fcd500b986f..1186b60527c7 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -197,7 +197,7 @@ Iterator OutlinerContainer::CreateIterator (IteratorLocation aLocation)
Iterator OutlinerContainer::CreateSelectionIterator (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward,
IteratorLocation aLocation)
{
@@ -236,7 +236,7 @@ Iterator OutlinerContainer::CreateSelectionIterator (
Iterator OutlinerContainer::CreateDocumentIterator (
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward,
IteratorLocation aLocation)
{
@@ -275,8 +275,8 @@ Iterator OutlinerContainer::CreateDocumentIterator (
break;
case CURRENT:
- const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
+ const std::shared_ptr<DrawViewShell> pDrawViewShell(
+ std::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
if (pDrawViewShell.get())
{
ePageKind = pDrawViewShell->GetPageKind();
@@ -300,7 +300,7 @@ Iterator OutlinerContainer::CreateDocumentIterator (
sal_Int32 OutlinerContainer::GetPageIndex (
SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
+ const std::shared_ptr<ViewShell>& rpViewShell,
PageKind ePageKind,
EditMode eEditMode,
bool bDirectionIsForward,
@@ -311,8 +311,8 @@ sal_Int32 OutlinerContainer::GetPageIndex (
sal_Int32 nPageIndex;
sal_Int32 nPageCount;
- const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
+ const std::shared_ptr<DrawViewShell> pDrawViewShell(
+ std::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
switch (eEditMode)
{
@@ -363,16 +363,16 @@ sal_Int32 OutlinerContainer::GetPageIndex (
//===== IteratorImplBase ====================================================
IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: maPosition()
, mpDocument (pDocument)
, mpViewShellWeak (rpViewShellWeak)
, mbDirectionIsForward (bDirectionIsForward)
{
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell;
+ std::shared_ptr<DrawViewShell> pDrawViewShell;
if ( ! mpViewShellWeak.expired())
- pDrawViewShell = ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShellWeak.lock());
+ pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>(rpViewShellWeak.lock());
if (pDrawViewShell.get())
{
@@ -387,7 +387,7 @@ IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
}
IteratorImplBase::IteratorImplBase( SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode)
: maPosition()
, mpDocument (pDocument)
@@ -442,7 +442,7 @@ SelectionIteratorImpl::SelectionIteratorImpl (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
sal_Int32 nObjectIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward),
mrObjectList(rObjectList),
@@ -542,7 +542,7 @@ bool SelectionIteratorImpl::IsEqual (
ViewIteratorImpl::ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward),
mbPageChangeOccurred(false),
@@ -555,7 +555,7 @@ ViewIteratorImpl::ViewIteratorImpl (
ViewIteratorImpl::ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward,
PageKind ePageKind,
EditMode eEditMode)
@@ -729,7 +729,7 @@ DocumentIteratorImpl::DocumentIteratorImpl (
sal_Int32 nPageIndex,
PageKind ePageKind, EditMode eEditMode,
SdDrawDocument* pDocument,
- const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
+ const std::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: ViewIteratorImpl (nPageIndex, pDocument, rpViewShellWeak, bDirectionIsForward,
ePageKind, eEditMode)
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 053989d79800..ee078591fd6b 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -151,8 +151,8 @@ public:
This ViewShellManager is used to activate or deactivate shells.
*/
void UpdateShells (
- const ::boost::shared_ptr<ViewShell>& rpMainViewShell,
- const ::boost::shared_ptr<ViewShellManager>& rpManager);
+ const std::shared_ptr<ViewShell>& rpMainViewShell,
+ const std::shared_ptr<ViewShellManager>& rpManager);
private:
class ShellDescriptor
@@ -184,8 +184,8 @@ class ToolBarRules
{
public:
ToolBarRules (
- const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager,
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager);
+ const std::shared_ptr<ToolBarManager>& rpToolBarManager,
+ const std::shared_ptr<ViewShellManager>& rpViewShellManager);
/** This method calls MainViewShellChanged() and SelectionHasChanged()
for the current main view shell and its view.
@@ -222,8 +222,8 @@ public:
sd::ShellId nShellId);
private:
- ::boost::shared_ptr<ToolBarManager> mpToolBarManager;
- ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
+ std::shared_ptr<ToolBarManager> mpToolBarManager;
+ std::shared_ptr<ViewShellManager> mpViewShellManager;
};
} // end of anonymous namespace
@@ -243,9 +243,9 @@ public:
*/
Implementation (
ViewShellBase& rBase,
- const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
- const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager);
+ const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const std::shared_ptr<ViewShellManager>& rpViewShellManager,
+ const std::shared_ptr<ToolBarManager>& rpToolBarManager);
~Implementation();
void SetValid (bool bValid);
@@ -300,7 +300,7 @@ private:
mutable ::osl::Mutex maMutex;
ViewShellBase& mrBase;
- ::boost::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
+ std::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
bool mbIsValid;
ToolBarList maToolBarList;
ToolBarShellList maToolBarShellList;
@@ -346,12 +346,12 @@ const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar");
const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar");
const OUString ToolBarManager::msTableObjectBar("tableobjectbar");
-::boost::shared_ptr<ToolBarManager> ToolBarManager::Create (
+std::shared_ptr<ToolBarManager> ToolBarManager::Create (
ViewShellBase& rBase,
- const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager)
+ const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const std::shared_ptr<ViewShellManager>& rpViewShellManager)
{
- ::boost::shared_ptr<ToolBarManager> pManager (new ToolBarManager());
+ std::shared_ptr<ToolBarManager> pManager (new ToolBarManager());
pManager->mpImpl.reset(
new Implementation(rBase,rpMultiplexer,rpViewShellManager,pManager));
return pManager;
@@ -515,9 +515,9 @@ const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:
ToolBarManager::Implementation::Implementation (
ViewShellBase& rBase,
- const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
- const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager)
+ const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const std::shared_ptr<ViewShellManager>& rpViewShellManager,
+ const std::shared_ptr<ToolBarManager>& rpToolBarManager)
: maMutex(),
mrBase(rBase),
mpEventMultiplexer(rpMultiplexer),
@@ -954,8 +954,8 @@ LayouterLock::~LayouterLock()
//===== ToolBarRules ==========================================================
ToolBarRules::ToolBarRules (
- const ::boost::shared_ptr<sd::ToolBarManager>& rpToolBarManager,
- const ::boost::shared_ptr<sd::ViewShellManager>& rpViewShellManager)
+ const std::shared_ptr<sd::ToolBarManager>& rpToolBarManager,
+ const std::shared_ptr<sd::ViewShellManager>& rpViewShellManager)
: mpToolBarManager(rpToolBarManager),
mpViewShellManager(rpViewShellManager)
{
@@ -1397,8 +1397,8 @@ void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules)
}
void ToolBarShellList::UpdateShells (
- const ::boost::shared_ptr<ViewShell>& rpMainViewShell,
- const ::boost::shared_ptr<ViewShellManager>& rpManager)
+ const std::shared_ptr<ViewShell>& rpMainViewShell,
+ const std::shared_ptr<ViewShellManager>& rpManager)
{
if (rpMainViewShell.get() != NULL)
{
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index a6fda969ca9f..461d9bf05f26 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -140,10 +140,10 @@ public:
It does not include the ViewTabBar.
*/
VclPtr<vcl::Window> mpViewWindow;
- ::boost::shared_ptr<ToolBarManager> mpToolBarManager;
- ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
- ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer;
- ::boost::shared_ptr<FormShellManager> mpFormShellManager;
+ std::shared_ptr<ToolBarManager> mpToolBarManager;
+ std::shared_ptr<ViewShellManager> mpViewShellManager;
+ std::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer;
+ std::shared_ptr<FormShellManager> mpFormShellManager;
Implementation (ViewShellBase& rBase);
~Implementation();
@@ -191,7 +191,7 @@ private:
order to ensure that it stays alive while the ViewShellBase is
alive.
*/
- ::boost::shared_ptr<slidesorter::cache::PageCacheManager> mpPageCacheManager;
+ std::shared_ptr<slidesorter::cache::PageCacheManager> mpPageCacheManager;
};
namespace {
@@ -313,7 +313,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
if (sView.isEmpty())
sView = GetInitialViewShellType();
- ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this));
+ std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this));
// Create the resource ids for the center pane and view.
const Reference<drawing::framework::XResourceId> xCenterPaneId (
@@ -359,14 +359,14 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
}
}
-::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const
+std::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const
{
return mpImpl->mpViewShellManager;
}
-::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const
+std::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const
{
- ::boost::shared_ptr<ViewShell> pMainViewShell (
+ std::shared_ptr<ViewShell> pMainViewShell (
framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this))
->GetViewShell(framework::FrameworkHelper::msCenterPaneURL));
if (pMainViewShell.get() == NULL)
@@ -423,7 +423,7 @@ void ViewShellBase::InitializeFramework()
OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
{
- ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
+ std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
dynamic_cast<DrawViewShell*>(pMainShell.get()));
return (pDrawViewShell)
@@ -433,7 +433,7 @@ OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
bool ViewShellBase::HasSelection(bool bText) const
{
- ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
+ std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
dynamic_cast<DrawViewShell*>(pMainShell.get()));
return (pDrawViewShell)
@@ -538,8 +538,8 @@ sal_uInt16 ViewShellBase::SetPrinter (
bScaleAll = (aWarnBox->Execute() == RET_YES);
}
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
- ::boost::dynamic_pointer_cast<DrawViewShell>(GetMainViewShell()));
+ std::shared_ptr<DrawViewShell> pDrawViewShell (
+ std::dynamic_pointer_cast<DrawViewShell>(GetMainViewShell()));
if (pDrawViewShell)
{
SdPage* pPage = GetDocument()->GetSdPage(
@@ -903,7 +903,7 @@ OUString ViewShellBase::GetInitialViewShellType()
return sRequestedView;
}
-::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
+std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL);
@@ -916,7 +916,7 @@ const Rectangle& ViewShellBase::getClientRectangle() const
return mpImpl->maClientArea;
}
-::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
+std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL);
@@ -924,7 +924,7 @@ const Rectangle& ViewShellBase::getClientRectangle() const
return mpImpl->mpToolBarManager;
}
-::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
+std::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpFormShellManager.get()!=NULL);
@@ -1041,7 +1041,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot()
pFrameView->GetPageKindOnLoad());
pFrameView->SetPageKind(
pFrameView->GetPageKindOnLoad());
- ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(mrBase));
+ std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(mrBase));
pHelper->RequestView(
FrameworkHelper::GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL);
@@ -1387,7 +1387,7 @@ void FocusForwardingWindow::dispose()
void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt)
{
- ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
+ std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
if (pViewShell.get() != NULL)
{
vcl::Window* pWindow = pViewShell->GetActiveWindow();
@@ -1404,7 +1404,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt)
void FocusForwardingWindow::Command (const CommandEvent& rEvent)
{
- ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
+ std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
if (pViewShell.get() != NULL)
{
vcl::Window* pWindow = pViewShell->GetActiveWindow();
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index a0c190512df9..970e9db8a05f 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -77,7 +77,7 @@ ViewShell::Implementation::~Implementation()
{
if ( ! mpUpdateLockForMouse.expired())
{
- ::boost::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse);
+ std::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse);
if (pLock.get() != NULL)
{
// Force the ToolBarManagerLock to be released even when the
@@ -328,11 +328,11 @@ class ViewShell::Implementation::ToolBarManagerLock::Deleter { public:
void operator() (ToolBarManagerLock* pObject) { delete pObject; }
};
-::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock>
+std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock>
ViewShell::Implementation::ToolBarManagerLock::Create (
- const ::boost::shared_ptr<ToolBarManager>& rpManager)
+ const std::shared_ptr<ToolBarManager>& rpManager)
{
- ::boost::shared_ptr<ToolBarManagerLock> pLock (
+ std::shared_ptr<ToolBarManagerLock> pLock (
new ViewShell::Implementation::ToolBarManagerLock(rpManager),
ViewShell::Implementation::ToolBarManagerLock::Deleter());
pLock->mpSelf = pLock;
@@ -340,7 +340,7 @@ class ViewShell::Implementation::ToolBarManagerLock::Deleter { public:
}
ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
- const ::boost::shared_ptr<ToolBarManager>& rpManager)
+ const std::shared_ptr<ToolBarManager>& rpManager)
: mpLock(new ToolBarManager::UpdateLock(rpManager)),
maTimer()
{
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index fea331f1813f..be7b3fc0cdc4 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -72,7 +72,7 @@
#include "Outliner.hxx"
#include "futext.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
@@ -87,7 +87,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
sal_uInt16 nSlot = rReq.GetSlot();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
@@ -154,7 +154,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aAttr.Get( EE_PARA_ULSPACE ) );
- boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -195,7 +195,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges());
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
- boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 103a892d7419..358d3cea0075 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -171,7 +171,7 @@
#include <sfx2/sidebar/Sidebar.hxx>
#include "ViewShellBase.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace {
const char CustomAnimationPanelId[] = "CustomAnimationPanel";
@@ -427,7 +427,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
+ std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
@@ -801,7 +801,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_SET_DEFAULT:
{
- boost::scoped_ptr<SfxItemSet> pSet;
+ std::unique_ptr<SfxItemSet> pSet;
if (mpDrawView->IsTextEdit())
{
@@ -876,7 +876,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
std::pair<SfxItemSet*,SdrObjUserCall*> &rAttr = aAttrList[j++];
- boost::scoped_ptr<SfxItemSet> pNewSet(rAttr.first);
+ std::unique_ptr<SfxItemSet> pNewSet(rAttr.first);
SdrObjUserCall* pUserCall = rAttr.second;
if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SfxItemState::SET )
@@ -1398,7 +1398,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
+ std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
@@ -1566,7 +1566,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
+ std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
@@ -1836,7 +1836,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_INSERT_FLD_FILE:
{
sal_uInt16 nMul = 1;
- boost::scoped_ptr<SvxFieldItem> pFieldItem;
+ std::unique_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -1976,12 +1976,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
+ std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
if( pDlg && pDlg->Execute() == RET_OK )
{
// To make a correct SetAttribs() call at the utlinerView
// it is necessary to split the actions here
- boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
+ std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
ESelection aSel = pOLV->GetSelection();
bool bSelectionWasModified(false);
@@ -2085,7 +2085,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -2118,7 +2118,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
@@ -2366,7 +2366,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
if( pDlg )
{
pDlg->Execute();
@@ -2880,7 +2880,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
GetActiveWindow(),
GetDoc()) : 0);
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index f95eacae4b19..a6ec31ef3df4 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -84,7 +84,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <editeng/lspcitem.hxx>
#include <editeng/ulspitem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
@@ -293,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_INSERT_DATE_TIME:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
+ std::unique_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
if( pDlg )
{
pDlg->Execute();
@@ -317,7 +317,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
pPage = static_cast<SdPage*>(&pPage->TRG_GetMasterPage());
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
if( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 43dab6be0282..5c2210335ffa 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -63,7 +63,7 @@
#include <svx/svditer.hxx>
#include <navigatr.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
@@ -563,7 +563,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
aMPos = Point( 20, 20 );
aFieldPopup.Execute( pWin, aMPos );
- boost::scoped_ptr<SvxFieldData> pField(aFieldPopup.GetField());
+ std::unique_ptr<SvxFieldData> pField(aFieldPopup.GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
@@ -896,7 +896,7 @@ void DrawViewShell::ShowSnapLineContextMenu (
const Point& rMouseLocation)
{
const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]);
- ::boost::scoped_ptr<PopupMenu> pMenu (new PopupMenu ());
+ std::unique_ptr<PopupMenu> pMenu (new PopupMenu ());
if (rHelpLine.GetKind() == SDRHELPLINE_POINT)
{
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index d42f2aa894d8..0f7ff416f90b 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -62,7 +62,7 @@
#include "ViewShellBase.hxx"
#include "FormShellManager.hxx"
#include "DrawController.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 13f80cc720a8..7623e4bbb0c0 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -60,7 +60,7 @@
#include <svx/galleryitem.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -202,7 +202,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
CheckLineTo (rReq);
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- boost::scoped_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
+ std::unique_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
GetView()->GetAttributes( *pAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1c82bbccbb22..e2ff2092d92c 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -69,7 +69,7 @@
#include "DrawController.hxx"
#include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -553,7 +553,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
}
else
{
- boost::scoped_ptr<SvxZoomItem> pZoomItem;
+ std::unique_ptr<SvxZoomItem> pZoomItem;
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
if( mbZoomOnPage )
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index aada4c5cdc37..1e1e322f817d 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -63,7 +63,7 @@
#include <editeng/adjustitem.hxx>
#include <svx/nbdtmgfact.hxx>
#include <svx/nbdtmg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace svx::sidebar;
using namespace ::com::sun::star;
@@ -578,7 +578,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END );
aNewAttr.Put( aEditAttr, false );
- boost::scoped_ptr<SvxNumRule> pNumRule;
+ std::unique_ptr<SvxNumRule> pNumRule;
const SfxPoolItem* pTmpItem=NULL;
sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
sal_uInt16 nActNumLvl = mpDrawView->GetSelectionLevel();
@@ -676,7 +676,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
nWhich = aIter.NextWhich();
}
- boost::scoped_ptr<SfxItemSet> pSet;
+ std::unique_ptr<SfxItemSet> pSet;
if( bAttr )
{
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 7806b653dfea..a12ac7bb4b38 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -63,7 +63,7 @@
#include "framework/FrameworkHelper.hxx"
#include "DrawViewShell.hxx"
#include "slideshow.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
@@ -312,7 +312,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
GetActiveWindow(),
GetDoc()) : 0);
@@ -357,7 +357,7 @@ void OutlineViewShell::ShowSlideShow(SfxRequest& rReq)
void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if (nSId != SID_OUTLINE_BULLET && nSId != FN_SVX_SET_BULLET && nSId != FN_SVX_SET_NUMBER)
{
aGuard.reset( new OutlineViewModelChangeGuard(*pOlView) );
@@ -488,7 +488,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case SID_INSERT_FLD_PAGES:
case SID_INSERT_FLD_FILE:
{
- boost::scoped_ptr<SvxFieldItem> pFieldItem;
+ std::unique_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -583,10 +583,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
+ std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
- boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
+ std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index a690de1acc08..79f89985d09c 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -86,7 +86,7 @@
#include "DrawController.hxx"
#include "framework/FrameworkHelper.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -425,7 +425,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
bool bPreviewState = false;
sal_uLong nSlot = rReq.GetSlot();
- boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+ std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
if( pOlView && (
(nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
(nSlot == SID_TRANSLITERATE_TITLE_CASE) ||
@@ -1272,7 +1272,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
{
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
- boost::scoped_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
+ std::unique_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
// limit area
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 18fbf2e7e68b..675799067e9c 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -93,8 +93,8 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include "DrawController.hxx"
+#include <memory>
#include <numeric>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -1268,7 +1268,7 @@ bool View::ShouldToggleOn(
return false;
bool bToggleOn = false;
- boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount && !bToggleOn; ++nIndex)
{
@@ -1336,8 +1336,8 @@ void View::ChangeMarkedObjectsBulletsNumbering(
const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets );
- boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
- boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
+ std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ std::unique_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount; ++nIndex)
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 7bb04352864f..24bff878d70c 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -65,7 +65,7 @@
#include <vcl/svapp.hxx>
#include "slideshow.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd {
@@ -888,7 +888,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg;
+ std::unique_ptr<AbstractSvxNameDialog> pDlg;
if (pFact)
pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc ));
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index f0dd92267b69..d9a4211320fb 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -76,7 +76,7 @@
#include <vcl/cvtgrf.hxx>
#include <svx/sdrhittesthelper.hxx>
#include <svx/xbtmpit.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// - Namespaces -
@@ -267,7 +267,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
TransferableDataHelper aDataHelper( rDataHelper );
SdrObject* pPickObj = NULL;
SdPage* pPage = NULL;
- boost::scoped_ptr<ImageMap> pImageMap;
+ std::unique_ptr<ImageMap> pImageMap;
bool bReturn = false;
bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 );
bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink );
@@ -1504,7 +1504,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool View::PasteRTFTable( ::tools::SvRef<SotStorageStream> xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
{
- boost::scoped_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
+ std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
pModel->NewOrLoadCompleted(NEW_DOC);
pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
pModel->InsertPage(pModel->AllocPage(false));
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 815801549b5b..a48b08db6214 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -488,7 +488,7 @@ bool ViewOverlayManager::CreateTags()
{
bool bChanges = false;
- ::boost::shared_ptr<ViewShell> aMainShell = mrBase.GetMainViewShell();
+ std::shared_ptr<ViewShell> aMainShell = mrBase.GetMainViewShell();
SdPage* pPage = aMainShell.get() ? aMainShell->getCurrentPage() : NULL;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index dc49a6b508cd..c060272f5e4d 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -635,7 +635,7 @@ void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
if ( ! mpImpl->mpUpdateLockForMouse.expired())
{
- ::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
+ std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
mpImpl->mpUpdateLockForMouse);
if (pLock.get() != NULL)
pLock->Release();
@@ -683,7 +683,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
if ( ! mpImpl->mpUpdateLockForMouse.expired())
{
- ::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
+ std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
mpImpl->mpUpdateLockForMouse);
if (pLock.get() != NULL)
pLock->Release();
generated by cgit (git 2.34.1) at 2024-12-23 08:36:37 +0000