summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/ViewShellBase.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/ViewShellBase.cxx')
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx94
1 files changed, 23 insertions, 71 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 061ba1a17292..fe631fc3c574 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -242,12 +242,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new ViewShellBase object has been constructed.
-/*
-SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
- SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
SfxViewFactory* ViewShellBase::pFactory;
SfxViewShell* ViewShellBase::CreateInstance (
SfxViewFrame *pFrame, SfxViewShell *pOldView)
@@ -256,7 +250,7 @@ SfxViewShell* ViewShellBase::CreateInstance (
pBase->LateInit(OUString());
return pBase;
}
-void ViewShellBase::RegisterFactory( USHORT nPrio )
+void ViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
pFactory = new SfxViewFactory(
&CreateInstance,&InitFactory,nPrio,"Default");
@@ -346,8 +340,8 @@ ViewShellBase::~ViewShellBase (void)
void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView)
{
- StartListening(*GetViewFrame(),TRUE);
- StartListening(*GetDocShell(),TRUE);
+ StartListening(*GetViewFrame(),sal_True);
+ StartListening(*GetDocShell(),sal_True);
mpImpl->LateInit();
InitializeFramework();
@@ -557,7 +551,7 @@ void ViewShellBase::Rearrange (void)
OSL_TRACE("Rearrange: window missing");
}
- GetViewFrame()->Resize(TRUE);
+ GetViewFrame()->Resize(sal_True);
}
@@ -587,7 +581,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void)
-SfxPrinter* ViewShellBase::GetPrinter (BOOL bCreate)
+SfxPrinter* ViewShellBase::GetPrinter (sal_Bool bCreate)
{
OSL_ASSERT(mpImpl.get()!=NULL);
@@ -597,9 +591,9 @@ SfxPrinter* ViewShellBase::GetPrinter (BOOL bCreate)
-USHORT ViewShellBase::SetPrinter (
+sal_uInt16 ViewShellBase::SetPrinter (
SfxPrinter* pNewPrinter,
- USHORT nDiffFlags,
+ sal_uInt16 nDiffFlags,
bool bIsAPI)
{
OSL_ASSERT(mpImpl.get()!=NULL);
@@ -615,7 +609,7 @@ USHORT ViewShellBase::SetPrinter (
pNewPrinter->SetMapMode(aMap);
Size aNewSize = pNewPrinter->GetOutputSize();
- BOOL bScaleAll = FALSE;
+ sal_Bool bScaleAll = sal_False;
if ( bIsAPI )
{
WarningBox aWarnBox (
@@ -650,15 +644,6 @@ USHORT ViewShellBase::SetPrinter (
-PrintDialog* ViewShellBase::CreatePrintDialog (::Window *pParent)
-{
- (void)pParent;
- return NULL;
-}
-
-
-
-
SfxTabPage* ViewShellBase::CreatePrintOptionsPage(
::Window *pParent,
const SfxItemSet &rOptions)
@@ -671,39 +656,6 @@ SfxTabPage* ViewShellBase::CreatePrintOptionsPage(
-USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI, PrintDialog* pDlg)
-{
- (void)bIsAPI;
- (void)pDlg;
- return 0;
-}
-
-
-
-
-ErrCode ViewShellBase::DoPrint (
- SfxPrinter* pPrinter,
- PrintDialog* pPrintDialog,
- BOOL bSilent, BOOL bIsAPI )
-{
- (void)pPrinter;
- (void)pPrintDialog;
- (void)bSilent;
- (void)bIsAPI;
- return 0;
-}
-
-
-
-
-void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog)
-{
- SfxViewShell::PreparePrint (pPrintDialog);
-}
-
-
-
-
void ViewShellBase::UIActivating( SfxInPlaceClient* pClient )
{
mpImpl->ShowViewTabBar(false);
@@ -745,7 +697,7 @@ SvBorder ViewShellBase::GetBorder (bool )
void ViewShellBase::Execute (SfxRequest& rRequest)
{
- USHORT nSlotId = rRequest.GetSlot();
+ sal_uInt16 nSlotId = rRequest.GetSlot();
switch (nSlotId)
{
@@ -889,7 +841,7 @@ void ViewShellBase::ReadUserDataSequence (
-void ViewShellBase::Activate (BOOL bIsMDIActivate)
+void ViewShellBase::Activate (sal_Bool bIsMDIActivate)
{
SfxViewShell::Activate(bIsMDIActivate);
@@ -907,7 +859,7 @@ void ViewShellBase::Activate (BOOL bIsMDIActivate)
-void ViewShellBase::Deactivate (BOOL bIsMDIActivate)
+void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate)
{
SfxViewShell::Deactivate(bIsMDIActivate);
}
@@ -929,11 +881,11 @@ void ViewShellBase::SetZoomFactor (
-USHORT ViewShellBase::PrepareClose (BOOL bUI, BOOL bForBrowsing)
+sal_uInt16 ViewShellBase::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing)
{
- USHORT nResult = SfxViewShell::PrepareClose (bUI, bForBrowsing);
+ sal_uInt16 nResult = SfxViewShell::PrepareClose (bUI, bForBrowsing);
- if (nResult == TRUE)
+ if (nResult == sal_True)
{
mpImpl->mbIsClosing = true;
@@ -949,7 +901,7 @@ USHORT ViewShellBase::PrepareClose (BOOL bUI, BOOL bForBrowsing)
-void ViewShellBase::WriteUserData (String& rString, BOOL bBrowse)
+void ViewShellBase::WriteUserData (String& rString, sal_Bool bBrowse)
{
SfxViewShell::WriteUserData (rString, bBrowse);
@@ -962,7 +914,7 @@ void ViewShellBase::WriteUserData (String& rString, BOOL bBrowse)
-void ViewShellBase::ReadUserData (const String& rString, BOOL bBrowse)
+void ViewShellBase::ReadUserData (const String& rString, sal_Bool bBrowse)
{
SfxViewShell::ReadUserData (rString, bBrowse);
@@ -1327,9 +1279,9 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
void ViewShellBase::Implementation::ShowViewTabBar (bool bShow)
{
if (mpViewTabBar.is()
- && (mpViewTabBar->GetTabControl()->IsVisible()==TRUE) != bShow)
+ && (mpViewTabBar->GetTabControl()->IsVisible()==sal_True) != bShow)
{
- mpViewTabBar->GetTabControl()->Show(bShow ? TRUE : FALSE);
+ mpViewTabBar->GetTabControl()->Show(bShow ? sal_True : sal_False);
mrBase.Rearrange();
}
}
@@ -1405,8 +1357,8 @@ void ViewShellBase::Implementation::SetPaneVisibility (
// Determine the new visibility state.
const SfxItemSet* pArguments = rRequest.GetArgs();
- BOOL bShowChildWindow;
- USHORT nSlotId = rRequest.GetSlot();
+ sal_Bool bShowChildWindow;
+ sal_uInt16 nSlotId = rRequest.GetSlot();
if (pArguments != NULL)
bShowChildWindow = static_cast<const SfxBoolItem&>(
pArguments->Get(nSlotId)).GetValue();
@@ -1593,7 +1545,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
{
// Set the visibility state of the toolpanel and one of its top
// level panels.
- BOOL bShowToolPanel = TRUE;
+ sal_Bool bShowToolPanel = sal_True;
toolpanel::PanelId nPanelId (
toolpanel::PID_UNKNOWN);
bool bPanelIdGiven = false;
@@ -1605,14 +1557,14 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
if ((pArgs->Count() == 1) || (pArgs->Count() == 2))
{
SFX_REQUEST_ARG (rRequest, pIsPanelVisible,
- SfxBoolItem, ID_VAL_ISVISIBLE, FALSE);
+ SfxBoolItem, ID_VAL_ISVISIBLE, sal_False);
if (pIsPanelVisible != NULL)
bShowToolPanel = pIsPanelVisible->GetValue();
}
if (pArgs->Count() == 2)
{
SFX_REQUEST_ARG (rRequest, pPanelId, SfxUInt32Item,
- ID_VAL_PANEL_INDEX, FALSE);
+ ID_VAL_PANEL_INDEX, sal_False);
if (pPanelId != NULL)
{
nPanelId = static_cast<
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 02:55:25 +0000