diff options
Diffstat (limited to 'sd/source/ui/dlg')
68 files changed, 1080 insertions, 762 deletions
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index 31653a407..a0a137918 100644..100755 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -50,7 +50,7 @@ SFX_IMPL_DOCKINGWINDOW(AnimationChildWindow, SID_ANIMATION_OBJECTS) AnimationChildWindow::AnimationChildWindow( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -76,7 +76,7 @@ AnimationChildWindow::AnimationChildWindow( pAnimWin->aFltWinSize = pWindow->GetSizePixel(); */ - SetHideNotDelete( TRUE ); + SetHideNotDelete( sal_True ); } } // end of namespace sd diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx index 1e07b179d..00fdc406b 100644..100755 --- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx +++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx @@ -54,7 +54,7 @@ namespace sd { LayerDialogChildWindow::LayerDialogChildWindow ( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index dfc592219..ecd1ec3c7 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -87,7 +87,7 @@ LayerDialogContent::~LayerDialogContent (void) -BOOL LayerDialogContent::Close (void) +sal_Bool LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 624304d84..af5ccf16a 100644..100755 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -105,26 +105,26 @@ void LayerTabBar::Select() void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bSetPageID=FALSE; + sal_Bool bSetPageID=sal_False; if (rMEvt.IsLeft() && !rMEvt.IsMod1() && !rMEvt.IsMod2()) { Point aPosPixel = rMEvt.GetPosPixel(); - USHORT aLayerId = GetPageId( PixelToLogic(aPosPixel) ); + sal_uInt16 aLayerId = GetPageId( PixelToLogic(aPosPixel) ); if (aLayerId == 0) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_INSERTLAYER, SFX_CALLMODE_SYNCHRON); - bSetPageID=TRUE; + bSetPageID=sal_True; } else if (rMEvt.IsShift()) { // Toggle zw. Layer sichtbar / unsichtbar String aName(GetPageText(aLayerId)); SdrPageView* pPV = pDrViewSh->GetView()->GetSdrPageView(); - BOOL bVisible = pPV->IsLayerVisible(aName); + sal_Bool bVisible = pPV->IsLayerVisible(aName); pPV->SetLayerVisible(aName, !bVisible); pDrViewSh->ResetActualLayer(); } @@ -161,9 +161,9 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { - USHORT nPageId = SDRPAGE_NOTFOUND; + sal_uInt16 nPageId = SDRPAGE_NOTFOUND; Point aPos( PixelToLogic( rEvt.maPosPixel ) ); - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); + sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), sal_False ); nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, nPageId, nLayerId ); @@ -181,8 +181,8 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); + sal_uInt16 nPageId = SDRPAGE_NOTFOUND; + sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), sal_False ); sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); EndSwitchPage(); @@ -202,7 +202,7 @@ void LayerTabBar::Command(const CommandEvent& rCEvt) long LayerTabBar::StartRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; String aLayerName = GetPageText( GetEditPageId() ); String aLayoutLayer ( SdResId(STR_LAYER_LAYOUT) ); String aControlsLayer ( SdResId(STR_LAYER_CONTROLS) ); @@ -215,7 +215,7 @@ long LayerTabBar::StartRenaming() aLayerName == aBackgroundLayer || aLayerName == aBackgroundObjLayer ) { // Diese Namen duerfen nicht veraendert werden - bOK = FALSE; + bOK = sal_False; } else { @@ -232,7 +232,7 @@ long LayerTabBar::StartRenaming() long LayerTabBar::AllowRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; // Ueberpruefung auf schon vorhandene Namen ::sd::View* pView = pDrViewSh->GetView(); @@ -242,13 +242,13 @@ long LayerTabBar::AllowRenaming() String aNewName( GetEditText() ); if ( aNewName.Len() == 0 || - (rLayerAdmin.GetLayer( aNewName, FALSE ) && aLayerName != aNewName) ) + (rLayerAdmin.GetLayer( aNewName, sal_False ) && aLayerName != aNewName) ) { // Name ist schon vorhanden WarningBox aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ), String(SdResId( STR_WARN_NAME_DUPLICATE ) ) ); aWarningBox.Execute(); - bOK = FALSE; + bOK = sal_False; } if (bOK) @@ -264,7 +264,7 @@ long LayerTabBar::AllowRenaming() aNewName == aBackgroundLayer || aNewName == aBackgroundObjLayer ) { // Diese Namen duerfen nicht vergeben werden - bOK = FALSE; + bOK = sal_False; } } @@ -281,7 +281,7 @@ void LayerTabBar::EndRenaming() SdDrawDocument* pDoc = pView->GetDoc(); String aLayerName = pView->GetActiveLayer(); SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, FALSE); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); if (pLayer) { @@ -290,7 +290,7 @@ void LayerTabBar::EndRenaming() DBG_ASSERT( pDrView, "Rename layer undo action is only working with a SdDrawView" ); if( pDrView ) { - SfxUndoManager* pManager = pDoc->GetDocSh()->GetUndoManager(); + ::svl::IUndoManager* pManager = pDoc->GetDocSh()->GetUndoManager(); SdLayerModifyUndoAction* pAction = new SdLayerModifyUndoAction( pDoc, pLayer, @@ -315,7 +315,7 @@ void LayerTabBar::EndRenaming() // schon bekannt sein muss. pView->SetActiveLayer(aNewName); pLayer->SetName(aNewName); - pDoc->SetChanged(TRUE); + pDoc->SetChanged(sal_True); } } } diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index bf32e60de..9fe363e7f 100644..100755 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -41,7 +41,7 @@ SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR) NavigatorChildWindow::NavigatorChildWindow ( ::Window* pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindowContext( nId ) diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index e4a1b7537..138e9559c 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -63,11 +63,11 @@ SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) PaneChildWindow::PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const USHORT nDockWinTitleResId, - const USHORT nTitleBarResId, + const sal_uInt16 nDockWinTitleResId, + const sal_uInt16 nTitleBarResId, SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { @@ -79,7 +79,7 @@ PaneChildWindow::PaneChildWindow ( String( SdResId( nTitleBarResId ) ) ); eChildAlignment = eAlignment; static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); - SetHideNotDelete(TRUE); + SetHideNotDelete(sal_True); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); if (pBase != NULL) @@ -111,7 +111,7 @@ PaneChildWindow::~PaneChildWindow (void) LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -132,7 +132,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -153,7 +153,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( //= ToolPanelChildWindow //====================================================================================================================== //---------------------------------------------------------------------------------------------------------------------- -ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index a6eafa15f..914aa7020 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -32,12 +32,16 @@ #include "PaneDockingWindow.hxx" #include "Window.hxx" #include "ViewShellBase.hxx" +#include "framework/FrameworkHelper.hxx" #include "sdresid.hxx" #include "res_bmp.hrc" #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/taskpanelist.hxx> -#include "framework/FrameworkHelper.hxx" +#include <vcl/splitwin.hxx> +#include <vcl/svapp.hxx> +#include <tools/wintypes.hxx> +#include <boost/bind.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,6 +66,11 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) { switch (nType) { + case STATE_CHANGE_INITSHOW: + Resize(); + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); + break; + case STATE_CHANGE_VISIBLE: // The visibility of the docking window has changed. Tell the // ConfigurationController so that it can activate or deactivate @@ -79,6 +88,63 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) SfxDockingWindow::StateChanged (nType); } +void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent) +{ + if (rEvent.GetButtons() == MOUSE_LEFT) + { + // For some strange reason we have to set the WB_DIALOGCONTROL at + // the content window in order to have it pass focus to its content + // window. Without setting this flag here that works only on views + // that have not been taken from the cash and relocated to this pane + // docking window. + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); + GetContentWindow().GrabFocus(); + } + SfxDockingWindow::MouseButtonDown(rEvent); +} + + + + + + + + +void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) +{ + SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); + if (pSplitWindow != NULL) + { + const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const sal_uInt16 nSetId (pSplitWindow->GetSet(nId)); + // Because the PaneDockingWindow paints its own decoration, we have + // to compensate the valid size range for that. + const SvBorder aBorder (GetDecorationBorder()); + sal_Int32 nCompensation (pSplitWindow->IsHorizontal() + ? mnTitleBarHeight + aBorder.Top() + aBorder.Bottom() + : aBorder.Left() + aBorder.Right()); + pSplitWindow->SetItemSizeRange( + nSetId, + Range( + aValidSizeRange.Min() + nCompensation, + aValidSizeRange.Max() + nCompensation)); + } +} + + + + +PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const +{ + SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); + if (pSplitWindow == NULL) + return UnknownOrientation; + else if (pSplitWindow->IsHorizontal()) + return HorizontalOrientation; + else + return VerticalOrientation; +} + } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index 0b366e142..aff5487ac 100755..100644 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -29,7 +29,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -45,7 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -61,7 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index f3699d3a9..c74a2829d 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -52,7 +52,7 @@ namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : ::svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), @@ -111,7 +111,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) // check. if (aResult.size() == 0) { - SfxBoolItem aItem (SID_SPELL_DIALOG, FALSE); + SfxBoolItem aItem (SID_SPELL_DIALOG, sal_False); GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, SFX_CALLMODE_ASYNCHRON, diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index cd56394b9..4d6daeb87 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -155,35 +155,34 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aNumFldBitmap ( this, SdResId( NUM_FLD_BITMAP ) ), aTimeField ( this, SdResId( TIME_FIELD ) ), aLbLoopCount ( this, SdResId( LB_LOOP_COUNT ) ), - + aGrpBitmap ( this, SdResId( GRP_BITMAP ) ), aBtnGetOneObject ( this, SdResId( BTN_GET_ONE_OBJECT ) ), aBtnGetAllObjects ( this, SdResId( BTN_GET_ALL_OBJECTS ) ), aBtnRemoveBitmap ( this, SdResId( BTN_REMOVE_BITMAP ) ), aBtnRemoveAll ( this, SdResId( BTN_REMOVE_ALL ) ), aFtCount ( this, SdResId( FT_COUNT ) ), aFiCount ( this, SdResId( FI_COUNT ) ), - aGrpBitmap ( this, SdResId( GRP_BITMAP ) ), - + aGrpAnimation ( this, SdResId( GRP_ANIMATION_GROUP ) ), aRbtGroup ( this, SdResId( RBT_GROUP ) ), aRbtBitmap ( this, SdResId( RBT_BITMAP ) ), aFtAdjustment ( this, SdResId( FT_ADJUSTMENT ) ), aLbAdjustment ( this, SdResId( LB_ADJUSTMENT ) ), aBtnCreateGroup ( this, SdResId( BTN_CREATE_GROUP ) ), - aGrpAnimation ( this, SdResId( GRP_ANIMATION_GROUP ) ), pWin ( pParent ), pBitmapEx ( NULL ), - bMovie ( FALSE ), - bAllObjects ( FALSE ), + bMovie ( sal_False ), + bAllObjects ( sal_False ), pBindings ( pInBindings ) { + aCtlDisplay.SetAccessibleName(String (SdResId(STR_DISPLAY))); FreeResource(); // neues Dokument mit Seite erzeugen pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL); - SdPage* pPage = (SdPage*) pMyDoc->AllocPage(FALSE); + SdPage* pPage = (SdPage*) pMyDoc->AllocPage(sal_False); pMyDoc->InsertPage(pPage); pControllerItem = new AnimationControllerItem( SID_ANIMATOR_STATE, this, pBindings ); @@ -219,13 +218,18 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, // der Animator ist leer; es kann keine Animationsgruppe erstellt werden aBtnCreateGroup.Disable(); + + aBtnGetOneObject.SetAccessibleRelationMemberOf( &aGrpBitmap ); + aBtnGetAllObjects.SetAccessibleRelationMemberOf( &aGrpBitmap ); + aBtnRemoveBitmap.SetAccessibleRelationMemberOf( &aGrpBitmap ); + aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap ); } // ----------------------------------------------------------------------- AnimationWindow::~AnimationWindow() { - ULONG i, nCount; + sal_uLong i, nCount; delete pControllerItem; @@ -258,7 +262,7 @@ IMPL_LINK( AnimationWindow, ClickFirstHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ClickStopHdl, void *, EMPTYARG ) { - bMovie = FALSE; + bMovie = sal_False; return( 0L ); } @@ -268,22 +272,22 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { ScopeLockGuard aGuard( maPlayLock ); - bMovie = TRUE; - BOOL bDisableCtrls = FALSE; - ULONG nCount = aBmpExList.Count(); - BOOL bReverse = p == &aBtnReverse; + bMovie = sal_True; + sal_Bool bDisableCtrls = sal_False; + sal_uLong nCount = aBmpExList.Count(); + sal_Bool bReverse = p == &aBtnReverse; // Kann spaeter schwer ermittelt werden - BOOL bRbtGroupEnabled = aRbtGroup.IsEnabled(); - BOOL bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); - BOOL bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); + sal_Bool bRbtGroupEnabled = aRbtGroup.IsEnabled(); + sal_Bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); + sal_Bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // Gesamtzeit ermitteln Time aTime( 0 ); long nFullTime; if( aRbtBitmap.IsChecked() ) { - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) aTime += *static_cast< Time* >( aTimeList.GetObject( i ) ); nFullTime = aTime.GetMSFromTime(); } @@ -297,16 +301,16 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) SfxProgress* pProgress = NULL; if( nFullTime >= 1000 ) { - bDisableCtrls = TRUE; + bDisableCtrls = sal_True; aBtnStop.Enable(); aBtnStop.Update(); String aStr( RTL_CONSTASCII_USTRINGPARAM( "Animator:" ) ); // Hier sollte man sich noch etwas gescheites ausdenken! pProgress = new SfxProgress( NULL, aStr, nFullTime ); } - ULONG nTmpTime = 0; + sal_uLong nTmpTime = 0; long i = 0; - BOOL bCount = i < (long) nCount; + sal_Bool bCount = i < (long) nCount; if( bReverse ) { i = nCount - 1; @@ -326,7 +330,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) DBG_ASSERT( pTime, "Keine Zeit gefunden!" ); aTimeField.SetTime( *pTime ); - ULONG nTime = pTime->GetMSFromTime(); + sal_uLong nTime = pTime->GetMSFromTime(); WaitInEffect( nTime, nTmpTime, pProgress ); nTmpTime += nTime; @@ -361,7 +365,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) } // Um die Controls wieder zu enablen - bMovie = FALSE; + bMovie = sal_False; if (nCount > 0) UpdateControl(i); @@ -396,12 +400,12 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) if( !pBitmapEx || p == &aRbtGroup || aRbtGroup.IsChecked() ) { aTimeField.SetText( String() ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); } else if( p == &aRbtBitmap || aRbtBitmap.IsChecked() ) { - ULONG n = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong n = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( n > 0 ) { Time* pTime = static_cast< Time* >( aTimeList.GetObject( n - 1 ) ); @@ -422,7 +426,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) bAllObjects = pBtn == &aBtnGetAllObjects; // Code jetzt in AddObj() - SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_ADD, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -438,7 +442,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) if( pBtn == &aBtnRemoveBitmap ) { - ULONG nPos = aBmpExList.GetCurPos(); + sal_uLong nPos = aBmpExList.GetCurPos(); pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetCurObject() ); if( pBitmapEx ) { @@ -526,7 +530,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) { // Code jetzt in CreatePresObj() - SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -537,7 +541,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) { - ULONG nBmp = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong nBmp = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( nBmp > aBmpExList.Count() ) nBmp = aBmpExList.Count(); @@ -556,7 +560,7 @@ IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) { - ULONG nPos = static_cast<ULONG>(aNumFldBitmap.GetValue() - 1); + sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); Time* pTime = static_cast< Time* >( aTimeList.GetObject( nPos ) ); DBG_ASSERT( pTime, "Zeit nicht gefunden!" ); @@ -568,7 +572,7 @@ IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) +void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls ) { String aString; @@ -577,7 +581,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) BitmapEx aBmp( *pBitmapEx ); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - SdrObject* pObject = (SdrObject*) pPage->GetObj( (ULONG) nListPos ); + SdrObject* pObject = (SdrObject*) pPage->GetObj( (sal_uLong) nListPos ); if( pObject ) { VirtualDevice aVD; @@ -629,15 +633,15 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) else { // Wenn kein Objekt in der Liste ist - aBtnFirst.Enable( FALSE ); - aBtnReverse.Enable( FALSE ); - aBtnPlay.Enable( FALSE ); - aBtnLast.Enable( FALSE ); - aNumFldBitmap.Enable( FALSE ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); - aBtnRemoveBitmap.Enable( FALSE ); - aBtnRemoveAll.Enable( FALSE ); + aBtnFirst.Enable( sal_False ); + aBtnReverse.Enable( sal_False ); + aBtnPlay.Enable( sal_False ); + aBtnLast.Enable( sal_False ); + aNumFldBitmap.Enable( sal_False ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); + aBtnRemoveBitmap.Enable( sal_False ); + aBtnRemoveAll.Enable( sal_False ); //aFtAdjustment.Enable(); //aLbAdjustment.Enable(); @@ -645,13 +649,13 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) if( bMovie && bDisableCtrls ) { - aBtnGetOneObject.Enable( FALSE ); - aBtnGetAllObjects.Enable( FALSE ); - aRbtGroup.Enable( FALSE ); - aRbtBitmap.Enable( FALSE ); - aBtnCreateGroup.Enable( FALSE ); - aFtAdjustment.Enable( FALSE ); - aLbAdjustment.Enable( FALSE ); + aBtnGetOneObject.Enable( sal_False ); + aBtnGetAllObjects.Enable( sal_False ); + aRbtGroup.Enable( sal_False ); + aRbtBitmap.Enable( sal_False ); + aBtnCreateGroup.Enable( sal_False ); + aFtAdjustment.Enable( sal_False ); + aLbAdjustment.Enable( sal_False ); } else { @@ -661,8 +665,8 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) aRbtBitmap.Enable(); aBtnCreateGroup.Enable(aBmpExList.Count() != 0); - aFtAdjustment.Enable( TRUE ); - aLbAdjustment.Enable( TRUE ); + aFtAdjustment.Enable( sal_True ); + aLbAdjustment.Enable( sal_True ); } ClickRbtHdl( NULL ); @@ -682,7 +686,7 @@ void AnimationWindow::ResetAttrs() // ----------------------------------------------------------------------- -void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, +void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { clock_t aEnd = Time::GetSystemTicks() + nMilliSeconds; @@ -706,13 +710,13 @@ void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, Fraction AnimationWindow::GetScale() { Fraction aFrac; - ULONG nPos = aBmpExList.GetCurPos(); - ULONG nCount = aBmpExList.Count(); + sal_uLong nPos = aBmpExList.GetCurPos(); + sal_uLong nCount = aBmpExList.Count(); if( nCount > 0 ) { aBmpSize.Width() = 0; aBmpSize.Height() = 0; - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) { pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetObject( i ) ); Size aTempSize( pBitmapEx->GetBitmap().GetSizePixel() ); @@ -833,22 +837,22 @@ void AnimationWindow::Resize() // ----------------------------------------------------------------------- -BOOL AnimationWindow::Close() +sal_Bool AnimationWindow::Close() { if( maPlayLock.isLocked() ) { - return FALSE; + return sal_False; } else { - SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE ); + SfxBoolItem aItem( SID_ANIMATION_OBJECTS, sal_False ); GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); - return TRUE; + return sal_True; } } @@ -870,30 +874,30 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekt(e) clonen und den/die Clone(s) in die Liste stellen const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - ULONG nCloneCount = pPage->GetObjCount(); + sal_uLong nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) { // Wenn es sich um EIN Animationsobjekt oder ein Gruppenobjekt // handelt, das 'einzeln uebernommen' wurde, // werden die einzelnen Objekte eingefuegt - BOOL bAnimObj = FALSE; + sal_Bool bAnimObj = sal_False; if( nMarkCount == 1 ) { SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = rView.GetDoc()->GetAnimationInfo( pObject ); - UINT32 nInv = pObject->GetObjInventor(); - UINT16 nId = pObject->GetObjIdentifier(); + sal_uInt32 nInv = pObject->GetObjInventor(); + sal_uInt16 nId = pObject->GetObjIdentifier(); // Animated Bitmap (GIF) if( nInv == SdrInventor && nId == OBJ_GRAF && ( (SdrGrafObj*) pObject )->IsAnimated() ) { const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); - USHORT nCount = 0; + sal_uInt16 nCount = 0; if( aGraphic.IsAnimated() ) nCount = aGraphic.GetAnimation().Count(); @@ -902,7 +906,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) { const Animation aAnimation( aGraphic.GetAnimation() ); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const AnimationBitmap& rAnimBmp = aAnimation.Get( i ); @@ -930,8 +934,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) } // Nachdem ein animated GIF uebernommen wurde, kann auch nur ein solches erstellt werden aRbtBitmap.Check(); - aRbtGroup.Enable( FALSE ); - bAnimObj = TRUE; + aRbtGroup.Enable( sal_False ); + bAnimObj = sal_True; } } else if( bAllObjects || ( pAnimInfo && pAnimInfo->mbIsMovie ) ) @@ -939,9 +943,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Mehrere Objekte SdrObjList* pObjList = ((SdrObjGroup*)pObject)->GetSubList(); - for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) + for( sal_uInt16 nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) { - SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject ); + SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (sal_uLong) nObject ); pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() ); aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 ); @@ -956,7 +960,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Weiterschalten der BitmapListe aBmpExList.Next(); } - bAnimObj = TRUE; + bAnimObj = sal_True; } } // Auch ein einzelnes animiertes Objekt @@ -985,7 +989,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekte einzeln uebernehmen if( bAllObjects ) { - for( ULONG nObject= 0; nObject < nMarkCount; nObject++ ) + for( sal_uLong nObject= 0; nObject < nMarkCount; nObject++ ) { // Clone SdrObject* pObject = rMarkList.GetMark( nObject )->GetMarkedSdrObj(); @@ -1001,14 +1005,14 @@ void AnimationWindow::AddObj (::sd::View& rView ) aBmpExList.Next(); } - bAnimObj = TRUE; // damit nicht nochmal weitergeschaltet wird + bAnimObj = sal_True; // damit nicht nochmal weitergeschaltet wird } else { SdrObjGroup* pCloneGroup = new SdrObjGroup; SdrObjList* pObjList = pCloneGroup->GetSubList(); - for (ULONG nObject= 0; nObject < nMarkCount; nObject++) + for (sal_uLong nObject= 0; nObject < nMarkCount; nObject++) pObjList->InsertObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()->Clone(), LIST_APPEND); pPage->InsertObject(pCloneGroup, aBmpExList.GetCurPos() + 1); @@ -1045,9 +1049,9 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) Size aTemp( pOutWin->GetOutputSizePixel() ); const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); const OutputDevice* pDefDev = Application::GetDefaultDevice(); - const ULONG nCount = aBmpExList.Count(); + const sal_uLong nCount = aBmpExList.Count(); BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); - ULONG i; + sal_uLong i; // Groesste Bitmap ermitteln for( i = 0; i < nCount; i++ ) @@ -1134,7 +1138,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // LoopCount (Anzahl der Durchlaeufe) ermitteln AnimationBitmap aAnimBmp; long nLoopCount = 0L; - USHORT nPos = aLbLoopCount.GetSelectEntryPos(); + sal_uInt16 nPos = aLbLoopCount.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32(); @@ -1144,7 +1148,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) aAnimBmp.aSizePix = aBitmapSize; aAnimBmp.nWait = nTime; aAnimBmp.eDisposal = DISPOSE_BACK; - aAnimBmp.bUserInput = FALSE; + aAnimBmp.bUserInput = sal_False; aAnimation.Insert( aAnimBmp ); aAnimation.SetDisplaySizePixel( aMaxSizePix ); @@ -1242,8 +1246,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pGroup,true); pInfo->meEffect = presentation::AnimationEffect_NONE; pInfo->meSpeed = presentation::AnimationSpeed_MEDIUM; - pInfo->mbActive = TRUE; - pInfo->mbIsMovie = TRUE; + pInfo->mbActive = sal_True; + pInfo->mbIsMovie = sal_True; pInfo->maBlueScreen = COL_WHITE; rView.InsertObjectAtView( pGroup, *pPV, SDRINSERT_SETDEFLAYER); @@ -1269,7 +1273,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) \************************************************************************/ AnimationControllerItem::AnimationControllerItem( - USHORT _nId, + sal_uInt16 _nId, AnimationWindow* pAnimWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -1279,14 +1283,14 @@ AnimationControllerItem::AnimationControllerItem( // ----------------------------------------------------------------------- -void AnimationControllerItem::StateChanged( USHORT nSId, +void AnimationControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_ANIMATOR_STATE ) { const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem ); DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet"); - UINT16 nState = pStateItem->GetValue(); + sal_uInt16 nState = pStateItem->GetValue(); pAnimationWin->aBtnGetOneObject.Enable( nState & 1 ); pAnimationWin->aBtnGetAllObjects.Enable( nState & 2 ); diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index 6e66e8c47..60fd6b751 100644..100755 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -28,6 +28,8 @@ #include "res_bmp.hrc" #include "app.hrc" #include "animobjs.hrc" +#include "helpids.h" + #define BUTTON_WIDTH 16 #define BUTTON_HEIGHT 14 #define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); @@ -36,7 +38,7 @@ #define MIN_BUTTON_SIZE MAP_APPFONT( MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT ); DockingWindow FLT_WIN_ANIMATION { - HelpID = SID_ANIMATION_OBJECTS ; + HelpID = CMD_SID_ANIMATION_OBJECTS ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -57,6 +59,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_FIRST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDSTART ; @@ -64,6 +67,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REVERSE { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_REVERSEPLAY ; @@ -71,6 +75,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_STOP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 2 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_STOP ; @@ -79,6 +84,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_PLAY { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 3 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_PLAY ; @@ -86,6 +92,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_LAST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 4 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDEND ; @@ -93,6 +100,7 @@ DockingWindow FLT_WIN_ANIMATION }; NumericField NUM_FLD_BITMAP { + HelpID = "sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 3 + MIN_BUTTON_WIDTH * 5 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 , 12 ) ; @@ -109,6 +117,7 @@ DockingWindow FLT_WIN_ANIMATION }; TimeField TIME_FIELD { + HelpID = "sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 6 + MIN_BUTTON_WIDTH * 7 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 12 ) ; @@ -131,6 +140,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_LOOP_COUNT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 12 + MIN_BUTTON_WIDTH * 9 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 100 ) ; @@ -162,6 +172,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ONE_OBJECT { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -177,6 +188,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ALL_OBJECTS { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS"; Pos = MAP_APPFONT ( 31 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -192,6 +204,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_BITMAP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP"; Pos = MAP_APPFONT ( 60 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -207,6 +220,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_ALL { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL"; Pos = MAP_APPFONT ( 79 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -242,12 +256,14 @@ DockingWindow FLT_WIN_ANIMATION }; RadioButton RBT_GROUP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP"; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Group object" ; }; RadioButton RBT_BITMAP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP"; Pos = MAP_APPFONT ( 12 , 181 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Bitmap object" ; @@ -262,6 +278,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_ADJUSTMENT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 196 ) ; Size = MAP_APPFONT ( 72 , 100 ) ; @@ -284,6 +301,7 @@ DockingWindow FLT_WIN_ANIMATION }; PushButton BTN_CREATE_GROUP { + HelpID = "sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP"; Pos = MAP_APPFONT ( 107 , 216 ) ; Size = MAP_APPFONT ( 41 , 14 ) ; TabStop = TRUE ; @@ -295,6 +313,10 @@ DockingWindow FLT_WIN_ANIMATION Size = MAP_APPFONT ( 147 , 8 ) ; Text [ en-US ] = "Animation group" ; }; + String STR_DISPLAY + { + Text [ en-US ] = "Preview"; + }; }; diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index a299d39ab..a299d39ab 100644..100755 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 0c3f78d26..a9cff73f7 100644..100755 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -61,8 +61,8 @@ BreakDlg::BreakDlg( ::Window* pWindow, DrawView* _pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) + sal_uLong nSumActionCount, + sal_uLong nObjCount ) : SfxModalDialog ( pWindow, SdResId( DLG_BREAK ) ), aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), @@ -83,7 +83,7 @@ BreakDlg::BreakDlg( pProgrInfo->Init( nSumActionCount*3, nObjCount ); pDrView = _pDrView; - bCancel = FALSE; + bCancel = sal_False; FreeResource(); } @@ -100,7 +100,7 @@ BreakDlg::~BreakDlg() // Control-Handler fuer den Abbruch Button IMPL_LINK( BreakDlg, CancelButtonHdl, void *, EMPTYARG ) { - bCancel = TRUE; + bCancel = sal_True; aBtnCancel.Disable(); return( 0L ); } @@ -181,7 +181,7 @@ short BreakDlg::Execute() IMPL_LINK( BreakDlg, InitialUpdate, Timer*, EMPTYARG ) { pDrView->DoImportMarkedMtf(pProgrInfo); - EndDialog(TRUE); + EndDialog(sal_True); return 0L; } diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index 73092421c..b0b41f5fb 100644 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/brkdlg.src @@ -28,6 +28,7 @@ #include "brkdlg.hrc" ModalDialog DLG_BREAK { + HelpID = "sd:ModalDialog:DLG_BREAK"; OutputSize = TRUE; SVLook = TRUE; Pos = MAP_APPFONT( 84, 34 ); diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 40af205e2..c5eea8f99 100644..100755 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -57,7 +57,7 @@ \************************************************************************/ SdPresCellTemplateDlg::SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ) -: SfxStyleDialog( pParent, SdResId(TAB_CELL_TEMPLATE), rStyleBase, FALSE ) +: SfxStyleDialog( pParent, SdResId(TAB_CELL_TEMPLATE), rStyleBase, sal_False ) , mpColorTab( pModel->GetColorTable() ) , mpGradientList( pModel->GetGradientList() ) , mpHatchingList( pModel->GetHatchList() ) @@ -79,7 +79,7 @@ SdPresCellTemplateDlg::~SdPresCellTemplateDlg() // ----------------------------------------------------------------------- -void SdPresCellTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdPresCellTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 54062d1f2..f45ababa5 100644..100755 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -73,23 +73,23 @@ CopyDlg::CopyDlg( maFtCopies ( this, SdResId( FT_COPIES ) ), maNumFldCopies ( this, SdResId( NUM_FLD_COPIES ) ), maBtnSetViewData ( this, SdResId( BTN_SET_VIEWDATA ) ), + maGrpMovement ( this, SdResId( GRP_MOVEMENT ) ), maFtMoveX ( this, SdResId( FT_MOVE_X ) ), maMtrFldMoveX ( this, SdResId( MTR_FLD_MOVE_X ) ), maFtMoveY ( this, SdResId( FT_MOVE_Y ) ), maMtrFldMoveY ( this, SdResId( MTR_FLD_MOVE_Y ) ), maFtAngle ( this, SdResId( FT_ANGLE ) ), maMtrFldAngle ( this, SdResId( MTR_FLD_ANGLE ) ), - maGrpMovement ( this, SdResId( GRP_MOVEMENT ) ), + maGrpEnlargement ( this, SdResId( GRP_ENLARGEMENT ) ), maFtWidth ( this, SdResId( FT_WIDTH ) ), maMtrFldWidth ( this, SdResId( MTR_FLD_WIDTH ) ), maFtHeight ( this, SdResId( FT_HEIGHT ) ), maMtrFldHeight ( this, SdResId( MTR_FLD_HEIGHT ) ), - maGrpEnlargement ( this, SdResId( GRP_ENLARGEMENT ) ), + maGrpColor ( this, SdResId( GRP_COLOR ) ), maFtStartColor ( this, SdResId( FT_START_COLOR ) ), maLbStartColor ( this, SdResId( LB_START_COLOR ) ), maFtEndColor ( this, SdResId( FT_END_COLOR ) ), maLbEndColor ( this, SdResId( LB_END_COLOR ) ), - maGrpColor ( this, SdResId( GRP_COLOR ) ), maBtnOK ( this, SdResId( BTN_OK ) ), maBtnCancel ( this, SdResId( BTN_CANCEL ) ), maBtnHelp ( this, SdResId( BTN_HELP ) ), @@ -116,10 +116,10 @@ CopyDlg::CopyDlg( FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() ); - SetFieldUnit( maMtrFldMoveX, eFUnit, TRUE ); - SetFieldUnit( maMtrFldMoveY, eFUnit, TRUE ); - SetFieldUnit( maMtrFldWidth, eFUnit, TRUE ); - SetFieldUnit( maMtrFldHeight, eFUnit, TRUE ); + SetFieldUnit( maMtrFldMoveX, eFUnit, sal_True ); + SetFieldUnit( maMtrFldMoveY, eFUnit, sal_True ); + SetFieldUnit( maMtrFldWidth, eFUnit, sal_True ); + SetFieldUnit( maMtrFldHeight, eFUnit, sal_True ); Reset(0L); } @@ -171,37 +171,37 @@ IMPL_LINK( CopyDlg, Reset, void*, EMPTYARG ) if( aStr.GetTokenCount( TOKEN ) < 8 ) { - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) ) maNumFldCopies.SetValue( ( ( const SfxUInt16Item* ) pPoolItem )->GetValue() ); else maNumFldCopies.SetValue( 1L ); long nMoveX = 500L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) ) nMoveX = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM); long nMoveY = 500L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) ) nMoveY = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM); - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) ) maMtrFldAngle.SetValue( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); else maMtrFldAngle.SetValue( 0L ); long nWidth = 0L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) ) nWidth = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM); long nHeight = 0L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) ) nHeight = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM); - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); @@ -259,10 +259,10 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) long nHeight = Fraction( GetCoreValue( maMtrFldHeight, SFX_MAPUNIT_100TH_MM) ) * maUIScale; long nWidth = Fraction( GetCoreValue( maMtrFldWidth, SFX_MAPUNIT_100TH_MM) ) * maUIScale; - rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (UINT16) maNumFldCopies.GetValue() ) ); + rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) maNumFldCopies.GetValue() ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_Y, nMoveY ) ); - rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<INT32>(maMtrFldAngle.GetValue()) ) ); + rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(maMtrFldAngle.GetValue()) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) ); @@ -288,7 +288,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) IMPL_LINK( CopyDlg, SelectColorHdl, void *, EMPTYARG ) { - USHORT nPos = maLbStartColor.GetSelectEntryPos(); + sal_uInt16 nPos = maLbStartColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && !maLbEndColor.IsEnabled() ) @@ -315,7 +315,7 @@ IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) // Farb-Attribut setzen const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); @@ -343,7 +343,7 @@ IMPL_LINK( CopyDlg, SetDefault, void*, EMPTYARG ) // Farb-Attribut setzen const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index bf4f87ec5..4697dc06d 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "copydlg.hrc" +#include "helpids.h" + ModalDialog DLG_COPY { - HelpID = SID_COPYOBJECTS ; + HelpID = CMD_SID_COPYOBJECTS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 177 ) ; @@ -63,6 +65,7 @@ ModalDialog DLG_COPY }; NumericField NUM_FLD_COPIES { + HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 7 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -78,6 +81,7 @@ ModalDialog DLG_COPY }; ImageButton BTN_SET_VIEWDATA { + HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA"; Pos = MAP_APPFONT ( 122 , 6 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; ButtonImage = Image @@ -90,6 +94,7 @@ ModalDialog DLG_COPY }; PushButton BTN_SET_DEFAULT { + HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT"; Pos = MAP_APPFONT ( 148 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -97,6 +102,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_ANGLE { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -124,6 +130,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_X { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 37 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -141,6 +148,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_Y { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 53 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -158,6 +166,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_WIDTH { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 98 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -175,6 +184,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_HEIGHT { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 114 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -228,6 +238,7 @@ ModalDialog DLG_COPY }; ListBox LB_START_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_START_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 143 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -243,6 +254,7 @@ ModalDialog DLG_COPY }; ListBox LB_END_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_END_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 159 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index fe6c7b4be..b503f27ac 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -71,7 +71,7 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, rDoc ( rDrawDoc ), pCustomShowList ( NULL ), pCustomShow ( NULL ), - bModified ( FALSE ) + bModified ( sal_False ) { FreeResource(); @@ -97,7 +97,7 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, { aLbCustomShows.InsertEntry( pCustomShow->GetName() ); } - aLbCustomShows.SelectEntryPos( (USHORT)nPosToSelect ); + aLbCustomShows.SelectEntryPos( (sal_uInt16)nPosToSelect ); pCustomShowList->Seek( nPosToSelect ); } @@ -118,9 +118,9 @@ SdCustomShowDlg::~SdCustomShowDlg() \************************************************************************/ void SdCustomShowDlg::CheckState() { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); - BOOL bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; + sal_Bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; aBtnEdit.Enable( bEnable ); aBtnRemove.Enable( bEnable ); aBtnCopy.Enable( bEnable ); @@ -146,7 +146,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) if( pCustomShow ) { if( !pCustomShowList ) - pCustomShowList = rDoc.GetCustomShowList( TRUE ); + pCustomShowList = rDoc.GetCustomShowList( sal_True ); pCustomShowList->Insert( pCustomShow, LIST_APPEND ); pCustomShowList->Last(); @@ -155,7 +155,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } if( aDlg.IsModified() ) - bModified = TRUE; + bModified = sal_True; } else if( pCustomShow ) DELETEZ( pCustomShow ); @@ -163,7 +163,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) // CustomShow bearbeiten else if( p == &aBtnEdit ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { DBG_ASSERT( pCustomShowList, "pCustomShowList existiert nicht" ); @@ -181,34 +181,34 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aLbCustomShows.SelectEntryPos( nPos ); } if( aDlg.IsModified() ) - bModified = TRUE; + bModified = sal_True; } } } // CustomShow loeschen else if( p == &aBtnRemove ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { delete (SdCustomShow*) pCustomShowList->Remove( nPos ); aLbCustomShows.RemoveEntry( nPos ); aLbCustomShows.SelectEntryPos( nPos == 0 ? nPos : nPos - 1 ); - bModified = TRUE; + bModified = sal_True; } } // CustomShow kopieren else if( p == &aBtnCopy ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { SdCustomShow* pShow = new SdCustomShow( *(SdCustomShow*) pCustomShowList->GetObject( nPos ) ); String aStr( pShow->GetName() ); String aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) ); - USHORT nStrPos = aStr.Search( aStrCopy ); - USHORT nNum = 1; + sal_uInt16 nStrPos = aStr.Search( aStrCopy ); + sal_uInt16 nNum = 1; if( nStrPos == STRING_NOTFOUND ) { aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); @@ -217,7 +217,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aStr.Append( sal_Unicode(')') ); nStrPos = aStr.Search( aStrCopy ); } - nStrPos = nStrPos + (USHORT)aStrCopy.Len(); + nStrPos = nStrPos + (sal_uInt16)aStrCopy.Len(); // Um nicht ins Nirvana zu greifen (--> Endlosschleife) if( nStrPos >= aStr.Len() ) { @@ -226,17 +226,17 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } // Name ueberpruefen... - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; //long nPosToSelect = pCustomShowList->GetCurPos(); while( !bDifferent ) { - bDifferent = TRUE; + bDifferent = sal_True; for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); pCustomShow != NULL && bDifferent; pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { if( aStr == pCustomShow->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } if( !bDifferent ) { @@ -258,20 +258,20 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aLbCustomShows.SelectEntry( pShow->GetName() ); - bModified = TRUE; + bModified = sal_True; } } else if( p == &aLbCustomShows ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); - bModified = TRUE; + bModified = sal_True; } else if( p == &aCbxUseCustomShow ) { - bModified = TRUE; + bModified = sal_True; } CheckState(); @@ -292,7 +292,7 @@ IMPL_LINK( SdCustomShowDlg, StartShowHdl, Button *, EMPTYARG ) /************************************************************************* |* CheckState \************************************************************************/ -BOOL SdCustomShowDlg::IsCustomShow() const +sal_Bool SdCustomShowDlg::IsCustomShow() const { return( aCbxUseCustomShow.IsEnabled() && aCbxUseCustomShow.IsChecked() ); } @@ -327,7 +327,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, rDoc ( rDrawDoc ), rpCustomShow ( rpCS ), - bModified ( FALSE ) + bModified ( sal_False ) { FreeResource(); @@ -346,7 +346,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, nPage < rDoc.GetSdPageCount( PK_STANDARD ); nPage++ ) { - pPage = rDoc.GetSdPage( (USHORT) nPage, PK_STANDARD ); + pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); String aStr( pPage->GetName() ); aLbPages.InsertEntry( aStr ); } @@ -377,7 +377,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, aLbCustomPages.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE ); aLbCustomPages.SetHighlightRange(); - aBtnOK.Enable( FALSE ); + aBtnOK.Enable( sal_False ); CheckState(); } @@ -395,10 +395,10 @@ SdDefineCustomShowDlg::~SdDefineCustomShowDlg() \************************************************************************/ void SdDefineCustomShowDlg::CheckState() { - BOOL bPages = aLbPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - //BOOL bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - BOOL bCSPages = aLbCustomPages.FirstSelected() != NULL; - BOOL bCount = aLbCustomPages.GetEntryCount() > 0; + sal_Bool bPages = aLbPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + //sal_Bool bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + sal_Bool bCSPages = aLbCustomPages.FirstSelected() != NULL; + sal_Bool bCount = aLbCustomPages.GetEntryCount() > 0; aBtnOK.Enable( bCount ); aBtnAdd.Enable( bPages ); @@ -412,50 +412,50 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) { if( p == &aBtnAdd ) { - USHORT nCount = aLbPages.GetSelectEntryCount(); + sal_uInt16 nCount = aLbPages.GetSelectEntryCount(); if( nCount > 0 ) { - ULONG nPosCP = LIST_APPEND; + sal_uLong nPosCP = LIST_APPEND; SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) nPosCP = aLbCustomPages.GetModel()->GetAbsPos( pEntry ) + 1L; - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { String aStr = aLbPages.GetSelectEntry( i ); pEntry = aLbCustomPages.InsertEntry( aStr, - 0, FALSE, nPosCP ); + 0, sal_False, nPosCP ); aLbCustomPages.Select( pEntry ); - SdPage* pPage = rDoc.GetSdPage( (USHORT) aLbPages. + SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) aLbPages. GetSelectEntryPos( i ), PK_STANDARD ); pEntry->SetUserData( pPage ); if( nPosCP != LIST_APPEND ) nPosCP++; } - bModified = TRUE; + bModified = sal_True; } } else if( p == &aBtnRemove ) { - //USHORT nPos = aLbCustomPages.GetSelectEntryPos(); + //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) { - ULONG nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry ); + sal_uLong nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry ); //rpCustomShow->Remove( nPos ); //aLbCustomPages.RemoveEntry( nPos ); aLbCustomPages.GetModel()->Remove( aLbCustomPages.GetModel()->GetEntryAtAbsPos( nPos ) ); - bModified = TRUE; + bModified = sal_True; } } else if( p == &aEdtName ) { //rpCustomShow->SetName( aEdtName.GetText() ); - bModified = TRUE; + bModified = sal_True; } CheckState(); @@ -470,7 +470,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) \************************************************************************/ void SdDefineCustomShowDlg::CheckCustomShow() { - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; SdPage* pPage = NULL; SvLBoxEntry* pEntry = NULL; @@ -478,7 +478,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( rpCustomShow->Count() != aLbCustomPages.GetEntryCount() ) { rpCustomShow->Clear(); - bDifferent = TRUE; + bDifferent = sal_True; } // Seiten-Pointer vergleichen @@ -491,7 +491,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( pPage != pEntry->GetUserData() ) { rpCustomShow->Clear(); - bDifferent = TRUE; + bDifferent = sal_True; } } } @@ -506,7 +506,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() pPage = (SdPage*) pEntry->GetUserData(); rpCustomShow->Insert( pPage, LIST_APPEND ); } - bModified = TRUE; + bModified = sal_True; } // Name vergleichen und ggfs. setzen @@ -514,7 +514,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( rpCustomShow->GetName() != aStr ) { rpCustomShow->SetName( aStr ); - bModified = TRUE; + bModified = sal_True; } } @@ -524,7 +524,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() IMPL_LINK( SdDefineCustomShowDlg, OKHdl, Button *, EMPTYARG ) { // Name ueberpruefen... - BOOL bDifferent = TRUE; + sal_Bool bDifferent = sal_True; List* pCustomShowList = rDoc.GetCustomShowList(); if( pCustomShowList ) { @@ -537,7 +537,7 @@ IMPL_LINK( SdDefineCustomShowDlg, OKHdl, Button *, EMPTYARG ) pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { if( aName == pCustomShow->GetName() && aName != aOldName ) - bDifferent = FALSE; + bDifferent = sal_False; } pCustomShowList->Seek( nPosToSelect ); } diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index f5e4195b5..13bb64ada 100644..100755 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -32,7 +32,7 @@ #define DIFF_Y 17 ModalDialog DLG_CUSTOMSHOW { - HelpID = SID_CUSTOMSHOW_DLG ; + HelpID = CMD_SID_CUSTOMSHOW_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ; @@ -40,6 +40,7 @@ ModalDialog DLG_CUSTOMSHOW Closeable = TRUE ; PushButton BTN_NEW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW"; Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -47,6 +48,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_EDIT { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT"; Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -54,6 +56,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_COPY { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY"; Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_STARTSHOW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW"; Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -89,13 +94,18 @@ ModalDialog DLG_CUSTOMSHOW }; ListBox LB_CUSTOMSHOWS { + HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ; TabStop = TRUE ; + //IAccessibility2 Implementation 2009----- + QuickHelpText [ en-US ] = "Custom Screen Show" ; + //-----IAccessibility2 Implementation 2009 }; CheckBox CBX_USE_CUSTOMSHOW { + HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW"; Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ; Size = MAP_APPFONT ( 112 + DIFF , 12 ) ; TabStop = TRUE ; @@ -138,6 +148,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; Edit EDT_NAME { + HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 38 , 6 ) ; Size = MAP_APPFONT ( 141 , 12 ) ; @@ -145,6 +156,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; MultiListBox LB_PAGES { + HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 35 ) ; Size = MAP_APPFONT ( 75 , 75 ) ; @@ -153,6 +165,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_ADD { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD"; Pos = MAP_APPFONT ( 84 , 67 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~>>" ; @@ -168,6 +181,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 84 , 95 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~<<" ; diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 629193cdb..a2a0e4a60 100644..100755 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -108,7 +108,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) void SdPagesField::Modify() { - SfxUInt16Item aItem( SID_PAGES_PER_ROW, (UINT16) GetValue() ); + SfxUInt16Item aItem( SID_PAGES_PER_ROW, (sal_uInt16) GetValue() ); ::uno::Any a; ::uno::Sequence< ::beans::PropertyValue > aArgs( 1 ); @@ -130,7 +130,7 @@ void SdPagesField::Modify() |* \************************************************************************/ -SdTbxCtlDiaPages::SdTbxCtlDiaPages( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -143,7 +143,7 @@ SdTbxCtlDiaPages::~SdTbxCtlDiaPages() //======================================================================== -void SdTbxCtlDiaPages::StateChanged( USHORT, +void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { SdPagesField* pFld = (SdPagesField*) GetToolBox().GetItemWindow( GetId() ); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 400a4581d..5ee4d8e40 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; diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index 2e3e0e3de..b2b6d8d78 100644 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.src @@ -48,6 +48,7 @@ ModalDialog DLG_ASS CheckBox CB_PREVIEW { + HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW"; Pos = MAP_APPFONT ( 144 , 140 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -56,6 +57,7 @@ ModalDialog DLG_ASS CheckBox CB_STARTWITH { + HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH"; Pos = MAP_APPFONT ( 144 , 154 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -84,6 +86,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_EMPTY { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY"; Pos = MAP_APPFONT ( 12 , 48 ); Size = MAP_APPFONT ( 130 , 10 ); TabStop = TRUE; @@ -92,6 +95,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_TEMPLATE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 62 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "~From template"; @@ -99,6 +103,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_OPEN { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN"; Pos = MAP_APPFONT ( 12 , 76 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "O~pen existing presentation"; @@ -106,6 +111,7 @@ ModalDialog DLG_ASS PushButton PB_PAGE1_OPEN { + HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 18 , 89 ) ; Size = MAP_APPFONT ( 50 , 18 ) ; @@ -171,6 +177,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE2_LAYOUT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 120 , 40 ) ; @@ -186,6 +193,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM5 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 121 ); Size = MAP_APPFONT ( 59 , 10 ); @@ -194,6 +202,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM1 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 121 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -202,6 +211,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM2 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -211,6 +221,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM3 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -220,6 +231,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM4 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -256,6 +268,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_EFFECT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 48 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -274,6 +287,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_SPEED { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 64 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -292,6 +306,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_LIVE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -300,6 +315,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_KIOSK { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 108 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -316,6 +332,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_TIME { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 122 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -349,6 +366,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_BREAK { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 138 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -374,6 +392,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE3_LOGO { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO"; OutputSize = TRUE; Pos = MAP_APPFONT ( 21 , 154 ); Size = MAP_APPFONT ( 111 , 10 ); @@ -410,6 +429,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKNAME { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 59 ) ; @@ -425,6 +445,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKTOPIC { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 88 ) ; @@ -440,6 +461,7 @@ ModalDialog DLG_ASS }; MultiLineEdit EDT_PAGE4_ASKINFORMATION { + HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 117 ) ; @@ -479,6 +501,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE5_SUMMARY { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY"; OutputSize = TRUE; Pos = MAP_APPFONT ( 6 , 154 ); Size = MAP_APPFONT ( 132 , 10 ); @@ -505,6 +528,7 @@ ModalDialog DLG_ASS PushButton BUT_LAST { + HelpID = "sd:PushButton:DLG_ASS:BUT_LAST"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 112 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -514,6 +538,7 @@ ModalDialog DLG_ASS PushButton BUT_NEXT { + HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT"; DefButton = TRUE ; OutputSize = TRUE ; Pos = MAP_APPFONT ( 165 , 170 ) ; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index ffdd68ed3..a50a6ebe6 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -50,10 +50,10 @@ SdPageListControl::SdPageListControl( : SvTreeListBox(pParent, rResId) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASLINESATROOT | WB_HSCROLL | - WB_HASBUTTONSATROOT ) ); + WB_HASBUTTONSATROOT ); SetNodeDefaultImages (); m_pCheckButton = new SvLBoxButtonData(this); @@ -117,8 +117,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) { Outliner* pOutliner = pDoc->GetInternalOutliner(); - USHORT nPage = 0; - const USHORT nMaxPages = pDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = pDoc->GetPageCount(); while( nPage < nMaxPages ) { SdPage* pPage = (SdPage*) pDoc->GetPage( nPage ); @@ -131,8 +131,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) if(!pTO) { // Ermittelt das SdrTextObject mit dem Layout Text dieser Seite - const ULONG nObjectCount = pPage->GetObjCount(); - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + const sal_uLong nObjectCount = pPage->GetObjCount(); + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { SdrObject* pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) @@ -151,14 +151,14 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); pOutliner->SetText( *pOPO ); - ULONG nCount = pOutliner->GetParagraphCount(); + sal_uLong nCount = pOutliner->GetParagraphCount(); Paragraph* pPara = NULL; - for (ULONG nPara = 0; nPara < nCount; nPara++) + for (sal_uLong nPara = 0; nPara < nCount; nPara++) { pPara = pOutliner->GetParagraph(nPara); - if(pPara && pOutliner->GetDepth( (USHORT) nPara ) == 0 ) + if(pPara && pOutliner->GetDepth( (sal_uInt16) nPara ) == 0 ) { String aParaText = pOutliner->GetText(pPara); if(aParaText.Len() != 0) @@ -174,10 +174,10 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); } -USHORT SdPageListControl::GetSelectedPage() +sal_uInt16 SdPageListControl::GetSelectedPage() { SvLBoxEntry* pSelEntry = GetCurEntry(); - USHORT nPage = 0; + sal_uInt16 nPage = 0; if ( pSelEntry ) { @@ -197,10 +197,10 @@ USHORT SdPageListControl::GetSelectedPage() return nPage; } -BOOL SdPageListControl::IsPageChecked( USHORT nPage ) +sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) { SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage); - return pEntry?(BOOL)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): FALSE; + return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False; } void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 927882a4c..ee0f4734a 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -48,8 +48,8 @@ public: void Fill( SdDrawDocument* pDoc ); void Clear(); - USHORT GetSelectedPage(); - BOOL IsPageChecked( USHORT nPage ); + sal_uInt16 GetSelectedPage(); + sal_Bool IsPageChecked( sal_uInt16 nPage ); DECL_LINK( CheckButtonClickHdl, SvLBoxButtonData * ); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 6790729f5..7ec013f27 100644..100755 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -65,7 +65,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, // ----------------------------------------------------------------------- -void SdCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index cc75a3168..e02d84079 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -85,14 +85,14 @@ void FadeEffectLB::Fill() /* void FadeEffectLB::SelectEffect( presentation::FadeEffect eFE ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for( long i = 0, nCount = sizeof( aEffects ) / sizeof( FadeEffectPair ); ( i < nCount ) && !bFound; i++ ) { if( aEffects[ i ].meFE == eFE ) { - SelectEntryPos( (USHORT) i ); - bFound = TRUE; + SelectEntryPos( (sal_uInt16) i ); + bFound = sal_True; } } } @@ -102,7 +102,7 @@ void FadeEffectLB::SelectEffect( presentation::FadeEffect eFE ) void FadeEffectLB::applySelected( SdPage* pSlide ) const { - const USHORT nPos = GetSelectEntryPos(); + const sal_uInt16 nPos = GetSelectEntryPos(); if( pSlide && (nPos < mpImpl->maPresets.size() ) ) { diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index a29e96f9a..ebe9bae65 100644..100755 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -62,9 +62,9 @@ SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ), + aGrpType ( this, SdResId( GRP_TYPE ) ), aRbtFix ( this, SdResId( RBT_FIX ) ), aRbtVar ( this, SdResId( RBT_VAR ) ), - aGrpType ( this, SdResId( GRP_TYPE ) ), maFtLanguage( this, SdResId( FT_LANGUAGE ) ), maLbLanguage( this, SdResId( LB_LANGUAGE ) ), aFtFormat ( this, SdResId( FT_FORMAT ) ), @@ -214,7 +214,7 @@ void SdModifyFieldDlg::FillFormatList() aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aLbFormat.SelectEntryPos( (USHORT) ( pDateField->GetFormat() - 2 ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtTimeField ) ) { @@ -242,7 +242,7 @@ void SdModifyFieldDlg::FillFormatList() //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM - aLbFormat.SelectEntryPos( (USHORT) ( pTimeField->GetFormat() - 2 ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtFileField ) ) { @@ -254,20 +254,20 @@ void SdModifyFieldDlg::FillFormatList() aLbFormat.InsertEntry( String( SdResId( STR_FILEFORMAT_PATH ) ) ); aLbFormat.InsertEntry( String( SdResId( STR_FILEFORMAT_NAME ) ) ); - aLbFormat.SelectEntryPos( (USHORT) ( pFileField->GetFormat() ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) ); } else if( pField->ISA( SvxAuthorField ) ) { const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField; SvxAuthorField aAuthorField( *pAuthorField ); - for( USHORT i = 0; i < 4; i++ ) + for( sal_uInt16 i = 0; i < 4; i++ ) { aAuthorField.SetFormat( (SvxAuthorFormat) i ); aLbFormat.InsertEntry( aAuthorField.GetFormatted() ); } - aLbFormat.SelectEntryPos( (USHORT) ( pAuthorField->GetFormat() ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) ); } @@ -322,7 +322,7 @@ void SdModifyFieldDlg::FillControls() aRbtVar.SaveValue(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, TRUE, &pItem ) ) + if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, sal_True, &pItem ) ) maLbLanguage.SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() ); maLbLanguage.SaveValue(); diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 679c21fff..120887497 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -28,6 +28,7 @@ #include "dlgfield.hrc" ModalDialog DLG_FIELD_MODIFY { + HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 138 , 154 ) ; @@ -41,6 +42,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_FIX { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -48,6 +50,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_VAR { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -62,6 +65,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_LANGUAGE { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 52 , 65 ) ; Size = MAP_APPFONT ( 80 , 70 ) ; @@ -71,6 +75,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_FORMAT { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 94 ) ; Size = MAP_APPFONT ( 126 , 54 ) ; diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index ebef1d5df..5177a1d85 100644..100755 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -74,7 +74,7 @@ OutlineBulletDlg::OutlineBulletDlg( ::sd::View* pView ) : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), aInputSet ( *pAttr ), - bTitle ( FALSE ), + bTitle ( sal_False ), pSdView ( pView ) { FreeResource(); @@ -85,14 +85,14 @@ OutlineBulletDlg::OutlineBulletDlg( pOutputSet = new SfxItemSet( *pAttr ); pOutputSet->ClearItem(); - BOOL bOutliner = FALSE; + sal_Bool bOutliner = sal_False; // Sonderbehandlung wenn eine Title Objekt selektiert wurde if( pView ) { const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - const ULONG nCount = rMarkList.GetMarkCount(); - for(ULONG nNum = 0; nNum < nCount; nNum++) + const sal_uLong nCount = rMarkList.GetMarkCount(); + for(sal_uLong nNum = 0; nNum < nCount; nNum++) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); if( pObj->GetObjInventor() == SdrInventor ) @@ -101,10 +101,10 @@ OutlineBulletDlg::OutlineBulletDlg( switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = TRUE; + bTitle = sal_True; break; case OBJ_OUTLINETEXT: - bOutliner = TRUE; + bOutliner = sal_True; break; } } @@ -121,7 +121,7 @@ OutlineBulletDlg::OutlineBulletDlg( aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) ); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if( pFirstStyleSheet ) - pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pItem); + pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pItem); } if( pItem == NULL ) @@ -133,7 +133,7 @@ OutlineBulletDlg::OutlineBulletDlg( } /* debug - if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem )) + if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem )) { SvxNumRule& rItem = *((SvxNumBulletItem*)pItem)->GetNumRule(); for( int i = 0; i < 9; i++ ) @@ -143,14 +143,14 @@ OutlineBulletDlg::OutlineBulletDlg( } */ - if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,TRUE) == SFX_ITEM_ON ) + if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON ) { - SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,TRUE); + SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,sal_True); SvxNumRule* pRule = pItem->GetNumRule(); if(pRule) { SvxNumRule aNewRule( *pRule ); - aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, TRUE ); + aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, sal_True ); SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aInputSet.Put(aNewItem); @@ -176,7 +176,7 @@ OutlineBulletDlg::~OutlineBulletDlg() delete pOutputSet; } -void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void OutlineBulletDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch ( nId ) { @@ -186,7 +186,7 @@ void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { FieldUnit eMetric = pSdView->GetDoc()->GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(USHORT)eMetric)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric)); rPage.PageCreated(aSet); } } @@ -197,7 +197,7 @@ void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { FieldUnit eMetric = pSdView->GetDoc()->GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(USHORT)eMetric)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric)); rPage.PageCreated(aSet); } } @@ -211,7 +211,7 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const pOutputSet->Put( aSet ); const SfxPoolItem *pItem = NULL; - if( SFX_ITEM_SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), FALSE, &pItem )) + if( SFX_ITEM_SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), sal_False, &pItem )) { SdBulletMapper::MapFontsInNumRule( *((SvxNumBulletItem*)pItem)->GetNumRule(), *pOutputSet ); @@ -225,12 +225,12 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const SdBulletMapper::PostMapNumBulletForDialog( *pOutputSet ); */ - if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,TRUE) == SFX_ITEM_ON ) + if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON ) { - SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,TRUE); + SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,sal_True); SvxNumRule* pRule = pBulletItem->GetNumRule(); if(pRule) - pRule->SetFeatureFlag( NUM_NO_NUMBERS, FALSE ); + pRule->SetFeatureFlag( NUM_NO_NUMBERS, sal_False ); } return pOutputSet; diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index bf2c61e75..fc02fde41 100644..100755 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -52,7 +52,7 @@ |* \************************************************************************/ -SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage ) : +SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) : SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), mrOutAttrs ( *pAttr ), mpDocShell ( pDocSh ) @@ -87,15 +87,15 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* |* \************************************************************************/ -void SdPageDlg::PageCreated(USHORT nId, SfxTabPage& rPage) +void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch(nId) { case RID_SVXPAGE_PAGE: - aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION)); - aSet.Put (SfxAllEnumItem((const USHORT)SID_PAPER_START, PAPER_A0)); - aSet.Put (SfxAllEnumItem((const USHORT)SID_PAPER_END, PAPER_E)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E)); rPage.PageCreated(aSet); break; case RID_SVXPAGE_AREA: diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index d2ada1393..a44c74f3f 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -82,8 +82,8 @@ SdSnapLineDlg::SdSnapLineDlg( aBtnDelete.SetClickHdl(LINK(this, SdSnapLineDlg, ClickHdl)); - SetFieldUnit( aMtrFldX, eUIUnit, TRUE ); - SetFieldUnit( aMtrFldY, eUIUnit, TRUE ); + SetFieldUnit( aMtrFldX, eUIUnit, sal_True ); + SetFieldUnit( aMtrFldY, eUIUnit, sal_True ); // WorkArea holen Rectangle aWorkArea = pView->GetWorkArea(); @@ -146,9 +146,9 @@ SdSnapLineDlg::SdSnapLineDlg( IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) { - if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); - else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); - else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); + if ( pBtn == &aRbPoint ) SetInputFields(sal_True, sal_True); + else if ( pBtn == &aRbHorz ) SetInputFields(sal_False, sal_True); + else if ( pBtn == &aRbVert ) SetInputFields(sal_True, sal_False); else if ( pBtn == &aBtnDelete ) EndDialog(RET_SNAP_DELETE); return 0; @@ -171,7 +171,7 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) nXValue = Fraction( GetCoreValue( aMtrFldX, SFX_MAPUNIT_100TH_MM) ) * aUIScale; nYValue = Fraction( GetCoreValue( aMtrFldY, SFX_MAPUNIT_100TH_MM) ) * aUIScale; - rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (USHORT)eKind)); + rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (sal_uInt16)eKind)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_X, nXValue)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_Y, nYValue)); } @@ -196,7 +196,7 @@ void SdSnapLineDlg::HideRadioGroup() |* \************************************************************************/ -void SdSnapLineDlg::SetInputFields(BOOL bEnableX, BOOL bEnableY) +void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) { if ( bEnableX ) { diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index bd69737f9..45938c433 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "dlgsnap.hrc" +#include "helpids.h" + ModalDialog DLG_SNAPLINE { - HelpID = SID_CAPTUREPOINT ; + HelpID = CMD_SID_CAPTUREPOINT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 140 , 125 ) ; @@ -57,6 +59,7 @@ ModalDialog DLG_SNAPLINE }; PushButton BTN_DELETE { + HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE"; Pos = MAP_APPFONT ( 88 , 63 ) ; Size = MAP_APPFONT ( 46 , 14 ) ; Text [ en-US ] = "~Delete" ; @@ -76,6 +79,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_X { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 14 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -99,6 +103,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_Y { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 30 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -122,6 +127,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_POINT { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Point" ; @@ -134,6 +140,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_VERTICAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL"; Pos = MAP_APPFONT ( 12 , 81 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Vertical" ; @@ -146,6 +153,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_HORIZONTAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 65 , 16 ) ; Text [ en-US ] = "Hori~zontal" ; diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index f1b086a45..4fbd3b977 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -73,7 +73,7 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage } SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId ) -: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(FALSE), mpObj(NULL), mnShowPage(0) +: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(sal_False), mpObj(NULL), mnShowPage(0) { SetBorderStyle( WINDOW_BORDER_MONO ); svtools::ColorConfig aColorConfig; @@ -106,13 +106,13 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rP if (dRatio>dRatioPreV) { - rSize=Size(nWidth, (USHORT)(nWidth/dRatio)); - rPoint=Point( 0, (USHORT)((nHeight-rSize.Height())/2)); + rSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio)); + rPoint=Point( 0, (sal_uInt16)((nHeight-rSize.Height())/2)); } else { - rSize=Size((USHORT)(nHeight*dRatio), nHeight); - rPoint=Point((USHORT)((nWidth-rSize.Width())/2),0); + rSize=Size((sal_uInt16)(nHeight*dRatio), nHeight); + rPoint=Point((sal_uInt16)((nWidth-rSize.Width())/2),0); } } @@ -239,7 +239,7 @@ void SdDocPreviewWin::updateViewSettings() aVDev.SetMapMode( aMap ); // Disable output, as we only want to record a metafile - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); pMtf->Record( &aVDev ); @@ -248,8 +248,8 @@ void SdDocPreviewWin::updateViewSettings() const Size aSize( pPage->GetSize() ); - pView->SetBordVisible( FALSE ); - pView->SetPageVisible( FALSE ); + pView->SetBordVisible( sal_False ); + pView->SetPageVisible( sal_False ); pView->ShowSdrPage( pPage ); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 2e0496eb8..f7c79da29 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -75,9 +75,9 @@ private: css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; css::uno::Reference< css::media::XPlayer > mxPlayer; - ULONG mnPlaySoundEvent; - BOOL mbUsableSelection; - BOOL mbLabelPlaying; + sal_uLong mnPlaySoundEvent; + sal_Bool mbUsableSelection; + sal_Bool mbLabelPlaying; void CheckSelectionState(); @@ -140,7 +140,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - mbLabelPlaying = FALSE; + mbLabelPlaying = sal_False; } catch( css::lang::IllegalArgumentException ) { @@ -174,7 +174,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_STOP ) ) ); - mbLabelPlaying = TRUE; + mbLabelPlaying = sal_True; } catch( css::lang::IllegalArgumentException ) { @@ -210,7 +210,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) { mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - mbLabelPlaying = FALSE; + mbLabelPlaying = sal_False; } catch( css::lang::IllegalArgumentException ) { @@ -233,9 +233,9 @@ void SdFileDialog_Imp::CheckSelectionState() try { if( !aCurrFilter.Len() || ( aCurrFilter == String( SdResId( STR_EXPORT_HTML_NAME ) ) ) ) - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, FALSE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False ); else - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, TRUE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_True ); } catch( css::lang::IllegalArgumentException ) { @@ -252,7 +252,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), - mbLabelPlaying(FALSE) + mbLabelPlaying(sal_False) { maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl)); @@ -282,7 +282,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { try { - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, FALSE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False ); } catch( css::lang::IllegalArgumentException ) { diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index c1cfd09a9..1b12890ee 100644..100755 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::frame; // z.Z. werden von Joe nur die u.a. Moeglichkeiten unterstuetzt #define ESCDIR_COUNT 5 -static UINT16 aEscDirArray[] = +static sal_uInt16 aEscDirArray[] = { SDRESC_SMART, SDRESC_LEFT, @@ -108,7 +108,7 @@ GlueEscDirLB::~GlueEscDirLB() void GlueEscDirLB::Select() { - UINT16 nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); SfxUInt16Item aItem( SID_GLUE_ESCDIR, aEscDirArray[ nPos ] ); if ( m_xFrame.is() ) @@ -159,7 +159,7 @@ void GlueEscDirLB::Fill() \************************************************************************/ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -170,7 +170,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( |* \************************************************************************/ -void SdTbxCtlGlueEscDir::StateChanged( USHORT nSId, +void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) { if( eState == SFX_ITEM_AVAILABLE ) @@ -188,7 +188,7 @@ void SdTbxCtlGlueEscDir::StateChanged( USHORT nSId, } else { - UINT16 nEscDir = ( (const SfxUInt16Item*) pState )->GetValue(); + sal_uInt16 nEscDir = ( (const SfxUInt16Item*) pState )->GetValue(); pGlueEscDirLB->SelectEntryPos( GetEscDirPos( nEscDir ) ); } } @@ -220,9 +220,9 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) |* \************************************************************************/ -UINT16 SdTbxCtlGlueEscDir::GetEscDirPos( UINT16 nEscDir ) +sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir ) { - for( UINT16 i = 0; i < ESCDIR_COUNT; i++ ) + for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ ) { if( aEscDirArray[ i ] == nEscDir ) return( i ); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index f4d55c3bd..99b144958 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -187,7 +187,7 @@ public: ~HeaderFooterTabPage(); static SfxTabPage* Create( ::Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); @@ -288,7 +288,7 @@ HeaderFooterDialog::~HeaderFooterDialog() IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { - const USHORT nId = pTabCtrl->GetCurPageId(); + const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); pTabPage->Show(); @@ -299,14 +299,14 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) IMPL_LINK( HeaderFooterDialog, DeactivatePageHdl, TabControl *, EMPTYARG ) { - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- short HeaderFooterDialog::Execute() { - USHORT nRet = TabDialog::Execute(); + sal_uInt16 nRet = TabDialog::Execute(); if( nRet ) mpViewShell->GetDocSh()->SetModified(); return nRet; @@ -361,7 +361,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (USHORT)nPage, PK_STANDARD ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_STANDARD ); change( pUndoGroup, pPage, aNewSettings ); } } @@ -402,7 +402,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (USHORT)nPage, PK_NOTES ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_NOTES ); change( pUndoGroup, pPage, aNewSettings ); } @@ -539,6 +539,19 @@ HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* FillFormatList(SVXDATEFORMAT_A); + maTBHeader.SetAccessibleRelationMemberOf(&maCBHeader); + maRBDateTimeFixed.SetAccessibleRelationMemberOf(&maCBDateTime); + maRBDateTimeAutomatic.SetAccessibleRelationMemberOf(&maCBDateTime); + maTBDateTimeFixed.SetAccessibleName(maRBDateTimeFixed.GetText()); + maTBDateTimeFixed.SetAccessibleRelationMemberOf(&maCBDateTime); + maTBDateTimeFixed.SetAccessibleRelationLabeledBy(&maRBDateTimeFixed); + maCBDateTimeFormat.SetAccessibleRelationMemberOf(&maCBDateTime); + maCBDateTimeFormat.SetAccessibleName(maRBDateTimeAutomatic.GetText()); + maCBDateTimeFormat.SetAccessibleRelationLabeledBy(&maRBDateTimeAutomatic); + maCBDateTimeLanguage.SetAccessibleRelationMemberOf(&maCBDateTime); + maTBFooter.SetAccessibleRelationMemberOf(&maCBFooter); + maCBSlideNumber.SetAccessibleRelationMemberOf(&maFLIncludeOnPage); + maCBFooter.SetAccessibleRelationMemberOf(&maFLIncludeOnPage); } // ----------------------------------------------------------------------- @@ -571,7 +584,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) for( nFormat = 0; nFormat < nDateTimeFormatsCount; nFormat++ ) { String aStr( SvxDateTimeField::GetFormatted( aDate, aTime, nDateTimeFormats[nFormat], *(SD_MOD()->GetNumberFormatter()), eLanguage ) ); - USHORT nEntry = maCBDateTimeFormat.InsertEntry( aStr ); + sal_uInt16 nEntry = maCBDateTimeFormat.InsertEntry( aStr ); maCBDateTimeFormat.SetEntryData( nEntry, (void*)(sal_IntPtr)nDateTimeFormats[nFormat] ); if( nDateTimeFormats[nFormat] == eFormat ) { @@ -603,7 +616,7 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot maCBDateTimeLanguage.SelectLanguage( meOldLanguage ); - USHORT nPos; + sal_uInt16 nPos; for( nPos = 0; nPos < maCBDateTimeFormat.GetEntryCount(); nPos++ ) { int nFormat = (int)(sal_IntPtr)maCBDateTimeFormat.GetEntryData( nPos ); @@ -706,8 +719,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo // if set, set it on all notes master pages if( bSet ) { - USHORT nPageCount = mpDoc->GetMasterSdPageCount( PK_NOTES ); - USHORT nPage; + sal_uInt16 nPageCount = mpDoc->GetMasterSdPageCount( PK_NOTES ); + sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_NOTES ) ); @@ -721,8 +734,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo { // get the language from the first master page // or set it to all master pages - USHORT nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PK_NOTES ) : 1; - USHORT nPage; + sal_uInt16 nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PK_NOTES ) : 1; + sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_STANDARD ) ); @@ -741,7 +754,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo { Outliner* pOutl = mpDoc->GetInternalOutliner(); pOutl->Init( OUTLINERMODE_TEXTOBJECT ); - USHORT nOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = pOutl->GetMode(); EditEngine* pEdit = const_cast< EditEngine* >(&pOutl->GetEditEngine()); @@ -752,12 +765,12 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo EFieldInfo aFieldInfo; aFieldInfo.pFieldItem = NULL; - USHORT nParaCount = pEdit->GetParagraphCount(); - USHORT nPara; + sal_uInt16 nParaCount = pEdit->GetParagraphCount(); + sal_uInt16 nPara; for( nPara = 0; (nPara < nParaCount) && (aFieldInfo.pFieldItem == NULL); nPara++ ) { - USHORT nFieldCount = pEdit->GetFieldCount( nPara ); - USHORT nField; + sal_uInt16 nFieldCount = pEdit->GetFieldCount( nPara ); + sal_uInt16 nField; for( nField = 0; (nField < nFieldCount) && (aFieldInfo.pFieldItem == NULL); nField++ ) { aFieldInfo = pEdit->GetFieldInfo( nPara, nField ); diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index b2e4fb25c..dd4d4b49d 100644 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.src @@ -103,6 +103,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER"; Pos = MAP_APPFONT ( C1, Y1 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -119,6 +120,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_HEADER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED"; Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -135,6 +137,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_DATETIME { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME"; Pos = MAP_APPFONT ( C1, Y2 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -143,6 +146,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_FIXED { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); Size = MAP_APPFONT ( W2, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -151,6 +155,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_DATETIME_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -159,6 +164,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_AUTOMATIC { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC"; Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -167,6 +173,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_FORMAT { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT"; Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -183,6 +190,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_LANGUAGE { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE"; Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -199,6 +207,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER"; Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -215,6 +224,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_FOOTER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED"; Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -231,6 +241,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_SLIDENUMBER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER"; Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -247,6 +258,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_NOTONTITLE { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE"; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -255,6 +267,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLYTOALL { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; @@ -263,6 +276,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLY { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_PUSHBUTTON_HEIGHT + SPACE_Y ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index d8a1323a5..5e986e27c 100644..100755 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -50,7 +50,7 @@ SdInsertPasteDlg::SdInsertPasteDlg( Window* pWindow ) : aBtnHelp( this, SdResId( BTN_HELP ) ) { FreeResource(); - aRbAfter.Check( TRUE ); + aRbAfter.Check( sal_True ); } // ----------------------------------------------------------------------------- @@ -61,7 +61,7 @@ SdInsertPasteDlg::~SdInsertPasteDlg() // ----------------------------------------------------------------------------- -BOOL SdInsertPasteDlg::IsInsertBefore() const +sal_Bool SdInsertPasteDlg::IsInsertBefore() const { return( aRbBefore.IsChecked() ); } diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index aec49d36b..7c770443a 100644 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.src @@ -29,6 +29,7 @@ ModalDialog DLG_INSERT_PASTE { + HelpID = "sd:ModalDialog:DLG_INSERT_PASTE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 90 ) ; @@ -61,6 +62,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_BEFORE { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "~Before" ; @@ -68,6 +70,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_AFTER { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER"; Pos = MAP_APPFONT ( 12, 27 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "A~fter" ; diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 8c03da267..8bc30e75b 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -114,7 +114,7 @@ void SdInsertPagesObjsDlg::Reset() aLbTree.InsertEntry( rName, aImgText, aImgText ); } - aCbxMasters.Check( TRUE ); + aCbxMasters.Check( sal_True ); } /************************************************************************* @@ -125,7 +125,7 @@ void SdInsertPagesObjsDlg::Reset() |* \************************************************************************/ -List* SdInsertPagesObjsDlg::GetList( USHORT nType ) +List* SdInsertPagesObjsDlg::GetList( sal_uInt16 nType ) { // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL // zurueckgegeben werden @@ -150,7 +150,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) |* \************************************************************************/ -BOOL SdInsertPagesObjsDlg::IsLink() +sal_Bool SdInsertPagesObjsDlg::IsLink() { return( aCbxLink.IsChecked() ); } @@ -161,7 +161,7 @@ BOOL SdInsertPagesObjsDlg::IsLink() |* \************************************************************************/ -BOOL SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const +sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const { return( aCbxMasters.IsChecked() ); } diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 44e7765fb..10e2e9753 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -30,7 +30,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS { - HelpID = DLG_INSERT_PAGES_OBJS ; + HelpID = HID_DLG_INSERT_PAGES_OBJS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 128 ) ; @@ -65,6 +65,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_LINK { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -72,6 +73,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index c19910751..737b0c733 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "layeroptionsdlg.hrc" +#include "helpids.h" ModalDialog DLG_INSERT_LAYER { - HelpID = SID_INSERTLAYER ; + HelpID = CMD_SID_INSERTLAYER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 172 ) ; @@ -46,6 +47,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_NAME { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -61,6 +63,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_TITLE { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -76,6 +79,7 @@ ModalDialog DLG_INSERT_LAYER MultiLineEdit EDT_DESCRIPTION { + HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 69 ) ; Size = MAP_APPFONT ( 188 , 34 ) ; @@ -86,6 +90,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_VISIBLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Visible" ; @@ -94,6 +99,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_PRINTABLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE"; Pos = MAP_APPFONT ( 6 , 119 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Printable" ; @@ -102,6 +108,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_LOCKED { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED"; Pos = MAP_APPFONT ( 6 , 132 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Locked" ; diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index b0c6b622e..05d0d4131 100644..100755 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -73,7 +73,7 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, S case PK_STANDARD: { // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); - maCBHeader.Enable( FALSE ); + maCBHeader.Enable( sal_False ); String aSlideNumberStr( SdResId( STR_SLIDE_NUMBER ) ); maCBPageNumber.SetText( aSlideNumberStr ); break; @@ -167,7 +167,7 @@ void MasterLayoutDialog::remove( PresObjKind eKind ) if( bUndo ) mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject)); SdrObjList* pOL =pObject->GetObjList(); - UINT32 nOrdNum=pObject->GetOrdNumDirect(); + sal_uInt32 nOrdNum=pObject->GetOrdNumDirect(); pOL->RemoveObject(nOrdNum); if( !bUndo ) diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index a886555b6..3f2a9d6ae 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT { + HelpID = "sd:ModalDialog:RID_SD_DLG_MASTER_LAYOUT"; Size = MAP_APPFONT( 89 , 92 ); OutputSize = TRUE; SVLook = TRUE; @@ -46,6 +47,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADER"; Pos = MAP_APPFONT( 6, 16 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -55,6 +57,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_DATE { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATE"; Pos = MAP_APPFONT( 6, 29 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -64,6 +67,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTER"; Pos = MAP_APPFONT( 6, 42 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -73,6 +77,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_PAGE_NUMBER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBER"; Pos = MAP_APPFONT( 6, 55 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 57fe7f1d0..24f1bd5b8 100644..100755 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -98,8 +98,8 @@ void MorphDlg::LoadSettings() SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + sal_uInt16 nSteps; + sal_Bool bOrient, bAttrib; if( xIStm.Is() ) { @@ -110,7 +110,7 @@ void MorphDlg::LoadSettings() else { nSteps = 16; - bOrient = bAttrib = TRUE; + bOrient = bAttrib = sal_True; } aMtfSteps.SetValue( nSteps ); @@ -130,7 +130,7 @@ void MorphDlg::SaveSettings() const { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (UINT16) aMtfSteps.GetValue() + *xOStm << (sal_uInt16) aMtfSteps.GetValue() << aCbxOrientation.IsChecked() << aCbxAttributes.IsChecked(); } diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index df244e5b9..466877800 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -27,6 +27,8 @@ #include "app.hrc" #include "morphdlg.hrc" +#include "helpids.h" + /****************************************************************************** |* |* @@ -34,7 +36,8 @@ \******************************************************************************/ ModalDialog DLG_MORPH { - HelpID = SID_POLYGON_MORPHING ; + HelpID = CMD_SID_POLYGON_MORPHING ; + HelpID = ".uno:Morphing" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 196 , 68 ) ; @@ -73,6 +76,7 @@ ModalDialog DLG_MORPH }; MetricField MTF_STEPS { + HelpID = "sd:MetricField:DLG_MORPH:MTF_STEPS"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -86,6 +90,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ATTRIBUTES { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES"; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; TabStop = TRUE ; @@ -93,6 +98,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ORIENTATION { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ORIENTATION"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index bd7861681..a804dd12f 100644..100755 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -45,6 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dockwin.hxx> +#include <sfx2/sfxresid.hxx> #include "pres.hxx" #include "navigatr.hxx" @@ -82,7 +83,7 @@ SdNavigatorWin::SdNavigatorWin( , maTlbObjects( this, SdResId( TLB_OBJECTS ) ) , maLbDocs ( this, SdResId( LB_DOCS ) ) , mpChildWinContext( pChWinCtxt ) -, mbDocImported ( FALSE ) +, mbDocImported ( sal_False ) // Bei Aenderung des DragTypes: SelectionMode der TLB anpassen! , meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) , mpBindings ( pInBindings ) @@ -92,6 +93,8 @@ SdNavigatorWin::SdNavigatorWin( FreeResource(); + maTlbObjects.SetAccessibleName(String(SdResId(STR_OBJECTS_TREE))); + mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings ); mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings ); mpDocList = new List(); @@ -141,7 +144,7 @@ SdNavigatorWin::SdNavigatorWin( ((SfxDockingWindow*)GetParent())->SetMinOutputSizePixel( maMinSize ); // InitTlb; Wird ueber Slot initiiert - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); mpBindings->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -157,7 +160,7 @@ SdNavigatorWin::~SdNavigatorWin() // Liste der DocInfos loeschen long nCount = mpDocList->Count(); while( nCount-- ) - delete (NavDocInfo*) mpDocList->Remove( (ULONG)0 ); + delete (NavDocInfo*) mpDocList->Remove( (sal_uLong)0 ); delete mpDocList; } @@ -183,7 +186,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) // Disable the shape filter drop down menu when there is a running slide // show. if (pViewShell!=NULL && sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() )) - maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE); + maToolbox.EnableItem(TBI_SHAPE_FILTER, sal_False); else maToolbox.EnableItem(TBI_SHAPE_FILTER); @@ -191,7 +194,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) { String aDocName = pDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (BOOL) FALSE, aDocName ); // Nur normale Seiten + maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); @@ -211,7 +214,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) SfxViewFrame* pViewFrame = ( ( pViewShell && pViewShell->GetViewFrame() ) ? pViewShell->GetViewFrame() : SfxViewFrame::Current() ); if( pViewFrame ) - pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, TRUE); + pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_True); } /************************************************************************* @@ -238,8 +241,8 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) { - USHORT nId = maToolbox.GetCurItemId(); - USHORT nSId = 0; + sal_uInt16 nId = maToolbox.GetCurItemId(); + sal_uInt16 nSId = 0; PageJump ePage = PAGE_NONE; switch( nId ) @@ -253,7 +256,7 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) if( nSId > 0 ) { - SfxBoolItem aItem( nSId, TRUE ); + SfxBoolItem aItem( nSId, sal_True ); mpBindings->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -276,7 +279,7 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) if( ePage != PAGE_NONE ) { - SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (UINT16)ePage ); + SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage ); mpBindings->GetDispatcher()->Execute( SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -298,7 +301,7 @@ IMPL_LINK( SdNavigatorWin, ClickToolboxHdl, ToolBox*, EMPTYARG ) IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) { - USHORT nId = maToolbox.GetCurItemId(); + sal_uInt16 nId = maToolbox.GetCurItemId(); switch( nId ) { @@ -308,16 +311,24 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) // gespeichert ist oder nicht PopupMenu *pMenu = new PopupMenu; - for( USHORT nID = NAVIGATOR_DRAGTYPE_URL; + static const char* aHIDs[] = + { + HID_SD_NAVIGATOR_MENU1, + HID_SD_NAVIGATOR_MENU2, + HID_SD_NAVIGATOR_MENU3, + 0 + }; + + for( sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) { - USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); + sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); if( nRId > 0 ) { + DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); pMenu->InsertItem( nID, String( SdResId( nRId ) ) ); - pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 + - nID - NAVIGATOR_DRAGTYPE_URL ); + pMenu->SetHelpId( nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL] ); } } @@ -325,18 +336,17 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) if( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() ) { - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, FALSE ); - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, FALSE ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, sal_False ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, sal_False ); meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED; } - pMenu->CheckItem( (UINT16)meDragType ); + pMenu->CheckItem( (sal_uInt16)meDragType ); pMenu->SetSelectHdl( LINK( this, SdNavigatorWin, MenuSelectHdl ) ); pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN ); pBox->EndSelection(); delete pMenu; - //pBox->Invalidate(); } break; @@ -409,7 +419,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) { String aStrLb = maLbDocs.GetSelectEntry(); long nPos = maLbDocs.GetSelectEntryPos(); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; ::sd::DrawDocShell* pDocShell = NULL; NavDocInfo* pInfo = GetDocInfo(); @@ -423,7 +433,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) { pDocShell = pInfo->mpDocShell; - bFound = TRUE; + bFound = sal_True; } if( bFound ) @@ -435,7 +445,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) ::sd::DrawDocShell* pNCDocShell = pNonConstDoc->GetDocSh(); String aDocName = pNCDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (BOOL) FALSE, aDocName ); // Nur normale Seiten + maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten } } @@ -458,7 +468,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) { - USHORT nMenuId; + sal_uInt16 nMenuId; if( pMenu ) nMenuId = pMenu->GetCurItemId(); else @@ -476,7 +486,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) { // Fix, um Endlosschleife zu unterbinden if( maTlbObjects.GetSelectionCount() > 1 ) - maTlbObjects.SelectAll( FALSE ); + maTlbObjects.SelectAll( sal_False ); maTlbObjects.SetSelectionMode( SINGLE_SELECTION ); } @@ -495,7 +505,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) if (pMenu != NULL) { bool bShowAllShapes (maTlbObjects.GetShowAllShapes()); - USHORT nMenuId (pMenu->GetCurItemId()); + sal_uInt16 nMenuId (pMenu->GetCurItemId()); switch (nMenuId) { case nShowNamedShapesFilter: @@ -577,10 +587,10 @@ void SdNavigatorWin::Resize() // ----------------------------------------------------------------------- -BOOL SdNavigatorWin::InsertFile(const String& rFileName) +sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) { INetURLObject aURL( rFileName ); - BOOL bReturn = TRUE; + sal_Bool bReturn = sal_True; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -609,9 +619,9 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { - SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE), FALSE); + SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE), sal_False); SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); - aMed.UseInteractionHandler( TRUE ); + aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); } @@ -621,7 +631,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) // ersteinmal nachgeschaut, ob es einen Storage enthaelt SfxMedium* pMedium = new SfxMedium( aFileName, STREAM_READ | STREAM_NOCREATE, - TRUE); // Download + sal_True); // Download if (pMedium->IsStorage()) { @@ -638,20 +648,20 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) if( !maTlbObjects.IsEqualToDoc( pDropDoc ) ) { // Nur normale Seiten - maTlbObjects.Fill(pDropDoc, (BOOL) FALSE, maDropFileName); + maTlbObjects.Fill(pDropDoc, (sal_Bool) sal_False, maDropFileName); RefreshDocumentLB( &maDropFileName ); } } } else { - bReturn = FALSE; + bReturn = sal_False; delete pMedium; } } else { - bReturn = FALSE; + bReturn = sal_False; } } @@ -662,7 +672,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( pDocName ) { @@ -670,7 +680,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) maLbDocs.RemoveEntry( 0 ); maLbDocs.InsertEntry( *pDocName, 0 ); - mbDocImported = TRUE; + mbDocImported = sal_True; } else { @@ -687,14 +697,14 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) // Liste der DocInfos loeschen long nCount = mpDocList->Count(); while( nCount-- ) - delete (NavDocInfo*) mpDocList->Remove( (ULONG)0 ); + delete (NavDocInfo*) mpDocList->Remove( (sal_uLong)0 ); if( mbDocImported ) maLbDocs.InsertEntry( aStr, 0 ); ::sd::DrawDocShell* pCurrentDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); - SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, FALSE); + SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, sal_False); while( pSfxDocShell ) { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, pSfxDocShell ); @@ -707,7 +717,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) if( aStr.Len() ) pInfo->SetName(); else - pInfo->SetName( FALSE ); + pInfo->SetName( sal_False ); // z.Z. wird wieder der Name der Shell genommen (also ohne Pfad) // da Koose es als Fehler ansieht, wenn er Pfad in URL-Notation // angezeigt wird! @@ -718,11 +728,11 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) if( pDocShell == pCurrentDocShell ) pInfo->SetActive(); else - pInfo->SetActive( FALSE ); + pInfo->SetActive( sal_False ); mpDocList->Insert( pInfo, LIST_APPEND ); } - pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0 , FALSE ); + pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0 , sal_False ); } } maLbDocs.SelectEntryPos( nPos ); @@ -730,7 +740,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) //------------------------------------------------------------------------ -USHORT SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage ) +sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage ) { switch( eDT ) { @@ -776,7 +786,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() long SdNavigatorWin::Notify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - long nOK = FALSE; + long nOK = sal_False; if( pKEvt ) { @@ -785,7 +795,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = TRUE; + nOK = sal_True; } else { @@ -797,7 +807,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) // deletion of the navigator window. Calling the // parents Notify after this is unsafe. Therefore we // return now. - return TRUE; + return sal_True; } } } @@ -818,14 +828,14 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) { - long nOK = FALSE; + long nOK = sal_False; if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) { if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = TRUE; + nOK = sal_True; } else { @@ -853,7 +863,7 @@ void SdNavigatorWin::DataChanged( const DataChangedEvent& rDCEvt ) void SdNavigatorWin::SetDragImage() { - maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, TRUE ) ) ); + maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, sal_True ) ) ); } void SdNavigatorWin::ApplyImageList() @@ -873,7 +883,7 @@ void SdNavigatorWin::ApplyImageList() |* \************************************************************************/ -SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, +SdNavigatorControllerItem::SdNavigatorControllerItem( sal_uInt16 _nId, SdNavigatorWin* pNavWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -883,14 +893,14 @@ SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, // ----------------------------------------------------------------------- -void SdNavigatorControllerItem::StateChanged( USHORT nSId, +void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_STATE ) { const SfxUInt32Item* pStateItem = PTR_CAST( SfxUInt32Item, pItem ); DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet"); - UINT32 nState = pStateItem->GetValue(); + sal_uInt32 nState = pStateItem->GetValue(); // Stift if( nState & NAVBTN_PEN_ENABLED && @@ -898,13 +908,13 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PEN ); if( nState & NAVBTN_PEN_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PEN ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PEN, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_PEN, sal_False ); if( nState & NAVBTN_PEN_CHECKED && !pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) pNavigatorWin->maToolbox.CheckItem( TBI_PEN ); if( nState & NAVBTN_PEN_UNCHECKED && pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) - pNavigatorWin->maToolbox.CheckItem( TBI_PEN, FALSE ); + pNavigatorWin->maToolbox.CheckItem( TBI_PEN, sal_False ); // Nur wenn Doc in LB das Aktive ist NavDocInfo* pInfo = pNavigatorWin->GetDocInfo(); @@ -916,7 +926,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_FIRST ); if( nState & NAVBTN_FIRST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_FIRST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, sal_False ); // Prev if( nState & NAVBTN_PREV_ENABLED && @@ -924,7 +934,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS ); if( nState & NAVBTN_PREV_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PREVIOUS ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, sal_False ); // Last if( nState & NAVBTN_LAST_ENABLED && @@ -932,7 +942,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_LAST ); if( nState & NAVBTN_LAST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_LAST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_LAST, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_LAST, sal_False ); // Next if( nState & NAVBTN_NEXT_ENABLED && @@ -940,12 +950,12 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_NEXT ); if( nState & NAVBTN_NEXT_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_NEXT ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, sal_False ); if( nState & NAVTLB_UPDATE ) { // InitTlb; Wird ueber Slot initiiert - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); GetBindings().GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -959,7 +969,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, |* \************************************************************************/ -SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, +SdPageNameControllerItem::SdPageNameControllerItem( sal_uInt16 _nId, SdNavigatorWin* pNavWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -969,7 +979,7 @@ SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, // ----------------------------------------------------------------------- -void SdPageNameControllerItem::StateChanged( USHORT nSId, +void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_PAGENAME ) @@ -987,7 +997,7 @@ void SdPageNameControllerItem::StateChanged( USHORT nSId, if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION ) { // Weil sonst immer dazuselektiert wird - pNavigatorWin->maTlbObjects.SelectAll( FALSE ); + pNavigatorWin->maTlbObjects.SelectAll( sal_False ); } pNavigatorWin->maTlbObjects.SelectEntry( aPageName ); } diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src index 4ffb23a96..b2dbf9e82 100644..100755 --- a/sd/source/ui/dlg/navigatr.src +++ b/sd/source/ui/dlg/navigatr.src @@ -149,3 +149,8 @@ Window FLT_NAVIGATOR NAVIGATR_IDLIST }; }; + +String STR_OBJECTS_TREE +{ + Text [ en-US ] = "Page Tree"; +}; diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 4704b1d40..deb172572 100644..100755 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -57,9 +57,9 @@ public: ~SdParagraphNumTabPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); private: @@ -93,9 +93,9 @@ SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rA return new SdParagraphNumTabPage( pParent, rAttrSet ); } -USHORT* SdParagraphNumTabPage::GetRanges() +sal_uInt16* SdParagraphNumTabPage::GetRanges() { - static USHORT aRange[] = + static sal_uInt16 aRange[] = { ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END, 0 @@ -104,15 +104,15 @@ USHORT* SdParagraphNumTabPage::GetRanges() return aRange; } -BOOL SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { if(maNewStartCB.GetState() != maNewStartCB.GetSavedValue() || maNewStartNumberCB.GetState() != maNewStartNumberCB.GetSavedValue()|| maNewStartNF.GetText() != maNewStartNF.GetSavedValue()) { mbModified = true; - BOOL bNewStartChecked = STATE_CHECK == maNewStartCB.GetState(); - BOOL bNumberNewStartChecked = STATE_CHECK == maNewStartNumberCB.GetState(); + sal_Bool bNewStartChecked = STATE_CHECK == maNewStartCB.GetState(); + sal_Bool bNumberNewStartChecked = STATE_CHECK == maNewStartNumberCB.GetState(); rSet.Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked)); const sal_Int16 nStartAt = (sal_Int16)maNewStartNF.GetValue(); @@ -129,7 +129,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) { const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(ATTR_NUMBER_NEWSTART); maNewStartCB.SetState( rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK ); - maNewStartCB.EnableTriState(FALSE); + maNewStartCB.EnableTriState(sal_False); } else { @@ -147,7 +147,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) nNewStart = 1; maNewStartNF.SetValue(nNewStart); - maNewStartNumberCB.EnableTriState(FALSE); + maNewStartNumberCB.EnableTriState(sal_False); } else { @@ -156,12 +156,12 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) ImplNewStartHdl(&maNewStartCB); maNewStartNF.SaveValue(); maNewStartNumberCB.SaveValue(); - mbModified = FALSE; + mbModified = sal_False; } IMPL_LINK( SdParagraphNumTabPage, ImplNewStartHdl, CheckBox*, EMPTYARG ) { - BOOL bEnable = maNewStartCB.IsChecked(); + sal_Bool bEnable = maNewStartCB.IsChecked(); maNewStartNumberCB.Enable(bEnable); maNewStartNF.Enable(bEnable && maNewStartNumberCB.IsChecked()); return 0; @@ -183,7 +183,7 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - static const BOOL bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); + static const sal_Bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); if( bShowParaNumbering ) AddTabPage( RID_TABPAGE_PARA_NUMBERING, SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges ); else diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 2db493972..a6ec49fdb 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -27,6 +27,7 @@ #include <svx/dialogs.hrc> #include "glob.hrc" +#include "helpids.h" #include "paragr.hrc" TabDialog TAB_PARAGRAPH @@ -105,13 +106,14 @@ TabDialog TAB_PARAGRAPH TabPage RID_TABPAGE_PARA_NUMBERING { - HelpId = RID_TABPAGE_PARA_NUMBERING ; + HelpId = HID_TABPAGE_PARA_NUMBERING ; Hide = TRUE ; Text = "Numbering" ; Size = MAP_APPFONT ( 260 , 185 ) ; TriStateBox CB_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -119,6 +121,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; TriStateBox CB_NUMBER_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START"; Pos = MAP_APPFONT ( 15 , 21 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Disable = TRUE ; @@ -126,6 +129,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; NumericField NF_NEW_START { + HelpID = "sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 20 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index fa89478b6..f164dcfae 100644..100755 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -112,9 +112,15 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aTmfPause.SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) ); aTmfPause.SetFormat( TIMEF_SEC ); + aLbDias.SetAccessibleRelationLabeledBy( &aRbtAtDia ); + aLbDias.SetAccessibleName(aRbtAtDia.GetText()); + aLbCustomshow.SetAccessibleRelationLabeledBy( &aRbtCustomshow ); + aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto ); + aTmfPause.SetAccessibleName(aRbtAuto.GetText()); + // Listbox mit Seitennamen fuellen rPageNames.First(); - for( UINT16 i = 0; + for( sal_uInt16 i = 0; i < rPageNames.Count(); i++ ) { @@ -124,7 +130,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, if( pCustomShowList ) { - USHORT nPosToSelect = (USHORT) pCustomShowList->GetCurPos(); + sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos(); SdCustomShow* pCustomShow; // Listbox mit CustomShows fuellen for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); @@ -155,8 +161,8 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); - const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); - const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); + const sal_Bool bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); + const sal_Bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); aTmfPause.SetTime( Time( 0, 0, nPause ) ); @@ -168,11 +174,11 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); if( bWindow ) - aRbtWindow.Check( TRUE ); + aRbtWindow.Check( sal_True ); else if( bEndless ) - aRbtAuto.Check( TRUE ); + aRbtAuto.Check( sal_True ); else - aRbtStandard.Check( TRUE ); + aRbtStandard.Check( sal_True ); InitMonitorSettings(); @@ -233,7 +239,7 @@ void SdStartPresentationDlg::InitMonitorSettings() else nSelected--; - maLBMonitor.SelectEntryPos( (USHORT)nSelected ); + maLBMonitor.SelectEntryPos( (sal_uInt16)nSelected ); } } catch( Exception& ) @@ -261,7 +267,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo.IsChecked() ) ); - USHORT nPos = maLBMonitor.GetSelectEntryPos(); + sal_uInt16 nPos = maLBMonitor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, nPos + 1 ) ); @@ -299,8 +305,8 @@ IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG if( bWindow ) { - aCbxAlwaysOnTop.Enable( FALSE ); - aCbxAlwaysOnTop.Check( FALSE ); + aCbxAlwaysOnTop.Enable( sal_False ); + aCbxAlwaysOnTop.Check( sal_False ); } else aCbxAlwaysOnTop.Enable(); diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index a414d282d..a584f5953 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -33,7 +33,7 @@ ModalDialog DLG_START_PRESENTATION { - HelpID = SID_PRESENTATION ; + HelpID = CMD_SID_PRESENTATION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 256, 205 ) ; @@ -68,6 +68,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_ALL { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80 , 12 ) ; Text [ en-US ] = "All ~slides" ; @@ -75,6 +76,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AT_DIA { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; Text [ en-US ] = "~From:" ; @@ -82,6 +84,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_DIAS { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS"; Border = TRUE ; Pos = MAP_APPFONT ( 82, 24 ) ; Size = MAP_APPFONT ( 111, 80 ) ; @@ -91,6 +94,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_CUSTOMSHOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; TabStop = TRUE ; @@ -98,6 +102,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_CUSTOMSHOW { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW"; Border = TRUE ; Pos = MAP_APPFONT ( 32, 53 ) ; Size = MAP_APPFONT ( 161, 80 ) ; @@ -113,6 +118,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_STANDARD { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD"; Pos = MAP_APPFONT ( 12, 84 ) ; Size = MAP_APPFONT ( 81, 12 ) ; Text [ en-US ] = "~Default" ; @@ -120,6 +126,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_WINDOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "~Window" ; @@ -127,6 +134,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AUTO { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "A~uto" ; @@ -142,6 +150,7 @@ ModalDialog DLG_START_PRESENTATION */ TimeField TMF_PAUSE { + HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE"; Pos = MAP_APPFONT ( 32, 120 ) ; Size = MAP_APPFONT ( 50, 12 ) ; Border = TRUE ; @@ -166,6 +175,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_AUTOLOGO { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO"; Pos = MAP_APPFONT ( 32 , 138 ) ; Size = MAP_APPFONT ( 61 , 12 ) ; TabStop = TRUE ; @@ -180,6 +190,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MANUEL { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL"; Pos = MAP_APPFONT ( 108 , 84 ) ; Size = MAP_APPFONT ( 139 , 12 ) ; TabStop = TRUE ; @@ -187,6 +198,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MOUSEPOINTER { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER"; Pos = MAP_APPFONT ( 108, 96 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer ~visible" ; @@ -194,6 +206,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_PEN { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN"; Pos = MAP_APPFONT ( 108, 108 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer as ~pen" ; @@ -201,6 +214,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_NAVIGATOR { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR"; Pos = MAP_APPFONT ( 108, 120 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -208,6 +222,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ANIMATION_ALLOWED { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED"; Pos = MAP_APPFONT ( 108, 132 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -215,6 +230,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_CHANGE_PAGE { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE"; Pos = MAP_APPFONT ( 108, 144 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -222,6 +238,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ALWAYS_ON_TOP { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP"; Pos = MAP_APPFONT ( 108, 156 ) ; Size = MAP_APPFONT ( 145, 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 3f92b1c52..0493c18b7 100644..100755 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -84,8 +84,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, if( IS_OUTLINE(ePO)) { // Leider sind die Itemsets unserer Stylesheets nicht discret.. - const USHORT* pPtr = pOrgSet->GetRanges(); - USHORT p1, p2; + const sal_uInt16* pPtr = pOrgSet->GetRanges(); + sal_uInt16 p1, p2; while( *pPtr ) { p1 = pPtr[0]; @@ -115,14 +115,14 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, // Fals in diesem Stylesheet kein Bullet Item ist, holen wir uns // das aus dem 'Outline 1' Stylesheet. - if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem )) + if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem )) { String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE))); aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) ); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if(pFirstStyleSheet) - if( SFX_ITEM_SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem) ) + if( SFX_ITEM_SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem) ) aInputSet.Put( *pItem ); } @@ -255,7 +255,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() // ----------------------------------------------------------------------- -void SdPresLayoutTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(aInputSet.GetPool())); switch( nId ) { @@ -324,7 +324,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const pOutSet->Put( *SfxTabDialog::GetOutputItemSet() ); const SvxNumBulletItem *pSvxNumBulletItem = NULL; - if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pSvxNumBulletItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pSvxNumBulletItem )) SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet ); return pOutSet; } @@ -334,7 +334,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const // --------------------------------------------------------------------- // --------------------------------------------------------------------- -USHORT SdPresLayoutTemplateDlg::GetOutlineLevel() const +sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const { switch( ePO ) { @@ -348,7 +348,7 @@ USHORT SdPresLayoutTemplateDlg::GetOutlineLevel() const case PO_OUTLINE_8: return 7; case PO_OUTLINE_9: return 8; default: - DBG_ASSERT( FALSE, "Falscher Po! [CL]"); + DBG_ASSERT( sal_False, "Falscher Po! [CL]"); } return 0; } diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 1d33071c5..299c093a9 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -100,6 +100,9 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : #ifndef QUARTZ SetDrawMode(); #endif + + aCbxFront.SetAccessibleRelationLabeledBy( &aRbtBooklet ); + aCbxBack.SetAccessibleRelationLabeledBy( &aRbtBooklet ); } // ----------------------------------------------------------------------- @@ -110,7 +113,7 @@ SdPrintOptions::~SdPrintOptions() // ----------------------------------------------------------------------- -BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { if( aCbxDraw.GetSavedValue() != aCbxDraw.IsChecked() || aCbxNotes.GetSavedValue() != aCbxNotes.IsChecked() || @@ -147,7 +150,7 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) aOptions.GetOptionsPrint().SetBackPage( aCbxBack.IsChecked() ); aOptions.GetOptionsPrint().SetPaperbin( aCbxPaperbin.IsChecked() ); - UINT16 nQuality = 0; // Standard, also Color + sal_uInt16 nQuality = 0; // Standard, also Color if( aRbtGrayscale.IsChecked() ) nQuality = 1; if( aRbtBlackWhite.IsChecked() ) @@ -156,9 +159,9 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( aOptions ); - return( TRUE ); + return( sal_True ); } - return( FALSE ); + return( sal_False ); } // ----------------------------------------------------------------------- @@ -166,7 +169,7 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) { const SdOptionsPrintItem* pPrintOpts = NULL; - if( SFX_ITEM_SET == rAttrs.GetItemState( ATTR_OPTIONS_PRINT, FALSE, + if( SFX_ITEM_SET == rAttrs.GetItemState( ATTR_OPTIONS_PRINT, sal_False, (const SfxPoolItem**) &pPrintOpts ) ) { aCbxDraw.Check( pPrintOpts->GetOptionsPrint().IsDraw() ); @@ -191,7 +194,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) aRbtDefault.Check(); } - UINT16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); + sal_uInt16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); if( nQuality == 0 ) aRbtColor.Check(); else if( nQuality == 1 ) @@ -298,7 +301,7 @@ void SdPrintOptions::PageCreated (SfxAllItemSet SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False); if (pFlagItem) { - UINT32 nFlags=pFlagItem->GetValue(); + sal_uInt32 nFlags=pFlagItem->GetValue(); if ( ( nFlags & SD_DRAW_MODE ) == SD_DRAW_MODE ) SetDrawMode(); } diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index 2644d6e59..3747dd39e 100644 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.src @@ -42,6 +42,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DRAW { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -49,6 +50,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_NOTES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -56,6 +58,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HANDOUTS { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -63,6 +66,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_OUTLINE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -82,6 +86,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_COLOR { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Default" ; @@ -89,6 +94,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_GRAYSCALE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE"; Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Gra~yscale" ; @@ -96,6 +102,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BLACKWHITE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE"; Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Black & ~white" ; @@ -109,6 +116,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAGENAME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Page name" ; @@ -116,6 +124,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DATE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "D~ate" ; @@ -123,6 +132,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_TIME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Ti~me" ; @@ -130,6 +140,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HIDDEN_PAGES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES"; Pos = MAP_APPFONT ( 12 , 125 ) ; // 120 , 14 Size = MAP_APPFONT ( 90 , 10 ) ; @@ -150,6 +161,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_DEFAULT { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT"; Pos = MAP_APPFONT ( 136 , 83 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -157,6 +169,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGESIZE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE"; Pos = MAP_APPFONT ( 136 , 97 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "~Fit to page" ; @@ -164,6 +177,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGETILE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -171,6 +185,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BOOKLET { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET"; Pos = MAP_APPFONT ( 136, 125 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -178,6 +193,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_FRONT { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT"; Pos = MAP_APPFONT ( 145 , 139 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; TabStop = TRUE ; @@ -185,6 +201,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_BACK { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK"; Pos = MAP_APPFONT ( 202 , 139 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -192,6 +209,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAPERBIN { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN"; Pos = MAP_APPFONT ( 136 , 153 ) ; Size = MAP_APPFONT ( 118 , 30 ) ; Text [ en-US ] = "Paper tray from printer s~ettings" ; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 4c71a1611..90c60c9b0 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -91,18 +91,18 @@ void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) // AbstractCopyDlg_Impl end //AbstractSdCustomShowDlg_Impl begin -BOOL AbstractSdCustomShowDlg_Impl::IsModified() const +sal_Bool AbstractSdCustomShowDlg_Impl::IsModified() const { return pDlg->IsModified(); } -BOOL AbstractSdCustomShowDlg_Impl::IsCustomShow() const +sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const { return pDlg->IsCustomShow(); } // AbstractSdCustomShowDlg_Impl end // AbstractTabDialog_Impl begin -void AbstractTabDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -110,7 +110,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -132,7 +132,7 @@ String AbstractTabDialog_Impl::GetText() const // -------------------------------------------------------------------- // AbstractBulletDialog_Impl begin -void AbstractBulletDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId ) { static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId ); } @@ -140,7 +140,7 @@ const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet(); } -const USHORT* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetInputRanges( pItem ); } @@ -161,7 +161,7 @@ String AbstractBulletDialog_Impl::GetText() const // -------------------------------------------------------------------- -void SdPresLayoutTemplateDlg_Impl::SetCurPageId( USHORT nId ) +void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -171,7 +171,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } -const USHORT* SdPresLayoutTemplateDlg_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* SdPresLayoutTemplateDlg_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -202,7 +202,7 @@ OutputType AbstractAssistentDlg_Impl::GetOutputMedium() const { return pDlg->GetOutputMedium(); } -BOOL AbstractAssistentDlg_Impl::IsSummary() const +sal_Bool AbstractAssistentDlg_Impl::IsSummary() const { return pDlg->IsSummary(); } @@ -214,11 +214,11 @@ String AbstractAssistentDlg_Impl::GetDocPath() const { return pDlg->GetDocPath(); } -BOOL AbstractAssistentDlg_Impl::GetStartWithFlag() const +sal_Bool AbstractAssistentDlg_Impl::GetStartWithFlag() const { return pDlg->GetStartWithFlag(); } -BOOL AbstractAssistentDlg_Impl::IsDocEmpty() const +sal_Bool AbstractAssistentDlg_Impl::IsDocEmpty() const { return pDlg->IsDocEmpty(); } @@ -252,7 +252,7 @@ void AbstractSdSnapLineDlg_Impl::HideDeleteBtn() { pDlg->HideDeleteBtn(); } -void AbstractSdSnapLineDlg_Impl::SetInputFields(BOOL bEnableX, BOOL bEnableY) +void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) { pDlg->SetInputFields(bEnableX, bEnableY); } @@ -267,14 +267,14 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( rHelpId ); } // AbstractSdInsertLayerDlg_Impl end //AbstractSdInsertPasteDlg_Impl begin -BOOL AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const +sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return pDlg->IsInsertBefore(); } @@ -285,15 +285,15 @@ BOOL AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return (::Window*)pDlg; } -List* AbstractSdInsertPagesObjsDlg_Impl::GetList( USHORT nType ) +List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType ) { return pDlg->GetList( nType ); } -BOOL AbstractSdInsertPagesObjsDlg_Impl::IsLink() +sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() { return pDlg->IsLink(); } -BOOL AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const +sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const { return pDlg->IsRemoveUnnessesaryMasterPages(); } @@ -304,15 +304,15 @@ void AbstractMorphDlg_Impl::SaveSettings() const { pDlg->SaveSettings(); } -USHORT AbstractMorphDlg_Impl::GetFadeSteps() const +sal_uInt16 AbstractMorphDlg_Impl::GetFadeSteps() const { return pDlg->GetFadeSteps(); } -BOOL AbstractMorphDlg_Impl::IsAttributeFade() const +sal_Bool AbstractMorphDlg_Impl::IsAttributeFade() const { return pDlg->IsAttributeFade(); } -BOOL AbstractMorphDlg_Impl::IsOrientationFade() const +sal_Bool AbstractMorphDlg_Impl::IsOrientationFade() const { return pDlg->IsOrientationFade(); } @@ -386,8 +386,8 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( ::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) //add for BreakDlg + sal_uLong nSumActionCount, + sal_uLong nObjCount ) //add for BreakDlg { return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); } @@ -416,14 +416,14 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::W } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage ) { return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } // add for SdCharDlg end //add for AssistentDlg begin -AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) +AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index dd5d5e68c..d227e774f 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -78,8 +78,8 @@ class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual BOOL IsModified() const ; - virtual BOOL IsCustomShow() const ; + virtual sal_Bool IsModified() const ; + virtual sal_Bool IsCustomShow() const ; }; //add for SdCharDlg begin @@ -87,9 +87,9 @@ class SfxTabDialog; class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -103,9 +103,9 @@ class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -117,9 +117,9 @@ class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -133,11 +133,11 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg DECL_ABSTDLG_BASE(AbstractAssistentDlg_Impl,AssistentDlg) virtual SfxObjectShellLock GetDocument(); virtual OutputType GetOutputMedium() const; - virtual BOOL IsSummary() const; + virtual sal_Bool IsSummary() const; virtual StartType GetStartType() const; virtual String GetDocPath() const; - virtual BOOL GetStartWithFlag() const; - virtual BOOL IsDocEmpty() const; + virtual sal_Bool GetStartWithFlag() const; + virtual sal_Bool IsDocEmpty() const; virtual String GetPassword(); }; @@ -158,7 +158,7 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg virtual void GetAttr(SfxItemSet& rOutAttrs); virtual void HideRadioGroup(); virtual void HideDeleteBtn(); - virtual void SetInputFields(BOOL bEnableX, BOOL bEnableY); + virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); //from class Window virtual void SetText( const XubString& rStr ); }; @@ -170,7 +170,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& rHelpId ) ; }; // add for SdInsertPasteDlg @@ -178,7 +178,7 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual BOOL IsInsertBefore() const; + virtual sal_Bool IsInsertBefore() const; }; // add for SdInsertPagesObjsDlg @@ -187,9 +187,9 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual List* GetList( USHORT nType ); - virtual BOOL IsLink(); - virtual BOOL IsRemoveUnnessesaryMasterPages() const; + virtual List* GetList( sal_uInt16 nType ); + virtual sal_Bool IsLink(); + virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; // add for MorphDlg @@ -197,9 +197,9 @@ class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) virtual void SaveSettings() const; - virtual USHORT GetFadeSteps() const; - virtual BOOL IsAttributeFade() const ; - virtual BOOL IsOrientationFade() const ; + virtual sal_uInt16 GetFadeSteps() const; + virtual sal_Bool IsAttributeFade() const ; + virtual sal_Bool IsOrientationFade() const ; }; // add for SdStartPresentationDlg @@ -259,12 +259,12 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ); virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ); + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot); virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 96e40db4c..7668941f1 100644..100755 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -116,17 +116,17 @@ void SdPresLayoutDlg::Reset() long nName; // MasterPage austauschen - if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, FALSE, &pPoolItem ) == SFX_ITEM_SET ) + if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, sal_False, &pPoolItem ) == SFX_ITEM_SET ) { - BOOL bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); + sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); maCbxMasterPage.Enable( !bMasterPage ); maCbxMasterPage.Check( bMasterPage ); } // Nicht verwendete MasterPages entfernen - maCbxCheckMasters.Check(FALSE); + maCbxCheckMasters.Check(sal_False); - if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, TRUE, &pPoolItem) == SFX_ITEM_SET) + if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, sal_True, &pPoolItem) == SFX_ITEM_SET) maName = ((const SfxStringItem*)pPoolItem)->GetValue(); else maName.Erase(); @@ -141,7 +141,7 @@ void SdPresLayoutDlg::Reset() } DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden"); - maVS.SelectItem((USHORT)nName + 1); // Inizes des ValueSets beginnen bei 1 + maVS.SelectItem((sal_uInt16)nName + 1); // Inizes des ValueSets beginnen bei 1 } @@ -154,7 +154,7 @@ void SdPresLayoutDlg::Reset() void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) { short nId = maVS.GetSelectItemId(); - BOOL bLoad = nId > mnLayoutCount; + sal_Bool bLoad = nId > mnLayoutCount; rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) ); String aLayoutName; @@ -195,9 +195,9 @@ void SdPresLayoutDlg::FillValueSet() SdDrawDocument* pDoc = mpDocSh->GetDoc(); - USHORT nCount = pDoc->GetMasterPageCount(); + sal_uInt16 nCount = pDoc->GetMasterPageCount(); - for (USHORT nLayout = 0; nLayout < nCount; nLayout++) + for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = (SdPage*)pDoc->GetMasterPage(nLayout); if (pMaster->GetPageKind() == PK_STANDARD) @@ -207,7 +207,7 @@ void SdPresLayoutDlg::FillValueSet() mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND); Bitmap aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90)); - maVS.InsertItem((USHORT)mpLayoutNames->Count(), aBitmap, aLayoutName); + maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName); } } @@ -244,12 +244,12 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) return 0; } - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); // Inserted update to force repaint Update(); String aFile; - BOOL bCancel = FALSE; + sal_Bool bCancel = sal_False; switch (nResult) { @@ -268,14 +268,14 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) break; default: - bCancel = TRUE; + bCancel = sal_True; } delete pDlg; if( !bCancel ) { // Pruefen, ob Vorlage schon vorhanden - BOOL bExists = FALSE; + sal_Bool bExists = sal_False; String* pName = (String*)mpLayoutNames->First(); String aCompareStr( maName ); if( maName.Len() == 0 ) @@ -285,9 +285,9 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { if( aCompareStr == *pName ) { - bExists = TRUE; + bExists = sal_True; // Vorlage selektieren - USHORT nId = (USHORT) mpLayoutNames->GetCurPos() + 1; + sal_uInt16 nId = (sal_uInt16) mpLayoutNames->GetCurPos() + 1; maVS.SelectItem( nId ); } pName = (String*)mpLayoutNames->Next(); @@ -306,9 +306,9 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { ::sd::DrawDocShell* pTemplDocSh= pTemplDoc->GetDocSh(); - USHORT nCount = pTemplDoc->GetMasterPageCount(); + sal_uInt16 nCount = pTemplDoc->GetMasterPageCount(); - for (USHORT nLayout = 0; nLayout < nCount; nLayout++) + for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = (SdPage*) pTemplDoc->GetMasterPage(nLayout); if (pMaster->GetPageKind() == PK_STANDARD) @@ -318,13 +318,13 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND); Bitmap aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90)); - maVS.InsertItem((USHORT)mpLayoutNames->Count(), aBitmap, aLayoutName); + maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName); } } } else { - bCancel = TRUE; + bCancel = sal_True; } pDoc->CloseBookmarkDoc(); @@ -333,14 +333,14 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { // leeres Layout mpLayoutNames->Insert( new String( maStrNone ), LIST_APPEND ); - maVS.InsertItem( (USHORT) mpLayoutNames->Count(), + maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(), Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone ); } if (!bCancel) { // Vorlage selektieren - maVS.SelectItem( (USHORT) mpLayoutNames->Count() ); + maVS.SelectItem( (sal_uInt16) mpLayoutNames->Count() ); } } } diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index bb0e5f5a3..5095e6436 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -27,9 +27,11 @@ #include "app.hrc" #include "sdpreslt.hrc" +#include "sdcommands.h" + ModalDialog DLG_PRESLT { - HelpID = SID_PRESENTATION_LAYOUT ; + HelpID = CMD_SID_PRESENTATION_LAYOUT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 212 , 185 ) ; @@ -63,6 +65,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_MASTER_PAGE { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE"; Pos = MAP_APPFONT ( 6 , 158 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; TabStop = TRUE ; @@ -70,6 +73,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 170 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -77,6 +81,7 @@ ModalDialog DLG_PRESLT }; PushButton BTN_LOAD { + HelpID = "sd:PushButton:DLG_PRESLT:BTN_LOAD"; Pos = MAP_APPFONT ( 156 , 155 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 32630c10c..419a4967f 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -75,9 +75,9 @@ public: }; -BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE; +sal_Bool SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False; -BOOL SdPageObjsTLB::IsInDrag() +sal_Bool SdPageObjsTLB::IsInDrag() { return bIsInDrag; } @@ -94,7 +94,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ) - : SdTransferable(rDocShell.GetDoc(), NULL, TRUE), + : SdTransferable(rDocShell.GetDoc(), NULL, sal_True), mrParent( rParent ), maBookmark( rBookmark ), mrDocShell( rDocShell ), @@ -123,7 +123,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - ULONG nFormatId = SotExchange::GetFormat( rFlavor ); + sal_uLong nFormatId = SotExchange::GetFormat( rFlavor ); switch (nFormatId) { case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK: @@ -240,17 +240,18 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) , mpOwnMedium ( NULL ) , maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) , maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) -, mbLinkableSelected ( FALSE ) +, mbLinkableSelected ( sal_False ) , mpDropNavWin ( NULL ) , mbShowAllShapes ( false ) , mbShowAllPages ( false ) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | - WB_HASBUTTONS | // WB_HASLINESATROOT | - WB_HSCROLL | - WB_HASBUTTONSATROOT ) ); + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | + WB_HASBUTTONS | // WB_HASLINESATROOT | + WB_HSCROLL | + WB_HASBUTTONSATROOT | + WB_QUICK_SEARCH /* i31275 */ ); SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ), Bitmap( SdResId( BMP_COLLAPSE ) ) ); @@ -312,9 +313,9 @@ String SdPageObjsTLB::GetObjectName( |* \************************************************************************/ -BOOL SdPageObjsTLB::SelectEntry( const String& rName ) +sal_Bool SdPageObjsTLB::SelectEntry( const String& rName ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if( rName.Len() ) { @@ -326,7 +327,7 @@ BOOL SdPageObjsTLB::SelectEntry( const String& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = TRUE; + bFound = sal_True; SetCurEntry( pEntry ); } } @@ -340,10 +341,10 @@ BOOL SdPageObjsTLB::SelectEntry( const String& rName ) |* \************************************************************************/ -BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) +sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName ) { - BOOL bFound = FALSE; - BOOL bChilds = FALSE; + sal_Bool bFound = sal_False; + sal_Bool bChilds = sal_False; if( rName.Len() ) { @@ -355,11 +356,11 @@ BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = TRUE; - BOOL bExpanded = IsExpanded( pEntry ); + bFound = sal_True; + sal_Bool bExpanded = IsExpanded( pEntry ); long nCount = GetChildSelectionCount( pEntry ); if( bExpanded && nCount > 0 ) - bChilds = TRUE; + bChilds = sal_True; } } } @@ -373,7 +374,7 @@ BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) |* \************************************************************************/ -void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, +void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages, const String& rDocName) { String aSelection; @@ -385,7 +386,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, mpDoc = pInDoc; maDocName = rDocName; - mbShowAllPages = (bAllPages == TRUE); + mbShowAllPages = (bAllPages == sal_True); mpMedium = NULL; SdPage* pPage = NULL; @@ -393,8 +394,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, IconProvider aIconProvider; // first insert all pages including objects - USHORT nPage = 0; - const USHORT nMaxPages = mpDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -402,7 +403,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, if( (mbShowAllPages || pPage->GetPageKind() == PK_STANDARD) && !(pPage->GetPageKind()==PK_HANDOUT) ) //#94954# never list the normal handout page ( handout-masterpage is used instead ) { - BOOL bPageExluded = pPage->IsExcluded(); + sal_Bool bPageExluded = pPage->IsExcluded(); bool bPageBelongsToShow = PageBelongsToCurrentShow (pPage); bPageExluded |= !bPageBelongsToShow; @@ -416,7 +417,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, if( mbShowAllPages ) { nPage = 0; - const USHORT nMaxMasterPages = mpDoc->GetMasterPageCount(); + const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount(); while( nPage < nMaxMasterPages ) { @@ -479,7 +480,7 @@ void SdPageObjsTLB::AddShapeList ( aIcon, aIcon, pParentEntry, - FALSE, + sal_False, LIST_APPEND, pUserData); @@ -487,7 +488,7 @@ void SdPageObjsTLB::AddShapeList ( rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, IM_FLAT, - FALSE /*not reverse*/); + sal_False /*not reverse*/); while( aIter.IsMore() ) { @@ -506,7 +507,7 @@ void SdPageObjsTLB::AddShapeList ( maImgOle, maImgOle, pEntry, - FALSE, + sal_False, LIST_APPEND, pObj ); @@ -518,7 +519,7 @@ void SdPageObjsTLB::AddShapeList ( maImgGraphic, maImgGraphic, pEntry, - FALSE, + sal_False, LIST_APPEND, pObj ); @@ -541,7 +542,7 @@ void SdPageObjsTLB::AddShapeList ( rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry, - FALSE, + sal_False, LIST_APPEND, pObj ); @@ -597,13 +598,13 @@ bool SdPageObjsTLB::GetShowAllShapes (void) const |* \************************************************************************/ -BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) +sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) { if( pInDoc ) mpDoc = pInDoc; if( !mpDoc ) - return( FALSE ); + return( sal_False ); SdrObject* pObj = NULL; SdPage* pPage = NULL; @@ -611,8 +612,8 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) String aName; // Alle Pages incl. Objekte vergleichen - USHORT nPage = 0; - const USHORT nMaxPages = mpDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -620,11 +621,11 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( pPage->GetPageKind() == PK_STANDARD ) { if( !pEntry ) - return( FALSE ); + return( sal_False ); aName = GetEntryText( pEntry ); if( pPage->GetName() != aName ) - return( FALSE ); + return( sal_False ); pEntry = Next( pEntry ); @@ -642,12 +643,12 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( aObjectName.Len() ) { if( !pEntry ) - return( FALSE ); + return( sal_False ); aName = GetEntryText( pEntry ); if( aObjectName != aName ) - return( FALSE ); + return( sal_False ); pEntry = Next( pEntry ); } @@ -679,14 +680,14 @@ String SdPageObjsTLB::GetSelectEntry() |* \************************************************************************/ -List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) +List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth ) { List* pList = NULL; SvLBoxEntry* pEntry = FirstSelected(); while( pEntry ) { - USHORT nListDepth = GetModel()->GetDepth( pEntry ); + sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry ); if( nListDepth == nDepth ) { if( !pList ) @@ -724,8 +725,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) // document name already inserted // only insert all "normal" ? slides with objects - USHORT nPage = 0; - const USHORT nMaxPages = mpBookmarkDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpBookmarkDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -736,7 +737,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) aImgPage, aImgPage, pFileEntry, - FALSE, + sal_False, LIST_APPEND, reinterpret_cast< void* >( 1 ) ); @@ -812,7 +813,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) if( pMed ) { // in this mode the document is also owned and controlled by this instance - mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, TRUE); + mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True); if (mxBookmarkDocShRef->DoLoad(pMed)) mpBookmarkDoc = mxBookmarkDocShRef->GetDoc(); else @@ -837,7 +838,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) /************************************************************************* |* -|* Bookmark-Dokument schlieáen und loeschen +|* Bookmark-Dokument schlie�en und loeschen |* \************************************************************************/ @@ -875,12 +876,12 @@ void SdPageObjsTLB::SelectHdl() { SvLBoxEntry* pEntry = FirstSelected(); - mbLinkableSelected = TRUE; + mbLinkableSelected = sal_True; while( pEntry && mbLinkableSelected ) { if( NULL == pEntry->GetUserData() ) - mbLinkableSelected = FALSE; + mbLinkableSelected = sal_False; pEntry = NextSelected( pEntry ); } @@ -941,26 +942,26 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) // Select all entries and disable them as drop targets. SetSelectionMode(MULTIPLE_SELECTION); - SetCursor(NULL, FALSE); - SelectAll(TRUE, FALSE); - EnableSelectionAsDropTarget(FALSE, TRUE); + SetCursor(NULL, sal_False); + SelectAll(sal_True, sal_False); + EnableSelectionAsDropTarget(sal_False, sal_True); // Enable only the entries as drop targets that are children of the // page under the mouse. SvLBoxEntry* pParent = GetRootLevelParent(pEntry); if (pParent != NULL) { - SelectAll(FALSE, FALSE); - Select(pParent, TRUE); + SelectAll(sal_False, sal_False); + Select(pParent, sal_True); // for (SvLBoxEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild)) - // Select(pChild, TRUE); - EnableSelectionAsDropTarget(TRUE, TRUE);//FALSE); + // Select(pChild, sal_True); + EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False); } // Set selection back to the entry under the mouse. - SelectAll(FALSE,FALSE); + SelectAll(sal_False,sal_False); SetSelectionMode(SINGLE_SELECTION); - Select(pEntry, TRUE); + Select(pEntry, sal_True); // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber @@ -999,7 +1000,7 @@ void SdPageObjsTLB::DoDrag() SvTreeListBox::ReleaseMouse(); - bIsInDrag = TRUE; + bIsInDrag = sal_True; SvLBoxDDInfo aDDInfo; memset(&aDDInfo,0,sizeof(SvLBoxDDInfo)); @@ -1078,7 +1079,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 ) } mpDropNavWin = NULL; - bIsInDrag = FALSE; + bIsInDrag = sal_False; } /************************************************************************* @@ -1100,7 +1101,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) SvLBoxEntry* pEntry = GetDropTarget(rEvent.maPosPixel); if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction )) { - ImplShowTargetEmphasis( pTargetEntry, FALSE ); + ImplShowTargetEmphasis( pTargetEntry, sal_False ); } else if( !nDragDropMode ) { @@ -1113,16 +1114,16 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) // Draw emphasis. if (pEntry != pTargetEntry || !(nImpFlags & SVLBOX_TARGEMPH_VIS)) { - ImplShowTargetEmphasis( pTargetEntry, FALSE ); + ImplShowTargetEmphasis( pTargetEntry, sal_False ); pTargetEntry = pEntry; - ImplShowTargetEmphasis( pTargetEntry, TRUE ); + ImplShowTargetEmphasis( pTargetEntry, sal_True ); } } } // Hide emphasis when there is no valid drop action. if (nResult == DND_ACTION_NONE) - ImplShowTargetEmphasis(pTargetEntry, FALSE); + ImplShowTargetEmphasis(pTargetEntry, sal_False); return nResult; } @@ -1142,7 +1143,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( !bIsInDrag ) { SdNavigatorWin* pNavWin = NULL; - USHORT nId = SID_NAVIGATOR; + sal_uInt16 nId = SID_NAVIGATOR; if( mpFrame->HasChildWindow( nId ) ) pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) ); @@ -1200,7 +1201,7 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const List* pShowList = const_cast<SdDrawDocument*>(mpDoc)->GetCustomShowList(); if (pShowList != NULL) { - ULONG nCurrentShowIndex = pShowList->GetCurPos(); + sal_uLong nCurrentShowIndex = pShowList->GetCurPos(); void* pObject = pShowList->GetObject(nCurrentShowIndex); pCustomShow = static_cast<SdCustomShow*>(pObject); } @@ -1209,8 +1210,8 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const if (pCustomShow != NULL) { bBelongsToShow = false; - ULONG nPageCount = pCustomShow->Count(); - for (USHORT i=0; i<nPageCount && !bBelongsToShow; i++) + sal_uLong nPageCount = pCustomShow->Count(); + for (sal_uInt16 i=0; i<nPageCount && !bBelongsToShow; i++) if (pPage == static_cast<SdPage*>(pCustomShow->GetObject (i))) bBelongsToShow = true; } @@ -1222,11 +1223,11 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const -BOOL SdPageObjsTLB::NotifyMoving( +sal_Bool SdPageObjsTLB::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos) + sal_uLong& rNewChildPos) { SvLBoxEntry* pDestination = pTarget; while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL) @@ -1255,7 +1256,7 @@ BOOL SdPageObjsTLB::NotifyMoving( { rpNewParent = 0; rNewChildPos = 0; - return TRUE; + return sal_True; } else if (GetParent(pDestination) == NULL) { @@ -1269,10 +1270,10 @@ BOOL SdPageObjsTLB::NotifyMoving( rNewChildPos += nCurEntrySelPos; nCurEntrySelPos++; } - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } @@ -1379,7 +1380,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else aObjectDescriptor.maDisplayName = String(); - aObjectDescriptor.mbCanLink = FALSE; + aObjectDescriptor.mbCanLink = sal_False; rTransferable.SetStartPos(aDragPos); rTransferable.SetObjectDescriptor( aObjectDescriptor ); diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index ca58f1116..1e4b0d815 100644..100755 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -71,7 +71,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) : - SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, FALSE ), + SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, sal_False ), rDocShell ( *pDocShell ), pSdrView ( pView ), pColorTab ( pModel->GetColorTable() ), @@ -122,7 +122,7 @@ SdTabTemplateDlg::~SdTabTemplateDlg() // ----------------------------------------------------------------------- -void SdTabTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 12ad9879c..b53073c7f 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/embed/VerbAttributes.hpp> #include "sdattr.hxx" - +#include <sfx2/sfxresid.hxx> #include <vcl/waitobj.hxx> #include <osl/file.hxx> @@ -141,8 +141,11 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : rOutAttrs ( rInAttrs ), mpView ( NULL ), mpDoc ( NULL ), - bTreeUpdated ( FALSE ) + bTreeUpdated ( sal_False ) { + aEdtSound.SetAccessibleName(String(SdResId(STR_PATHNAME))); + aBtnSeek.SetAccessibleRelationMemberOf( &aFlSeparator ); + FreeResource(); aBtnSearch.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) ); @@ -202,7 +205,7 @@ void SdTPAction::Construct() // OLE-Actionlistbox auffuellen SdrOle2Obj* pOleObj = NULL; SdrGrafObj* pGrafObj = NULL; - BOOL bOLEAction = FALSE; + sal_Bool bOLEAction = sal_False; if ( mpView->AreObjectsMarked() ) { @@ -214,8 +217,8 @@ void SdTPAction::Construct() SdrMark* pMark = rMarkList.GetMark(0); pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -228,13 +231,13 @@ void SdTPAction::Construct() // // VCXControl ? // else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) // { -// bDisableAll = TRUE; +// bDisableAll = sal_True; // } } } if( pGrafObj ) { - bOLEAction = TRUE; + bOLEAction = sal_True; aVerbVector.push_back( 0 ); aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( String( SdResId( STR_EDIT_OBJ ) ) ) ); @@ -244,7 +247,7 @@ void SdTPAction::Construct() uno::Reference < embed::XEmbeddedObject > xObj = pOleObj->GetObjRef(); if ( xObj.is() ) { - bOLEAction = TRUE; + bOLEAction = sal_True; uno::Sequence < embed::VerbDescriptor > aVerbs; try { @@ -270,24 +273,24 @@ void SdTPAction::Construct() } pCurrentActions = new List; - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_NONE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_PREVPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_NEXTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_FIRSTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_LASTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_BOOKMARK, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_DOCUMENT, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_SOUND, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_NONE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_PREVPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_NEXTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_FIRSTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_LASTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_BOOKMARK, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_DOCUMENT, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_SOUND, LIST_APPEND); if( bOLEAction && aLbOLEAction.GetEntryCount() ) - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_VERB, LIST_APPEND ); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_PROGRAM, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_MACRO, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_STOPPRESENTATION, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_VERB, LIST_APPEND ); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_PROGRAM, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_MACRO, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_STOPPRESENTATION, LIST_APPEND); // Action-Listbox fuellen - for (ULONG nAction = 0; nAction < pCurrentActions->Count(); nAction++) + for (sal_uLong nAction = 0; nAction < pCurrentActions->Count(); nAction++) { - USHORT nRId = GetClickActionSdResId((presentation::ClickAction)(ULONG)pCurrentActions->GetObject(nAction)); + sal_uInt16 nRId = GetClickActionSdResId((presentation::ClickAction)(sal_uLong)pCurrentActions->GetObject(nAction)); aLbAction.InsertEntry( String( SdResId( nRId ) ) ); } @@ -295,9 +298,9 @@ void SdTPAction::Construct() // ----------------------------------------------------------------------- -BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; presentation::ClickAction eCA = presentation::ClickAction_NONE; if( aLbAction.GetSelectEntryCount() ) @@ -305,13 +308,13 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( aLbAction.GetSavedValue() != aLbAction.GetSelectEntryPos() ) { - rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (USHORT)eCA ) ); - bModified = TRUE; + rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); + bModified = sal_True; } else rAttrs.InvalidateItem( ATTR_ACTION ); - String aFileName = GetEditText( TRUE ); + String aFileName = GetEditText( sal_True ); if( aFileName.Len() == 0 ) rAttrs.InvalidateItem( ATTR_ACTION_FILENAME ); else @@ -327,7 +330,7 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) INetURLObject::DECODE_UNAMBIGUOUS ); rAttrs.Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); - bModified = TRUE; + bModified = sal_True; } else { @@ -367,7 +370,7 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) case presentation::ClickAction_BOOKMARK: { if( !aLbTree.SelectEntry( aFileName ) ) - aLbTree.SelectAll( FALSE ); + aLbTree.SelectAll( sal_False ); } break; @@ -418,8 +421,8 @@ void SdTPAction::UpdateTree() if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) { //aLbTree.Clear(); - aLbTree.Fill( mpDoc, TRUE, mpDoc->GetDocSh()->GetMedium()->GetName() ); - bTreeUpdated = TRUE; + aLbTree.Fill( mpDoc, sal_True, mpDoc->GetDocSh()->GetMedium()->GetName() ); + bTreeUpdated = sal_True; } } @@ -429,11 +432,11 @@ void SdTPAction::OpenFileDialog() { // Soundpreview nur fuer Interaktionen mit Sound presentation::ClickAction eCA = GetActualClickAction(); - BOOL bSound = ( eCA == presentation::ClickAction_SOUND ); - BOOL bPage = ( eCA == presentation::ClickAction_BOOKMARK ); - BOOL bDocument = ( eCA == presentation::ClickAction_DOCUMENT || + sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND ); + sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK ); + sal_Bool bDocument = ( eCA == presentation::ClickAction_DOCUMENT || eCA == presentation::ClickAction_PROGRAM ); - BOOL bMacro = ( eCA == presentation::ClickAction_MACRO ); + sal_Bool bMacro = ( eCA == presentation::ClickAction_MACRO ); if( bPage ) { @@ -488,7 +491,7 @@ void SdTPAction::OpenFileDialog() // filter makes the (Windows system) open file dialog follow // links on the desktop to directories. aFileDialog.AddFilter ( - String (SdResId (STR_SFX_FILTERNAME_ALL)), + String (SfxResId (STR_SFX_FILTERNAME_ALL)), String (RTL_CONSTASCII_USTRINGPARAM("*.*"))); @@ -708,7 +711,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) // Ueberpruefen, ob es eine gueltige Draw-Datei ist SfxMedium aMedium( aFile, STREAM_READ | STREAM_NOCREATE, - TRUE ); // Download + sal_True ); // Download if( aMedium.IsStorage() ) { @@ -730,7 +733,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) aLastFile = aFile; aLbTreeDocument.Clear(); - aLbTreeDocument.Fill( pBookmarkDoc, TRUE, aFile ); + aLbTreeDocument.Fill( pBookmarkDoc, sal_True, aFile ); mpDoc->CloseBookmarkDoc(); aLbTreeDocument.Show(); } @@ -753,10 +756,10 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) presentation::ClickAction SdTPAction::GetActualClickAction() { presentation::ClickAction eCA = presentation::ClickAction_NONE; - USHORT nPos = aLbAction.GetSelectEntryPos(); + sal_uInt16 nPos = aLbAction.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) - eCA = (presentation::ClickAction)(ULONG)pCurrentActions->GetObject((ULONG)nPos); + eCA = (presentation::ClickAction)(sal_uLong)pCurrentActions->GetObject((sal_uLong)nPos); return( eCA ); } @@ -764,7 +767,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) { - USHORT nPos = (USHORT)pCurrentActions->GetPos((void*)(ULONG)eCA); + sal_uInt16 nPos = (sal_uInt16)pCurrentActions->GetPos((void*)(sal_uLong)eCA); DBG_ASSERT(nPos != 0xffff, "unbekannte Interaktion"); aLbAction.SelectEntryPos(nPos); } @@ -834,7 +837,7 @@ void SdTPAction::SetEditText( String const & rStr ) //------------------------------------------------------------------------ -String SdTPAction::GetEditText( BOOL bFullDocDestination ) +String SdTPAction::GetEditText( sal_Bool bFullDocDestination ) { String aStr; presentation::ClickAction eCA = GetActualClickAction(); @@ -846,7 +849,7 @@ String SdTPAction::GetEditText( BOOL bFullDocDestination ) break; case presentation::ClickAction_VERB: { - const USHORT nPos = aLbOLEAction.GetSelectEntryPos(); + const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos(); if( nPos < aVerbVector.size() ) aStr = UniString::CreateFromInt32( aVerbVector[ nPos ] ); return aStr; @@ -901,7 +904,7 @@ String SdTPAction::GetEditText( BOOL bFullDocDestination ) //------------------------------------------------------------------------ -USHORT SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) +sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { switch( eCA ) { diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index 118f4eda4..e08f6401c 100644..100755 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -32,7 +32,7 @@ TabPage TP_ANIMATION { - HelpID = SID_ANIMATION_EFFECTS ; + HelpID = CMD_SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; @@ -48,6 +48,7 @@ TabPage TP_ANIMATION }; ListBox LB_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_ACTIONLB_TOP ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 79 ) ; @@ -66,6 +67,7 @@ TabPage TP_ANIMATION Edit EDT_SOUND { + HelpID = "sd:Edit:TP_ANIMATION:EDT_SOUND"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ; @@ -77,6 +79,7 @@ TabPage TP_ANIMATION // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; @@ -112,6 +115,7 @@ TabPage TP_ANIMATION }; ListBox LB_OLE_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_OLE_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ; @@ -126,6 +130,7 @@ TabPage TP_ANIMATION }; Edit EDT_BOOKMARK { + HelpID = "sd:Edit:TP_ANIMATION:EDT_BOOKMARK"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -134,6 +139,7 @@ TabPage TP_ANIMATION }; Edit EDT_DOCUMENT { + HelpID = "sd:Edit:TP_ANIMATION:EDT_DOCUMENT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -142,6 +148,7 @@ TabPage TP_ANIMATION }; Edit EDT_PROGRAM { + HelpID = "sd:Edit:TP_ANIMATION:EDT_PROGRAM"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -150,6 +157,7 @@ TabPage TP_ANIMATION }; Edit EDT_MACRO { + HelpID = "sd:Edit:TP_ANIMATION:EDT_MACRO"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -158,13 +166,17 @@ TabPage TP_ANIMATION }; PushButton BTN_SEEK { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEEK"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; Hide = TRUE ; Text [ en-US ] = "~Find" ; }; - + String STR_PATHNAME + { + Text [ en-US ] = "Path Name"; + }; Text [ en-US ] = "Interaction"; }; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 4597ccd9d..dd7c931f0 100644..100755 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -97,7 +97,7 @@ SdTpOptionsSnap::~SdTpOptionsSnap() // ----------------------------------------------------------------------- -BOOL SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) { SvxGridTabPage::FillItemSet(rAttrs); SdOptionsSnapItem* pOptsItem = NULL; @@ -110,16 +110,16 @@ BOOL SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsSnap().SetOrtho( aCbxOrtho.IsChecked() ); aOptsItem.GetOptionsSnap().SetBigOrtho( aCbxBigOrtho.IsChecked() ); aOptsItem.GetOptionsSnap().SetRotate( aCbxRotate.IsChecked() ); - aOptsItem.GetOptionsSnap().SetSnapArea( (INT16) aMtrFldSnapArea.GetValue() ); - aOptsItem.GetOptionsSnap().SetAngle( (INT16) aMtrFldAngle.GetValue() ); - aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (INT16) aMtrFldBezAngle.GetValue() ); + aOptsItem.GetOptionsSnap().SetSnapArea( (sal_Int16) aMtrFldSnapArea.GetValue() ); + aOptsItem.GetOptionsSnap().SetAngle( (sal_Int16) aMtrFldAngle.GetValue() ); + aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (sal_Int16) aMtrFldBezAngle.GetValue() ); if( pOptsItem == NULL || !(aOptsItem == *pOptsItem) ) rAttrs.Put( aOptsItem ); // Evtl. vorhandenes GridItem wird geholt, um nicht versehentlich // irgendwelche Standardwerte einzustellen - return( TRUE ); + return( sal_True ); } // ----------------------------------------------------------------------- @@ -178,9 +178,9 @@ SdTpOptionsContents::~SdTpOptionsContents() // ----------------------------------------------------------------------- -BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if( aCbxRuler.GetSavedValue() != aCbxRuler.IsChecked() || aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || @@ -195,7 +195,7 @@ BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsLayout().SetHandlesBezier( aCbxHandlesBezier.IsChecked() ); rAttrs.Put( aOptsItem ); - bModified = TRUE; + bModified = sal_True; } return( bModified ); } @@ -283,7 +283,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) // Metrik einstellen FieldUnit eFUnit; - USHORT nWhich = GetWhich( SID_ATTR_METRIC ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) { const SfxUInt16Item& rItem = (SfxUInt16Item&)rInAttrs.Get( nWhich ); @@ -296,13 +296,13 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) // ListBox mit Metriken f"ullen SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE ); - USHORT i; + sal_uInt16 i; for ( i = 0; i < aMetricArr.Count(); ++i ) { String sMetric = aMetricArr.GetStringByPos( i ); long nFieldUnit = aMetricArr.GetValue( i ); - USHORT nPos = aLbMetric.InsertEntry( sMetric ); + sal_uInt16 nPos = aLbMetric.InsertEntry( sMetric ); aLbMetric.SetEntryData( nPos, (void*)nFieldUnit ); } aLbMetric.SetSelectHdl( LINK( this, SdTpOptionsMisc, SelectMetricHdl_Impl ) ); @@ -328,7 +328,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); // Fuellen der CB - USHORT aTable[ TABLE_COUNT ] = + sal_uInt16 aTable[ TABLE_COUNT ] = { 1, 2, 4, 5, 8, 10, 16, 20, 30, 40, 50, 100 }; for( i = 0; i < TABLE_COUNT; i++ ) @@ -351,7 +351,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) // Metrik ggfs. aendern (da TabPage im Dialog liegt, // wo die Metrik eingestellt werden kann const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -362,11 +362,11 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) { // Metriken einstellen sal_Int64 nVal = aMtrFldOriginalWidth.Denormalize( aMtrFldOriginalWidth.GetValue( FUNIT_TWIP ) ); - SetFieldUnit( aMtrFldOriginalWidth, eFUnit, TRUE ); + SetFieldUnit( aMtrFldOriginalWidth, eFUnit, sal_True ); aMtrFldOriginalWidth.SetValue( aMtrFldOriginalWidth.Normalize( nVal ), FUNIT_TWIP ); nVal = aMtrFldOriginalHeight.Denormalize( aMtrFldOriginalHeight.GetValue( FUNIT_TWIP ) ); - SetFieldUnit( aMtrFldOriginalHeight, eFUnit, TRUE ); + SetFieldUnit( aMtrFldOriginalHeight, eFUnit, sal_True ); aMtrFldOriginalHeight.SetValue( aMtrFldOriginalHeight.Normalize( nVal ), FUNIT_TWIP ); @@ -392,7 +392,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // Parsercheck - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { if( pActiveSet ) @@ -413,9 +413,9 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) // ----------------------------------------------------------------------- -BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || aCbxMarkedHitMovesAlways.GetSavedValue()!= aCbxMarkedHitMovesAlways.IsChecked() || @@ -445,36 +445,36 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); rAttrs.Put( aOptsItem ); - bModified = TRUE; + bModified = sal_True; } // Metrik - const USHORT nMPos = aLbMetric.GetSelectEntryPos(); + const sal_uInt16 nMPos = aLbMetric.GetSelectEntryPos(); if ( nMPos != aLbMetric.GetSavedValue() ) { - USHORT nFieldUnit = (USHORT)(long)aLbMetric.GetEntryData( nMPos ); + sal_uInt16 nFieldUnit = (sal_uInt16)(long)aLbMetric.GetEntryData( nMPos ); rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), - (UINT16)nFieldUnit ) ); - bModified |= TRUE; + (sal_uInt16)nFieldUnit ) ); + bModified |= sal_True; } // Tabulatorabstand if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() ) { - USHORT nWh = GetWhich( SID_ATTR_DEFTABSTOP ); + sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); - SfxUInt16Item aDef( nWh,(USHORT)GetCoreValue( aMtrFldTabstop, eUnit ) ); + SfxUInt16Item aDef( nWh,(sal_uInt16)GetCoreValue( aMtrFldTabstop, eUnit ) ); rAttrs.Put( aDef ); - bModified |= TRUE; + bModified |= sal_True; } - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) ); rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_Y, nY ) ); - bModified = TRUE; + bModified = sal_True; } return( bModified ); @@ -510,7 +510,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) aCbxUsePrinterMetrics.SaveValue(); // Metrik - USHORT nWhich = GetWhich( SID_ATTR_METRIC ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); aLbMetric.SetNoSelection(); if ( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) @@ -518,7 +518,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs.Get( nWhich ); long nFieldUnit = (long)rItem.GetValue(); - for ( USHORT i = 0; i < aLbMetric.GetEntryCount(); ++i ) + for ( sal_uInt16 i = 0; i < aLbMetric.GetEntryCount(); ++i ) { if ( (long)aLbMetric.GetEntryData( i ) == nFieldUnit ) { @@ -539,9 +539,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) aLbMetric.SaveValue(); aMtrFldTabstop.SaveValue(); //Scale - INT32 nX = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nX = ( (const SfxInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_X ) ).GetValue(); - INT32 nY = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nY = ( (const SfxInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_Y ) ).GetValue(); nWidth = ( (const SfxUInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_WIDTH ) ).GetValue(); @@ -575,7 +575,7 @@ SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, IMPL_LINK( SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox *, EMPTYARG ) { - USHORT nPos = aLbMetric.GetSelectEntryPos(); + sal_uInt16 nPos = aLbMetric.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -688,11 +688,11 @@ void SdTpOptionsMisc::SetDrawMode() IMPL_LINK( SdTpOptionsMisc, ModifyScaleHdl, void *, EMPTYARG ) { // Originalgroesse berechnen - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { - INT32 nW = nWidth * nY / nX; - INT32 nH = nHeight * nY / nX; + sal_Int32 nW = nWidth * nY / nX; + sal_Int32 nH = nHeight * nY / nX; SetMetricValue( aMtrFldOriginalWidth, nW, ePoolUnit ); SetMetricValue( aMtrFldOriginalHeight, nH, ePoolUnit ); @@ -742,7 +742,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -String SdTpOptionsMisc::GetScale( INT32 nX, INT32 nY ) +String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { String aScale( UniString::CreateFromInt32( nX ) ); aScale.Append( TOKEN ); @@ -753,28 +753,28 @@ String SdTpOptionsMisc::GetScale( INT32 nX, INT32 nY ) // ----------------------------------------------------------------------- -BOOL SdTpOptionsMisc::SetScale( const String& aScale, INT32& rX, INT32& rY ) +sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ) { if( aScale.GetTokenCount( TOKEN ) != 2 ) - return( FALSE ); + return( sal_False ); ByteString aTmp( aScale.GetToken( 0, TOKEN ), RTL_TEXTENCODING_ASCII_US ); if( !aTmp.IsNumericAscii() ) - return( FALSE ); + return( sal_False ); rX = (long) aTmp.ToInt32(); if( rX == 0 ) - return( FALSE ); + return( sal_False ); aTmp = ByteString( aScale.GetToken( 1, TOKEN ), RTL_TEXTENCODING_ASCII_US ); if( !aTmp.IsNumericAscii() ) - return( FALSE ); + return( sal_False ); rY = (long) aTmp.ToInt32(); if( rY == 0 ) - return( FALSE ); + return( sal_False ); - return( TRUE ); + return( sal_True ); } @@ -841,7 +841,7 @@ void SdTpOptionsMisc::PageCreated (SfxAllItemSet aSet) SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False); if (pFlagItem) { - UINT32 nFlags=pFlagItem->GetValue(); + sal_uInt32 nFlags=pFlagItem->GetValue(); if ( ( nFlags & SD_DRAW_MODE ) == SD_DRAW_MODE ) SetDrawMode(); if ( ( nFlags & SD_IMPRESS_MODE ) == SD_IMPRESS_MODE ) diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 34e256cc5..3102f34c0 100644 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -45,6 +45,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_RULER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER"; Pos = MAP_APPFONT ( 12 , 83 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HELPLINES { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES"; Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -59,6 +61,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HANDLES_BEZIER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER"; Pos = MAP_APPFONT ( 12 , 111 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -66,6 +69,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_MOVE_OUTLINE { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 125 - 69 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -87,6 +91,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_QUICKEDIT { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -94,6 +99,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_PICKTHROUGH { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -107,6 +113,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_TEMPLATE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -120,6 +127,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MASTERPAGE_CACHE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -127,6 +135,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_COPY { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY"; Pos = MAP_APPFONT ( 12 , 93 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -134,6 +143,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MARKED_HIT_MOVES_ALWAYS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -141,6 +151,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_CROOK_NO_CONTORTION { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -155,6 +166,7 @@ TabPage TP_OPTIONS_MISC }; ListBox LB_METRIC { + HelpID = "sd:ListBox:TP_OPTIONS_MISC:LB_METRIC"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 117 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; @@ -169,6 +181,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_TABSTOP { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP"; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 117 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -192,6 +205,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_ACTUAL_PAGE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE"; Pos = MAP_APPFONT ( 12 , 145 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -205,6 +219,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_USE_PRINTER_METRICS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS"; // This checkbox and the following one will change places when this // one is wired in into the dialog. At the moment exists only for // translation to work on. @@ -214,6 +229,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_MERGE_PARA_DIST { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 242, 10 ) ; Text [ en-US ] = "Add ~spacing between paragraphs and tables (in current document)"; @@ -248,6 +264,7 @@ TabPage TP_OPTIONS_MISC }; ComboBox CB_SCALE { + HelpID = "sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE"; Hide = TRUE; Pos = MAP_APPFONT ( 72 , 147 ) ; Size = MAP_APPFONT ( 30 , 70 ) ; @@ -269,6 +286,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_WIDTH { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 147 ) ; @@ -300,6 +318,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_HEIGHT { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 163 ) ; diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 8e41699f6..fe8067fe4 100644..100755 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -76,7 +76,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, // Layoutnamen und Separator loeschen String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT nPos = aName.Search(aSep); + sal_uInt16 nPos = aName.Search(aSep); if( nPos != STRING_NOTFOUND ) aName.Erase(0, nPos + aSep.Len()); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 14db51e02..6e0d97b9d 100644..100755 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -44,9 +44,6 @@ #include "vectdlg.hxx" #include "vectdlg.hrc" #include <tools/config.hxx> -#ifndef _SV_OCTREE_HXX //autogen - #include <vcl/octree.hxx> -#endif #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> #include <vcl/metaact.hxx> @@ -167,7 +164,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) else rScale = Fraction( 1, 1 ); - aNew.ReduceColors( (USHORT) aNmLayers.GetValue(), BMP_REDUCE_SIMPLE ); + aNew.ReduceColors( (sal_uInt16) aNmLayers.GetValue(), BMP_REDUCE_SIMPLE ); return aNew; } @@ -176,7 +173,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); aPrgs.SetValue( 0 ); Fraction aScale; @@ -185,7 +182,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) if( !!aTmp ) { const Link aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) ); - aTmp.Vectorize( rMtf, (BYTE) aMtReduce.GetValue(), BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES, &aPrgsHdl ); + aTmp.Vectorize( rMtf, (sal_uInt8) aMtReduce.GetValue(), BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES, &aPrgsHdl ); if( aCbFillHoles.IsChecked() ) { @@ -232,7 +229,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) aTmp.ReleaseAccess( pRAcc ); - for( ULONG n = 0UL, nCount = rMtf.GetActionCount(); n < nCount; n++ ) + for( sal_uLong n = 0UL, nCount = rMtf.GetActionCount(); n < nCount; n++ ) aNewMtf.AddAction( rMtf.GetAction( n )->Clone() ); aMap.SetScaleX( aMap.GetScaleX() * aScale ); @@ -244,7 +241,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) } aPrgs.SetValue( 0 ); - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); } // ----------------------------------------------------------------------------- @@ -252,7 +249,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { - ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; + sal_uLong nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; const long nRight = nPosX + nWidth - 1L; const long nBottom = nPosY + nHeight - 1L; const double fMult = 1.0 / ( nWidth * nHeight ); @@ -269,9 +266,9 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, } } - const Color aColor( (BYTE) FRound( nSumR * fMult ), - (BYTE) FRound( nSumG * fMult ), - (BYTE) FRound( nSumB * fMult ) ); + const Color aColor( (sal_uInt8) FRound( nSumR * fMult ), + (sal_uInt8) FRound( nSumG * fMult ), + (sal_uInt8) FRound( nSumB * fMult ) ); Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); const Size& rMaxSize = rMtf.GetPrefSize(); @@ -284,8 +281,8 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, if( aRect.Bottom() > ( rMaxSize.Height() - 1L ) ) aRect.Bottom() = rMaxSize.Height() - 1L; - rMtf.AddAction( new MetaLineColorAction( aColor, TRUE ) ); - rMtf.AddAction( new MetaFillColorAction( aColor, TRUE ) ); + rMtf.AddAction( new MetaLineColorAction( aColor, sal_True ) ); + rMtf.AddAction( new MetaFillColorAction( aColor, sal_True ) ); rMtf.AddAction( new MetaRectAction( aRect ) ); } @@ -293,7 +290,7 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) { - aPrgs.SetValue( (USHORT)(ULONG) pData ); + aPrgs.SetValue( (sal_uInt16)(sal_uLong) pData ); return 0L; } @@ -357,10 +354,10 @@ void SdVectorizeDlg::LoadSettings() UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ), SD_OPTION_LOAD ) ); - UINT16 nLayers; - UINT16 nReduce; - UINT16 nFillHoles; - BOOL bFillHoles; + sal_uInt16 nLayers; + sal_uInt16 nReduce; + sal_uInt16 nFillHoles; + sal_Bool bFillHoles; if( xIStm.Is() ) { @@ -372,7 +369,7 @@ void SdVectorizeDlg::LoadSettings() nLayers = 8; nReduce = 0; nFillHoles = 32; - bFillHoles = FALSE; + bFillHoles = sal_False; } aNmLayers.SetValue( nLayers ); @@ -395,8 +392,8 @@ void SdVectorizeDlg::SaveSettings() const if( xOStm.Is() ) { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (UINT16) aNmLayers.GetValue() << (UINT16) aMtReduce.GetValue(); - *xOStm << (UINT16) aMtFillHoles.GetValue() << aCbFillHoles.IsChecked(); + *xOStm << (sal_uInt16) aNmLayers.GetValue() << (sal_uInt16) aMtReduce.GetValue(); + *xOStm << (sal_uInt16) aMtFillHoles.GetValue() << aCbFillHoles.IsChecked(); } } diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index bc75187c0..909dc878c 100644..100755 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -28,10 +28,11 @@ #include "app.hrc" #include "vectdlg.hrc" +#include "helpids.h" ModalDialog DLG_VECTORIZE { - HelpID = SID_VECTORIZE; + HelpID = HID_VECTORIZE_DLG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200, 237 ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_VECTORIZE PushButton BTN_PREVIEW { + HelpID = "sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW"; Pos = MAP_APPFONT ( 144 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -86,6 +88,7 @@ ModalDialog DLG_VECTORIZE NumericField NM_LAYERS { + HelpID = "sd:NumericField:DLG_VECTORIZE:NM_LAYERS"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +112,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_REDUCE { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_REDUCE"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -127,6 +131,7 @@ ModalDialog DLG_VECTORIZE CheckBox CB_FILLHOLES { + HelpID = "sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; TabStop = TRUE ; @@ -142,6 +147,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_FILLHOLES { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -170,6 +176,7 @@ ModalDialog DLG_VECTORIZE Border = TRUE ; Pos = MAP_APPFONT ( 6, 98 ) ; Size = MAP_APPFONT ( 92, 100 ) ; + Text [ en-US ] = "Source picture" ; }; FixedText FT_VECTORIZED @@ -184,6 +191,7 @@ ModalDialog DLG_VECTORIZE Border = TRUE ; Pos = MAP_APPFONT ( 101, 98 ) ; Size = MAP_APPFONT ( 93, 100 ) ; + Text [ en-US ] = "Vectorized image" ; }; FixedText GRP_PRGS @@ -199,6 +207,7 @@ ModalDialog DLG_VECTORIZE SVLook = TRUE ; Pos = MAP_APPFONT ( 6, 215 ) ; Size = MAP_APPFONT ( 188, 10 ) ; + Text [ en-US ] = "Progress" ; }; }; |