summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg/dlgass.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg/dlgass.cxx')
-rw-r--r--sd/source/ui/dlg/dlgass.cxx190
1 files changed, 96 insertions, 94 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 5f39c74d59f1..c720f1c806d8 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -50,7 +50,7 @@
#include <svl/undo.hxx>
#include "DrawDocShell.hxx"
#include <vcl/gdimtf.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
#include "docprev.hxx"
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
@@ -101,7 +101,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap )
// ====================================================================
// ====================================================================
-UINT32 PageHelpIds[] =
+const char* PageHelpIds[] =
{
HID_SD_AUTOPILOT_PAGE1,
HID_SD_AUTOPILOT_PAGE2,
@@ -150,7 +150,7 @@ private:
class AssistentDlgImpl : public SfxListener
{
public:
- AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot );
+ AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot );
~AssistentDlgImpl();
/// Local mutex used to serialize concurrent method calls.
@@ -165,10 +165,10 @@ public:
files and insert them into a listbox.
*/
void ScanDocmenu (void);
- /** Flag that is set to TRUE after the recently used files have been
+ /** Flag that is set to sal_True after the recently used files have been
scanned.
*/
- BOOL mbRecentDocumentsReady;
+ sal_Bool mbRecentDocumentsReady;
/** When the list of templates has not been scanned already this is done
when this method is called. That includes requesting the whole list
@@ -190,16 +190,16 @@ public:
*/
void TemplateScanDone (std::vector<TemplateDir*>& rTemplateFolders);
- /** Flag that is set to TRUE after the impress templates have been
+ /** Flag that is set to sal_True after the impress templates have been
scanned.
*/
- BOOL mbTemplatesReady;
+ sal_Bool mbTemplatesReady;
/** Flag used to prevent nested or concurrent calls to the
<member>UpdatePreview</memember> method. A <TRUE/> value indicates
that a preview update is currently active.
*/
- BOOL mbPreviewUpdating;
+ sal_Bool mbPreviewUpdating;
::Window* mpWindow;
@@ -229,7 +229,7 @@ public:
TemplateDir* mpLayoutRegion;
// preview
- BOOL mbUserDataDirty;
+ sal_Bool mbUserDataDirty;
Timer maPrevTimer;
Timer maEffectPrevTimer;
Timer maUpdatePageListTimer;
@@ -239,19 +239,19 @@ public:
::std::auto_ptr<WindowUpdater> mpWindowUpdater;
- BOOL mbPreview;
- USHORT mnShowPage;
- BOOL mbDocPreview;
+ sal_Bool mbPreview;
+ sal_uInt16 mnShowPage;
+ sal_Bool mbDocPreview;
- ULONG mnTemplate;
+ sal_uLong mnTemplate;
String maPageListFile;
- void UpdatePreview( BOOL bDocPreview );
+ void UpdatePreview( sal_Bool bDocPreview );
void UpdatePageList();
void UpdateUserData();
- BOOL IsOwnFormat( const String& rPath );
+ sal_Bool IsOwnFormat( const String& rPath );
// dlg status
void EndDialog( long nResult = 0 );
@@ -362,15 +362,15 @@ public:
// ====================================================================
-AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ) :
+AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ) :
mpTemplateRegion(NULL),
mpLayoutRegion(NULL),
- mbUserDataDirty(FALSE),
+ mbUserDataDirty(sal_False),
xDocShell (NULL),
mpWindowUpdater (new WindowUpdater()),
- mbPreview(TRUE),
+ mbPreview(sal_True),
mnShowPage(0),
- mbDocPreview(FALSE),
+ mbDocPreview(sal_False),
maAssistentFunc(5),
maPreviewFlag(pWindow,SdResId(CB_PREVIEW)),
maStartWithFlag(pWindow,SdResId(CB_STARTWITH)),
@@ -384,9 +384,9 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
maOpenStr(SdResId(STR_OPEN))
{
maPageListFile += sal_Unicode('?'),
- mbRecentDocumentsReady = FALSE;
- mbTemplatesReady = FALSE;
- mbPreviewUpdating = FALSE;
+ mbRecentDocumentsReady = sal_False;
+ mbTemplatesReady = sal_False;
+ mbPreviewUpdating = sal_False;
mpWindow = pWindow;
@@ -445,8 +445,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
mpPage1OpenPB->SetModeImage(
GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open")))
);
- mpPage1OpenPB->EnableImageDisplay(TRUE);
- mpPage1OpenPB->EnableTextDisplay(TRUE);
+ mpPage1OpenPB->EnableImageDisplay(sal_True);
+ mpPage1OpenPB->EnableTextDisplay(sal_True);
mpPage1OpenPB->SetImageAlign(IMAGEALIGN_LEFT);
mpPage1OpenPB->SetStyle(mpPage1OpenPB->GetStyle() | WB_CENTER);
}
@@ -625,7 +625,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
mpWindowUpdater->RegisterWindow (&maPreview);
- UpdatePreview( TRUE );
+ UpdatePreview( sal_True );
//check wether we should start with a template document initialy and preselect it
const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) );
@@ -844,10 +844,10 @@ void AssistentDlgImpl::ScanDocmenu (void)
}
}
}
- mbRecentDocumentsReady = TRUE;
+ mbRecentDocumentsReady = sal_True;
try
{
- UpdatePreview(TRUE);
+ UpdatePreview(sal_True);
}
catch (uno::RuntimeException& )
{
@@ -867,7 +867,7 @@ void AssistentDlgImpl::ProvideTemplates (void)
try
{
- UpdatePreview(TRUE);
+ UpdatePreview(sal_True);
}
catch (uno::RuntimeException& e)
{
@@ -909,7 +909,7 @@ void AssistentDlgImpl::TemplateScanDone (
mpPage1RegionLB->InsertEntry (pDir->msRegion);
}
- mpPage1RegionLB->SelectEntryPos ((USHORT)nFirstEntry);
+ mpPage1RegionLB->SelectEntryPos ((sal_uInt16)nFirstEntry);
mpPage1RegionLB->Update();
SelectTemplateRegion (mpPage1RegionLB->GetSelectEntry());
@@ -934,12 +934,12 @@ void AssistentDlgImpl::TemplateScanDone (
mpPage2RegionLB->InsertEntry (pDir->msRegion);
}
- mpPage2RegionLB->SelectEntryPos ((USHORT)nFirstEntry);
+ mpPage2RegionLB->SelectEntryPos ((sal_uInt16)nFirstEntry);
mpPage2RegionLB->Update();
SelectLayoutRegion (mpPage2RegionLB->GetSelectEntry());
// Make the changes visible.
- mbTemplatesReady = TRUE;
+ mbTemplatesReady = sal_True;
if (mpWindow)
UpdatePage();
}
@@ -985,7 +985,7 @@ String AssistentDlgImpl::GetDocFileName()
if(mpWindow)
{
aTitle = mpWindow->GetText();
- USHORT nPos = aTitle.Search(sal_Unicode('('));
+ sal_uInt16 nPos = aTitle.Search(sal_Unicode('('));
if(nPos != STRING_NOTFOUND)
aTitle.Erase( nPos-1 );
}
@@ -993,9 +993,9 @@ String AssistentDlgImpl::GetDocFileName()
String aDocFile;
if( GetStartType() == ST_TEMPLATE )
{
- const USHORT nEntry = mpPage1TemplateLB->GetSelectEntryPos();
+ const sal_uInt16 nEntry = mpPage1TemplateLB->GetSelectEntryPos();
TemplateEntry* pEntry = NULL;
- if(nEntry != (USHORT)-1)
+ if(nEntry != (sal_uInt16)-1)
pEntry = mpTemplateRegion->maEntries[nEntry];
if(pEntry)
@@ -1009,8 +1009,8 @@ String AssistentDlgImpl::GetDocFileName()
}
else if( GetStartType() == ST_OPEN )
{
- const USHORT nEntry = mpPage1OpenLB->GetSelectEntryPos();
- if(nEntry != (USHORT)-1 )
+ const sal_uInt16 nEntry = mpPage1OpenLB->GetSelectEntryPos();
+ if(nEntry != (sal_uInt16)-1 )
aDocFile = *maOpenFilesList[nEntry];
}
@@ -1023,9 +1023,9 @@ String AssistentDlgImpl::GetDocFileName()
String AssistentDlgImpl::GetLayoutFileName()
{
String aFile;
- const USHORT nEntry = mpPage2LayoutLB->GetSelectEntryPos();
+ const sal_uInt16 nEntry = mpPage2LayoutLB->GetSelectEntryPos();
TemplateEntry* pEntry = NULL;
- if(nEntry != (USHORT)-1 && nEntry > 0)
+ if(nEntry != (sal_uInt16)-1 && nEntry > 0)
pEntry = mpLayoutRegion->maEntries[nEntry-1];
if(pEntry)
@@ -1036,7 +1036,7 @@ String AssistentDlgImpl::GetLayoutFileName()
SfxObjectShellLock AssistentDlgImpl::GetDocument()
{
- UpdatePreview(FALSE); // aber komplett laden
+ UpdatePreview(sal_False); // aber komplett laden
UpdatePageList();
SfxObjectShell* pShell = xDocShell;
@@ -1045,9 +1045,9 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument()
if(pDoc)
{
- const USHORT nPageCount = pDoc->GetSdPageCount(PK_STANDARD);
- BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked();
- UINT32 nNewTime = (UINT32)mpPage3PresTimeTMF->GetTime().GetMSFromTime() / 1000;
+ const sal_uInt16 nPageCount = pDoc->GetSdPageCount(PK_STANDARD);
+ sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked();
+ sal_uInt32 nNewTime = (sal_uInt32)mpPage3PresTimeTMF->GetTime().GetMSFromTime() / 1000;
if(bKiosk)
{
PresentationSettings& rSettings = pDoc->getPresentationSettings();
@@ -1056,8 +1056,8 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument()
rSettings.mbShowPauseLogo = mpPage3LogoCB->IsChecked();
}
- USHORT nPgAbsNum = 0;
- USHORT nPgRelNum = 0;
+ sal_uInt16 nPgAbsNum = 0;
+ sal_uInt16 nPgRelNum = 0;
while( nPgAbsNum < nPageCount )
{
SdPage* pPage = pDoc->GetSdPage( nPgRelNum, PK_STANDARD );
@@ -1107,10 +1107,12 @@ void AssistentDlgImpl::ChangePage()
maNextPageButton.Enable(!maAssistentFunc.IsLastPage());
maLastPageButton.Enable(!maAssistentFunc.IsFirstPage());
- USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage();
+ sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
if( mpWindow )
+ {
mpWindow->SetHelpId( PageHelpIds[nPage-1]);
+ }
UpdatePage();
@@ -1124,7 +1126,7 @@ void AssistentDlgImpl::ChangePage()
void AssistentDlgImpl::UpdatePage()
{
- USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage();
+ sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
switch(nPage)
{
@@ -1132,7 +1134,7 @@ void AssistentDlgImpl::UpdatePage()
{
// Elemente auf der ersten Seite abhaengig vom Starttype Zeigen
SetStartType( GetStartType() );
- mpPage1TemplateRB->Enable(TRUE /*mbTemplatesReady*/);
+ mpPage1TemplateRB->Enable(sal_True /*mbTemplatesReady*/);
break;
}
@@ -1143,11 +1145,11 @@ void AssistentDlgImpl::UpdatePage()
if( GetStartType() != ST_EMPTY )
{
- mpPage2Medium5RB->Enable( TRUE );
+ mpPage2Medium5RB->Enable( sal_True );
}
else
{
- mpPage2Medium5RB->Enable( FALSE );
+ mpPage2Medium5RB->Enable( sal_False );
if(mpPage2Medium5RB->IsChecked())
mpPage2Medium1RB->Check();
}
@@ -1168,7 +1170,7 @@ void AssistentDlgImpl::UpdatePage()
if(GetStartType() != ST_TEMPLATE)
maNextPageButton.Enable(false);
- BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked();
+ sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked();
mpPage3PresTimeFT->Enable(bKiosk);
mpPage3BreakFT->Enable(bKiosk);
mpPage3PresTimeTMF->Enable(bKiosk);
@@ -1239,7 +1241,7 @@ IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG )
if( maPreviewFlag.IsChecked() != mbPreview )
{
mbPreview = maPreviewFlag.IsChecked();
- UpdatePreview(TRUE);
+ UpdatePreview(sal_True);
}
return 0;
}
@@ -1268,11 +1270,11 @@ IMPL_LINK( AssistentDlgImpl, SelectFileHdl, ListBox *, EMPTYARG )
IMPL_LINK( AssistentDlgImpl, PageSelectHdl, Control *, EMPTYARG )
{
- USHORT nPage = mpPage5PageListCT->GetSelectedPage();
+ sal_uInt16 nPage = mpPage5PageListCT->GetSelectedPage();
if( mnShowPage != nPage )
{
mnShowPage = nPage;
- UpdatePreview(FALSE);
+ UpdatePreview(sal_False);
}
return 0;
@@ -1286,7 +1288,7 @@ IMPL_LINK( AssistentDlgImpl, UpdatePageListHdl, void *, EMPTYARG )
IMPL_LINK( AssistentDlgImpl, UpdatePreviewHdl, void *, EMPTYARG )
{
- UpdatePreview( TRUE );
+ UpdatePreview( sal_True );
return 0;
}
@@ -1343,7 +1345,7 @@ IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG )
maNextPageButton.Enable(false);
}
- BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked();
+ sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked();
mpPage3PresTimeFT->Enable(bKiosk);
mpPage3BreakFT->Enable(bKiosk);
mpPage3PresTimeTMF->Enable(bKiosk);
@@ -1354,7 +1356,7 @@ IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG )
IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG )
{
- mbUserDataDirty = TRUE;
+ mbUserDataDirty = sal_True;
String aTopic = mpPage4AskTopicEDT->GetText();
String aName = mpPage4AskNameEDT->GetText();
String aInfo = mpPage4AskInfoEDT->GetText();
@@ -1427,7 +1429,7 @@ void AssistentDlgImpl::UpdateUserData()
if(pPage && ( aTopic.Len() != 0 || aName.Len() != 0 || aInfo.Len() != 0 ) )
{
if( pPage->GetAutoLayout() == AUTOLAYOUT_NONE )
- pPage->SetAutoLayout(AUTOLAYOUT_TITLE, TRUE);
+ pPage->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True);
SdrTextObj* pObj;
String aEmptyString;
@@ -1438,8 +1440,8 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_TITLE, aTopic );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), TRUE );
- pObj->SetEmptyPresObj(FALSE);
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), sal_True );
+ pObj->SetEmptyPresObj(sal_False);
}
}
@@ -1455,8 +1457,8 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_OUTLINE, aStrTmp );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), TRUE );
- pObj->SetEmptyPresObj(FALSE);
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), sal_True );
+ pObj->SetEmptyPresObj(sal_False);
}
else
{
@@ -1464,20 +1466,20 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_TEXT, aStrTmp );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), TRUE );
- pObj->SetEmptyPresObj(FALSE);
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), sal_True );
+ pObj->SetEmptyPresObj(sal_False);
}
}
}
}
- mbUserDataDirty = FALSE;
+ mbUserDataDirty = sal_False;
}
void AssistentDlgImpl::UpdatePageList()
{
if(mbDocPreview || !mbPreview)
- UpdatePreview(FALSE);
+ UpdatePreview(sal_False);
else if(maPageListFile == maDocFile)
return;
@@ -1493,20 +1495,20 @@ void AssistentDlgImpl::UpdatePageList()
mpPage5PageListCT->Fill(pDoc);
}
-void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
+void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview )
{
// Guard against multiple concurrent execution to this method caused either
// by calls from different threads or recursion.
::osl::MutexGuard aGuard (maMutex);
if (mbPreviewUpdating)
return;
- mbPreviewUpdating = TRUE;
+ mbPreviewUpdating = sal_True;
if(!mbPreview && bDocPreview)
{
maPreview.Invalidate();
maPreview.SetObjectShell(0);
- mbPreviewUpdating = FALSE;
+ mbPreviewUpdating = sal_False;
return;
}
@@ -1515,8 +1517,8 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
String aEmptyStr;
SfxApplication *pSfxApp = SFX_APP();
- ULONG lErr;
- BOOL bChangeMaster = aLayoutFile.Len() != 0;
+ sal_uLong lErr;
+ sal_Bool bChangeMaster = aLayoutFile.Len() != 0;
if( aDocFile.Len() == 0 )
{
@@ -1526,15 +1528,15 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
CloseDocShell();
DrawDocShell* pNewDocSh;
- xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, FALSE);
+ xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_False);
pNewDocSh->DoInitNew(NULL);
SdDrawDocument* pDoc = pNewDocSh->GetDoc();
pDoc->CreateFirstPages();
pDoc->StopWorkStartupDelay();
- mbDocPreview = FALSE;
+ mbDocPreview = sal_False;
maDocFile = aDocFile;
- mbUserDataDirty = TRUE;
+ mbUserDataDirty = sal_True;
}
else
bChangeMaster = (aLayoutFile.Len() != 0) && (maLayoutFile != aLayoutFile);
@@ -1545,13 +1547,13 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
{
SfxObjectShell* pShell = xDocShell;
DrawDocShell* pDocShell = PTR_CAST(DrawDocShell,pShell);
- SfxUndoManager* pUndoMgr = pDocShell?pDocShell->GetUndoManager():NULL;
+ ::svl::IUndoManager* pUndoMgr = pDocShell?pDocShell->GetUndoManager():NULL;
if(pUndoMgr)
pUndoMgr->Undo();
- mbUserDataDirty = TRUE;
+ mbUserDataDirty = sal_True;
}
else
- bChangeMaster = FALSE;
+ bChangeMaster = sal_False;
}
else
{
@@ -1565,11 +1567,11 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() );
if(IsOwnFormat(aDocFile))
{
- pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+ pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
if(bDocPreview)
- pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) );
+ pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) );
RestorePassword( pSet, aDocFile );
- if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, TRUE, pSet )) != 0 )
+ if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, sal_True, pSet )) != 0 )
ErrorHandler::HandleError(lErr);
else
SavePassword( xDocShell, aDocFile );
@@ -1582,7 +1584,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) );
aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) );
- aReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
+ aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) );
@@ -1597,7 +1599,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
mnShowPage = 0;
mbDocPreview = bDocPreview;
maDocFile = aDocFile;
- mbUserDataDirty = TRUE;
+ mbUserDataDirty = sal_True;
}
if(bChangeMaster && (aLayoutFile != maDocFile))
@@ -1612,11 +1614,11 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
if(IsOwnFormat(aLayoutFile))
{
- pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
- pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) );
+ pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
+ pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) );
RestorePassword( pSet, aLayoutFile );
- if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, TRUE, pSet )) != 0 )
+ if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, sal_True, pSet )) != 0 )
ErrorHandler::HandleError(lErr);
SavePassword( xLayoutDocShell, aLayoutFile );
}
@@ -1634,14 +1636,14 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
if( pDoc && pLayoutDoc )
{
- pDoc->SetMasterPage(0, aEmptyStr, pLayoutDoc, TRUE, FALSE );
+ pDoc->SetMasterPage(0, aEmptyStr, pLayoutDoc, sal_True, sal_False );
}
else
{
OSL_FAIL("sd::AssistentDlgImpl::UpdatePreview(), no document for preview?");
}
- mbUserDataDirty = TRUE;
+ mbUserDataDirty = sal_True;
}
maLayoutFile = aLayoutFile;
@@ -1655,7 +1657,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
maPreview.SetObjectShell( xDocShell, mnShowPage );
}
- mbPreviewUpdating = FALSE;
+ mbPreviewUpdating = sal_False;
}
void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const String& rPath )
@@ -1667,7 +1669,7 @@ void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const String& rPat
{
SfxItemSet * pSet = pMedium->GetItemSet();
const SfxPoolItem *pItem = 0;
- if( pSet->GetItemState(SID_PASSWORD, TRUE, &pItem) == SFX_ITEM_SET )
+ if( pSet->GetItemState(SID_PASSWORD, sal_True, &pItem) == SFX_ITEM_SET )
{
//TODO/MBA: testing
String aPass( ((const SfxStringItem*)pItem)->GetValue());
@@ -1724,7 +1726,7 @@ void AssistentDlgImpl::DeletePassords()
maPasswordList.clear();
}
-BOOL AssistentDlgImpl::IsOwnFormat( const String& rPath )
+sal_Bool AssistentDlgImpl::IsOwnFormat( const String& rPath )
{
INetURLObject aURL( rPath );
String aExt( aURL.GetFileExtension() );
@@ -1856,7 +1858,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL)
//////////////////////////////////////////////
-AssistentDlg::AssistentDlg(Window* pParent, BOOL bAutoPilot) :
+AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) :
ModalDialog(pParent,SdResId(DLG_ASS))
{
Link aFinishLink = LINK(this,AssistentDlg, FinishHdl);
@@ -1890,7 +1892,7 @@ IMPL_LINK( AssistentDlg, FinishHdl, OKButton *, EMPTYARG )
INetURLObject aURL;
aURL.SetSmartURL(aFileToOpen);
mpImpl->maOpenFilesList.push_back (new String (aURL.GetMainURL( INetURLObject::NO_DECODE )));
- USHORT nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName());
+ sal_uInt16 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName());
mpImpl->mpPage1OpenLB->SelectEntryPos(nNewPos);
}
}
@@ -1927,7 +1929,7 @@ OutputType AssistentDlg::GetOutputMedium() const
return OUTPUT_ORIGINAL;
}
-BOOL AssistentDlg::IsSummary() const
+sal_Bool AssistentDlg::IsSummary() const
{
return mpImpl->mpPage5SummaryCB->IsChecked();
}
@@ -1942,12 +1944,12 @@ String AssistentDlg::GetDocPath() const
return mpImpl->GetDocFileName();
}
-BOOL AssistentDlg::GetStartWithFlag() const
+sal_Bool AssistentDlg::GetStartWithFlag() const
{
return !mpImpl->maStartWithFlag.IsChecked();
}
-BOOL AssistentDlg::IsDocEmpty() const
+sal_Bool AssistentDlg::IsDocEmpty() const
{
return mpImpl->GetDocFileName().Len() == 0 &&
mpImpl->GetLayoutFileName().Len() == 0;
generated by cgit (git 2.34.1) at 2025-02-04 07:22:27 +0000