summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/docshell')
-rw-r--r--sd/source/ui/docshell/docshel2.cxx18
-rw-r--r--sd/source/ui/docshell/docshel3.cxx6
-rw-r--r--sd/source/ui/docshell/docshel4.cxx26
-rw-r--r--sd/source/ui/docshell/docshell.cxx46
-rw-r--r--sd/source/ui/docshell/sdclient.cxx2
5 files changed, 49 insertions, 49 deletions
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 87b97987748f..3ec1a9eb3ae6 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -52,7 +52,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
// THUMBNAIL: here we may can set the draft mode
}
- ClientView* pView = new ClientView(this, pOut, NULL);
+ ClientView* pView = new ClientView(this, pOut, nullptr);
pView->SetHlplVisible(false);
pView->SetGridVisible(false);
@@ -60,7 +60,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
pView->SetPageVisible(false);
pView->SetGlueVisible(false);
- SdPage* pSelectedPage = NULL;
+ SdPage* pSelectedPage = nullptr;
const std::vector<sd::FrameView*> &rViews = mpDoc->GetFrameViewList();
if( !rViews.empty() )
@@ -73,9 +73,9 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
}
}
- if( NULL == pSelectedPage )
+ if( nullptr == pSelectedPage )
{
- SdPage* pPage = NULL;
+ SdPage* pPage = nullptr;
sal_uInt16 nPageCnt = (sal_uInt16) mpDoc->GetSdPageCount(PK_STANDARD);
for (sal_uInt16 i = 0; i < nPageCnt; i++)
@@ -86,7 +86,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
pSelectedPage = pPage;
}
- if( NULL == pSelectedPage )
+ if( nullptr == pSelectedPage )
pSelectedPage = mpDoc->GetSdPage(0, PK_STANDARD);
}
@@ -163,13 +163,13 @@ void DrawDocShell::Disconnect(ViewShell* pViewSh)
{
if (mpViewShell == pViewSh)
{
- mpViewShell = NULL;
+ mpViewShell = nullptr;
}
}
FrameView* DrawDocShell::GetFrameView()
{
- FrameView* pFrameView = NULL;
+ FrameView* pFrameView = nullptr;
if (mpViewShell)
{
@@ -211,7 +211,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe
aMapMode.SetScaleY( aFrac );
pVDev->SetMapMode( aMapMode );
- ClientView* pView = new ClientView( this, pVDev, NULL );
+ ClientView* pView = new ClientView( this, pVDev, nullptr );
FrameView* pFrameView = GetFrameView();
pView->ShowSdrPage( pPage );
@@ -290,7 +290,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName )
{
OUString aDesc( SD_RESSTR( STR_WARN_PAGE_EXISTS ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0;
+ AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : nullptr;
if( aNameDlg )
{
aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 7775d83c5c3b..ccbc6989fe36 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -183,11 +183,11 @@ void DrawDocShell::Execute( SfxRequest& rReq )
if (pShell == pFirstShell)
{
- pShell = NULL;
+ pShell = nullptr;
}
}
- SetDocShellFunction(0);
+ SetDocShellFunction(nullptr);
Invalidate();
rReq.Done();
}
@@ -256,7 +256,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
if( mpViewShell )
{
rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create( mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) );
- static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true );
+ static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, nullptr, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true );
}
}
break;
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index b91cd3407b0f..0ab60d24b0dd 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -157,12 +157,12 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter)
void DrawDocShell::UpdateFontList()
{
delete mpFontList;
- OutputDevice* pRefDevice = NULL;
+ OutputDevice* pRefDevice = nullptr;
if ( mpDoc->GetPrinterIndependentLayout() == css::document::PrinterIndependentLayout::DISABLED )
pRefDevice = GetPrinter(true);
else
pRefDevice = SD_MOD()->GetVirtualRefDevice();
- mpFontList = new FontList( pRefDevice, NULL, false );
+ mpFontList = new FontList( pRefDevice, nullptr, false );
SvxFontListItem aFontListItem( mpFontList, SID_ATTR_CHAR_FONTLIST );
PutItem( aFontListItem );
}
@@ -341,7 +341,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
{
mbNewDocument = false;
- WaitObject* pWait = NULL;
+ WaitObject* pWait = nullptr;
if( mpViewShell )
pWait = new WaitObject( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) );
@@ -574,7 +574,7 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
{
const SfxFilter* pMediumFilter = rMedium.GetFilter();
const OUString aTypeName( pMediumFilter->GetTypeName() );
- SdFilter* pFilter = NULL;
+ SdFilter* pFilter = nullptr;
if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
{
@@ -678,7 +678,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
bool bIsMasterPage = false;
sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND;
- SdrObject* pObj = NULL;
+ SdrObject* pObj = nullptr;
OUString sBookmark( rBookmark );
const OUString sInteraction( "action?" );
@@ -781,11 +781,11 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
}
else
{
- pDrawViewShell = NULL;
+ pDrawViewShell = nullptr;
}
}
- if (pDrawViewShell != NULL)
+ if (pDrawViewShell != nullptr)
{
setEditMode(pDrawViewShell, bIsMasterPage);
@@ -808,7 +808,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
pDrawViewShell->SwitchPage(nSdPgNum);
}
- if (pObj != NULL)
+ if (pObj != nullptr)
{
// show and select object
pDrawViewShell->MakeVisible(pObj->GetLogicRect(),
@@ -821,7 +821,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
}
}
- SfxBindings& rBindings = ((pDrawViewShell && pDrawViewShell->GetViewFrame()!=NULL)
+ SfxBindings& rBindings = ((pDrawViewShell && pDrawViewShell->GetViewFrame()!=nullptr)
? pDrawViewShell->GetViewFrame()
: SfxViewFrame::Current() )->GetBindings();
@@ -867,7 +867,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
// Is the bookmark a page ?
bool bIsMasterPage;
sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
- SdrObject* pObj = NULL;
+ SdrObject* pObj = nullptr;
if (nPgNum == SDRPAGE_NOTFOUND)
{
@@ -946,7 +946,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
// is the bookmark a page ?
bool bIsMasterPage;
sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
- SdrObject* pObj = NULL;
+ SdrObject* pObj = nullptr;
if (nPgNum == SDRPAGE_NOTFOUND)
{
@@ -1111,7 +1111,7 @@ OutputDevice* DrawDocShell::GetDocumentRefDev()
OutputDevice* pReferenceDevice = SfxObjectShell::GetDocumentRefDev ();
// Only when our parent does not have a reference device then we return
// our own.
- if (pReferenceDevice == NULL && mpDoc != NULL)
+ if (pReferenceDevice == nullptr && mpDoc != nullptr)
pReferenceDevice = mpDoc->GetRefDevice ();
return pReferenceDevice;
}
@@ -1122,7 +1122,7 @@ void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL )
{
SfxStringItem aStrItem( SID_FILE_NAME, rBookmarkURL );
SfxStringItem aReferer( SID_REFERER, GetMedium()->GetName() );
- const SfxPoolItem* ppArgs[] = { &aStrItem, &aReferer, 0 };
+ const SfxPoolItem* ppArgs[] = { &aStrItem, &aReferer, nullptr };
( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs );
}
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 7b252ff9268c..6c83b119c884 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -97,7 +97,7 @@ void DrawDocShell::Construct( bool bClipboard )
mbInDestruction = false;
SetSlotFilter(); // setzt Filter zurueck
- mbOwnDocument = mpDoc == 0;
+ mbOwnDocument = mpDoc == nullptr;
if( mbOwnDocument )
mpDoc = new SdDrawDocument(meDocType, this);
@@ -118,13 +118,13 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
bool bDataObject,
DocumentType eDocumentType) :
SfxObjectShell( eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode),
- mpDoc(NULL),
- mpUndoManager(NULL),
- mpPrinter(NULL),
- mpViewShell(NULL),
- mpFontList(NULL),
+ mpDoc(nullptr),
+ mpUndoManager(nullptr),
+ mpPrinter(nullptr),
+ mpViewShell(nullptr),
+ mpFontList(nullptr),
meDocType(eDocumentType),
- mpFilterSIDs(0),
+ mpFilterSIDs(nullptr),
mbSdDataObj(bDataObject),
mbOwnPrinter(false),
mbNewDocument( true )
@@ -134,13 +134,13 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
DrawDocShell::DrawDocShell( SfxModelFlags nModelCreationFlags, bool bDataObject, DocumentType eDocumentType ) :
SfxObjectShell( nModelCreationFlags ),
- mpDoc(NULL),
- mpUndoManager(NULL),
- mpPrinter(NULL),
- mpViewShell(NULL),
- mpFontList(NULL),
+ mpDoc(nullptr),
+ mpUndoManager(nullptr),
+ mpPrinter(nullptr),
+ mpViewShell(nullptr),
+ mpFontList(nullptr),
meDocType(eDocumentType),
- mpFilterSIDs(0),
+ mpFilterSIDs(nullptr),
mbSdDataObj(bDataObject),
mbOwnPrinter(false),
mbNewDocument( true )
@@ -153,12 +153,12 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode,
DocumentType eDocumentType) :
SfxObjectShell(eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode),
mpDoc(pDoc),
- mpUndoManager(NULL),
- mpPrinter(NULL),
- mpViewShell(NULL),
- mpFontList(NULL),
+ mpUndoManager(nullptr),
+ mpPrinter(nullptr),
+ mpViewShell(nullptr),
+ mpFontList(nullptr),
meDocType(eDocumentType),
- mpFilterSIDs(0),
+ mpFilterSIDs(nullptr),
mbSdDataObj(bDataObject),
mbOwnPrinter(false),
mbNewDocument( true )
@@ -176,12 +176,12 @@ DrawDocShell::~DrawDocShell()
mbInDestruction = true;
- SetDocShellFunction(0);
+ SetDocShellFunction(nullptr);
delete mpFontList;
if( mpDoc )
- mpDoc->SetSdrUndoManager( 0 );
+ mpDoc->SetSdrUndoManager( nullptr );
delete mpUndoManager;
if (mbOwnPrinter)
@@ -366,7 +366,7 @@ void DrawDocShell::CancelSearching()
{
if( dynamic_cast<FuSearch*>( mxDocShellFunction.get() ) )
{
- SetDocShellFunction(0);
+ SetDocShellFunction(nullptr);
}
}
@@ -421,8 +421,8 @@ void DrawDocShell::SetModified( bool bSet /* = true */ )
// to get hands on the outliner and the text object.
IMPL_LINK_TYPED(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void)
{
- SdrObject* pObj = NULL;
- SdrOutliner* pOutl = NULL;
+ SdrObject* pObj = nullptr;
+ SdrOutliner* pOutl = nullptr;
if(GetViewShell())
{
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index d33e05478896..55f3295834e8 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -41,7 +41,7 @@ Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, vcl::Window* pWindow) :
SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ),
mpViewShell(pViewShell),
pSdrOle2Obj(pObj),
- pSdrGrafObj(NULL)
+ pSdrGrafObj(nullptr)
{
SetObject( pObj->GetObjRef() );
DBG_ASSERT( GetObject().is(), "No object connected!" );
generated by cgit (git 2.34.1) at 2024-07-31 21:07:09 +0000